Testing callable methods in checkout/order model

opencart · Jan 20, 2024 · 7520368 · 7520368
1 parent e284f29
commit 7520368
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/upload/catalog/model/checkout/order.php b/upload/catalog/model/checkout/order.php
@@ -464,7 +464,9 @@ public function addHistory(int $order_id, int $order_status_id, string $comment
 					if ($this->config->get('fraud_' . $extension['code'] . '_status')) {
 						$this->load->model('extension/fraud/' . $extension['code']);
 
-						if (isset($this->{'model_extension_fraud_' . $extension['code']}->check)) {
+						$callable = [$this->{'model_extension_fraud_' . $extension['code']}]->check;
+
+						if (is_callable([$this->{'model_extension_fraud_' . $extension['code']}, 'check'])) {
 							$fraud_status_id = $this->{'model_extension_fraud_' . $extension['code']}->check($order_info);
 
 							if ($fraud_status_id) {
@@ -483,7 +485,7 @@ public function addHistory(int $order_id, int $order_status_id, string $comment
 				foreach ($order_totals as $order_total) {
 					$this->load->model('extension/total/' . $order_total['code']);
 
-					if (isset($this->{'model_extension_total_' . $order_total['code']}->confirm)) {
+					if (is_callable([$this->{'model_extension_total_' . $order_total['code']}, 'check'])) {	
 						// Confirm coupon, vouchers and reward points
 						$fraud_status_id = $this->{'model_extension_total_' . $order_total['code']}->confirm($order_info, $order_total);
 
@@ -579,7 +581,7 @@ public function addHistory(int $order_id, int $order_status_id, string $comment
 				foreach ($order_totals as $order_total) {
 					$this->load->model('extension/total/' . $order_total['code']);
 
-					if (isset($this->{'model_extension_total_' . $order_total['code']}->unconfirm)) {
+					if (is_callable([$this->{'model_extension_total_' . $order_total['code']}, 'unconfirm'])) {
 						$this->{'model_extension_total_' . $order_total['code']}->unconfirm($order_id);
 					}
 				}