From 835bedd96aa01aa11854acca942965ccc0dfb654 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 09:25:47 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E6=96=87=E4=B8=AD=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E7=BC=A9=E5=87=8F=E4=B8=BA4=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-recommends-tour.php | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/application/views/mobile_first/ah-recommends-tour.php b/application/views/mobile_first/ah-recommends-tour.php
index 6a084d16..2458a796 100644
--- a/application/views/mobile_first/ah-recommends-tour.php
+++ b/application/views/mobile_first/ah-recommends-tour.php
@@ -1,6 +1,6 @@
 <div class="infopage_ad_content">
     <?php if (!empty($recommands['Content Tour A']) || !empty($recommands['Content Tour B']) || !empty($recommands['Content Tour C']) || !empty($recommands['Content Tour D'])) { ?>
-        <div class="content_article_title">You might be interested in:</div>
+        <div class="content_article_title">Explore similar itineraries:</div>
       
                     <?php if (!empty($recommands['Content Tour A'])) { ?>
                        <div class="infopage_ad">
@@ -71,41 +71,5 @@
                         </div>
                     <?php } ?>
 
-
-                    <?php if (!empty($recommands['Content Tour E'])) { ?>
-                       <div class="infopage_ad">
-                            <a href="<?php echo $recommands['Content Tour E']->ic_url; ?>"> <img
-                                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour E']->mobile_photo; ?>"
-                                        class="img-responsive"
-                                        alt="<?php echo $recommands['Content Tour E']->ic_title; ?>"></a>
-
-                            <div class="content_article_name"><a
-                                        href="<?php echo $recommands['Content Tour E']->ic_url; ?>"> <?php echo $recommands['Content Tour E']->ic_title; ?> </a>
-                            </div>
-                            <div class="content_article_button"><a
-                                        href="<?php echo $recommands['Content Tour E']->ic_url; ?>"></a>
-                            </div>
-                        </div>
-                    <?php } ?>
-
-
-                    <?php if (!empty($recommands['Content Tour F'])) { ?>
-                       <div class="infopage_ad">
-                            <a href="<?php echo $recommands['Content Tour F']->ic_url; ?>"> <img
-                                        src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour F']->mobile_photo; ?>"
-                                        class="img-responsive"
-                                        alt="<?php echo $recommands['Content Tour F']->ic_title; ?>"></a>
-
-                            <div class="content_article_name"><a
-                                        href="<?php echo $recommands['Content Tour F']->ic_url; ?>"> <?php echo $recommands['Content Tour F']->ic_title; ?> </a>
-                            </div>
-                            <div class="content_article_button"><a
-                                        href="<?php echo $recommands['Content Tour F']->ic_url; ?>"></a>
-                            </div>
-                        </div>
-                    <?php } ?>
-
     <?php } ?>
 </div>
\ No newline at end of file

From 3edb6fc7cfcc61d24b84a5929409cd3c024fa86d Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 09:26:54 +0800
Subject: [PATCH 02/14] 11

---
 application/views/mobile_first/ah-recommends-tour.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-recommends-tour.php b/application/views/mobile_first/ah-recommends-tour.php
index 2458a796..fd96755c 100644
--- a/application/views/mobile_first/ah-recommends-tour.php
+++ b/application/views/mobile_first/ah-recommends-tour.php
@@ -1,7 +1,6 @@
 <div class="infopage_ad_content">
     <?php if (!empty($recommands['Content Tour A']) || !empty($recommands['Content Tour B']) || !empty($recommands['Content Tour C']) || !empty($recommands['Content Tour D'])) { ?>
-        <div class="content_article_title">Explore similar itineraries:</div>
-      
+        <div class="content_article_title">Explore similar itineraries:</div>     
                     <?php if (!empty($recommands['Content Tour A'])) { ?>
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour A']->ic_url; ?>"> <img

From 05c6e555e118a176ec7ac2579a9505bea4dd7c71 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 09:40:14 +0800
Subject: [PATCH 03/14] 11

---
 application/views/mobile_first/ah-recommends-tour.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/ah-recommends-tour.php b/application/views/mobile_first/ah-recommends-tour.php
index fd96755c..b73ea002 100644
--- a/application/views/mobile_first/ah-recommends-tour.php
+++ b/application/views/mobile_first/ah-recommends-tour.php
@@ -5,7 +5,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour A']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour A']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour A']->ic_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour A']->ic_title; ?>"></a>
 
@@ -22,7 +22,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour B']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour B']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour B']->ic_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour B']->ic_title; ?>"></a>
 
@@ -40,7 +40,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour C']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour C']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour C']->ic_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour C']->ic_title; ?>"></a>
 
@@ -57,7 +57,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour D']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour D']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour D']->ic_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour D']->ic_title; ?>"></a>
 

From d8b96f57802eef0daeeb918d2f3403a8d3fbcf3d Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 09:50:57 +0800
Subject: [PATCH 04/14] 11

---
 application/views/mobile_first/ah-recommends-tour.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/ah-recommends-tour.php b/application/views/mobile_first/ah-recommends-tour.php
index b73ea002..314c4edf 100644
--- a/application/views/mobile_first/ah-recommends-tour.php
+++ b/application/views/mobile_first/ah-recommends-tour.php
@@ -5,7 +5,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour A']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour A']->ic_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour A']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour A']->ic_title; ?>"></a>
 
@@ -22,7 +22,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour B']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour B']->ic_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour B']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour B']->ic_title; ?>"></a>
 
@@ -40,7 +40,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour C']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour C']->ic_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour C']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour C']->ic_title; ?>"></a>
 
@@ -57,7 +57,7 @@
                        <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Tour D']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Tour D']->ic_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Tour D']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Tour D']->ic_title; ?>"></a>
 

From 8fff23a748f790b2e8be4ebf8ca45171ddd0e819 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 15:15:38 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-info-page-form.php  | 228 ++++++++++--------
 .../views/mobile_first/ah-inquiry-form.php    | 228 ++++++++++--------
 2 files changed, 246 insertions(+), 210 deletions(-)

diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php
index f36de899..9b11355d 100644
--- a/application/views/mobile_first/ah-info-page-form.php
+++ b/application/views/mobile_first/ah-info-page-form.php
@@ -46,109 +46,118 @@
                   <p style="margin-bottom: 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="1">1</option>
