Merge remote-tracking branch 'origin/master'

application/third_party/order/views/confirm_order.php

@@ -242,7 +242,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
 		.traveler_info {
 			border-bottom: 3px dashed #d1d1d1;
 			padding-bottom: 50px;
-			margin-bottom: 50px;
+			margin-bottom: 20px;
 		}
 
 		.emergency_title {
@@ -672,7 +672,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
                                                 <option value="665">Zambia</option>
                                                 <option value="666">Zimbabwe</option>
                                             </select>
-											<div class="inputTerm">
+											<div class="inputTerm" id='phoneNumberDiv'>
 												<input type="text" name="mobile" required="" class="number">
 												<label>
 													Phone number
@@ -757,7 +757,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					<div class="selectionBlock" style="width: 100%;">
 
 						<div class="inputTerm">
-							<input type="text" name="MEI_ArrivalFlightNo" required="">
+							<input type="text" name="MEI_ArrivalFlightNo">
 							<label>
 								Arrival flight No.
 							</label>
@@ -766,13 +766,13 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					<div class="selectionBlock" style="width: 100%;">
                         <p>Arrival time</p>
 						<div class="inputTerm">
-							<input type="datetime-local" name="MEI_ArrivalTime" required="">
+							<input type="datetime-local" name="MEI_ArrivalTime">
 							
 						</div>
 					</div>
 					<div class="selectionBlock" style="width: 100%;">
 						<div class="inputTerm">
-							<input type="text" name="MEI_DepartureFlightNo" required="">
+							<input type="text" name="MEI_DepartureFlightNo">
 							<label>
 								Departure Flight No.
 							</label>
@@ -781,17 +781,13 @@ select.gender_pick {border: 1px solid #d1d1d1;
 					<div class="selectionBlock" style="width: 100%;">
                         <p>Departure time</p>
 						<div class="inputTerm">
-							<input type="datetime-local" name="MEI_DepartureTime" required="">
+							<input type="datetime-local" name="MEI_DepartureTime">
 							
 						</div>
 					</div>
 				</div>
 
-				<div id="inquiryBox">
-					<h2>Your Special Request (optional)</h2>
-					<p></p>
-					<textarea id="special_request" name="special_request" style="resize:none;"></textarea>
-				</div>
+			
 
 				<div id="inquiryBox">
 					<h2>Emergency Contact Information (optional)</h2>
@@ -831,12 +827,11 @@ select.gender_pick {border: 1px solid #d1d1d1;
 						</div>
 					</div>
 				</div>
-
 				<div id="inquiryBox">
-					<h2>Your Insurance Information (Optional)</h2>
-					<textarea id="insurance_information" name="insurance_information" style="resize:none;"></textarea>
+					<h2>Your Insurance Information and Other Special Request (optional)</h2>
+					
+					<textarea id="special_request" name="special_request" style="resize:none;"></textarea>
 				</div>
-
 				<div class="inquiryBtn">          
           <input type="hidden" name="toname" value="<?php echo $userinfo[0]->OPI_FirstName; ?>">
           <input type="hidden" name="tomail" value="<?php echo $userinfo[0]->OPI_Email; ?>">      
@@ -940,6 +935,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
     //添加客户
     $("#add_traveler_button").click(function() {
       var $addTraveler = $travelerTemplate.clone();
+      $addTraveler.find('#phoneNumberDiv').remove();
       var travelerCount = $(".traveler_info").length + 1;
       $addTraveler.find('[data-header]').text('Traveler ' + travelerCount);
       $('#add_traveler_button').before($addTraveler);