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

Merge pull request #4854 from beganovich/v5-0902-under-payments

Browse Source 
(v5) Update rules for underpayments
This commit is contained in:
David Bomba 2021-02-09 23:06:28 +11:00 committed by GitHub
commit a1369d3c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/ClientPortal/PaymentController.php
View File

@ -137,32 +137,36 @@ class PaymentController extends Controller
$payable_invoice['amount'] = Number::roundValue(($invoice->partial > 0 ? $invoice->partial : $invoice->balance), auth()->user()->client->currency()->precision); $payable_invoice['amount'] = Number::roundValue(($invoice->partial > 0 ? $invoice->partial : $invoice->balance), auth()->user()->client->currency()->precision);
} }
/* If we DO allow under payments check the minimum amount is present else return */ if (!$settings->client_portal_allow_under_payment && $payable_amount < $invoice_balance) {
return redirect()
->route('client.invoices.index')
->with('message', ctrans('texts.minimum_required_payment', ['amount' => $invoice_balance]));
}
if ($settings->client_portal_allow_under_payment) { if ($settings->client_portal_allow_under_payment) {
if ($payable_invoice['amount'] < $settings->client_portal_under_payment_minimum) { if ($invoice_balance < $settings->client_portal_under_payment_minimum && $payable_amount < $invoice_balance) {
return redirect()
->route('client.invoices.index')
->with('message', ctrans('texts.minimum_required_payment', ['amount' => $invoice_balance]));
}
if ($invoice_balance < $settings->client_portal_under_payment_minimum) {
// Skip the under payment rule.
}
if ($invoice_balance >= $settings->client_portal_under_payment_minimum && $payable_amount < $settings->client_portal_under_payment_minimum) {
return redirect() return redirect()
->route('client.invoices.index') ->route('client.invoices.index')
->with('message', ctrans('texts.minimum_required_payment', ['amount' => $settings->client_portal_under_payment_minimum])); ->with('message', ctrans('texts.minimum_required_payment', ['amount' => $settings->client_portal_under_payment_minimum]));
} }
} else {
/*Double check!!*/
if ($payable_amount < $invoice_balance) {
return redirect()
->route('client.invoices.index')
->with('message', ctrans('texts.under_payments_disabled'));
}
} }
/* If we don't allow over payments and the amount exceeds the balance */ /* If we don't allow over payments and the amount exceeds the balance */
if (!$settings->client_portal_allow_over_payment) { if (!$settings->client_portal_allow_over_payment && $payable_amount > $invoice_balance) {
if ($payable_amount > $invoice_balance) { return redirect()
return redirect() ->route('client.invoices.index')
->route('client.invoices.index') ->with('message', ctrans('texts.over_payments_disabled'));
->with('message', ctrans('texts.over_payments_disabled'));
}
} }
} }