From 590b37e7459d61824dbb6d980ae8b6de9d60255b Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Sat, 19 Nov 2022 01:05:59 +0100
Subject: [PATCH] Porting over f061a83

---
 app/Helpers/tabular_helper.php | 2 +-
 app/Models/Sale.php            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Helpers/tabular_helper.php b/app/Helpers/tabular_helper.php
index 63ef3edfc..cde1e0d02 100644
--- a/app/Helpers/tabular_helper.php
+++ b/app/Helpers/tabular_helper.php
@@ -50,7 +50,7 @@ function transform_headers(array $array, bool $readonly = FALSE, bool $editable
 			'field' => key($element),
 			'title' => current($element),
 			'switchable' => $element['switchable'] ?? !preg_match('(^$|&nbsp)', current($element)),
-			'escape' => !preg_match("/(edit|phone_numberf061a83|email|messages)/", key($element)) && !(isset($element['escape']) && !$element['escape']),
+			'escape' => !preg_match("/(edit|phone_number|email|messages)/", key($element)) && !(isset($element['escape']) && !$element['escape']),
 			'sortable' => $element['sortable'] ?? current($element) != '',
 			'checkbox' => $element['checkbox'] ?? FALSE,
 			'class' => isset($element['checkbox']) || preg_match('(^$|&nbsp)', current($element)) ? 'print_hide' : '',
diff --git a/app/Models/Sale.php b/app/Models/Sale.php
index 816b76c18..9ae0e6df8 100644
--- a/app/Models/Sale.php
+++ b/app/Models/Sale.php
@@ -692,7 +692,7 @@ class Sale extends Model
 
 			$builder->insert($sales_payments_data);
 
-			$total_amount = floatval($total_amount) + floatval($payment['payment_amount']);
+			$total_amount = floatval($total_amount) + floatval($payment['payment_amount']) - floatval($payment['cash_refund']);
 		}
 
 		$this->save_customer_rewards($customer_id, $sale_id, $total_amount, $total_amount_used);
@@ -1532,4 +1532,4 @@ class Sale extends Model
 			}
 		}
 	}
-}
\ No newline at end of file
+}