https://github.com/opencart/opencart/issues/13753

opencart · Apr 22, 2024 · 672b700 · 672b700
1 parent bbff3ce
commit 672b700
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/upload/catalog/controller/account/payment_method.php b/upload/catalog/controller/account/payment_method.php
@@ -94,8 +94,10 @@ protected function getList(): string {
 			if ($this->config->get('payment_' . $result['code'] . '_status')) {
 				$this->load->model('extension/' . $result['extension'] . '/payment/' . $result['code']);
 
-				if (is_callable([$this->{'model_extension_' . $result['extension'] . '_payment_' . $result['code']}, 'getStored'])) {
-					$payment_method_info = $this->{'model_extension_' . $result['extension'] . '_payment_' . $result['code']}->getStored();
+				$key = 'model_extension_' . $result['extension'] . '_payment_' . $result['code'];
+
+				if (isset($this->{$key}->getStored)) {
+					$payment_method_info = $this->{$key}->getStored();
 
 					if ($payment_method_info) {
 						$data['payment_methods'][] = [
@@ -148,8 +150,10 @@ public function delete(): void {
 		if (!$json) {
 			$this->load->model('extension/' . $payment_method_info['extension'] . '/payment/' . $payment_method_info['code']);
 
-			if (is_callable([$this->{'model_extension_' . $payment_method_info['extension'] . '_payment_' . $payment_method_info['code']}, 'delete'])) {
-				$this->{'model_extension_' . $payment_method_info['extension'] . '_payment_' . $payment_method_info['code']}->delete();
+			$key = 'model_extension_' . $payment_method_info['extension'] . '_payment_' . $payment_method_info['code'];
+
+			if (isset($this->{$key}->delete)) {
+				$this->{$key}->delete();
 			}
 
 			$json['success'] = $this->language->get('text_success');

diff --git a/upload/catalog/controller/checkout/cart.php b/upload/catalog/controller/checkout/cart.php
@@ -122,12 +122,6 @@ public function list(): void {
 	 * @return string
 	 */
 	public function getList(): string {
-
-
-
-
-
-
 		$data['product_edit'] = $this->url->link('checkout/cart.edit', 'language=' . $this->config->get('config_language'));
 		$data['product_remove'] = $this->url->link('checkout/cart.remove', 'language=' . $this->config->get('config_language'));
 		$data['voucher_remove'] = $this->url->link('checkout/voucher.remove', 'language=' . $this->config->get('config_language'));

diff --git a/upload/catalog/controller/cron/subscription.php b/upload/catalog/controller/cron/subscription.php
@@ -358,11 +358,11 @@ public function index(int $cron_id, string $code, string $cycle, string $date_ad
 					// Load payment method used by the subscription
 					$this->load->model('extension/' . $extension_info['extension'] . '/payment/' . $extension_info['code']);
 
-					$callable = [$this->{'model_extension_' . $extension_info['extension'] . '_payment_' . $extension_info['code']}, 'charge'];
+					$key = 'model_extension_' . $extension_info['extension'] . '_payment_' . $extension_info['code'];
 
-					if (is_callable($callable)) {
+					if (isset($this->{$key}->charge)) {
 						// Process payment
-						$response_info = $this->{'model_extension_' . $order_data['payment_method']['extension'] . '_payment_' . $order_data['payment_method']['code']}->charge($this->customer->getId(), $this->session->data['order_id'], $order_info['total'], $order_data['payment_method']['code']);
+						$response_info = $this->{$key}->charge($this->customer->getId(), $this->session->data['order_id'], $order_info['total'], $order_data['payment_method']['code']);
 
 						if (isset($response_info['order_status_id'])) {
 							$order_status_id = $response_info['order_status_id'];

diff --git a/upload/catalog/model/checkout/payment_method.php b/upload/catalog/model/checkout/payment_method.php
@@ -24,8 +24,10 @@ public function getMethods(array $payment_address = []): array {
 			if ($this->config->get('payment_' . $result['code'] . '_status')) {
 				$this->load->model('extension/' . $result['extension'] . '/payment/' . $result['code']);
 
-				if (is_callable([$this->{'model_extension_' . $result['extension'] . '_payment_' . $result['code']}, 'getMethods'])) {
-					$payment_methods = $this->{'model_extension_' . $result['extension'] . '_payment_' . $result['code']}->getMethods($payment_address);
+				$key = 'model_extension_' . $result['extension'] . '_payment_' . $result['code'];
+
+				if ($this->{$key}->getMethods) {
+					$payment_methods = $this->{$key}->getMethods($payment_address);
 
 					if ($payment_methods) {
 						$method_data[$result['code']] = $payment_methods;

diff --git a/upload/catalog/model/checkout/shipping_method.php b/upload/catalog/model/checkout/shipping_method.php
@@ -24,8 +24,10 @@ public function getMethods(array $shipping_address): array {
 			if ($this->config->get('shipping_' . $result['code'] . '_status')) {
 				$this->load->model('extension/' . $result['extension'] . '/shipping/' . $result['code']);
 
-				if (is_callable([$this->{'model_extension_' . $result['extension'] . '_shipping_' . $result['code']}, 'getQuote'])) {
-					$quote = $this->{'model_extension_' . $result['extension'] . '_shipping_' . $result['code']}->getQuote($shipping_address);
+				$key = 'model_extension_' . $result['extension'] . '_shipping_' . $result['code'];
+
+				if (isset($this->{$key}->getQuote)) {
+					$quote = $this->{$key}->getQuote($shipping_address);
 
 					if ($quote) {
 						$method_data[$result['code']] = $quote;