From 803b26e0f8b0fc53432137ad9fcc35e434d387f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 7 Aug 2020 19:39:23 +0300 Subject: [PATCH] invoice print stacks --- .../sales/invoices/print_classic.blade.php | 26 ++++++++++--------- .../sales/invoices/print_default.blade.php | 26 ++++++++++--------- .../sales/invoices/print_modern.blade.php | 14 +++++----- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php index 82c827a68..e762b0b20 100644 --- a/resources/views/sales/invoices/print_classic.blade.php +++ b/resources/views/sales/invoices/print_classic.blade.php @@ -170,25 +170,27 @@
@foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') -
- {{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true) -
- @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') +
+ {{ trans($total->title) }}: + @money($total->amount, $invoice->currency_code, true) +
+ @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start')
{{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)
+ @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') -
- {{ trans($total->name) }}: - @money($total->amount - $invoice->paid, $invoice->currency_code, true) -
- @stack('grand_total_td_end') + @stack('grand_total_tr_start') +
+ {{ trans($total->name) }}: + @money($total->amount - $invoice->paid, $invoice->currency_code, true) +
+ @stack('grand_total_tr_end') @endif @endforeach
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php index 2594a4126..a23333f92 100644 --- a/resources/views/sales/invoices/print_default.blade.php +++ b/resources/views/sales/invoices/print_default.blade.php @@ -158,25 +158,27 @@
@foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') -
- {{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true)
-
- @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') +
+ {{ trans($total->title) }}: + @money($total->amount, $invoice->currency_code, true)
+
+ @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start')
{{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)
+ @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') -
- {{ trans($total->name) }}: - @money($total->amount - $invoice->paid, $invoice->currency_code, true) -
- @stack('grand_total_td_end') + @stack('grand_total_tr_start') +
+ {{ trans($total->name) }}: + @money($total->amount - $invoice->paid, $invoice->currency_code, true) +
+ @stack('grand_total_tr_end') @endif @endforeach
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php index f5a4f38dc..80923a71c 100644 --- a/resources/views/sales/invoices/print_modern.blade.php +++ b/resources/views/sales/invoices/print_modern.blade.php @@ -139,19 +139,21 @@
@foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') - {{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true)

- @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') + {{ trans($total->title) }}: + @money($total->amount, $invoice->currency_code, true)

+ @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start') {{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)

+ @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') + @stack('grand_total_tr_start') {{ trans($total->name) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true) - @stack('grand_total_td_end') + @stack('grandtotal_tr_end') @endif @endforeach