Changeset 3720550

Timestamp:

09/30/2026 07:30:56 AM (3 weeks ago)

Author:

whalet

Message:

本次插件改动：1. 后端字段调整，不在返回tradeUniId，前端wordpress插件和收银台关联需要tradeUniId字段，现在改成tradeUniId值从后端字段tradeId获取

Location:

whalet-payment/trunk

Files:

• admin/settings.php (modified) (1 diff)
• assets/js/whalet-postmessage-init.js (modified) (1 diff)
• includes/handlers/class-whalet-config-processor.php (modified) (1 diff)
• includes/handlers/class-whalet-payment-processor.php (modified) (2 diffs)
• templates/whalet-checkout.php (modified) (1 diff)
• woocommerce/card/class-wc-gateway-card.php (modified) (1 diff)

whalet-payment/trunk/admin/settings.php

@@ -254 +254 @@
 
     // New Fields Defaults
-    'cards_title' => __('Card Payment', 'whalet-payment'),
-    'cards_description' => __('Pay with your credit or debit card; Secure and Fast', 'whalet-payment'),
+    'cards_title' => 'Cards',
+    'cards_description' => 'Fast and Secure Payment with Whalet Cards',
     'cards_enabled' => 0,
 
-    'local_title' => __('Whalet Pay', 'whalet-payment'),
-    'local_description' => __('Pay via Whalet; Secure and Fast', 'whalet-payment'),
+    'local_title' => 'Pay with cards and more',
+    'local_description' => 'Fast and Secure Payment with Whalet',
     'local_enabled' => 0,
 );

whalet-payment/trunk/assets/js/whalet-postmessage-init.js

@@ -104 +104 @@
         .filter((method) => method.methodType === "Cards")
         .map((method) => ({
-          paymentMethod: method.methodCode,
+          paymentMethod: method.methodCode,  // 这个字段相当于 网关接口端的 paymentMethodCode
           paymentMethodType: method.methodType.toUpperCase(),
           networks: [],
-          brand: method.brand
+          brand: method.brand,
+          rawData: method?.rawData || {}
         }));
     }

whalet-payment/trunk/includes/handlers/class-whalet-config-processor.php

@@ -101 +101 @@
                         'display_name' => $payment_method_key,
                         'countries' => $method['country'],
-                        'currencies' => $method['currency']
+                        'currencies' => $method['currency'],
+                        // rawData
+                        'rawData' => $method,
                     );
                 }

whalet-payment/trunk/includes/handlers/class-whalet-payment-processor.php

@@ -292 +292 @@
             'order_id' => $order->order_id,
             // tradeUniId 用于唯一标识支付交易 它是 $order->gateway_payment_url 的  /pay/ 后面的一段字符串，请你帮我获取 tradeUniId，直接使用 $tradeUniId
-            'tradeUniId' => $tradeUniId,
+            'tradeUniId' => $order->gateway_payment_id ?: $tradeUniId,
+            'tradeId' => $order->gateway_payment_id,
+            'linkUniId' => $tradeUniId,
             // 从 metadata 中获取 email
             'email' => $email,
@@ -371 +373 @@
             'amount' => $order_data['amount'],
             'currency' => $order_data['currency'],
-            'tradeUniId' => $gateway_result['tradeUniId'],
+            'tradeUniId' => $gateway_result['tradeId'] ?? $gateway_result['tradeUniId'],
             'email' => $gateway_result['customerEmail'],
             'country' => $order_data['billingAddress']['country'],

whalet-payment/trunk/templates/whalet-checkout.php

@@ -138 +138 @@
             scrolling="auto"
             allow="payment"
+            sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox"
             src="<?php echo esc_url($gateway_payment_url) . '?isWooCommerce=true'; ?>"
             >

whalet-payment/trunk/woocommerce/card/class-wc-gateway-card.php

@@ -293 +293 @@
                 scrolling="no"
                 id="whalet-card-iframe"
+                sandbox="allow-scripts allow-same-origin allow-popups allow-popups-to-escape-sandbox"
                 >
               </iframe>';