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

Fixes for invoice item calcs

Browse Source
This commit is contained in:
David Bomba 2023-10-28 11:13:55 +11:00
parent 8d9d0f2eed
commit a4c3ab58fc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Helpers/Invoice/InvoiceItemSum.php
View File

@ -399,8 +399,11 @@ class InvoiceItemSum
$item_tax = 0; $item_tax = 0;
//$amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total)); // $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total));
$amount = ($this->sub_total > 0) ? $this->item->line_total - ($this->invoice->discount * ($this->item->line_total / $this->sub_total)) : 0; if($this->invoice->discount > 0)
$amount = ($this->sub_total > 0) ? $this->item->line_total - ($this->invoice->discount * ($this->item->line_total / $this->sub_total)) : 0;
else
$amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total));
$item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount); $item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount);

3
app/PaymentDrivers/GoCardless/DirectDebit.php
View File

@ -108,7 +108,8 @@ class DirectDebit implements MethodInterface
$response = $this->go_cardless->gateway->billingRequests()->create([ $response = $this->go_cardless->gateway->billingRequests()->create([
"params" => [ "params" => [
"mandate_request" => [ "mandate_request" => [
"currency" => auth()->guard('contact')->user()->client->currency()->code "currency" => auth()->guard('contact')->user()->client->currency()->code,
"verify" => "recommended"
] ]
] ]
]); ]);