From 297c2ea402dfc8e3cb844b5dcb11701ae9ffd8a7 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 22 Dec 2023 14:53:34 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E7=AD=89=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/views/gh/confirm_order.php | 604 +++++++++--------- 1 file changed, 295 insertions(+), 309 deletions(-) diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index c67f8f01..4dc44722 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/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; } @@ -400,7 +401,7 @@ select.gender_pick {border: 1px solid #d1d1d1; reissuing of tickets would be at your expense!

-

Traveler 1

+

Primary contact

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
+ + +

Date of birth

@@ -701,57 +724,11 @@ select.gender_pick {border: 1px solid #d1d1d1; -
-
-
-

Your contact information (optional)

-

Having a phone number, especially with WhatsApp/iMessage capability will help us contact you in - case of emergency.

- -

Phone No.

-
- - -
-
-

Home address

-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- - -
-
-
+

Your Flight Information (optional)

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. @@ -761,7 +738,7 @@ select.gender_pick {border: 1px solid #d1d1d1;

- + @@ -769,7 +746,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -777,7 +754,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -785,7 +762,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -793,14 +770,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
-
-

Your Special Request (optional)

-

- -
+
-

Emergency Contact Information (optional)

+

Emergency Contact Information

(in case an unlikely event happens when you are travelling)
@@ -837,10 +810,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
-
-

Your Insurance Information (Optional)

- +

Your Insurance Information and Special Request (optional)

+ +
@@ -944,12 +917,25 @@ select.gender_pick {border: 1px solid #d1d1d1; $(function() { var $travelerTemplate = $(".traveler_info:first").clone(); //添加客户 - $("#add_traveler_button").click(function() { - var $addTraveler = $travelerTemplate.clone(); + $("#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(); $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 = $(''); + $deleteTravelerButton.click(function(){$('#'+travelerId).remove();}); + $addTraveler.append($deleteTravelerButton); + $(".traveler_info:last").after($addTraveler); + } }); From babd2c309754f8a58fa504726f3a2febb5f53bae Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 22 Dec 2023 14:53:58 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E7=AD=89=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/views/ah/confirm_order.php | 607 +++++++++--------- 1 file changed, 297 insertions(+), 310 deletions(-) diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index 6d6b1f02..a2e32818 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/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; } @@ -399,7 +400,7 @@ select.gender_pick {border: 1px solid #d1d1d1; reissuing of tickets would be at your expense!

-

Traveler 1

+

Primary contact

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - +
+ + +

Date of birth

@@ -699,56 +722,10 @@ select.gender_pick {border: 1px solid #d1d1d1; -
-
-
-

Your contact information (optional)

-

Having a phone number, especially with WhatsApp/iMessage capability will help us contact you in - case of emergency.

- -

Phone No.

-
- -
-
-

Home address

-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
+

Your Flight Information (optional)

@@ -759,7 +736,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -768,7 +745,7 @@ select.gender_pick {border: 1px solid #d1d1d1;

Arrival date

- +
@@ -779,7 +756,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -788,7 +765,7 @@ select.gender_pick {border: 1px solid #d1d1d1;

Departure date

- +
@@ -799,14 +776,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
-
-

Your Special Request (optional)

-

- -
+
-

Emergency Contact Information (optional)

+

Emergency Contact Information

(in case an unlikely event happens when you are travelling)
@@ -843,11 +816,12 @@ select.gender_pick {border: 1px solid #d1d1d1;
-
-

Your Insurance Information (Optional)

- +

Your Insurance Information and Special Request (optional)

+ +
+
@@ -950,12 +924,25 @@ select.gender_pick {border: 1px solid #d1d1d1; $(function() { var $travelerTemplate = $(".traveler_info:first").clone(); //添加客户 - $("#add_traveler_button").click(function() { - var $addTraveler = $travelerTemplate.clone(); + $("#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(); $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 = $(''); + $deleteTravelerButton.click(function(){$('#'+travelerId).remove();}); + $addTraveler.append($deleteTravelerButton); + $(".traveler_info:last").after($addTraveler); + } }); From 4e34e194bd8f69e0c4884cadaa03fe52a78ce2bf Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 22 Dec 2023 14:59:47 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/order/views/ah/confirm_order.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index a2e32818..2a1ceb9e 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -1,3 +1,4 @@ + @@ -946,5 +947,3 @@ select.gender_pick {border: 1px solid #d1d1d1; }); - - \ No newline at end of file From 54ddeec02dd537c92222f49dd2ab412b2f04d839 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 22 Dec 2023 15:00:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/order/views/gh/confirm_order.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index 4dc44722..aeb2e33c 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/confirm_order.php @@ -1,3 +1,4 @@ + @@ -940,4 +941,3 @@ select.gender_pick {border: 1px solid #d1d1d1; - \ No newline at end of file From 51bfadbe4fb0a99fa5200c6bc1114e65a05578a4 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Fri, 22 Dec 2023 15:19:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=88=AA=E7=8F=AD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/order/views/ah/confirm_order.php | 12 ++++++------ .../third_party/order/views/confirm_order.php | 8 ++++---- .../third_party/order/views/gh/confirm_order.php | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index 2a1ceb9e..8fcfd768 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -737,7 +737,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -746,18 +746,18 @@ select.gender_pick {border: 1px solid #d1d1d1;

Arrival date

- +
- +
- + @@ -766,12 +766,12 @@ select.gender_pick {border: 1px solid #d1d1d1;

Departure date

- +
- +
diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index a0635c28..82f04a06 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -738,7 +738,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -747,13 +747,13 @@ select.gender_pick {border: 1px solid #d1d1d1;

Arrival time

- +
- + @@ -762,7 +762,7 @@ select.gender_pick {border: 1px solid #d1d1d1;

Departure time

- +
diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index aeb2e33c..29fcfa6f 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/confirm_order.php @@ -739,7 +739,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -747,7 +747,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -755,7 +755,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + @@ -763,7 +763,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + From 3a7ca3ead8c480ca6b27418068b4d569f645c713 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 22 Dec 2023 15:35:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=9B=BD=E7=B1=8D=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/views/ah/confirm_order.php | 492 +++++++++--------- .../third_party/order/views/confirm_order.php | 492 +++++++++--------- .../order/views/gh/confirm_order.php | 492 +++++++++--------- 3 files changed, 714 insertions(+), 762 deletions(-) diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index 8fcfd768..03849339 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -435,259 +435,243 @@ select.gender_pick {border: 1px solid #d1d1d1;
@@ -729,7 +713,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
-

Your Flight Information (optional)

+

Your Flight Information

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. Please ensure the details you provide are correct. You can skip this if your don't need airport transfer service.

diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 82f04a06..4a2871ee 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -436,259 +436,243 @@ select.gender_pick {border: 1px solid #d1d1d1;
@@ -730,7 +714,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
-

Your Flight Information (optional)

+

Your Flight Information

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. Please ensure the details you provide are correct. You can skip this if your don't need airport transfer service.

diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index 29fcfa6f..8b065eaf 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/confirm_order.php @@ -437,259 +437,243 @@ select.gender_pick {border: 1px solid #d1d1d1;
@@ -731,7 +715,7 @@ select.gender_pick {border: 1px solid #d1d1d1;
-

Your Flight Information (optional)

+

Your Flight Information

Your flight information will be forwarded to your guide/driver for airport pick up and drop off. Please ensure the details you provide are correct. You can skip this if your don't need airport transfer service.

From 1b0af1f0c9d2b954a7bde243ac8a36f2c90d3e9b Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 22 Dec 2023 15:37:25 +0800 Subject: [PATCH 7/7] 11 --- application/third_party/order/views/ah/confirm_order.php | 2 +- application/third_party/order/views/confirm_order.php | 2 +- application/third_party/order/views/gh/confirm_order.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index 03849339..5185dfbd 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -444,7 +444,7 @@ select.gender_pick {border: 1px solid #d1d1d1; - + diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 4a2871ee..956ceeac 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -445,7 +445,7 @@ select.gender_pick {border: 1px solid #d1d1d1; - + diff --git a/application/third_party/order/views/gh/confirm_order.php b/application/third_party/order/views/gh/confirm_order.php index 8b065eaf..2eb9c897 100644 --- a/application/third_party/order/views/gh/confirm_order.php +++ b/application/third_party/order/views/gh/confirm_order.php @@ -446,7 +446,7 @@ select.gender_pick {border: 1px solid #d1d1d1; - +