Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' into v5-stable

Browse Source
This commit is contained in:
David Bomba 2024-02-24 14:10:53 +11:00
commit cd72331c87
3 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helpers/Invoice/InvoiceSum.php
View File

@ -122,7 +122,7 @@ class InvoiceSum
private function calculateInvoiceTaxes(): self private function calculateInvoiceTaxes(): self
{ {
if (is_string($this->invoice->tax_name1) && strlen($this->invoice->tax_name1) > 1) { if (is_string($this->invoice->tax_name1) && strlen($this->invoice->tax_name1) > 2) {
$tax = $this->taxer($this->total, $this->invoice->tax_rate1); $tax = $this->taxer($this->total, $this->invoice->tax_rate1);
$tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name1, $this->invoice->tax_rate1); $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name1, $this->invoice->tax_rate1);
@ -130,7 +130,7 @@ class InvoiceSum
$this->total_tax_map[] = ['name' => $this->invoice->tax_name1.' '.floatval($this->invoice->tax_rate1).'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name1.' '.floatval($this->invoice->tax_rate1).'%', 'total' => $tax];
} }
if (is_string($this->invoice->tax_name2) && strlen($this->invoice->tax_name2) > 1) { if (is_string($this->invoice->tax_name2) && strlen($this->invoice->tax_name2) > 2) {
$tax = $this->taxer($this->total, $this->invoice->tax_rate2); $tax = $this->taxer($this->total, $this->invoice->tax_rate2);
$tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name2, $this->invoice->tax_rate2); $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name2, $this->invoice->tax_rate2);
@ -138,7 +138,7 @@ class InvoiceSum
$this->total_tax_map[] = ['name' => $this->invoice->tax_name2.' '.floatval($this->invoice->tax_rate2).'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name2.' '.floatval($this->invoice->tax_rate2).'%', 'total' => $tax];
} }
if (is_string($this->invoice->tax_name3) && strlen($this->invoice->tax_name3) > 1) { if (is_string($this->invoice->tax_name3) && strlen($this->invoice->tax_name3) > 2) {
$tax = $this->taxer($this->total, $this->invoice->tax_rate3); $tax = $this->taxer($this->total, $this->invoice->tax_rate3);
$tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name3, $this->invoice->tax_rate3); $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name3, $this->invoice->tax_rate3);

11
app/Helpers/Invoice/InvoiceSumInclusive.php
View File

