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

close #128 Fixed: partial invoice cant mark as paid

Browse Source
This commit is contained in:
cuneytsenturk 2017-12-18 14:44:28 +03:00
parent cb02800bf5
commit d7685a654d
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/Incomes/Invoices.php
View File

@ -588,18 +588,23 @@ class Invoices extends Controller
$amount = $invoice->amount - $paid;
$request = new PaymentRequest();
if (!empty($amount)) {
$request = new PaymentRequest();
$request['company_id'] = $invoice->company_id;
$request['invoice_id'] = $invoice->id;
$request['account_id'] = setting('general.default_account');
$request['payment_method'] = setting('general.default_payment_method', 'offlinepayment.cash.1');
$request['currency_code'] = $invoice->currency_code;
$request['amount'] = $amount;
$request['paid_at'] = Date::now();
$request['_token'] = csrf_token();
$request['company_id'] = $invoice->company_id;
$request['invoice_id'] = $invoice->id;
$request['account_id'] = setting('general.default_account');
$request['payment_method'] = setting('general.default_payment_method', 'offlinepayment.cash.1');
$request['currency_code'] = $invoice->currency_code;
$request['amount'] = $amount;
$request['paid_at'] = Date::now();
$request['_token'] = csrf_token();
$this->payment($request);
$this->payment($request);
} else {
$invoice->invoice_status_code = 'paid';
$invoice->save();
}
return redirect()->back();
}
@ -693,7 +698,9 @@ class Invoices extends Controller
{
$invoice = Invoice::find($payment->invoice_id);
if ($invoice->payments()->count() > 1) {
if ($invoice->payments()->paid() == $invoice->amount) {
$invoice->invoice_status_code = 'paid';
} elseif ($invoice->payments()->count() > 1) {
$invoice->invoice_status_code = 'partial';
} else {
$invoice->invoice_status_code = 'draft';

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

@ -157,7 +157,9 @@
@permission('update-incomes-invoices')
<li><a href="{{ url('incomes/invoices/' . $invoice->id . '/pay') }}">{{ trans('invoices.mark_paid') }}</a></li>
@endpermission
@if(empty($invoice->payments()->count()) || (!empty($invoice->payments()->count()) && $invoice->payments()->paid() != $invoice->amount))
<li><a href="#" id="button-payment">{{ trans('invoices.add_payment') }}</a></li>
@endif
<li class="divider"></li>
@endif
@permission('update-incomes-invoices')