From 50c5e0db3a73b060c3691ac8314e32a25f75acb4 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 4 Mar 2025 10:25:52 +0800
Subject: [PATCH 01/19] =?UTF-8?q?PC=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 81 +++++++++++++-----------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 229fa1b1..b7f43bce 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -73,35 +73,39 @@
     <!--PC头部导航-->
     <header class="headerbar" id="header">
         <nav>
-            <a href="/" class="p_toplogo"> <img
-                    src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navigation-logo.png" width="154"
-                    height="83" alt="chinahighlights logo" class="chinahighlightslogo img-responsive"></a>
-            <nav>
+            
+           
                 <ul class="pctopnavi">
+                    <li><a href="/" class="p_toplogo"> <img
+                        src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navigation-logo.png" width="154"
+                        height="83" alt="chinahighlights logo" class="chinahighlightslogo img-responsive"></a></li>
+
                     <li class="dropdown"><a href="/tour/" class="p_topnavilink" id="china_tours_2021">China Tours</a>
                         <div class="chinatourspc dropdown-content">
                             <ul class="list-reset sidebar">
-                                <li class="start-nav-item"><a href="/tour/top-china-tours/" id="china_top_tours_2021">Top 10 Tours</a></li>
-                                    <li class="start-nav-item"><a href="/tour/hassle-free-china-visas.htm" id="Visa-Free">Visa-Free Tours</a></li>
-                                    <li class="start-nav-item"><a href="/tour/china-panda-tours/"
+                                <li class="start-nav-item"><a href="/tour/top-china-tours/"
+                                        id="china_top_tours_2021">Top 10 Tours</a></li>
+                                <li class="start-nav-item"><a href="/tour/hassle-free-china-visas.htm"
+                                        id="Visa-Free">Visa-Free Tours</a></li>
+                                <li class="start-nav-item"><a href="/tour/china-panda-tours/"
                                         id="china_panda_tours_2021">Panda Tours</a></li>
-                                        <li class="start-nav-item"><a href="/tour/family-tours/"
-                                            id="china_family_tours_2021">Family
-                                            Tours</a></li>
-                                            <li class="start-nav-item"><a href="/tour/silk-road-tours/"
-                                                id="china_silk_road_tours_2021">Silk Road Tours</a></li>
-                                                <li class="start-nav-item start-nav-item-last"><a href="/greatwall/tours/"
-                                                    id="china_great_wall_tours_2021">Great Wall of China Tours</a></li>
-                                                    <li class="start-nav-item start-nav-item-last"><a href="/tour/china-nature-tours/"
-                                                        id="Nature">Nature Tours</a></li>
-                                                        <li class="start-nav-item"><a href="/tour/winter-vacation/"
-                                                            id="china_winter_tours_2021">China Winter Tours</a></li>
-                                                            <li class="start-nav-item"><a href="/yangtzecruise/"
-                                                                id="china_yangtze_cruise_2021">Yangtze River Cruise</a></li>
+                                <li class="start-nav-item"><a href="/tour/family-tours/"
+                                        id="china_family_tours_2021">Family
+                                        Tours</a></li>
+                                <li class="start-nav-item"><a href="/tour/silk-road-tours/"
+                                        id="china_silk_road_tours_2021">Silk Road Tours</a></li>
+                                <li class="start-nav-item start-nav-item-last"><a href="/greatwall/tours/"
+                                        id="china_great_wall_tours_2021">Great Wall of China Tours</a></li>
+                                <li class="start-nav-item start-nav-item-last"><a href="/tour/china-nature-tours/"
+                                        id="Nature">Nature Tours</a></li>
+                                <li class="start-nav-item"><a href="/tour/winter-vacation/"
+                                        id="china_winter_tours_2021">China Winter Tours</a></li>
+                                <li class="start-nav-item"><a href="/yangtzecruise/"
+                                        id="china_yangtze_cruise_2021">Yangtze River Cruise</a></li>
                                 <li class="start-nav-item"><a href="/tour/expats-tours.htm"
                                         id="china_expats_tours_2021">China Expats Tours</a></li>
-                                        <li class="start-nav-item"><a href="/tour/educational-tours/"
-                                            id="china_educational_tours_2021">China Educational Tours</a></li>
+                                <li class="start-nav-item"><a href="/tour/educational-tours/"
+                                        id="china_educational_tours_2021">China Educational Tours</a></li>
                             </ul>
                         </div>
                     </li>
@@ -333,25 +337,26 @@
                     </li>
                     <li class="dropdown"><a href="/aboutus/" class="p_topnavilink">About us</a></li>
                     <li class="topnavitailor">
-                        <a href="/contactus/?product_code=" id="contact_us_2021">Contact us</a>
+                        <a href="/contactus/?product_code=cht-home-111" id="contact_us_2021">Contact us</a>
+                    </li>
+                    <li class="pcnavibutton">
+
+                        <div class="siteSearch">
+                            <form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach"
+                                action="https://www.chinahighlights.com/search-result/">
+                                <input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
+                                <input type="hidden" value="FORID:9" name="cof">
+                                <input type="text" onfocus="this.value = ''" class="strkeys"
+                                    placeholder="Search China Highlights" name="q">
+                                <input type="image" class="submits"
+                                    src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px"
+                                    alt="site search button">
+                            </form>
+                        </div>
                     </li>
                 </ul>
             </nav>
-            <div class="pcnavibutton">
-
-                <div class="siteSearch">
-                    <form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach"
-                        action="https://www.chinahighlights.com/search-result/">
-                        <input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
-                        <input type="hidden" value="FORID:9" name="cof">
-                        <input type="text" onfocus="this.value = ''" class="strkeys"
-                            placeholder="Search China Highlights" name="q">
-                        <input type="image" class="submits"
-                            src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px"
-                            alt="site search button">
-                    </form>
-                </div>
-            </div>
+           
     </header>
  <!--@HEAD_1@-->
     <div class="main_content">

From c301b738fbaf6f3df7f7ab2a7b6f0a5d56e4a078 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 4 Mar 2025 10:26:42 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E5=90=8C=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index b7f43bce..b329b49d 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -355,8 +355,7 @@
                         </div>
                     </li>
                 </ul>
-            </nav>
-           
+            </nav>        
     </header>
  <!--@HEAD_1@-->
     <div class="main_content">

From 54b9456fbc2ed92b342a2a9cc4500adff1d9e7d4 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 5 Mar 2025 11:32:50 +0800
Subject: [PATCH 03/19] =?UTF-8?q?AH=20=E8=B7=A8=E5=B9=B4=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=92=8C=E5=A2=9E=E5=8A=A0=E9=80=A0=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile_first/ah-new-year-countdown.php    | 70 ++++++++++++++++---
 1 file changed, 59 insertions(+), 11 deletions(-)

diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 01e53bf0..8f14689d 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -1,10 +1,11 @@
+<!--New Year Countdown start-->
 <script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <div class="tmbottom">
