Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for auto billing when using credits

Browse Source
This commit is contained in:
David Bomba 2022-09-05 18:15:08 +10:00
parent 8d250209e3
commit 9e7f70dacd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Services/Invoice/AutoBillInvoice.php
View File

@ -221,11 +221,11 @@ class AutoBillInvoice extends AbstractService
*/ */
private function applyCreditPayment() private function applyCreditPayment()
{ {
$available_credits = $this->client $available_credits = Credit::where('client_id', $this->client->id)
->credits
->where('is_deleted', false) ->where('is_deleted', false)
->where('balance', '>', 0) ->where('balance', '>', 0)
->sortBy('created_at'); ->orderBy('created_at')
->get();
$available_credit_balance = $available_credits->sum('balance'); $available_credit_balance = $available_credits->sum('balance');
@ -253,6 +253,8 @@ class AutoBillInvoice extends AbstractService
$this->invoice->balance -= $this->invoice->partial; $this->invoice->balance -= $this->invoice->partial;
$this->invoice->paid_to_date += $this->invoice->partial; $this->invoice->paid_to_date += $this->invoice->partial;
$this->invoice->partial = 0; $this->invoice->partial = 0;
$credit->balance -= $this->invoice->partial;
$credit->save();
break; break;
} else { } else {
$this->used_credit[$key]['credit_id'] = $credit->id; $this->used_credit[$key]['credit_id'] = $credit->id;
@ -260,6 +262,8 @@ class AutoBillInvoice extends AbstractService
$this->invoice->partial -= $credit->balance; $this->invoice->partial -= $credit->balance;
$this->invoice->balance -= $credit->balance; $this->invoice->balance -= $credit->balance;
$this->invoice->paid_to_date += $credit->balance; $this->invoice->paid_to_date += $credit->balance;
$credit->balance = 0;
$credit->save();
} }
} else { } else {
@ -269,13 +273,16 @@ class AutoBillInvoice extends AbstractService
$this->used_credit[$key]['amount'] = $this->invoice->balance; $this->used_credit[$key]['amount'] = $this->invoice->balance;
$this->invoice->paid_to_date += $this->invoice->balance; $this->invoice->paid_to_date += $this->invoice->balance;
$this->invoice->balance = 0; $this->invoice->balance = 0;
$credit->balance -= $this->invoice->balance;
$credit->save();
break; break;
} else { } else {
$this->used_credit[$key]['credit_id'] = $credit->id; $this->used_credit[$key]['credit_id'] = $credit->id;
$this->used_credit[$key]['amount'] = $credit->balance; $this->used_credit[$key]['amount'] = $credit->balance;
$this->invoice->balance -= $credit->balance; $this->invoice->balance -= $credit->balance;
$this->invoice->paid_to_date += $credit->balance; $this->invoice->paid_to_date += $credit->balance;
$credit->balance = 0;
$credit->save();
} }
} }
} }