diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 800af84c3..32c243dac 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -39,110 +39,118 @@ @stack('timeline_start') @if ($bill->status->code != 'paid') -
- @stack('timeline_body_start') -
-
-
-
- @stack('timeline_body_create_bill_start') -
- - - -
- @stack('timeline_body_create_bill_head_start') -

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

- @stack('timeline_body_create_bill_head_end') + @stack('timeline_body_start') +
+
+
+ @stack('timeline_body_create_bill_start') +
+ + + +
+ @stack('timeline_body_create_bill_head_start') +

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

+ @stack('timeline_body_create_bill_head_end') - @stack('timeline_body_create_bill_body_start') + @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') - @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') - -
- @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_body_button_edit_start') + + {{ trans('general.edit') }} + + @stack('timeline_body_create_bill_body_button_edit_end')
-
- @stack('timeline_body_create_bill_end') + @stack('timeline_body_create_bill_body_end') +
+
+ @stack('timeline_body_create_bill_end') - @stack('timeline_body_receive_bill_start') -
- - - -
- @stack('timeline_body_receive_bill_head_start') -

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

- @stack('timeline_body_receive_bill_head_end') + @stack('timeline_body_receive_bill_start') +
+ + + +
+ @stack('timeline_body_receive_bill_head_start') +

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

+ @stack('timeline_body_receive_bill_head_end') - @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_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') +
+ @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') + + @stack('timeline_body_make_payment_start') +
+ + + + +
+ @stack('timeline_body_make_payment_head_start') +

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

+ @stack('timeline_body_make_payment_head_end') + + @stack('timeline_body_make_payment_body_start') + @stack('timeline_body_get_paid_body_message_start') + @if($bill->status->code != 'paid' && empty($bill->transactions->count())) +
+

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('bills.messages.status.paid.await') }}
@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') - - @stack('timeline_body_make_payment_start') -
- - - - -
- @stack('timeline_body_make_payment_head_start') -

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

- @stack('timeline_body_make_payment_head_end') - - @stack('timeline_body_make_payment_body_start') - @stack('timeline_body_get_paid_body_message_start') - @if($bill->status->code != 'paid' && empty($bill->transactions->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->transactions->count()) || (!empty($bill->transactions->count()) && $bill->paid != $bill->amount)) - - @endif - @stack('timeline_body_make_payment_body_button_payment_end') +
+

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('general.partially_paid') }}
- @stack('timeline_body_make_payment_body_end') + @endif + @stack('timeline_body_make_payment_body_message_end') + +
+ @stack('timeline_body_make_payment_body_button_payment_start') + @if(empty($bill->transactions->count()) || (!empty($bill->transactions->count()) && $bill->paid != $bill->amount)) + + @endif + @stack('timeline_body_make_payment_body_button_payment_end')
-
- @stack('timeline_body_make_payment_end') + @stack('timeline_body_make_payment_body_end') +
-
+ @stack('timeline_body_make_payment_end')
- @stack('timeline_body_end') -
+
+ @stack('timeline_body_end') @endif @stack('timeline_end') @@ -334,11 +342,11 @@ @stack('name_td_end') @stack('quantity_td_start') - {{ $item->quantity }} + {{ $item->quantity }} @stack('quantity_td_end') @stack('price_td_start') - @money($item->price, $bill->currency_code, true) + @money($item->price, $bill->currency_code, true) @stack('price_td_end') @stack('total_td_start') @@ -485,8 +493,8 @@ {{ trans('general.date') }} - {{ trans_choice('general.statuses', 1) }} - {{ trans('general.description') }} + {{ trans_choice('general.statuses', 1) }} + {{ trans('general.description') }} @@ -494,7 +502,7 @@ @date($history->created_at) {{ $history->status->name }} - {{ $history->description }} + {{ $history->description }} @endforeach @@ -529,7 +537,7 @@ @foreach($bill->transactions as $transaction) @date($item->paid_at) - @money($transaction->amount, $transaction->currency_code, true) + @money($transaction->amount, $transaction->currency_code, true) {{ $transaction->account->name }} @if ($transaction->reconciled) diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 3dc9b4234..d2759a636 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -50,12 +50,15 @@
@stack('timeline_body_create_invoice_head_start') -

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

+

{{ 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)]) }} +
+