-    <h3 style="font-size: 24px; line-height: 22px;">Chiang Mai CAD New Year Countdown to 2025</h3>
+    <h3 style="font-size: 24px; line-height: 22px;">Chiang Mai CAD New Year Countdown to 2026</h3>
     <form id='ticket_form' action="https://www.asiahighlights.com/orders/new_year_countdown_save" method="post" >
         <p style="font-size: 22px;"><strong>Select Date:</strong></p>
 		<div class="selectHotl" style="margin-bottom: 20px;">
-           <div class="optionLable">
+           <div class="optionLable" style="display: none;">
                 <input type="radio" value="2024-12-30" id="december30th" name="ticket_date">
                 <label for="december30th">
                 December 30th, 2024
@@ -34,7 +35,7 @@
                     </div>
                 </label>
             </div>
-            <div class="optionLable" id="ticket_type_elite_december31th">
+            <div class="optionLable" id="ticket_type_elite_december31th" style="display: none">
                 <input type="radio" value="Elite Ticket" id="elite_december31th" data-price="289" name="ticket_type">
                 <label for="elite_december31th" style="font-size:18px;">
                 <strong style="    margin-bottom: 5px;
@@ -61,13 +62,13 @@
                 </label>
             </div>
             <div class="optionLable" id="vip_type_premium_december31th">
-                <input type="radio" value="Premium Ticket" id="premium_december31th" data-price="179" name="ticket_type">
+                <input type="radio" value="Premium Ticket" id="premium_december31th" data-price="209" name="ticket_type">
                 <label for="premium_december31th" style="font-size:18px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">Premium Ticket</strong>
                     <div class="selectionMemo" style="line-height: 18px;">
-                      US$179 (6,500 THB)
+                      US$209
                     <br>
                     Premium service + shuttle transfer + dinner
                     </div>
@@ -87,13 +88,26 @@
                 </label>
             </div>
             <div class="optionLable" id="ticket_type_standard_december31th">
-                <input type="radio" value="VIP Ticket" checked id="vip_december31th" data-price="139" name="ticket_type">
+                <input type="radio" value="VIP Ticket" checked id="vip_december31th" data-price="199" name="ticket_type">
                 <label for="vip_december31th" style="font-size:18px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">VIP Ticket</strong>
                     <div class="selectionMemo" style="line-height: 18px;">
-                      US$139 (5,000 THB)
+                      US$199
+                    <br>
+                    VIP service + shuttle transfer + dinner
+                    </div>
+                </label>
+            </div>
+            <div class="optionLable" id="ticket_type_standard_december31th">
+                <input type="radio" value="Standard Ticket" checked id="standard_december31th" data-price="149" name="ticket_type">
+                <label for="standard_december31th" style="font-size:18px;">
+                <strong style="margin-bottom: 5px;
+    display: block;
+    font-size: 19px;">Standard Ticket</strong>
+                    <div class="selectionMemo" style="line-height: 18px;">
+                      US$149
                     <br>
                     VIP service + shuttle transfer + dinner
                     </div>
@@ -103,6 +117,17 @@
         <div id="ticket_type_errmsg" style="display: none">
           <div class="requiredArea" style="margin-top:-10px;">Please select at least one option.</div>
         </div>
+
+        <div style="clear: both;display: inline-block;border: 3px dashed #d1d1d1;border-radius: 10px;padding: 10px 10px 0px 10px;width: calc(100% - 30px);background: #fff;margin-top: 15px; margin-bottom: 20px;">
+            <p style="font-size: 19px;margin-bottom: 5px;font-style: italic;clear: both;"><strong>Exclusive Add-on:</strong> Thai Costume with Makeup &amp; Hairstyle – <span style="color: #ad1818;">US$119 per person</span></p>
+
+            <div class="numberBtn">
+                <input class="minaddBtn reduceadult" id="minusButton_makeup" type="button" value="-">
+                <input class="number" id="makeupNumberValue" readonly="readonly" type="text" value="0" name="makeupNumber" style="width: 50px;height: 22px;top: -5px;position: relative;text-align: center;font-size: 20px;">
+                <input class="minaddBtn addadult" id="plusButton_makeup" type="button" value="+">
+            </div>
+        </div>
+
         <p style="font-size: 22px;"><strong>Select Ticket Quantity</strong></p>
         <div class="peopleSelect" style="width: auto;">
             <span class="formMemo">
@@ -404,17 +429,23 @@
 </div>
 <script>
     function calcTotalPrice(ticketPrice, adultNumber) {
-        var totalPrice = ticketPrice * adultNumber;
-        totalPrice = totalPrice.toFixed(2);
+      var makeupPrice = makeupNumberValue * 119;
 
-        totalPriceHidden.value = totalPrice;
-        totalPriceText.innerText = '$' + totalPrice;
+      var totalPrice = (ticketPrice * adultNumber) + makeupPrice;
+
+      totalPrice = totalPrice.toFixed(2);
+
+      totalPriceHidden.value = totalPrice;
+      totalPriceText.innerText = '$' + totalPrice;
     }
+
     var adultNumberNode = document.getElementById("adultNumberValue");
+    var makeupNumberNode = document.getElementById("makeupNumberValue");
     var ticketTypeList = document.querySelectorAll("input[name='ticket_type']");
     var totalPriceText = document.getElementById("totalPriceText");
     var totalPriceHidden = document.getElementById("totalPriceHidden");
     var adultNumberValue = parseInt(adultNumberNode.value);
+    var makeupNumberValue = parseInt(makeupNumberNode.value);
     var currentTicketPrice = 10000;
 
     var vip_december30thRadio = document.getElementById("vip_december30th");
@@ -502,6 +533,22 @@
             calcTotalPrice(currentTicketPrice, adultNumberValue);
         }
     });
+
+    var plusMakeupButton = document.getElementById("plusButton_makeup");
+    var minusMakeupButton = document.getElementById("minusButton_makeup");
+    plusMakeupButton.addEventListener('click', function (event) {
+      makeupNumberValue = parseInt(makeupNumberNode.value) + 1;
+      makeupNumberNode.value = makeupNumberValue;
+      calcTotalPrice(currentTicketPrice, adultNumberValue);
+    });
+    minusMakeupButton.addEventListener('click', function (event) {
+      var beforeValue = parseInt(makeupNumberNode.value);
+      if (beforeValue > 0) {
+        makeupNumberValue = beforeValue - 1;
+        makeupNumberNode.value = makeupNumberValue;
+        calcTotalPrice(currentTicketPrice, adultNumberValue);
+      }
+    });
 </script>
 <script>
     var submit_ticket_button = document.getElementById("submit_ticket_button");
@@ -579,3 +626,4 @@
         return result;
     }
 </script>
+<!--New Year Countdown end-->
\ No newline at end of file

