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

Only support line item gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-24 16:21:35 +03:00
parent 91563b6346
commit d208e54a24
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2416,9 +2416,9 @@ $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/>Surcharges aren\'t affected by discounts, line items support partial payments.', 'gateway_fees_help' => 'Automatically add an online payment surcharge.',
'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 updated manually.',
'fees_surcharge_help' => 'Customize surcharge :link.', 'fees_surcharge_help' => 'Customize surcharge :link.',
'label_and_taxes' => 'label and taxes', 'label_and_taxes' => 'label and taxes',
'billable' => 'Billable', 'billable' => 'Billable',

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

@ -25,14 +25,22 @@
trans('texts.on_due_date') => ['value'=>1, 'name'=>'auto_bill_on_due_date'], trans('texts.on_due_date') => ['value'=>1, 'name'=>'auto_bill_on_due_date'],
])->help(trans('texts.auto_bill_ach_date_help')) !!} ])->help(trans('texts.auto_bill_ach_date_help')) !!}
<br/> <br/>
{!! Former::select('gateway_fee_location')
{!! Former::checkbox('gateway_fee_location')
->onchange('onGatewayFeeChange()')
->help('gateway_fees_help')
->label('gateway_fees')
->text('enable')
->value(FEE_LOCATION_ITEM) !!}
{{-- Former::select('gateway_fee_location')
->addOption(trans('texts.disabled'), '') ->addOption(trans('texts.disabled'), '')
->addOption(trans('texts.location_first_surcharge') . ($account->custom_invoice_label1 ? ' | ' . $account->custom_invoice_label1 : ''), FEE_LOCATION_CHARGE1) ->addOption(trans('texts.location_first_surcharge') . ($account->custom_invoice_label1 ? ' | ' . $account->custom_invoice_label1 : ''), FEE_LOCATION_CHARGE1)
->addOption(trans('texts.location_second_surcharge') . ($account->custom_invoice_label2 ? ' | ' . $account->custom_invoice_label2 : '' ), FEE_LOCATION_CHARGE2) ->addOption(trans('texts.location_second_surcharge') . ($account->custom_invoice_label2 ? ' | ' . $account->custom_invoice_label2 : '' ), FEE_LOCATION_CHARGE2)
->addOption(trans('texts.location_line_item'), FEE_LOCATION_ITEM) ->addOption(trans('texts.location_line_item'), FEE_LOCATION_ITEM)
->onchange('onGatewayFeeChange()') ->onchange('onGatewayFeeChange()')
->help('gateway_fees_help') ->help('gateway_fees_help')
->label('gateway_fees')!!} ->label('gateway_fees') --}}
<br/> <br/>
{!! Former::actions( Button::success(trans('texts.save'))->withAttributes(['id' => 'formSave'])->submit()->appendIcon(Icon::create('floppy-disk')) ) !!} {!! Former::actions( Button::success(trans('texts.save'))->withAttributes(['id' => 'formSave'])->submit()->appendIcon(Icon::create('floppy-disk')) ) !!}
</div> </div>
@ -383,10 +391,9 @@
} }
window.hasShownGatewayFeeWarning = true; window.hasShownGatewayFeeWarning = true;
var settingLocation = $('#gateway_fee_location').val(); var accountEnabled = '{{ $account->gateway_fee_location ? 'true' : 'false' }}';
var accountLocation = '{{ $account->gateway_fee_location }}'; var formEnabled = $('#gateway_fee_location').is(':checked');
if (accountEnabled && ! formEnabled) {
if (accountLocation && settingLocation && accountLocation != settingLocation) {
swal("{!! trans('texts.warning') !!}", "{!! trans('texts.gateway_fee_change_warning') !!}"); swal("{!! trans('texts.warning') !!}", "{!! trans('texts.gateway_fee_change_warning') !!}");
} }
} }