From c9040c24110e7e61274855c38d83a24ec8f71749 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 21 Dec 2023 16:57:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=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-recommends-article.php     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/mobile_first/ah-recommends-article.php b/application/views/mobile_first/ah-recommends-article.php
index 1a194404..6abf15a1 100644
--- a/application/views/mobile_first/ah-recommends-article.php
+++ b/application/views/mobile_first/ah-recommends-article.php
@@ -7,7 +7,7 @@
                         <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Article A']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article A']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article A']->ic_title; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article A']->ic_title; ?>"></a>
 
@@ -24,7 +24,7 @@
                         <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Article B']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article B']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article B']->ic_title; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article B']->ic_title; ?>"></a>
 
@@ -42,7 +42,7 @@
                         <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Article C']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article C']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article C']->ic_title; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article C']->ic_title; ?>"></a>
 
@@ -59,7 +59,7 @@
                         <div class="infopage_ad hidden-xs">
                             <a href="<?php echo $recommands['Content Article D']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article D']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article D']->ic_title; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article D']->ic_title; ?>"></a>
 
@@ -77,7 +77,7 @@
                         <div class="infopage_ad hidden-xs">
                             <a href="<?php echo $recommands['Content Article E']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article E']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article E']->ic_title; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article E']->ic_title; ?>"></a>
 
@@ -95,7 +95,7 @@
                         <div class="infopage_ad hidden-xs">
                             <a href="<?php echo $recommands['Content Article F']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article F']->mobile_photo; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article F']->ic_title; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article F']->ic_title; ?>"></a>
 

From e5baebe3cf1f754a5a498a0737d79d18bfa2ebe7 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 21 Dec 2023 16:58:15 +0800
Subject: [PATCH 2/5] 11

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

diff --git a/application/views/mobile_first/ah-recommends-article.php b/application/views/mobile_first/ah-recommends-article.php
index 6abf15a1..9b400630 100644
--- a/application/views/mobile_first/ah-recommends-article.php
+++ b/application/views/mobile_first/ah-recommends-article.php
@@ -1,7 +1,6 @@
 <div class="infopage_ad_content">
     <?php if (!empty($recommands['Content Article A']) || !empty($recommands['Content Article B']) || !empty($recommands['Content Article C']) || !empty($recommands['Content Article D'])) { ?>
-        <div class="content_article_title">You might be interested in:</div>
-       
+        <div class="content_article_title">You might be interested in:</div>    
 
                     <?php if (!empty($recommands['Content Article A'])) { ?>
                         <div class="infopage_ad">

From 4aaaf80bb52f2c14133c747be1c497c8ea36cd9c Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 21 Dec 2023 17:00:05 +0800
Subject: [PATCH 3/5] 11

---
 .../views/mobile_first/ah-recommends-article.php     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/mobile_first/ah-recommends-article.php b/application/views/mobile_first/ah-recommends-article.php
index 9b400630..8e37666a 100644
--- a/application/views/mobile_first/ah-recommends-article.php
+++ b/application/views/mobile_first/ah-recommends-article.php
@@ -6,7 +6,7 @@
                         <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Article A']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article A']->ic_title; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article A']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article A']->ic_title; ?>"></a>
 
@@ -23,7 +23,7 @@
                         <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Article B']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article B']->ic_title; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article B']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article B']->ic_title; ?>"></a>
 
@@ -41,7 +41,7 @@
                         <div class="infopage_ad">
                             <a href="<?php echo $recommands['Content Article C']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article C']->ic_title; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article C']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article C']->ic_title; ?>"></a>
 
@@ -58,7 +58,7 @@
                         <div class="infopage_ad hidden-xs">
                             <a href="<?php echo $recommands['Content Article D']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article D']->ic_title; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article D']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article D']->ic_title; ?>"></a>
 
@@ -76,7 +76,7 @@
                         <div class="infopage_ad hidden-xs">
                             <a href="<?php echo $recommands['Content Article E']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article E']->ic_title; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article E']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article E']->ic_title; ?>"></a>
 
@@ -94,7 +94,7 @@
                         <div class="infopage_ad hidden-xs">
                             <a href="<?php echo $recommands['Content Article F']->ic_url; ?>"> <img
                                         src="https://data.asiahighlights.com/grey.gif" loader="lazy"
