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

Merge pull request #4666 from beganovich/v5-show-only-credits-in-amount-exceed

Browse Source 
(v5) Show "Apply credits" only
This commit is contained in:
David Bomba 2021-01-12 08:19:28 +11:00 committed by GitHub
commit 3e6f330643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/Client.php
View File

@ -484,7 +484,7 @@ class Client extends BaseModel implements HasLocalePreference
// handle custom gateways as they are not unique'd()--------------------------------------------------------- // handle custom gateways as they are not unique'd()---------------------------------------------------------
// we need to split the query here as we allow multiple custom gateways, so we must show all of them, they query logic // we need to split the query here as we allow multiple custom gateways, so we must show all of them, they query logic
// above only pulls in unique gateway types.. ie.. we only allow 1 credit card gateway, but many custom gateways. // above only pulls in unique gateway types.. ie.. we only allow 1 credit card gateway, but many custom gateways.
if ($company_gateways || $company_gateways == '0') { if ($company_gateways || $company_gateways == '0') {
$transformed_ids = $this->transformKeys(explode(',', $company_gateways)); $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
$gateways = $this->company $gateways = $this->company
@ -525,14 +525,14 @@ class Client extends BaseModel implements HasLocalePreference
$fee_label = $gateway->calcGatewayFeeLabel($amount, $this); $fee_label = $gateway->calcGatewayFeeLabel($amount, $this);
if(!$gateway_type_id){ if(!$gateway_type_id){
$payment_urls[] = [ $payment_urls[] = [
'label' => $gateway->getConfigField('name') . $fee_label, 'label' => $gateway->getConfigField('name') . $fee_label,
'company_gateway_id' => $gateway_id, 'company_gateway_id' => $gateway_id,
'gateway_type_id' => GatewayType::CREDIT_CARD, 'gateway_type_id' => GatewayType::CREDIT_CARD,
]; ];
} }
else else
{ {
$payment_urls[] = [ $payment_urls[] = [
'label' => $gateway->getTypeAlias($gateway_type_id) . $fee_label, 'label' => $gateway->getTypeAlias($gateway_type_id) . $fee_label,
@ -544,6 +544,14 @@ class Client extends BaseModel implements HasLocalePreference
} }
if (($this->getSetting('use_credits_payment') == 'option' || $this->getSetting('use_credits_payment') == 'always') && $this->service()->getCreditBalance() > 0) { if (($this->getSetting('use_credits_payment') == 'option' || $this->getSetting('use_credits_payment') == 'always') && $this->service()->getCreditBalance() > 0) {
// Show credits as only payment option if both statements are true.
if (
$this->service()->getCreditBalance() > $amount
&& $this->getSetting('use_credits_payment') == 'always') {
$payment_urls = [];
}
$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,