Changeset 3250888

Timestamp:

03/05/2025 07:41:17 AM (12 months ago)

Author:

PerfectSolution

Message:

Update trunk/ - 7.4.0

Location:

woocommerce-quickpay

Files:

• tags/7.4.0 (copied) (copied from woocommerce-quickpay/trunk)
• tags/7.4.0/README.txt (modified) (1 diff)
• tags/7.4.0/classes/utils/woocommerce-quickpay-order-payments-utils.php (modified) (1 diff)
• tags/7.4.0/classes/utils/woocommerce-quickpay-order-transaction-data-utils.php (modified) (1 diff)
• tags/7.4.0/classes/utils/woocommerce-quickpay-order-utils.php (modified) (1 diff)
• tags/7.4.0/classes/woocommerce-quickpay-callbacks.php (modified) (2 diffs)
• tags/7.4.0/classes/woocommerce-quickpay-subscription.php (modified) (2 diffs)
• tags/7.4.0/helpers/transactions.php (modified) (1 diff)
• tags/7.4.0/woocommerce-quickpay.php (modified) (2 diffs)
• trunk/README.txt (modified) (1 diff)
• trunk/classes/utils/woocommerce-quickpay-order-payments-utils.php (modified) (1 diff)
• trunk/classes/utils/woocommerce-quickpay-order-transaction-data-utils.php (modified) (1 diff)
• trunk/classes/utils/woocommerce-quickpay-order-utils.php (modified) (1 diff)
• trunk/classes/woocommerce-quickpay-callbacks.php (modified) (2 diffs)
• trunk/classes/woocommerce-quickpay-subscription.php (modified) (2 diffs)
• trunk/helpers/transactions.php (modified) (1 diff)
• trunk/woocommerce-quickpay.php (modified) (2 diffs)

woocommerce-quickpay/tags/7.4.0/README.txt

@@ -28 +28 @@
 
 == Changelog ==
+= 7.4.0 =
+* Fix: Subscription switching was not always creating a subscription payment when upgrading from a free subscription to a paid variant where no previous payments have been made.
+
 = 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.

woocommerce-quickpay/tags/7.4.0/classes/utils/woocommerce-quickpay-order-payments-utils.php

