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

Working on gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-16 16:24:50 +02:00
parent 63096aaae1
commit 5920940403
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,7 @@ $LANG = array(
'reset_all' => 'Reset All', 'reset_all' => 'Reset All',
'approve' => 'Approve', 'approve' => 'Approve',
'token_billing_type_id' => 'Token Billing', 'token_billing_type_id' => 'Token Billing',
'token_billing_help' => 'Enables you to store credit cards with your gateway, and charge them at a later date.', 'token_billing_help' => 'Enables you to store payment details with WePay, Stripe or Braintree.',
'token_billing_1' => 'Disabled', 'token_billing_1' => 'Disabled',
'token_billing_2' => 'Opt-in - checkbox is shown but not selected', 'token_billing_2' => 'Opt-in - checkbox is shown but not selected',
'token_billing_3' => 'Opt-out - checkbox is shown and selected', 'token_billing_3' => 'Opt-out - checkbox is shown and selected',
@ -1345,7 +1345,7 @@ $LANG = array(
'on_send_date' => 'On send date', 'on_send_date' => 'On send date',
'on_due_date' => 'On due date', 'on_due_date' => 'On due date',
'auto_bill_ach_date_help' => 'ACH auto bill will always happen on the due date', 'auto_bill_ach_date_help' => 'ACH will always auto bill on the due date.',
'warn_change_auto_bill' => 'Due to NACHA rules, changes to this invoice may prevent ACH auto bill.', 'warn_change_auto_bill' => 'Due to NACHA rules, changes to this invoice may prevent ACH auto bill.',
'bank_account' => 'Bank Account', 'bank_account' => 'Bank Account',
@ -1353,7 +1353,6 @@ $LANG = array(
'wepay_payment_tos_agree' => 'I agree to the WePay :terms and :privacy_policy.', 'wepay_payment_tos_agree' => 'I agree to the WePay :terms and :privacy_policy.',
'privacy_policy' => 'Privacy Policy', 'privacy_policy' => 'Privacy Policy',
'wepay_payment_tos_agree_required' => 'You must agree to the WePay Terms of Service and Privacy Policy.', 'wepay_payment_tos_agree_required' => 'You must agree to the WePay Terms of Service and Privacy Policy.',
'payment_settings_supported_gateways' => 'Note: token billing is supported by WePay, Stripe, and Braintree.',
'ach_email_prompt' => 'Please enter your email address:', 'ach_email_prompt' => 'Please enter your email address:',
'verification_pending' => 'Verification Pending', 'verification_pending' => 'Verification Pending',
@ -2415,6 +2414,8 @@ $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.',
); );
return $LANG; return $LANG;

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

@ -24,17 +24,15 @@
trans('texts.on_send_date') => ['value'=>0, 'name'=>'auto_bill_on_due_date'], trans('texts.on_send_date') => ['value'=>0, 'name'=>'auto_bill_on_due_date'],
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')) !!}
<div class="form-group"> <br/>
<div class="col-sm-offset-4 col-sm-8"><p>{!! trans('texts.payment_settings_supported_gateways') !!}</p></div>
</div>
{!! Former::select('gateway_fee_location') {!! Former::select('gateway_fee_location')
->addOption(trans('texts.disabled'), '') ->addOption(trans('texts.disabled'), '')
->addOption(trans('texts.first_surcharge') . ($account->custom_invoice_label1 ? ' | ' . $account->custom_invoice_label1 : ''), FEE_LOCATION_CHARGE1) ->addOption(trans('texts.first_surcharge') . ($account->custom_invoice_label1 ? ' | ' . $account->custom_invoice_label1 : ''), FEE_LOCATION_CHARGE1)
->addOption(trans('texts.second_surcharge') . ($account->custom_invoice_label2 ? ' | ' . $account->custom_invoice_label2 : '' ), FEE_LOCATION_CHARGE2) ->addOption(trans('texts.second_surcharge') . ($account->custom_invoice_label2 ? ' | ' . $account->custom_invoice_label2 : '' ), FEE_LOCATION_CHARGE2)
//->addOption(trans('texts.line_item'), FEE_LOCATION_ITEM) //->addOption(trans('texts.line_item'), FEE_LOCATION_ITEM)
->help('gateway_fees_help')
->label('gateway_fees')!!} ->label('gateway_fees')!!}
<br/>
{!! Former::actions( Button::success(trans('texts.save'))->submit()->appendIcon(Icon::create('floppy-disk')) ) !!} {!! Former::actions( Button::success(trans('texts.save'))->submit()->appendIcon(Icon::create('floppy-disk')) ) !!}
</div> </div>
</div> </div>
@ -366,11 +364,7 @@
onTaxRateChange(instance); onTaxRateChange(instance);
} }
/*
$(function() {
javascript:showLimitsModal('Credit Card', 1);
})
*/
</script> </script>
@stop @stop