mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-24 02:14:21 -04:00
Fixes for save payment methods dialogue
This commit is contained in:
parent
364978d282
commit
8c589ec0c4
@ -385,7 +385,7 @@ class CompanyGatewayController extends BaseController
|
||||
|
||||
$company_gateway->save();
|
||||
|
||||
ApplePayDomain::dispatch($company_gateway, $company_gateway->company->db);
|
||||
// ApplePayDomain::dispatch($company_gateway, $company_gateway->company->db);
|
||||
|
||||
return $this->itemResponse($company_gateway);
|
||||
}
|
||||
|
@ -61,6 +61,9 @@ class UpdateCompanyGatewayRequest extends Request
|
||||
$input['fees_and_limits'] = $this->cleanFeesAndLimits($input['fees_and_limits']);
|
||||
}
|
||||
|
||||
if (isset($input['token_billing']) && $input['token_billing'] == 'disabled')
|
||||
$input['token_billing'] = 'off';
|
||||
|
||||
$this->replace($input);
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,22 @@
|
||||
@php
|
||||
$token_billing = $gateway instanceof \App\Models\CompanyGateway
|
||||
? $gateway->token_billing !== 'always'
|
||||
: $gateway->company_gateway->token_billing !== 'always';
|
||||
// $token_billing = $gateway instanceof \App\Models\CompanyGateway
|
||||
// ? $gateway->token_billing !== 'always'
|
||||
// : $gateway->company_gateway->token_billing !== 'always';
|
||||
|
||||
$gateway_instance = $gateway instanceof \App\Models\CompanyGateway ? $gateway : $gateway->company_gateway;
|
||||
$token_billing = true;
|
||||
$checked_on = '';
|
||||
$checked_off = 'checked';
|
||||
|
||||
if($gateway_instance->token_billing == 'off' || $gateway_instance->token_billing == 'always'){
|
||||
$token_billing = false;
|
||||
}
|
||||
|
||||
if($gateway_instance->token_billing == 'optout' || $gateway_instance->token_billing == 'always'){
|
||||
$checked_on = 'checked';
|
||||
$checked_off = '';
|
||||
}
|
||||
|
||||
@endphp
|
||||
|
||||
@if($token_billing)
|
||||
@ -13,13 +28,13 @@
|
||||
<label class="mr-4">
|
||||
<input type="radio" class="form-radio cursor-pointer" name="token-billing-checkbox"
|
||||
id="proxy_is_default"
|
||||
value="true"/>
|
||||
value="true" {{ $checked_on }}/>
|
||||
<span class="ml-1 cursor-pointer">{{ ctrans('texts.yes') }}</span>
|
||||
</label>
|
||||
<label>
|
||||
<input type="radio" class="form-radio cursor-pointer" name="token-billing-checkbox"
|
||||
id="proxy_is_default"
|
||||
value="false" checked />
|
||||
value="false" {{ $checked_off }} />
|
||||
<span class="ml-1 cursor-pointer">{{ ctrans('texts.no') }}</span>
|
||||
</label>
|
||||
</dd>
|
||||
|
Loading…
x
Reference in New Issue
Block a user