Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 13:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better WePay setup UI

Browse Source
This commit is contained in:
Joshua Dwire 2016-05-14 22:32:27 -04:00
parent 1524447cd4
commit 9afd0741f7
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/AccountGatewayController.php
View File

@ -87,6 +87,7 @@ class AccountGatewayController extends BaseController
->where('id', '!=', GATEWAY_GOCARDLESS) ->where('id', '!=', GATEWAY_GOCARDLESS)
->where('id', '!=', GATEWAY_DWOLLA) ->where('id', '!=', GATEWAY_DWOLLA)
->where('id', '!=', GATEWAY_STRIPE) ->where('id', '!=', GATEWAY_STRIPE)
->where('id', '!=', GATEWAY_WEPAY)
->orderBy('name')->get(); ->orderBy('name')->get();
$data['hiddenFields'] = Gateway::$hiddenFields; $data['hiddenFields'] = Gateway::$hiddenFields;
@ -245,8 +246,11 @@ class AccountGatewayController extends BaseController
$accountGateway = AccountGateway::createNew(); $accountGateway = AccountGateway::createNew();
$accountGateway->gateway_id = $gatewayId; $accountGateway->gateway_id = $gatewayId;
if ($gatewayId == GATEWAY_WEPAY && !$this->setupWePay($accountGateway, $wepayResponse)) { if ($gatewayId == GATEWAY_WEPAY) {
return $wepayResponse; if(!$this->setupWePay($accountGateway, $wepayResponse)) {
return $wepayResponse;
}
$oldConfig = $accountGateway->getConfig();
} }
} }
@ -265,7 +269,7 @@ class AccountGatewayController extends BaseController
$config->$field = $value; $config->$field = $value;
} }
} }
} else { } elseif($oldConfig) {
$config = clone $oldConfig; $config = clone $oldConfig;
} }

20
resources/views/accounts/partials/account_gateway_wepay.blade.php
View File

@ -10,6 +10,9 @@
{!! Former::populateField('first_name', $user->first_name) !!} {!! Former::populateField('first_name', $user->first_name) !!}
{!! Former::populateField('last_name', $user->last_name) !!} {!! Former::populateField('last_name', $user->last_name) !!}
{!! Former::populateField('email', $user->email) !!} {!! Former::populateField('email', $user->email) !!}
{!! Former::populateField('show_address', 1) !!}
{!! Former::populateField('update_address', 1) !!}
{!! Former::populateField('token_billing_type_id', $account->token_billing_type_id) !!}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{!! trans('texts.online_payments') !!}</h3> <h3 class="panel-title">{!! trans('texts.online_payments') !!}</h3>
@ -20,6 +23,23 @@
{!! Former::text('email') !!} {!! Former::text('email') !!}
{!! Former::text('company_name')->help('wepay_company_name_help')->maxlength(255) !!} {!! Former::text('company_name')->help('wepay_company_name_help')->maxlength(255) !!}
{!! Former::text('description')->help('wepay_description_help') !!} {!! Former::text('description')->help('wepay_description_help') !!}
{!! Former::select('token_billing_type_id')
->options($tokenBillingOptions)
->help(trans('texts.token_billing_help')) !!}
{!! Former::checkbox('show_address')
->label(trans('texts.billing_address'))
->text(trans('texts.show_address_help'))
->addGroupClass('gateway-option') !!}
{!! Former::checkbox('update_address')
->label(' ')
->text(trans('texts.update_address_help'))
->addGroupClass('gateway-option') !!}
{!! Former::checkboxes('creditCardTypes[]')
->label('Accepted Credit Cards')
->checkboxes($creditCardTypes)
->class('creditcard-types')
->addGroupClass('gateway-option')
!!}
{!! Former::checkbox('tos_agree')->label(' ')->text(trans('texts.wepay_tos_agree', {!! Former::checkbox('tos_agree')->label(' ')->text(trans('texts.wepay_tos_agree',
['link'=>'<a href="https://go.wepay.com/terms-of-service-us" target="_blank">'.trans('texts.wepay_tos_link_text').'</a>'] ['link'=>'<a href="https://go.wepay.com/terms-of-service-us" target="_blank">'.trans('texts.wepay_tos_link_text').'</a>']
))->value('true') !!} ))->value('true') !!}