+                      <option value="2">2</option>
+                      <option value="3">3</option>
+                      <option value="4">4</option>
+                      <option value="5">5</option>
+                      <option value="6">6</option>
+                      <option value="7">7</option>
+                      <option value="8">8</option>
+                      <option value="9">9</option>
+                      <option value="10">10</option>
+                      <option value="11">11</option>
+                      <option value="12">12</option>
+                      <option value="13">13</option>
+                      <option value="14">14</option>
+                      <option value="15">15</option>
+                      <option value="16">16</option>
+                      <option value="17">17</option>
+                      <option value="18">18</option>
+                      <option value="19">19</option>
+                      <option value="20">20</option>
+                      <option value="21">21</option>
+                      <option value="22">22</option>
+                      <option value="23">23</option>
+                      <option value="24">24</option>
+                      <option value="25">25</option>
+                      <option value="26">26</option>
+                      <option value="27">27</option>
+                      <option value="28">28</option>
+                      <option value="29">29</option>
+                      <option value="30">30</option>
                       </select>
+                      <p style="
+    margin-top: 5px;
+">people</p>
               </div>
               <div class="kids_age">
                   <p style="margin-bottom: 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="1">1</option>
+                      <option value="2">2</option>
+                      <option value="3">3</option>
+                      <option value="4">4</option>
+                      <option value="5">5</option>
+                      <option value="6">6</option>
+                      <option value="7">7</option>
+                      <option value="8">8</option>
+                      <option value="9">9</option>
+                      <option value="10">10</option>
+                      <option value="11">11</option>
+                      <option value="12">12</option>
+                      <option value="13">13</option>
+                      <option value="14">14</option>
+                      <option value="15">15</option>
+                      <option value="16">16</option>
+                      <option value="17">17</option>
+                      <option value="18">18</option>
+                      <option value="19">19</option>
+                      <option value="20">20</option>
+                      <option value="21">21</option>
+                      <option value="22">22</option>
+                      <option value="23">23</option>
+                      <option value="24">24</option>
+                      <option value="25">25</option>
+                      <option value="26">26</option>
+                      <option value="27">27</option>
+                      <option value="28">28</option>
+                      <option value="29">29</option>
+                      <option value="30">30</option>
                       </select>
+                      <p style="
+    margin-top: 5px;
+">people</p>
               </div>
               <div class="kids_age">
                   <p style="margin-bottom: 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="1">1</option>
+                      <option value="2">2</option>
+                      <option value="3">3</option>
+                      <option value="4">4</option>
+                      <option value="5">5</option>
+                      <option value="6">6</option>
+                      <option value="7">7</option>
+                      <option value="8">8</option>
+                      <option value="9">9</option>
+                      <option value="10">10</option>
+                      <option value="11">11</option>
+                      <option value="12">12</option>
+                      <option value="13">13</option>
+                      <option value="14">14</option>
+                      <option value="15">15</option>
+                      <option value="16">16</option>
+                      <option value="17">17</option>
+                      <option value="18">18</option>
+                      <option value="19">19</option>
+                      <option value="20">20</option>
+                      <option value="21">21</option>
+                      <option value="22">22</option>
+                      <option value="23">23</option>
+                      <option value="24">24</option>
+                      <option value="25">25</option>
+                      <option value="26">26</option>
+                      <option value="27">27</option>
+                      <option value="28">28</option>
+                      <option value="29">29</option>
+                      <option value="30">30</option>
                       </select>
+                      <p style="
+    margin-top: 5px;
+">people</p>
               </div>
           </div>
           <div class="clear"></div>
@@ -158,34 +167,43 @@
                   <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>
+              <option value="1">1</option>
+              <option value="2">2</option>
+              <option value="3">3</option>
+              <option value="4">4</option>
+              <option value="5">5</option>
                   </select>
+                  <p style="
+    margin-top: 5px;
+">people</p>
               </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">
                   <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="1">1</option>
+              <option value="2">2</option>
+              <option value="3">3</option>
+              <option value="4">4</option>
+              <option value="5">5</option>
                 </select>
+                <p style="
+    margin-top: 5px;
+">people</p>
               </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">
                   <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="1">1</option>
+              <option value="2">2</option>
+              <option value="3">3</option>
+              <option value="4">4</option>
+              <option value="5">5</option>
                   </select>
+                  <p style="
+    margin-top: 5px;
+">people</p>
               </div>
           </div>
 
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 3d54d8f0..db8d4960 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -42,112 +42,121 @@
                     <p style="margin-bottom: 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="1">1</option>
+                        <option value="2">2</option>
+                        <option value="3">3</option>
+                        <option value="4">4</option>
+                        <option value="5">5</option>
+                        <option value="6">6</option>
+                        <option value="7">7</option>
+                        <option value="8">8</option>
+                        <option value="9">9</option>
+                        <option value="10">10</option>
+                        <option value="11">11</option>
+                        <option value="12">12</option>
+                        <option value="13">13</option>
+                        <option value="14">14</option>
+                        <option value="15">15</option>
+                        <option value="16">16</option>
+                        <option value="17">17</option>
+                        <option value="18">18</option>
+                        <option value="19">19</option>
+                        <option value="20">20</option>
+                        <option value="21">21</option>
+                        <option value="22">22</option>
+                        <option value="23">23</option>
+                        <option value="24">24</option>
+                        <option value="25">25</option>
+                        <option value="26">26</option>
+                        <option value="27">27</option>
+                        <option value="28">28</option>
+                        <option value="29">29</option>
+                        <option value="30">30</option>
                         
                         </select>
+                        <p style="
+    margin-top: 5px;
+">people</p>
                 </div>
                 <div class="kids_age">
                     <p style="margin-bottom: 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="1">1</option>
+                        <option value="2">2</option>
+                        <option value="3">3</option>
+                        <option value="4">4</option>
+                        <option value="5">5</option>
+                        <option value="6">6</option>
+                        <option value="7">7</option>
+                        <option value="8">8</option>
+                        <option value="9">9</option>
+                        <option value="10">10</option>
+                        <option value="11">11</option>
+                        <option value="12">12</option>
+                        <option value="13">13</option>
+                        <option value="14">14</option>
+                        <option value="15">15</option>
+                        <option value="16">16</option>
+                        <option value="17">17</option>
+                        <option value="18">18</option>
+                        <option value="19">19</option>
+                        <option value="20">20</option>
+                        <option value="21">21</option>
+                        <option value="22">22</option>
+                        <option value="23">23</option>
+                        <option value="24">24</option>
+                        <option value="25">25</option>
+                        <option value="26">26</option>
+                        <option value="27">27</option>
+                        <option value="28">28</option>
+                        <option value="29">29</option>
+                        <option value="30">30</option>
                         
                         </select>
