Changeset 3239254

Timestamp:

02/12/2025 10:00:25 AM (12 months ago)

Author:

PerfectSolution

Message:

Update trunk/ - 7.3.5

Location:

woocommerce-quickpay

Files:

• tags/7.3.5 (copied) (copied from woocommerce-quickpay/trunk)
• tags/7.3.5/README.txt (modified) (1 diff)
• tags/7.3.5/classes/woocommerce-quickpay-callbacks.php (modified) (1 diff)
• tags/7.3.5/helpers/transactions.php (modified) (1 diff)
• tags/7.3.5/trunk (copied) (copied from woocommerce-quickpay/trunk)
• tags/7.3.5/trunk/README.txt (modified) (1 diff)
• tags/7.3.5/trunk/classes/woocommerce-quickpay-callbacks.php (modified) (1 diff)
• tags/7.3.5/trunk/helpers/transactions.php (modified) (1 diff)
• tags/7.3.5/trunk/woocommerce-quickpay.php (modified) (6 diffs)
• tags/7.3.5/woocommerce-quickpay.php (modified) (6 diffs)
• trunk/README.txt (modified) (1 diff)
• trunk/classes/woocommerce-quickpay-callbacks.php (modified) (1 diff)
• trunk/helpers/transactions.php (modified) (1 diff)
• trunk/woocommerce-quickpay.php (modified) (6 diffs)

woocommerce-quickpay/tags/7.3.5/README.txt

@@ -28 +28 @@
 
 == Changelog ==
-= 7.3.4=
+= 7.3.5 =
+* Fix: woocommerce_quickpay_get_order now makes a specific check on WC_Order instance to avoid possible direct property access on a WC_Order object.
+* Fix: add check in callback handler to avoid payment failed transitioning on orders and subscriptions that does not actually require a payment.
+* Fix: add extra check on qp_status_code in callback handler to avoid possible incorrect logging when refunds or captures fail.
+
+= 7.3.4 =
 * Fix: MobilePay Subscriptions now calls WC_Subscription::cancel_order to leverage support of pending-cancel/cancelled logic when setting "Cancelled agreement status" to 'Cancelled'.
 * Fix: Change QuickPay to Quickpay in text strings

woocommerce-quickpay/tags/7.3.5/classes/woocommerce-quickpay-callbacks.php

@@ -60 +60 @@
             $order->update_status( 'completed', $capture_note );
         } else {
-            $order->add_order_note( $capture_note );
+            $order->add_order_note( 'Quickpay: ' . $capture_note );
         }
 

woocommerce-quickpay/tags/7.3.5/helpers/transactions.php

@@ -93 +93 @@
  */
 function woocommerce_quickpay_get_order( $order ): ?WC_Order {
+
     if ( ! is_object( $order ) ) {
         return wc_get_order( $order ) ?: null;
+    }
+
+    if ( $order instanceof WC_Order ) {
+        return $order;
     }
 

woocommerce-quickpay/tags/7.3.5/trunk/README.txt

@@ -28 +28 @@
 
 == Changelog ==
-= 7.3.4=
+= 7.3.5 =
+* Fix: woocommerce_quickpay_get_order now makes a specific check on WC_Order instance to avoid possible direct property access on a WC_Order object.
+* Fix: add check in callback handler to avoid payment failed transitioning on orders and subscriptions that does not actually require a payment.
+* Fix: add extra check on qp_status_code in callback handler to avoid possible incorrect logging when refunds or captures fail.
+
+= 7.3.4 =
 * Fix: MobilePay Subscriptions now calls WC_Subscription::cancel_order to leverage support of pending-cancel/cancelled logic when setting "Cancelled agreement status" to 'Cancelled'.
 * Fix: Change QuickPay to Quickpay in text strings

woocommerce-quickpay/tags/7.3.5/trunk/classes/woocommerce-quickpay-callbacks.php

@@ -60 +60 @@
             $order->update_status( 'completed', $capture_note );
         } else {
-            $order->add_order_note( $capture_note );
+            $order->add_order_note( 'Quickpay: ' . $capture_note );
         }
 

woocommerce-quickpay/tags/7.3.5/trunk/helpers/transactions.php

@@ -93 +93 @@
  */
 function woocommerce_quickpay_get_order( $order ): ?WC_Order {
+
     if ( ! is_object( $order ) ) {
         return wc_get_order( $order ) ?: null;
+    }
+
+    if ( $order instanceof WC_Order ) {
+        return $order;
     }
 

woocommerce-quickpay/tags/7.3.5/trunk/woocommerce-quickpay.php

@@ -4 +4 @@
  * Plugin URI: http://wordpress.org/plugins/woocommerce-quickpay/
  * Description: Integrates your Quickpay payment gateway into your WooCommerce installation.
- * Version: 7.3.4
+ * Version: 7.3.5
  * Author: Perfect Solution
  * Text Domain: woo-quickpay
@@ -20 +20 @@
 }
 
