From 65624e9a8ea9aa420b3141d17c304faf3e4918ce Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 11 Nov 2025 09:35:16 +0800
Subject: [PATCH] paypal ...

---
 .../pay/models/Online_payment_account_model.php     | 13 ++++++++-----
 .../pay/models/Online_payment_note_model.php        |  1 +
 webht/third_party/paypal/controllers/index.php      | 13 +++++++++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/webht/third_party/pay/models/Online_payment_account_model.php b/webht/third_party/pay/models/Online_payment_account_model.php
index 04973bb6..5cc8d397 100644
--- a/webht/third_party/pay/models/Online_payment_account_model.php
+++ b/webht/third_party/pay/models/Online_payment_account_model.php
@@ -168,9 +168,11 @@ class Online_payment_account_model extends CI_Model {
         $info_sql = "SELECT GAI_SN, GAI_State,GAI_COLI_ID as orderId
                     ,CAST(GAI_SQJE AS VARCHAR) GAI_SQJE,GAI_SQJECurrency
                     ,CAST(GAI_SSJE AS VARCHAR) GAI_SSJE,GAI_Memo
-                    ,'B' AS ordertype FROM BIZ_GroupAccountInfo
-                    WHERE GAI_AccreditNo = '$pn_txn_id'
-                        OR CHARINDEX('$pn_txn_id', gai_memo) > 0
+                    ,'B' AS ordertype
+                    FROM BIZ_GroupAccountInfo
+                    WHERE (GAI_AccreditNo = '$pn_txn_id'
+                        OR CHARINDEX('$pn_txn_id', gai_memo) > 0)
+                        AND BIZ_GroupAccountInfo.DeleteFlag =0
                     UNION
                     SELECT GAI_SN, GAI_State
                     ,(
@@ -182,8 +184,9 @@ class Online_payment_account_model extends CI_Model {
                     ,cast(GAI_SSJE as varchar) GAI_SSJE,GAI_Memo
                     ,'T' AS ordertype
                     FROM GroupAccountInfo
-                    WHERE GAI_AccreditNo = '$pn_txn_id'
-                        OR CHARINDEX('$pn_txn_id', gai_memo) > 0";
+                    WHERE (GAI_AccreditNo = '$pn_txn_id'
+                        OR CHARINDEX('$pn_txn_id', gai_memo) > 0)
+                        AND GroupAccountInfo.DeleteFlag =0";
 
         $info_query = $this->HT->query($info_sql);
         $info_result = $info_query->result();
diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php
index 1473b83f..4805dd38 100644
--- a/webht/third_party/pay/models/Online_payment_note_model.php
+++ b/webht/third_party/pay/models/Online_payment_note_model.php
@@ -244,6 +244,7 @@ class Online_payment_note_model extends CI_Model {
         $this->search = $method===null ? "" : " AND OPN_accountMethod IN ($method) ";
         $this->search .= " AND (OPN_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
                 OR OPN_noticeSendTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
+                OR OPN_completeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
             )
         ";
         $this->send = " AND isnull(OPN_noticeSendStatus,'') NOT IN ('', 'sendfail', 'unsend', 'closed' )";
diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index 6ad531f2..7bfb39b5 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -717,8 +717,11 @@ class Index extends CI_Controller {
                 $pn_receiver_account = $GAI_API->payee->email_address;
                 $pn_receiver_account_name = $GAI_API->payee->merchant;
                 // $pn_receiver_account_name = $this->fundsource_map($pn_receiver_account)->merchant;
+                $save_to_pn = $GAI_API->payee->email_address == 'pay@trippest.com' ? true : false;
+
                 break;
             case 'PAYMENT.SALE.REFUNDED':
+                $save_to_pn = false;
             case 'PAYMENT.SALE.REVERSED':
                 $pn_invoice = $post_data->resource->invoice_number;
                 $pn_mc_currency = $post_data->resource->amount->currency;
@@ -741,10 +744,13 @@ class Index extends CI_Controller {
                 $post_data->GAI_API = $GAI_API;
                 break;
 
-            case 'PAYMENT.CAPTURE.COMPLETED':
             case 'PAYMENT.CAPTURE.DECLINED': // todo: CHECKOUT.PAYMENT-APPROVAL.REVERSED
+                $save_to_pn = true;
             case 'PAYMENT.CAPTURE.PENDING':
-                $save_to_pn = $post_data->event_type !== 'PAYMENT.CAPTURE.PENDING'; // false;
+                $save_to_pn = false;
+                // $save_to_pn = $post_data->event_type !== 'PAYMENT.CAPTURE.PENDING'; // false;
+            case 'PAYMENT.CAPTURE.COMPLETED':
+                // $save_to_pn = false;
                 $fund_type = 'pay';
                 $pn_invoice = $post_data->resource->invoice_id;
                 $pn_custom = isset($post_data->resource->custom_id) ? $post_data->resource->custom_id : '';
@@ -760,8 +766,11 @@ class Index extends CI_Controller {
                 $post_data->GAI_API = $GAI_API;
                 $pn_receiver_account = $GAI_API->payee->email_address;
                 $pn_receiver_account_name = $this->fundsource_map($pn_receiver_account)->merchant;
+
+                $save_to_pn = $post_data->event_type === 'PAYMENT.CAPTURE.COMPLETED' ? ($GAI_API->payee->email_address == 'pay@trippest.com' ? true : false) : $save_to_pn;
                 break;
             case 'PAYMENT.CAPTURE.REFUNDED':
+                $save_to_pn = false;
             case 'PAYMENT.CAPTURE.REVERSED':
                 $fund_type = 'refund';
                 $pn_invoice = $post_data->resource->invoice_id;