From 4e221102b4958639097dc4764b64346ceb6fd663 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Mon, 4 Feb 2019 16:33:41 +0300 Subject: [PATCH] Invoice, Bill show page added many stack feature.. --- .../views/customers/invoices/show.blade.php | 161 ++++++++--- resources/views/expenses/bills/show.blade.php | 251 +++++++++++++----- .../views/incomes/invoices/show.blade.php | 178 +++++++++++-- 3 files changed, 452 insertions(+), 138 deletions(-) diff --git a/resources/views/customers/invoices/show.blade.php b/resources/views/customers/invoices/show.blade.php index 8b0a34baf..642000c35 100644 --- a/resources/views/customers/invoices/show.blade.php +++ b/resources/views/customers/invoices/show.blade.php @@ -5,12 +5,15 @@ @section('content')
+ @stack('invoice_badge_start')
{{ trans('invoices.status.' . $invoice->status->code) }}
+ @stack('invoice_badge_end') + @stack('invoice_header_start')
@if (setting('general.invoice_logo')) @@ -21,114 +24,185 @@ @endif
+
{{ setting('general.company_name') }}
- {{ setting('general.company_address') }}
+ {!! nl2br(setting('general.company_address')) !!}
@if (setting('general.company_tax_number')) - {{ trans('general.tax_number') }}: {{ setting('general.company_tax_number') }}
+ {{ trans('general.tax_number') }}: {{ setting('general.company_tax_number') }}
@endif
@if (setting('general.company_phone')) - {{ setting('general.company_phone') }}
+ {{ setting('general.company_phone') }}
@endif {{ setting('general.company_email') }}
+ @stack('invoice_header_end') + @stack('invoice_information_start')
{{ trans('invoices.bill_to') }}
+ @stack('name_input_start') {{ $invoice->customer_name }}
- {{ $invoice->customer_address }}
+ @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 }}
+ {{ 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')
+
- - - - - @if ($invoice->order_number) + @stack('invoice_number_input_start') + + + + + @stack('invoice_number_input_end') + + @stack('order_number_input_start') + @if ($invoice->order_number) - @endif - - - - - - - - + @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.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) }}
{{ trans('invoices.invoice_date') }}:{{ Date::parse($invoice->invoiced_at)->format($date_format) }}
{{ trans('invoices.payment_due') }}:{{ Date::parse($invoice->due_at)->format($date_format) }}
+ @stack('invoice_information_end') + @stack('invoice_item_start')
- - - - - - - @foreach($invoice->items as $item) + @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 + @endforeach
{{ trans_choice('general.items', 1) }}{{ trans('invoices.quantity') }}{{ trans('invoices.price') }}{{ trans('invoices.total') }}
{{ 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)
+ @stack('invoice_item_end') + @stack('invoice_total_start')
- @if ($invoice->notes) -

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

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

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

-

- {{ $invoice->notes }} -

- @endif +

+ {{ $invoice->notes }} +

+ @endif + @stack('notes_input_end')
+
- @foreach($invoice->totals as $total) - @if($total->code != 'total') + @foreach ($invoice->totals as $total) + @if ($total->code != 'total') + @stack($total->code . '_td_start') - + + @stack($total->code . '_td_end') @else @if ($invoice->paid) @@ -136,26 +210,35 @@ @endif + @stack('grand_total_td_start') - + + @stack('grand_total_td_end') @endif - @endforeach + @endforeach
{{ trans($total['name']) }}:{{ trans($total->title) }}: @money($total->amount, $invoice->currency_code, true)
- @money($invoice->paid, $invoice->currency_code, true)
{{ trans($total['name']) }}:{{ trans($total->name) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true)
+ @stack('invoice_total_end') + @stack('box_footer_start')
+ @stack('button_print_start')   {{ trans('general.print') }} + @stack('button_print_end') + + @stack('button_pdf_start')   {{ trans('general.download') }} + @stack('button_pdf_end')
@@ -170,8 +253,10 @@
+ @stack('box_footer_end')
+ @stack('invoice_end') @endsection @push('scripts') diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 38775d4f9..316df24f7 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -3,94 +3,147 @@ @section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number) @section('content') + @stack('recurring_message_start') @if (($recurring = $bill->recurring) && ($next = $recurring->next())) -
-

{{ trans('recurring.recurring') }}

+
+ @stack('recurring_message_head_start') +

{{ trans('recurring.recurring') }}

+ @stack('recurring_message_head_end') -

{{ trans('recurring.message', [ - 'type' => mb_strtolower(trans_choice('general.bills', 1)), - 'date' => $next->format($date_format) - ]) }} -

-
+ @stack('recurring_message_body_start') +

{{ trans('recurring.message', [ + 'type' => mb_strtolower(trans_choice('general.bills', 1)), + 'date' => $next->format($date_format) + ]) }} +

+ @stack('recurring_message_body_end') +
@endif + @stack('recurring_message_end') + @stack('status_message_start') @if ($bill->status->code == 'draft') -
-

{!! trans('invoices.messages.draft') !!}

-
+
+ @stack('status_message_body_start') +

{!! trans('invoices.messages.draft') !!}

+ @stack('status_message_body_end') +
@endif + @stack('status_message_end') + @stack('timeline_start') @if ($bill->status->code != 'paid') -
-
-
    -
  • - +
    + @stack('timeline_body_start') +
    +
      + @stack('timeline_body_create_bill_start') +
    • + -
      -

      {{ trans('bills.create_bill') }}

      +
      + @stack('timeline_body_create_bill_head_start') +

      {{ trans('bills.create_bill') }}

      + @stack('timeline_body_create_bill_head_end') -
      - {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }} + @stack('timeline_body_create_bill_body_start') +
      + @stack('timeline_body_create_bill_body_message_start') + {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }} + @stack('timeline_body_create_bill_body_message_end') - - {{ trans('general.edit') }} - -
      + @stack('timeline_body_create_bill_body_button_edit_start') + + {{ trans('general.edit') }} + + @stack('timeline_body_create_bill_body_button_edit_end')
      -
      • -
    • - + @stack('timeline_body_create_bill_body_end') +
    +
    • + @stack('timeline_body_create_bill_end') -
    -

    {{ trans('bills.receive_bill') }}

    + @stack('timeline_body_receive_bill_start') +
  • + -
    - @if ($bill->status->code == 'draft') - {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.receive.draft') }} +
    + @stack('timeline_body_receive_bill_head_start') +

    {{ trans('bills.receive_bill') }}

    + @stack('timeline_body_receive_bill_head_end') - @permission('update-expenses-bills') - {{ trans('bills.mark_received') }} - @endpermission - @else - {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }} - @endif -
    + @stack('timeline_body_receive_bill_body_start') +
    + @if ($bill->status->code == 'draft') + @stack('timeline_body_receive_bill_body_message_start') + {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.receive.draft') }} + @stack('timeline_body_receive_bill_body_message_end') + + @stack('timeline_body_receive_bill_body_button_sent_start') + @permission('update-expenses-bills') + {{ trans('bills.mark_received') }} + @endpermission + @stack('timeline_body_receive_bill_body_button_sent_end') + @else + @stack('timeline_body_receive_bill_body_message_start') + {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }} + @stack('timeline_body_receive_bill_body_message_end') + @endif
    -
    • -
  • - + @stack('timeline_body_receive_bill_body_end') +
    • + + @stack('timeline_body_receive_bill_end') -
    -

    {{ trans('bills.make_payment') }}

    + @stack('timeline_body_make_payment_start') +
  • + -
    - @if($bill->status->code != 'paid' && empty($bill->payments()->count())) - {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.paid.await') }} - @else - {{ trans_choice('general.statuses', 1) . ': ' . trans('general.partially_paid') }} - @endif +
    + @stack('timeline_body_make_payment_head_start') +

    {{ trans('bills.make_payment') }}

    + @stack('timeline_body_make_payment_head_end') - @if(empty($bill->payments()->count()) || (!empty($bill->payments()->count()) && $bill->paid != $bill->amount)) - {{ trans('bills.add_payment') }} - @endif -
    + @stack('timeline_body_make_payment_body_start') +
    + @stack('timeline_body_get_paid_body_message_start') + @if($bill->status->code != 'paid' && empty($bill->payments()->count())) + {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.paid.await') }} + @else + {{ trans_choice('general.statuses', 1) . ': ' . trans('general.partially_paid') }} + @endif + @stack('timeline_body_make_payment_body_message_end') + + + @stack('timeline_body_make_payment_body_button_payment_start') + @if(empty($bill->payments()->count()) || (!empty($bill->payments()->count()) && $bill->paid != $bill->amount)) + {{ trans('bills.add_payment') }} + @endif + @stack('timeline_body_make_payment_body_button_payment_end')
    -
    • -
-
+ @stack('timeline_body_make_payment_body_end') +
+ + @stack('timeline_body_make_payment_end') + + @stack('timeline_body_end') + @endif + @stack('timeline_end') + @stack('bill_start')
-
+
+ @stack('bill_badge_start')
{{ trans('bills.status.' . $bill->status->code) }}
+ @stack('bill_badge_end') + @stack('bill_header_start')
@if (isset($bill->vendor->logo) && !empty($bill->vendor->logo->id)) @@ -99,22 +152,25 @@ @endif
+
{{ setting('general.company_name') }}
{!! nl2br(setting('general.company_address')) !!}
@if (setting('general.company_tax_number')) - {{ trans('general.tax_number') }}: {{ setting('general.company_tax_number') }}
+ {{ trans('general.tax_number') }}: {{ setting('general.company_tax_number') }}
@endif
@if (setting('general.company_phone')) - {{ setting('general.company_phone') }}
+ {{ setting('general.company_phone') }}
@endif {{ setting('general.company_email') }}
+ @stack('bill_header_end') + @stack('bill_information_start')
{{ trans('bills.bill_from') }} @@ -122,9 +178,11 @@ @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 }}
@@ -136,11 +194,13 @@ {{ $bill->vendor_phone }}
@endif @stack('phone_input_end') + @stack('email_start') {{ $bill->vendor_email }} @stack('email_input_end')
+
@@ -151,6 +211,7 @@ @stack('bill_number_input_end') + @stack('order_number_input_start') @if ($bill->order_number) @@ -159,12 +220,14 @@ @endif @stack('order_number_input_end') + @stack('billed_at_input_start') @stack('billed_at_input_end') + @stack('due_at_input_start') @@ -176,7 +239,9 @@ + @stack('bill_information_end') + @stack('bill_item_start')
{{ $bill->bill_number }}
{{ trans('bills.bill_date') }}: {{ Date::parse($bill->billed_at)->format($date_format) }}
{{ trans('bills.payment_due') }}:
@@ -184,17 +249,22 @@ @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') @@ -203,6 +273,7 @@ @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') @@ -228,7 +303,9 @@
{{ trans_choice('general.items', 1) }}{{ trans('bills.quantity') }}{{ trans('bills.price') }}{{ trans('bills.total') }}
{{ $item->name }} @@ -211,14 +282,18 @@ @endif {{ $item->quantity }}@money($item->price, $bill->currency_code, true)@money($item->total, $bill->currency_code, true)
+ @stack('bill_item_end') + @stack('bill_total_start')
@stack('notes_input_start') @@ -241,6 +318,7 @@ @endif @stack('notes_input_end')
+
@@ -273,24 +351,33 @@ + @stack('bill_total_end') + @stack('box_footer_start')
-
+
+ @stack('button_edit_start') @if(!$bill->reconciled)   {{ trans('general.edit') }} @endif + @stack('button_edit_end') + @stack('button_print_start')   {{ trans('general.print') }} + @stack('button_print_end') + @stack('button_group_start')
+ @stack('button_group_end') @if($bill->attachment) @php $file = $bill->attachment; @endphp @@ -316,10 +413,14 @@ @endif
-
+ @stack('box_footer_end') + + @stack('invoice_end') + @stack('row_footer_start')
+ @stack('row_footer_history_start')
@@ -334,11 +435,11 @@
- - - - - + + + + + @foreach($bill->histories as $history) @@ -354,7 +455,9 @@ + @stack('row_footer_history_end') + @stack('row_footer_payment_start')
@@ -369,12 +472,12 @@
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
- - - - - - + + + + + + @foreach($bill->payments as $payment) @@ -413,7 +516,9 @@ + @stack('row_footer_payment_end') + @stack('row_footer_end') @endsection @push('js') diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 4b49f1228..a6bbedb45 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -3,53 +3,83 @@ @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number) @section('content') + @stack('recurring_message_start') @if (($recurring = $invoice->recurring) && ($next = $recurring->next())) -
-

