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

mark bill as paid

Browse Source
This commit is contained in:
denisdulici
2020-03-16 01:09:50 +03:00
parent 5625e837dd
commit 8427f0bd3e
4 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en-GB/bills.php
View File

@@ -28,6 +28,7 @@ return [
'histories' => 'Histories',
'payments' => 'Payments',
'add_payment' => 'Add Payment',
'mark_paid' => 'Mark Paid',
'mark_received' => 'Mark Received',
'download_pdf' => 'Download PDF',
'send_mail' => 'Send Email',
@@ -46,6 +47,7 @@ return [
'messages' => [
'received' => 'Bill marked as received successfully!',
'marked_paid' => 'Bill marked as paid!',
'draft' => 'This is a <b>DRAFT</b> bill and will be reflected to charts after it gets received.',
'status' => [

27
resources/views/purchases/bills/show.blade.php
View File

@@ -139,6 +139,12 @@
@stack('timeline_body_make_payment_body_message_end')
<div class="mt-3">
@stack('timeline_body_get_paid_body_button_pay_start')
@permission('update-purchases-bills')
<a href="{{ route('bills.paid', $bill->id) }}" class="btn btn-white btn-sm header-button-top">{{ trans('bills.mark_paid') }}</a>
@endpermission
@stack('timeline_body_get_paid_body_button_pay_end')
@stack('timeline_body_make_payment_body_button_payment_start')
@if(empty($bill->transactions->count()) || (!empty($bill->transactions->count()) && $bill->paid != $bill->amount))
<button @click="onPayment" id="button-payment" class="btn btn-success btn-sm header-button-bottom">{{ trans('bills.add_payment') }}</button>
@@ -456,20 +462,27 @@
<div class="dropdown-menu" role="menu">
@stack('button_pay_start')
@if($bill->status != 'paid')
@permission('update-purchases-bills')
<a class="dropdown-item" href="{{ route('bills.paid', $bill->id) }}">{{ trans('bills.mark_paid') }}</a>
@endpermission
@if(empty($bill->paid) || ($bill->paid != $bill->amount))
<button class="dropdown-item" id="button-payment" @click="onPayment">{{ trans('bills.add_payment') }}</button>
@endif
@permission('update-purchases-bills')
@if($bill->status == 'draft')
<a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a>
@else
<button type="button" class="dropdown-item" disabled="disabled">{{ trans('bills.mark_received') }}</button>
@endif
@endpermission
<div class="dropdown-divider"></div>
@endif
@stack('button_pay_end')
@stack('button_received_start')
@permission('update-purchases-bills')
@if($bill->status == 'draft')
<a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a>
@else
<button type="button" class="dropdown-item" disabled="disabled">{{ trans('bills.mark_received') }}</button>
@endif
@endpermission
@stack('button_received_end')
@stack('button_pdf_start')
<a class="dropdown-item" href="{{ route('bills.pdf', $bill->id) }}">{{ trans('bills.download_pdf') }}</a>
@stack('button_pdf_end')