Changeset 2540675

Timestamp:

06/01/2021 12:01:56 PM (5 years ago)

Author:

woothemes

Message:

Tagging version 3.2.2

Location:

woocommerce-gateway-eway

Files:

• tags/3.2.2 (copied) (copied from woocommerce-gateway-eway/trunk)
• tags/3.2.2/changelog.txt (modified) (1 diff)
• tags/3.2.2/includes/class-wc-gateway-eway-subscriptions.php (modified) (1 diff)
• tags/3.2.2/includes/class-wc-gateway-eway.php (modified) (1 diff)
• tags/3.2.2/readme.txt (modified) (2 diffs)
• tags/3.2.2/woocommerce-gateway-eway.php (modified) (2 diffs)
• trunk/changelog.txt (modified) (1 diff)
• trunk/includes/class-wc-gateway-eway-subscriptions.php (modified) (1 diff)
• trunk/includes/class-wc-gateway-eway.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/woocommerce-gateway-eway.php (modified) (2 diffs)

woocommerce-gateway-eway/tags/3.2.2/changelog.txt

@@ -1 +1 @@
 *** WooCommerce eWAY Gateway Changelog ***
+
+= 3.2.2 - 2021-06-01 =
+* Fix - Fatal error when updating payment for all subscriptions.
 
 = 3.2.1 - 2021-05-17 =

woocommerce-gateway-eway/tags/3.2.2/includes/class-wc-gateway-eway-subscriptions.php

@@ -26 +26 @@
             add_filter( 'woocommerce_subscription_validate_payment_meta', array( $this, 'validate_subscription_payment_meta' ), 10, 2 );
 
+            // Don't update payment methods immediately when changing payment for subscriptions to eWay - wait until we get payment token.
+            add_filter( 'woocommerce_subscriptions_update_payment_via_pay_shortcode', array( $this, 'maybe_update_payment_method' ), 10, 3 );
+
+            add_action( 'woocommerce_api_wc_gateway_eway_payment_completed', array( $this, 'maybe_update_all_subscriptions_payment' ), 10, 3 );
+        }
+
+        /**
+         * Maybe update payment method of all subscriptions.
+         *
+         * @param WC_Order        $order The order whose payment failed.
+         * @param stdClass        $result The result from the API call.
+         * @param WC_Gateway_EWAY $gateway The instance of the gateway.
+         */
+        public function maybe_update_all_subscriptions_payment( $order, $result, $gateway ) {
+            if ( $this->id !== $gateway->id ) {
+                return;
+            }
+
+            if ( ! wcs_is_subscription( $order ) ) {
+                return;
+            }
+
+            if ( ! WC_Subscriptions_Change_Payment_Gateway::will_subscription_update_all_payment_methods( $order ) ) {
+                return;
+            }
+
+            switch ( $result->ResponseMessage ) {
+                case 'A2000':
+                case 'A2008':
+                case 'A2010':
+                case 'A2011':
+                case 'A2016':
+                    if ( empty( $result->TokenCustomerID ) ) {
+                        return;
+                    }
+                    WC_Subscriptions_Change_Payment_Gateway::update_all_payment_methods_from_subscription( $order, $gateway->id );
+                    break;
+            }
+        }
+
+        /**
+         * Updates payment method if necessary.
+         *
+         * When changing payment to eWay for subscriptions it doesn't update payment methods immediately but waits until payment token available.
+         *
+         * @param  bool            $update
+         * @param  string          $new_payment_method
+         * @param  WC_Subscription $subscription
+         * @return bool
+         */
+        public function maybe_update_payment_method( $update, $new_payment_method, $subscription ) {
+            if ( empty( $_POST['update_all_subscriptions_payment_method'] ) ) {
+                return $update;
+            }
+
+            if ( $this->id !== $new_payment_method ) {
+                return $update;
+            }
+
+            /*
+             * So that 'pay for order' page shows the credit card form, the order whose
+             * payment method is to be changed needs to have payment method = eway.
+             * That's why, when payment method is not eway, we want to update it immediately.
+             * Hence, return $update here.
+             */
+            if ( $this->id !== $subscription->get_payment_method() ) {
+                return $update;
+            }
+
+            $is_new_card = ! isset( $_POST['eway_card_id'] ) || 'new' === $_POST['eway_card_id'];
+            if ( ! $is_new_card ) {
+                return $update;
+            }
+
+            // Don't update payment methods immediately when changing payment for subscriptions to eWay - wait until we get payment token.
+            return false;
         }
 

woocommerce-gateway-eway/tags/3.2.2/includes/class-wc-gateway-eway.php

@@ -38 +38 @@
                 'subscription_payment_method_change_admin',
                 'multiple_subscriptions',
+                'subscription_payment_method_delayed_change',
             );
 

woocommerce-gateway-eway/tags/3.2.2/readme.txt

@@ -4 +4 @@
 Requires at least: 4.4
 Tested up to: 5.7
-Stable tag: 3.2.1
+Stable tag: 3.2.2
 Requires PHP: 5.6
 License: GPLv3
@@ -84 +84 @@
 == Changelog ==
 
+= 3.2.2 - 2021-06-01 =
+* Fix - Fatal error when updating payment for all subscriptions.
+
 = 3.2.1 - 2021-05-17 =
 * Fix - Fatal error when PHP version is older than 7.3.

woocommerce-gateway-eway/tags/3.2.2/woocommerce-gateway-eway.php

