From fb959c1487b3f0b7d9ab11493a3d51a8aaebdfd0 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 25 Feb 2016 10:32:31 +0200 Subject: [PATCH] Refinements to reports --- app/Http/Controllers/ReportController.php | 2 +- resources/views/reports/chart_builder.blade.php | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index f6aa72bf535b..690775318aea 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -292,7 +292,7 @@ class ReportController extends BaseController foreach ($taxes as $tax) { $displayData[] = [ $tax['name'], - $tax['rate'], + $tax['rate'] . '%', $account->formatMoney($tax['amount'], $client), $account->formatMoney($tax['paid'], $client) ]; diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php index 5095c097f77d..defe7405e08b 100644 --- a/resources/views/reports/chart_builder.blade.php +++ b/resources/views/reports/chart_builder.blade.php @@ -87,13 +87,19 @@ - @foreach ($displayData as $record) + @if (count($displayData)) + @foreach ($displayData as $record) + + @foreach ($record as $field) + {!! $field !!} + @endforeach + + @endforeach + @else - @foreach ($record as $field) - {!! $field !!} - @endforeach + {{ trans('texts.empty_table') }} - @endforeach + @endif