From 577b8cc5788e43bdee95e1a6059c5e16e5fd6f49 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Dec 2023 09:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=80=89=E6=8B=A9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/gh-info-page-form.php  | 258 +++++++++++------
 .../views/mobile_first/gh-tour-form.php       | 259 ++++++++++++------
 2 files changed, 336 insertions(+), 181 deletions(-)

diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php
index 39d90997..43b94723 100644
--- a/application/views/mobile_first/gh-info-page-form.php
+++ b/application/views/mobile_first/gh-info-page-form.php
@@ -11,9 +11,7 @@
            <textarea id="additionalrequirements" name="additional_requirements"
               placeholder="E.g.: This is a big trip for anniversary, honeymoon, birthday celebration..." style="margin-bottom:20px;"></textarea>
               <div class="selectionBlock" style="margin-bottom: 0;">
-                <p style="
-              margin-bottom: 0px;
-          ">
+                <p style="margin-bottom: 0px;">
                   <strong>Number in your group</strong>
                 </p>
                 <div id="group_error_msg" style="display: none">
@@ -45,97 +43,175 @@
                 </div>
           
                 <div id="adultBlock" style="display: none">
-                
-                  <div class="peopleSelect">
-                    <p style="    margin-top: 10px;
-                              margin-bottom: 10px;"><strong>
-                      Adults (≥18 years old)
-                    </strong> </p>
-                    <button class="minaddBtn reduceadult" id="minusAdult" type="button"
-                      value="-">-</button>
-                    <input class="number" type="text" value="2" id="adultNumber" name="adult">
-                    <button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button>
-                  </div>
-                  <div class="age_range">
-                    <p>
-                      Adults' ages
-                    </p>
-                    <div class="checkYes" style="float:left; width: auto; margin-right: 30px;">
-                      <label for="65+">
-                        <input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+
-                      </label>
-                    </div>
-                    <div class="checkYes" style="float:left; width: auto; margin-right: 30px;">
-                      <label for="51-64">
-                        <input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64
-                      </label>
-                    </div>
-                    <div class="checkYes" style="float:left; width: auto; margin-right: 30px;">
-                      <label for="41-50">
-                        <input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50
-                      </label>
-                    </div>
-                    <div class="checkYes" style="float:left; width: auto; margin-right: 30px;">
-                      <label for="31-40">
-                        <input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40
-                      </label>
-                    </div>
-                    <div class="checkYes" style="float:left; width: auto; margin-right: 30px;">
-                      <label for="18-30">
-                        <input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30
-                      </label>
-                    </div>
-                  </div>
-                </div>
-                <div class="clear"></div>
-                <div id="childrenBlock" style="display: none">
-                  <p style=" margin-bottom: 0;"><strong>Children (age of children at time of trip)</strong></p>
+                  <p style="margin-bottom: 5px;"><strong>Adults number</strong></p>
+                  
+                                      <div class="kids_age" >
+                                          <p style="margin-bottom: 5px; margin-top: 0;">65+ yrs old</p>
+                                          <select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
+                                              <option value="0">0</option>
+                                              <option value="1">1 person</option>
+                                              <option value="2">2 people</option>
+                                              <option value="3">3 people</option>
+                                              <option value="4">4 people</option>
+                                              <option value="5">5 people</option>
+                                              <option value="6">6 people</option>
+                                              <option value="7">7 people</option>
+                                              <option value="8">8 people</option>
+                                              <option value="9">9 people</option>
+                                              <option value="10">10 people</option>
+                                              <option value="11">11 people</option>
+                                              <option value="12">12 people</option>
+                                              <option value="13">13 people</option>
+                                              <option value="14">14 people</option>
+                                              <option value="15">15 people</option>
+                                              <option value="16">16 people</option>
+                                              <option value="17">17 people</option>
+                                              <option value="18">18 people</option>
+                                              <option value="19">19 people</option>
+                                              <option value="20">20 people</option>
+                                              <option value="21">21 people</option>
+                                              <option value="22">22 people</option>
+                                              <option value="23">23 people</option>
+                                              <option value="24">24 people</option>
+                                              <option value="25">25 people</option>
+                                              <option value="26">26 people</option>
+                                              <option value="27">27 people</option>
+                                              <option value="28">28 people</option>
+                                              <option value="29">29 people</option>
+                                              <option value="30">30 people</option>
+                                              <option value="31">31 or more people</option>
+                                              </select>
+                                          </div>
+                                      <div class="kids_age" >
+                                          <p style="margin-bottom: 5px; margin-top: 0;">41-64 yrs old</p>
+                                          <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
+                                              <option value="0">0</option>
+                                              <option value="1">1 person</option>
+                                              <option value="2">2 people</option>
+                                              <option value="3">3 people</option>
+                                              <option value="4">4 people</option>
+                                              <option value="5">5 people</option>
+                                              <option value="6">6 people</option>
+                                              <option value="7">7 people</option>
+                                              <option value="8">8 people</option>
+                                              <option value="9">9 people</option>
+                                              <option value="10">10 people</option>
+                                              <option value="11">11 people</option>
+                                              <option value="12">12 people</option>
+                                              <option value="13">13 people</option>
+                                              <option value="14">14 people</option>
+                                              <option value="15">15 people</option>
+                                              <option value="16">16 people</option>
+                                              <option value="17">17 people</option>
+                                              <option value="18">18 people</option>
+                                              <option value="19">19 people</option>
+                                              <option value="20">20 people</option>
+                                              <option value="21">21 people</option>
+                                              <option value="22">22 people</option>
+                                              <option value="23">23 people</option>
+                                              <option value="24">24 people</option>
+                                              <option value="25">25 people</option>
+                                              <option value="26">26 people</option>
+                                              <option value="27">27 people</option>
+                                              <option value="28">28 people</option>
+                                              <option value="29">29 people</option>
+                                              <option value="30">30 people</option>
+                                              <option value="31">31 or more people</option>
+                                              </select>
+                                          </div>
+                  
+                                          <div class="kids_age" >
+                                              <p style="margin-bottom: 5px; margin-top: 0;">18-40 yrs old</p>
+                                              <select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
+                                                  <option value="0">0</option>
+                                                  <option value="1">1 person</option>
+                                                  <option value="2">2 people</option>
+                                                  <option value="3">3 people</option>
+                                                  <option value="4">4 people</option>
+                                                  <option value="5">5 people</option>
+                                                  <option value="6">6 people</option>
+                                                  <option value="7">7 people</option>
+                                                  <option value="8">8 people</option>
+                                                  <option value="9">9 people</option>
+                                                  <option value="10">10 people</option>
+                                                  <option value="11">11 people</option>
+                                                  <option value="12">12 people</option>
+                                                  <option value="13">13 people</option>
+                                                  <option value="14">14 people</option>
+                                                  <option value="15">15 people</option>
+                                                  <option value="16">16 people</option>
+                                                  <option value="17">17 people</option>
+                                                  <option value="18">18 people</option>
+                                                  <option value="19">19 people</option>
+                                                  <option value="20">20 people</option>
+                                                  <option value="21">21 people</option>
+                                                  <option value="22">22 people</option>
+                                                  <option value="23">23 people</option>
+                                                  <option value="24">24 people</option>
+                                                  <option value="25">25 people</option>
+                                                  <option value="26">26 people</option>
+                                                  <option value="27">27 people</option>
+                                                  <option value="28">28 people</option>
+                                                  <option value="29">29 people</option>
+                                                  <option value="30">30 people</option>
+                                                  <option value="31">31 or more people</option>
+                                                  </select>
+                                              </div>
+                                  </div>
+              <div class="clear"></div>
+              <div id='childrenBlock' style="display: none">
+                  <p style="margin-bottom: 5px;"><strong>Children number (age of children at time of trip)</strong></p>
                   <div class="kids_age">