@@ -6 +6 @@
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 3.2.1
+ * Version: 3.2.2
  * Text Domain: wc-eway
  * Domain Path: /languages
@@ -22 +22 @@
 }
 
-define( 'WOOCOMMERCE_GATEWAY_EWAY_VERSION', '3.2.1' ); // WRCS: DEFINED_VERSION.
+define( 'WOOCOMMERCE_GATEWAY_EWAY_VERSION', '3.2.2' ); // WRCS: DEFINED_VERSION.
 define( 'WOOCOMMERCE_GATEWAY_EWAY_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
 define( 'WOOCOMMERCE_GATEWAY_EWAY_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );

woocommerce-gateway-eway/trunk/changelog.txt

@@ -1 +1 @@
 *** WooCommerce eWAY Gateway Changelog ***
+
+= 3.2.2 - 2021-06-01 =
+* Fix - Fatal error when updating payment for all subscriptions.
 
 = 3.2.1 - 2021-05-17 =

woocommerce-gateway-eway/trunk/includes/class-wc-gateway-eway-subscriptions.php

@@ -26 +26 @@
             add_filter( 'woocommerce_subscription_validate_payment_meta', array( $this, 'validate_subscription_payment_meta' ), 10, 2 );
 
+            // Don't update payment methods immediately when changing payment for subscriptions to eWay - wait until we get payment token.
+            add_filter( 'woocommerce_subscriptions_update_payment_via_pay_shortcode', array( $this, 'maybe_update_payment_method' ), 10, 3 );
+
+            add_action( 'woocommerce_api_wc_gateway_eway_payment_completed', array( $this, 'maybe_update_all_subscriptions_payment' ), 10, 3 );
+        }
+
+        /**
+         * Maybe update payment method of all subscriptions.
+         *
+         * @param WC_Order        $order The order whose payment failed.
+         * @param stdClass        $result The result from the API call.
+         * @param WC_Gateway_EWAY $gateway The instance of the gateway.
+         */
+        public function maybe_update_all_subscriptions_payment( $order, $result, $gateway ) {
+            if ( $this->id !== $gateway->id ) {
+                return;
+            }
+
+            if ( ! wcs_is_subscription( $order ) ) {
+                return;
+            }
+
+            if ( ! WC_Subscriptions_Change_Payment_Gateway::will_subscription_update_all_payment_methods( $order ) ) {
+                return;
+            }
+
+            switch ( $result->ResponseMessage ) {
+                case 'A2000':
+                case 'A2008':
+                case 'A2010':
+                case 'A2011':
+                case 'A2016':
+                    if ( empty( $result->TokenCustomerID ) ) {
+                        return;
+                    }
+                    WC_Subscriptions_Change_Payment_Gateway::update_all_payment_methods_from_subscription( $order, $gateway->id );
+                    break;
+            }
+        }
+
+        /**
+         * Updates payment method if necessary.
+         *
+         * When changing payment to eWay for subscriptions it doesn't update payment methods immediately but waits until payment token available.
+         *
+         * @param  bool            $update
+         * @param  string          $new_payment_method
+         * @param  WC_Subscription $subscription
+         * @return bool
+         */
+        public function maybe_update_payment_method( $update, $new_payment_method, $subscription ) {
+            if ( empty( $_POST['update_all_subscriptions_payment_method'] ) ) {
+                return $update;
+            }
+
+            if ( $this->id !== $new_payment_method ) {
+                return $update;
+            }
+
+            /*
+             * So that 'pay for order' page shows the credit card form, the order whose
+             * payment method is to be changed needs to have payment method = eway.
+             * That's why, when payment method is not eway, we want to update it immediately.
+             * Hence, return $update here.
+             */
+            if ( $this->id !== $subscription->get_payment_method() ) {
+                return $update;
+            }
+
+            $is_new_card = ! isset( $_POST['eway_card_id'] ) || 'new' === $_POST['eway_card_id'];
+            if ( ! $is_new_card ) {
+                return $update;
+            }
+
+            // Don't update payment methods immediately when changing payment for subscriptions to eWay - wait until we get payment token.
+            return false;
         }
 

woocommerce-gateway-eway/trunk/includes/class-wc-gateway-eway.php

@@ -38 +38 @@
                 'subscription_payment_method_change_admin',
                 'multiple_subscriptions',
+                'subscription_payment_method_delayed_change',
             );
 

woocommerce-gateway-eway/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.4
 Tested up to: 5.7
-Stable tag: 3.2.1
+Stable tag: 3.2.2
 Requires PHP: 5.6
 License: GPLv3
@@ -84 +84 @@
 == Changelog ==
 
+= 3.2.2 - 2021-06-01 =
+* Fix - Fatal error when updating payment for all subscriptions.
+
 = 3.2.1 - 2021-05-17 =
 * Fix - Fatal error when PHP version is older than 7.3.

woocommerce-gateway-eway/trunk/woocommerce-gateway-eway.php

@@ -6 +6 @@
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 3.2.1
+ * Version: 3.2.2
  * Text Domain: wc-eway
  * Domain Path: /languages
@@ -22 +22 @@
 }
 
-define( 'WOOCOMMERCE_GATEWAY_EWAY_VERSION', '3.2.1' ); // WRCS: DEFINED_VERSION.
+define( 'WOOCOMMERCE_GATEWAY_EWAY_VERSION', '3.2.2' ); // WRCS: DEFINED_VERSION.
 define( 'WOOCOMMERCE_GATEWAY_EWAY_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
 define( 'WOOCOMMERCE_GATEWAY_EWAY_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );