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

refactored report listener

Browse Source
This commit is contained in:
denisdulici
2020-01-27 22:41:08 +03:00
parent 877d299533
commit 9c6e3c2751
31 changed files with 484 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en-GB/demo.php
View File

@ -27,7 +27,7 @@ return [
'income' => 'Monthly income summary by category.',
'expense' => 'Monthly expense summary by category.',
'income_expense' => 'Monthly income vs expense by category.',
'tax' => 'Quarterly tax summary by category.',
'tax' => 'Quarterly tax summary.',
'profit_loss' => 'Quarterly profit & loss by category.',
],

1
resources/views/common/items/edit.blade.php
View File

@ -43,6 +43,7 @@
</div>
</div>
@endpermission
{!! Form::close() !!}
</div>
@endsection

11
resources/views/common/reports/edit.blade.php
View File

@ -60,11 +60,14 @@
</div>
</div>
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('common/reports') }}
@permission('update-common-reports')
<div class="card-footer">
<div class="row float-right">
{{ Form::saveButtons('common/reports') }}
</div>
</div>
</div>
@endpermission
{!! Form::close() !!}
</div>
@endsection

6
resources/views/common/reports/index.blade.php
View File

@ -25,15 +25,13 @@
<i class="fa fa-ellipsis-v text-primary"></i>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
@permission('create-common-reports')
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@permission('create-common-reports')
<a class="dropdown-item" href="{{ route('reports.duplicate', $report->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission
@permission('delete-common-reports')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($report, 'common/reports') !!}
@endpermission
</div>

2
resources/views/partials/reports/print.blade.php
View File

@ -6,7 +6,7 @@
{{ setting('company.name') }}
@if($class->model->settings->chart)
@if(!empty($class->model->settings->chart))
@include($class->views['chart'])
@endif

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

@ -2,8 +2,8 @@
<table class="table align-items-center rp-border-collapse">
@include($class->views['table.header'])
<tbody>
@if (!empty($class->rows[$table]))
@foreach($class->rows[$table] as $id => $items)
@if (!empty($class->row_values[$table]))
@foreach($class->row_values[$table] as $id => $rows)
@include($class->views['table.rows'])
@endforeach
@else

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

@ -1,11 +1,11 @@
<tfoot>
<tr class="rp-border-top-1">
<th class="report-column text-left">{{ trans_choice('general.totals', 1) }}</th>
@php $total_total = 0; @endphp
@foreach($class->totals[$table] as $total)
@php $total_total += $total; @endphp
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp
<th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach
<th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th>
<th class="report-column text-right">@money($grand_total, setting('default.currency'), true)</th>
</tr>
</tfoot>

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

@ -1,9 +1,9 @@
@php $row_total = 0; @endphp
<tr class="rp-border-top-1">
<td class="report-column">{{ $class->getTableRowList()[$id] }}</td>
@foreach($items as $item)
@php $row_total += $item; @endphp
<td class="report-column text-right px-0">@money($item, setting('default.currency'), true)</td>
<td class="report-column">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row)
@php $row_total += $row; @endphp
<td class="report-column text-right px-0">@money($row, setting('default.currency'), true)</td>
@endforeach
<td class="report-column text-right">@money($row_total, setting('default.currency'), true)</td>
</tr>

8
resources/views/reports/profit_loss/table/footer.blade.php
View File

@ -1,11 +1,11 @@
<tfoot>
<tr class="rp-border-top-1">
<th class="report-column text-left">{{ trans_choice('general.totals', 1) }}</th>
@php $total_total = 0; @endphp
@foreach($class->totals[$table] as $date => $total)
@php $total_total += $total; @endphp
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $date => $total)
@php $grand_total += $total; @endphp
<th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach
<th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th>
<th class="report-column text-right">@money($grand_total, setting('default.currency'), true)</th>
</tr>
</tfoot>

8
resources/views/reports/tax_summary/table/footer.blade.php
View File

@ -1,11 +1,11 @@
<tfoot>
<tr class="rp-border-top-1">
<th class="report-column text-left">{{ trans('reports.net') }}</th>
@php $total_total = 0; @endphp
@foreach($class->totals[$table] as $total)
@php $total_total += $total; @endphp
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp
<th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach
<th class="report-column text-right">@money($total_total, setting('default.currency'), true)</th>
<th class="report-column text-right">@money($grand_total, setting('default.currency'), true)</th>
</tr>
</tfoot>