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

Hide fee on custom gateway

Browse Source
This commit is contained in:
Hillel Coren 2017-03-24 16:28:31 +03:00
parent d208e54a24
commit 7bb6a7945a
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Ninja/Datatables/AccountGatewayDatatable.php
View File

@ -192,9 +192,6 @@ class AccountGatewayDatatable extends EntityDatatable
$actions[] = [ $actions[] = [
trans('texts.set_limits_fees', ['gateway_type' => $gatewayType->name]), trans('texts.set_limits_fees', ['gateway_type' => $gatewayType->name]),
function () use ($gatewayType) { function () use ($gatewayType) {
//$accountGatewaySettings = $this->getAccountGatewaySetting($gatewayType->id);
//$min = $accountGatewaySettings && $accountGatewaySettings->min_limit !== null ? $accountGatewaySettings->min_limit : 'null';
//$max = $accountGatewaySettings && $accountGatewaySettings->max_limit !== null ? $accountGatewaySettings->max_limit : 'null';
return "javascript:showLimitsModal('{$gatewayType->name}', {$gatewayType->id})"; return "javascript:showLimitsModal('{$gatewayType->name}', {$gatewayType->id})";
}, },
function ($model) use ($gatewayType) { function ($model) use ($gatewayType) {

1
resources/lang/en/texts.php
View File

@ -2436,6 +2436,7 @@ $LANG = array(
'auto_bill_failed' => 'Auto-billing for invoice :invoice_number failed', 'auto_bill_failed' => 'Auto-billing for invoice :invoice_number failed',
'online_payment_discount' => 'Online Payment Discount', 'online_payment_discount' => 'Online Payment Discount',
'created_new_company' => 'Successfully created new company', 'created_new_company' => 'Successfully created new company',
'fees_disabled_for_gateway' => 'Fees are disabled for this gateway.',
); );

19
resources/views/accounts/payments.blade.php
View File

@ -134,7 +134,12 @@
</div> </div>
</div> </div>
<div role="tabpanel" class="tab-pane" id="fees"> <div role="tabpanel" class="tab-pane" id="fees">
<div class="panel-body"> <div id="feesDisabled" class="panel-body" style="display:none">
<div class="help-block">
{{ trans('texts.fees_disabled_for_gateway') }}
</div>
</div>
<div id="feesEnabled" class="panel-body">
{!! Former::text('fee_amount') {!! Former::text('fee_amount')
->label('amount') ->label('amount')
@ -262,13 +267,21 @@
setTaxRate(2, '', ''); setTaxRate(2, '', '');
} }
$('#paymentLimitsModal').modal('show');
updateFeeSample(); updateFeeSample();
@if ($account->gateway_fee_location == FEE_LOCATION_ITEM) @if ($account->gateway_fee_location == FEE_LOCATION_ITEM)
$('#taxDiv').show(); $('#taxDiv').show();
@endif @endif
if (gateway_type_id == {{ GATEWAY_TYPE_CUSTOM }}) {
$('#feesEnabled').hide();
$('#feesDisabled').show();
} else {
$('#feesDisabled').hide();
$('#feesEnabled').show();
}
$('#paymentLimitsModal').modal('show');
} }
var limitsSlider = document.getElementById('payment-limits-slider'); var limitsSlider = document.getElementById('payment-limits-slider');