Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Hide partial field if using surcharge gateway fee

Browse Source
This commit is contained in:
Hillel Coren 2017-03-19 17:03:46 +02:00
parent ebc5fe0c3c
commit 81671152e5
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/AccountController.php
View File

@ -1190,13 +1190,6 @@ class AccountController extends BaseController
$account->auto_bill_on_due_date = boolval(Input::get('auto_bill_on_due_date')); $account->auto_bill_on_due_date = boolval(Input::get('auto_bill_on_due_date'));
$account->gateway_fee_location = Input::get('gateway_fee_location') ?: null; $account->gateway_fee_location = Input::get('gateway_fee_location') ?: null;
/*
if ($account->gateway_fee_location) {
$taxField = $account->gateway_fee_location == FEE_LOCATION_CHARGE1 ? 'custom_invoice_taxes1' : 'custom_invoice_taxes1';
$account->$taxField = false;
}
*/
$account->save(); $account->save();
event(new UserSettingsChanged()); event(new UserSettingsChanged());

5
app/Models/Account.php
View File

@ -396,6 +396,11 @@ class Account extends Eloquent
return $this->invoice_number_prefix != $this->quote_number_prefix; return $this->invoice_number_prefix != $this->quote_number_prefix;
} }
public function hasGatewayFeeSurcharge()
{
return $this->gateway_fee_location == FEE_LOCATION_CHARGE1 || $this->gateway_fee_location == FEE_LOCATION_CHARGE2;
}
/** /**
* @return mixed * @return mixed
*/ */

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

@ -2416,9 +2416,9 @@ $LANG = array(
'online_payment_surcharge' => 'Online Payment Surcharge', 'online_payment_surcharge' => 'Online Payment Surcharge',
'gateway_fees' => 'Gateway Fees', 'gateway_fees' => 'Gateway Fees',
'fees_disabled' => 'Fees are disabled', 'fees_disabled' => 'Fees are disabled',
'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Use \'Line item\' to support partial payments.', 'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Use \'Line item\' to support partial/deposit payments.',
'gateway' => 'Gateway', 'gateway' => 'Gateway',
'gateway_fee_change_warning' => 'If there are unpaid invoices with fees applied they need to be removed to prevent duplicate fees.', 'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.',
'fees_surcharge_help' => 'Customize surcharge :link.', 'fees_surcharge_help' => 'Customize surcharge :link.',
'label_and_taxes' => 'label and taxes' 'label_and_taxes' => 'label and taxes'

16
resources/views/accounts/invoice_settings.blade.php
View File

@ -238,20 +238,18 @@
->label(trans('texts.field_label')) ->label(trans('texts.field_label'))
->placeholder($account->gateway_fee_location == FEE_LOCATION_CHARGE1 ? trans('texts.surcharge') : ' ') ->placeholder($account->gateway_fee_location == FEE_LOCATION_CHARGE1 ? trans('texts.surcharge') : ' ')
->addGroupClass('pad-checkbox') ->addGroupClass('pad-checkbox')
->append($account->gateway_fee_location == FEE_LOCATION_CHARGE1 && false ? false : ->append(Former::checkbox('custom_invoice_taxes1')
Former::checkbox('custom_invoice_taxes1') ->value(1)
->value(1) ->raw() . trans('texts.charge_taxes')) !!}
->raw() . trans('texts.charge_taxes')) !!}
{!! Former::text('custom_invoice_label2') {!! Former::text('custom_invoice_label2')
->label(trans('texts.field_label')) ->label(trans('texts.field_label'))
->placeholder($account->gateway_fee_location == FEE_LOCATION_CHARGE2 ? trans('texts.surcharge') : ' ') ->placeholder($account->gateway_fee_location == FEE_LOCATION_CHARGE2 ? trans('texts.surcharge') : ' ')
->addGroupClass('pad-checkbox') ->addGroupClass('pad-checkbox')
->append($account->gateway_fee_location == FEE_LOCATION_CHARGE2 && false ? false : ->append(Former::checkbox('custom_invoice_taxes2')
Former::checkbox('custom_invoice_taxes2') ->value(1)
->value(1) ->raw() . trans('texts.charge_taxes'))
->raw() . trans('texts.charge_taxes')) ->help(trans('texts.custom_invoice_charges_helps')) !!}
->help(trans('texts.custom_invoice_charges_helps')) !!}
</div> </div>
</div> </div>

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

@ -172,7 +172,7 @@
@if ($account->gateway_fee_location == FEE_LOCATION_ITEM && !$account->invoice_item_taxes && $account->invoice_taxes && count($taxRates)) @if ($account->gateway_fee_location == FEE_LOCATION_ITEM && !$account->invoice_item_taxes && $account->invoice_taxes && count($taxRates))
<br/>{{ trans('texts.fees_tax_help') }} <br/>{{ trans('texts.fees_tax_help') }}
@endif @endif
@if ($account->gateway_fee_location == FEE_LOCATION_CHARGE1 || $account->gateway_fee_location == 2) @if ($account->hasGatewayFeeSurcharge())
<br/>{!! trans('texts.fees_surcharge_help', ['link' => link_to('/settings/invoice_settings#invoice_surcharges', trans('texts.label_and_taxes'), ['target' => '_blank'])]) !!} <br/>{!! trans('texts.fees_surcharge_help', ['link' => link_to('/settings/invoice_settings#invoice_surcharges', trans('texts.label_and_taxes'), ['target' => '_blank'])]) !!}
@endif @endif
</div> </div>

6
resources/views/invoices/edit.blade.php
View File

@ -158,8 +158,10 @@
->placeholder($invoice->exists || $invoice->isQuote() ? ' ' : $account->present()->dueDatePlaceholder()) ->placeholder($invoice->exists || $invoice->isQuote() ? ' ' : $account->present()->dueDatePlaceholder())
->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('due_date') !!} ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('due_date') !!}
{!! Former::text('partial')->data_bind("value: partial, valueUpdate: 'afterkeydown'")->onkeyup('onPartialChange()') @if (! $account->hasGatewayFeeSurcharge())
->addGroupClass('partial')!!} {!! Former::text('partial')->data_bind("value: partial, valueUpdate: 'afterkeydown'")->onkeyup('onPartialChange()')
->addGroupClass('partial')!!}
@endif
</div> </div>
@if ($entityType == ENTITY_INVOICE) @if ($entityType == ENTITY_INVOICE)
<div data-bind="visible: is_recurring" style="display: none"> <div data-bind="visible: is_recurring" style="display: none">