From 3dc01ebc43eb9161e6ec7531a910bf35cfafc2a5 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 6 Apr 2023 14:31:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/paypal/controllers/index.php  | 36 +++++++++++++++++++
 .../third_party/paypal/views/gai_setting.php  |  2 ++
 webht/third_party/paypal/views/note_list.php  | 17 +++++++++
 3 files changed, 55 insertions(+)

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index 54666eb5..ced0d670 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -1572,6 +1572,42 @@ class Index extends CI_Controller {
         }
         echo json_encode($this->load->view('gai_setting', $data, true));
     }
+
+    /** 测试收款记录的是否已录入到订单 
+     * 测试找不到订单信息使用
+    */
+    public function test_gai_modal($pn_txn_id=null, $pn_id = null, $neworder=null)
+    {
+        $data = array();
+        $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id);
+        $orderid_info = $this->analysis_orderid($data['note']->pn_invoice);
+        if (!empty($orderid_info)) {
+            $orderid_info = json_decode($orderid_info);
+            if ($orderid_info->ordertype === 'TP' || $orderid_info->ordertype === 'A') {
+                $orderid_info->ordertype = 'B';
+            }
+            if ($orderid_info->ordertype === 'T') {
+                $data['gai_info'] = $this->Paypal_model->get_money_t($pn_txn_id);
+            } elseif ($orderid_info->ordertype === 'B') {
+                $data['gai_info'] = $this->Paypal_model->get_money_b($pn_txn_id);
+            }
+        }
+        $data['old_order'] = $data['note']->pn_invoice;
+        $data['new_order'] = $neworder;
+        $data['order_info'] = null;
+        if ($neworder !== null) {
+            $neworder_id = $this->analysis_orderid($neworder);
+            $neworder_id = json_decode($neworder_id);
+            if ($neworder_id->ordertype === 'TP') {
+                $neworder_id->ordertype = 'B';
+            }
+            if ( ! empty($neworder_id)) {
+                $data['order_info'] = $this->Paypal_model->get_order($neworder_id->orderid, true, $neworder_id->ordertype);
+            }
+        }
+        echo json_encode($data);
+    }
+
     public function gai_modal_save()
     {
         $data = array();
diff --git a/webht/third_party/paypal/views/gai_setting.php b/webht/third_party/paypal/views/gai_setting.php
index e11d0137..187b5f0a 100644
--- a/webht/third_party/paypal/views/gai_setting.php
+++ b/webht/third_party/paypal/views/gai_setting.php
@@ -19,6 +19,8 @@
         <input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo $new_order; ?>" placeholder="输入订单号" >
         <span class="input-group-addon search-btn" style="cursor: pointer; background: url(//data.chinahighlights.com/css/images/global/site-search-button.png) no-repeat center center;width: auto;height: auto;"
             onclick="show_gai_modal('<?php echo $note->pn_txn_id; ?>','<?php echo $note->pn_sn; ?>', $('#pn_invoice').val())" ></span>
+        <span class="input-group-addon search-btn" style="cursor: pointer; background: url(//data.chinahighlights.com/css/images/global/green-dot.png) no-repeat center center;width: auto;height: auto;"
+            onclick="test_gai_modal('<?php echo $note->pn_txn_id; ?>','<?php echo $note->pn_sn; ?>', $('#pn_invoice').val())" ></span>
     </div>
     <label class="text-danger">订单号形如: 160414408_B , B商务订单，JJ160321052_T,T传统订单，请务必加上后缀</label>
     <div>订单详细内容: </div>
diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php
index 47b4c3a9..2fa72dc9 100644
--- a/webht/third_party/paypal/views/note_list.php
+++ b/webht/third_party/paypal/views/note_list.php
@@ -383,6 +383,23 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
         return false;
     }
 
+    // 测试找不到订单信息使用
+function test_gai_modal(pn_txn_id, pn_id, new_order) {
+  var url = '/webht.php/apps/paypal/index/test_gai_modal/' + pn_txn_id + '/' + pn_id;
+  if (new_order) url += '/' + new_order;
+  $.ajax({
+      type: "get",
+      dataType: "json",
+      url: url,
+      success: function(data, textStatus) {
+          console.info(data);
+      },
+      error: function(msg) {
+          console.info(msg);
+      }
+  });
+}
+
     function show_gai_modal(pn_txn_id, pn_id, new_order) {
       var url = '/webht.php/apps/paypal/index/gai_modal/' + pn_txn_id + '/' + pn_id;
       if (new_order) url += '/' + new_order;

From 0c6dfbe00843567d21e24af515ab22394c582975 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 6 Apr 2023 15:29:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/paypal/controllers/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index ced0d670..e57a148e 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -1583,6 +1583,7 @@ class Index extends CI_Controller {
         $orderid_info = $this->analysis_orderid($data['note']->pn_invoice);
         if (!empty($orderid_info)) {
             $orderid_info = json_decode($orderid_info);
+            $data['old_order_info'] = $orderid_info;
             if ($orderid_info->ordertype === 'TP' || $orderid_info->ordertype === 'A') {
                 $orderid_info->ordertype = 'B';
             }
@@ -1598,10 +1599,11 @@ class Index extends CI_Controller {
         if ($neworder !== null) {
             $neworder_id = $this->analysis_orderid($neworder);
             $neworder_id = json_decode($neworder_id);
+            $data['new_order_info'] = $neworder_id;
             if ($neworder_id->ordertype === 'TP') {
                 $neworder_id->ordertype = 'B';
             }
-            if ( ! empty($neworder_id)) {
+            if (!empty($neworder_id)) {
                 $data['order_info'] = $this->Paypal_model->get_order($neworder_id->orderid, true, $neworder_id->ordertype);
             }
         }

From 09465f27d7e79ea6f6d4786f17c1294d01be929c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Mon, 10 Apr 2023 09:24:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=97=A0=E5=8E=8B?=
 =?UTF-8?q?=E7=BC=A9JS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/chinatravel-cruisedetails-form.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/mobile_first/chinatravel-cruisedetails-form.php b/application/views/mobile_first/chinatravel-cruisedetails-form.php
index 59ea97d1..08ccb5fa 100644
--- a/application/views/mobile_first/chinatravel-cruisedetails-form.php
+++ b/application/views/mobile_first/chinatravel-cruisedetails-form.php
@@ -75,4 +75,4 @@
 	{{ /each }}
 </script>
 <input type="hidden" name="jsShipName" id="jsShipName" value="<?php echo $shipname; ?>" />
-<script type="text/javascript" src="https://data.chinatravel.com/js/mobile-first/cruise-details.min.js" async defer></script>
\ No newline at end of file
+<script type="text/javascript" src="https://data.chinatravel.com/js/mobile-first/cruise-details.js" async defer></script>
\ No newline at end of file