diff --git a/app/Http/Controllers/GoogleChartController.php b/app/Http/Controllers/GoogleChartController.php index 0be1fe5a91..45220a5714 100644 --- a/app/Http/Controllers/GoogleChartController.php +++ b/app/Http/Controllers/GoogleChartController.php @@ -126,7 +126,7 @@ class GoogleChartController extends Controller while ($start <= $end) { $row = [clone $start]; foreach ($budgets as $budget) { - $spent = $repository->spentInMonth($budget, $start); + $spent = $repository->spentInMonth($budget, $start, $shared); $row[] = $spent; } $chart->addRowArray($row); diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 4a6cf2eafe..4883560b5f 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -256,17 +256,26 @@ class BudgetRepository implements BudgetRepositoryInterface } /** - * @param Budget $budget - * @param Carbon $date + * @param Budget $budget + * @param Carbon $date + * @param boolean $shared * * @return float */ - public function spentInMonth(Budget $budget, Carbon $date) + public function spentInMonth(Budget $budget, Carbon $date, $shared) { $end = clone $date; + $sum = 0; $date->startOfMonth(); $end->endOfMonth(); - $sum = floatval($budget->transactionjournals()->before($end)->after($date)->lessThan(0)->sum('amount')) * -1; + + if ($shared === true) { + // get everything: + $sum = floatval($budget->transactionjournals()->before($end)->after($date)->lessThan(0)->sum('amount')) * -1; + } else { + // get all journals in this month where the asset account is NOT shared. + $sum = rand(1, 100); + } return $sum; } diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index d2c0cd0bed..d7b14e60b3 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -125,10 +125,11 @@ interface BudgetRepositoryInterface /** * @param Budget $budget * @param Carbon $date + * @param boolean $shared * * @return float */ - public function spentInMonth(Budget $budget, Carbon $date); + public function spentInMonth(Budget $budget, Carbon $date, $shared); /** * @param array $data