From 7aff9e0b1065f39b12805a8631a962a95d2cd8bb Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Mon, 16 Dec 2019 18:44:01 +0300 Subject: [PATCH] invoice and bill show pages time line updated --- resources/views/expenses/bills/show.blade.php | 30 ++++++---------- .../views/incomes/invoices/show.blade.php | 36 +++++++------------ 2 files changed, 22 insertions(+), 44 deletions(-) diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 2b096cc3e..d4e7171b8 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -55,10 +55,8 @@ @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)]) }} -
+ {{ 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')
@@ -86,10 +84,8 @@ @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') }} -
+ {{ trans_choice('general.statuses', 1) . ':' }} + {{ trans('bills.messages.status.receive.draft') }} @stack('timeline_body_receive_bill_body_message_end')
@@ -101,10 +97,8 @@
@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)]) }} -
+ {{ 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') @@ -126,15 +120,11 @@ @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') }} -
+ {{ trans_choice('general.statuses', 1) . ':' }} + {{ trans('bills.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_make_payment_body_message_end') diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 305b35c40..09e10e08c 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -55,10 +55,8 @@ @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')
@@ -86,10 +84,8 @@ @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')
@@ -117,17 +113,13 @@
@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') @@ -149,15 +141,11 @@ @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')