{{ trans('recurring.recurring') }}

+
+ @stack('recurring_message_head_start') +

{{ trans('recurring.recurring') }}

+ @stack('recurring_message_head_end') -

{{ trans('recurring.message', [ - 'type' => mb_strtolower(trans_choice('general.invoices', 1)), - 'date' => $next->format($date_format) - ]) }} -

-
- @endif - - @if ($invoice->status->code == 'draft') -
-

{!! trans('invoices.messages.draft') !!}

+ @stack('recurring_message_body_start') +

{{ trans('recurring.message', [ + 'type' => mb_strtolower(trans_choice('general.invoices', 1)), + 'date' => $next->format($date_format) + ]) }} +

+ @stack('recurring_message_body_end')
@endif + @stack('recurring_message_end') + @stack('status_message_start') + @if ($invoice->status->code == 'draft') +
+ @stack('status_message_body_start') +

{!! trans('invoices.messages.draft') !!}

+ @stack('status_message_body_end') +
+ @endif + @stack('status_message_end') + + @stack('timeline_start') @if ($invoice->status->code != 'paid')
+ @stack('timeline_body_start')
    -
  • + @stack('timeline_body_create_invoice_start') +
  • + @stack('timeline_body_create_invoice_head_start')

    {{ trans('invoices.create_invoice') }}

    + @stack('timeline_body_create_invoice_head_end') + @stack('timeline_body_create_invoice_body_start')
    + @stack('timeline_body_create_invoice_body_message_start') {{ trans_choice('general.statuses', 1) . ': ' . trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }} + @stack('timeline_body_create_invoice_body_message_end') + @stack('timeline_body_create_invoice_body_button_edit_start') {{ trans('general.edit') }} + @stack('timeline_body_create_invoice_body_button_edit_end')
    + @stack('timeline_body_create_invoice_body_end')
    • -
  • + @stack('timeline_body_create_invoice_end') + + @stack('timeline_body_send_invoice_start') +
  • + @stack('timeline_body_send_invoice_head_start')

    {{ trans('invoices.send_invoice') }}

    + @stack('timeline_body_send_invoice_head_end') + @stack('timeline_body_send_invoice_body_start')
    @if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial') + @stack('timeline_body_send_invoice_body_message_start') {{ trans_choice('general.statuses', 1) . ': ' . trans('invoices.messages.status.send.draft') }} + @stack('timeline_body_send_invoice_body_message_end') + @stack('timeline_body_send_invoice_body_button_sent_start') @permission('update-incomes-invoices') @if($invoice->invoice_status_code == 'draft') {{ trans('invoices.mark_sent') }} @@ -57,6 +87,9 @@ {{ trans('invoices.mark_sent') }} @endif @endpermission + @stack('timeline_body_send_invoice_body_button_sent_end') + + @stack('timeline_body_send_invoice_body_button_email_start') @if($invoice->customer_email) {{ trans('invoices.send_mail') }} @else @@ -64,47 +97,72 @@ {{ trans('invoices.send_mail') }} @endif + @stack('timeline_body_send_invoice_body_button_email_end') @else + @stack('timeline_body_send_invoice_body_message_start') {{ trans_choice('general.statuses', 1) . ': ' . trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }} + @stack('timeline_body_send_invoice_body_message_end') @endif
    + @stack('timeline_body_send_invoice_body_end')
    • -
  • + @stack('timeline_body_send_invoice_end') + + @stack('timeline_body_get_paid_start') +
  • + @stack('timeline_body_get_paid_head_start')

    {{ trans('invoices.get_paid') }}

    + @stack('timeline_body_get_paid_head_end') + @stack('timeline_body_get_paid_body_start')
    + @stack('timeline_body_get_paid_body_message_start') @if($invoice->status->code != 'paid' && empty($invoice->payments()->count())) {{ trans_choice('general.statuses', 1) . ': ' . trans('invoices.messages.status.paid.await') }} @else {{ trans_choice('general.statuses', 1) . ': ' . trans('general.partially_paid') }} @endif + @stack('timeline_body_get_paid_body_message_end') + @stack('timeline_body_get_paid_body_button_pay_start') @permission('update-incomes-invoices') {{ trans('invoices.mark_paid') }} @endpermission + @stack('timeline_body_get_paid_body_button_pay_end') + + @stack('timeline_body_get_paid_body_button_payment_start') @if(empty($invoice->payments()->count()) || (!empty($invoice->payments()->count()) && $invoice->paid != $invoice->amount)) {{ trans('invoices.add_payment') }} @endif + @stack('timeline_body_get_paid_body_button_payment_end')
    + @stack('timeline_body_get_paid_body_end')
    • + @stack('timeline_body_get_paid_end')
