From ad77aa80a0d4a8e194dbf8e291a9fa8934a42e22 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 24 Feb 2024 14:09:55 +1100 Subject: [PATCH] Fixes for tests --- app/Helpers/Invoice/InvoiceSumInclusive.php | 3 ++- tests/Unit/InvoiceInclusiveTest.php | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php index 3786b55f99e6..d213874e68b2 100644 --- a/app/Helpers/Invoice/InvoiceSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceSumInclusive.php @@ -340,7 +340,8 @@ class InvoiceSumInclusive $this->total_taxes += $total_line_tax; } - +nlog($this->tax_map); +nlog($this->total_taxes); return $this; } diff --git a/tests/Unit/InvoiceInclusiveTest.php b/tests/Unit/InvoiceInclusiveTest.php index c5e8eba22ae0..0c557438cf4a 100644 --- a/tests/Unit/InvoiceInclusiveTest.php +++ b/tests/Unit/InvoiceInclusiveTest.php @@ -266,7 +266,7 @@ class InvoiceInclusiveTest extends TestCase $item->quantity = 1; $item->cost = 10; $item->tax_rate1 = 10; - $item->tax_name1 = 10; + $item->tax_name1 = 'a10'; $item->discount = 5; $line_items[] = $item; @@ -275,7 +275,7 @@ class InvoiceInclusiveTest extends TestCase $item->quantity = 1; $item->cost = 10; $item->tax_rate1 = 10; - $item->tax_name1 = 10; + $item->tax_name1 = 'a10'; $item->discount = 5; $line_items[] = $item; @@ -289,21 +289,20 @@ class InvoiceInclusiveTest extends TestCase $this->invoice->tax_rate1 = 10; $this->invoice->tax_rate2 = 10; - -$this->invoice->tax_name1 = 'dog'; -$this->invoice->tax_name2 = 'cat'; + $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->build(); $line_items = $this->invoice_calc->invoice_items->getLineItems(); + nlog($this->invoice_calc->getTaxMap()); - $this->assertEquals($this->invoice_calc->getSubTotal(), 19); - $this->assertEquals($this->invoice_calc->getTotalDiscount(), 0.95); - $this->assertEquals($this->invoice_calc->getTotalTaxes(), 4.92); + $this->assertEquals(19, $this->invoice_calc->getSubTotal()); + $this->assertEquals(0.95, $this->invoice_calc->getTotalDiscount()); + $this->assertEquals(4.92, $this->invoice_calc->getTotalTaxes()); - // nlog($this->invoice_calc->getTaxMap()); $this->assertEquals(count($this->invoice_calc->getTaxMap()), 1); $this->assertEquals($this->invoice_calc->getTotal(), 18.05);