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

Working on gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-17 15:16:30 +02:00
parent 0791e6fbc5
commit 3883c3d4f6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,15 +28,14 @@ trait ChargesFees
} }
if ($settings->fee_percent) { if ($settings->fee_percent) {
$amount = $this->partial > 0 ? $this->partial : $this->balance;
// prevent charging taxes twice on the surcharge // prevent charging taxes twice on the surcharge
if ($location == FEE_LOCATION_ITEM) { if ($location != FEE_LOCATION_ITEM) {
$amount = $this->partial > 0 ? $this->partial : $this->balance;
} else {
$amount = $this->amount;
if ($this->$taxField) { if ($this->$taxField) {
$taxAmount = 0; $taxAmount = 0;
foreach ($this->getTaxes() as $key => $tax) { foreach ($this->getTaxes() as $key => $tax) {
$taxAmount += $tax['amount']; $taxAmount += $tax['amount'] - $tax['paid'];
} }
$amount -= $taxAmount; $amount -= $taxAmount;
} }