Small modifications to array lookup while calling methods

opencart · Jan 20, 2024 · ad6386a · ad6386a
1 parent c2c3ef6
commit ad6386a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 25 deletions.
diff --git a/upload/catalog/controller/extension/module/paypal_smart_button.php b/upload/catalog/controller/extension/module/paypal_smart_button.php
@@ -784,19 +784,17 @@ public function confirmOrder(): void {
 					if ($this->config->get('shipping_' . $result['code'] . '_status')) {
 						$this->load->model('extension/shipping/' . $result['code']);
 
-						$quote = [];
-
 						if (is_callable([$this->{'model_extension_shipping_' . $result['code']}, 'getQuote'])) {
 							$quote = $this->{'model_extension_shipping_' . $result['code']}->getQuote($data['shipping_address']);
-						}
 
-						if ($quote) {
-							$quote_data[$result['code']] = [
-								'title'      => $quote['title'],
-								'quote'      => $quote['quote'],
-								'sort_order' => $quote['sort_order'],
-								'error'      => $quote['error']
-							];
+							if ($quote) {
+								$quote_data[$result['code']] = [
+									'title'      => $quote['title'],
+									'quote'      => $quote['quote'],
+									'sort_order' => $quote['sort_order'],
+									'error'      => $quote['error']
+								];
+							}
 						}
 					}
 				}
@@ -854,14 +852,12 @@ public function confirmOrder(): void {
 				if ($this->config->get('payment_' . $result['code'] . '_status')) {
 					$this->load->model('extension/payment/' . $result['code']);
 
-					$method = [];
-
 					if (is_callable([$this->{'model_extension_payment_' . $result['code']}, 'getMethod'])) {
 						$method = $this->{'model_extension_payment_' . $result['code']}->getMethod($data['payment_address'], $total);
-					}
 
-					if ($method) {
-						$method_data[$result['code']] = $method;
+						if ($method) {
+							$method_data[$result['code']] = $method;
+						}
 					}
 				}
 			}

diff --git a/upload/catalog/controller/extension/payment/amazon_login_pay.php b/upload/catalog/controller/extension/payment/amazon_login_pay.php
@@ -144,19 +144,17 @@ public function shipping_methods(): void {
 				if ($this->config->get('shipping_' . $code . '_status')) {
 					$this->load->model('extension/shipping/' . $code);
 
-					$quote = [];
-
 					if (is_callable([$this->{'model_extension_shipping_' . $code}, 'getQuote'])) {
 						$quote = $this->{'model_extension_shipping_' . $code}->getQuote($address);
-					}
 
-					if ($quote && empty($quote['error'])) {
-						$quotes[$code] = [
-							'title'      => $quote['title'],
-							'quote'      => $quote['quote'],
-							'sort_order' => $quote['sort_order'],
-							'error'      => $quote['error']
-						];
+						if ($quote && empty($quote['error'])) {
+							$quotes[$code] = [
+								'title'      => $quote['title'],
+								'quote'      => $quote['quote'],
+								'sort_order' => $quote['sort_order'],
+								'error'      => $quote['error']
+							];
+						}
 					}
 				}
 			}