-                    <p style="margin-bottom: 5px;">10-17 yrs old</p>
-                    <select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs">
-                      <option value="0">0
-                      </option>
-                      <option value="1">1
-                      </option>
-                      <option value="2">2
-                      </option>
-                      <option value="3">3
-                      </option>
-                      <option value="4">4
-                      </option>
-                    </select>
+                      <p style="margin-bottom: 5px;">10-17 yrs old</p>
+                      <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
+                          <option value="0">0 
+                          </option>
+                          <option value="1">1 person
+                          </option>
+    
+                          <option value="2">2 people
+                          </option>
+                          <option value="3">3 people
+                          </option> 
+                          <option value="4">4 people
+                          </option>
+                          <option value="5">5 people</option>
+                      </select>
                   </div>
                   <div class="kids_age">
-                    <p style="margin-bottom: 5px;">3-9 yrs old</p>
-                    <select class="kids_number" id="childrenNumber" name="children_3_9_yrs">
-                      <option value="0">0
-                      </option>
-                      <option value="1">1
-                      </option>         
-                      <option value="2">2
-                      </option>
-                      <option value="3">3
-                      </option>
-                      <option value="4">4
-                      </option>
-                    </select>
+                      <p style="margin-bottom: 5px;">3-9 yrs old</p>
+                      <select class="kids_number" id="childrenNumber" name="children_3_9">
+                          <option value="0">0
+                          </option>
+                          <option value="1">1 person
+                          </option>
+    
+                          <option value="2">2 people
+                          </option>
+                          <option value="3">3 people
+                          </option>
+                          <option value="4">4 people
+                          </option>
+                          <option value="5">5 people</option>
+                      </select>
                   </div>
                   <div class="kids_age">