+                        <p style="
+    margin-top: 5px;
+">people</p>
                 </div>
                 <div class="kids_age">
                     <p style="margin-bottom: 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="1">1</option>
+                        <option value="2">2</option>
+                        <option value="3">3</option>
+                        <option value="4">4</option>
+                        <option value="5">5</option>
+                        <option value="6">6</option>
+                        <option value="7">7</option>
+                        <option value="8">8</option>
+                        <option value="9">9</option>
+                        <option value="10">10</option>
+                        <option value="11">11</option>
+                        <option value="12">12</option>
+                        <option value="13">13</option>
+                        <option value="14">14</option>
+                        <option value="15">15</option>
+                        <option value="16">16</option>
+                        <option value="17">17</option>
+                        <option value="18">18</option>
+                        <option value="19">19</option>
+                        <option value="20">20</option>
+                        <option value="21">21</option>
+                        <option value="22">22</option>
+                        <option value="23">23</option>
+                        <option value="24">24</option>
+                        <option value="25">25</option>
+                        <option value="26">26</option>
+                        <option value="27">27</option>
+                        <option value="28">28</option>
+                        <option value="29">29</option>
+                        <option value="30">30</option>
                         
                         </select>
+                        <p style="
+    margin-top: 5px;
+">people</p>
                 </div>
             </div>
             <div class="clear"></div>
@@ -157,34 +166,43 @@
                     <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>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+                <option value="5">5</option>
                     </select>
+                    <p style="
+    margin-top: 5px;
+">people</p>
                 </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">
                     <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="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+                <option value="5">5</option>
                 </select>
+                <p style="
+    margin-top: 5px;
+">people</p>
                 </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">
                     <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="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+                <option value="5">5</option>
                     </select>
+                    <p style="
+    margin-top: 5px;
+">people</p>
                 </div>
             </div>
 

From fdfad34b1e975733b7ab5829681662443d452a95 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 15:19:35 +0800
Subject: [PATCH 06/14] 11

---
 application/views/mobile_first/ah-info-page-form.php | 4 +---
 application/views/mobile_first/ah-inquiry-form.php   | 9 +++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php
index 9b11355d..17fe300c 100644
--- a/application/views/mobile_first/ah-info-page-form.php
+++ b/application/views/mobile_first/ah-info-page-form.php
@@ -116,9 +116,7 @@
                       <option value="29">29</option>
                       <option value="30">30</option>
                       </select>
-                      <p style="
-    margin-top: 5px;
-">people</p>
+                      <p style="margin-top: 5px;">people</p>
               </div>
               <div class="kids_age">
                   <p style="margin-bottom: 0;">18-40 yrs old</p>
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index db8d4960..50a90dd1 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -71,8 +71,7 @@
                         <option value="27">27</option>
                         <option value="28">28</option>
                         <option value="29">29</option>
-                        <option value="30">30</option>
-                        
+                        <option value="30">30</option>                       
                         </select>
                         <p style="
     margin-top: 5px;
@@ -111,8 +110,7 @@
                         <option value="27">27</option>
                         <option value="28">28</option>
                         <option value="29">29</option>
-                        <option value="30">30</option>
-                        
+                        <option value="30">30</option>                      
                         </select>
                         <p style="
     margin-top: 5px;
@@ -151,8 +149,7 @@
                         <option value="27">27</option>
                         <option value="28">28</option>
                         <option value="29">29</option>
-                        <option value="30">30</option>
-                        
+                        <option value="30">30</option>                       
                         </select>
                         <p style="
     margin-top: 5px;

From bf72bd6f2f2e5f018e6351bdb3d39d1f2e08c86c Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 15:22:24 +0800
Subject: [PATCH 07/14] 11

---
 application/views/mobile_first/ah-info-page-form.php | 6 +++---
 application/views/mobile_first/ah-inquiry-form.php   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php
index 17fe300c..5a130be5 100644
--- a/application/views/mobile_first/ah-info-page-form.php
+++ b/application/views/mobile_first/ah-info-page-form.php
@@ -172,7 +172,7 @@
               <option value="5">5</option>
                   </select>
                   <p style="
-    margin-top: 5px;
+    margin-top: 10px;
 ">people</p>
               </div>
               <div class="kids_age">
@@ -186,7 +186,7 @@
               <option value="5">5</option>
                 </select>
                 <p style="
-    margin-top: 5px;
+    margin-top: 10px;
 ">people</p>
               </div>
               <div class="kids_age">
@@ -200,7 +200,7 @@
               <option value="5">5</option>
                   </select>
                   <p style="
-    margin-top: 5px;
+    margin-top: 10px;
 ">people</p>
               </div>
           </div>
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 50a90dd1..29a1cbd9 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -170,7 +170,7 @@
                 <option value="5">5</option>
                     </select>
                     <p style="
-    margin-top: 5px;
+    margin-top: 10px;
 ">people</p>
                 </div>
                 <div class="kids_age">
@@ -184,7 +184,7 @@
                 <option value="5">5</option>
                 </select>
                 <p style="
-    margin-top: 5px;
+    margin-top: 10px;
 ">people</p>
                 </div>
                 <div class="kids_age">
@@ -198,7 +198,7 @@
                 <option value="5">5</option>
                     </select>
                     <p style="
-    margin-top: 5px;
+    margin-top: 10px;
 ">people</p>
                 </div>
             </div>

From 06ccc62ec63773df35bbb7f1c5e918cde41283ad Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 15:27:58 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ch-info-page-form.php  | 228 ++++++++++--------
 .../views/mobile_first/ch-inquiry-form.php    | 228 ++++++++++--------
 2 files changed, 246 insertions(+), 210 deletions(-)

diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php
index c1f4589b..96232855 100644
--- a/application/views/mobile_first/ch-info-page-form.php
+++ b/application/views/mobile_first/ch-info-page-form.php
@@ -49,112 +49,121 @@
                                   <p style="margin-bottom: 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="1">1</option>
+                                      <option value="2">2</option>
+                                      <option value="3">3</option>
+                                      <option value="4">4</option>
+                                      <option value="5">5</option>
+                                      <option value="6">6</option>
+                                      <option value="7">7</option>
+                                      <option value="8">8</option>
+                                      <option value="9">9</option>
+                                      <option value="10">10</option>
+                                      <option value="11">11</option>
+                                      <option value="12">12</option>
+                                      <option value="13">13</option>
+                                      <option value="14">14</option>
+                                      <option value="15">15</option>
+                                      <option value="16">16</option>
+                                      <option value="17">17</option>
+                                      <option value="18">18</option>
+                                      <option value="19">19</option>
+                                      <option value="20">20</option>
+                                      <option value="21">21</option>
+                                      <option value="22">22</option>
+                                      <option value="23">23</option>
+                                      <option value="24">24</option>
+                                      <option value="25">25</option>
+                                      <option value="26">26</option>
+                                      <option value="27">27</option>
+                                      <option value="28">28</option>
+                                      <option value="29">29</option>
+                                      <option value="30">30</option>
                                       
                                       </select>
+                                      <p style="
+    margin-top: 5px;
+">people</p>
                               </div>
                               <div class="kids_age">
                                   <p style="margin-bottom: 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="1">1</option>
+                                      <option value="2">2</option>
+                                      <option value="3">3</option>
+                                      <option value="4">4</option>
+                                      <option value="5">5</option>
+                                      <option value="6">6</option>
+                                      <option value="7">7</option>
+                                      <option value="8">8</option>
+                                      <option value="9">9</option>
+                                      <option value="10">10</option>
+                                      <option value="11">11</option>
+                                      <option value="12">12</option>
+                                      <option value="13">13</option>
+                                      <option value="14">14</option>
+                                      <option value="15">15</option>
+                                      <option value="16">16</option>
+                                      <option value="17">17</option>
+                                      <option value="18">18</option>
+                                      <option value="19">19</option>
+                                      <option value="20">20</option>
+                                      <option value="21">21</option>
+                                      <option value="22">22</option>
+                                      <option value="23">23</option>
+                                      <option value="24">24</option>
+                                      <option value="25">25</option>
+                                      <option value="26">26</option>
+                                      <option value="27">27</option>
+                                      <option value="28">28</option>
+                                      <option value="29">29</option>
+                                      <option value="30">30</option>
                                       
                                       </select>
+                                      <p style="
+    margin-top: 5px;
+">people</p>
                               </div>
                               <div class="kids_age">
                                   <p style="margin-bottom: 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="1">1</option>
+                                      <option value="2">2</option>
+                                      <option value="3">3</option>
+                                      <option value="4">4</option>
+                                      <option value="5">5</option>
+                                      <option value="6">6</option>
+                                      <option value="7">7</option>
+                                      <option value="8">8</option>
+                                      <option value="9">9</option>
+                                      <option value="10">10</option>
+                                      <option value="11">11</option>
+                                      <option value="12">12</option>
+                                      <option value="13">13</option>
+                                      <option value="14">14</option>
+                                      <option value="15">15</option>
+                                      <option value="16">16</option>
+                                      <option value="17">17</option>
+                                      <option value="18">18</option>
+                                      <option value="19">19</option>
+                                      <option value="20">20</option>
+                                      <option value="21">21</option>
+                                      <option value="22">22</option>
+                                      <option value="23">23</option>
+                                      <option value="24">24</option>
+                                      <option value="25">25</option>
+                                      <option value="26">26</option>
+                                      <option value="27">27</option>
+                                      <option value="28">28</option>
+                                      <option value="29">29</option>
+                                      <option value="30">30</option>
                                       
                                       </select>
+                                      <p style="
+    margin-top: 5px;
+">people</p>
                               </div>
                           </div>
                           <div class="clear"></div>
@@ -164,34 +173,43 @@
                                   <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>
+                              <option value="1">1</option>
+                              <option value="2">2</option>
+                              <option value="3">3</option>
+                              <option value="4">4</option>
+                              <option value="5">5</option>
                                   </select>
+                                  <p style="
+    margin-top: 10px;
+">people</p>
                               </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">
                                   <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="1">1</option>
+                              <option value="2">2</option>
+                              <option value="3">3</option>
+                              <option value="4">4</option>
+                              <option value="5">5</option>
                                   </select>
+                                  <p style="
+    margin-top: 10px;
+">people</p>
                               </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">
                                   <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="1">1</option>
+                              <option value="2">2</option>
+                              <option value="3">3</option>
+                              <option value="4">4</option>
+                              <option value="5">5</option>
                                   </select>
+                                  <p style="
+    margin-top: 10px;
+">people</p>
                               </div>
                           </div>
 
diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 481a1382..83897b79 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -43,112 +43,121 @@
                                     <p style="margin-bottom: 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="1">1</option>
+                                        <option value="2">2</option>
+                                        <option value="3">3</option>
+                                        <option value="4">4</option>
+                                        <option value="5">5</option>
+                                        <option value="6">6</option>
+                                        <option value="7">7</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                        <option value="11">11</option>
+                                        <option value="12">12</option>
+                                        <option value="13">13</option>
+                                        <option value="14">14</option>
+                                        <option value="15">15</option>
+                                        <option value="16">16</option>
+                                        <option value="17">17</option>
+                                        <option value="18">18</option>
+                                        <option value="19">19</option>
+                                        <option value="20">20</option>
+                                        <option value="21">21</option>
+                                        <option value="22">22</option>
+                                        <option value="23">23</option>
+                                        <option value="24">24</option>
+                                        <option value="25">25</option>
+                                        <option value="26">26</option>
+                                        <option value="27">27</option>
+                                        <option value="28">28</option>
+                                        <option value="29">29</option>
+                                        <option value="30">30</option>
                                         
                                         </select>
+                                        <p style="
+    margin-top: 5px;
+">people</p>
                                 </div>
                                 <div class="kids_age">
                                     <p style="margin-bottom: 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="1">1</option>