@ -122,7 +122,7 @@ class InvoiceSumInclusive
private function calculateInvoiceTaxes() private function calculateInvoiceTaxes()
{ {
$amount = $this->total; $amount = $this->total;
if ($this->invoice->discount > 0 && $this->invoice->is_amount_discount) { if ($this->invoice->discount > 0 && $this->invoice->is_amount_discount) {
$amount = $this->formatValue(($this->sub_total - $this->invoice->discount), 2); $amount = $this->formatValue(($this->sub_total - $this->invoice->discount), 2);
} }
@ -131,20 +131,20 @@ class InvoiceSumInclusive
$amount = $this->formatValue(($this->sub_total - ($this->sub_total * ($this->invoice->discount / 100))), 2); $amount = $this->formatValue(($this->sub_total - ($this->sub_total * ($this->invoice->discount / 100))), 2);
} }
if (is_string($this->invoice->tax_name1) && strlen($this->invoice->tax_name1) > 2) { if (is_string($this->invoice->tax_name1) && strlen($this->invoice->tax_name1) > 1) {
$tax = $this->calcInclusiveLineTax($this->invoice->tax_rate1, $amount); $tax = $this->calcInclusiveLineTax($this->invoice->tax_rate1, $amount);
$this->total_taxes += $tax; $this->total_taxes += $tax;
$this->total_tax_map[] = ['name' => $this->invoice->tax_name1.' '.floatval($this->invoice->tax_rate1).'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name1.' '.floatval($this->invoice->tax_rate1).'%', 'total' => $tax];
} }
if (is_string($this->invoice->tax_name2) && strlen($this->invoice->tax_name2) > 2) { if (is_string($this->invoice->tax_name2) && strlen($this->invoice->tax_name2) > 1) {
$tax = $this->calcInclusiveLineTax($this->invoice->tax_rate2, $amount); $tax = $this->calcInclusiveLineTax($this->invoice->tax_rate2, $amount);
$this->total_taxes += $tax; $this->total_taxes += $tax;
$this->total_tax_map[] = ['name' => $this->invoice->tax_name2.' '.floatval($this->invoice->tax_rate2).'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name2.' '.floatval($this->invoice->tax_rate2).'%', 'total' => $tax];
} }
if (is_string($this->invoice->tax_name3) && strlen($this->invoice->tax_name3) > 2) { if (is_string($this->invoice->tax_name3) && strlen($this->invoice->tax_name3) > 1) {
$tax = $this->calcInclusiveLineTax($this->invoice->tax_rate3, $amount); $tax = $this->calcInclusiveLineTax($this->invoice->tax_rate3, $amount);
$this->total_taxes += $tax; $this->total_taxes += $tax;
$this->total_tax_map[] = ['name' => $this->invoice->tax_name3.' '.floatval($this->invoice->tax_rate3).'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name3.' '.floatval($this->invoice->tax_rate3).'%', 'total' => $tax];
@ -340,7 +340,8 @@ class InvoiceSumInclusive
$this->total_taxes += $total_line_tax; $this->total_taxes += $total_line_tax;
} }
nlog($this->tax_map);
nlog($this->total_taxes);
return $this; return $this;
} }

49
tests/Unit/InvoiceInclusiveTest.php
View File

@ -66,6 +66,8 @@ class InvoiceInclusiveTest extends TestCase
public function testInvoiceTotals() public function testInvoiceTotals()
{ {
$this->invoice_calc = new InvoiceSumInclusive($this->invoice);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
@ -76,6 +78,8 @@ class InvoiceInclusiveTest extends TestCase
{ {
$this->invoice->discount = 5; $this->invoice->discount = 5;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
@ -88,6 +92,8 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->discount = 5; $this->invoice->discount = 5;
$this->invoice->custom_surcharge1 = 5; $this->invoice->custom_surcharge1 = 5;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
@ -103,6 +109,8 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->tax_rate1 = 10; $this->invoice->tax_rate1 = 10;
$this->invoice->is_amount_discount = true; $this->invoice->is_amount_discount = true;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
@ -119,6 +127,7 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->tax_rate1 = 10; $this->invoice->tax_rate1 = 10;
$this->invoice->is_amount_discount = false; $this->invoice->is_amount_discount = false;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
@ -135,6 +144,7 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->uses_inclusive_taxes = true; $this->invoice->uses_inclusive_taxes = true;
$this->invoice->is_amount_discount = true; $this->invoice->is_amount_discount = true;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
@ -154,6 +164,8 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->uses_inclusive_taxes = true; $this->invoice->uses_inclusive_taxes = true;
$this->invoice->is_amount_discount = true; $this->invoice->is_amount_discount = true;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
@ -170,7 +182,10 @@ class InvoiceInclusiveTest extends TestCase
$item->cost = 10; $item->cost = 10;
$item->tax_rate1 = 10; $item->tax_rate1 = 10;
$item->tax_name1 = 10; $item->tax_name1 = 10;
$item->tax_rate2 = 0;
$item->tax_name2 = '';
$item->tax_rate3 = 0;
$item->tax_name3 = '';
$line_items[] = $item; $line_items[] = $item;
$item = InvoiceItemFactory::create(); $item = InvoiceItemFactory::create();
@ -178,6 +193,10 @@ class InvoiceInclusiveTest extends TestCase
$item->cost = 10; $item->cost = 10;
$item->tax_rate1 = 10; $item->tax_rate1 = 10;
$item->tax_name1 = 10; $item->tax_name1 = 10;
$item->tax_rate2 = 0;
$item->tax_name2 = '';
$item->tax_rate3 = 0;
$item->tax_name3 = '';
$line_items[] = $item; $line_items[] = $item;
@ -223,14 +242,17 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->discount = 0; $this->invoice->discount = 0;
$this->invoice->custom_surcharge1 = 0; $this->invoice->custom_surcharge1 = 0;
$this->invoice->tax_name1 = 'dog';
$this->invoice->tax_name2 = 'cat';
$this->invoice->tax_rate1 = 10; $this->invoice->tax_rate1 = 10;
$this->invoice->tax_rate2 = 10; $this->invoice->tax_rate2 = 10;
$this->invoice_calc = null;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings); $this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings);
$this->invoice_calc->build(); $this->invoice_calc->build();
$this->assertEquals($this->invoice_calc->getSubTotal(), 20); $this->assertEquals(20, $this->invoice_calc->getSubTotal());
$this->assertEquals($this->invoice_calc->getTotalTaxes(), 5.46); $this->assertEquals(5.46, $this->invoice_calc->getTotalTaxes());
$this->assertEquals(count($this->invoice_calc->getTaxMap()), 1); $this->assertEquals(count($this->invoice_calc->getTaxMap()), 1);
$this->assertEquals($this->invoice_calc->getTotal(), 20); $this->assertEquals($this->invoice_calc->getTotal(), 20);
$this->assertEquals($this->invoice_calc->getBalance(), 20); $this->assertEquals($this->invoice_calc->getBalance(), 20);
@ -244,7 +266,7 @@ class InvoiceInclusiveTest extends TestCase
$item->quantity = 1; $item->quantity = 1;
$item->cost = 10; $item->cost = 10;
$item->tax_rate1 = 10; $item->tax_rate1 = 10;
$item->tax_name1 = 10; $item->tax_name1 = 'a10';
$item->discount = 5; $item->discount = 5;
$line_items[] = $item; $line_items[] = $item;
@ -253,7 +275,7 @@ class InvoiceInclusiveTest extends TestCase
$item->quantity = 1; $item->quantity = 1;
$item->cost = 10; $item->cost = 10;
$item->tax_rate1 = 10; $item->tax_rate1 = 10;
$item->tax_name1 = 10; $item->tax_name1 = 'a10';
$item->discount = 5; $item->discount = 5;
$line_items[] = $item; $line_items[] = $item;
@ -267,17 +289,20 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->tax_rate1 = 10; $this->invoice->tax_rate1 = 10;
$this->invoice->tax_rate2 = 10; $this->invoice->tax_rate2 = 10;
$this->invoice->tax_name1 = 'VAT';
$this->invoice->tax_name2 = 'VAT';
$this->invoice_calc = null;
$this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings); $this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings);
$this->invoice_calc->build(); $this->invoice_calc->build();
$line_items = $this->invoice_calc->invoice_items->getLineItems(); $line_items = $this->invoice_calc->invoice_items->getLineItems();
nlog($this->invoice_calc->getTaxMap());
$this->assertEquals($this->invoice_calc->getSubTotal(), 19); $this->assertEquals(19, $this->invoice_calc->getSubTotal());
$this->assertEquals($this->invoice_calc->getTotalDiscount(), 0.95); $this->assertEquals(0.95, $this->invoice_calc->getTotalDiscount());
$this->assertEquals($this->invoice_calc->getTotalTaxes(), 4.92); $this->assertEquals(4.92, $this->invoice_calc->getTotalTaxes());
// nlog($this->invoice_calc->getTaxMap());
$this->assertEquals(count($this->invoice_calc->getTaxMap()), 1); $this->assertEquals(count($this->invoice_calc->getTaxMap()), 1);
$this->assertEquals($this->invoice_calc->getTotal(), 18.05); $this->assertEquals($this->invoice_calc->getTotal(), 18.05);
@ -316,6 +341,9 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->tax_rate1 = 10; $this->invoice->tax_rate1 = 10;
$this->invoice->tax_rate2 = 10; $this->invoice->tax_rate2 = 10;
$this->invoice->tax_name1 = 'dog';
$this->invoice->tax_name2 = 'cat';
$this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings); $this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings);
$this->invoice_calc->build(); $this->invoice_calc->build();
@ -361,6 +389,9 @@ class InvoiceInclusiveTest extends TestCase
$this->invoice->tax_rate1 = 10; $this->invoice->tax_rate1 = 10;
$this->invoice->tax_rate2 = 10; $this->invoice->tax_rate2 = 10;
$this->invoice->tax_name1 = 'dog';
$this->invoice->tax_name2 = 'cat';
$this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings); $this->invoice_calc = new InvoiceSumInclusive($this->invoice, $this->settings);
$this->invoice_calc->build(); $this->invoice_calc->build();