From 2cb5f82ddc6104ee432d39cb011a3fd44702c4b5 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Tue, 12 Dec 2023 10:25:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?GH=20=E8=A1=A8=E5=8D=95=E6=88=90=E4=BA=BA?=
 =?UTF-8?q?=E7=B4=AF=E5=8A=A0=E8=A7=84=E5=88=99=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/gh-info-page-form.php  | 69 +------------------
 .../views/mobile_first/gh-tour-form.php       | 62 -----------------
 2 files changed, 2 insertions(+), 129 deletions(-)

diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php
index 367811c1..e69b3056 100644
--- a/application/views/mobile_first/gh-info-page-form.php
+++ b/application/views/mobile_first/gh-info-page-form.php
@@ -697,21 +697,9 @@
       $(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' ) {
             $adultBlock.show();
@@ -719,11 +707,6 @@
           } else {
             $adultBlock.show();
             $childrenBlock.hide();
-          }
-          if (currentTarget.id === 'Couple') {
-            $adultNumberInput.val(2);
-          } else if (currentTarget.id === 'Solo') {
-            $adultNumberInput.val(1);
           }
               })
           });
@@ -756,55 +739,7 @@
   });
 
   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
+  // Trip Length
   $('#tripLengthPlus').click(function () {
     tripLength++;
     $('#tripLengthNumber').val(tripLength);
diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php
index 0f1e6b32..24e9a8ca 100644
--- a/application/views/mobile_first/gh-tour-form.php
+++ b/application/views/mobile_first/gh-tour-form.php
@@ -572,22 +572,10 @@ $(function () {
   var selectedExpectedDate = '';
   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' ) {
         $adultBlock.show();
@@ -596,11 +584,6 @@ $(function () {
         $adultBlock.show();
         $childrenBlock.hide();
       }
-      if (currentTarget.id === 'Couple') {
-        $adultNumberInput.val(2);
-      } else if (currentTarget.id === 'Solo') {
-        $adultNumberInput.val(1);
-      }
     })
   });
 
@@ -634,51 +617,6 @@ $(function () {
     })
   });
 
-  //成人
-  $('#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);
-    }
-  });
-
   function validateQuickInquiryForm() {
     var result = true;
     var realnameVal = document.getElementById("realname").value;

From 13983fbc67e354e222b398290f1c6a561cd24a64 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 12 Dec 2023 10:56:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E7=BD=91=E7=AB=99=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=A2=9D=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/paypal/controllers/index.php | 16 ++++++++++++++--
 webht/third_party/paypal/models/note_model.php |  2 +-
 webht/third_party/paypal/views/note_list.php   |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index a163bd08..2f640a6a 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -916,11 +916,10 @@ class Index extends CI_Controller {
             $advisor_info_from_tmp = $this->Paypal_model->get_order($orderid_info->orderid, false, 'M', $handpick);
             /**
              * 传统订单, 网站支付
-             * 已经录入, 后来重新生成订单号, 不再邮件通知了
              * @author LYT
              */
             if (empty($advisor_info) && ! empty($advisor_info_from_tmp) && $orderid_info->ordertype == 'T') {
-                $this->Note_model->update_send($item->pn_txn_id, 'closeRecord', $item->pn_sn);
+                // $this->Note_model->update_send($item->pn_txn_id, 'closeRecord', $item->pn_sn);
                 $this->Note_model->set_invoice($item->pn_txn_id, $advisor_info_from_tmp->COLI_ID . '_' . $orderid_info->ordertype);
                 continue;
             }
@@ -1068,6 +1067,19 @@ class Index extends CI_Controller {
 
         //根据订单号查找外联信息
         $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick);
+
+        //根据订单号查找外联信息, 从临时表
+        $advisor_info_from_tmp = $this->Paypal_model->get_order($orderid_info->orderid, false, 'M', $handpick);
+        /**
+         * 传统订单, 网站支付
+         * @author LYT
+         */
+        if (empty($advisor_info) && ! empty($advisor_info_from_tmp) && $orderid_info->ordertype == 'T') {
+            // $this->Note_model->update_send($item->pn_txn_id, 'closeRecord', $item->pn_sn);
+            $this->Note_model->set_invoice($item->pn_txn_id, $advisor_info_from_tmp->COLI_ID . '_' . $orderid_info->ordertype);
+            continue;
+        }
+
         //查不到订单信息
         if (empty($advisor_info)) {
             $this->Note_model->update_send($item->pn_txn_id, 'sendfail');
diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php
index 48f057e2..db756a63 100644
--- a/webht/third_party/paypal/models/note_model.php
+++ b/webht/third_party/paypal/models/note_model.php
@@ -182,7 +182,7 @@ class Note_model extends CI_Model {
     {
         $ele->fundsource = "";
         $raw = json_decode($ele->pn_memo);
-        $business = isset($raw->business) ? $raw->business : '0';
+        $business = isset($raw->business) ? $raw->business : (isset($raw->receiver_email) ? $raw->receiver_email : '0');
         if ($this->code_fundsource[$business]) {
             $ele->fundsource = $this->code_fundsource[$business];
         }
diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php
index 9fe2d495..75bfd9c6 100644
--- a/webht/third_party/paypal/views/note_list.php
+++ b/webht/third_party/paypal/views/note_list.php
@@ -236,7 +236,7 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
                         $raw_content = json_decode($item->pn_memo);
                         $show_record = '查看录入状态';
                         if ($item->pn_send == 'send' || substr($item->pn_send, 0, 5) == "send-") {
-                            $show_send = $item->pn_send;
+                            $show_send = $item->pn_send . " / " . str_ireplace('completed', '', $item->pn_payment_status);
                         } elseif ($item->pn_send == 'closeRecord') {
                             $show_send = $show_record = '已忽略';
                         } else if (strtolower($item->pn_payment_status) == 'completed') {