+                                        <option value="2">2</option>
+                                        <option value="3">3</option>
+                                        <option value="4">4</option>
+                                        <option value="5">5</option>
+                                        <option value="6">6</option>
+                                        <option value="7">7</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                        <option value="11">11</option>
+                                        <option value="12">12</option>
+                                        <option value="13">13</option>
+                                        <option value="14">14</option>
+                                        <option value="15">15</option>
+                                        <option value="16">16</option>
+                                        <option value="17">17</option>
+                                        <option value="18">18</option>
+                                        <option value="19">19</option>
+                                        <option value="20">20</option>
+                                        <option value="21">21</option>
+                                        <option value="22">22</option>
+                                        <option value="23">23</option>
+                                        <option value="24">24</option>
+                                        <option value="25">25</option>
+                                        <option value="26">26</option>
+                                        <option value="27">27</option>
+                                        <option value="28">28</option>
+                                        <option value="29">29</option>
+                                        <option value="30">30</option>
                                         
                                         </select>
+                                        <p style="
+    margin-top: 5px;
+">people</p>
                                 </div>
                                 <div class="kids_age">
                                     <p style="margin-bottom: 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="1">1</option>
+                                        <option value="2">2</option>
+                                        <option value="3">3</option>
+                                        <option value="4">4</option>
+                                        <option value="5">5</option>
+                                        <option value="6">6</option>
+                                        <option value="7">7</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                        <option value="11">11</option>
+                                        <option value="12">12</option>
+                                        <option value="13">13</option>
+                                        <option value="14">14</option>
+                                        <option value="15">15</option>
+                                        <option value="16">16</option>
+                                        <option value="17">17</option>
+                                        <option value="18">18</option>
+                                        <option value="19">19</option>
+                                        <option value="20">20</option>
+                                        <option value="21">21</option>
+                                        <option value="22">22</option>
+                                        <option value="23">23</option>
+                                        <option value="24">24</option>
+                                        <option value="25">25</option>
+                                        <option value="26">26</option>
+                                        <option value="27">27</option>
+                                        <option value="28">28</option>
+                                        <option value="29">29</option>
+                                        <option value="30">30</option>
                                         
                                         </select>
+                                        <p style="
+    margin-top: 5px;
+">people</p>
                                 </div>
                             </div>
                             <div class="clear"></div>
@@ -158,34 +167,43 @@
                                     <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>
+                                <option value="1">1</option>
+                                <option value="2">2</option>
+                                <option value="3">3</option>
+                                <option value="4">4</option>
+                                <option value="5">5</option>
                                     </select>
+                                    <p style="
+    margin-top: 10px;
+">people</p>
                                 </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">
                                     <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="1">1</option>
+                                <option value="2">2</option>
+                                <option value="3">3</option>
+                                <option value="4">4</option>
+                                <option value="5">5</option>
                                     </select>
+                                    <p style="
+    margin-top: 10px;
+">people</p>
                                 </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">
                                     <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="1">1</option>
+                                <option value="2">2</option>
+                                <option value="3">3</option>
+                                <option value="4">4</option>
+                                <option value="5">5</option>
                                     </select>
+                                    <p style="
+    margin-top: 10px;
+">people</p>
                                 </div>
                             </div>
 

From 5ca832448a4572cda651bc2b8ce1e32ad1d319b6 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 15:30:43 +0800
Subject: [PATCH 09/14] 11

---
 application/views/mobile_first/ch-info-page-form.php | 3 +--
 application/views/mobile_first/ch-inquiry-form.php   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php
index 96232855..cf608ce0 100644
--- a/application/views/mobile_first/ch-info-page-form.php
+++ b/application/views/mobile_first/ch-info-page-form.php
@@ -158,8 +158,7 @@
                                       <option value="27">27</option>
                                       <option value="28">28</option>
                                       <option value="29">29</option>
-                                      <option value="30">30</option>
-                                      
+                                      <option value="30">30</option>                                     
                                       </select>
                                       <p style="
     margin-top: 5px;
diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 83897b79..547d83e8 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -72,8 +72,7 @@
                                         <option value="27">27</option>
                                         <option value="28">28</option>
                                         <option value="29">29</option>
-                                        <option value="30">30</option>
-                                        
+                                        <option value="30">30</option>                                        
                                         </select>
                                         <p style="
     margin-top: 5px;

From 2b4bab2f332f237f3484339d77f7fa1896489c12 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 13 Dec 2023 15:33:45 +0800
Subject: [PATCH 10/14] 11

---
 application/views/mobile_first/ah-info-page-form.php | 12 ++++++------
 application/views/mobile_first/ah-inquiry-form.php   | 12 ++++++------
 application/views/mobile_first/ch-info-page-form.php | 12 ++++++------
 application/views/mobile_first/ch-inquiry-form.php   | 12 ++++++------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php
index 5a130be5..790f69a7 100644
--- a/application/views/mobile_first/ah-info-page-form.php
+++ b/application/views/mobile_first/ah-info-page-form.php
@@ -78,7 +78,7 @@
                       <option value="30">30</option>
                       </select>
                       <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
               </div>
               <div class="kids_age">
@@ -116,7 +116,7 @@
                       <option value="29">29</option>
                       <option value="30">30</option>
                       </select>
-                      <p style="margin-top: 5px;">people</p>
+                      <p style="margin-top: 5px;font-size: 18px;">people</p>
               </div>
               <div class="kids_age">
                   <p style="margin-bottom: 0;">18-40 yrs old</p>
@@ -154,7 +154,7 @@
                       <option value="30">30</option>
                       </select>
                       <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
               </div>
           </div>
@@ -172,7 +172,7 @@
               <option value="5">5</option>
                   </select>
                   <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
               </div>
               <div class="kids_age">
@@ -186,7 +186,7 @@
               <option value="5">5</option>
                 </select>
                 <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
               </div>
               <div class="kids_age">
@@ -200,7 +200,7 @@
               <option value="5">5</option>
                   </select>
                   <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
               </div>
           </div>
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 29a1cbd9..fa9f4666 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -74,7 +74,7 @@
                         <option value="30">30</option>                       
                         </select>
                         <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                 </div>
                 <div class="kids_age">
@@ -113,7 +113,7 @@
                         <option value="30">30</option>                      
                         </select>
                         <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                 </div>
                 <div class="kids_age">
