From 3fa46e4e22076757d6533c5aacbbf04c7d46425e Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Mon, 26 Feb 2024 10:33:44 +0800
Subject: [PATCH] =?UTF-8?q?AH=20CH=20GH=E6=89=80=E6=9C=89=E5=90=AB?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=80=89=E6=8B=A9=E8=A1=A8=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BA=BA=E6=95=B0=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-info-page-form.php       |  7 ++++++-
 application/views/mobile_first/ah-inquiry-form.php |  7 ++++++-
 .../views/mobile_first/ah-tour-list-form.php       | 14 +++++---------
 .../views/mobile_first/ch-info-page-form.php       |  7 ++++++-
 application/views/mobile_first/ch-inquiry-form.php |  7 ++++++-
 .../views/mobile_first/gh-info-page-form.php       |  7 ++++++-
 application/views/mobile_first/gh-tour-form.php    |  8 +++++++-
 7 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php
index c51acb7d..2960f076 100644
--- a/application/views/mobile_first/ah-info-page-form.php
+++ b/application/views/mobile_first/ah-info-page-form.php
@@ -43,7 +43,7 @@
           <div id="adultBlock" style="display: none">
               <p style="margin-top: 0;margin-bottom: 0;"><strong>Adults number (age ≥ 18 years old)</strong></p>
               <div class="kids_age">
-                  <select class="kids_number" id="adultNumber_65_plus" name="adult_18_plus" >
+                  <select class="kids_number" id="adult_18_plus" name="adult_18_plus" >
                       <option value="0">0</option>
                       <option value="1">1</option>
                       <option value="2">2</option>
@@ -646,6 +646,11 @@
               $adultBlock.show();
               $childrenBlock.hide();
             }
+            if (currentTarget.id === 'Couple') {
+                      $('#adult_18_plus').val('2');
+                    } else if (currentTarget.id === 'Solo') {                      
+                      $('#adult_18_plus').val('1');
+                    }
                 })
             });
 
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index f62f60e8..689050e4 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -39,7 +39,7 @@
             <div id="adultBlock" style="display: none">
                 <p style="margin-top: 0;margin-bottom: 0;"><strong>Adults number (age ≥ 18 years old)</strong></p>
                 <div class="kids_age">
-                    <select class="kids_number" id="adultNumber_65_plus" name="adult_18_plus" >
+                    <select class="kids_number" id="adult_18_plus" name="adult_18_plus" >
                         <option value="0">0</option>
                         <option value="1">1</option>
                         <option value="2">2</option>
@@ -655,6 +655,11 @@ function validateQuickInquiryForm() {
           $adultBlock.show();
           $childrenBlock.hide();
         }
+        if (currentTarget.id === 'Couple') {
+                      $('#adult_18_plus').val('2');
+                    } else if (currentTarget.id === 'Solo') {                      
+                      $('#adult_18_plus').val('1');
+                    }
 			})
 		});
 
diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index e9ec6e8a..1f500f3f 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -46,7 +46,7 @@
             <div id="adultBlock" style="display: none">
                 <p style="margin-top: 0;margin-bottom: 0;"><strong>Adults number (age ≥ 18 years old)</strong></p>
                 <div class="kids_age">
-                    <select class="kids_number" id="adultNumber_65_plus" name="adult_18_plus" >
+                    <select class="kids_number" id="adult_18_plus" name="adult_18_plus" >
                         <option value="0">0</option>
                         <option value="1">1</option>
                         <option value="2">2</option>
@@ -656,10 +656,6 @@ function validateQuickInquiryForm() {
     $('input[name="travel_group"]').each((i, groupEle) => {
 			$(groupEle).click(function (e) {
 
-        $teenagerNumberInput.val(0);
-        $childrenNumberInput.val(0);
-        $infantNumberInput.val(0);
-
 				var currentTarget = e.currentTarget;
         if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
           $adultBlock.show();
@@ -669,10 +665,10 @@ function validateQuickInquiryForm() {
           $childrenBlock.hide();
         }
         if (currentTarget.id === 'Couple') {
-          $adultNumberInput.val(2);
-        } else if (currentTarget.id === 'Solo') {
-          $adultNumberInput.val(1);
-        }
+                      $('#adult_18_plus').val('2');
+                    } else if (currentTarget.id === 'Solo') {                      
+                      $('#adult_18_plus').val('1');
+                    }
 			})
 		});
 
diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php
index 12aaa1e2..6304bd4f 100644
--- a/application/views/mobile_first/ch-info-page-form.php
+++ b/application/views/mobile_first/ch-info-page-form.php
@@ -46,7 +46,7 @@
                             <div id="adultBlock" style="display: none">
                               <p style="margin-top: 0;margin-bottom: 10px;"><strong>Adults number (age ≥ 18 years old)</strong></p>
                               <div class="kids_age">
-                                <select class="kids_number" id="adultNumber_65_plus" name="adult_18_plus" >
+                                <select class="kids_number" id="adult_18_plus" name="adult_18_plus" >
                                   <option value="0">0</option>
                                   <option value="1">1</option>
                                   <option value="2">2</option>
@@ -663,6 +663,11 @@ margin-top: 5px;font-size: 18px;
               $adultBlock.show();
               $childrenBlock.hide();
             }
+             if (currentTarget.id === 'Couple') {
+                      $('#adult_18_plus').val('2');
+                    } else if (currentTarget.id === 'Solo') {                      
+                      $('#adult_18_plus').val('1');
+                    }
                 })
             });
     
diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index ae9ca539..19bdcd36 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -41,7 +41,7 @@
                                 <p style="    margin-bottom: 10px;"><strong>Adults number (age ≥ 18 years old)</strong></p>
                                 <div class="kids_age">
 
-                                    <select class="kids_number" id="adultNumber_65_plus" name="adult_18_plus" >
+                                    <select class="kids_number" id="adult_18_plus" name="adult_18_plus" >
                                         <option value="0">0</option>
                                         <option value="1">1</option>
                                         <option value="2">2</option>
@@ -563,6 +563,11 @@ document.addEventListener('DOMContentLoaded', () => {
         $adultBlock.show();
         $childrenBlock.hide();
       }
+       if (currentTarget.id === 'Couple') {
+                      $('#adult_18_plus').val('2');
+                    } else if (currentTarget.id === 'Solo') {                      
+                      $('#adult_18_plus').val('1');
+                    }
           })
       });
 })
diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php
index 8d1af8e9..8369244c 100644
--- a/application/views/mobile_first/gh-info-page-form.php
+++ b/application/views/mobile_first/gh-info-page-form.php
@@ -47,7 +47,7 @@
                   
                                       <div class="kids_age" >
                                        
-                                          <select class="kids_number" id="adultNumber_65_plus" name="adult_18_plus" >
+                                          <select class="kids_number" id="adult_18_plus" name="adult_18_plus" >
                                               <option value="0">0</option>
                                               <option value="1">1</option>
                                               <option value="2">2</option>
@@ -672,6 +672,11 @@
             $adultBlock.show();
             $childrenBlock.hide();
           }
+          if (currentTarget.id === 'Couple') {
+                      $('#adult_18_plus').val('2');
+                    } else if (currentTarget.id === 'Solo') {                      
+                      $('#adult_18_plus').val('1');
+                    }
               })
           });
   
diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php
index 36fa7b08..d3c68613 100644
--- a/application/views/mobile_first/gh-tour-form.php
+++ b/application/views/mobile_first/gh-tour-form.php
@@ -41,7 +41,7 @@
               
                                   <div class="kids_age" >
                                     
-                                      <select class="kids_number" id="adultNumber_65_plus" name="adult_18_plus" >
+                                      <select class="kids_number" id="adult_18_plus" name="adult_18_plus" >
                                           <option value="0">0</option>
                                           <option value="1">1</option>
                                           <option value="2">2</option>
@@ -557,6 +557,12 @@ $(function () {
         $adultBlock.show();
         $childrenBlock.hide();
       }
+      
+                    if (currentTarget.id === 'Couple') {
+                      $('#adult_18_plus').val('2');
+                    } else if (currentTarget.id === 'Solo') {                      
+                      $('#adult_18_plus').val('1');
+                    }
     })
   });