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

Refactor for payment processing

Browse Source
This commit is contained in:
David Bomba 2024-02-17 19:03:20 +11:00
parent 32b82f5bfe
commit 66fd68cf93
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,8 @@ use App\Models\Invoice;
use App\Models\Payment; use App\Models\Payment;
use App\Models\PaymentHash; use App\Models\PaymentHash;
use App\Models\PaymentType; use App\Models\PaymentType;
use App\Repositories\CreditRepository;
use App\Repositories\PaymentRepository;
use App\Services\AbstractService; use App\Services\AbstractService;
use App\Utils\Ninja; use App\Utils\Ninja;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -32,8 +34,6 @@ class AutoBillInvoice extends AbstractService
private array $used_credit = []; private array $used_credit = [];
private array $used_unapplied = [];
/*Specific variable for partial payments */ /*Specific variable for partial payments */
private bool $is_partial_amount = false; private bool $is_partial_amount = false;
@ -168,11 +168,6 @@ class AutoBillInvoice extends AbstractService
} }
} }
private function finalizePaymentUsingUnapplied()
{
}
/** /**
* If the credits on file cover the invoice amount * If the credits on file cover the invoice amount
* the we create a matching payment using credits only * the we create a matching payment using credits only
@ -228,8 +223,6 @@ class AutoBillInvoice extends AbstractService
->client ->client
->service() ->service()
->updateBalanceAndPaidToDate($amount * -1, $amount) ->updateBalanceAndPaidToDate($amount * -1, $amount)
// ->updateBalance($amount * -1)
// ->updatePaidToDate($amount)
->adjustCreditBalance($amount * -1) ->adjustCreditBalance($amount * -1)
->save(); ->save();
@ -286,45 +279,40 @@ class AutoBillInvoice extends AbstractService
$this->is_partial_amount = true; $this->is_partial_amount = true;
} }
$this->used_unapplied = [];
$payment_repo = new PaymentRepository(new CreditRepository());
foreach ($unapplied_payments as $key => $payment) { foreach ($unapplied_payments as $key => $payment) {
$payment_balance = $payment->amount - $payment->applied; $payment_balance = $payment->amount - $payment->applied;
if ($this->is_partial_amount) { if ($this->is_partial_amount) {
//more than needed //more than needed
if ($payment_balance > $this->invoice->partial) { if ($payment_balance > $this->invoice->partial) {
$this->used_unapplied[$key]['payment_id'] = $payment->id; $payload = ['invoices' => [['invoice_id' => $this->invoice->id,'amount' => $this->invoice->partial]]];
$this->used_unapplied[$key]['amount'] = $this->invoice->partial; $payment_repo->save($payload, $payment);
$this->invoice->balance -= $this->invoice->partial;
$this->invoice->paid_to_date += $this->invoice->partial;
$this->invoice->partial = 0;
break; break;
} else { } else {
$this->used_unapplied[$key]['payment_id'] = $payment->id; $payload = ['invoices' => [['invoice_id' => $this->invoice->id,'amount' => $payment_balance]]];
$this->used_unapplied[$key]['amount'] = $payment_balance; $payment_repo->save($payload, $payment);
$this->invoice->partial -= $payment_balance;
$this->invoice->balance -= $payment_balance;
$this->invoice->paid_to_date += $payment_balance;
} }
} else { } else {
//more than needed //more than needed
if ($payment_balance > $this->invoice->balance) { if ($payment_balance > $this->invoice->balance) {
$this->used_unapplied[$key]['payment_id'] = $payment->id;
$this->used_unapplied[$key]['amount'] = $this->invoice->balance; $payload = ['invoices' => [['invoice_id' => $this->invoice->id,'amount' => $this->invoice->balance]]];
$this->invoice->paid_to_date += $this->invoice->balance; $payment_repo->save($payload, $payment);
$this->invoice->balance = 0;
break; break;
} else { } else {
$this->used_unapplied[$key]['payment_id'] = $payment->id;
$this->used_unapplied[$key]['amount'] = $payment_balance; $payload = ['invoices' => [['invoice_id' => $this->invoice->id,'amount' => $payment_balance]]];
$this->invoice->balance -= $payment_balance; $payment_repo->save($payload, $payment);
$this->invoice->paid_to_date += $payment_balance;
} }
} }
}
$this->finalizePaymentUsingUnapplied(); $this->invoice = $this->invoice->fresh();
}
return $this; return $this;
} }