{{ 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')
@@ -77,13 +80,15 @@
@stack('timeline_body_send_invoice_head_start') -

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

+

{{ 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' && $invoice->status->code != 'viewed') @stack('timeline_body_send_invoice_body_message_start') - {{ trans_choice('general.statuses', 1) . ' :' }} {{ trans('invoices.messages.status.send.draft') }} +
+

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('invoices.messages.status.send.draft') }} +
@stack('timeline_body_send_invoice_body_message_end')
@@ -109,14 +114,17 @@ @endif @stack('timeline_body_send_invoice_body_button_email_end')
- @elseif($invoice->status->code == 'viewed') @stack('timeline_body_viewed_invoice_body_message_start') - {{ trans_choice('general.statuses', 1) . ' :' }} {{ trans('invoices.messages.status.viewed') }} +
+

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('invoices.messages.status.viewed') }} +
@stack('timeline_body_viewed_invoice_body_message_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)]) }} +
+

{{ 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') @@ -132,15 +140,19 @@
@stack('timeline_body_get_paid_head_start') -

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

+

{{ 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->transactions->count())) - {{ trans_choice('general.statuses', 1) . ' :' }} {{ trans('invoices.messages.status.paid.await') }} +
+

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('invoices.messages.status.paid.await') }} +
@else - {{ trans_choice('general.statuses', 1) . ' :' }} {{ trans('general.partially_paid') }} +
+

{{ trans_choice('general.statuses', 1) . ':' }}

{{ trans('general.partially_paid') }} +
@endif @stack('timeline_body_get_paid_body_message_end') @@ -338,7 +350,7 @@ @stack('quantity_th_end') @stack('price_th_start') - {{ trans($text_override['price']) }} + {{ trans($text_override['price']) }} @stack('price_th_end') @stack('total_th_start') @@ -352,11 +364,11 @@ @stack('name_td_end') @stack('quantity_td_start') - {{ $item->quantity }} + {{ $item->quantity }} @stack('quantity_td_end') @stack('price_td_start') - @money($item->price, $invoice->currency_code, true) + @money($item->price, $invoice->currency_code, true) @stack('price_td_end') @stack('total_td_start') @@ -527,7 +539,7 @@ {{ trans('general.date') }} {{ trans_choice('general.statuses', 1) }} - {{ trans('general.description') }} + {{ trans('general.description') }} @@ -535,7 +547,7 @@ @date($history->created_at) {{ $history->status->name }} - {{ $history->description }} + {{ $history->description }} @endforeach @@ -570,7 +582,7 @@ @foreach($invoice->transactions as $transaction) @date($transaction->paid_at) - @money($transaction->amount, $transaction->currency_code, true) + @money($transaction->amount, $transaction->currency_code, true) {{ $transaction->account->name }} @if ($transaction->reconciled) @@ -584,23 +596,23 @@ 'route' => ['transactions.destroy', $transaction->id], 'class' => 'd-inline' ]) !!} - {{ Form::hidden('form_id', '#invoice-transaction-' . $transaction->id, ['id' => 'form_id-' . $transaction->id]) }} - {{ Form::hidden('title', trans_choice('general.transactions', 2), ['id' => 'title-' . $transaction->id]) }} - @php $message = trans('general.delete_confirm', [ - 'name' => '' . Date::parse($transaction->paid_at)->format($date_format) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', - 'type' => strtolower(trans_choice('general.transactions', 1)) - ]); - @endphp - {{ Form::hidden('message', $message, ['id' => 'mesage-' . $transaction->id]) }} - {{ Form::hidden('cancel', trans('general.cancel'), ['id' => 'cancel-' . $transaction->id]) }} - {{ Form::hidden('delete', trans('general.delete'), ['id' => 'delete-' . $transaction->id]) }} + {{ Form::hidden('form_id', '#invoice-transaction-' . $transaction->id, ['id' => 'form_id-' . $transaction->id]) }} + {{ Form::hidden('title', trans_choice('general.transactions', 2), ['id' => 'title-' . $transaction->id]) }} + @php $message = trans('general.delete_confirm', [ + 'name' => '' . Date::parse($transaction->paid_at)->format($date_format) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', + 'type' => strtolower(trans_choice('general.transactions', 1)) + ]); + @endphp + {{ Form::hidden('message', $message, ['id' => 'mesage-' . $transaction->id]) }} + {{ Form::hidden('cancel', trans('general.cancel'), ['id' => 'cancel-' . $transaction->id]) }} + {{ Form::hidden('delete', trans('general.delete'), ['id' => 'delete-' . $transaction->id]) }} - {!! Form::button(' ' . trans('general.delete'), array( - 'type' => 'button', - 'class' => 'btn btn-danger btn-sm', - 'title' => trans('general.delete'), - '@click' => 'onDeleteTransaction("invoice-transaction-' . $transaction->id . '")' - )) !!} + {!! Form::button(' ' . trans('general.delete'), array( + 'type' => 'button', + 'class' => 'btn btn-danger btn-sm', + 'title' => trans('general.delete'), + '@click' => 'onDeleteTransaction("invoice-transaction-' . $transaction->id . '")' + )) !!} {!! Form::close() !!} @endif