-define( 'WCQP_VERSION', '7.3.4' );
+define( 'WCQP_VERSION', '7.3.5' );
 define( 'WCQP_URL', plugins_url( __FILE__ ) );
 define( 'WCQP_PATH', plugin_dir_path( __FILE__ ) );
@@ -784 +784 @@
                 $subscription_id = WC_QuickPay_Callbacks::get_subscription_id_from_callback( $json );
                 $subscription    = null;
+
                 if ( $subscription_id !== null ) {
                     $subscription = woocommerce_quickpay_get_subscription( $subscription_id );
@@ -797 +798 @@
                     // Is the transaction accepted and approved by QP / Acquirer?
                     // Did we find an order?
-                    if ( $json->accepted && $order ) {
+                    if ( $json->accepted && $order && in_array( (int) $transaction->qp_status_code, [ 20000, 20200 ], true ) ) {
                         do_action( 'woocommerce_quickpay_accepted_callback_before_processing', $order, $json );
                         do_action( 'woocommerce_quickpay_accepted_callback_before_processing_status_' . $transaction->type, $order, $json );
@@ -823 +824 @@
 
                                 case 'refund' :
-                                    $order->add_order_note( sprintf( __( 'Refunded %s %s', 'woo-quickpay' ), WC_QuickPay_Helper::price_normalize( $transaction->amount, $json->currency ), $json->currency ) );
+                                    $order->add_order_note( sprintf( 'Quickpay: ' . __( 'Refunded %s %s', 'woo-quickpay' ), WC_QuickPay_Helper::price_normalize( $transaction->amount, $json->currency ), $json->currency ) );
                                     break;
 
@@ -865 +866 @@
                         ] );
 
-                        if ( $order && ( $transaction->type === 'recurring' || 'rejected' !== $json->state ) ) {
+                        if ( $order && $order->needs_payment() && ( $transaction->type === 'recurring' || 'rejected' !== $json->state ) ) {
                             $order->update_status( 'failed', sprintf( 'Payment failed <br />QuickPay Message: %s<br />Acquirer Message: %s', $transaction->qp_status_msg, $transaction->aq_status_msg ) );
                         }

woocommerce-quickpay/tags/7.3.5/woocommerce-quickpay.php

@@ -4 +4 @@
  * Plugin URI: http://wordpress.org/plugins/woocommerce-quickpay/
  * Description: Integrates your Quickpay payment gateway into your WooCommerce installation.
- * Version: 7.3.4
+ * Version: 7.3.5
  * Author: Perfect Solution
  * Text Domain: woo-quickpay
@@ -20 +20 @@
 }
 
-define( 'WCQP_VERSION', '7.3.4' );
+define( 'WCQP_VERSION', '7.3.5' );
 define( 'WCQP_URL', plugins_url( __FILE__ ) );
 define( 'WCQP_PATH', plugin_dir_path( __FILE__ ) );
@@ -784 +784 @@
                 $subscription_id = WC_QuickPay_Callbacks::get_subscription_id_from_callback( $json );
                 $subscription    = null;
+
                 if ( $subscription_id !== null ) {
                     $subscription = woocommerce_quickpay_get_subscription( $subscription_id );
@@ -797 +798 @@
                     // Is the transaction accepted and approved by QP / Acquirer?
                     // Did we find an order?
-                    if ( $json->accepted && $order ) {
+                    if ( $json->accepted && $order && in_array( (int) $transaction->qp_status_code, [ 20000, 20200 ], true ) ) {
                         do_action( 'woocommerce_quickpay_accepted_callback_before_processing', $order, $json );
                         do_action( 'woocommerce_quickpay_accepted_callback_before_processing_status_' . $transaction->type, $order, $json );
@@ -823 +824 @@
 
                                 case 'refund' :
-                                    $order->add_order_note( sprintf( __( 'Refunded %s %s', 'woo-quickpay' ), WC_QuickPay_Helper::price_normalize( $transaction->amount, $json->currency ), $json->currency ) );
+                                    $order->add_order_note( sprintf( 'Quickpay: ' . __( 'Refunded %s %s', 'woo-quickpay' ), WC_QuickPay_Helper::price_normalize( $transaction->amount, $json->currency ), $json->currency ) );
                                     break;
 
@@ -865 +866 @@
                         ] );
 
-                        if ( $order && ( $transaction->type === 'recurring' || 'rejected' !== $json->state ) ) {
+                        if ( $order && $order->needs_payment() && ( $transaction->type === 'recurring' || 'rejected' !== $json->state ) ) {
                             $order->update_status( 'failed', sprintf( 'Payment failed <br />QuickPay Message: %s<br />Acquirer Message: %s', $transaction->qp_status_msg, $transaction->aq_status_msg ) );
                         }

woocommerce-quickpay/trunk/README.txt

@@ -28 +28 @@
 
 == Changelog ==
-= 7.3.4=
+= 7.3.5 =
+* Fix: woocommerce_quickpay_get_order now makes a specific check on WC_Order instance to avoid possible direct property access on a WC_Order object.
+* Fix: add check in callback handler to avoid payment failed transitioning on orders and subscriptions that does not actually require a payment.
+* Fix: add extra check on qp_status_code in callback handler to avoid possible incorrect logging when refunds or captures fail.
+
+= 7.3.4 =
 * Fix: MobilePay Subscriptions now calls WC_Subscription::cancel_order to leverage support of pending-cancel/cancelled logic when setting "Cancelled agreement status" to 'Cancelled'.
 * Fix: Change QuickPay to Quickpay in text strings

woocommerce-quickpay/trunk/classes/woocommerce-quickpay-callbacks.php

@@ -60 +60 @@
             $order->update_status( 'completed', $capture_note );
         } else {
-            $order->add_order_note( $capture_note );
+            $order->add_order_note( 'Quickpay: ' . $capture_note );
         }
 

woocommerce-quickpay/trunk/helpers/transactions.php

@@ -93 +93 @@
  */
 function woocommerce_quickpay_get_order( $order ): ?WC_Order {
+
     if ( ! is_object( $order ) ) {
         return wc_get_order( $order ) ?: null;
+    }
+
+    if ( $order instanceof WC_Order ) {
+        return $order;
     }
 

woocommerce-quickpay/trunk/woocommerce-quickpay.php

@@ -4 +4 @@
  * Plugin URI: http://wordpress.org/plugins/woocommerce-quickpay/
  * Description: Integrates your Quickpay payment gateway into your WooCommerce installation.
- * Version: 7.3.4
+ * Version: 7.3.5
  * Author: Perfect Solution
  * Text Domain: woo-quickpay
@@ -20 +20 @@
 }
 
-define( 'WCQP_VERSION', '7.3.4' );
+define( 'WCQP_VERSION', '7.3.5' );
 define( 'WCQP_URL', plugins_url( __FILE__ ) );
 define( 'WCQP_PATH', plugin_dir_path( __FILE__ ) );
@@ -784 +784 @@
                 $subscription_id = WC_QuickPay_Callbacks::get_subscription_id_from_callback( $json );
                 $subscription    = null;
+
                 if ( $subscription_id !== null ) {
                     $subscription = woocommerce_quickpay_get_subscription( $subscription_id );
@@ -797 +798 @@
                     // Is the transaction accepted and approved by QP / Acquirer?
                     // Did we find an order?
-                    if ( $json->accepted && $order ) {
+                    if ( $json->accepted && $order && in_array( (int) $transaction->qp_status_code, [ 20000, 20200 ], true ) ) {
                         do_action( 'woocommerce_quickpay_accepted_callback_before_processing', $order, $json );
                         do_action( 'woocommerce_quickpay_accepted_callback_before_processing_status_' . $transaction->type, $order, $json );
@@ -823 +824 @@
 
                                 case 'refund' :
-                                    $order->add_order_note( sprintf( __( 'Refunded %s %s', 'woo-quickpay' ), WC_QuickPay_Helper::price_normalize( $transaction->amount, $json->currency ), $json->currency ) );
+                                    $order->add_order_note( sprintf( 'Quickpay: ' . __( 'Refunded %s %s', 'woo-quickpay' ), WC_QuickPay_Helper::price_normalize( $transaction->amount, $json->currency ), $json->currency ) );
                                     break;
 
@@ -865 +866 @@
                         ] );
 
-                        if ( $order && ( $transaction->type === 'recurring' || 'rejected' !== $json->state ) ) {
+                        if ( $order && $order->needs_payment() && ( $transaction->type === 'recurring' || 'rejected' !== $json->state ) ) {
                             $order->update_status( 'failed', sprintf( 'Payment failed <br />QuickPay Message: %s<br />Acquirer Message: %s', $transaction->qp_status_msg, $transaction->aq_status_msg ) );
                         }