From 92a7fc10d2c4637015cfa5f39aad68753072fe5d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 30 Nov 2017 20:18:00 +0200 Subject: [PATCH] Fix sum on PnL report --- app/Ninja/Reports/ProfitAndLossReport.php | 2 +- resources/views/reports/report_builder.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Ninja/Reports/ProfitAndLossReport.php b/app/Ninja/Reports/ProfitAndLossReport.php index 9370d91dfbd7..cd16ed49b0c9 100644 --- a/app/Ninja/Reports/ProfitAndLossReport.php +++ b/app/Ninja/Reports/ProfitAndLossReport.php @@ -59,7 +59,7 @@ class ProfitAndLossReport extends AbstractReport $this->data[] = [ trans('texts.expense'), $client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '', - $expense->present()->amount, + '-' . $expense->present()->amount, $expense->present()->expense_date, $expense->present()->category, ]; diff --git a/resources/views/reports/report_builder.blade.php b/resources/views/reports/report_builder.blade.php index a872f47651e4..f48317eff8f4 100644 --- a/resources/views/reports/report_builder.blade.php +++ b/resources/views/reports/report_builder.blade.php @@ -474,7 +474,7 @@ if (str.indexOf(':') >= 0) { return roundToTwo(moment.duration(str).asHours()); } else { - var number = Number(str.replace(/[^0-9]+/g, '')); + var number = Number(str.replace(/[^0-9\-]+/g, '')); return number / 100; } } @@ -528,7 +528,7 @@ var txt = $(this).find("td").eq(i).text(); subtotal += convertStringToNumber(txt); }); - $cell.find(".group-count").append(' - ' + label + ': ' + roundToTwo(subtotal)); + $cell.find(".group-count").append(' - ' + label + ': ' + roundToTwo(subtotal, true)); } }, }