diff --git a/resources/views/purchases/bills/print.blade.php b/resources/views/purchases/bills/print.blade.php index f59269197..bc16f7865 100644 --- a/resources/views/purchases/bills/print.blade.php +++ b/resources/views/purchases/bills/print.blade.php @@ -3,273 +3,200 @@ @section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number) @section('content') -
-
-
-
- - - - - - -
- @if (!empty($bill->contact->logo) && !empty($bill->contact->logo->id)) - {{ $bill->contact_name }} - @else - {{ $bill->contact_name }} - @endif -
-
-
-
-
- - - - - - - - - - - - - - - - - - -
- {{ setting('company.name') }} -
- {!! nl2br(setting('company.address')) !!} -
- @if (setting('company.tax_number')) - {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} - @endif -
- @if (setting('company.phone')) - {{ setting('company.phone') }} - @endif -
- {{ setting('company.email') }} -
-
+
+
+
+ @if (!empty($bill->contact->logo) && !empty($bill->contact->logo->id)) + + @else + + @endif
- +
+
+ {{ setting('company.name') }}
+

{!! nl2br(setting('company.address')) !!}

-
-
-
- - - - - - - - - - - - - - - - - - -
- {{ trans('bills.bill_from') }} - @stack('name_input_start') - {{ $bill->contact_name }}
- @stack('name_input_end') -
- @stack('address_input_start') - {!! nl2br($bill->contact_address) !!} - @stack('address_input_end') -
- @stack('tax_number_input_start') - @if ($bill->contact_tax_number) - {{ trans('general.tax_number') }}: {{ $bill->contact_tax_number }} - @endif - @stack('tax_number_input_end') -
- @stack('phone_input_start') - @if ($bill->contact_phone) - {{ $bill->contact_phone }} - @endif - @stack('phone_input_end') -
- @stack('email_start') - {{ $bill->contact_email }} - @stack('email_input_end') -
-
-
-
-
- - - @stack('bill_number_input_start') - - - - - @stack('bill_number_input_end') +

+ @if (setting('company.tax_number')) + {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} + @endif +

- @stack('order_number_input_start') - @if ($bill->order_number) - - - - - @endif - @stack('order_number_input_end') +

+ @if (setting('company.phone')) + {{ setting('company.phone') }} + @endif +

- @stack('billed_at_input_start') - - - - - @stack('billed_at_input_end') - - @stack('due_at_input_start') - - - - - @stack('due_at_input_end') - -
{{ trans('bills.bill_number') }}:{{ $bill->bill_number }}
{{ trans('bills.order_number') }}:{{ $bill->order_number }}
{{ trans('bills.bill_date') }}:@date($bill->billed_at)
{{ trans('bills.payment_due') }}:@date($bill->due_at)
-
+

{{ setting('company.email') }}

+
- - - - @stack('actions_th_start') - @stack('actions_th_end') +
+
+
+
+ {{ trans('bills.bill_from') }}
+ @stack('name_input_start') + {{ $bill->contact_name }}
+ @stack('name_input_end') - @stack('name_th_start') -
- @stack('name_th_end') + @stack('address_input_start') +

{!! nl2br($bill->contact_address) !!}

