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

Fixed problem creating a new payment gateway

Browse Source
This commit is contained in:
Hillel Coren 2016-04-08 10:38:11 +03:00
parent 6f097c34c2
commit fdde60577c
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ExpenseController.php
View File

@ -146,12 +146,6 @@ class ExpenseController extends BaseController
$data = array_merge($data, self::getViewModel()); $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); return View::make('expenses.edit', $data);
} }

4
resources/views/accounts/account_gateway.blade.php
View File

@ -6,7 +6,7 @@
@include('accounts.nav', ['selected' => ACCOUNT_PAYMENTS]) @include('accounts.nav', ['selected' => ACCOUNT_PAYMENTS])
{!! Former::open($url)->method($method)->rule()->addClass('warn-on-exit') !!} {!! Former::open($url)->method($method)->rule()->addClass('warn-on-exit') !!}
{!! Former::populate($account) !!} {!! Former::populateField('token_billing_type_id', $account->token_billing_type_id) !!}
<div class="panel panel-default"> <div class="panel panel-default">
@ -63,7 +63,7 @@
@foreach ($gateway->fields as $field => $details) @foreach ($gateway->fields as $field => $details)
@if ($details && !$accountGateway) @if ($details && !$accountGateway && !is_array($details))
{!! Former::populateField($gateway->id.'_'.$field, $details) !!} {!! Former::populateField($gateway->id.'_'.$field, $details) !!}
@endif @endif