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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
public/css/bootstrap3-print-fix.css vendored Normal file
View File

@ -0,0 +1,193 @@
@media print {
.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
float: left;
}
.col-sm-12 {
width: 100%;
}
.col-sm-11 {
width: 91.66666667%;
}
.col-sm-10 {
width: 83.33333333%;
}
.col-sm-9 {
width: 75%;
}
.col-sm-8 {
width: 66.66666667%;
}
.col-sm-7 {
width: 58.33333333%;
}
.col-sm-6 {
width: 50%;
}
.col-sm-5 {
width: 41.66666667%;
}
.col-sm-4 {
width: 33.33333333%;
}
.col-sm-3 {
width: 25%;
}
.col-sm-2 {
width: 16.66666667%;
}
.col-sm-1 {
width: 8.33333333%;
}
.col-sm-pull-12 {
right: 100%;
}
.col-sm-pull-11 {
right: 91.66666667%;
}
.col-sm-pull-10 {
right: 83.33333333%;
}
.col-sm-pull-9 {
right: 75%;
}
.col-sm-pull-8 {
right: 66.66666667%;
}
.col-sm-pull-7 {
right: 58.33333333%;
}
.col-sm-pull-6 {
right: 50%;
}
.col-sm-pull-5 {
right: 41.66666667%;
}
.col-sm-pull-4 {
right: 33.33333333%;
}
.col-sm-pull-3 {
right: 25%;
}
.col-sm-pull-2 {
right: 16.66666667%;
}
.col-sm-pull-1 {
right: 8.33333333%;
}
.col-sm-pull-0 {
right: auto;
}
.col-sm-push-12 {
left: 100%;
}
.col-sm-push-11 {
left: 91.66666667%;
}
.col-sm-push-10 {
left: 83.33333333%;
}
.col-sm-push-9 {
left: 75%;
}
.col-sm-push-8 {
left: 66.66666667%;
}
.col-sm-push-7 {
left: 58.33333333%;
}
.col-sm-push-6 {
left: 50%;
}
.col-sm-push-5 {
left: 41.66666667%;
}
.col-sm-push-4 {
left: 33.33333333%;
}
.col-sm-push-3 {
left: 25%;
}
.col-sm-push-2 {
left: 16.66666667%;
}
.col-sm-push-1 {
left: 8.33333333%;
}
.col-sm-push-0 {
left: auto;
}
.col-sm-offset-12 {
margin-left: 100%;
}
.col-sm-offset-11 {
margin-left: 91.66666667%;
}
.col-sm-offset-10 {
margin-left: 83.33333333%;
}
.col-sm-offset-9 {
margin-left: 75%;
}
.col-sm-offset-8 {
margin-left: 66.66666667%;
}
.col-sm-offset-7 {
margin-left: 58.33333333%;
}
.col-sm-offset-6 {
margin-left: 50%;
}
.col-sm-offset-5 {
margin-left: 41.66666667%;
}
.col-sm-offset-4 {
margin-left: 33.33333333%;
}
.col-sm-offset-3 {
margin-left: 25%;
}
.col-sm-offset-2 {
margin-left: 16.66666667%;
}
.col-sm-offset-1 {
margin-left: 8.33333333%;
}
.col-sm-offset-0 {
margin-left: 0%;
}
.visible-xs {
display: none !important;
}
.hidden-xs {
display: block !important;
}
table.hidden-xs {
display: table;
}
tr.hidden-xs {
display: table-row !important;
}
th.hidden-xs,
td.hidden-xs {
display: table-cell !important;
}
.hidden-xs.hidden-print {
display: none !important;
}
.hidden-sm {
display: none !important;
}
.visible-sm {
display: block !important;
}
table.visible-sm {
display: table;
}
tr.visible-sm {
display: table-row !important;
}
th.visible-sm,
td.visible-sm {
display: table-cell !important;
}
}

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

@ -10,7 +10,6 @@ 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', 'total_expenses' => 'Total Expenses',
'summary' => [ 'summary' => [

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

@ -1,6 +1,11 @@
<html> <html>
@include('partials.admin.head') @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"> <body onload="window.print();" class="print-width">
@yield('content') @yield('content')
</body> </body>

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

@ -3,34 +3,34 @@
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th class="col-md-2">&nbsp;</th> <th class="col-sm-2">&nbsp;</th>
@foreach($dates as $date) @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 @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> </tr>
</thead> </thead>
</table> </table>
<table class="table" style="margin-top: 40px"> <table class="table" style="margin-top: 40px">
<thead> <thead>
<tr> <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> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($compares['income'] as $category_id => $category) @foreach($compares['income'] as $category_id => $category)
<tr> <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) @foreach($category as $i => $item)
@php $gross['income'][$i] += $item['amount']; @endphp @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 @endforeach
</tr> </tr>
@endforeach @endforeach
<tr> <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) @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 @endforeach
</tr> </tr>
</tbody> </tbody>
@ -38,23 +38,23 @@
<table class="table" style="margin-top: 40px"> <table class="table" style="margin-top: 40px">
<thead> <thead>
<tr> <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> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($compares['expense'] as $category_id => $category) @foreach($compares['expense'] as $category_id => $category)
<tr> <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) @foreach($category as $i => $item)
@php $gross['expense'][$i] += $item['amount']; @endphp @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 @endforeach
</tr> </tr>
@endforeach @endforeach
<tr> <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) @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 @endforeach
</tr> </tr>
</tbody> </tbody>
@ -62,9 +62,9 @@
<table class="table" style="margin-top: 40px"> <table class="table" style="margin-top: 40px">
<tbody> <tbody>
<tr> <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) @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 @endforeach
</tr> </tr>
</tbody> </tbody>