shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1005 from batuhawk/master

Browse Source 
Invoice and bill show pages time line updated
This commit is contained in:
Batuhan Baş 2019-12-16 18:44:35 +03:00 committed by GitHub
commit c4d93754b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
resources/views/expenses/bills/show.blade.php
View File

@ -55,10 +55,8 @@
@stack('timeline_body_create_bill_body_start') @stack('timeline_body_create_bill_body_start')
@stack('timeline_body_create_bill_body_message_start') @stack('timeline_body_create_bill_body_message_start')
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0"> {{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small>
<small class="pl-1">{{ trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small>
</div>
@stack('timeline_body_create_bill_body_message_end') @stack('timeline_body_create_bill_body_message_end')
<div class="mt-3"> <div class="mt-3">
@ -86,10 +84,8 @@
@stack('timeline_body_receive_bill_body_start') @stack('timeline_body_receive_bill_body_start')
@if ($bill->status->code == 'draft') @if ($bill->status->code == 'draft')
@stack('timeline_body_receive_bill_body_message_start') @stack('timeline_body_receive_bill_body_message_start')
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('bills.messages.status.receive.draft') }}</small>
<small class="pl-1">{{ trans('bills.messages.status.receive.draft') }}</small>
</div>
@stack('timeline_body_receive_bill_body_message_end') @stack('timeline_body_receive_bill_body_message_end')
<div class="mt-3"> <div class="mt-3">
@ -101,10 +97,8 @@
</div> </div>
@else @else
@stack('timeline_body_receive_bill_body_message_start') @stack('timeline_body_receive_bill_body_message_start')
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small>
<small class="pl-1">{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small>
</div>
@stack('timeline_body_receive_bill_body_message_end') @stack('timeline_body_receive_bill_body_message_end')
@endif @endif
@stack('timeline_body_receive_bill_body_end') @stack('timeline_body_receive_bill_body_end')
@ -126,15 +120,11 @@
@stack('timeline_body_make_payment_body_start') @stack('timeline_body_make_payment_body_start')
@stack('timeline_body_get_paid_body_message_start') @stack('timeline_body_get_paid_body_message_start')
@if($bill->status->code != 'paid' && empty($bill->transactions->count())) @if($bill->status->code != 'paid' && empty($bill->transactions->count()))
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0"> {{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('bills.messages.status.paid.await') }}</small>
<small class="pl-1">{{ trans('bills.messages.status.paid.await') }}</small>
</div>
@else @else
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('general.partially_paid') }}</small>
<small class="pl-1">{{ trans('general.partially_paid') }}</small>
</div>
@endif @endif
@stack('timeline_body_make_payment_body_message_end') @stack('timeline_body_make_payment_body_message_end')

36
resources/views/incomes/invoices/show.blade.php
View File

@ -55,10 +55,8 @@
@stack('timeline_body_create_invoice_body_start') @stack('timeline_body_create_invoice_body_start')
@stack('timeline_body_create_invoice_body_message_start') @stack('timeline_body_create_invoice_body_message_start')
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0"> {{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small>
<small class="pl-1">{{ trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small>
</div>
@stack('timeline_body_create_invoice_body_message_end') @stack('timeline_body_create_invoice_body_message_end')
<div class="mt-3"> <div class="mt-3">
@ -86,10 +84,8 @@
@stack('timeline_body_send_invoice_body_start') @stack('timeline_body_send_invoice_body_start')
@if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial' && $invoice->status->code != 'viewed') @if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial' && $invoice->status->code != 'viewed')
@stack('timeline_body_send_invoice_body_message_start') @stack('timeline_body_send_invoice_body_message_start')
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('invoices.messages.status.send.draft') }}</small>
<small class="pl-1">{{ trans('invoices.messages.status.send.draft') }}</small>
</div>
@stack('timeline_body_send_invoice_body_message_end') @stack('timeline_body_send_invoice_body_message_end')
<div class="mt-3"> <div class="mt-3">
@ -117,17 +113,13 @@
</div> </div>
@elseif($invoice->status->code == 'viewed') @elseif($invoice->status->code == 'viewed')
@stack('timeline_body_viewed_invoice_body_message_start') @stack('timeline_body_viewed_invoice_body_message_start')
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('invoices.messages.status.viewed') }}</small>
<small class="pl-1">{{ trans('invoices.messages.status.viewed') }}</small>
</div>
@stack('timeline_body_viewed_invoice_body_message_end') @stack('timeline_body_viewed_invoice_body_message_end')
@else @else
@stack('timeline_body_send_invoice_body_message_start') @stack('timeline_body_send_invoice_body_message_start')
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small>
<small class="pl-1">{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small>
</div>
@stack('timeline_body_send_invoice_body_message_end') @stack('timeline_body_send_invoice_body_message_end')
@endif @endif
@stack('timeline_body_send_invoice_body_end') @stack('timeline_body_send_invoice_body_end')
@ -149,15 +141,11 @@
@stack('timeline_body_get_paid_body_start') @stack('timeline_body_get_paid_body_start')
@stack('timeline_body_get_paid_body_message_start') @stack('timeline_body_get_paid_body_message_start')
@if($invoice->status->code != 'paid' && empty($invoice->transactions->count())) @if($invoice->status->code != 'paid' && empty($invoice->transactions->count()))
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('invoices.messages.status.paid.await') }}</small>
<small class="pl-1">{{ trans('invoices.messages.status.paid.await') }}</small>
</div>
@else @else
<div class="d-flex align-items-center"> <small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small>{{ trans('general.partially_paid') }}</small>
<small class="pl-1">{{ trans('general.partially_paid') }}</small>
</div>
@endif @endif
@stack('timeline_body_get_paid_body_message_end') @stack('timeline_body_get_paid_body_message_end')