From 78e8bae5d2050fa5588fc8d997f873a5b2bade66 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 9 Sep 2022 13:38:29 +0800 Subject: [PATCH 01/34] =?UTF-8?q?CH=20=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=ADQI=20=E4=BD=BF=E7=94=A8=20Google=20=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ch-info-page-form.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 97e15bac..db9a23f6 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -5,7 +5,7 @@

Or Submit an Inquiry Below

-
+

*

@@ -15,9 +15,22 @@

*

-
+
+ + + \ No newline at end of file From d0af0ce978b7297470335ba6dc54525ac85ed601 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 9 Sep 2022 15:59:32 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20QI=20=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E8=A1=A8=E5=8D=95=E4=BD=BF=E7=94=A8=20Google=20?= =?UTF-8?q?=E4=BB=A4=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- application/views/mobile_first/ah-gp-form.php | 17 +++- .../views/mobile_first/ah-info-page-form.php | 29 +++++- .../views/mobile_first/ah-inquiry-form.php | 95 ++++++++++++++++++- .../ah-lantern-form-info-page.php | 14 +++ .../views/mobile_first/ah-lantern-form.php | 14 +++ 6 files changed, 162 insertions(+), 9 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 7ec3c042..5e4e9819 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1274,7 +1274,7 @@ class Information extends CI_Controller $addthis_widget = $this->load->view($template_path . '-add-this', false, true); $template = str_replace('', $addthis_widget, $template); } else { - $template = str_replace('', '', $template); + // $template = str_replace('', '', $template); $inquiry_form_template = $this->load->view( $template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code, 'information' => $information), diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/ah-gp-form.php index e8d936be..79be6ec1 100644 --- a/application/views/mobile_first/ah-gp-form.php +++ b/application/views/mobile_first/ah-gp-form.php @@ -1,3 +1,4 @@ +

Book this trip now. Your 1:1 travel consultant will reply within 1 working day.

@@ -730,7 +731,21 @@ const submitFormBtn = el('submit_gp_form'); submitFormBtn.on('click', () => { if (validateGPForm()) { - el('gp_form').submit(); + + if (typeof(grecaptcha) === "undefined") { + console.warn('grecaptcha is disabled.'); + el('gp_form').submit(); + } else { + grecaptcha.enterprise.ready(async () => { + const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'}); + var el = document.createElement("input"); + el.type = "hidden"; + el.name = "__grecaptcha_token__"; + el.value = token; + tailormade_form.appendChild(el); + el('gp_form').submit(); + }); + } } }); diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index cef577bc..6b3a7d3b 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -1,9 +1,11 @@ + +

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

- + - +

For a quick conversation, simply reach us via WhatsApp:

@@ -620,6 +622,29 @@ document.addEventListener('DOMContentLoaded', () => { disableMobile: true, minDate: "today" }); + + var info_page_button = document.getElementById("info_page_button"); + var info_page_form = document.getElementById("info_page_form"); + + info_page_button.addEventListener('click', function(event) { + var validateResult = validateQuickInquiryForm(); + if (validateResult) { + if (typeof(grecaptcha) === "undefined") { + console.warn('grecaptcha is disabled.'); + info_page_form.submit(); + } else { + grecaptcha.enterprise.ready(async () => { + const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'}); + var el = document.createElement("input"); + el.type = "hidden"; + el.name = "__grecaptcha_token__"; + el.value = token; + info_page_form.appendChild(el); + info_page_form.submit(); + }); + } + } + }); function validateQuickInquiryForm() { diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 9bbef304..8529adee 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -1,8 +1,7 @@ - - +

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

-
+ - +

+8615807734776
Email: contact@asiahighlights.com

-
\ No newline at end of file + + \ No newline at end of file diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index 327f6232..3b8e1ff8 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -1,3 +1,4 @@ +

Get Your 2022 Chiang Mai CAD Lantern Mass Release @@ -727,7 +728,20 @@ submit_ticket_button.addEventListener('click', function(event) { var validateResult = validateTicketForm(); if (validateResult) { + if (typeof(grecaptcha) === "undefined") { + console.warn('grecaptcha is disabled.'); ticket_form.submit(); + } else { + grecaptcha.enterprise.ready(async () => { + const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'}); + var el = document.createElement("input"); + el.type = "hidden"; + el.name = "__grecaptcha_token__"; + el.value = token; + ticket_form.appendChild(el); + ticket_form.submit(); + }); + } } }); function validateTicketForm() { diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 638d481a..608a95c1 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -1,3 +1,4 @@ +

Get Your 2022 Chiang Mai CAD Lantern Mass Release @@ -726,7 +727,20 @@ submit_ticket_button.addEventListener('click', function(event) { var validateResult = validateTicketForm(); if (validateResult) { + if (typeof(grecaptcha) === "undefined") { + console.warn('grecaptcha is disabled.'); ticket_form.submit(); + } else { + grecaptcha.enterprise.ready(async () => { + const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'}); + var el = document.createElement("input"); + el.type = "hidden"; + el.name = "__grecaptcha_token__"; + el.value = token; + ticket_form.appendChild(el); + ticket_form.submit(); + }); + } } }); function validateTicketForm() { From e601998a0b640e8793bc29ffe38662d84b0bca5b Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 9 Sep 2022 16:04:39 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20JS=20=E8=AF=AD?= =?UTF-8?q?=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-info-page-form.php | 1 + application/views/mobile_first/ah-inquiry-form.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 6b3a7d3b..85363a0d 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -644,6 +644,7 @@ document.addEventListener('DOMContentLoaded', () => { }); } } + ); }); diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 8529adee..fedbab9e 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -649,6 +649,7 @@ document.addEventListener('DOMContentLoaded', () => { }); } } + ); }); function validateQuickInquiryForm() { From f0d2668f413c6ffaa8630891a4644b5ef2f074f8 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 9 Sep 2022 16:11:14 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20JS=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-info-page-form.php | 2 +- application/views/mobile_first/ah-inquiry-form.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 85363a0d..7757752d 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -644,7 +644,7 @@ document.addEventListener('DOMContentLoaded', () => { }); } } - ); + }); }); diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index fedbab9e..89184337 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -648,8 +648,8 @@ document.addEventListener('DOMContentLoaded', () => { quick_inquiry_form.submit(); }); } - } - ); + } + }); }); function validateQuickInquiryForm() { From 14983db4c2f225da383ae774df3732c27b90a4f2 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 9 Sep 2022 16:13:03 +0800 Subject: [PATCH 06/34] 11 --- application/views/mobile_first/ch-info-page-form.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 00ecc3be..a0cca819 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -1,7 +1,5 @@
- -

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

Date: Fri, 9 Sep 2022 16:19:35 +0800 Subject: [PATCH 07/34] 11 --- application/views/mobile_first/ch-info-page-form.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index a0cca819..46d534c5 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -1,7 +1,5 @@
-

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

-
From 89ba7399fc0970579253e507274d03d0f65d5a67 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 9 Sep 2022 16:21:55 +0800 Subject: [PATCH 08/34] JS error --- application/views/mobile_first/ah-inquiry-form.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 89184337..334ffffd 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -609,6 +609,8 @@ Email: contact@asiahighlights.com
+ + + + + + \ No newline at end of file From b858dd45a2d0dda031d5383f6a112fffaf9d4b73 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 9 Sep 2022 17:30:39 +0800 Subject: [PATCH 11/34] fixed js error --- application/views/mobile_first/ch-info-page-form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 3edfa2ca..6bc72158 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -1,7 +1,7 @@

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

- +
From 91af76371197fe64350766ef6db638f259803494 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 13 Sep 2022 14:45:31 +0800 Subject: [PATCH 12/34] 11 --- application/views/mobile_first/ah-lantern-form-info-page.php | 1 - application/views/mobile_first/ah-lantern-form.php | 1 - 2 files changed, 2 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index 7873a506..5f21688e 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -1,6 +1,5 @@
-

Get Your 2022 Chiang Mai CAD Lantern Mass Release Tickets Here!

diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index a7ca8cd4..fabd772c 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -1,6 +1,5 @@
-

Get Your 2022 Chiang Mai CAD Lantern Mass Release Tickets Here!

From 99edd466fc9ddd2905c01d2926dbbcc960acd554 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 13 Sep 2022 15:52:24 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=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-info-page.php | 2 +- application/views/mobile_first/ah-lantern-form.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index 5f21688e..6389407d 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -60,7 +60,7 @@

Children under 8 years old enter free; 8-year-olds and above are charged the same as adults. You can buy a ticket for your child under 8 if you would like her or him to enjoy the same provision.

-
Total price: $170
+
Total price: $179

Please provide correct personal information for your ticket booking. Double check.

diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index fabd772c..7ef8c656 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -60,7 +60,7 @@

Children under 8 years old enter free; 8-year-olds and above are charged the same as adults. You can buy a ticket for your child under 8 if you would like her or him to enjoy the same provision.

-
Total price: $170
+
Total price: $179

Please provide correct personal information for your ticket booking. Double check.

From fdc3c0527e11a50b6e015f1fc68530803a919b98 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 13 Sep 2022 16:15:15 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E7=A5=A8=E4=BB=B7=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-info-page.php | 4 ++-- application/views/mobile_first/ah-lantern-form.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index 6389407d..483d051e 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -681,7 +681,7 @@ var totalPriceText = document.getElementById("totalPriceText"); var totalPriceHidden = document.getElementById("totalPriceHidden"); var adultNumberValue = parseInt(adultNumberNode.value); - var ticketPrice = 170; + var ticketPrice = 179; totalPriceHidden.value = ticketPrice * adultNumberValue; for (var i = 0; i < ticketTypeList.length; i++) { var ticketTypeNode = ticketTypeList[i]; @@ -689,7 +689,7 @@ var currentTarget = event.currentTarget; var adultNumberValue = parseInt(adultNumberNode.value); if (currentTarget.value === 'Premium + Free Transfer') { - ticketPrice = 170; + ticketPrice = 179; } else if (currentTarget.value === 'Standard + Free Transfer') { ticketPrice = 122; } else if (currentTarget.value === 'VIP + Free Transfer') { diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 7ef8c656..0224ff27 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -680,7 +680,7 @@ var totalPriceText = document.getElementById("totalPriceText"); var totalPriceHidden = document.getElementById("totalPriceHidden"); var adultNumberValue = parseInt(adultNumberNode.value); - var ticketPrice = 170; + var ticketPrice = 179; totalPriceHidden.value = ticketPrice * adultNumberValue; for (var i = 0; i < ticketTypeList.length; i++) { var ticketTypeNode = ticketTypeList[i]; @@ -688,7 +688,7 @@ var currentTarget = event.currentTarget; var adultNumberValue = parseInt(adultNumberNode.value); if (currentTarget.value === 'Premium + Free Transfer') { - ticketPrice = 170; + ticketPrice = 179; } else if (currentTarget.value === 'Standard + Free Transfer') { ticketPrice = 122; } else if (currentTarget.value === 'VIP + Free Transfer') { From f32152c21cf027cbc2568ed20a6c599950ed8268 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 14 Sep 2022 10:37:59 +0800 Subject: [PATCH 15/34] =?UTF-8?q?CH=20=E4=BD=BF=E7=94=A8=20grecaptcha=20?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 4 +- .../views/mobile_first/ch-info-page-form.php | 58 +++++++------ .../views/mobile_first/ch-inquiry-form.php | 81 +++++++++++++++++-- 3 files changed, 109 insertions(+), 34 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 7ec3c042..74134625 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -709,7 +709,6 @@ class Information extends CI_Controller $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true); $information->ic_content = str_replace('', $info_page_form_content, $information->ic_content); } else { - $template = str_replace('', '', $template); $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true); $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); @@ -1273,8 +1272,7 @@ class Information extends CI_Controller if (empty($meta_product_code)) { $addthis_widget = $this->load->view($template_path . '-add-this', false, true); $template = str_replace('', $addthis_widget, $template); - } else { - $template = str_replace('', '', $template); + } else { $inquiry_form_template = $this->load->view( $template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code, 'information' => $information), diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 024c543e..fe010893 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -1,7 +1,7 @@

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

+ name="quick_inquiry_form" novalidate="">
@@ -590,31 +590,9 @@
- - + \ No newline at end of file diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index de535c7c..962689cc 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -1,11 +1,7 @@
- - -

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

-
+ name="quick_inquiry_form" novalidate="">
@@ -591,7 +587,7 @@
-
@@ -603,5 +599,76 @@
Quickly inquire about this tour via our WeChat: chinahighlightstour
+

+ + + \ No newline at end of file From 6925367c37089695f9342d4191ba0be7445d104f Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 14 Sep 2022 10:43:23 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-info-page-form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index fe010893..71e9c0ad 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -586,7 +586,7 @@
- +

From 1921677a005d7898b234dc31472017d04f759920 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 16 Sep 2022 17:07:44 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E7=AB=99=E9=93=BE=E6=8E=A5=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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index e6657624..e779205e 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -304,12 +304,12 @@ Corporate Number: 914503003486045699
From 76f51e3ab2e9cab0a9d1cc88fba7ac3de58815c2 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 19 Sep 2022 09:59:19 +0800 Subject: [PATCH 18/34] 11 --- 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 e779205e..feb6df80 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -230,8 +230,7 @@ -
- +
From ac2eea0e95c3ed71f8a4a0147ecf0dda255bec68 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 19 Sep 2022 10:06:11 +0800 Subject: [PATCH 19/34] 11 --- application/views/mobile_first/ch-pc.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index feb6df80..d4581baa 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -47,9 +47,7 @@
diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index 962689cc..d663a8fb 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -594,7 +594,7 @@
china highlights' wechat code
Quickly inquire about this tour via our WeChat: chinahighlightstour
From b20b13f9786cbcb6832012c713fdfd641124df43 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 20 Sep 2022 14:17:33 +0800 Subject: [PATCH 28/34] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E6=BC=8F=E5=A1=AB?= =?UTF-8?q?=E6=8F=90=E9=86=92=E6=96=87=E5=AD=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-info-page-form.php | 9 +++++---- application/views/mobile_first/ch-inquiry-form.php | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 077344e6..90752d72 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -10,15 +10,15 @@ * + id="realname_errmsg" style="display: none">Please enter your name.

* - - + +

@@ -26,7 +26,7 @@

+ class="requiredArea">Please enter your starting date.

+

Having a phone number, especially with WeChat/WhatsApp capability will improve communication efficiency.

I prefer to be contacted via:

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index d663a8fb..dbc5495c 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -9,16 +9,16 @@ * - + +

* - - + +

@@ -26,7 +26,7 @@

+ class="requiredArea">Please enter your starting date.

+

Having a phone number, especially with WeChat/WhatsApp capability will improve communication efficiency.

I prefer to be contacted via:

From 56c2004b61b4a66acc0c50e1d0d93cefcdd2dc7a Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 20 Sep 2022 14:25:58 +0800 Subject: [PATCH 29/34] 11 --- application/views/mobile_first/ah-feedback-list.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php index 62723006..5ad95895 100644 --- a/application/views/mobile_first/ah-feedback-list.php +++ b/application/views/mobile_first/ah-feedback-list.php @@ -8,7 +8,10 @@ $feedback) {?>
- +
,
From 6486bde1139401283a9e7440cd9b1b148f677277 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 21 Sep 2022 13:47:37 +0800 Subject: [PATCH 30/34] =?UTF-8?q?QI=20=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-info-page-form.php | 7 +++++++ application/views/mobile_first/ch-inquiry-form.php | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 90752d72..74029490 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -607,16 +607,19 @@ function validateQuickInquiryForm() { var realnameVal = document.getElementById("realname").value; var emailVal = document.getElementById("email").value; var startingDateVal = document.getElementById("starting_date").value; + var phoneVal = document.getElementById("PhoneNo").value; var startingDateErrEl = document.getElementById("starting_date_errmsg"); var realnameErrEl = document.getElementById("realname_errmsg"); var emailErrEl = document.getElementById("email_errmsg"); var emailVerifyErrEl = document.getElementById("email_verify_errmsg"); + var phoneErrEl = document.getElementById("phone_errmsg"); if (realnameErrEl) realnameErrEl.style.display = 'none'; if (emailErrEl) emailErrEl.style.display = 'none'; if (emailVerifyErrEl) emailVerifyErrEl.style.display = 'none'; if (startingDateErrEl) startingDateErrEl.style.display = 'none'; + if (phoneErrEl) phoneErrEl.style.display = 'none'; if (realnameVal === '') { realnameErrEl.style.display = ''; @@ -636,6 +639,10 @@ function validateQuickInquiryForm() { startingDateErrEl.style.display = ''; result = false; } + if (phoneVal === '') { + phoneErrEl.style.display = ''; + result = false; + } return result; } document.addEventListener('DOMContentLoaded', () => { diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index dbc5495c..24f441b2 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -609,16 +609,19 @@ function validateQuickInquiryForm() { var realnameVal = document.getElementById("realname").value; var emailVal = document.getElementById("email").value; var startingDateVal = document.getElementById("starting_date").value; + var phoneVal = document.getElementById("PhoneNo").value; var startingDateErrEl = document.getElementById("starting_date_errmsg"); var realnameErrEl = document.getElementById("realname_errmsg"); var emailErrEl = document.getElementById("email_errmsg"); var emailVerifyErrEl = document.getElementById("email_verify_errmsg"); + var phoneErrEl = document.getElementById("phone_errmsg"); if (realnameErrEl) realnameErrEl.style.display = 'none'; if (emailErrEl) emailErrEl.style.display = 'none'; if (emailVerifyErrEl) emailVerifyErrEl.style.display = 'none'; if (startingDateErrEl) startingDateErrEl.style.display = 'none'; + if (phoneErrEl) phoneErrEl.style.display = 'none'; if (realnameVal === '') { realnameErrEl.style.display = ''; @@ -638,6 +641,10 @@ function validateQuickInquiryForm() { startingDateErrEl.style.display = ''; result = false; } + if (phoneVal === '') { + phoneErrEl.style.display = ''; + result = false; + } return result; } document.addEventListener('DOMContentLoaded', () => { From e797b770d349f1565d97932743858dc7bdc2f77b Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 21 Sep 2022 13:58:24 +0800 Subject: [PATCH 31/34] 11 --- application/views/mobile_first/ch-info-page-form.php | 2 +- application/views/mobile_first/ch-inquiry-form.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 74029490..bc59857e 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -579,7 +579,7 @@

+ placeholder="Phone number (We'll only call if you ask.)*" type="tel"/>

Having a phone number, especially with WeChat/WhatsApp capability will improve communication efficiency.

I prefer to be contacted via:

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index 24f441b2..aec70f11 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -579,7 +579,7 @@

+ placeholder="Phone number (We'll only call if you ask.)*" type="tel"/>

Having a phone number, especially with WeChat/WhatsApp capability will improve communication efficiency.

I prefer to be contacted via:

From 1689a4f8a573940d3f33b618eff78f49381aecba Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Thu, 22 Sep 2022 10:34:59 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E6=B0=B4=E7=81=AF=E8=8A=82=E5=A2=9E?= =?UTF-8?q?=E5=8A=A010=E4=BA=BA=E5=8F=8A=E4=BB=A5=E4=B8=8A=E4=BC=98?= =?UTF-8?q?=E6=83=A05%=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 0224ff27..a52fb431 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -675,6 +675,14 @@