diff --git a/public/css/print.css b/public/css/print.css index e55916445..e707250c1 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -348,13 +348,25 @@ th, td { */ .rp-border-top-1 { - border-top: 1px solid #3c3f72; + border-top: 1px solid #e5e5e5; } .rp-border-bottom-1 { - border-bottom: 1px solid #3c3f72; + border-bottom: 1px solid #e5e5e5; } +.rp-border-top-1 { + border-top: 1px solid #e5e5e5; +} + +.rp-border-0 { + border: 0 !important; +} + +.rp-border-collapse +{ + border-collapse: collapse; +} .rp-float-left { float: left; @@ -371,7 +383,3 @@ th, td { ========================================================= */ - - - - diff --git a/resources/views/partials/reports/table.blade.php b/resources/views/partials/reports/table.blade.php index cf43132f9..5726f91c8 100644 --- a/resources/views/partials/reports/table.blade.php +++ b/resources/views/partials/reports/table.blade.php @@ -1,5 +1,5 @@
- +
@include($class->views['table.header']) @if (!empty($class->rows[$table])) diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php index 9d804562d..495050780 100644 --- a/resources/views/partials/reports/table/footer.blade.php +++ b/resources/views/partials/reports/table/footer.blade.php @@ -1,5 +1,5 @@ - + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index 5b5396715..eaffc1ea0 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 32c03b2a8..02e139b7c 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -1,12 +1,12 @@
-
{{ trans_choice('general.totals', 1) }}
{{ $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 8773e9d89..2f8335c02 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -1,12 +1,12 @@
-
{{ 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 11400788f..e92f826ad 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/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index f53aef113..018a553f6 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -1,5 +1,5 @@
-
{{ $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)
+
diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index 742048303..7dbb0dc2b 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 @@ - - + + @php $total_total = 0; @endphp @foreach($class->totals[$table] as $total) @php $total_total += $total; @endphp - + @endforeach - +
{{ trans('reports.net') }}
{{ trans('reports.net') }}@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)