From 6f75e0df3cf66edf2d3a4922a31408beba92fc1b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 21 Aug 2019 18:07:15 +0200
Subject: [PATCH] Fix for #2451

---
 app/Helpers/Report/BudgetReportHelper.php | 29 +++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/Helpers/Report/BudgetReportHelper.php b/app/Helpers/Report/BudgetReportHelper.php
index d41de90649..c9a4dff1f4 100644
--- a/app/Helpers/Report/BudgetReportHelper.php
+++ b/app/Helpers/Report/BudgetReportHelper.php
@@ -82,13 +82,15 @@ class BudgetReportHelper implements BudgetReportHelperInterface
                 'rows'        => [],
             ];
             // get multi currency expenses first:
-            $budgetLimits = $this->repository->getBudgetLimits($budget, $start, $end);
-            $expenses     = $this->repository->spentInPeriodMc(new Collection([$budget]), $accounts, $start, $end);
+            $budgetLimits    = $this->repository->getBudgetLimits($budget, $start, $end);
+            $expenses        = $this->repository->spentInPeriodMc(new Collection([$budget]), $accounts, $start, $end);
+            $defaultCurrency = app('amount')->getDefaultCurrencyByUser($budget->user);
             if (0 === count($expenses)) {
                 // list the budget limits, basic amounts.
                 /** @var BudgetLimit $limit */
                 foreach ($budgetLimits as $limit) {
-                    $row = [
+                    $currency = $limit->transactionCurrency ?? $defaultCurrency;
+                    $row      = [
                         'limit_id'                => $limit->id,
                         'start_date'              => $limit->start_date,
                         'end_date'                => $limit->end_date,
@@ -96,11 +98,11 @@ class BudgetReportHelper implements BudgetReportHelperInterface
                         'spent'                   => '0',
                         'left'                    => $limit->amount,
                         'overspent'               => null,
-                        'currency_id'             => $limit->transactionCurrency->id,
-                        'currency_code'           => $limit->transactionCurrency->code,
-                        'currency_name'           => $limit->transactionCurrency->name,
-                        'currency_symbol'         => $limit->transactionCurrency->symbol,
-                        'currency_decimal_places' => $limit->transactionCurrency->decimal_places,
+                        'currency_id'             => $currency->id,
+                        'currency_code'           => $currency->code,
+                        'currency_name'           => $currency->name,
+                        'currency_symbol'         => $currency->symbol,
+                        'currency_decimal_places' => $currency\->decimal_places,
                     ];
 
                     $entry['rows'][] = $row;
@@ -169,8 +171,8 @@ class BudgetReportHelper implements BudgetReportHelperInterface
         foreach ($array['budgets'] as $budget) {
             /** @var array $row */
             foreach ($budget['rows'] as $row) {
-                $currencyId                        = $row['currency_id'];
-                $array['sums'][$currencyId]        = $array['sums'][$currencyId] ?? [
+                $currencyId                              = $row['currency_id'];
+                $array['sums'][$currencyId]              = $array['sums'][$currencyId] ?? [
                         'currency_id'             => $row['currency_id'],
                         'currency_code'           => $row['currency_code'],
                         'currency_name'           => $row['currency_name'],
@@ -181,12 +183,13 @@ class BudgetReportHelper implements BudgetReportHelperInterface
                         'left'                    => '0',
                         'overspent'               => '0',
                     ];
-                $array['sums'][$currencyId]['budgeted'] = bcadd($array['sums'][$currencyId]['budgeted'], $row['budgeted'] ?? '0');
-                $array['sums'][$currencyId]['spent'] = bcadd($array['sums'][$currencyId]['spent'], $row['spent'] ?? '0');
-                $array['sums'][$currencyId]['left'] = bcadd($array['sums'][$currencyId]['left'], $row['left'] ?? '0');
+                $array['sums'][$currencyId]['budgeted']  = bcadd($array['sums'][$currencyId]['budgeted'], $row['budgeted'] ?? '0');
+                $array['sums'][$currencyId]['spent']     = bcadd($array['sums'][$currencyId]['spent'], $row['spent'] ?? '0');
+                $array['sums'][$currencyId]['left']      = bcadd($array['sums'][$currencyId]['left'], $row['left'] ?? '0');
                 $array['sums'][$currencyId]['overspent'] = bcadd($array['sums'][$currencyId]['overspent'], $row['overspent'] ?? '0');
             }
         }
+
         return $array;
     }