From 0dda4e4b68474de62ce18b4c3889c73eab091ff2 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 5 Mar 2025 13:33:23 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile_first/ah-new-year-countdown.php    | 67 +++++++------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 8f14689d..4d48808e 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -1,26 +1,10 @@
 <!--New Year Countdown start-->
 <script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <div class="tmbottom">
-    <h3 style="font-size: 24px; line-height: 22px;">Chiang Mai CAD New Year Countdown to 2026</h3>
+    <h3 style="font-size: 24px; line-height: 22px;">Chiang Mai CAD New Year Countdown on Dec.31st, 2025</h3>
     <form id='ticket_form' action="https://www.asiahighlights.com/orders/new_year_countdown_save" method="post" >
-        <p style="font-size: 22px;"><strong>Select Date:</strong></p>
-		<div class="selectHotl" style="margin-bottom: 20px;">
-           <div class="optionLable" style="display: none;">
-                <input type="radio" value="2024-12-30" id="december30th" name="ticket_date">
-                <label for="december30th">
-                December 30th, 2024
-                </label>
-            </div>
 
-            <div class="optionLable">
-                <input type="radio" value="2024-12-31" checked id="december31st" name="ticket_date">
-                <label for="december31st">
-                December 31st, 2024
-                </label>
-            </div>
-        </div>
-
-        <p style="font-size: 22px;"><strong>Select an Available Ticket Type</strong></p>
+        <p style="font-size: 20px;"><strong>Select an Available Ticket Type:</strong></p>
 		<div class="selectHotl" style="margin-bottom: 20px;">
             <div class="optionLable" id="ticket_type_elite_december30th" style="display: none">
                 <input type="radio" value="Elite Ticket" id="elite_december30th" data-price="189" name="ticket_type">
@@ -62,15 +46,13 @@
                 </label>
             </div>
             <div class="optionLable" id="vip_type_premium_december31th">
-                <input type="radio" value="Premium Ticket" id="premium_december31th" data-price="209" name="ticket_type">
+                <input type="radio" value="Premium Ticket+ Transfer + Dinner" id="premium_december31th" data-price="209" name="ticket_type">
                 <label for="premium_december31th" style="font-size:18px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
-    font-size: 19px;">Premium Ticket</strong>
+    font-size: 19px; font-weight: 300;">Premium + Transfer + Dinner</strong>
                     <div class="selectionMemo" style="line-height: 18px;">
                       US$209
-                    <br>
-                    Premium service + shuttle transfer + dinner
                     </div>
                 </label>
             </div>
@@ -88,28 +70,24 @@
                 </label>
             </div>
             <div class="optionLable" id="ticket_type_standard_december31th">
-                <input type="radio" value="VIP Ticket" checked id="vip_december31th" data-price="199" name="ticket_type">
+                <input type="radio" value="VIP Ticket+ Transfer + Dinner" checked id="vip_december31th" data-price="199" name="ticket_type">
                 <label for="vip_december31th" style="font-size:18px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
-    font-size: 19px;">VIP Ticket</strong>
+    font-size: 19px;font-weight: 300;">VIP + Transfer + Dinner</strong>
                     <div class="selectionMemo" style="line-height: 18px;">
                       US$199
-                    <br>
-                    VIP service + shuttle transfer + dinner
                     </div>
                 </label>
             </div>
             <div class="optionLable" id="ticket_type_standard_december31th">
-                <input type="radio" value="Standard Ticket" checked id="standard_december31th" data-price="149" name="ticket_type">
+                <input type="radio" value="Standard Ticket+ Transfer + Dinner" checked id="standard_december31th" data-price="149" name="ticket_type">
                 <label for="standard_december31th" style="font-size:18px;">
                 <strong style="margin-bottom: 5px;
     display: block;
-    font-size: 19px;">Standard Ticket</strong>
+    font-size: 19px;font-weight: 300;">Standard + Transfer + Dinner</strong>
                     <div class="selectionMemo" style="line-height: 18px;">
                       US$149
-                    <br>
-                    VIP service + shuttle transfer + dinner
                     </div>
                 </label>
             </div>
@@ -117,18 +95,14 @@
         <div id="ticket_type_errmsg" style="display: none">
           <div class="requiredArea" style="margin-top:-10px;">Please select at least one option.</div>
         </div>
-
-        <div style="clear: both;display: inline-block;border: 3px dashed #d1d1d1;border-radius: 10px;padding: 10px 10px 0px 10px;width: calc(100% - 30px);background: #fff;margin-top: 15px; margin-bottom: 20px;">
-            <p style="font-size: 19px;margin-bottom: 5px;font-style: italic;clear: both;"><strong>Exclusive Add-on:</strong> Thai Costume with Makeup &amp; Hairstyle – <span style="color: #ad1818;">US$119 per person</span></p>
-
+        <p style="font-size: 20px;margin-bottom: 5px; margin-top: 10px;"><strong>Select Ticket Quantity:</strong> Adults and children (8+ years)</p>
+        <div class="peopleSelect" style="width: auto;">
             <div class="numberBtn">
-                <input class="minaddBtn reduceadult" id="minusButton_makeup" type="button" value="-">
-                <input class="number" id="makeupNumberValue" readonly="readonly" type="text" value="0" name="makeupNumber" style="width: 50px;height: 22px;top: -5px;position: relative;text-align: center;font-size: 20px;">
-                <input class="minaddBtn addadult" id="plusButton_makeup" type="button" value="+">
+                <input class="minaddBtn reduceadult" id="minusButton" type="button" value="-">
+                <input class="number" id="adultNumberValue" readonly="readonly" type="text" value="1" name="adult" style="width: 50px;                    height: 22px;                    top: -5px;                    position: relative;                    text-align: center;                    font-size: 20px;">
+                <input class="minaddBtn addadult" id="plusButton" type="button" value="+">
             </div>
         </div>
-
-        <p style="font-size: 22px;"><strong>Select Ticket Quantity</strong></p>
         <div class="peopleSelect" style="width: auto;">
             <span class="formMemo">
                 Adults and older children (8+ years old)
@@ -145,6 +119,17 @@
                 <input class="minaddBtn addadult" id='plusButton' type="button" value="+">
             </div>
         </div>
+
+        <div style="clear: both;display: inline-block;border: 3px dashed #d1d1d1;border-radius: 10px;padding: 10px 10px 0px 10px;width: calc(100% - 30px);background: #fff;margin-top: 15px; margin-bottom: 20px;">
+            <p style="font-size: 19px;margin-bottom: 5px;font-style: italic;clear: both;"><strong>Exclusive Add-on:</strong> Thai Costume with Makeup &amp; Hairstyle – <span style="color: #ad1818;">US$119 per person</span></p>
+
+            <div class="numberBtn">
+                <input class="minaddBtn reduceadult" id="minusButton_makeup" type="button" value="-">
+                <input class="number" id="makeupNumberValue" readonly="readonly" type="text" value="0" name="makeupNumber" style="width: 50px;height: 22px;top: -5px;position: relative;text-align: center;font-size: 20px;">
+                <input class="minaddBtn addadult" id="plusButton_makeup" type="button" value="+">
+            </div>
+        </div>
+
         <div class="payonline_price">Total price: <strong id="totalPriceText">$129</strong></div>
 
         <p style="    margin-top: 30px;
