diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 433fb930aa..bb0ea1d3b8 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -51,12 +51,12 @@ class ReportHelper implements ReportHelperInterface $end->endOfMonth(); // all budgets $set = Auth::user()->budgets() - ->leftJoin( - 'budget_limits', function (JoinClause $join) use ($date) { - $join->on('budget_limits.budget_id', '=', 'budgets.id')->where('budget_limits.startdate', '=', $date->format('Y-m-d')); - } - ) - ->get(['budgets.*', 'budget_limits.amount as amount']); + ->leftJoin( + 'budget_limits', function (JoinClause $join) use ($date) { + $join->on('budget_limits.budget_id', '=', 'budgets.id')->where('budget_limits.startdate', '=', $date->format('Y-m-d')); + } + ) + ->get(['budgets.*', 'budget_limits.amount as amount']); $budgets = $this->_helper->makeArray($set); @@ -141,23 +141,26 @@ class ReportHelper implements ReportHelperInterface } $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']) - ->filter( - function (Account $account) use ($sharedAccounts) { - if (!in_array($account->id, $sharedAccounts)) { - return $account; - } + ->filter( + function (Account $account) use ($sharedAccounts) { + if (!in_array($account->id, $sharedAccounts)) { + return $account; + } - return null; - } - ); + return null; + } + ); $report = []; $start->startOfYear()->subDay(); $end->endOfYear(); foreach ($accounts as $account) { - $report[] = [ - 'start' => Steam::balance($account, $start), - 'end' => Steam::balance($account, $end), + $startBalance = Steam::balance($account, $start); + $endBalance = Steam::balance($account, $end); + $report[] = [ + 'start' => $startBalance, + 'end' => $endBalance, + 'hide' => ($startBalance == 0 && $endBalance == 0), 'account' => $account, 'shared' => $account->accountRole == 'sharedAsset' ]; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 4b027e64a9..ef345a6f96 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -13,6 +13,7 @@ use Preferences; use Session; use Steam; use View; +use FireflyIII\Models\Preference; /** * Class ReportController @@ -367,7 +368,7 @@ class ReportController extends Controller } catch (Exception $e) { return view('error')->with('message', 'Invalid date.'); } - + /** @var Preference $pref */ $pref = Preferences::get('showSharedReports', false); $showSharedReports = $pref->data; $date = new Carbon('01-01-' . $year); diff --git a/resources/views/reports/year.blade.php b/resources/views/reports/year.blade.php index f6c05e0dd2..cce963375f 100644 --- a/resources/views/reports/year.blade.php +++ b/resources/views/reports/year.blade.php @@ -54,17 +54,20 @@ $end += $balance['end']; $diff += ($balance['end']-$balance['start']); ?> -