-                    <p style="margin-bottom: 5px;">0-2 yrs old</p>
-                    <select class="kids_number" id="infantNumber" name="infant_0_2_yrs">
-                      <option value="0">0
-                      </option>
-                      <option value="1">1
-                      </option>
-                      <option value="2">2
-                      </option>
-                      <option value="3">3
-                      </option>
-                      <option value="4">4
-                      </option>
-                    </select>
+                      <p style="margin-bottom: 5px;">0-2 yrs old</p>
+                      <select class="kids_number" id="infantNumber" name="infant_0_2">
+                          <option value="0">0
+                          </option>
+                          <option value="1">1 person
+                          </option>
+                          <option value="2">2 people
+                          </option>
+                          <option value="3">3 people
+                          </option>
+                          <option value="4">4 people
+                          </option>
+                          <option value="5">5 people</option>
+                      </select>
                   </div>
-                </div>
+              </div>
           
               </div>
               <div class="selectionBlock" style="margin-bottom: 10px;">
@@ -149,19 +225,19 @@
                 <div class="travel_group date_select" >
                     <input type="radio" value="exact travel dates" id="exact" name="trip_date">
                     <label for="exact" class="updatedestination" style="font-size: 18px;">
-                        Exact travel dates
+                        Exact dates
                     </label>
                 </div>
                 <div class="travel_group date_select" >
                     <input type="radio" value="approximate travel dates" id="approximate" name="trip_date">
                     <label for="approximate" class="updatedestination" style="font-size: 18px;">
-                        Approximate travel dates
+                        Approximate dates
                     </label>
                 </div>
                 <div class="travel_group date_select" >
                     <input type="radio" value="haven't decided travel dates" id="yet" name="trip_date">
                     <label for="yet" class="updatedestination" style="font-size: 18px;">
-                        Not decided travel dates
+                        Undecided dates
                     </label>
                 </div>
                 
diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php
index b2575e9f..16a98e2d 100644
--- a/application/views/mobile_first/gh-tour-form.php
+++ b/application/views/mobile_first/gh-tour-form.php
@@ -37,96 +37,175 @@
               </label>
             </div>
             <div id="adultBlock" style="display: none">
