From 108e62f519a13b0e4c88b24071887ec6675a3459 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 7 Jan 2017 10:04:39 +1100 Subject: [PATCH] PHP 7.1 fixes (#1259) * revert error reporting * fix for non boolean output * PHP 7.1 non-numeric fixes --- app/Ninja/Repositories/InvoiceRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index d40e3fd7e9af..cd75f902755e 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -412,7 +412,7 @@ class InvoiceRepository extends BaseRepository $invoice->invoice_design_id = isset($data['invoice_design_id']) ? $data['invoice_design_id'] : $account->invoice_design_id; - // provide backwards compatability + // provide backwards compatibility if (isset($data['tax_name']) && isset($data['tax_rate'])) { $data['tax_name1'] = $data['tax_name']; $data['tax_rate1'] = $data['tax_rate']; @@ -495,8 +495,8 @@ class InvoiceRepository extends BaseRepository $total += $invoice->custom_value2; } - $taxAmount1 = round($total * $invoice->tax_rate1 / 100, 2); - $taxAmount2 = round($total * $invoice->tax_rate2 / 100, 2); + $taxAmount1 = round($total * ($invoice->tax_rate1 ? $invoice->tax_rate1 : 0) / 100, 2); + $taxAmount2 = round($total * ($invoice->tax_rate2 ? $invoice->tax_rate2 : 0) / 100, 2); $total = round($total + $taxAmount1 + $taxAmount2, 2); $total += $itemTax;