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

added gross profit and total expenses #293

Browse Source
This commit is contained in:
denisdulici 2018-04-12 18:20:07 +03:00
parent 8e87062e1a
commit 8ec2baced8
3 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Reports/ProfitLoss.php
View File

@ -107,6 +107,8 @@ class ProfitLoss extends Controller
'currency_rate' => 1 'currency_rate' => 1
]; ];
$gross['income'] = $gross['expense'] = [1 => 0, 2 => 0, 3 => 0, 4 => 0, 'total' => 0];
foreach ($income_categories as $category_id => $category_name) { foreach ($income_categories as $category_id => $category_name) {
$compares['income'][$category_id]['total'] = [ $compares['income'][$category_id]['total'] = [
'category_id' => $category_id, 'category_id' => $category_id,
@ -186,7 +188,7 @@ class ProfitLoss extends Controller
$view_template = 'reports.profit_loss.index'; $view_template = 'reports.profit_loss.index';
} }
return view($view_template, compact('dates', 'income_categories', 'expense_categories', 'compares', 'totals')); return view($view_template, compact('dates', 'income_categories', 'expense_categories', 'compares', 'totals', 'gross'));
} }
private function setAmount(&$totals, &$compares, $items, $type, $date_field) private function setAmount(&$totals, &$compares, $items, $type, $date_field)

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

@ -10,6 +10,8 @@ return [
'profit_loss' => 'Profit & Loss', 'profit_loss' => 'Profit & Loss',
'gross_profit' => 'Gross Profit', 'gross_profit' => 'Gross Profit',
'net_profit' => 'Net Profit', 'net_profit' => 'Net Profit',
'less_expenses' => 'Less Expenses',
'total_expenses' => 'Total Expenses',
'summary' => [ 'summary' => [
'income' => 'Income Summary', 'income' => 'Income Summary',

106
resources/views/reports/profit_loss/body.blade.php
View File

@ -1,6 +1,6 @@
<div class="box-body"> <div class="box-body">
<div class="table table-responsive"> <div class="table-responsive">
<table class="table" id="tbl-profit-loss"> <table class="table">
<thead> <thead>
<tr> <tr>
<th class="col-md-2">&nbsp;</th> <th class="col-md-2">&nbsp;</th>
@ -10,58 +10,64 @@
<th class="col-md-2 text-right">{{ trans_choice('general.totals', 1) }}</th> <th class="col-md-2 text-right">{{ trans_choice('general.totals', 1) }}</th>
</tr> </tr>
</thead> </thead>
</table>
<table class="table" style="margin-top: 40px">
<thead>
<th class="col-md-2" colspan="6">{{ trans_choice('general.incomes', 1) }}</th>
</thead>
<tbody> <tbody>
@if ($compares) @foreach($compares['income'] as $category_id => $category)
<table class="table">
<thead>
<th class="col-md-2" colspan="6">{{ trans_choice('general.incomes', 2) }}</th>
</thead>
<tbody>
@foreach($compares['income'] as $category_id => $category)
<tr>
<td>{{ $income_categories[$category_id] }}</td>
@foreach($category as $item)
<td class="col-md-2 text-right">@money($item['amount'], $item['currency_code'], true)</td>
@endforeach
</tr>
@endforeach
</tbody>
</table>
<table class="table">
<thead>
<th class="col-md-2" colspan="6">{{ trans_choice('general.expenses', 2) }}</th>
</thead>
<tbody>
@foreach($compares['expense'] as $category_id => $category)
<tr>
<td>{{ $expense_categories[$category_id] }}</td>
@foreach($category as $item)
<td class="col-md-2 text-right">@money($item['amount'], $item['currency_code'], true)</td>
@endforeach
</tr>
@endforeach
</tbody>
</table>
@else
<tr>
<td colspan="13">
<h5 class="text-center">{{ trans('general.no_records') }}</h5>
</td>
</tr>
@endif
</tbody>
<table class="table">
<tbody>
<tr> <tr>
<th class="col-md-2" colspan="6">{{ trans('reports.net_profit') }}</th> <td>{{ $income_categories[$category_id] }}</td>
@foreach($totals as $total)
<th class="col-md-2 text-right"><span>@money($total['amount'], $total['currency_code'], true)</span></th> @foreach($category as $i => $item)
@php $gross['income'][$i] += $item['amount']; @endphp
<td class="col-md-2 text-right">@money($item['amount'], $item['currency_code'], true)</td>
@endforeach @endforeach
</tr> </tr>
</tbody> @endforeach
</table> <tr>
<th>{{ trans('reports.gross_profit') }}</th>
@foreach($gross['income'] as $item)
<th class="col-md-2 text-right">@money($item, setting('general.default_currency'), true)</th>
@endforeach
</tr>
</tbody>
</table>
<table class="table" style="margin-top: 40px">
<thead>
<th class="col-md-2" colspan="6">{{ trans('reports.less_expenses') }}</th>
</thead>
<tbody>
@foreach($compares['expense'] as $category_id => $category)
<tr>
<td>{{ $expense_categories[$category_id] }}</td>
@foreach($category as $i => $item)
@php $gross['expense'][$i] += $item['amount']; @endphp
<td class="col-md-2 text-right">@money($item['amount'], $item['currency_code'], true)</td>
@endforeach
</tr>
@endforeach
<tr>
<th>{{ trans('reports.total_expenses') }}</th>
@foreach($gross['expense'] as $item)
<th class="col-md-2 text-right">@money($item, setting('general.default_currency'), true)</th>
@endforeach
</tr>
</tbody>
</table>
<table class="table" style="margin-top: 40px">
<tbody>
<tr>
<th class="col-md-2" colspan="6">{{ trans('reports.net_profit') }}</th>
@foreach($totals as $total)
<th class="col-md-2 text-right"><span>@money($total['amount'], $total['currency_code'], true)</span></th>
@endforeach
</tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>