@@ -420,10 +405,10 @@
         <input name="product_code" id="cli_no" type="hidden" value="YDFW-AH"/>
         <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
         <button class="sendButton" id="submit_ticket_button" name="submit_ticket_form"
-            type="button">Proceed to Payment</button>
+            type="button" style="margin-top: 20px;">Proceed to Payment</button>
 <p style="    text-align: center;
     font-style: italic;
-    margin-top: -15px;
+    margin-top: -15px;font-size: 18px;
     line-height: 20px;"><strong>Once we receive your payment, our travel advisor will contact you within 24 hours and send you your e-ticket.</strong></p>
     </form>
 </div>

From 0dc608648953714e9e1ff385adb2e4fe4d85af7d Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 5 Mar 2025 13:41:44 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile_first/ah-new-year-countdown.php      | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 4d48808e..73d90793 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -96,6 +96,7 @@
           <div class="requiredArea" style="margin-top:-10px;">Please select at least one option.</div>
         </div>
         <p style="font-size: 20px;margin-bottom: 5px; margin-top: 10px;"><strong>Select Ticket Quantity:</strong> Adults and children (8+ years)</p>
+        <p style="font-size: 16px;font-style: italic;margin-bottom: 10px;margin-top: -5px;">Children under 8 are free.</p>
         <div class="peopleSelect" style="width: auto;">
             <div class="numberBtn">
                 <input class="minaddBtn reduceadult" id="minusButton" type="button" value="-">
@@ -103,22 +104,6 @@
                 <input class="minaddBtn addadult" id="plusButton" type="button" value="+">
             </div>
         </div>
-        <div class="peopleSelect" style="width: auto;">
-            <span class="formMemo">
-                Adults and older children (8+ years old)
-            </span>
-            <div class="numberBtn">
-                <input class="minaddBtn reduceadult" id='minusButton' type="button" value="-">
-                <input class="number" id="adultNumberValue" readonly="readonly" type="text" value="1"
-                    name="adult" style="width: 50px;
-                    height: 22px;
-                    top: -5px;
-                    position: relative;
-                    text-align: center;
-                    font-size: 20px;">
-                <input class="minaddBtn addadult" id='plusButton' type="button" value="+">
-            </div>
-        </div>
 
         <div style="clear: both;display: inline-block;border: 3px dashed #d1d1d1;border-radius: 10px;padding: 10px 10px 0px 10px;width: calc(100% - 30px);background: #fff;margin-top: 15px; margin-bottom: 20px;">
             <p style="font-size: 19px;margin-bottom: 5px;font-style: italic;clear: both;"><strong>Exclusive Add-on:</strong> Thai Costume with Makeup &amp; Hairstyle – <span style="color: #ad1818;">US$119 per person</span></p>

From e011fd3603d767784ef581620baedc56d4b95b20 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 5 Mar 2025 13:46:02 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E5=90=8C=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile_first/ah-new-year-countdown.php      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 73d90793..2fd34900 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -48,9 +48,7 @@
             <div class="optionLable" id="vip_type_premium_december31th">
                 <input type="radio" value="Premium Ticket+ Transfer + Dinner" id="premium_december31th" data-price="209" name="ticket_type">
                 <label for="premium_december31th" style="font-size:18px;">
-                <strong style="    margin-bottom: 5px;
-    display: block;
-    font-size: 19px; font-weight: 300;">Premium + Transfer + Dinner</strong>
+                Premium + Transfer + Dinner
                     <div class="selectionMemo" style="line-height: 18px;">
                       US$209
                     </div>
@@ -72,9 +70,7 @@
             <div class="optionLable" id="ticket_type_standard_december31th">
                 <input type="radio" value="VIP Ticket+ Transfer + Dinner" checked id="vip_december31th" data-price="199" name="ticket_type">
                 <label for="vip_december31th" style="font-size:18px;">
-                <strong style="    margin-bottom: 5px;
-    display: block;
-    font-size: 19px;font-weight: 300;">VIP + Transfer + Dinner</strong>
+                VIP + Transfer + Dinner
                     <div class="selectionMemo" style="line-height: 18px;">
                       US$199
                     </div>
@@ -83,9 +79,7 @@
             <div class="optionLable" id="ticket_type_standard_december31th">
                 <input type="radio" value="Standard Ticket+ Transfer + Dinner" checked id="standard_december31th" data-price="149" name="ticket_type">
                 <label for="standard_december31th" style="font-size:18px;">
-                <strong style="margin-bottom: 5px;
-    display: block;
-    font-size: 19px;font-weight: 300;">Standard + Transfer + Dinner</strong>
+               Standard + Transfer + Dinner
                     <div class="selectionMemo" style="line-height: 18px;">
                       US$149
                     </div>
@@ -596,4 +590,9 @@
         return result;
     }
 </script>
+<style>
+.minaddBtn {
+    width: auto !important;
+}
+</style>
 <!--New Year Countdown end-->
\ No newline at end of file

From 34e0a51ac41f037f8d4603ec3d9c56b4b9ac8dcc Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 5 Mar 2025 13:49:49 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E5=90=8C=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-new-year-countdown.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 2fd34900..e522b3d1 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -4,7 +4,7 @@
     <h3 style="font-size: 24px; line-height: 22px;">Chiang Mai CAD New Year Countdown on Dec.31st, 2025</h3>
     <form id='ticket_form' action="https://www.asiahighlights.com/orders/new_year_countdown_save" method="post" >
 
-        <p style="font-size: 20px;"><strong>Select an Available Ticket Type:</strong></p>
+        <p style="font-size: 20px;margin-bottom: 20px;"><strong>Select an Available Ticket Type:</strong></p>
 		<div class="selectHotl" style="margin-bottom: 20px;">
             <div class="optionLable" id="ticket_type_elite_december30th" style="display: none">
                 <input type="radio" value="Elite Ticket" id="elite_december30th" data-price="189" name="ticket_type">
@@ -12,7 +12,7 @@
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">Elite Ticket</strong>
-                    <div class="selectionMemo" style="line-height: 18px;">
+                    <div class="selectionMemo">
                     US$189 (6900THB)
                     <br>
                     Elite service + no transfer + dinner
@@ -25,7 +25,7 @@
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">Elite Ticket</strong>
-                    <div class="selectionMemo" style="line-height: 18px;">
+                    <div class="selectionMemo">
                       US$289 (10,000 THB)
                     <br>
                     Elite service + no transfer + dinner
@@ -38,7 +38,7 @@
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">Premium Ticket</strong>
-                    <div class="selectionMemo" style="line-height: 18px;">
+                    <div class="selectionMemo">
                     US$139 (4900THB)
                     <br>
                     Premium service + shuttle transfer + dinner
