From 299eaf3e5301f845942394a7dc9030c6a2c877ac Mon Sep 17 00:00:00 2001
From: syh101 <yuhui.shang@hainatravel.com>
Date: Fri, 19 Jul 2019 09:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E4=BA=BA=E5=A1=AB=E5=86=99=E6=8A=A4?=
 =?UTF-8?q?=E7=85=A7=E4=BF=A1=E6=81=AF=E7=9A=84=E9=93=BE=E6=8E=A5=E9=87=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0Occupation=E7=9A=84=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/order/views/confirm_order.php | 56 ++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php
index 05a815f3..40ce2a93 100644
--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@@ -65,7 +65,6 @@
                     <a name="passenger_information" id="passenger_information" ></a>
                 </div>
                 <form id="form-confirm-info" method="post" action="https://www.chinahighlights.com/secureinfoconfirm/confirm/save_confirm_info">
-                    <div class="col-xs-24 personinfo-box">
                         <div class="panel panel-default">
                             <div class="panel-body">
 
@@ -77,30 +76,33 @@
                                 </div>
 
                                 <div class="col-xs-24 nopadding hidden-xs">
-                                    <div class="form-group col-sm-8 nopadding-R" style="margin-bottom:0px;">
+                                    <div class="form-group col-sm-7 nopadding-R" style="margin-bottom:0px;">
                                         <label style="width:100%;text-align:left !important;">
                                             <div class="col-xs-24 nopadding" style="height:15px;font-weight:normal;">
                                                 Sur name/First and Middle name<a href="javascript:void(0);" data-toggle="modal" data-target="#sampleModal"> (Sample ▼)</a>
                                             </div>
                                         </label>
                                     </div>
-                                    <div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
+                                    <div class="form-group col-sm-3 nopadding-R" style="margin-bottom:0px;">
                                         <label class="" style="font-weight:normal">Passport No.</label>
                                     </div>
                                     <div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
                                         <label class="" style="font-weight:normal">Passport Expiration Date</label>
                                     </div>
-                                    <div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
+                                    <div class="form-group col-sm-3 nopadding-R" style="margin-bottom:0px;">
                                         <label class="" style="font-weight:normal">Birthday</label>
                                     </div>
-                                    <div class="form-group col-sm-4" style="margin-bottom:0px;">
+                                    <div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
                                         <label class="" style="font-weight:normal">Nationality</label>
+                                    </div>
+									<div class="form-group col-sm-3 nopadding-l" style="margin-bottom:0px;">
+                                        <label class="" style="font-weight:normal">Occupation</label>
                                     </div>
                                 </div>
 
                                 <div class="col-xs-24 nopadding personinfo-input-box">
 
-                                    <div class="form-group col-sm-8 nopadding-R">
+                                    <div class="form-group col-sm-7 nopadding-R">
                                         <label class="visible-xs-block" style="width:100%;text-align:left !important;">
                                             <div class="col-xs-24 nopadding" style="height:15px;">
                                                 Sur name/First and Middle name<a href="javascript:void(0);" data-toggle="modal" data-target="#sampleModal"> (Sample ▼)</a>
@@ -130,7 +132,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="form-group col-sm-4 nopadding-R">
+                                    <div class="form-group col-sm-3 nopadding-R">
                                         <label  class="visible-xs-block">Passport No.</label>
                                         <input type="text" class="form-control input-sm common_input" name="passport[]" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your passport!" autocomplete="off">
                                     </div>
@@ -142,7 +144,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="form-group col-sm-4 nopadding-R">
+                                    <div class="form-group col-sm-3 nopadding-R">
                                         <label  class="visible-xs-block">Birthday</label>
                                         <div class="input-groups date " data-date="1970-05-20">
                                             <input class="form-control input-sm common_input bd_datepicker" type="text" name="birthday[]" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Please fill in your birthday!" autocomplete="off" style="color:#333333 !important;">
@@ -151,7 +153,7 @@
 
                                     <div class="form-group col-sm-4">
                                         <label class="visible-xs-block">Nationality</label>
-                                        <div class="input-group">
+                                       
                                             <select class="form-control input-sm common_input" name="nationality[]">
                                                 <option value="18" selected="selected">Australia</option>
                                                 <option value="5">Canada</option>
@@ -391,12 +393,40 @@
                                                 <option value="665">Zambia</option>
                                                 <option value="666">Zimbabwe</option>
                                             </select>
-                                            <span class="input-group-addon" style="background:#fff;border:none;padding:2px 3px;">
+                                           
+                                    </div>
+                                    <div class="form-group col-sm-3 nopadding-L">
+                                       <div class="input-group">
+                                            <label  class="visible-xs-block">Occupation</label>
+                                            <select class="form-control input-sm nopadding select_occupation" name="occupation[]" placeholder="Occupation" >
+                                                   <option value="null"></option>
+                                                    <option value="Retired">Retired</option>
+                                                    <option value="Agriculture, Food & Natural Resources">Agriculture, Food & Natural Resources</option>
+                                                    <option value="Architecture & Construction">Architecture & Construction</option>
+                                                    <option value="Arts, Audio/Video Technology & Communications">Arts, Audio/Video Technology & Communications</option>
+                                                    <option value="Business Management & Administration">Business Management & Administration</option>
+                                                    <option value="Education & Training">Education & Training</option>
+                                                    <option value="Finance">Finance</option>
+                                                    <option value="Government & Public Administration">Government & Public Administration</option>
+                                                    <option value="Health Science">Health Science</option>
+                                                    <option value="Hospitality & Tourism">Hospitality & Tourism</option>
+                                                    <option value="Human Services">Human Services</option>
+                                                    <option value="Information Technology">Information Technology</option>
+                                                    <option value="Law, Public Safety, Corrections & Security">Law, Public Safety, Corrections & Security</option>
+                                                    <option value="Manufacturing">Manufacturing</option>
+                                                    <option value="Marketing, Sales & Service">Marketing, Sales & Service</option>
+                                                    <option value="Science, Technology, Engineering & Mathematics">Science, Technology, Engineering & Mathematics</option>
+                                                    <option value="Transportation, Distribution & Logistics">Transportation, Distribution & Logistics</option>
+                                                    <option value="Housewife">Housewife</option>
+                                                    <option value="Other">Other</option>
+                                                </select>
+                                                <span class="input-group-addon" style="background:#fff;border:none;padding:2px 3px;">
                                                 <span class="glyphicon glyphicon-minuss text-danger"></span>
-                                            </span>
+                                             </span>
                                         </div>
-                                    </div>
-
+                                   
+                                   
+                                            </div>
                                 </div>
 
                                 <div class="col-xs-24 add-personinfo-box">