@@ -154 +154 @@
         if ( WC_QuickPay_Subscription::is_subscription( $order_id ) ) {
             $order_number = $order_id;
-        } // On initial subscription authorizations
-        else if ( ! $recurring && ! WC_QuickPay_Order_Utils::contains_switch_order( $order ) && WC_QuickPay_Order_Utils::contains_subscription( $order ) ) {
+        }
+        // On initial subscription authorizations
+        // 1. Either on parent orders
+        // 2. Or if the customer tries to upgrade a free subscription to a not-free variation.
+        else if ( ( ! $recurring || WC_QuickPay_Order_Utils::switches_from_free_to_paid( $order ) ) && WC_QuickPay_Order_Utils::contains_subscription( $order ) ) {
             // Find all subscriptions
             $subscriptions = WC_QuickPay_Subscription::get_subscriptions_for_order( $order_id );

woocommerce-quickpay/tags/7.4.0/classes/utils/woocommerce-quickpay-order-transaction-data-utils.php

@@ -131 +131 @@
 
         // Get the correct order_post_id. We want to fetch the ID of the subscription to store data on subscription (if available).
-        // But only on the first attempt. In case of failed auto capture on the initial order, we dont want to add the subscription ID.
-        // If we are handlong a product switch, we will not need this ID as we are making a regular payment.
-        if ( ! WC_QuickPay_Order_Utils::contains_switch_order( $order ) ) {
-            $subscription_id = WC_QuickPay_Subscription::get_subscription_id( $order );
-            if ( $subscription_id ) {
-                $custom_vars['subscription_post_id'] = $subscription_id;
-            }
+        if ( $subscription_id = WC_QuickPay_Subscription::get_subscription_id( $order ) ) {
+            $custom_vars['subscription_post_id'] = $subscription_id;
         }
 

woocommerce-quickpay/tags/7.4.0/classes/utils/woocommerce-quickpay-order-utils.php

@@ -57 +57 @@
     }
 
+    /**
+     * Checks if the order switches a subscription from free to paid.
+     * In this case we would often require authorization of a subscription transaction in order to
+     * be able to authorize payments automatically in the future.
+     *
+     * @param $order
+     *
+     * @return bool
+     */
+    public static function switches_from_free_to_paid( $order ): bool {
+        if ( ! self::contains_switch_order( $order ) ) {
+            return false;
+        }
+
+        if ( ! ( $subscription_id = $order->get_meta( '_subscription_switch' ) ) || ! ( $subscription = woocommerce_quickpay_get_subscription( $subscription_id ) ) ) {
+            return false;
+        }
+
+        // Make sure to cast the return value as WC returns the total as a string regardless of context.
+        $old_total = (float) $subscription->get_total();
+        $new_total = (float) $order->get_total();
+
+        return $old_total === 0.0 && $new_total > 0;
+    }
+
+    /**
+     * @param WC_Order $order
+     * @param string|null $message
+     *
+     * @return void
+     */
     public static function add_note( WC_Order $order, ?string $message ): void {
         if ( $message ) {

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

@@ -123 +123 @@
         // Only make an instant payment if the order total is more than 0
         if ( $related_order->get_total() > 0 ) {
-            // Check if this is an order containing a subscription or if it is a renewal order
-            if ( ! WC_QuickPay_Subscription::is_subscription( $related_order ) && ( WC_QuickPay_Order_Utils::contains_subscription( $related_order ) || WC_QuickPay_Subscription::is_renewal( $related_order ) ) ) {
-                // Process a recurring payment, but only if the subscription needs a payment.
-                // This check was introduced to avoid possible double payments in case Quickpay sends callbacks more than once.
-                if ( ( $wcs_subscription = wcs_get_subscription( $subscription->get_id() ) ) && $wcs_subscription->needs_payment() ) {
+            // Determine if the order is a subscription or renewal order
+            $is_subscription       = WC_QuickPay_Subscription::is_subscription( $related_order );
+            $contains_subscription = WC_QuickPay_Order_Utils::contains_subscription( $related_order );
+            $is_renewal            = WC_QuickPay_Subscription::is_renewal( $related_order );
+
+            if ( ! $is_subscription && ( $contains_subscription || $is_renewal ) ) {
+                // Retrieve the subscription and check if a payment is needed
+                $wcs_subscription = wcs_get_subscription( $subscription->get_id() );
+                // Checks if the subscription needs a payment. Also checks specifically on the related order as switch orders will not flag a subscription as needing a payment
+                $needs_payment = $wcs_subscription && ( $wcs_subscription->needs_payment() || $related_order->needs_payment() );
+
+                if ( $needs_payment ) {
                     WC_QP()->process_recurring_payment( new WC_QuickPay_API_Subscription(), $transaction->id, $related_order->get_total(), $related_order );
                 }
@@ -134 +141 @@
         // If there is no initial payment, we will mark the order as complete.
         // This is usually happening if a subscription has a free trial.
-        else {
-            // Only complete the order payment if we are not changing payment method.
-            // This is to avoid the subscription going into a 'processing' limbo.
-            if ( empty( $transaction->variables->change_payment ) ) {
-                $related_order->payment_complete();
-            }
+        else if ( empty( $transaction->variables->change_payment ) ) {
+            $related_order->payment_complete();
         }
 

woocommerce-quickpay/tags/7.4.0/classes/woocommerce-quickpay-subscription.php

@@ -113 +113 @@
 
     /**
+     * @param $order
+     * @param array $args
+     *
+     * @return WC_Subscription|null
+     */
+    public static function get_last_subscription_for_order( $order, array $args = [] ): ?WC_Subscription {
+        $subscriptions = self::get_subscriptions_for_order( $order, $args );
+
+        if ( ! empty( $subscriptions ) ) {
+            return end( $subscriptions );
+        }
+
+        return null;
+    }
+
+    /**
      * @param WC_Order $order
      *
@@ -135 +151 @@
             return end( $subscriptions )->get_id();
         }
+
         return null;
     }

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

@@ -16 +16 @@
 
     // If the order is a subscription or an attempt of updating the payment method
-    if ( ! WC_QuickPay_Subscription::cart_contains_switches() && ( WC_QuickPay_Order_Utils::contains_subscription( $order ) || WC_QuickPay_Requests_Utils::is_request_to_change_payment() ) ) {
-        // Instantiate a subscription transaction instead of a payment transaction
-        $api_transaction = new WC_QuickPay_API_Subscription();
+    if ( WC_QuickPay_Order_Utils::contains_subscription( $order ) || WC_QuickPay_Requests_Utils::is_request_to_change_payment() ) {
+        if ( WC_QuickPay_Subscription::cart_contains_switches() ) {
+            $subscription   = WC_QuickPay_Subscription::get_last_subscription_for_order( $order );
+            $transaction_id = $subscription ? WC_QuickPay_Order_Utils::get_transaction_id( $subscription ) : null;
+
+            if ( ! $transaction_id && $order->needs_payment() ) {
+                // Instantiate a subscription transaction instead of a payment transaction
+                $api_transaction = new WC_QuickPay_API_Subscription();
+            }
+        } else {
+            // Instantiate a subscription transaction instead of a payment transaction
+            $api_transaction = new WC_QuickPay_API_Subscription();
+        }
     }
 

woocommerce-quickpay/tags/7.4.0/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.5
+ * Version: 7.4.0
  * Author: Perfect Solution
  * Text Domain: woo-quickpay
@@ -20 +20 @@
 }
 
-define( 'WCQP_VERSION', '7.3.5' );
+define( 'WCQP_VERSION', '7.4.0' );
 define( 'WCQP_URL', plugins_url( __FILE__ ) );
 define( 'WCQP_PATH', plugin_dir_path( __FILE__ ) );

woocommerce-quickpay/trunk/README.txt

@@ -28 +28 @@
 
 == Changelog ==
+= 7.4.0 =
+* Fix: Subscription switching was not always creating a subscription payment when upgrading from a free subscription to a paid variant where no previous payments have been made.
+
 = 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.

woocommerce-quickpay/trunk/classes/utils/woocommerce-quickpay-order-payments-utils.php

@@ -154 +154 @@
         if ( WC_QuickPay_Subscription::is_subscription( $order_id ) ) {
             $order_number = $order_id;
-        } // On initial subscription authorizations
-        else if ( ! $recurring && ! WC_QuickPay_Order_Utils::contains_switch_order( $order ) && WC_QuickPay_Order_Utils::contains_subscription( $order ) ) {
+        }
+        // On initial subscription authorizations
+        // 1. Either on parent orders
+        // 2. Or if the customer tries to upgrade a free subscription to a not-free variation.
+        else if ( ( ! $recurring || WC_QuickPay_Order_Utils::switches_from_free_to_paid( $order ) ) && WC_QuickPay_Order_Utils::contains_subscription( $order ) ) {
             // Find all subscriptions
             $subscriptions = WC_QuickPay_Subscription::get_subscriptions_for_order( $order_id );

woocommerce-quickpay/trunk/classes/utils/woocommerce-quickpay-order-transaction-data-utils.php

@@ -131 +131 @@
 
         // Get the correct order_post_id. We want to fetch the ID of the subscription to store data on subscription (if available).
-        // But only on the first attempt. In case of failed auto capture on the initial order, we dont want to add the subscription ID.
-        // If we are handlong a product switch, we will not need this ID as we are making a regular payment.
-        if ( ! WC_QuickPay_Order_Utils::contains_switch_order( $order ) ) {
-            $subscription_id = WC_QuickPay_Subscription::get_subscription_id( $order );
-            if ( $subscription_id ) {
-                $custom_vars['subscription_post_id'] = $subscription_id;
-            }
+        if ( $subscription_id = WC_QuickPay_Subscription::get_subscription_id( $order ) ) {
+            $custom_vars['subscription_post_id'] = $subscription_id;
         }
 

woocommerce-quickpay/trunk/classes/utils/woocommerce-quickpay-order-utils.php

@@ -57 +57 @@
     }
 
+    /**
+     * Checks if the order switches a subscription from free to paid.
+     * In this case we would often require authorization of a subscription transaction in order to
+     * be able to authorize payments automatically in the future.
+     *
+     * @param $order
+     *
+     * @return bool
+     */
+    public static function switches_from_free_to_paid( $order ): bool {
+        if ( ! self::contains_switch_order( $order ) ) {
+            return false;
+        }
+
+        if ( ! ( $subscription_id = $order->get_meta( '_subscription_switch' ) ) || ! ( $subscription = woocommerce_quickpay_get_subscription( $subscription_id ) ) ) {
+            return false;
+        }
+
+        // Make sure to cast the return value as WC returns the total as a string regardless of context.
+        $old_total = (float) $subscription->get_total();
+        $new_total = (float) $order->get_total();
+
+        return $old_total === 0.0 && $new_total > 0;
+    }
+
+    /**
+     * @param WC_Order $order
+     * @param string|null $message
+     *
+     * @return void
+     */
     public static function add_note( WC_Order $order, ?string $message ): void {
         if ( $message ) {

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

@@ -123 +123 @@
         // Only make an instant payment if the order total is more than 0
         if ( $related_order->get_total() > 0 ) {
-            // Check if this is an order containing a subscription or if it is a renewal order
-            if ( ! WC_QuickPay_Subscription::is_subscription( $related_order ) && ( WC_QuickPay_Order_Utils::contains_subscription( $related_order ) || WC_QuickPay_Subscription::is_renewal( $related_order ) ) ) {
-                // Process a recurring payment, but only if the subscription needs a payment.
-                // This check was introduced to avoid possible double payments in case Quickpay sends callbacks more than once.
-                if ( ( $wcs_subscription = wcs_get_subscription( $subscription->get_id() ) ) && $wcs_subscription->needs_payment() ) {
+            // Determine if the order is a subscription or renewal order
+            $is_subscription       = WC_QuickPay_Subscription::is_subscription( $related_order );
+            $contains_subscription = WC_QuickPay_Order_Utils::contains_subscription( $related_order );
+            $is_renewal            = WC_QuickPay_Subscription::is_renewal( $related_order );
+
+            if ( ! $is_subscription && ( $contains_subscription || $is_renewal ) ) {
+                // Retrieve the subscription and check if a payment is needed
+                $wcs_subscription = wcs_get_subscription( $subscription->get_id() );
+                // Checks if the subscription needs a payment. Also checks specifically on the related order as switch orders will not flag a subscription as needing a payment
+                $needs_payment = $wcs_subscription && ( $wcs_subscription->needs_payment() || $related_order->needs_payment() );
+
+                if ( $needs_payment ) {
                     WC_QP()->process_recurring_payment( new WC_QuickPay_API_Subscription(), $transaction->id, $related_order->get_total(), $related_order );
                 }
@@ -134 +141 @@
         // If there is no initial payment, we will mark the order as complete.
         // This is usually happening if a subscription has a free trial.
-        else {
-            // Only complete the order payment if we are not changing payment method.
-            // This is to avoid the subscription going into a 'processing' limbo.
-            if ( empty( $transaction->variables->change_payment ) ) {
-                $related_order->payment_complete();
-            }
+        else if ( empty( $transaction->variables->change_payment ) ) {
+            $related_order->payment_complete();
         }
 

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

@@ -113 +113 @@
 
     /**
+     * @param $order
+     * @param array $args
+     *
+     * @return WC_Subscription|null
+     */
+    public static function get_last_subscription_for_order( $order, array $args = [] ): ?WC_Subscription {
+        $subscriptions = self::get_subscriptions_for_order( $order, $args );
+
+        if ( ! empty( $subscriptions ) ) {
+            return end( $subscriptions );
+        }
+
+        return null;
+    }
+
+    /**
      * @param WC_Order $order
      *
@@ -135 +151 @@
             return end( $subscriptions )->get_id();
         }
+
         return null;
     }

woocommerce-quickpay/trunk/helpers/transactions.php

@@ -16 +16 @@
 
     // If the order is a subscription or an attempt of updating the payment method
-    if ( ! WC_QuickPay_Subscription::cart_contains_switches() && ( WC_QuickPay_Order_Utils::contains_subscription( $order ) || WC_QuickPay_Requests_Utils::is_request_to_change_payment() ) ) {
-        // Instantiate a subscription transaction instead of a payment transaction
-        $api_transaction = new WC_QuickPay_API_Subscription();
+    if ( WC_QuickPay_Order_Utils::contains_subscription( $order ) || WC_QuickPay_Requests_Utils::is_request_to_change_payment() ) {
+        if ( WC_QuickPay_Subscription::cart_contains_switches() ) {
+            $subscription   = WC_QuickPay_Subscription::get_last_subscription_for_order( $order );
+            $transaction_id = $subscription ? WC_QuickPay_Order_Utils::get_transaction_id( $subscription ) : null;
+
+            if ( ! $transaction_id && $order->needs_payment() ) {
+                // Instantiate a subscription transaction instead of a payment transaction
+                $api_transaction = new WC_QuickPay_API_Subscription();
+            }
+        } else {
+            // Instantiate a subscription transaction instead of a payment transaction
+            $api_transaction = new WC_QuickPay_API_Subscription();
+        }
     }
 

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.5
+ * Version: 7.4.0
  * Author: Perfect Solution
  * Text Domain: woo-quickpay
@@ -20 +20 @@
 }
 
-define( 'WCQP_VERSION', '7.3.5' );
+define( 'WCQP_VERSION', '7.4.0' );
 define( 'WCQP_URL', plugins_url( __FILE__ ) );
 define( 'WCQP_PATH', plugin_dir_path( __FILE__ ) );