@@ -152,7 +152,7 @@
                         <option value="30">30</option>                       
                         </select>
                         <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                 </div>
             </div>
@@ -170,7 +170,7 @@
                 <option value="5">5</option>
                     </select>
                     <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                 </div>
                 <div class="kids_age">
@@ -184,7 +184,7 @@
                 <option value="5">5</option>
                 </select>
                 <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                 </div>
                 <div class="kids_age">
@@ -198,7 +198,7 @@
                 <option value="5">5</option>
                     </select>
                     <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                 </div>
             </div>
diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php
index cf608ce0..45afd392 100644
--- a/application/views/mobile_first/ch-info-page-form.php
+++ b/application/views/mobile_first/ch-info-page-form.php
@@ -82,7 +82,7 @@
                                       
                                       </select>
                                       <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                               </div>
                               <div class="kids_age">
@@ -122,7 +122,7 @@
                                       
                                       </select>
                                       <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                               </div>
                               <div class="kids_age">
@@ -161,7 +161,7 @@
                                       <option value="30">30</option>                                     
                                       </select>
                                       <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                               </div>
                           </div>
@@ -179,7 +179,7 @@
                               <option value="5">5</option>
                                   </select>
                                   <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                               </div>
                               <div class="kids_age">
@@ -193,7 +193,7 @@
                               <option value="5">5</option>
                                   </select>
                                   <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                               </div>
                               <div class="kids_age">
@@ -207,7 +207,7 @@
                               <option value="5">5</option>
                                   </select>
                                   <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                               </div>
                           </div>
diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 547d83e8..db79325e 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -75,7 +75,7 @@
                                         <option value="30">30</option>                                        
                                         </select>
                                         <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                                 </div>
                                 <div class="kids_age">
@@ -115,7 +115,7 @@
                                         
                                         </select>
                                         <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                                 </div>
                                 <div class="kids_age">
@@ -155,7 +155,7 @@
                                         
                                         </select>
                                         <p style="
-    margin-top: 5px;
+    margin-top: 5px;font-size: 18px;
 ">people</p>
                                 </div>
                             </div>
@@ -173,7 +173,7 @@
                                 <option value="5">5</option>
                                     </select>
                                     <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                                 </div>
                                 <div class="kids_age">
@@ -187,7 +187,7 @@
                                 <option value="5">5</option>
                                     </select>
                                     <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                                 </div>
                                 <div class="kids_age">
@@ -201,7 +201,7 @@
                                 <option value="5">5</option>
                                     </select>
                                     <p style="
-    margin-top: 10px;
+    margin-top: 10px;font-size: 18px;
 ">people</p>
                                 </div>
                             </div>

