From cd67f710b1ed9c53eee549e7384e4d62bf1ff4c4 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 23 May 2019 17:25:44 +0800
Subject: [PATCH] =?UTF-8?q?PayPal=20=E5=A4=84=E7=90=86webhook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index 78badbfe..1543b2ea 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -817,14 +817,14 @@ class Index extends CI_Controller {
                 echo ++$show_index . ' ' . $item->pn_txn_id . '<br/>';
             }
             //退款状态默认为已经处理，陆燕在退款前手动通知外联了，系统跳过处理
-            if ($item->pn_payment_status == 'Refunded') {
+            if (strtolower($item->pn_payment_status) == 'refunded') {
                 $this->send_refund($item, $handpick, $old_ssje);
                 // $this->Note_model->update_send($item->pn_txn_id, 'send');
                 continue;
             }
 
             //只处理完成状态，其他状态由陆燕处理
-            if ($item->pn_payment_status !== 'Completed') {
+            if (strtolower($item->pn_payment_status) !== 'completed') {
                 $this->Note_model->update_send($item->pn_txn_id, 'sendfail');
                 continue;
             }
@@ -852,7 +852,7 @@ class Index extends CI_Controller {
             }
             $orderid_info = json_decode($orderid_info);
             // 仅自动程序发送提醒 false == $handpick &&
-            if ($item->pn_payment_status === 'Completed'
+            if (strtolower($item->pn_payment_status) === 'completed'
                 && $orderid_info->ordertype == 'A' && strpos($get_order_no, 'China Train Booking') !== false) {
                 // APP 组的China Train Booking-开头的订单号
                 // 发送邮件提醒外联核对收款金额, 不写入收款记录
diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php
index 4dcfcb2d..c40e675e 100644
--- a/webht/third_party/paypal/views/note_list.php
+++ b/webht/third_party/paypal/views/note_list.php
@@ -213,7 +213,7 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
                             $show_send = 'send';
                         } elseif ($item->pn_send == 'closeRecord') {
                             $show_send = $show_record = '已忽略';
-                        } else if ($item->pn_payment_status == 'Completed') {
+                        } else if (strtolower($item->pn_payment_status) == 'completed') {
                             $class_css = 'btn-danger';
                             $show_send = $item->pn_send;
                         } else {