+ @stack('timeline_body_end')
@endif + @stack('timeline_end') + @stack('invoice_start')
+ @stack('invoice_badge_start')
{{ trans('invoices.status.' . $invoice->status->code) }}
+ @stack('invoice_badge_end') + @stack('invoice_header_start')
@if (setting('general.invoice_logo')) @@ -115,6 +173,7 @@ @endif
+
{{ setting('general.company_name') }}
@@ -130,7 +189,9 @@
+ @stack('invoice_header_end') + @stack('invoice_information_start')
{{ trans('invoices.bill_to') }} @@ -138,9 +199,11 @@ @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 }}
@@ -152,11 +215,13 @@ {{ $invoice->customer_phone }}
@endif @stack('phone_input_end') + @stack('email_start') {{ $invoice->customer_email }} @stack('email_input_end')
+
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
@@ -167,6 +232,7 @@ @stack('invoice_number_input_end') + @stack('order_number_input_start') @if ($invoice->order_number) @@ -175,12 +241,14 @@ @endif @stack('order_number_input_end') + @stack('invoiced_at_input_start') @stack('invoiced_at_input_end') + @stack('due_at_input_start') @@ -192,7 +260,9 @@ + @stack('invoice_information_end') + @stack('invoice_item_start')
{{ $invoice->invoice_number }}
{{ trans('invoices.invoice_date') }}: {{ Date::parse($invoice->invoiced_at)->format($date_format) }}
{{ trans('invoices.payment_due') }}:
@@ -200,17 +270,22 @@ @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') @@ -219,6 +294,7 @@ @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') @@ -244,7 +324,9 @@
{{ trans_choice($text_override['items'], 2) }}{{ trans($text_override['quantity']) }}{{ trans($text_override['price']) }}{{ trans('invoices.total') }}
{{ $item->name }} @@ -227,14 +303,18 @@ @endif {{ $item->quantity }}@money($item->price, $invoice->currency_code, true)@money($item->total, $invoice->currency_code, true)
+ @stack('invoice_item_end') + @stack('invoice_total_start')
@stack('notes_input_start') @@ -257,6 +339,7 @@ @endif @stack('notes_input_end')
+
@@ -289,32 +372,50 @@ + @stack('invoice_total_end') + @stack('box_footer_start')
+ @stack('button_edit_start') @if(!$invoice->reconciled)   {{ trans('general.edit') }} @endif + @stack('button_edit_end') + + @stack('button_print_start')   {{ trans('general.print') }} + @stack('button_print_end') + + @stack('button_share_start')   Share + @stack('button_share_end') + + @stack('button_group_start')
+ @stack('button_group_end') @if($invoice->attachment) @php $file = $invoice->attachment; @endphp @@ -344,10 +458,14 @@ @endif
+ @stack('box_footer_end') + @stack('invoice_end') + @stack('row_footer_start')
+ @stack('row_footer_history_start')
@@ -358,15 +476,16 @@
+
- - - - - + + + + + @foreach($invoice->histories as $history) @@ -382,7 +501,9 @@ + @stack('row_footer_history_end') + @stack('row_footer_payment_start')
@@ -393,16 +514,17 @@
+
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
- - - - - - + + + + + + @foreach($invoice->payments as $payment) @@ -441,7 +563,9 @@ + @stack('row_footer_payment_end') + @stack('row_footer_end') @endsection @push('js')
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}