shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow reports without money

Browse Source
This commit is contained in:
Denis Duliçi 2021-07-16 02:35:42 +03:00
parent 8b69aeeb4b
commit 2c0e96f351
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/Listeners/Report.php
View File

@ -8,7 +8,7 @@ use App\Models\Setting\Category;
use App\Traits\Contacts; use App\Traits\Contacts;
use App\Traits\DateTime; use App\Traits\DateTime;
use App\Traits\SearchString; use App\Traits\SearchString;
use Date; use App\Utilities\Date;
abstract class Report abstract class Report
{ {

4
app/Abstracts/Report.php
View File

@ -32,6 +32,8 @@ abstract class Report
public $icon = 'fa fa-chart-pie'; public $icon = 'fa fa-chart-pie';
public $has_money = true;
public $year; public $year;
public $views = []; public $views = [];
@ -142,7 +144,7 @@ abstract class Report
$sum += is_array($total) ? array_sum($total) : $total; $sum += is_array($total) ? array_sum($total) : $total;
} }
$total = money($sum, setting('default.currency'), true)->format(); $total = $this->has_money ? money($sum, setting('default.currency'), true)->format() : $sum;
} else { } else {
$total = trans('general.na'); $total = trans('general.na');
} }

4
resources/views/partials/reports/table/footer.blade.php
View File

@ -4,8 +4,8 @@
<tr class="row rp-border-top-1 font-size-unset px-3"> <tr class="row rp-border-top-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th> <th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
@foreach($class->footer_totals[$table] as $total) @foreach($class->footer_totals[$table] as $total)
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th> <th class="{{ $class->column_value_width }} text-right px-0">{{ $class->has_money ? money($total, setting('default.currency'), true) : $total }}</th>
@endforeach @endforeach
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th> <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ $class->has_money ? money($grand_total, setting('default.currency'), true) : $grand_total }}</th>
</tr> </tr>
</tfoot> </tfoot>

4
resources/views/partials/reports/table/rows.blade.php
View File

@ -2,8 +2,8 @@
<tr class="row rp-border-top-1 font-size-unset"> <tr class="row rp-border-top-1 font-size-unset">
<td class="{{ $class->column_name_width }} long-texts pr-0" title="{{ $class->row_names[$table][$id] }}">{{ $class->row_names[$table][$id] }}</td> <td class="{{ $class->column_name_width }} long-texts pr-0" title="{{ $class->row_names[$table][$id] }}">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row) @foreach($rows as $row)
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td> <td class="{{ $class->column_value_width }} text-right px-0">{{ $class->has_money ? money($row, setting('default.currency'), true) : $row }}</td>
@endforeach @endforeach
<td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td> <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ $class->has_money ? money($row_total, setting('default.currency'), true) : $row }}</td>
</tr> </tr>
@endif @endif