@@ -49,7 +49,7 @@
                 <input type="radio" value="Premium Ticket+ Transfer + Dinner" id="premium_december31th" data-price="209" name="ticket_type">
                 <label for="premium_december31th" style="font-size:18px;">
                 Premium + Transfer + Dinner
-                    <div class="selectionMemo" style="line-height: 18px;">
+                    <div class="selectionMemo">
                       US$209
                     </div>
                 </label>
@@ -60,7 +60,7 @@
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">VIP Ticket</strong>
-                    <div class="selectionMemo" style="line-height: 18px;">
+                    <div class="selectionMemo" >
                     US$109 (3900THB)
                     <br>
                     VIP service + shuttle transfer + dinner
@@ -71,7 +71,7 @@
                 <input type="radio" value="VIP Ticket+ Transfer + Dinner" checked id="vip_december31th" data-price="199" name="ticket_type">
                 <label for="vip_december31th" style="font-size:18px;">
                 VIP + Transfer + Dinner
-                    <div class="selectionMemo" style="line-height: 18px;">
+                    <div class="selectionMemo">
                       US$199
                     </div>
                 </label>
@@ -80,7 +80,7 @@
                 <input type="radio" value="Standard Ticket+ Transfer + Dinner" checked id="standard_december31th" data-price="149" name="ticket_type">
                 <label for="standard_december31th" style="font-size:18px;">
                Standard + Transfer + Dinner
-                    <div class="selectionMemo" style="line-height: 18px;">
+                    <div class="selectionMemo" >
                       US$149
                     </div>
                 </label>

From 729552f2fdf66156a65ed1a39cbc6e59842de0a9 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 5 Mar 2025 13:52:46 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E5=90=8C=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-new-year-countdown.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index e522b3d1..9f9f0ceb 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -8,7 +8,7 @@
 		<div class="selectHotl" style="margin-bottom: 20px;">
             <div class="optionLable" id="ticket_type_elite_december30th" style="display: none">
                 <input type="radio" value="Elite Ticket" id="elite_december30th" data-price="189" name="ticket_type">
-                <label for="elite_december30th" style="font-size:18px;">
+                <label for="elite_december30th" style="font-size:17px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">Elite Ticket</strong>
@@ -21,7 +21,7 @@
             </div>
             <div class="optionLable" id="ticket_type_elite_december31th" style="display: none">
                 <input type="radio" value="Elite Ticket" id="elite_december31th" data-price="289" name="ticket_type">
-                <label for="elite_december31th" style="font-size:18px;">
+                <label for="elite_december31th" style="font-size:17px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">Elite Ticket</strong>
@@ -34,7 +34,7 @@
             </div>
             <div class="optionLable" id="vip_type_premium_december30th" style="display: none">
                 <input type="radio" value="Premium Ticket" id="premium_december30th" data-price="139" name="ticket_type">
-                <label for="premium_december30th" style="font-size:18px;">
+                <label for="premium_december30th" style="font-size:17px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">Premium Ticket</strong>
@@ -47,8 +47,8 @@
             </div>
             <div class="optionLable" id="vip_type_premium_december31th">
                 <input type="radio" value="Premium Ticket+ Transfer + Dinner" id="premium_december31th" data-price="209" name="ticket_type">
-                <label for="premium_december31th" style="font-size:18px;">
-                Premium + Transfer + Dinner
+                <label for="premium_december31th" style="font-size:19px;">
+                Premium+Transfer+Dinner
                     <div class="selectionMemo">
                       US$209
                     </div>
@@ -56,7 +56,7 @@
             </div>
             <div class="optionLable" id="ticket_type_standard_december30th" style="display: none">
                 <input type="radio" value="VIP Ticket" id="vip_december30th" data-price="109" name="ticket_type">
-                <label for="vip_december30th" style="font-size:18px;">
+                <label for="vip_december30th" style="font-size:17px;">
                 <strong style="    margin-bottom: 5px;
     display: block;
     font-size: 19px;">VIP Ticket</strong>
@@ -70,7 +70,7 @@
             <div class="optionLable" id="ticket_type_standard_december31th">
                 <input type="radio" value="VIP Ticket+ Transfer + Dinner" checked id="vip_december31th" data-price="199" name="ticket_type">
                 <label for="vip_december31th" style="font-size:18px;">
-                VIP + Transfer + Dinner
+                VIP+Transfer+Dinner
                     <div class="selectionMemo">
                       US$199
                     </div>
@@ -79,7 +79,7 @@
             <div class="optionLable" id="ticket_type_standard_december31th">
                 <input type="radio" value="Standard Ticket+ Transfer + Dinner" checked id="standard_december31th" data-price="149" name="ticket_type">
                 <label for="standard_december31th" style="font-size:18px;">
-               Standard + Transfer + Dinner
+               Standard+Transfer+Dinner
                     <div class="selectionMemo" >
                       US$149
                     </div>

From 463ba99df1209774168aa023e43efad6f3f8b684 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 5 Mar 2025 13:57:14 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E5=90=8C=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-new-year-countdown.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 9f9f0ceb..9f7a51cd 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -378,7 +378,7 @@
         <div id="ticket_contact_errmsg" style="display: none">
             <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div>
         </div>
-        <textarea name="other_travelers_names" style="height: 60px;" placeholder="If booking two or more tickets, please fill in other traveler name(s) here:(per passport, e.g.Smith Sarah Jean)."></textarea>
+        <textarea name="other_travelers_names" placeholder="If booking two or more tickets, please fill in other traveler name(s) here:(per passport, e.g.Smith Sarah Jean)."></textarea>
 
         <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
         <input name="product_code" id="cli_no" type="hidden" value="YDFW-AH"/>

From ec70eb5388ec412b0dff09234b739f05ee9daecb Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 10 Mar 2025 09:21:04 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=A5=A8=E7=A7=8DPremium+Transfer+Dinner+Thai=20Costume?=
 =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E5=A6=86=E9=80=A0=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-lantern-form-2025.php       | 11 ++++++++++-
 .../views/mobile_first/ah-new-year-countdown.php      | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-lantern-form-2025.php b/application/views/mobile_first/ah-lantern-form-2025.php
index df408dd5..b577c023 100644
--- a/application/views/mobile_first/ah-lantern-form-2025.php
+++ b/application/views/mobile_first/ah-lantern-form-2025.php
@@ -50,6 +50,15 @@
                     </div>
                 </label>
             </div>
+            <div class="optionLable" id="ticket_type_standard_khomloy">
+                <input type="radio" value="Premium+Transfer+Dinner+Thai Costume" id="premium_costume" data-price="349" name="ticket_type">
+                <label for="premium_costume" style="font-size:18px;">
+                    Premium+Transfer+Dinner+Thai Costume
+                    <div class="selectionMemo">
+                       US$349
+                    </div>
+                </label>
+            </div>
         </div>
         <div id="ticket_type_errmsg" style="display: none">
           <div class="requiredArea" style="margin-top:-10px;">Please select at least one option.</div>
