diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 7837c0980710..1d6f931099f9 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -83,6 +83,7 @@ class DashboardController extends BaseController 'tasks' => $tasks, 'showBlueVinePromo' => $showBlueVinePromo, 'showWhiteLabelExpired' => $showWhiteLabelExpired, + 'showExpenses' => count($expenses) && $account->isModuleEnabled(ENTITY_EXPENSE), 'headerClass' => in_array(\App::getLocale(), ['lt', 'pl', 'cs', 'sl', 'tr_TR']) ? 'in-large' : 'in-thin', 'footerClass' => in_array(\App::getLocale(), ['lt', 'pl', 'cs', 'sl', 'tr_TR']) ? '' : 'in-thin', ]; diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index e40e6880a137..0c35e9d40b64 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -170,7 +170,7 @@ }); function loadData() { - var includeExpenses = "{{ count($expenses) ? 'true' : 'false' }}"; + var includeExpenses = "{{ $showExpenses ? 'true' : 'false' }}"; var url = "{!! url('/dashboard_chart_data') !!}/" + chartGroupBy + '/' + chartStartDate.format('YYYY-MM-DD') + '/' + chartEndDate.format('YYYY-MM-DD') + '/' + chartCurrencyId + '/' + includeExpenses; $.get(url, function(response) { response = JSON.parse(response); @@ -290,7 +290,7 @@
- @if (count($expenses)) + @if ($showExpenses)
{{ trans('texts.total_expenses') }}
@@ -415,7 +415,7 @@

- @if (count($expenses) && count($averageInvoice)) + @if ($showExpenses && count($averageInvoice))
@foreach ($averageInvoice as $item)