Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 08:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

working on credit payments

Browse Source
This commit is contained in:
David Bomba 2020-10-15 15:07:42 +11:00
parent 901f7c4117
commit 27f678bd8c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Client.php
View File

@ -524,7 +524,7 @@ class Client extends BaseModel implements HasLocalePreference
} }
} }
if($this->company->use_credit_payment = 'optin' && $this->service()->getCreditBalance() > 0) { if($this->company->use_credits_payment == 'option' && $this->service()->getCreditBalance() > 0) {
$payment_urls[] = [ $payment_urls[] = [
'label' => ctrans('texts.apply_credit'), 'label' => ctrans('texts.apply_credit'),
'company_gateway_id' => CompanyGateway::GATEWAY_CREDIT, 'company_gateway_id' => CompanyGateway::GATEWAY_CREDIT,

6
app/Services/Credit/ApplyPayment.php
View File

@ -47,6 +47,7 @@ class ApplyPayment
//$available_credit_balance = $this->credit->balance; //$available_credit_balance = $this->credit->balance;
$applicable_amount = min($this->amount, $this->credit->balance); $applicable_amount = min($this->amount, $this->credit->balance);
$invoice_balance = $this->invoice->balance; $invoice_balance = $this->invoice->balance;
$credit_balance = $this->credit->balance;
/* Check invoice partial for amount to be cleared first */ /* Check invoice partial for amount to be cleared first */
if($this->invoice->partial > 0){ if($this->invoice->partial > 0){
@ -56,7 +57,7 @@ class ApplyPayment
$this->invoice->partial -= $partial_payment; $this->invoice->partial -= $partial_payment;
$invoice_balance -= $partial_payment; $invoice_balance -= $partial_payment;
$this->amount -= $partial_payment; $this->amount -= $partial_payment;
// $this->credit->balance -= $partial_payment; $credit_balance -= $partial_payment;
$applicable_amount -= $partial_payment; $applicable_amount -= $partial_payment;
$this->amount_applied += $partial_payment; $this->amount_applied += $partial_payment;
@ -65,11 +66,10 @@ class ApplyPayment
/* If there is remaining amount use it on the balance */ /* If there is remaining amount use it on the balance */
if($this->amount > 0 && $applicable_amount > 0 && $invoice_balance > 0){ if($this->amount > 0 && $applicable_amount > 0 && $invoice_balance > 0){
$balance_payment = min($invoice_balance, $this->amount); $balance_payment = min($invoice_balance, min($this->amount, $credit_balance));
$invoice_balance -= $balance_payment; $invoice_balance -= $balance_payment;
$this->amount -= $balance_payment; $this->amount -= $balance_payment;
// $this->credit->balance -= $balance_payment;
$this->amount_applied += $balance_payment; $this->amount_applied += $balance_payment;
} }

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

@ -56,7 +56,7 @@ class AutoBillInvoice extends AbstractService
//if the credits cover the payments, we stop here, build the payment with credits and exit early //if the credits cover the payments, we stop here, build the payment with credits and exit early
if($this->invoice->company->use_credits_payment == 'always' || $this->invoice->company->use_credits_payment == 'optin') if($this->invoice->company->use_credits_payment == 'always' || $this->invoice->company->use_credits_payment == 'option')
$this->applyCreditPayment(); $this->applyCreditPayment();
info("partial = {$this->invoice->partial}"); info("partial = {$this->invoice->partial}");

2
database/migrations/2020_10_14_201320_project_ids_to_entities.php
View File

@ -24,7 +24,7 @@ class ProjectIdsToEntities extends Migration
Schema::table('companies', function (Blueprint $table) { Schema::table('companies', function (Blueprint $table) {
$table->boolean('mark_expenses_invoiceable')->default(0); $table->boolean('mark_expenses_invoiceable')->default(0);
$table->boolean('mark_expenses_paid')->default(0); $table->boolean('mark_expenses_paid')->default(0);
$table->enum('use_credits_payment', ['always', 'off', 'optin'])->nullable(); $table->enum('use_credits_payment', ['always', 'off', 'option'])->default('off');
}); });