From e1b052a84371a6c83a518f10672d74d9fa1821a1 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 18 Sep 2021 09:26:28 +1000 Subject: [PATCH] Minor Fixes --- app/Utils/Traits/MakesInvoiceValues.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index 5361d38a5ac3..bf6b263ecf5c 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -297,6 +297,9 @@ trait MakesInvoiceValues $data[$key][$table_type.'.notes'] = $this->processReservedKeywords($item->notes); $data[$key][$table_type.'.description'] = $this->processReservedKeywords($item->notes); + /* need to test here as this is new - 18/09/2021*/ + if(!array_key_exists($table_type.'.gross_line_total', $data[$key])) + $data[$key][$table_type.'.gross_line_total'] = 0; $data[$key][$table_type . ".{$_table_type}1"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}1", $item->custom_value1, $this->client); $data[$key][$table_type . ".{$_table_type}2"] = $helpers->formatCustomFieldValue($this->client->company->custom_fields, "{$_table_type}2", $item->custom_value2, $this->client); @@ -311,10 +314,7 @@ trait MakesInvoiceValues $data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client); $data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client); - - /* need to test here as this is new - 18/09/2021*/ - if(array_key_exists($table_type.'.gross_line_total', $data[$key])) - $data[$key][$table_type.'.gross_line_total'] = Number::formatMoney($item->gross_line_total, $this->client); + if (isset($item->discount) && $item->discount > 0) { if ($item->is_amount_discount) {