From 3b266c537d6fff127bf2a08cc579cdfd40c408da Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Wed, 13 Dec 2023 15:45:31 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index b69108cc..8ba2e259 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1199,9 +1199,11 @@ class Information extends CI_Controller
 
     public function test_price()
     {
-        $price_rule = '<div style="color: red;">#ah-8,st,2#</div><div style="color: red;">#ah-8,st,2#</div>';
-        $price_tag_list = $this->parse_price_tag($price_rule);
-        var_dump($price_tag_list);
+      $price_rule = '<div style="color: red;">#ah-23,st,2#</div>';
+      $price_item_array = $this->price_pregmatch($price_rule);
+      var_dump($price_item_array);
+      $price_tag_list = $this->parse_price_tag($price_rule);
+      var_dump($price_tag_list);
     }
 
     /*!

From 31a414ac52d67f262510a4f61ef9d62808183eaf Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 13 Dec 2023 19:36:53 +0800
Subject: [PATCH 12/14] =?UTF-8?q?PayPal=E8=AE=B0=E5=BD=95:=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BAwebhooks=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/paypal/models/note_model.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php
index db756a63..49d98b22 100644
--- a/webht/third_party/paypal/models/note_model.php
+++ b/webht/third_party/paypal/models/note_model.php
@@ -55,12 +55,13 @@ class Note_model extends CI_Model {
     public function notestatus($topnum = 2, $status = '') {
         $this->init();
         $this->topnum = $topnum;
+        $sql = " AND pn_memo NOT LIKE '{\"id\":\"WH-%' ";
         $x_status = strtolower($status) === 'reversal' ? 'revers' : $status;
         $sql1 = in_array(strtolower($status), ["completed", 'pending']) ? " AND (pn_payment_status='$status' ) " : "";
         $sql2 = in_array(strtolower($status), ["refunded", "reversal"]) ? " AND (pn_payment_status like '%$x_status%' ) " : "";
         $sql3 = in_array(strtolower($status), ["others"]) ? " AND (pn_payment_status='failed' OR pn_payment_status='denied' ) " : "";
         $sql4 = in_array(strtolower($status), ["case"]) ? " AND (pn_memo like '{\"txn_type\":\"new_case\"%' AND pn_mc_gross = '0' ) " : "";
-        $this->pn_send = $sql1 . $sql2 . $sql3 . $sql4;
+        $this->pn_send = $sql1 . $sql2 . $sql3 . $sql4 . $sql;
         // $this->orderby=" ORDER BY pn_payment_date DESC, pn.pn_sn ASC ";
         $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC ";
         return $this->get_list();
@@ -77,10 +78,10 @@ class Note_model extends CI_Model {
 
     public function search_date($date) {
         $this->init();
-        $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) ";
+        $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR isnull(pn_send,'') in ('sendfail','unsend','')) AND pn_memo NOT LIKE '{\"id\":\"WH-%' "; // {"id":"WH-
         $this->search = $search_sql;
         // $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC ";
-        $this->orderby=" ORDER BY CASE WHEN pn.pn_send='sendfail' AND pn.pn_payment_status='Completed' THEN 1  ELSE 9 END ,pn.pn_sn DESC ";
+        $this->orderby=" ORDER BY CASE WHEN pn.pn_send='sendfail' AND pn.pn_payment_status='Completed' THEN 1 WHEN pn.pn_send = 'sendfail' THEN 2 ELSE 9 END ,pn.pn_sn DESC ";
         // WHEN pn.pn_send = 'sendfail' THEN 2
 
         return $this->get_list();

From 95dac34c4d00a93024da4911af02db53c7566aee Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 14 Dec 2023 09:16:32 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=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  | 218 +++++++++---------
 .../views/mobile_first/gh-tour-form.php       | 216 ++++++++---------
 2 files changed, 224 insertions(+), 210 deletions(-)

diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php
index 060b8154..5e5e43e1 100644
--- a/application/views/mobile_first/gh-info-page-form.php
+++ b/application/views/mobile_first/gh-info-page-form.php
@@ -49,113 +49,118 @@
                                           <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="1">1</option>
+                                              <option value="2">2</option>
+                                              <option value="3">3</option>
+                                              <option value="4">4</option>
+                                              <option value="5">5</option>
+                                              <option value="6">6</option>
+                                              <option value="7">7</option>
+                                              <option value="8">8</option>
+                                              <option value="9">9</option>
+                                              <option value="10">10</option>
+                                              <option value="11">11</option>
+                                              <option value="12">12</option>
+                                              <option value="13">13</option>
+                                              <option value="14">14</option>
+                                              <option value="15">15</option>
+                                              <option value="16">16</option>
+                                              <option value="17">17</option>
+                                              <option value="18">18</option>
+                                              <option value="19">19</option>
+                                              <option value="20">20</option>
+                                              <option value="21">21</option>
+                                              <option value="22">22</option>
+                                              <option value="23">23</option>
+                                              <option value="24">24</option>
+                                              <option value="25">25</option>
+                                              <option value="26">26</option>
+                                              <option value="27">27</option>
+                                              <option value="28">28</option>
+                                              <option value="29">29</option>
+                                              <option value="30">30</option>
                                               
                                               </select>
+                                              <p style="margin-top: 10px;">people</p>
                                           </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="1">1</option>
+                                              <option value="2">2</option>
+                                              <option value="3">3</option>
+                                              <option value="4">4</option>
+                                              <option value="5">5</option>
+                                              <option value="6">6</option>
+                                              <option value="7">7</option>
+                                              <option value="8">8</option>
+                                              <option value="9">9</option>
+                                              <option value="10">10</option>
+                                              <option value="11">11</option>
+                                              <option value="12">12</option>
+                                              <option value="13">13</option>
+                                              <option value="14">14</option>
+                                              <option value="15">15</option>
+                                              <option value="16">16</option>
+                                              <option value="17">17</option>
+                                              <option value="18">18</option>
+                                              <option value="19">19</option>
+                                              <option value="20">20</option>
+                                              <option value="21">21</option>
+                                              <option value="22">22</option>
+                                              <option value="23">23</option>
+                                              <option value="24">24</option>
+                                              <option value="25">25</option>
+                                              <option value="26">26</option>
+                                              <option value="27">27</option>
+                                              <option value="28">28</option>
+                                              <option value="29">29</option>
+                                              <option value="30">30</option>
                                               
                                               </select>
+                                              <p style="margin-top: 10px;">people</p>
                                           </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="1">1</option>
+                                                  <option value="2">2</option>
+                                                  <option value="3">3</option>
+                                                  <option value="4">4</option>
+                                                  <option value="5">5</option>
+                                                  <option value="6">6</option>
+                                                  <option value="7">7</option>
+                                                  <option value="8">8</option>
+                                                  <option value="9">9</option>
+                                                  <option value="10">10</option>
+                                                  <option value="11">11</option>
+                                                  <option value="12">12</option>
+                                                  <option value="13">13</option>
+                                                  <option value="14">14</option>
+                                                  <option value="15">15</option>
+                                                  <option value="16">16</option>
+                                                  <option value="17">17</option>
+                                                  <option value="18">18</option>
+                                                  <option value="19">19</option>
+                                                  <option value="20">20</option>
+                                                  <option value="21">21</option>
+                                                  <option value="22">22</option>
+                                                  <option value="23">23</option>
+                                                  <option value="24">24</option>
+                                                  <option value="25">25</option>
+                                                  <option value="26">26</option>
+                                                  <option value="27">27</option>
+                                                  <option value="28">28</option>
+                                                  <option value="29">29</option>
+                                                  <option value="30">30</option>
                                                   
                                                   </select>
+                                                  <p style="
+    margin-top: 10px;
+">people</p>
                                               </div>
                                   </div>
               <div class="clear"></div>
@@ -166,50 +171,53 @@
                       <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
                           <option value="0">0 
                           </option>
-                          <option value="1">1 person
+                          <option value="1">1
                           </option>
     
-                          <option value="2">2 people
+                          <option value="2">2
                           </option>
-                          <option value="3">3 people
+                          <option value="3">3
                           </option> 
-                          <option value="4">4 people
+                          <option value="4">4
                           </option>
-                          <option value="5">5 people</option>
+                          <option value="5">5</option>
                       </select>
+                      <p style="margin-top: 10px;">people</p>
                   </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">
                           <option value="0">0
                           </option>
-                          <option value="1">1 person
+                          <option value="1">1
                           </option>
     
-                          <option value="2">2 people
+                          <option value="2">2
                           </option>
-                          <option value="3">3 people
+                          <option value="3">3
                           </option>
-                          <option value="4">4 people
+                          <option value="4">4
                           </option>
-                          <option value="5">5 people</option>
+                          <option value="5">5</option>
                       </select>
+                      <p style="margin-top: 10px;">people</p>
                   </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">
                           <option value="0">0
                           </option>
-                          <option value="1">1 person
+                          <option value="1">1
                           </option>
-                          <option value="2">2 people
+                          <option value="2">2
                           </option>
-                          <option value="3">3 people
+                          <option value="3">3
                           </option>
-                          <option value="4">4 people
+                          <option value="4">4
                           </option>
-                          <option value="5">5 people</option>
+                          <option value="5">5</option>
                       </select>
+                      <p style="margin-top: 10px;">people</p>
                   </div>
               </div>
           
diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php
index 64ed34e0..4ce2aef4 100644
--- a/application/views/mobile_first/gh-tour-form.php
+++ b/application/views/mobile_first/gh-tour-form.php
@@ -43,113 +43,116 @@
                                       <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="1">1</option>
+                                          <option value="2">2</option>
+                                          <option value="3">3</option>
+                                          <option value="4">4</option>
+                                          <option value="5">5</option>
+                                          <option value="6">6</option>
+                                          <option value="7">7</option>
+                                          <option value="8">8</option>
+                                          <option value="9">9</option>
+                                          <option value="10">10</option>
+                                          <option value="11">11</option>
+                                          <option value="12">12</option>
+                                          <option value="13">13</option>
+                                          <option value="14">14</option>
+                                          <option value="15">15</option>
+                                          <option value="16">16</option>
+                                          <option value="17">17</option>
+                                          <option value="18">18</option>
+                                          <option value="19">19</option>
+                                          <option value="20">20</option>
+                                          <option value="21">21</option>
+                                          <option value="22">22</option>
+                                          <option value="23">23</option>
+                                          <option value="24">24</option>
+                                          <option value="25">25</option>
+                                          <option value="26">26</option>
+                                          <option value="27">27</option>
+                                          <option value="28">28</option>
+                                          <option value="29">29</option>
+                                          <option value="30">30</option>
                                           
                                           </select>
+                                          <p style="margin-top: 10px;">people</p>
                                       </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="1">1</option>
+                                          <option value="2">2</option>
+                                          <option value="3">3</option>
+                                          <option value="4">4</option>
+                                          <option value="5">5</option>
+                                          <option value="6">6</option>
+                                          <option value="7">7</option>
+                                          <option value="8">8</option>
+                                          <option value="9">9</option>
+                                          <option value="10">10</option>
+                                          <option value="11">11</option>
+                                          <option value="12">12</option>
+                                          <option value="13">13</option>
+                                          <option value="14">14</option>
+                                          <option value="15">15</option>
+                                          <option value="16">16</option>
+                                          <option value="17">17</option>
+                                          <option value="18">18</option>
+                                          <option value="19">19</option>
+                                          <option value="20">20</option>
+                                          <option value="21">21</option>
+                                          <option value="22">22</option>
+                                          <option value="23">23</option>
+                                          <option value="24">24</option>
+                                          <option value="25">25</option>
+                                          <option value="26">26</option>
+                                          <option value="27">27</option>
+                                          <option value="28">28</option>
+                                          <option value="29">29</option>
+                                          <option value="30">30</option>
                                           
                                           </select>
+                                          <p style="margin-top: 10px;">people</p>
                                       </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="1">1</option>
+                                              <option value="2">2</option>
+                                              <option value="3">3</option>
+                                              <option value="4">4</option>
+                                              <option value="5">5</option>
+                                              <option value="6">6</option>
+                                              <option value="7">7</option>
+                                              <option value="8">8</option>
+                                              <option value="9">9</option>
+                                              <option value="10">10</option>
+                                              <option value="11">11</option>
+                                              <option value="12">12</option>
+                                              <option value="13">13</option>
+                                              <option value="14">14</option>
+                                              <option value="15">15</option>
+                                              <option value="16">16</option>
+                                              <option value="17">17</option>
+                                              <option value="18">18</option>
+                                              <option value="19">19</option>
+                                              <option value="20">20</option>
+                                              <option value="21">21</option>
+                                              <option value="22">22</option>
+                                              <option value="23">23</option>
+                                              <option value="24">24</option>
+                                              <option value="25">25</option>
+                                              <option value="26">26</option>
+                                              <option value="27">27</option>
+                                              <option value="28">28</option>
+                                              <option value="29">29</option>
+                                              <option value="30">30</option>
                                               
                                               </select>
+                                              <p style="margin-top: 10px;">people</p>
                                           </div>
                               </div>
           <div class="clear"></div>
@@ -160,50 +163,53 @@
                   <select class="kids_number" id="teenagerNumber" name="teenager_10_17">
                       <option value="0">0 
                       </option>
-                      <option value="1">1 person
+                      <option value="1">1
                       </option>
 
-                      <option value="2">2 people
+                      <option value="2">2
                       </option>
-                      <option value="3">3 people
+                      <option value="3">3
                       </option> 
-                      <option value="4">4 people
+                      <option value="4">4
                       </option>
-                      <option value="5">5 people</option>
+                      <option value="5">5</option>
                   </select>
+                  <p style="margin-top: 10px;">people</p>
               </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">
                       <option value="0">0
                       </option>
-                      <option value="1">1 person
+                      <option value="1">1
                       </option>
 
-                      <option value="2">2 people
+                      <option value="2">2
                       </option>
-                      <option value="3">3 people
+                      <option value="3">3
                       </option>
-                      <option value="4">4 people
+                      <option value="4">4
                       </option>
-                      <option value="5">5 people</option>
+                      <option value="5">5</option>
                   </select>
+                  <p style="margin-top: 10px;">people</p>
               </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">
                       <option value="0">0
                       </option>
-                      <option value="1">1 person
+                      <option value="1">1
                       </option>
-                      <option value="2">2 people
+                      <option value="2">2
                       </option>
-                      <option value="3">3 people
+                      <option value="3">3
                       </option>
-                      <option value="4">4 people
+                      <option value="4">4
                       </option>
-                      <option value="5">5 people</option>
+                      <option value="5">5</option>
                   </select>
+                  <p style="margin-top: 10px;">people</p>
               </div>
           </div>
           </div>

From f57386990c98f6d078c12b17f37d16ca19ecb485 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 14 Dec 2023 09:17:19 +0800
Subject: [PATCH 14/14] 11

---
 application/views/mobile_first/gh-info-page-form.php | 3 +--
 application/views/mobile_first/gh-tour-form.php      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php
index 5e5e43e1..b563833f 100644
--- a/application/views/mobile_first/gh-info-page-form.php
+++ b/application/views/mobile_first/gh-info-page-form.php
@@ -155,8 +155,7 @@
                                                   <option value="27">27</option>
                                                   <option value="28">28</option>
                                                   <option value="29">29</option>
-                                                  <option value="30">30</option>
-                                                  
+                                                  <option value="30">30</option>                                                  
                                                   </select>
                                                   <p style="
     margin-top: 10px;
diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php
index 4ce2aef4..2693e467 100644
--- a/application/views/mobile_first/gh-tour-form.php
+++ b/application/views/mobile_first/gh-tour-form.php
@@ -149,8 +149,7 @@
                                               <option value="27">27</option>
                                               <option value="28">28</option>
                                               <option value="29">29</option>
-                                              <option value="30">30</option>
-                                              
+                                              <option value="30">30</option>                                             
                                               </select>
                                               <p style="margin-top: 10px;">people</p>
                                           </div>