From ad1a4386e564372a82a29d966e0683e0f0e4a606 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Tue, 9 Sep 2025 10:37:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20PayPal=E6=9F=A5=E8=AF=A2order=20?= =?UTF-8?q?=E7=9A=84=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/PaymentService.php | 1 + webht/third_party/paypal/controllers/index.php | 1 + 2 files changed, 2 insertions(+) diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index 1af0f035..3bc635be 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -445,6 +445,7 @@ class PaymentService extends CI_Controller { $paypal_order = isset($memo->resource->supplementary_data) ?$memo->resource->supplementary_data->related_ids->order_id : (isset($memo->resource->application_context) ? $memo->resource->application_context->related_qualifiers[0]->id : ''); } $paypal_account = $item->OPN_fundSource ? $item->OPN_fundSource : 'cht'; + $paypal_account = 'Highlights' ? 'htravel' : $paypal_account; // log_message('error','test: ' . __METHOD__ . ': ' . __LINE__ . ' ' . PHP_EOL . var_export($paypal_order, 1)); // log_message('error','test: ' . __METHOD__ . ': ' . __LINE__ . ' ' . PHP_EOL . var_export($paypal_account, 1)); // log_message('error','test: ' . __METHOD__ . ': ' . __LINE__ . ' ' . PHP_EOL . var_export($item->OPN_noticeType, 1)); diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 4e9f87ff..bd3d290e 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -642,6 +642,7 @@ class Index extends CI_Controller { } log_message('error',"paypal_webhook" . var_export($raw_post, 1)); $post_data = json_decode($raw_post); + log_message('error','paypal_webhook: ' . $post_data->event_type); if ( strpos($post_data->event_type, 'COMPLETED') === false && strpos($post_data->event_type, 'REFUNDED') === false