From 5f14c0a541ff406ff6d6f89686592584c7d5c392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 6 May 2021 12:46:02 +0200 Subject: [PATCH] Fixing the 500 when using negative taxes --- app/Utils/Traits/MakesInvoiceValues.php | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index e9dd773cf902..0e39f4a71199 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -318,36 +318,24 @@ trait MakesInvoiceValues $data[$key][$table_type.'.discount'] = ''; } - if (isset($item->tax_rate1) && $item->tax_rate1 > 0) { + // Previously we used to check for tax_rate value, + // but that's no longer necessary. + + if (isset($item->tax_rate1)) { $data[$key][$table_type.'.tax_rate1'] = round($item->tax_rate1, 2).'%'; $data[$key][$table_type.'.tax1'] = &$data[$key][$table_type.'.tax_rate1']; } - if (isset($item->tax_rate2) && $item->tax_rate2 > 0) { + if (isset($item->tax_rate2)) { $data[$key][$table_type.'.tax_rate2'] = round($item->tax_rate2, 2).'%'; $data[$key][$table_type.'.tax2'] = &$data[$key][$table_type.'.tax_rate2']; } - if (isset($item->tax_rate3) && $item->tax_rate3 > 0) { + if (isset($item->tax_rate3)) { $data[$key][$table_type.'.tax_rate3'] = round($item->tax_rate3, 2).'%'; $data[$key][$table_type.'.tax3'] = &$data[$key][$table_type.'.tax_rate3']; } - if (isset($item->tax_rate1) && $item->tax_rate1 == 0) { - $data[$key][$table_type.'.tax_rate1'] = ''; - $data[$key][$table_type.'.tax1'] = &$data[$key][$table_type.'.tax_rate1']; - } - - if (isset($item->tax_rate2) && $item->tax_rate2 == 0) { - $data[$key][$table_type.'.tax_rate2'] = ''; - $data[$key][$table_type.'.tax2'] = &$data[$key][$table_type.'.tax_rate2']; - } - - if (isset($item->tax_rate3) && $item->tax_rate3 == 0) { - $data[$key][$table_type.'.tax_rate3'] = ''; - $data[$key][$table_type.'.tax3'] = &$data[$key][$table_type.'.tax_rate3']; - } - $data[$key]['task_id'] = optional($item)->task_id; }