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

Tweak texts

Browse Source
This commit is contained in:
Hillel Coren 2017-03-19 17:17:29 +02:00
parent 81671152e5
commit 1fb06295d4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -1026,7 +1026,7 @@ class InvoiceRepository extends BaseRepository
} }
// once an invoice with fee surcharge has been paid don't clear it // once an invoice with fee surcharge has been paid don't clear it
if (($location == FEE_LOCATION_CHARGE1 || $location == FEE_LOCATION_CHARGE2) && $invoice->amount != $invoice->balance) { if ($account->hasGatewayFeeSurcharge() && $invoice->amount != $invoice->balance) {
return false; return false;
} }

2
resources/lang/en/texts.php
View File

@ -2416,7 +2416,7 @@ $LANG = array(
'online_payment_surcharge' => 'Online Payment Surcharge', 'online_payment_surcharge' => 'Online Payment Surcharge',
'gateway_fees' => 'Gateway Fees', 'gateway_fees' => 'Gateway Fees',
'fees_disabled' => 'Fees are disabled', 'fees_disabled' => 'Fees are disabled',
'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Use \'Line item\' to support partial/deposit payments.', 'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Surcharges aren\'t affected by discounts, line item supports partial payments.',
'gateway' => 'Gateway', 'gateway' => 'Gateway',
'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.', 'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.',
'fees_surcharge_help' => 'Customize surcharge :link.', 'fees_surcharge_help' => 'Customize surcharge :link.',