Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-12 20:24:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refinements to reports

Browse Source
This commit is contained in:
Hillel Coren 2016-02-25 10:32:31 +02:00
parent 6cdbc15961
commit fb959c1487
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ReportController.php
View File

@ -292,7 +292,7 @@ class ReportController extends BaseController
foreach ($taxes as $tax) { foreach ($taxes as $tax) {
$displayData[] = [ $displayData[] = [
$tax['name'], $tax['name'],
$tax['rate'], $tax['rate'] . '%',
$account->formatMoney($tax['amount'], $client), $account->formatMoney($tax['amount'], $client),
$account->formatMoney($tax['paid'], $client) $account->formatMoney($tax['paid'], $client)
]; ];

6
resources/views/reports/chart_builder.blade.php
View File

@ -87,6 +87,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if (count($displayData))
@foreach ($displayData as $record) @foreach ($displayData as $record)
<tr> <tr>
@foreach ($record as $field) @foreach ($record as $field)
@ -94,6 +95,11 @@
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach
@else
<tr>
<td colspan="10" style="text-align: center">{{ trans('texts.empty_table') }}</td>
</tr>
@endif
</tbody> </tbody>
</table> </table>