@@ -79,7 +88,7 @@ border: 3px dashed #d1d1d1;
 border-radius: 10px;
 padding: 10px 10px 0px 10px;
 width: calc(100% - 30px);
-background: #fff;margin-top: 15px; margin-bottom: 20px;">
+background: #fff;margin-top: 15px; margin-bottom: 20px; display: none;">
         <p style="    font-size: 19px;
         margin-bottom: 5px;
         font-style: italic;
diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index 9f7a51cd..c9b8c3e6 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -85,6 +85,15 @@
                     </div>
                 </label>
             </div>
+            <div class="optionLable" id="ticket_type_standard_december31th">
+                <input type="radio" value="Premium+Transfer+Dinner+Thai Costume" checked id="premium_costume" data-price="349" name="ticket_type">
+                <label for="premium_costume" style="font-size:18px;">
+                    Premium+Transfer+Dinner+Thai Costume
+                    <div class="selectionMemo" >
+                      US$149
+                    </div>
+                </label>
+            </div>
         </div>
         <div id="ticket_type_errmsg" style="display: none">
           <div class="requiredArea" style="margin-top:-10px;">Please select at least one option.</div>
@@ -99,7 +108,7 @@
             </div>
         </div>
 
-        <div style="clear: both;display: inline-block;border: 3px dashed #d1d1d1;border-radius: 10px;padding: 10px 10px 0px 10px;width: calc(100% - 30px);background: #fff;margin-top: 15px; margin-bottom: 20px;">
+        <div style="clear: both;display: inline-block;border: 3px dashed #d1d1d1;border-radius: 10px;padding: 10px 10px 0px 10px;width: calc(100% - 30px);background: #fff;margin-top: 15px; margin-bottom: 20px; display: none;">
             <p style="font-size: 19px;margin-bottom: 5px;font-style: italic;clear: both;"><strong>Exclusive Add-on:</strong> Thai Costume with Makeup &amp; Hairstyle – <span style="color: #ad1818;">US$119 per person</span></p>
 
             <div class="numberBtn">

From 763fd009f7d07bbd7c47bf82cbe8b35ec2920a8c Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 10 Mar 2025 09:30:57 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-lantern-form-2025.php  | 2 +-
 application/views/mobile_first/ah-new-year-countdown.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-lantern-form-2025.php b/application/views/mobile_first/ah-lantern-form-2025.php
index b577c023..cad2a798 100644
--- a/application/views/mobile_first/ah-lantern-form-2025.php
+++ b/application/views/mobile_first/ah-lantern-form-2025.php
@@ -53,7 +53,7 @@
             <div class="optionLable" id="ticket_type_standard_khomloy">
                 <input type="radio" value="Premium+Transfer+Dinner+Thai Costume" id="premium_costume" data-price="349" name="ticket_type">
                 <label for="premium_costume" style="font-size:18px;">
-                    Premium+Transfer+Dinner+Thai Costume
+                    Premium+Transfer+Dinner<br>+Thai Costume
                     <div class="selectionMemo">
                        US$349
                     </div>
diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php
index c9b8c3e6..31379eca 100644
--- a/application/views/mobile_first/ah-new-year-countdown.php
+++ b/application/views/mobile_first/ah-new-year-countdown.php
@@ -88,7 +88,7 @@
             <div class="optionLable" id="ticket_type_standard_december31th">
                 <input type="radio" value="Premium+Transfer+Dinner+Thai Costume" checked id="premium_costume" data-price="349" name="ticket_type">
                 <label for="premium_costume" style="font-size:18px;">
-                    Premium+Transfer+Dinner+Thai Costume
+                    Premium+Transfer+Dinner<br>+Thai Costume
                     <div class="selectionMemo" >
                       US$149
                     </div>

From 1e2dd1dd4142c5015e29b2a42dd45d85b5aab66f Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 10 Mar 2025 11:31:14 +0800
Subject: [PATCH 12/19] =?UTF-8?q?AH=20=E5=A2=9E=E5=8A=A0=E7=A4=BE=E5=AA=92?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=A0=87=E9=A2=98=E5=92=8C=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php  | 14 +++++++--
 application/views/mobile_first/ah-pc.php |  4 ++-
 application/views/mobile_first/ah.php    | 36 +++++++++++++-----------
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 28ef32ca..ff5d81f4 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1111,7 +1111,7 @@ class Information extends CI_Controller
 
     // 检查图片地址格式
     $parsed_photo_url = parse_url($parsed_photo);
-    if (strpos($parsed_photo,"data.chinahighlights.com")!==false ){  
+    if (strpos($parsed_photo,"data.chinahighlights.com")!==false ){
         //判断是否录入了//data.chinahighlihgts.com这种以前兼容http的图片url
         //如果有，就不需要改变图片url
     }
@@ -2490,6 +2490,16 @@ class Information extends CI_Controller
       $template = str_replace('<!--@ADDON-JS@-->', '<script src="' . $meta_addon_js . '"></script>', $template);
     }
 
+    $meta_note_ogtitle = get_meta($information->ic_id, 'meta_note_ogtitle');
+    if (!empty($meta_note_ogtitle)) {
+      $template = str_replace('<!--@meta_og:title@-->', '<meta property="og:title" content="' . $meta_note_ogtitle . '" />', $template);
+    }
+
+    $meta_note = get_meta($information->ic_id, 'meta_note');
+    if (!empty($meta_note)) {
+      $template = str_replace('<!--@meta_og:description@-->', '<meta property="og:description" content="' . $meta_note . '" />', $template);
+    }
+    
     $meta_index_set = get_meta($information->ic_id, 'meta_index_set');
     if (!empty($meta_index_set)) {
       $template = str_replace('<!--@Meta_Robots@-->', '<meta name="robots" content="' . $meta_index_set . '" />', $template);
@@ -3042,7 +3052,7 @@ class Information extends CI_Controller
       }
       $template_TrainDetailSearch = $this->load->view($template_path . '-train-index', $data_TrainCity, true);
     }
-    
+
 
 
     /*  详细内容  */
diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index e7880a5f..e75ad12b 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -11,6 +11,8 @@
     <meta content="yes" name="apple-mobile-web-app-capable">
     <meta name="apple-mobile-web-app-title" content="Asia Highlights - Since 2016!">
     <meta name="description" content="<!--@DESCRIPTION@-->">
+  <!--@meta_og:title@-->
+  <!--@meta_og:description@-->
     <!--@Meta_Robots@-->
     <!--@OG:IMAGE@-->
     <link rel="canonical" href="<!--@CANONICAL@-->">
@@ -45,7 +47,7 @@
                     alt="Asiahighlights logo" class="asiahighlightslogo img-responsive"></a>
             <nav>
                 <ul class="pctopnavi">
