tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:hillelcoren/invoice-ninja

Browse source
This commit is contained in:
Hillel Coren 2014-06-30 14:42:46 +03:00
commit f1d2444cc9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/AccountController.php
View file

@ -107,11 +107,13 @@ class AccountController extends \BaseController {
$accountGateway = null;
$config = null;
$configFields = null;
$selectedCards = 0;
if (count($account->account_gateways) > 0)
{
$accountGateway = $account->account_gateways[0];
$config = $accountGateway->config;
$selectedCards = $accountGateway->accepted_credit_cards;
$configFields = json_decode($config);
@ -142,7 +144,10 @@ class AccountController extends \BaseController {
$creditCards = [];
foreach($creditCardsArray as $card => $name)
{
$creditCards[$name['text']] = ['value' => $card, 'data-imageUrl' => asset($name['card'])];
if($selectedCards > 0 && ($selectedCards & $card) == $card)
$creditCards[$name['text']] = ['value' => $card, 'data-imageUrl' => asset($name['card']), 'checked' => 'checked'];
else
$creditCards[$name['text']] = ['value' => $card, 'data-imageUrl' => asset($name['card'])];
}
$otherItem = array(