-             
-              <div class="peopleSelect">
-                <p style="margin-top: 20px;"><strong>
-                  Adults (≥18 years old)
-                </strong> </p>
-                <button class="minaddBtn reduceadult" id="minusAdult" type="button"
-                value="-">-</button>
-                <input class="number" type="text" value="2" id="adultNumber" name="adult">
-                <button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button>
-              </div>
-              <div class="age_range">
-                <p>
-                  Adults' ages
-                </p>
-                <div class="checkYes" style="float:left;">
-                  <label for="65+">
-                    <input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+
-                  </label>
-                </div>
-                <div class="checkYes" style="float:left;">
-                  <label for="51-64">
-                    <input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64
-                  </label>
-                </div>
-                <div class="checkYes" style="float:left;">
-                  <label for="41-50">
-                    <input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50
-                  </label>
-                </div>
-                <div class="checkYes" style="float:left;">
-                  <label for="31-40">
-                    <input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40
-                  </label>
-                </div>
-                <div class="checkYes" style="float:left;">
-                  <label for="18-30">
-                    <input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30
-                  </label>
-                </div>
-              </div>
-            </div>
-            <div class="clear"></div>
-            <div id="childrenBlock" style="display: none">
-              <p style="margin-top: 0;margin-bottom: 0;"><strong>Children</strong></p>
+              <p style="margin-bottom: 5px;"><strong>Adults number</strong></p>
+              
+                                  <div class="kids_age" >
+                                      <p style="margin-bottom: 5px; margin-top: 0;">65+ yrs old</p>
+                                      <select class="kids_number" id="adultNumber_65_plus" name="adult_65_plus" >
+                                          <option value="0">0</option>
+                                          <option value="1">1 person</option>
+                                          <option value="2">2 people</option>
+                                          <option value="3">3 people</option>
+                                          <option value="4">4 people</option>
+                                          <option value="5">5 people</option>
+                                          <option value="6">6 people</option>
+                                          <option value="7">7 people</option>
+                                          <option value="8">8 people</option>
+                                          <option value="9">9 people</option>
+                                          <option value="10">10 people</option>
+                                          <option value="11">11 people</option>
+                                          <option value="12">12 people</option>
+                                          <option value="13">13 people</option>
+                                          <option value="14">14 people</option>
+                                          <option value="15">15 people</option>
+                                          <option value="16">16 people</option>
+                                          <option value="17">17 people</option>
+                                          <option value="18">18 people</option>
+                                          <option value="19">19 people</option>
+                                          <option value="20">20 people</option>
+                                          <option value="21">21 people</option>
+                                          <option value="22">22 people</option>
+                                          <option value="23">23 people</option>
+                                          <option value="24">24 people</option>
+                                          <option value="25">25 people</option>
+                                          <option value="26">26 people</option>
+                                          <option value="27">27 people</option>
+                                          <option value="28">28 people</option>
+                                          <option value="29">29 people</option>
+                                          <option value="30">30 people</option>
+                                          <option value="31">31 or more people</option>
+                                          </select>
+                                      </div>
+                                  <div class="kids_age" >
+                                      <p style="margin-bottom: 5px; margin-top: 0;">41-64 yrs old</p>
+                                      <select class="kids_number" id="adultNumber_41_64" name="adult_41_64" >
+                                          <option value="0">0</option>
+                                          <option value="1">1 person</option>
+                                          <option value="2">2 people</option>
+                                          <option value="3">3 people</option>
+                                          <option value="4">4 people</option>
+                                          <option value="5">5 people</option>
+                                          <option value="6">6 people</option>
+                                          <option value="7">7 people</option>
+                                          <option value="8">8 people</option>
+                                          <option value="9">9 people</option>
+                                          <option value="10">10 people</option>
+                                          <option value="11">11 people</option>
+                                          <option value="12">12 people</option>
+                                          <option value="13">13 people</option>
+                                          <option value="14">14 people</option>
+                                          <option value="15">15 people</option>
+                                          <option value="16">16 people</option>
+                                          <option value="17">17 people</option>
+                                          <option value="18">18 people</option>
+                                          <option value="19">19 people</option>
+                                          <option value="20">20 people</option>
+                                          <option value="21">21 people</option>
+                                          <option value="22">22 people</option>
+                                          <option value="23">23 people</option>
+                                          <option value="24">24 people</option>
+                                          <option value="25">25 people</option>
+                                          <option value="26">26 people</option>
+                                          <option value="27">27 people</option>
+                                          <option value="28">28 people</option>
+                                          <option value="29">29 people</option>
+                                          <option value="30">30 people</option>
+                                          <option value="31">31 or more people</option>
+                                          </select>
+                                      </div>
+              
+                                      <div class="kids_age" >
+                                          <p style="margin-bottom: 5px; margin-top: 0;">18-40 yrs old</p>
+                                          <select class="kids_number" id="adultNumber_18_40" name="adult_18_40" >
+                                              <option value="0">0</option>
+                                              <option value="1">1 person</option>
+                                              <option value="2">2 people</option>
+                                              <option value="3">3 people</option>
+                                              <option value="4">4 people</option>
+                                              <option value="5">5 people</option>
+                                              <option value="6">6 people</option>
+                                              <option value="7">7 people</option>
+                                              <option value="8">8 people</option>
+                                              <option value="9">9 people</option>
+                                              <option value="10">10 people</option>
+                                              <option value="11">11 people</option>
+                                              <option value="12">12 people</option>
+                                              <option value="13">13 people</option>
+                                              <option value="14">14 people</option>
+                                              <option value="15">15 people</option>
+                                              <option value="16">16 people</option>
+                                              <option value="17">17 people</option>
+                                              <option value="18">18 people</option>
+                                              <option value="19">19 people</option>
+                                              <option value="20">20 people</option>
+                                              <option value="21">21 people</option>
+                                              <option value="22">22 people</option>
+                                              <option value="23">23 people</option>
+                                              <option value="24">24 people</option>
+                                              <option value="25">25 people</option>
+                                              <option value="26">26 people</option>
+                                              <option value="27">27 people</option>
+                                              <option value="28">28 people</option>
+                                              <option value="29">29 people</option>
+                                              <option value="30">30 people</option>
+                                              <option value="31">31 or more people</option>
+                                              </select>
+                                          </div>
+                              </div>
+          <div class="clear"></div>
+          <div id='childrenBlock' style="display: none">
+              <p style="margin-bottom: 5px;"><strong>Children number (age of children at time of trip)</strong></p>
               <div class="kids_age">
