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

fixed bootstrap 3 print issue #293

Browse Source
This commit is contained in:
denisdulici
2018-04-14 10:36:26 +03:00
parent 0e97b95757
commit c6df7e6845
4 changed files with 213 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
resources/views/layouts/print.blade.php
View File

@ -1,6 +1,11 @@
<html>
@include('partials.admin.head')
@push('css')
<!-- Bootstrap 3 print fix -->
<link rel="stylesheet" href="{{ asset('public/css/bootstrap3-print-fix.css?v=1.2') }}">
@endpush
<body onload="window.print();" class="print-width">
@yield('content')
</body>

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

@ -3,34 +3,34 @@
<table class="table">
<thead>
<tr>
<th class="col-md-2">&nbsp;</th>
<th class="col-sm-2">&nbsp;</th>
@foreach($dates as $date)
<th class="col-md-2 text-right">{{ trans('reports.quarter.' . $date) }}</th>
<th class="col-sm-2 text-right">{{ trans('reports.quarter.' . $date) }}</th>
@endforeach
<th class="col-md-2 text-right">{{ trans_choice('general.totals', 1) }}</th>
<th class="col-sm-2 text-right">{{ trans_choice('general.totals', 1) }}</th>
</tr>
</thead>
</table>
<table class="table" style="margin-top: 40px">
<thead>
<tr>
<th class="col-md-2" colspan="6">{{ trans_choice('general.incomes', 1) }}</th>
<th class="col-sm-2" colspan="6">{{ trans_choice('general.incomes', 1) }}</th>
</tr>
</thead>
<tbody>
@foreach($compares['income'] as $category_id => $category)
<tr>
<td class="col-md-2">{{ $income_categories[$category_id] }}</td>
<td class="col-sm-2">{{ $income_categories[$category_id] }}</td>
@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>
<td class="col-sm-2 text-right">@money($item['amount'], $item['currency_code'], true)</td>
@endforeach
</tr>
@endforeach
<tr>
<th class="col-md-2">{{ trans('reports.gross_profit') }}</th>
<th class="col-sm-2">{{ 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>
<th class="col-sm-2 text-right">@money($item, setting('general.default_currency'), true)</th>
@endforeach
</tr>
</tbody>
@ -38,23 +38,23 @@
<table class="table" style="margin-top: 40px">
<thead>
<tr>
<th class="col-md-2" colspan="6">{{ trans('reports.less_expenses') }}</th>
<th class="col-sm-2" colspan="6">{{ trans_choice('general.expenses', 2) }}</th>
</tr>
</thead>
<tbody>
@foreach($compares['expense'] as $category_id => $category)
<tr>
<td class="col-md-2">{{ $expense_categories[$category_id] }}</td>
<td class="col-sm-2">{{ $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>
<td class="col-sm-2 text-right">@money($item['amount'], $item['currency_code'], true)</td>
@endforeach
</tr>
@endforeach
<tr>
<th class="col-md-2">{{ trans('reports.total_expenses') }}</th>
<th class="col-sm-2">{{ 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>
<th class="col-sm-2 text-right">@money($item, setting('general.default_currency'), true)</th>
@endforeach
</tr>
</tbody>
@ -62,9 +62,9 @@
<table class="table" style="margin-top: 40px">
<tbody>
<tr>
<th class="col-md-2" colspan="6">{{ trans('reports.net_profit') }}</th>
<th class="col-sm-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>
<th class="col-sm-2 text-right"><span>@money($total['amount'], $total['currency_code'], true)</span></th>
@endforeach
</tr>
</tbody>