From c324da72819da1996b5a08f0e928466f623965f5 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Mon, 4 Dec 2023 16:05:17 +0800 Subject: [PATCH 01/58] =?UTF-8?q?perf:=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E5=A4=9A=E8=B4=A6=E6=88=B7:=20+Trippest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controllers/AlipayTradeService.php | 6 +++--- .../pay/models/Alipay_note_model.php | 18 +++++++++++++++++- webht/third_party/pay/views/alipay_list.php | 7 +++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index e181633c..2ea85eb0 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -97,7 +97,7 @@ class AlipayTradeService extends CI_Controller * @date 2017-09-13 * @return [type] [description] */ - public function alipay_notice() + public function alipay_notice($site = 'cht') { error_reporting(0); $resp_arr = $this->input->post(); @@ -958,7 +958,7 @@ class AlipayTradeService extends CI_Controller /** * 验签方法 * @param $arr 验签支付宝返回的信息，使用支付宝公钥。 - * @return boolean + * @return obj */ function check($arr){ $ret = new ArrayObject(); @@ -1120,7 +1120,7 @@ class AlipayTradeService extends CI_Controller } $data["paytext"] = $this->payment_status(); $order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN; - $data['group_accout_info'] = + $data['group_accout_info'] = $this->Alipay_model->get_group_accout_info($order_sn, $data['note']->ALI_dealId); echo json_encode($this->load->view('alipay_note_setting', $data, true)); } diff --git a/webht/third_party/pay/models/Alipay_note_model.php b/webht/third_party/pay/models/Alipay_note_model.php index 040a16a7..6cbd3b2b 100644 --- a/webht/third_party/pay/models/Alipay_note_model.php +++ b/webht/third_party/pay/models/Alipay_note_model.php @@ -166,7 +166,23 @@ class Alipay_note_model extends CI_Model { return FALSE; } } else { - return $query->result(); + $result = $query->result(); + array_walk($result, 'Alipay_note_model::set_fundsource'); + return $result; + } + } + + private $code_fundsource = array( + "2021004129643221" => "Trippest", + "2017092108849921" => "", // "CHT", + ); + public function set_fundsource(&$ele) + { + $ele->fundsource = ""; + $raw = json_decode($ele->ALI_memo); + $app_id = isset($raw->app_id) ? $raw->app_id : '2017092108849921'; + if ($this->code_fundsource[$app_id]) { + $ele->fundsource = $this->code_fundsource[$app_id]; } } diff --git a/webht/third_party/pay/views/alipay_list.php b/webht/third_party/pay/views/alipay_list.php index 02584e14..d88d2279 100644 --- a/webht/third_party/pay/views/alipay_list.php +++ b/webht/third_party/pay/views/alipay_list.php @@ -63,6 +63,9 @@ .input-group-btn{border: 1px solid #ccc;padding: 5px;} .search-btn{cursor: pointer; background: url(//data.chinahighlights.com/css/images/global/site-search-button.png) no-repeat center center;} .center-block{display: block;margin: 0 auto;} + .brand_text {color: #fff; padding: 2px 3px; border-radius: 4px;font-style: italic;} + .cht-color {background-color: #A31022;} + .trippest-color {background-color: #E83201;} + - - - -
-

- Adults' ages -

-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- -
-

0-2 yrs old

- -
- + +
+ - +

-

-

- How would you travel? -

- -
- - -
-
- - -
-
- - -
-
- - -
- - -
- -
-

0-2 yrs old

- -
-
+ +
+ -
+

@@ -205,82 +260,7 @@ - + -

From 8e48d62ffc011df6aeabda8ce16eab4db5a4ceef Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 11 Dec 2023 14:21:01 +0800 Subject: [PATCH 15/58] =?UTF-8?q?AH=20=E8=A1=A8=E5=8D=95=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E3=80=81=E5=A4=A9=E6=95=B0=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-info-page-form.php | 64 ------------------ .../views/mobile_first/ah-inquiry-form.php | 65 +------------------ 2 files changed, 1 insertion(+), 128 deletions(-) diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 57342b27..c89c5a70 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -661,20 +661,8 @@ $(function () { var $adultBlock = $('#adultBlock'); var $childrenBlock = $('#childrenBlock'); - var $adultNumberInput = $('#adultNumber'); - var adultNumber = $adultNumberInput.val(); - var $teenagerNumberInput = $('#teenagerNumber'); - var teenagerNumber = $teenagerNumberInput.val(); - var $childrenNumberInput = $('#childrenNumber'); - var childrenNumber = $childrenNumberInput.val(); - var $infantNumberInput = $('#infantNumber'); - var infantNumber = $infantNumberInput.val(); $('input[name="travel_group"]').each((i, groupEle) => { $(groupEle).click(function (e) { - - $teenagerNumberInput.val(0); - $childrenNumberInput.val(0); - $infantNumberInput.val(0); var currentTarget = e.currentTarget; if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { @@ -683,11 +671,6 @@ } else { $adultBlock.show(); $childrenBlock.hide(); - } - if (currentTarget.id === 'Couple') { - $adultNumberInput.val(2); - } else if (currentTarget.id === 'Solo') { - $adultNumberInput.val(1); } }) }); @@ -722,53 +705,6 @@ }); var tripLength = $('#tripLengthNumber').val(); - - //成人 - $('#plusAdult').click(function () { - adultNumber++; - $adultNumberInput.val(adultNumber); - }); - $('#minusAdult').click(function () { - if (adultNumber > 1) { - adultNumber--; - $adultNumberInput.val(adultNumber); - } - }); - // 青少年 - $('#plusTeenager').click(function () { - teenagerNumber++; - $teenagerNumberInput.val(teenagerNumber); - }); - $('#minusTeenager').click(function () { - if (teenagerNumber > 0) { - teenagerNumber--; - $teenagerNumberInput.val(teenagerNumber); - } - }); - // 儿童 - $('#plusChildren').click(function () { - childrenNumber++; - $childrenNumberInput.val(childrenNumber); - }); - $('#minusChildren').click(function () { - if (childrenNumber > 0) { - childrenNumber--; - $childrenNumberInput.val(childrenNumber); - } - }); - // 婴儿 - $('#plusInfant').click(function () { - infantNumber++; - $infantNumberInput.val(infantNumber); - }); - $('#minusInfant').click(function () { - if (infantNumber > 0) { - infantNumber--; - $infantNumberInput.val(infantNumber); - } - }); - - // Trip Length $('#tripLengthPlus').click(function () { diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index e1e03387..57040ad1 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -660,23 +660,10 @@ function validateQuickInquiryForm() {