Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Code Issues Releases Activity

Show online payment settings by default

Browse Source
This commit is contained in:
Hillel Coren 2017-03-26 11:19:00 +03:00
parent 5f9ffee8ea
commit eb8d164b37
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/AccountController.php
View File

@ -482,23 +482,19 @@ class AccountController extends BaseController
} }
} }
if ($trashedCount == 0) { $tokenBillingOptions = [];
return Redirect::to('gateways/create'); for ($i = 1; $i <= 4; $i++) {
} else { $tokenBillingOptions[$i] = trans("texts.token_billing_{$i}");
$tokenBillingOptions = [];
for ($i = 1; $i <= 4; $i++) {
$tokenBillingOptions[$i] = trans("texts.token_billing_{$i}");
}
return View::make('accounts.payments', [
'showAdd' => $count < count(Gateway::$alternate) + 1,
'title' => trans('texts.online_payments'),
'tokenBillingOptions' => $tokenBillingOptions,
'currency' => Utils::getFromCache(Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY), 'currencies'),
'taxRates' => TaxRate::scope()->whereIsInclusive(false)->orderBy('rate')->get(['public_id', 'name', 'rate']),
'account' => $account,
]);
} }
return View::make('accounts.payments', [
'showAdd' => $count < count(Gateway::$alternate) + 1,
'title' => trans('texts.online_payments'),
'tokenBillingOptions' => $tokenBillingOptions,
'currency' => Utils::getFromCache(Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY), 'currencies'),
'taxRates' => TaxRate::scope()->whereIsInclusive(false)->orderBy('rate')->get(['public_id', 'name', 'rate']),
'account' => $account,
]);
} }
/** /**

2
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 payment details with WePay, Stripe or Braintree.', 'token_billing_help' => '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',