From 6d8b69c2b7e1ea5633ad286beb089102525aaccf Mon Sep 17 00:00:00 2001
From: Dao Duc <ducdt@hurasoft.com>
Date: Fri, 26 Jan 2024 11:59:06 +0700
Subject: [PATCH] update order page 12:00

---
 template/order/detail-new.html | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/template/order/detail-new.html b/template/order/detail-new.html
index 3c7f2b7..fa25d46 100644
--- a/template/order/detail-new.html
+++ b/template/order/detail-new.html
@@ -202,11 +202,12 @@
 
                     <div style="margin: 5px 0 10px;">
                         <input type="button" onclick="OrderManagement.update_payment_status()" title="Click để xác nhận đơn đã được thanh toán đủ" value="Đã nhận đủ"
-                        class="bg-[#0041E8] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                            class="bg-[#0041E8] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
                         >
 
-                        <input type="button" value="Quay lại" onclick="openPaymentStatusUpdateForm()"
-                        class="bg-[#9e9e9e] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                        <input type="button" value="Quay lại"
+                            class="bg-[#9e9e9e] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                            onclick="$('#js-payment-status-holder').hide()"
                         >
                     </div>
                 </div>
@@ -232,11 +233,12 @@
 
                     <div style="margin: 5px 0 10px;">
                         <input type="button" onclick="OrderManagement.update_fulfillment_status()" title="Click để xác nhận đơn đã được vận chuyển thành công" value="Đã vận chuyển"
-                        class="bg-[#0041E8] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                            class="bg-[#0041E8] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
                         >
 
-                        <input type="button" value="Quay lại" onclick="openFulfillmentStatusUpdateForm()"
-                        class="bg-[#9e9e9e] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                        <input type="button" value="Quay lại"
+                            class="bg-[#9e9e9e] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                            onclick="$('#js-fulfillment-status-holder').hide()"
                         >
                     </div>
                 </div>
@@ -266,11 +268,12 @@
                         </select>
             
                         <input type="button" onclick="OrderManagement.update_order_status()" title="Click để xác nhận" value="Lưu lại"
-                        class="bg-[#0041E8] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                            class="bg-[#0041E8] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
                         >
             
-                        <input type="button" value="Quay lại" onclick="openOrderStatusUpdateForm()"
-                        class="bg-[#9e9e9e] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                        <input type="button" value="Quay lại"
+                            class="bg-[#9e9e9e] cursor-pointer font-[500] h-[32px] p-[0_15px] rounded-[4px] text-[#fff]"
+                            onclick="$('#js-order-status-holder').hide()"
                         >
                     </div>
                 </div>