From abeac45655f08976956bea6bfc70d9a5c625b7b0 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 9 Feb 2023 15:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E8=A1=A8=E5=8D=95na?=
 =?UTF-8?q?me=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/views/gh/confirm_order.php          | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php
index f45703c0..646e9860 100644
--- a/application/third_party/order/views/gh/confirm_order.php
+++ b/application/third_party/order/views/gh/confirm_order.php
@@ -672,7 +672,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 
 					<p>Phone No.</p>
 					<div class="inputTerm">
-						<input type="text" name="Phone" required="" class="number">
+						<input type="text" name="mobile" required="" class="number">
 						<label>
 							including country code and area code
 						</label>
@@ -680,7 +680,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					<div class="selectionBlock">
 						<p>Home address</p>
 						<div class="inputTerm">
-							<input type="text" name="street" required="">
+							<input type="text" name="address_street" required="">
 							<label>
 								Street
 							</label>
@@ -688,7 +688,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="city" required="">
+							<input type="text" name="address_city" required="">
 							<label>
 								City
 							</label>
@@ -696,7 +696,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="state" required="">
+							<input type="text" name="address_state" required="">
 							<label>
 								State
 							</label>
@@ -704,7 +704,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="country" required="">
+							<input type="text" name="address_country" required="">
 							<label>
 								Country
 							</label>
@@ -722,7 +722,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					<div class="selectionBlock">
 
 						<div class="inputTerm">
-							<input type="text" name="Arrival flight No." required="">
+							<input type="text" name="MEI_ArrivalFlightNo" required="">
 							<label>
 								Arrival flight No.
 							</label>
@@ -730,7 +730,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="Arrival time" required="">
+							<input type="text" name="MEI_ArrivalTime" required="">
 							<label>
 								Arrival time
 							</label>
@@ -738,7 +738,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="Departure Flight No." required="">
+							<input type="text" name="MEI_DepartureFlightNo" required="">
 							<label>
 								Departure Flight No.
 							</label>
@@ -746,7 +746,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="Departure time" required="">
+							<input type="text" name="MEI_DepartureTime" required="">
 							<label>
 								Departure time
 							</label>
@@ -757,7 +757,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 				<div id="inquiryBox">
 					<h2>Your Special Request (optional)</h2>
 					<p></p>
-					<textarea id="additionalrequirements" name="Special Request" style="resize:none;"></textarea>
+					<textarea id="special_request" name="special_request" style="resize:none;"></textarea>
 				</div>
 
 				<div id="inquiryBox">
@@ -765,7 +765,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					<div class="emergency_title">(in case an unlikely event happens when you are travelling)</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="Emergency Contact name" required="">
+							<input type="text" name="emergency_person_name" required="">
 							<label>
 								Contact person's name
 							</label>
@@ -773,7 +773,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					</div>
 					<div class="selectionBlock">
 						<div class="inputTerm">
-							<input type="text" name="Emergency Contact Email" required="">
+							<input type="text" name="emergency_email" required="">
 							<label>
 								Email address
 							</label>
@@ -782,7 +782,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					<div class="selectionBlock">
 						<p>Relationship with him/her</p>
 						<div class="inputTerm">
-							<input type="text" name="Relationship" required="">
+							<input type="text" name="emergency_relationship" required="">
 							<label>
 								eg: He's Sue's father.
 							</label>
@@ -791,7 +791,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 					<div class="selectionBlock">
 						<p>Telephone No.</p>
 						<div class="inputTerm">
-							<input type="text" name="Emergency Contact Telephone No." required="">
+							<input type="text" name="emergency_telephone" required="">
 							<label>
 								including country code and area code
 							</label>
@@ -801,7 +801,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 
 				<div id="inquiryBox">
 					<h2>Your Insurance Information (Optional)</h2>
-					<textarea id="additionalrequirements" name="Insurance Information" style="resize:none;"></textarea>
+					<textarea id="insurance_information" name="insurance_information" style="resize:none;"></textarea>
 				</div>
 
 				<div class="inquiryBtn">
@@ -858,13 +858,17 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
     });
   };
 
+  function validateForm() {
+    console.info($("#form-confirm-info").serialize());
+    return false;
+  }
+
   function show_review_modal() {
-    // if (verifyInfo() == false) {
-    //   return false;
-    // }
+    if (!validateForm()) {
+      return false;
+    }
 
     // $('#reviewModal_body').html('loading....');
-    console.info($("#form-confirm-info").serialize());
     $.ajax({
       type: "post",
       dataType: "json",