From c10a094ea0b621acf33a4f097e7001d044b9b99a Mon Sep 17 00:00:00 2001
From: Daniel Kerr <webmaster@opencart.com>
Date: Fri, 9 Aug 2024 17:21:57 +0800
Subject: [PATCH] https://github.com/opencart/opencart/issues/12661

---
 upload/admin/controller/sale/order.php        | 118 +++++++++---------
 .../admin/view/template/sale/order_info.twig  |  59 ++++-----
 .../catalog/controller/api/payment_method.php |   8 +-
 .../controller/api/shipping_method.php        |  16 +++
 4 files changed, 103 insertions(+), 98 deletions(-)

diff --git a/upload/admin/controller/sale/order.php b/upload/admin/controller/sale/order.php
index 43d5c609c67..c6731e5b929 100644
--- a/upload/admin/controller/sale/order.php
+++ b/upload/admin/controller/sale/order.php
@@ -825,65 +825,6 @@ public function info(): void {
 
 		$data['currencies'] = $this->model_localisation_currency->getCurrencies();
 
-		// Coupon, Voucher, Reward
-		$data['total_coupon'] = '';
-		$data['total_voucher'] = '';
-		$data['total_reward'] = 0;
-
-		if ($order_id) {
-			$order_totals = $this->model_sale_order->getTotals($order_id);
-
-			foreach ($order_totals as $order_total) {
-				// If coupon, voucher or reward points
-				$start = strpos($order_total['title'], '(');
-				$end = strrpos($order_total['title'], ')');
-
-				if ($start !== false && $end !== false) {
-					$data['total_' . $order_total['code']] = substr($order_total['title'], $start + 1, $end - ($start + 1));
-				}
-			}
-		}
-
-		// Reward Points
-		if (!empty($order_info)) {
-			$data['points'] = $this->model_sale_order->getRewardTotal($order_id);
-		} else {
-			$data['points'] = 0;
-		}
-
-		// Reward Points
-		if (!empty($order_info)) {
-			$data['reward_total'] = $this->model_customer_customer->getTotalRewardsByOrderId($order_id);
-		} else {
-			$data['reward_total'] = 0;
-		}
-
-		// Affiliate
-		if (!empty($order_info)) {
-			$data['affiliate_id'] = $order_info['affiliate_id'];
-		} else {
-			$data['affiliate_id'] = 0;
-		}
-
-		if (!empty($order_info)) {
-			$data['affiliate'] = $order_info['affiliate'];
-		} else {
-			$data['affiliate'] = '';
-		}
-
-		// Commission
-		if (!empty($order_info) && (float)$order_info['commission']) {
-			$data['commission'] = $this->currency->format($order_info['commission'], $this->config->get('config_currency'));
-		} else {
-			$data['commission'] = '';
-		}
-
-		if (!empty($order_info)) {
-			$data['commission_total'] = $this->model_customer_customer->getTotalTransactionsByOrderId($order_id);
-		} else {
-			$data['commission_total'] = '';
-		}
-
 		// Addresses
 		if (!empty($order_info)) {
 			$this->load->model('customer/customer');
@@ -1082,6 +1023,65 @@ public function info(): void {
 			$data['shipping_code'] = '';
 		}
 
+		// Coupon, Voucher, Reward
+		$data['total_coupon'] = '';
+		$data['total_voucher'] = '';
+		$data['total_reward'] = 0;
+
+		if ($order_id) {
+			$order_totals = $this->model_sale_order->getTotals($order_id);
+
+			foreach ($order_totals as $order_total) {
+				// If coupon, voucher or reward points
+				$start = strpos($order_total['title'], '(');
+				$end = strrpos($order_total['title'], ')');
+
+				if ($start !== false && $end !== false) {
+					$data['total_' . $order_total['code']] = substr($order_total['title'], $start + 1, $end - ($start + 1));
+				}
+			}
+		}
+
+		// Reward Points
+		if (!empty($order_info)) {
+			$data['points'] = $this->model_sale_order->getRewardTotal($order_id);
+		} else {
+			$data['points'] = 0;
+		}
+
+		// Reward Points
+		if (!empty($order_info)) {
+			$data['reward_total'] = $this->model_customer_customer->getTotalRewardsByOrderId($order_id);
+		} else {
+			$data['reward_total'] = 0;
+		}
+
+		// Affiliate
+		if (!empty($order_info)) {
+			$data['affiliate_id'] = $order_info['affiliate_id'];
+		} else {
+			$data['affiliate_id'] = 0;
+		}
+
+		if (!empty($order_info)) {
+			$data['affiliate'] = $order_info['affiliate'];
+		} else {
+			$data['affiliate'] = '';
+		}
+
+		// Commission
+		if (!empty($order_info) && (float)$order_info['commission']) {
+			$data['commission'] = $this->currency->format($order_info['commission'], $this->config->get('config_currency'));
+		} else {
+			$data['commission'] = '';
+		}
+
+		if (!empty($order_info)) {
+			$data['commission_total'] = $this->model_customer_customer->getTotalTransactionsByOrderId($order_id);
+		} else {
+			$data['commission_total'] = '';
+		}
+
 		// Comment
 		if (!empty($order_info)) {
 			$data['comment'] = nl2br($order_info['comment']);
diff --git a/upload/admin/view/template/sale/order_info.twig b/upload/admin/view/template/sale/order_info.twig
index 51818d138b4..c712707836c 100644
--- a/upload/admin/view/template/sale/order_info.twig
+++ b/upload/admin/view/template/sale/order_info.twig
@@ -222,7 +222,6 @@
               <button type="button" data-bs-toggle="modal" data-bs-target="#modal-payment-address" class="btn btn-outline-primary float-end"><i class="fa-solid fa-cog"></i></button>
             </div>
           </div>
-
           <div id="shipping-address" class="col{% if not shipping_method %} d-none{% endif %}">
             <div class="input-group mb-3">
               <div class="form-control border rounded-start">
@@ -266,7 +265,6 @@
               <button type="button" data-bs-toggle="modal" data-bs-target="#modal-shipping-address" class="btn btn-outline-primary float-end"><i class="fa-solid fa-cog"></i></button>
             </div>
           </div>
-
         </div>
         <div class="row">
 
@@ -440,7 +438,6 @@
           {% endfor %}
         </ul>
         <div class="tab-content">
-
           <div id="tab-history" class="tab-pane active">
             <fieldset>
               <legend>{{ text_history }}</legend>
@@ -491,7 +488,6 @@
               <input type="hidden" name="order_id" value="{{ order_id }}" id="input-order-id"/>
             </form>
           </div>
-
           <div id="tab-additional" class="tab-pane">
             <div class="table-responsive">
               <table class="table table-bordered">
@@ -541,7 +537,6 @@
       </div>
       <div class="modal-body">
         <form id="form-customer">
-
           <div class="mb-3">
             <label for="input-customer" class="form-label">{{ entry_customer }}</label>
             <div class="input-group">
@@ -551,7 +546,6 @@
             <input type="hidden" name="customer_id" value="{{ customer_id }}" id="input-customer-id"/>
             <ul id="autocomplete-customer" class="dropdown-menu"></ul>
           </div>
-
           <div class="mb-3">
             <label for="input-customer-group" class="form-label">{{ entry_customer_group }}</label>
             <select name="customer_group_id" id="input-customer-group" class="form-select">
@@ -560,19 +554,16 @@
               {% endfor %}
             </select>
           </div>
-
           <div class="mb-3 required">
             <label for="input-firstname" class="form-label">{{ entry_firstname }}</label>
             <input type="text" name="firstname" value="{{ firstname }}" placeholder="{{ entry_firstname }}" id="input-firstname" class="form-control"/>
             <div id="error-firstname" class="invalid-feedback"></div>
           </div>
-
           <div class="mb-3 required">
             <label for="input-lastname" class="form-label">{{ entry_lastname }}</label>
             <input type="text" name="lastname" value="{{ lastname }}" placeholder="{{ entry_lastname }}" id="input-lastname" class="form-control"/>
             <div id="error-lastname" class="invalid-feedback"></div>
           </div>
-
           <div class="mb-3 required">
             <label for="input-email" class="form-label">{{ entry_email }}</label>
             <div class="input-group">
@@ -580,7 +571,6 @@
             </div>
             <div id="error-email" class="invalid-feedback"></div>
           </div>
-
           <div class="mb-3{% if config_telephone_required %} required{% endif %}">
             <label for="input-telephone" class="form-label">{{ entry_telephone }}</label>
             <input type="text" name="telephone" value="{{ telephone }}" placeholder="{{ entry_telephone }}" id="input-telephone" class="form-control"/>
@@ -784,8 +774,6 @@
   </div>
 </div>
 
-
-
 <div id="modal-payment-address" class="modal">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -950,27 +938,6 @@
     </div>
   </div>
 </div>
-
-<div id="modal-payment" class="modal">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-credit-card"></i> {{ text_payment_method }}</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-      </div>
-      <div class="modal-body">
-        <form id="form-payment-method">
-          <p>{{ text_payment }}</p>
-          <div id="payment-methods"></div>
-          <div class="text-end">
-            <button type="submit" id="button-payment-method" class="btn btn-primary">{{ button_continue }}</button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
-
 <div id="modal-shipping-address" class="modal">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -1167,6 +1134,26 @@
   </div>
 </div>
 
+<div id="modal-payment" class="modal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-credit-card"></i> {{ text_payment_method }}</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+      <div class="modal-body">
+
+        <form id="form-payment-method">
+          <p>{{ text_payment }}</p>
+          <div id="payment-methods"></div>
+          <div class="text-end">
+            <button type="submit" id="button-payment-method" class="btn btn-primary">{{ button_continue }}</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
 
 <div id="modal-affiliate" class="modal">
   <div class="modal-dialog">
@@ -1192,7 +1179,6 @@
   </div>
 </div>
 
-
 <div id="modal-comment" class="modal">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -2358,7 +2344,6 @@ $('#order-vouchers').on('submit', 'form', function(e) {
     });
 });
 
-
 // Coupon
 $('#form-coupon').on('submit', function(e) {
     e.preventDefault();
@@ -2802,6 +2787,10 @@ $('#button-confirm').on('click', function() {
                 for (i in json['error']) {
                     $('#alert').prepend('<div class="alert alert-danger alert-dismissible"><i class="fa-solid fa-circle-exclamation"></i> ' + json['error'][i] + ' <button type="button" class="btn-close" data-bs-dismiss="alert"></button></div>');
                 }
+
+                if (json['error']['customer']) {
+                    $('#alert').prepend('<div class="alert alert-danger alert-dismissible"><i class="fa-solid fa-circle-exclamation"></i> ' + json['error']['customer'] + ' <button type="button" class="btn-close" data-bs-dismiss="alert"></button></div>');
+                }
             }
 
             if (json['success']) {
diff --git a/upload/catalog/controller/api/payment_method.php b/upload/catalog/controller/api/payment_method.php
index ef23605b467..ff16a8b9134 100644
--- a/upload/catalog/controller/api/payment_method.php
+++ b/upload/catalog/controller/api/payment_method.php
@@ -22,10 +22,6 @@ public function index(): void {
 			$json['error'] = $this->language->get('error_product');
 		}
 
-		if ($this->config->get('config_checkout_payment_address') && !isset($this->session->data['payment_address'])) {
-			$json['error'] = $this->language->get('error_payment_address');
-		}
-
 		if ($this->cart->hasShipping()) {
 			if (!isset($this->session->data['shipping_address'])) {
 				$json['error'] = $this->language->get('error_shipping_address');
@@ -36,6 +32,10 @@ public function index(): void {
 			}
 		}
 
+		if ($this->config->get('config_checkout_payment_address') && !isset($this->session->data['payment_address'])) {
+			$json['error'] = $this->language->get('error_payment_address');
+		}
+
 		if (!$json) {
 			$payment_address = [];
 
diff --git a/upload/catalog/controller/api/shipping_method.php b/upload/catalog/controller/api/shipping_method.php
index 199fe32bd02..3c7b316bbd4 100644
--- a/upload/catalog/controller/api/shipping_method.php
+++ b/upload/catalog/controller/api/shipping_method.php
@@ -42,6 +42,10 @@ public function index(): void {
 		$this->response->setOutput(json_encode($json));
 	}
 
+	public function getMethods(): void {
+
+	}
+
 	/**
 	 * Save
 	 *
@@ -58,8 +62,20 @@ public function save(): void {
 			}
 
 			if (isset($this->request->post['shipping_method'])) {
+
+
+				if (!isset($this->request->post['shipping_method']['code'])) {
+
+
+				}
+
+
 				$shipping = explode('.', $this->request->post['shipping_method']);
 
+
+
+
+
 				if (!isset($shipping[0]) || !isset($shipping[1]) || !isset($this->session->data['shipping_methods'][$shipping[0]]['quote'][$shipping[1]])) {
 					$json['error'] = $this->language->get('error_shipping_method');
 				}