-                   
+
 
                     <li class="dropdown"><a class="p_topnavilink" href="/destinations">Destinations</a>
                         <div class=" dropdown-content">
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index c6c93dd9..fbb31626 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -8,6 +8,8 @@
   </title>
   <meta name="description" content="<!--@DESCRIPTION@-->">
   <link rel="canonical" href="<!--@CANONICAL@-->">
+  <!--@meta_og:title@-->
+  <!--@meta_og:description@-->
   <!--@Meta_Robots@-->
   <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
   <!--@OG:IMAGE@-->
@@ -32,13 +34,13 @@
   <noscript> <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-56CMWN3" height="0" width="0"
       style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) -->
 
-      <header class="headerbar" id="header">      
+      <header class="headerbar" id="header">
         <img src="https://data.chinahighlights.com/image/tour-detail/icon/top-navigation-menu-button.jpg"
         class="topnaviarrowdown action--open" width="26" height="25" style="position: absolute; top: 13px; left: 10px;" title="navigation button">
         <a href="/" style="width: 103px; display: block; margin: 0 auto;"> <img src="https://data.asiahighlights.com/pic/logo-ah.png" alt="Asia Highlights logo" class="chinahighlightslogo img-responsive" width="238" height="117"></a>
         <div class="topnavitailor">
-            <a href="/contact-us" class="infocustomize">Contact</a>        
-        </div>  
+            <a href="/contact-us" class="infocustomize">Contact</a>
+        </div>
 </header>
 
 
@@ -66,12 +68,12 @@
       <ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All">
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/">Home</a></li>
         <li class="menu__item" role="menuitem" ><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2" >Destinations</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/tours" data-submenu="submenu-7" aria-owns="submenu-7">Tours</a></li>   
-       
+        <li class="menu__item" role="menuitem"><a class="menu__link" href="/tours" data-submenu="submenu-7" aria-owns="submenu-7">Tours</a></li>
+
             <li class="menu__item" role="menuitem" style="margin-bottom: 50px;"><a class="menu__link" href="/itinerary-ideas">Itinerary Ideas</a></li>
             <li class="menu__item" role="menuitem"><a href="/reviews" data-submenu="submenu-9" aria-owns="submenu-9" class="menu__link">Reviews</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/about-us">About Us</a></li>
-        
+
       </ul>
       <ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu"
         aria-label="destinations">
@@ -175,14 +177,14 @@
                           <div class="bottom_why_us_content">
                               <div class="whyus_image"> <img src="https://data.asiahighlights.com/grey.gif" loader="lazy" originalsrc="https://images.asiahighlights.com/allpicture/2024/02/2fa10d72338f4942af532a909a486215_cut_100x100_241.png"
                                   alt="Customize Your Tour" class="img-responsive" width="100" height="100"/></div>
-                                
+
                                   <h3>Customize Your Tour</h3>
                               <ul class="infolist">
                                   <li>Travel Advisors Rooted in Asia</li>
                                   <li>Instant Response, No More Waits! </li>
                                         <li>Direct Connections, Supreme Values</li>
                               </ul>
-                        
+
                           </div>
                       </td>
                       <td>
@@ -197,14 +199,14 @@
                               </ul>
                           </div>
                       </td>
-  
+
                       <td>
                           <div class="bottom_why_us_content">
                               <div class="whyus_image"><img src="https://data.asiahighlights.com/grey.gif" loader="lazy" originalsrc="https://images.asiahighlights.com/allpicture/2024/02/93cce481fbbb427882ce36285d73119d_cut_100x100_241.png"
                                   alt="Ensure Your Satisfactory" class="img-responsive" width="100" height="100"/></div>
                               <h3>Ensure Your Satisfactory</h3>
                               <ul class="infolist">
-                              <li>The Top 20% nationwide guides at your service.</li> 
+                              <li>The Top 20% nationwide guides at your service.</li>
                                         <li>20% more space on your group's transportation.</li>
                                           <li>  24/7 emergency support.</li>
                               </ul>
@@ -221,7 +223,7 @@
                                       <li>  Celebrate milestones with style!</li>
                                           <li>  Photographer service for special moments</li>
                               </ul>
-  
+
                           </div>
                       </td>
                   </tr>
@@ -239,14 +241,14 @@
 <div class="listtour">
   <div class="destination_links">
     <ul>
-      <li><a href="https://www.chinahighlights.com/" target="_blank" rel="nofollow">China</a></li>              
-      <li><a href="https://www.globalhighlights.com/europe" target="_blank" rel="nofollow">Europe</a></li>  
-         
+      <li><a href="https://www.chinahighlights.com/" target="_blank" rel="nofollow">China</a></li>
+      <li><a href="https://www.globalhighlights.com/europe" target="_blank" rel="nofollow">Europe</a></li>
+
     </ul>
   </div>
   <div class="destination_links">
     <ul>
-      <li><a href="https://www.globalhighlights.com/middle-east/tours" target="_blank" rel="nofollow">Middle East  </a></li>               
+      <li><a href="https://www.globalhighlights.com/middle-east/tours" target="_blank" rel="nofollow">Middle East  </a></li>
       <li><a href="https://www.globalhighlights.com/african-safari-tours/tours" target="_blank" rel="nofollow">African Safari</a></li>
 </ul>
 </div>
@@ -300,7 +302,7 @@
         <span class="followtitle"><a href="/about-us">About Us</a></span>
         <ul>
         <li><a href="/about-us">About us</a></li>
-                  <li><a href="/travel-agents">Travel Agents</a></li>                 
+                  <li><a href="/travel-agents">Travel Agents</a></li>
                   <li><a href="/reviews">Reviews</a></li>
                   <li><a href="/contact-us" >Contact us</a></li>
                   <li><a href="/about-us/loyalty-program">Loyalty Program</a></li>
@@ -319,7 +321,7 @@
   </ul></div>
 <div>
 <ul>
-  
+
 
 <li><a href="https://www.viaggio-in-cina.it/" target="_blank" rel="nofollow">Italiano</a></li>
 <li><a href="https://www.chinahighlights.ru/" target="_blank" rel="nofollow">Русский</a></li>

From 4dcb3ae680790d229f992a4d9c8f61bc83140d81 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 10 Mar 2025 14:31:56 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?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

---
 application/views/mobile_first/ch-pc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index b329b49d..fd0bc34d 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -156,7 +156,7 @@
                     <li class="dropdown"><a href="/travelguide/" class="p_topnavilink" id="travel_guide_2021">Travel
                             Guide</a>
                         <div class="travelguidepc dropdown-content">
-                            <div class="listtour" style="width:1200px; padding-left: 150px;">
+                            <div class="listtour" style="width: 1200px; margin: 0 auto;">
                                 <div class="guide_block">
                                     <div class="navisgation_title_pc">Itinerary Ideas</div>
 

