Release 1.1.6

Author: edgaraswallee

README.md

@@ -9,11 +9,11 @@ This repository contains the wallee Subscriptions addon that enables WooCommerce
 
 * [Wordpress](https://wordpress.org/) 4.4 or later.
 * [Woocommerce](https://woocommerce.com/) 3.0 or later
-* [wallee Plugin](../../../woocommerce/) 1.2 or later
+* [wallee Plugin](../../../woocommerce/) 3.2.0 or later
 * [Woocommerce Subscriptions Plugin](https://woocommerce.com/products/woocommerce-subscriptions/) 2.2 or later
 * [PHP](http://php.net/) 5.6 or later
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/woocommerce-subscription/blob/1.1.5/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/woocommerce-subscription/blob/1.1.6/LICENSE) for more information.
 

changelog.txt

@@ -87,3 +87,12 @@ Bug fix, if space_view_id is not set, it does not send it to the service portal.
 - [Tested Against] WooCommerce 8.9.1
 - [Tested Against] Woo Subscriptions 5.5.0
 
+= 1.1.6 - Mar 6 2025 =
+- [BugFix] Fixed usage of newly introduced constants on version 3.2.0
+- [BugFix] Improved subscription handling: Optimized the processing of subscription data for better reliability and performance.
+
+- [Tested Against] PHP 8.2
+- [Tested Against] Wordpress 6.8.0
+- [Tested Against] WooCommerce 9.8.0
+- [Tested Against] Woo Subscriptions 7.2.1
+

docs/en/documentation.html

@@ -23,7 +23,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/woocommerce-subscription/releases/tag/1.1.5/">
+		<a href="https://github.com/wallee-payment/woocommerce-subscription/releases/tag/1.1.6/">
 			Source
 		</a>
 	</li>

includes/class-wc-wallee-subscription-gateway.php

@@ -98,17 +98,11 @@ public function __construct( WC_Wallee_Gateway $gateway ) {
 	 */
 	public function process_scheduled_subscription_payment( $amount_to_charge, WC_Order $order ) {
 		try {
-			$token_space_id = get_post_meta( $order->get_id(), '_wallee_subscription_space_id', true );
-			$token_id = get_post_meta( $order->get_id(), '_wallee_subscription_token_id', true );
+			$token_data = $this->get_token_data_from_order($order);
+
+			$token_space_id = $token_data['_wallee_subscription_space_id'];
+			$token_id = $token_data['_wallee_subscription_token_id'];
 
-			if ( empty( $token_space_id ) || get_option( WooCommerce_Wallee::CK_SPACE_ID ) != $token_space_id ) {
-				$order->update_status( 'failed', __( 'The token space and the configured space are not equal.', 'woo-wallee-subscription' ) );
-				return;
-			}
-			if ( empty( $token_id ) ) {
-				$order->update_status( 'failed', __( 'There is no token associated with this subscription.', 'woo-wallee-subscription' ) );
-				return;
-			}
 			$transaction_service = WC_Wallee_Subscription_Service_Transaction::instance();
 
 			$transaction_info = WC_Wallee_Entity_Transaction_Info::load_by_order_id( $order->get_id() );
@@ -134,6 +128,57 @@ public function process_scheduled_subscription_payment( $amount_to_charge, WC_Or
 		}
 	}
 
+	/**
+	 * Get token data from original order
+	 *
+	 * @param WC_Order $order Order.
+	 * @return array
+	 */
+	private function get_token_data_from_order($order)
+	{
+		$order_id = $order->get_id();
+		$token_data = [];
+		$token_data['_wallee_subscription_space_id'] = get_post_meta( $order_id, '_wallee_subscription_space_id', true );
+		$token_data['_wallee_subscription_token_id'] = get_post_meta( $order_id, '_wallee_subscription_token_id', true );
+
+		if( ! isset($token_data['_wallee_subscription_space_id']) || isset($token_data['_wallee_subscription_token_id']) ) {
+
+			$subscriptions = wcs_get_subscriptions_for_renewal_order( $order_id );
+			// In theory, each of the array elements should contain the same token and space data
+			$subscription_object = array_pop($subscriptions);
+			$subscription_meta = $subscription_object->get_meta_data();
+			$token_data = [];
+			$wallee_subscription_keys = [
+				'_wallee_subscription_space_id',
+				'_wallee_subscription_token_id'
+			];
+
+			foreach( $subscription_meta as $meta_data ) {
+				$contained_data = $meta_data->get_data();
+				if ( in_array($contained_data['key'], $wallee_subscription_keys ) ) {
+					$token_data[$contained_data['key']] = $contained_data['value'];
+				}
+			}
+		}
+
+		if( ! isset($token_data['_wallee_subscription_space_id']) ) {
+			$order->update_status( 'failed', __( 'No space ID is found.', 'woo-wallee-subscription' ) );
+			throw new Exception('Missing space id details');
+		}
+
+		if( ! isset($token_data['_wallee_subscription_token_id']) ) {
+			$order->update_status( 'failed', __( 'No token ID is found.', 'woo-wallee-subscription' ) );
+			throw new Exception('Missing token id');
+		}
+
+		if ( get_option( WooCommerce_Wallee::WALLEE_CK_SPACE_ID ) != $token_data['_wallee_subscription_space_id'] ) {
+			$order->update_status( 'failed', __( 'The token space and the configured space are not equal.', 'woo-wallee-subscription' ) );
+			throw new Exception('Token space does not match configured space');
+		}
+
+		return $token_data;
+	}
+
 
 	/**
 	 * Update payment method.
@@ -261,7 +306,7 @@ public function validate_subscription_payment_meta( $payment_method_id, $payment
 		if ( $this->gateway->id === $payment_method_id ) {
 			if ( ! isset( $payment_meta['post_meta']['_wallee_subscription_space_id']['value'] ) || empty( $payment_meta['post_meta']['_wallee_subscription_space_id']['value'] ) ) {
 				throw new Exception( __( 'The wallee Space Id value is required.', 'woo-wallee-subscription' ) );
-			} elseif ( get_option( WooCommerce_Wallee::CK_SPACE_ID ) != $payment_meta['post_meta']['_wallee_subscription_space_id']['value'] ) {
+			} elseif ( get_option( WooCommerce_Wallee::WALLEE_CK_SPACE_ID ) != $payment_meta['post_meta']['_wallee_subscription_space_id']['value'] ) {
 				throw new Exception( __( 'The wallee Space Id needs to be in the same space as configured in the main configuration.', 'woo-wallee-subscription' ) );
 			}
 			if ( ! isset( $payment_meta['post_meta']['_wallee_subscription_token_id']['value'] ) || empty( $payment_meta['post_meta']['_wallee_subscription_token_id']['value'] ) ) {

includes/service/class-wc-wallee-subscription-service-transaction.php

@@ -33,10 +33,10 @@ class WC_Wallee_Subscription_Service_Transaction extends WC_Wallee_Service_Trans
 	 * 	 If the transaction being created is not valid.
 	 */
 	public function create_transaction_by_renewal_order( WC_Order $order, $order_total, $token_id ) {
-		$space_id = get_option( WooCommerce_Wallee::CK_SPACE_ID );
+		$space_id = get_option( WooCommerce_Wallee::WALLEE_CK_SPACE_ID );
 		$create_transaction = new \Wallee\Sdk\Model\TransactionCreate();
 		$create_transaction->setCustomersPresence( \Wallee\Sdk\Model\CustomersPresence::VIRTUAL_PRESENT );
-		$space_view_id = get_option( WooCommerce_Wallee::CK_SPACE_VIEW_ID );
+		$space_view_id = get_option( WooCommerce_Wallee::WALLEE_CK_SPACE_VIEW_ID );
 		if ( is_numeric( $space_view_id ) ) {
 			$create_transaction->setSpaceViewId( $space_view_id );
 		}

readme.txt

@@ -3,7 +3,7 @@ Contributors: customwebgmbh
 Tags: woocommerce wallee, woocommerce, wallee, payment, e-commerce, webshop, psp, subscription, recurring payment, processing
 Requires at least: 4.7
 Tested up to: 6.5.3
-Stable tag: 1.1.5
+Stable tag: 1.1.6
 License: Apache 2
 License URI: http://www.apache.org/licenses/LICENSE-2.0
 
@@ -49,9 +49,11 @@ Therefore, it is necessary that you install the this plugin as well.
 
 == Changelog ==
 
-= 1.1.5 - Jun 3 2024 =
-- [Feature] Added compatibilities with WordPress 6.5.3 and the new WooCommerce version 8.9.1
-- [Tested Against] PHP 8.0
-- [Tested Against] Wordpress 6.5.3
-- [Tested Against] WooCommerce 8.9.1
-- [Tested Against] Woo Subscriptions 5.5.0
+= 1.1.6 - Mar 6 2025 =
+- [BugFix] Fixed usage of newly introduced constants on version 3.2.0
+- [BugFix] Improved subscription handling: Optimized the processing of subscription data for better reliability and performance.
+
+- [Tested Against] PHP 8.2
+- [Tested Against] Wordpress 6.8.0
+- [Tested Against] WooCommerce 9.8.0
+- [Tested Against] Woo Subscriptions 7.2.1

woocommerce-wallee-subscription.php

@@ -3,15 +3,16 @@
  * Plugin Name: wallee Subscription
  * Plugin URI: https://wordpress.org/plugins/woo-wallee-subscription
  * Description: Addon to process WooCommerce Subscriptions with wallee
- * Version: 1.1.5
+ * Version: 1.1.6
  * License: Apache2
  * License URI: http://www.apache.org/licenses/LICENSE-2.0
  * Author: wallee AG
  * Author URI: https://www.wallee.com
  * Requires at least: 4.7
- * Tested up to: 6.5.3
- * WC requires at least: 3.0.0
- * WC tested up to: 8.9.1
+ * Tested up to: 6.7.2
+ * WC requires at least: 3.2.0
+ * WC tested up to: 9.7.0
+ * Requires Plugins: woo-wallee
  *
  * Text Domain: woo-wallee-subscription
  * Domain Path: /languages/
@@ -36,7 +37,7 @@ final class WooCommerce_Wallee_Subscription {
 		 *
 		 * @var string
 		 */
-		private $version = '1.1.5';
+		private $version = '1.1.6';
 
 		/**
 		 * The single instance of the class.