Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-12 14:12:44 +01:00
Code Issues Releases Activity

Working on gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-16 22:10:13 +02:00
parent 5122a2114c
commit 87507c06f4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2415,7 +2415,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.', 'gateway_fees_help' => 'Automatically add an online payment surcharge [partial payments are not supported].',
); );

4
resources/views/accounts/payments.blade.php
View File

@ -168,7 +168,7 @@
<br/><div id="feeSample" class="help-block"></div> <br/><div id="feeSample" class="help-block"></div>
@if (!$account->invoice_item_taxes && $account->invoice_taxes && count($taxRates)) @if (false && !$account->invoice_item_taxes && $account->invoice_taxes && count($taxRates))
<br/><div class="help-block">{{ trans('texts.fees_tax_help') }}</div> <br/><div class="help-block">{{ trans('texts.fees_tax_help') }}</div>
@endif @endif
@ -325,7 +325,7 @@
total += subtotal * taxRate2 / 100; total += subtotal * taxRate2 / 100;
} }
if (total > 0) { if (total >= 0) {
var str = "{{ trans('texts.fees_sample') }}"; var str = "{{ trans('texts.fees_sample') }}";
} else { } else {
var str = "{{ trans('texts.discount_sample') }}"; var str = "{{ trans('texts.discount_sample') }}";