From fdde60577cdc8e49d1643b50533721470e18803b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 8 Apr 2016 10:38:11 +0300 Subject: [PATCH] Fixed problem creating a new payment gateway --- app/Http/Controllers/ExpenseController.php | 6 ------ resources/views/accounts/account_gateway.blade.php | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index b4e083a3ad43..b8e82cddda48 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -146,12 +146,6 @@ class ExpenseController extends BaseController $data = array_merge($data, self::getViewModel()); - if (Auth::user()->account->isNinjaAccount()) { - if ($account = Account::whereId($client->public_id)->first()) { - $data['proPlanPaid'] = $account['pro_plan_paid']; - } - } - return View::make('expenses.edit', $data); } diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php index c19268c258fd..db7200907263 100644 --- a/resources/views/accounts/account_gateway.blade.php +++ b/resources/views/accounts/account_gateway.blade.php @@ -6,7 +6,7 @@ @include('accounts.nav', ['selected' => ACCOUNT_PAYMENTS]) {!! Former::open($url)->method($method)->rule()->addClass('warn-on-exit') !!} - {!! Former::populate($account) !!} + {!! Former::populateField('token_billing_type_id', $account->token_billing_type_id) !!}
@@ -63,7 +63,7 @@ @foreach ($gateway->fields as $field => $details) - @if ($details && !$accountGateway) + @if ($details && !$accountGateway && !is_array($details)) {!! Former::populateField($gateway->id.'_'.$field, $details) !!} @endif