diff --git a/resources/views/expenses/bills/bill.blade.php b/resources/views/expenses/bills/bill.blade.php index 6e6e53c84..e7ab40aa2 100644 --- a/resources/views/expenses/bills/bill.blade.php +++ b/resources/views/expenses/bills/bill.blade.php @@ -29,40 +29,58 @@
{{ trans('bills.bill_from') }}

+ @stack('name_input_start') {{ $bill->vendor_name }}
+ @stack('name_input_end') + @stack('address_input_start') {!! nl2br($bill->vendor_address) !!}
+ @stack('address_input_end') + @stack('tax_number_input_start') @if ($bill->vendor_tax_number) {{ trans('general.tax_number') }}: {{ $bill->vendor_tax_number }}
@endif + @stack('tax_number_input_end')
+ @stack('phone_input_start') @if ($bill->vendor_phone) {{ $bill->vendor_phone }}
@endif + @stack('phone_input_end') + @stack('email_start') {{ $bill->vendor_email }} + @stack('email_input_end')
+ @stack('bill_number_input_start') + @stack('bill_number_input_end') + @stack('order_number_input_start') @if ($bill->order_number) @endif + @stack('order_number_input_end') + @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::parse($bill->billed_at)->format($date_format) }}
{{ trans('bills.payment_due') }}: {{ Date::parse($bill->due_at)->format($date_format) }}
@@ -72,24 +90,48 @@ + @stack('actions_th_start') + @stack('actions_th_end') + @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('taxes_th_start') + @stack('taxes_th_end') + @stack('total_th_start') + @stack('total_th_end') @foreach($bill->items as $item) + @stack('actions_td_start') + @stack('actions_td_end') + @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('taxes_td_start') + @stack('taxes_td_end') + @stack('total_td_start') + @stack('total_td_end') @endforeach @@ -97,22 +139,26 @@
+ @stack('notes_input_start') @if ($bill->notes)
{{ trans_choice('general.items', 1) }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.total') }}
{{ $item->name }} @if ($item->sku)
{{ trans('items.sku') }}: {{ $item->sku }} @endif
{{ $item->quantity }}@money($item->price, $bill->currency_code, true)@money($item->total, $bill->currency_code, true)
{{ 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') + @stack($total->code . '_td_end') @else @if ($bill->paid) @@ -120,10 +166,12 @@ @endif + @stack('grand_total_td_start') + @stack('grand_total_td_end') @endif @endforeach diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index aea64a8c7..2e27d4de2 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -119,40 +119,58 @@
{{ trans('bills.bill_from') }}
+ @stack('name_input_start') {{ $bill->vendor_name }}
+ @stack('name_input_end') + @stack('address_input_start') {!! nl2br($bill->vendor_address) !!}
+ @stack('address_input_end') + @stack('tax_number_input_start') @if ($bill->vendor_tax_number) {{ trans('general.tax_number') }}: {{ $bill->vendor_tax_number }}
@endif + @stack('tax_number_input_end')
+ @stack('phone_input_start') @if ($bill->vendor_phone) {{ $bill->vendor_phone }}
@endif + @stack('phone_input_end') + @stack('email_start') {{ $bill->vendor_email }} + @stack('email_input_end')
{{ trans($total->title) }}: @money($total->amount, $bill->currency_code, true)
- @money($bill->paid, $bill->currency_code, true)
{{ trans($total->name) }}: @money($total->amount - $bill->paid, $bill->currency_code, true)
- - - - - @if ($bill->order_number) - - - - - @endif - - - - - - - - + @stack('bill_number_input_start') + + + + + @stack('bill_number_input_end') + @stack('order_number_input_start') + @if ($bill->order_number) + + + + + @endif + @stack('order_number_input_end') + @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::parse($bill->billed_at)->format($date_format) }}
{{ trans('bills.payment_due') }}:{{ Date::parse($bill->due_at)->format($date_format) }}
{{ trans('bills.bill_number') }}:{{ $bill->bill_number }}
{{ trans('bills.order_number') }}:{{ $bill->order_number }}
{{ trans('bills.bill_date') }}:{{ Date::parse($bill->billed_at)->format($date_format) }}
{{ trans('bills.payment_due') }}:{{ Date::parse($bill->due_at)->format($date_format) }}
@@ -164,22 +182,46 @@ + @stack('actions_th_start') + @stack('actions_th_end') + @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('taxes_th_start') + @stack('taxes_th_end') + @stack('total_th_start') + @stack('total_th_end') @foreach($bill->items as $item) + @stack('actions_td_start') + @stack('actions_td_end') + @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('taxes_td_start') + @stack('taxes_td_end') + @stack('total_td_start') + @stack('total_td_end') @endforeach @@ -189,13 +231,15 @@
- @if ($bill->notes) -

{{ trans_choice('general.notes', 2) }}:

+ @stack('notes_input_start') + @if ($bill->notes) +

{{ trans_choice('general.notes', 2) }}:

-

- {{ $bill->notes }} -

- @endif +

+ {{ $bill->notes }} +

+ @endif + @stack('notes_input_end')
@@ -203,10 +247,12 @@
@foreach ($bill->totals as $total) @if ($total->code != 'total') + @stack($total->code . '_td_start') + @stack($total->code . '_td_end') @else @if ($bill->paid) @@ -214,10 +260,12 @@ @endif + @stack('grand_total_td_start') + @stack('grand_total_td_end') @endif @endforeach diff --git a/resources/views/incomes/invoices/invoice.blade.php b/resources/views/incomes/invoices/invoice.blade.php index cf6d31f6c..0f5c1d44d 100644 --- a/resources/views/incomes/invoices/invoice.blade.php +++ b/resources/views/incomes/invoices/invoice.blade.php @@ -29,40 +29,58 @@
{{ trans('invoices.bill_to') }}

+ @stack('name_input_start') {{ $invoice->customer_name }}
+ @stack('name_input_end') + @stack('address_input_start') {!! nl2br($invoice->customer_address) !!}
+ @stack('address_input_end') + @stack('tax_number_input_start') @if ($invoice->customer_tax_number) {{ trans('general.tax_number') }}: {{ $invoice->customer_tax_number }}
@endif + @stack('tax_number_input_end')
+ @stack('phone_input_start') @if ($invoice->customer_phone) {{ $invoice->customer_phone }}
@endif + @stack('phone_input_end') + @stack('email_start') {{ $invoice->customer_email }} + @stack('email_input_end')
{{ trans_choice('general.items', 1) }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.total') }}
{{ $item->name }} @if ($item->sku)
{{ trans('items.sku') }}: {{ $item->sku }} @endif
{{ $item->quantity }}@money($item->price, $bill->currency_code, true)@money($item->total, $bill->currency_code, true)
{{ trans($total->title) }}: @money($total->amount, $bill->currency_code, true)
- @money($bill->paid, $bill->currency_code, true)
{{ trans($total->name) }}: @money($total->amount - $bill->paid, $bill->currency_code, true)
+ @stack('invoice_number_input_start') + @stack('invoice_number_input_end') + @stack('order_number_input_start') @if ($invoice->order_number) @endif + @stack('order_number_input_end') + @stack('invoiced_at_input_start') + @stack('invoiced_at_input_end') + @stack('due_at_input_start') + @stack('due_at_input_end')
{{ trans('invoices.invoice_number') }}: {{ $invoice->invoice_number }}
{{ trans('invoices.order_number') }}: {{ $invoice->order_number }}
{{ trans('invoices.invoice_date') }}: {{ Date::parse($invoice->invoiced_at)->format($date_format) }}
{{ trans('invoices.payment_due') }}: {{ Date::parse($invoice->due_at)->format($date_format) }}
@@ -72,24 +90,48 @@ + @stack('actions_th_start') + @stack('actions_th_end') + @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('taxes_th_start') + @stack('taxes_th_end') + @stack('total_th_start') + @stack('total_th_end') @foreach($invoice->items as $item) + @stack('actions_td_start') + @stack('actions_td_end') + @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('taxes_td_start') + @stack('taxes_td_end') + @stack('total_td_start') + @stack('total_td_end') @endforeach @@ -97,22 +139,26 @@
+ @stack('notes_input_start') @if ($invoice->notes)
{{ trans_choice($text_override['items'], 2) }}{{ trans($text_override['quantity']) }}{{ trans($text_override['price']) }}{{ trans('invoices.total') }}
{{ $item->name }} @if ($item->sku)
{{ trans('items.sku') }}: {{ $item->sku }} @endif
{{ $item->quantity }}@money($item->price, $invoice->currency_code, true)@money($item->total, $invoice->currency_code, true)
{{ trans_choice('general.notes', 2) }}
{{ $invoice->notes }}
@endif + @stack('notes_input_end')
@foreach ($invoice->totals as $total) @if ($total->code != 'total') + @stack($total->code . '_td_start') + @stack($total->code . '_td_end') @else @if ($invoice->paid) @@ -120,10 +166,12 @@ @endif + @stack('grand_total_td_start') + @stack('grand_total_td_end') @endif @endforeach diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index ecbd42572..8c10b5cd4 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -135,40 +135,58 @@
{{ trans('invoices.bill_to') }}
+ @stack('name_input_start') {{ $invoice->customer_name }}
+ @stack('name_input_end') + @stack('address_input_start') {!! nl2br($invoice->customer_address) !!}
+ @stack('address_input_end') + @stack('tax_number_input_start') @if ($invoice->customer_tax_number) {{ trans('general.tax_number') }}: {{ $invoice->customer_tax_number }}
@endif + @stack('tax_number_input_end')
+ @stack('phone_input_start') @if ($invoice->customer_phone) {{ $invoice->customer_phone }}
@endif + @stack('phone_input_end') + @stack('email_start') {{ $invoice->customer_email }} + @stack('email_input_end')
{{ trans($total->title) }}: @money($total->amount, $invoice->currency_code, true)
- @money($invoice->paid, $invoice->currency_code, true)
{{ trans($total->name) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true)
+ @stack('invoice_number_input_start') + @stack('invoice_number_input_end') + @stack('order_number_input_start') @if ($invoice->order_number) @endif + @stack('order_number_input_end') + @stack('invoiced_at_input_start') + @stack('invoiced_at_input_end') + @stack('due_at_input_start') + @stack('due_at_input_end')
{{ trans('invoices.invoice_number') }}: {{ $invoice->invoice_number }}
{{ trans('invoices.order_number') }}: {{ $invoice->order_number }}
{{ trans('invoices.invoice_date') }}: {{ Date::parse($invoice->invoiced_at)->format($date_format) }}
{{ trans('invoices.payment_due') }}: {{ Date::parse($invoice->due_at)->format($date_format) }}
@@ -180,22 +198,46 @@ + @stack('actions_th_start') + @stack('actions_th_end') + @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('taxes_th_start') + @stack('taxes_th_end') + @stack('total_th_start') + @stack('total_th_end') @foreach($invoice->items as $item) + @stack('actions_td_start') + @stack('actions_td_end') + @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('taxes_td_start') + @stack('taxes_td_end') + @stack('total_td_start') + @stack('total_td_end') @endforeach @@ -205,6 +247,7 @@
+ @stack('notes_input_start') @if ($invoice->notes)

{{ trans_choice('general.notes', 2) }}

@@ -212,6 +255,7 @@ {{ $invoice->notes }}

@endif + @stack('notes_input_end')
@@ -219,10 +263,12 @@
@foreach ($invoice->totals as $total) @if ($total->code != 'total') + @stack($total->code . '_td_start') + @stack($total->code . '_td_end') @else @if ($invoice->paid) @@ -230,10 +276,12 @@ @endif + @stack('grand_total_td_start') + @stack('grand_total_td_end') @endif @endforeach
{{ trans_choice($text_override['items'], 2) }}{{ trans($text_override['quantity']) }}{{ trans($text_override['price']) }}{{ trans('invoices.total') }}
{{ $item->name }} @if ($item->sku)
{{ trans('items.sku') }}: {{ $item->sku }} @endif
{{ $item->quantity }}@money($item->price, $invoice->currency_code, true)@money($item->total, $invoice->currency_code, true)
{{ trans($total->title) }}: @money($total->amount, $invoice->currency_code, true)
- @money($invoice->paid, $invoice->currency_code, true)
{{ trans($total->name) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true)