From de9ec9ee903533f55c9f76adb5af858aa53708e3 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 2 Jan 2020 18:06:16 +0800
Subject: [PATCH] fix: PayPal set invoice

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

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index 87b1f0a2..612ee7f7 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -1277,11 +1277,10 @@ class Index extends CI_Controller {
     //获取note详情，修改各项数据
     public function note_modal($pn_txn_id, $pn_id=false, $pn_invoice=false) {
         $this->permission->is_admin(true);
-        $data = array();
+        $data = array('pn_invoice'=>$pn_invoice);
         if (!empty($pn_txn_id)) {
             $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id);
             if (!empty($data['note'])) {
-                $data['pn_invoice'] = $data['note']->pn_invoice;
                 if (!empty($pn_invoice)) {
                     $orderid_info = $this->analysis_orderid($pn_invoice);
                 } else {
@@ -1291,6 +1290,7 @@ class Index extends CI_Controller {
                     $orderid_info = json_decode($orderid_info);
                     $data['order_info'] = $this->Paypal_model->get_order($orderid_info->orderid, true, $orderid_info->ordertype);
                 }
+                $data['pn_invoice'] = $pn_invoice ? $pn_invoice : $data['note']->pn_invoice ;
                 echo json_encode($this->load->view('note_setting', $data, true));
                 return true;
             }
diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php
index e592aa80..7d58f1be 100644
--- a/webht/third_party/paypal/views/note_list.php
+++ b/webht/third_party/paypal/views/note_list.php
@@ -335,11 +335,13 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
         });
     }
 
-    function show_order_modal(pn_txn_id, pn_id) {
+    function show_order_modal(pn_txn_id, pn_id, new_order) {
+      var url = '<?php echo site_url('apps/paypal/index/note_modal/'); ?>' + '/' + pn_txn_id + '/' + pn_id;
+      if (new_order) url += '/' + new_order;
         $.ajax({
             type: "get",
             dataType: "json",
-            url: '<?php echo site_url('apps/paypal/index/note_modal/'); ?>' + '/' + pn_txn_id + '/' + pn_id,
+            url: url,
             success: function(data, textStatus) {
                 $('#modal_set_orderid_body').html(data);
                 $('#modal_set_orderid').modal('show');