diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index d4206499f..b98450aef 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -47,11 +47,6 @@ abstract class Report public $loaded = false; - public $indents = [ - 'table_header' => '0px', - 'table_rows' => '24px', - ]; - public $chart = [ 'line' => [ 'width' => '0', diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index f96aac242..cf55d9f27 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -16,11 +16,6 @@ class ProfitLoss extends Report public $icon = 'fa fa-heart'; - public $indents = [ - 'table_header' => '0px', - 'table_rows' => '48px', - ]; - public function setViews() { parent::setViews(); diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index 15baa5679..f9dc3dca9 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -21,11 +21,6 @@ class TaxSummary extends Report public $icon = 'fa fa-percent'; - public $indents = [ - 'table_header' => '0px', - 'table_rows' => '48px', - ]; - public function setViews() { parent::setViews(); diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php index 2dc203b99..3f5601fd4 100644 --- a/resources/views/layouts/print.blade.php +++ b/resources/views/layouts/print.blade.php @@ -1,5 +1,4 @@ - @include('partials.print.head') @@ -9,5 +8,4 @@ @stack('body_end') - diff --git a/resources/views/partials/print/head.blade.php b/resources/views/partials/print/head.blade.php index a3d2460b9..e9de5521f 100644 --- a/resources/views/partials/print/head.blade.php +++ b/resources/views/partials/print/head.blade.php @@ -20,7 +20,6 @@ } - @stack('css') @stack('stylesheet') diff --git a/resources/views/partials/reports/print.blade.php b/resources/views/partials/reports/print.blade.php index 6324a0e57..04e6f094a 100644 --- a/resources/views/partials/reports/print.blade.php +++ b/resources/views/partials/reports/print.blade.php @@ -1,12 +1,13 @@ @extends('layouts.print') -@section('content') +@section('title', $class->model->name) +@section('content')

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

{{ setting('company.name') }} - @if(!empty($class->model->settings->chart)) + @if (!empty($class->model->settings->chart)) @include($class->views['chart']) @endif diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php index 8443fd1ba..26c39de50 100644 --- a/resources/views/partials/reports/table/footer.blade.php +++ b/resources/views/partials/reports/table/footer.blade.php @@ -1,17 +1,11 @@ +@php $grand_total = array_sum($class->footer_totals[$table]); @endphp + - @if ($grand_total = array_sum($class->footer_totals[$table])) - - {{ trans_choice('general.totals', 1) }} - @foreach($class->footer_totals[$table] as $total) - @money($total, setting('default.currency'), true) - @endforeach - @money($grand_total, setting('default.currency'), true) - - @else - - -
{{ trans('general.no_records') }}
- - - @endif + + {{ trans_choice('general.totals', 1) }} + @foreach($class->footer_totals[$table] as $total) + @money($total, setting('default.currency'), true) + @endforeach + @money($grand_total, setting('default.currency'), true) + diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 286aeb58f..2b4b4728a 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -2,7 +2,7 @@ - + @foreach($class->net_profit as $profit) @endforeach diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index 8554a37fb..a83bd574e 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -1,17 +1,11 @@ +@php $grand_total = array_sum($class->footer_totals[$table]); @endphp + - @if ($grand_total = array_sum($class->footer_totals[$table])) - - - @foreach($class->footer_totals[$table] as $date => $total) - - @endforeach - - - @else - - - - @endif + + + @foreach($class->footer_totals[$table] as $total) + + @endforeach + + diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index b658d1847..cec2e60d3 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -1,10 +1,10 @@ -
+
{{ trans('reports.net_profit') }}{{ trans('reports.net_profit') }}@money($profit, setting('default.currency'), true)
{{ trans_choice('general.totals', 1) }}@money($total, setting('default.currency'), true)@money($grand_total, setting('default.currency'), true)
-
{{ trans('general.no_records') }}
-
{{ trans_choice('general.totals', 1) }}@money($total, setting('default.currency'), true)@money($grand_total, setting('default.currency'), true)
- + @foreach($class->dates as $date) - + @endforeach diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index 9804cec3f..c88fa5aee 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -1,17 +1,11 @@ +@php $grand_total = array_sum($class->footer_totals[$table]); @endphp + - @if ($grand_total = array_sum($class->footer_totals[$table])) - - - @foreach($class->footer_totals[$table] as $total) - - @endforeach - - - @else - - - - @endif + + + @foreach($class->footer_totals[$table] as $total) + + @endforeach + + diff --git a/resources/views/reports/tax_summary/table/header.blade.php b/resources/views/reports/tax_summary/table/header.blade.php index d35424d7c..61579aee4 100644 --- a/resources/views/reports/tax_summary/table/header.blade.php +++ b/resources/views/reports/tax_summary/table/header.blade.php @@ -1,4 +1,4 @@ - +
{{ $date }}{{ $date }}{{ trans_choice('general.totals', 1) }}
{{ trans('reports.net') }}@money($total, setting('default.currency'), true)@money($grand_total, setting('default.currency'), true)
-
{{ trans('general.no_records') }}
-
{{ trans('reports.net') }}@money($total, setting('default.currency'), true)@money($grand_total, setting('default.currency'), true)

{{ $table }}