-                                        originalsrc="<?php echo $recommands['Content Article F']->ic_title; ?>"
+                                        originalsrc="<?php echo $recommands['Content Article F']->desktop_photo; ?>"
                                         class="img-responsive"
                                         alt="<?php echo $recommands['Content Article F']->ic_title; ?>"></a>
 

From 7b4605c9fd6bf69d188a1ef19261156dfd8913e7 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 22 Dec 2023 10:06:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9Edelete=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/order/views/confirm_order.php | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php
index 2d2c01d3..1f3db961 100644
--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@@ -35,7 +35,7 @@
 
 
 		.wholeWrap2 {
-			background: #000;
+			background: #555;
 			width: 100%;
 			display: inline-block;
 			margin-bottom: -4px;
@@ -434,6 +434,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
 						<div id="passport_error_msg" class="hidden">Please enter your passport number.</div>
 
 						<select class="country_code" name="nationality[]">
+							<option disabled >Select your nationality</option>
                                                 <option value="18">Australia</option>
                                                 <option value="5">Canada</option>
                                                 <option value="1">China</option>
@@ -675,7 +676,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
 											<div class="inputTerm" id='phoneNumberDiv'>
 												<input type="text" name="mobile" required="" class="number">
 												<label>
-													Phone number
+													Phone number including country code and area code
 												</label>
 											</div>
 						<div class="selectionBlock">
@@ -706,8 +707,8 @@ select.gender_pick {border: 1px solid #d1d1d1;
 							<option value="Self-emloyed person">Self-emloyed person</option>
 							<option value="Others">Others</option>
 						</select>
-					</div>
 					<button class="add_traveler_button" id="add_traveler_button" type="button">+ Add a traveler</button>
+					</div>
 				</div>
 
 
@@ -933,13 +934,25 @@ select.gender_pick {border: 1px solid #d1d1d1;
   $(function() {
     var $travelerTemplate = $(".traveler_info:first").clone();
     //添加客户
-    $("#add_traveler_button").click(function() {
+    $("#add_traveler_button").click(function () {addTraveler()});
+
+    function addTraveler() {
+      var travelerCount = $(".traveler_info").length + 1;
+      var travelerId = 'traveler' + travelerCount;
       var $addTraveler = $travelerTemplate.clone();
+      $addTraveler.attr('id', travelerId);
       $addTraveler.find('#phoneNumberDiv').remove();
-      var travelerCount = $(".traveler_info").length + 1;
       $addTraveler.find('[data-header]').text('Traveler ' + travelerCount);
-      $('#add_traveler_button').before($addTraveler);
-    });
+
+      $addTravelerButton = $addTraveler.find('#add_traveler_button');
+      $addTravelerButton.attr('id', 'add_traveler_button' + travelerCount);
+      $addTravelerButton.click(function(){addTraveler()});
+
+      $deleteTravelerButton = $('<button class="add_traveler_button" type="button">- Delete Travel ' + travelerCount + '</button>');
+      $deleteTravelerButton.click(function(){$('#'+travelerId).remove();});
+      $addTraveler.append($deleteTravelerButton);
+      $(".traveler_info:last").after($addTraveler);
+    }
   });
 	</script>
 </body>

From 723deb7019407ca3e9ed50510f0dcf9a4bda09bc Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 22 Dec 2023 10:14:27 +0800
Subject: [PATCH 5/5] =?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

---
 .../third_party/order/views/confirm_order.php     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php
index 1f3db961..e2b68d7f 100644
--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@@ -138,12 +138,13 @@
 		}
 
 		button.add_traveler_button {
-			font-size: 21px;
-			color: #ad1818;
-			padding: 8px;
-			border: 1px solid #d1d1d1;
-			border-radius: 4px;
-			width: 300px;
+			font-size: 20px;
+    color: #ad1818;
+    padding: 5px 30px;
+    border: 1px solid #d1d1d1;
+    border-radius: 4px;
+    margin-top: 30px;
+    margin-right: 10px;
 		}
 
 
@@ -434,7 +435,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
 						<div id="passport_error_msg" class="hidden">Please enter your passport number.</div>
 
 						<select class="country_code" name="nationality[]">
-							<option disabled >Select your nationality</option>
+							<option value="" disabled="" selected="">Select your nationality</option>
                                                 <option value="18">Australia</option>
                                                 <option value="5">Canada</option>
                                                 <option value="1">China</option>