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

Improve gateway fee label

Browse Source
This commit is contained in:
Hillel Coren 2018-06-10 13:11:38 +03:00
parent 22d3c69bf3
commit 1001aee5df
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Ninja/Presenters/InvoicePresenter.php
View File

@ -319,19 +319,19 @@ class InvoicePresenter extends EntityPresenter
} }
if ($invoice->getGatewayFeeItem()) { if ($invoice->getGatewayFeeItem()) {
return ''; $label = ' + ' . trans('texts.fee');
}
$fee = $invoice->calcGatewayFee($gatewayTypeId, true);
$fee = $account->formatMoney($fee, $invoice->client);
if (floatval($settings->fee_amount) < 0 || floatval($settings->fee_percent) < 0) {
$label = trans('texts.discount');
} else { } else {
$label = trans('texts.fee'); $fee = $invoice->calcGatewayFee($gatewayTypeId, true);
} $fee = $account->formatMoney($fee, $invoice->client);
$label = ' - ' . $fee . ' ' . $label; if (floatval($settings->fee_amount) < 0 || floatval($settings->fee_percent) < 0) {
$label = trans('texts.discount');
} else {
$label = trans('texts.fee');
}
$label = ' - ' . $fee . ' ' . $label;
}
$label .= '&nbsp;&nbsp; <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="' . trans('texts.fee_help') . '"></i>'; $label .= '&nbsp;&nbsp; <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="' . trans('texts.fee_help') . '"></i>';