From ff2f43d8fc46d21b440cf4ae00e6d8a6e6461bfa Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 12 Mar 2021 07:24:09 +1100 Subject: [PATCH] Do no add value from custom_value to invoice total --- app/Helpers/Invoice/InvoiceSum.php | 24 ++++++++++----------- app/Helpers/Invoice/InvoiceSumInclusive.php | 24 ++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php index 53df2fdb53d6..33db3dfc9a47 100644 --- a/app/Helpers/Invoice/InvoiceSum.php +++ b/app/Helpers/Invoice/InvoiceSum.php @@ -157,21 +157,21 @@ class InvoiceSum { $this->total += $this->total_taxes; - if (is_numeric($this->invoice->custom_value1)) { - $this->total += $this->invoice->custom_value1; - } + // if (is_numeric($this->invoice->custom_value1)) { + // $this->total += $this->invoice->custom_value1; + // } - if (is_numeric($this->invoice->custom_value2)) { - $this->total += $this->invoice->custom_value2; - } + // if (is_numeric($this->invoice->custom_value2)) { + // $this->total += $this->invoice->custom_value2; + // } - if (is_numeric($this->invoice->custom_value3)) { - $this->total += $this->invoice->custom_value3; - } + // if (is_numeric($this->invoice->custom_value3)) { + // $this->total += $this->invoice->custom_value3; + // } - if (is_numeric($this->invoice->custom_value4)) { - $this->total += $this->invoice->custom_value4; - } + // if (is_numeric($this->invoice->custom_value4)) { + // $this->total += $this->invoice->custom_value4; + // } return $this; } diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php index 24273b883aee..c0505387b71f 100644 --- a/app/Helpers/Invoice/InvoiceSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceSumInclusive.php @@ -166,21 +166,21 @@ class InvoiceSumInclusive { //$this->total += $this->total_taxes; - if (is_numeric($this->invoice->custom_value1)) { - $this->total += $this->invoice->custom_value1; - } + // if (is_numeric($this->invoice->custom_value1)) { + // $this->total += $this->invoice->custom_value1; + // } - if (is_numeric($this->invoice->custom_value2)) { - $this->total += $this->invoice->custom_value2; - } + // if (is_numeric($this->invoice->custom_value2)) { + // $this->total += $this->invoice->custom_value2; + // } - if (is_numeric($this->invoice->custom_value3)) { - $this->total += $this->invoice->custom_value3; - } + // if (is_numeric($this->invoice->custom_value3)) { + // $this->total += $this->invoice->custom_value3; + // } - if (is_numeric($this->invoice->custom_value4)) { - $this->total += $this->invoice->custom_value4; - } + // if (is_numeric($this->invoice->custom_value4)) { + // $this->total += $this->invoice->custom_value4; + // } return $this; }