diff --git a/public/css/print.css b/public/css/print.css index c89eb61ec..22d1fb26e 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -20,7 +20,7 @@ table { } th, td { - padding: 18px; + padding: 18px 9px 18px 9px; } .row { @@ -181,11 +181,11 @@ th, td { } .lines .item { - width: 40%; + width: 50%; } .lines .quantity { - width: 20%; + width: 10%; text-align: center; } @@ -264,11 +264,11 @@ th, td { } .c-lines .item { - width: 40%; + width: 50%; } .c-lines .quantity { - width: 20%; + width: 10%; text-align: center; } @@ -322,11 +322,11 @@ th, td { } .m-lines .item { - width: 40%; + width: 50%; } .m-lines .quantity { - width: 20%; + width: 10%; text-align: center; } diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php index 3638add5c..f0e8ff22b 100644 --- a/resources/views/sales/invoices/print_classic.blade.php +++ b/resources/views/sales/invoices/print_classic.blade.php @@ -192,25 +192,22 @@ @foreach ($invoice->totals as $total) @if ($total->code != 'total') @stack($total->code . '_td_start') -
-
+
{{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true)

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

+ - @money($invoice->paid, $invoice->currency_code, true)
@endif @stack('grand_total_td_start') -
-
+
{{ trans($total->name) }}: - @money($total->amount - $invoice->paid, $invoice->currency_code, true) + @money($total->amount - $invoice->paid, $invoice->currency_code, true)
@stack('grand_total_td_end') @endif diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php index 77b341acb..24125493c 100644 --- a/resources/views/sales/invoices/print_default.blade.php +++ b/resources/views/sales/invoices/print_default.blade.php @@ -167,6 +167,7 @@
@stack('notes_input_start') @if ($invoice->notes) +
{{ trans_choice('general.notes', 2) }}

{{ $invoice->notes }} @endif @@ -179,25 +180,22 @@ @foreach ($invoice->totals as $total) @if ($total->code != 'total') @stack($total->code . '_td_start') -
-
+
{{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true)

+ @money($total->amount, $invoice->currency_code, true)

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

+ - @money($invoice->paid, $invoice->currency_code, true)

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