diff --git a/public/css/print.css b/public/css/print.css index 0a61e1e8d..e55916445 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -91,7 +91,7 @@ th, td { .pr-2 { padding-right: 16px; -} +} .pl-2 { padding-left: 16px; @@ -136,6 +136,10 @@ th, td { font-size: 16px; } +.text-left { + text-align: left; +} + .text-right { text-align: right; } @@ -192,7 +196,7 @@ th, td { .d-note { width: 80%; - background-color: #e5e5e5; + background-color: #e5e5e5; } /*! @@ -285,12 +289,12 @@ th, td { */ .m-first-column { - padding-top: 35px; + padding-top: 35px; padding-bottom:48px; } .m-logo { - padding-top: 10px; + padding-top: 10px; padding-bottom: -36px; } @@ -337,4 +341,37 @@ th, td { * Print Template - Modern ------------ Finish ========================================================= -*/ \ No newline at end of file +========================================================= +* Print Reports ------------ Start +========================================================= + +*/ + +.rp-border-top-1 { + border-top: 1px solid #3c3f72; +} + +.rp-border-bottom-1 { + border-bottom: 1px solid #3c3f72; +} + + +.rp-float-left { + float: left; +} + +.rp-float-right { + float: right; +} + +/*! + +========================================================= +* Print Reports ------------ Finish +========================================================= + +*/ + + + + diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php index 2352cd606..2dc203b99 100644 --- a/resources/views/layouts/print.blade.php +++ b/resources/views/layouts/print.blade.php @@ -5,7 +5,7 @@ @stack('body_start') - @yield('content') + @yield('content') @stack('body_end') diff --git a/resources/views/partials/reports/header.blade.php b/resources/views/partials/reports/header.blade.php index 89bc4053d..f1ab68ed5 100644 --- a/resources/views/partials/reports/header.blade.php +++ b/resources/views/partials/reports/header.blade.php @@ -2,12 +2,12 @@ @section('new_button') - +  {{ trans('general.print') }} - +  {{ trans('general.export') }} diff --git a/resources/views/partials/reports/print.blade.php b/resources/views/partials/reports/print.blade.php index d41ca2ec9..af4381ae4 100644 --- a/resources/views/partials/reports/print.blade.php +++ b/resources/views/partials/reports/print.blade.php @@ -1,8 +1,11 @@ @extends('layouts.print') -@section('title', $class->model->name) - @section('content') + +

{{ $class->model->name }}

+ + {{ setting('company.name') }} + @if($class->model->settings->chart) @include($class->views['chart']) @endif diff --git a/resources/views/partials/reports/table.blade.php b/resources/views/partials/reports/table.blade.php index 9fc4b43f5..cf43132f9 100644 --- a/resources/views/partials/reports/table.blade.php +++ b/resources/views/partials/reports/table.blade.php @@ -1,4 +1,4 @@ -
+
@include($class->views['table.header']) diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index 565686ca5..5b5396715 100644 --- a/resources/views/partials/reports/table/rows.blade.php +++ b/resources/views/partials/reports/table/rows.blade.php @@ -1,9 +1,9 @@ @php $row_total = 0; @endphp - + @foreach($items as $item) @php $row_total += $item; @endphp - + @endforeach - + diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index f981059d3..32c03b2a8 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -2,11 +2,11 @@
{{ $class->getTableRowList()[$id] }}{{ $class->getTableRowList()[$id] }}@money($item, setting('default.currency'), true)@money($item, setting('default.currency'), true)@money($row_total, setting('default.currency'), true)@money($row_total, setting('default.currency'), true)
- + @foreach($class->net_profit as $profit) - + @endforeach - diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index f2e545811..8773e9d89 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -2,11 +2,11 @@
{{ trans('reports.net_profit') }}{{ trans('reports.net_profit') }}@money($profit, setting('default.currency'), true)@money($profit, setting('default.currency'), true) + @money(array_sum($class->net_profit), setting('default.currency'), true)
- + @foreach($class->dates as $date) - + @endforeach - diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index db27d06f1..11400788f 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -1,11 +1,11 @@ - + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $date => $total) @php $total_total += $total; @endphp - + @endforeach - + diff --git a/resources/views/reports/profit_loss/table/header.blade.php b/resources/views/reports/profit_loss/table/header.blade.php index 0843023e2..61579aee4 100644 --- a/resources/views/reports/profit_loss/table/header.blade.php +++ b/resources/views/reports/profit_loss/table/header.blade.php @@ -1,7 +1,7 @@ - diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index 86b878948..f53aef113 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -2,13 +2,11 @@
{{ $date }}{{ $date }} + {{ trans_choice('general.totals', 1) }}
{{ trans_choice('general.totals', 1) }}{{ trans_choice('general.totals', 1) }}@money($total, setting('default.currency'), true)@money($total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)@money($total_total, setting('default.currency'), true)
-
{{ $table }}
+ 		+

{{ $table }}
- + @foreach($class->dates as $date) - + @endforeach - +
{{ $date }}{{ $date }} -
{{ trans_choice('general.totals', 1) }}
- 		{{ trans_choice('general.totals', 1) }}
diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index 755cbb94c..742048303 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -1,11 +1,11 @@ - {{ trans('reports.net') }} + {{ trans('reports.net') }} @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - @money($total, setting('default.currency'), true) + @money($total, setting('default.currency'), true) @endforeach - @money($total_total, setting('default.currency'), true) + @money($total_total, setting('default.currency'), true) diff --git a/resources/views/reports/tax_summary/table/header.blade.php b/resources/views/reports/tax_summary/table/header.blade.php index 02ce4081e..61579aee4 100644 --- a/resources/views/reports/tax_summary/table/header.blade.php +++ b/resources/views/reports/tax_summary/table/header.blade.php @@ -1,5 +1,7 @@ - {{ $table }} + +

{{ $table }}

+