Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Working on gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-16 23:12:56 +02:00
parent 4e7050206d
commit 85635c8a27
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Models/Traits/ChargesFees.php
View File

@ -11,10 +11,11 @@ use App\Models\AccountGatewaySettings;
*/
trait ChargesFees
{
public function calcGatewayFee($gatewayTypeId = false, $includeTax = true)
public function calcGatewayFee($gatewayTypeId = false, $includeTax = false)
{
$account = $this->account;
$settings = $account->getGatewaySettings($gatewayTypeId);
$taxField = $account->gateway_fee_location == FEE_LOCATION_CHARGE1 ? 'custom_taxes1' : 'custom_taxes1';
$fee = 0;
if (! $settings) {
@ -28,7 +29,6 @@ trait ChargesFees
if ($settings->fee_percent) {
// prevent charging taxes twice on the surcharge
$amount = $this->amount;
$taxField = $account->gateway_fee_location == FEE_LOCATION_CHARGE1 ? 'custom_taxes1' : 'custom_taxes1';
if ($this->$taxField) {
$taxAmount = 0;
foreach ($this->getTaxes() as $key => $tax) {
@ -40,6 +40,18 @@ trait ChargesFees
$fee += $amount * $settings->fee_percent / 100;
}
// calculate final amount with tax
if ($includeTax && $this->$taxField) {
$preTaxFee = $fee;
if (floatval($this->tax_rate1)) {
$fee += round($preTaxFee * $this->tax_rate1 / 100, 2);
}
if (floatval($this->tax_rate2)) {
$fee += round($preTaxFee * $this->tax_rate2 / 100, 2);
}
}
/*
if ($account->gateway_fee_location == FEE_LOCATION_ITEM && $includeTax) {
$preTaxFee = $fee;
@ -51,6 +63,7 @@ trait ChargesFees
$fee += $preTaxFee * $settings->fee_tax_rate2 / 100;
}
}
*/
return round($fee, 2);
}

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

@ -268,7 +268,7 @@ class InvoicePresenter extends EntityPresenter
return '';
}
$fee = $invoice->calcGatewayFee($gatewayTypeId);
$fee = $invoice->calcGatewayFee($gatewayTypeId, true);
$fee = $account->formatMoney($fee, $invoice->client);
if (floatval($settings->fee_amount) < 0 || floatval($settings->fee_percent) < 0) {