+ @stack('address_input_end') - @stack('quantity_th_start') - - @stack('quantity_th_end') - - @stack('price_th_start') - - @stack('price_th_end') - - @stack('taxes_th_start') - @stack('taxes_th_end') - - @stack('total_th_start') - - @stack('total_th_end') - - - - @foreach($bill->items as $bill_item) - - @stack('name_td_start') - - @stack('name_td_end') - - @stack('quantity_td_start') - - @stack('quantity_td_end') - - @stack('price_td_start') - - @stack('price_td_end') - - @stack('total_td_start') - - @stack('total_td_end') - - @endforeach - -
{{ trans_choice('general.items', 1) }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.total') }}
- {{ $bill_item->name }} - @if (!empty($bill_item->item->description)) -
{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!} - @endif -
{{ $bill_item->quantity }}@money($bill_item->price, $bill->currency_code, true)@money($bill_item->total, $bill->currency_code, true)
- -
-
-
- @stack('notes_input_start') - @if ($bill->notes) - - - - - - - - - -
- {{ trans_choice('general.notes', 2) }} -
- {{ $bill->notes }} -
+ @stack('tax_number_input_start') +

+ @if ($bill->contact_tax_number) + {{ trans('general.tax_number') }}: {{ $bill->contact_tax_number }} @endif - @stack('notes_input_end') -

+

+ @stack('tax_number_input_end') + + @stack('phone_input_start') +

+ @if ($bill->contact_phone) + {{ $bill->contact_phone }} + @endif +

+ @stack('phone_input_end') + + @stack('email_start') +

+ {{ $bill->contact_email }} +

+ @stack('email_input_end')
-
-
- - - @foreach ($bill->totals as $total) - @if ($total->code != 'total') - @stack($total->code . '_td_start') - - - - - @stack($total->code . '_td_end') - @else - @if ($bill->paid) - - - - - @endif - @stack('grand_total_td_start') - - - - - @stack('grand_total_td_end') - @endif - @endforeach - -
- {{ trans($total->title) }}: - - @money($total->amount, $bill->currency_code, true) -
- {{ trans('invoices.paid') }}: - - - @money($bill->paid, $bill->currency_code, true) -
- {{ trans($total->name) }}: - - @money($total->amount - $bill->paid, $bill->currency_code, true) -
-
+
+ +
+
+
+ @stack('bill_number_input_start') + {{ trans('bills.bill_number') }}: + {{ $bill->bill_number }}

+ @stack('bill_number_input_end') + + @stack('order_number_input_start') + @if ($bill->order_number) + {{ trans('bills.order_number') }}: + {{ $bill->order_number }}

+ @endif + @stack('order_number_input_end') + + @stack('billed_at_input_start') + {{ trans('bills.bill_date') }}: + @date($bill->billed_at)

+ @stack('billed_at_input_end') + + @stack('due_at_input_start') + {{ trans('bills.payment_due') }}: + @date($bill->due_at)

+ @stack('due_at_input_end') +
+
+
+ +
+
+
+ + @foreach($bill as $item) + + @endforeach + + @stack('name_th_start') + + @stack('name_th_end') + + @stack('quantity_th_start') + + @stack('quantity_th_end') + + @stack('price_th_start') + + @stack('price_th_end') + + @stack('total_th_start') + + @stack('total_th_end') + + + + + @foreach($bill->items as $bill_item) + + @stack('name_td_start') + + @stack('name_td_end') + + @stack('quantity_td_start') + + @stack('quantity_td_end') + + @stack('price_td_start') + + @stack('price_td_end') + + @stack('total_td_start') + + @stack('total_td_end') + + @endforeach + +
{{ trans_choice('general.items', 1) }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.total') }}
+ {{ $bill_item->name }} + @if (!empty($bill_item->item->description)) +
{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!} + @endif +
{{ $bill_item->quantity }}@money($bill_item->price, $bill->currency_code, true)@money($bill_item->total, $bill->currency_code, true)
+
+
+
+ +
+
+
+ @stack('notes_input_start') + @if ($bill->notes) +
+ {{ trans_choice('general.notes', 2) }}

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

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

+
+ @endif + @stack('grand_total_td_start') +
+ {{ trans($total->name) }}: + @money($total->amount - $bill->paid, $bill->currency_code, true) +
+ @stack('grand_total_td_end') + @endif + @endforeach
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php index 24125493c..edf9de275 100644 --- a/resources/views/sales/invoices/print_default.blade.php +++ b/resources/views/sales/invoices/print_default.blade.php @@ -182,7 +182,7 @@ @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