-                <p style="margin-bottom: 5px;">10-17 yrs old</p>
-                <select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs">
-                  <option value="0">0
-                  </option>
-                  <option value="1">1
-                  </option>
-                  <option value="2">2
-                  </option>
-                  <option value="3">3
-                  </option>
-                  <option value="4">4
-                  </option>
-                </select>
+                  <p style="margin-bottom: 5px;">10-17 yrs old</p>
+                  <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
+                      <option value="0">0 
+                      </option>
+                      <option value="1">1 person
+                      </option>
+
+                      <option value="2">2 people
+                      </option>
+                      <option value="3">3 people
+                      </option> 
+                      <option value="4">4 people
+                      </option>
+                      <option value="5">5 people</option>
+                  </select>
               </div>
               <div class="kids_age">
-                <p style="margin-bottom: 5px;">3-9 yrs old</p>
-                <select class="kids_number" id="childrenNumber" name="children_3_9_yrs">
-                  <option value="0">0
-                  </option>
-                  <option value="1">1
-                  </option>
-                  <option value="2">2
-                  </option>
-                  <option value="3">3
-                  </option>
-                  <option value="4">4
-                  </option>
-                </select>
+                  <p style="margin-bottom: 5px;">3-9 yrs old</p>
+                  <select class="kids_number" id="childrenNumber" name="children_3_9">
+                      <option value="0">0
+                      </option>
+                      <option value="1">1 person
+                      </option>
+
+                      <option value="2">2 people
+                      </option>
+                      <option value="3">3 people
+                      </option>
+                      <option value="4">4 people
+                      </option>
+                      <option value="5">5 people</option>
+                  </select>
               </div>
               <div class="kids_age">
-                <p style="margin-bottom: 5px;">0-2 yrs old</p>
-                <select class="kids_number" id="infantNumber" name="infant_0_2_yrs">
-                  <option value="0">0
-                  </option>
-                  <option value="1">1
-                  </option>
-                  <option value="2">2
-                  </option>
-                  <option value="3">3
-                  </option>
-                  <option value="4">4
-                  </option>
-                </select>
+                  <p style="margin-bottom: 5px;">0-2 yrs old</p>
+                  <select class="kids_number" id="infantNumber" name="infant_0_2">
+                      <option value="0">0
+                      </option>
+                      <option value="1">1 person
+                      </option>
+                      <option value="2">2 people
+                      </option>
+                      <option value="3">3 people
+                      </option>
+                      <option value="4">4 people
+                      </option>
+                      <option value="5">5 people</option>
+                  </select>
               </div>
-            </div>
+          </div>
           </div>
           <div class="selectionBlock">
             <h4 style="margin-top: 0; margin-bottom: 0;font-weight: 400;">
@@ -138,19 +217,19 @@
             <div class="travel_group date_select">
               <input type="radio" value="Exact travel dates" id="exact" name="trip_date">
               <label for="exact" class="family">
-                Exact travel dates
+                Exact dates
               </label>
             </div>
             <div class="travel_group date_select">
               <input type="radio" value="Approximate travel dates" id="approximate" name="trip_date">
               <label for="approximate" class="couple">
-                Approximate travel dates
+                Approximate dates
               </label>
             </div>
             <div class="travel_group date_select">
               <input type="radio" value="Undecided travel dates" id="yet" name="trip_date">
               <label for="yet" class="solo">
-                Undecided travel dates
+                Undecided dates
               </label>
             </div>
             <div class="trip_date_length" id="tripDateBlock" style="display: none">
@@ -172,19 +251,19 @@
             <div class="travel_group date_select">
               <input type="radio" value="Luxury (5 stars & up)" id="Luxury" name="hotel">
               <label for="Luxury" class="family">
-                Luxury <em>(5 stars & up)</em>
+                Luxury<br> <em>(5 stars & up)</em>
               </label>
             </div>
             <div class="travel_group date_select">
               <input type="radio" value="Handpicked Comfort (4-5 stars)" id="Handpicked" name="hotel">
               <label for="Handpicked" class="couple">
-                Handpicked Comfort <em>(4-5 stars)</em>
+                Handpicked Comfort<br> <em>(4-5 stars)</em>
               </label>
             </div>
             <div class="travel_group date_select">
               <input type="radio" value="Standard (3 stars)" id="Standard" name="hotel">
               <label for="Standard" class="solo">
-                Standard <em>(3 stars)</em>
+                Standard<br> <em>(3 stars)</em>
               </label>
             </div>
           </div>