From 3a36d203e6f487515e298bc2365be83619869c5e Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 10 Mar 2025 15:01:53 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20Myanmar=20Travel=20Reviews?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-pc.php | 3 +--
 application/views/mobile_first/ah.php    | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index e75ad12b..212cb99e 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -122,8 +122,7 @@
                                         <li><a href="/reviews/cambodia" id="cambodia_reviews">Cambodia Travel
                                                 Reviews</a></li>
                                         <li><a href="/reviews/japan" id="japan_reviews">Japan Travel Reviews</a></li>
-                                        <li><a href="/reviews/myanmar" id="myanmar_reviews">Myanmar Travel Reviews</a>
-                                        </li>
+                                        
                                         <li><a href="/reviews/china" id="china_reviews">China Travel Reviews</a></li>
                                     </ul>
                                 </div>
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index fbb31626..6de0d85c 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -113,9 +113,7 @@
 
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/reviews/japan"
             id="japan_reviews_mobile">Japan Travel Reviews</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/reviews/myanmar"
-            id="myanmar_reviews_mobile">Myanmar Travel Reviews</a>
-        </li>
+        
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/reviews/china"
             id="china_reviews_mobile">China Travel Reviews</a></li>
       </ul>

From 2c3a49c865d0a09c5f74e188b42c4dd7ad88d3d8 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 10 Mar 2025 15:09:05 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?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

---
 application/views/mobile_first/gh-pc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php
index 8f62ad1b..e3fbbda3 100644
--- a/application/views/mobile_first/gh-pc.php
+++ b/application/views/mobile_first/gh-pc.php
@@ -62,7 +62,7 @@
                 <li class="dropdown"><a class="p_topnavilink" href="/destinations">Destinations</a>
                     <div class="dropdown-content">
                         <div class="inspirationinfo">
-                            <div class="inspirationlist vacationtype" style="width: 15%;">
+                            <div class="inspirationlist vacationtype" style="width: 17%;">
                                 <div class="inspirationtitle"><a href="/europe">Europe</a></div>
                                 <ul class="inspiration">
                                     <li><a href="/italy">Italy</a></li>
@@ -71,7 +71,7 @@
                                     <li><a href="/spain">Spain</a></li>
                                 </ul>
                             </div>
-                            <div class="inspirationlist vacationtype" style="width: 25%;">
+                            <div class="inspirationlist vacationtype" style="width: 30%;">
                                 <div class="inspirationtitle">Asia</div>
 
                                 <div class="listtour">
@@ -121,7 +121,7 @@
                                 </div>
                             </div>
 
-                            <div class="inspirationlist vacationtype" style="width: 15%;">
+                            <div class="inspirationlist vacationtype" style="width: 17%;">
                                 <div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
                                 <ul class="inspiration">
                                     <li><a href="/egypt/tours">Egypt
@@ -136,7 +136,7 @@
                                         </a></li>
                                 </ul>
                             </div>
-                            <div class="inspirationlist vacationtype" style="width: 15%;">
+                            <div class="inspirationlist vacationtype" style="width: 18%;">
                                 <div class="inspirationtitle">Africa</div>
                                 <ul class="inspiration">
                                     <li><a href="/african-safari">African Safari</a></li>
@@ -145,7 +145,7 @@
                                     <li><a href="/tanzania">Tanzania</a></li>
                                 </ul>
                             </div>
-                            <div class="inspirationlist vacationtype" style="width: 15%;">
+                            <div class="inspirationlist vacationtype" style="width: 18%;">
                                 <div class="inspirationtitle">South America</div>
                                 <ul class="inspiration">
                                     <li><a href="/peru/2-week-itinerary">Peru</a></li>

From 6d65e0b07470d0b1348dd7735871c258344e38bd Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 11 Mar 2025 09:35:53 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20Contact=20US=20?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index fd0bc34d..64c235a3 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -73,8 +73,8 @@
     <!--PC头部导航-->
     <header class="headerbar" id="header">
         <nav>
-            
-           
+
+
                 <ul class="pctopnavi">
                     <li><a href="/" class="p_toplogo"> <img
                         src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navigation-logo.png" width="154"
@@ -337,7 +337,7 @@
                     </li>
                     <li class="dropdown"><a href="/aboutus/" class="p_topnavilink">About us</a></li>
                     <li class="topnavitailor">
-                        <a href="/contactus/?product_code=cht-home-111" id="contact_us_2021">Contact us</a>
+                        <a href="/contactus/?product_code=" id="contact_us_2021">Contact us</a>
                     </li>
                     <li class="pcnavibutton">
 
@@ -355,7 +355,7 @@
                         </div>
                     </li>
                 </ul>
-            </nav>        
+            </nav>
     </header>
  <!--@HEAD_1@-->
     <div class="main_content">

From 986dd4c9542c3435df80bc158c108681363c8be3 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 11 Mar 2025 09:36:56 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E4=BF=AE=E6=94=B9=E4=B8=BA=20/contactus/=3Fp?=
 =?UTF-8?q?roduct=5Fcode=3D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index fd0bc34d..e9c47fd8 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -337,7 +337,7 @@
                     </li>
                     <li class="dropdown"><a href="/aboutus/" class="p_topnavilink">About us</a></li>
                     <li class="topnavitailor">
-                        <a href="/contactus/?product_code=cht-home-111" id="contact_us_2021">Contact us</a>
+                        <a href="/contactus/?product_code=" id="contact_us_2021">Contact us</a>
                     </li>
                     <li class="pcnavibutton">
 

From bab5484d110cd1286f92bbc1e39e9e1651477d47 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 11 Mar 2025 09:37:32 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E5=90=8C=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 64c235a3..72286f86 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -340,7 +340,6 @@
                         <a href="/contactus/?product_code=" id="contact_us_2021">Contact us</a>
                     </li>
                     <li class="pcnavibutton">
-
                         <div class="siteSearch">
                             <form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach"
                                 action="https://www.chinahighlights.com/search-result/">

From a5b7b71ef4fac357087a2b0b2b70749b9b9569ab Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 11 Mar 2025 10:42:21 +0800
Subject: [PATCH 19/19] =?UTF-8?q?China=20Nature=20Tours=20=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 614d6ec4..715f7c82 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -141,8 +141,7 @@
                                             class="menu__link">Silk Road Tours</a></li>
                                                 <li class="start-nav-item start-nav-item-last"><a href="/greatwall/tours/"
                                                 class="menu__link">Great Wall of China Tours</a></li>
-                                                    <li class="start-nav-item start-nav-item-last"><a href="/tour/china-nature-tours/"
-                                                    class="menu__link">Nature Tours</a></li>
+<li class="start-nav-item start-nav-item-last"><a href="/tour/china-nature-tours/" class="menu__link">China Nature Tours</a></li>
                                                         <li class="menu__item" role="menuitem"><a href="/tour/winter-vacation/"
                                                         class="menu__link">China Winter Tours</a></li>
                                                             <li class="menu__item" role="menuitem"><a href="/yangtzecruise/"