From 17c943fcf13e94d7fa2f335bd0590be09e0f3bc2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 20 Sep 2019 16:17:57 +0200
Subject: [PATCH] Fix #2626

---
 app/Http/Controllers/Budget/BudgetLimitController.php | 1 +
 app/Http/Controllers/Report/BudgetController.php      | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index 85411c6252..cb27113c68 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -206,6 +206,7 @@ class BudgetLimitController extends Controller
         $array['left_per_day'] = bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
 
         // left per day formatted.
+        $array['amount']                 = round($limit['amount'], $limit->transactionCurrency->decimal_places);
         $array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']);
 
         return response()->json($array);
diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php
index 2b3613a517..75afe0734e 100644
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -388,7 +388,7 @@ class BudgetController extends Controller
             ];
         $noBudget             = $this->nbRepository->sumExpenses($start, $end);
         foreach ($noBudget as $noBudgetEntry) {
-            $report['budgets'][0]['budget_limits'][]                = [
+            $report['budgets'][0]['budget_limits'][] = [
                 'budget_limit_id'         => null,
                 'start_date'              => $start,
                 'end_date'                => $end,
@@ -404,7 +404,8 @@ class BudgetController extends Controller
                 'currency_symbol'         => $noBudgetEntry['currency_symbol'],
                 'currency_decimal_places' => $noBudgetEntry['currency_decimal_places'],
             ];
-            $report['sums'][$noBudgetEntry['currency_id']]['spent'] = bcadd($report['sums'][$noBudgetEntry['currency_id']]['spent'], $noBudgetEntry['sum']);
+            $report['sums'][$noBudgetEntry['currency_id']]['spent']
+                                                     = bcadd($report['sums'][$noBudgetEntry['currency_id']]['spent'] ?? '0', $noBudgetEntry['sum']);
         }
 
         // make percentages based on total amount.