diff --git a/public/css/bootstrap3-print-fix.css b/public/css/bootstrap3-print-fix.css new file mode 100644 index 000000000..ecc5a59f9 --- /dev/null +++ b/public/css/bootstrap3-print-fix.css @@ -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; + } +} \ No newline at end of file diff --git a/resources/lang/en-GB/reports.php b/resources/lang/en-GB/reports.php index 5f7139878..a0e8c53e0 100644 --- a/resources/lang/en-GB/reports.php +++ b/resources/lang/en-GB/reports.php @@ -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' => [ diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php index 6b213602e..9530c04ac 100644 --- a/resources/views/layouts/print.blade.php +++ b/resources/views/layouts/print.blade.php @@ -1,6 +1,11 @@ @include('partials.admin.head') + @push('css') + + + @endpush + @yield('content') diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php index 5df908562..6e76cc33b 100644 --- a/resources/views/reports/profit_loss/body.blade.php +++ b/resources/views/reports/profit_loss/body.blade.php @@ -3,34 +3,34 @@ - + @foreach($dates as $date) - + @endforeach - +
  {{ trans('reports.quarter.' . $date) }}{{ trans('reports.quarter.' . $date) }}{{ trans_choice('general.totals', 1) }}{{ trans_choice('general.totals', 1) }}
- + @foreach($compares['income'] as $category_id => $category) - + @foreach($category as $i => $item) @php $gross['income'][$i] += $item['amount']; @endphp - + @endforeach @endforeach - + @foreach($gross['income'] as $item) - + @endforeach @@ -38,23 +38,23 @@
{{ trans_choice('general.incomes', 1) }}{{ trans_choice('general.incomes', 1) }}
{{ $income_categories[$category_id] }}{{ $income_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)@money($item['amount'], $item['currency_code'], true)
{{ trans('reports.gross_profit') }}{{ trans('reports.gross_profit') }}@money($item, setting('general.default_currency'), true)@money($item, setting('general.default_currency'), true)
- + @foreach($compares['expense'] as $category_id => $category) - + @foreach($category as $i => $item) @php $gross['expense'][$i] += $item['amount']; @endphp - + @endforeach @endforeach - + @foreach($gross['expense'] as $item) - + @endforeach @@ -62,9 +62,9 @@
{{ trans('reports.less_expenses') }}{{ trans_choice('general.expenses', 2) }}
{{ $expense_categories[$category_id] }}{{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)@money($item['amount'], $item['currency_code'], true)
{{ trans('reports.total_expenses') }}{{ trans('reports.total_expenses') }}@money($item, setting('general.default_currency'), true)@money($item, setting('general.default_currency'), true)
- + @foreach($totals as $total) - + @endforeach
{{ trans('reports.net_profit') }}{{ trans('reports.net_profit') }}@money($total['amount'], $total['currency_code'], true)@money($total['amount'], $total['currency_code'], true)