2.2.21

changelog.txt

@@ -1,5 +1,19 @@
 *** WooCommerce Subscriptions Changelog ***
 
+2018.05.29 - version 2.2.21
+* Tweak: Update WooCommerce tested up to compatibility flag.
+* Fix: [GDPR] While processing erasure requests anonymise all user subscriptions with any status. PR#2720
+* Fix: Fix PHP warnings which appear on the WooCommerce > Settings > Accounts & Privacy page and while exporting user personal data. PR#2719
+
+2018.05.25 - version 2.2.20
+* New: [GDPR] Export and erase subscription personal data when processing user export and erasure requests. PR#2692
+* New: [GDPR] Add an automatic data removal system for ended subscriptions and their related orders. PR#2702
+* New: [GDPR] Add details about the personal data the plugin collects to the privacy policy guide. PR#2700
+* Tweak: Reorder wcs_get_subscriptions_for_order logic to be more performance friendly. PR#2697
+* Tweak: Replace remote image sources with an internal asset. PR#2690
+* Fix: [WC3.4] Prevent subscription related orders from being trashed/anonymised by WC's automatic clean up system. PR#2698
+* Fix: [WC3.4] Only trigger the woocommerce_before_add_to_cart_button action hook once on variable subscription single product pages. PR#2706
+
 2018.04.04 - version 2.2.19
 * Fix: With Mixed Checkout disabled, only remove the add to cart notice when redirected straight to checkout. Fixes issue where error notices are removed incorrectly. PR#2541
 * Fix: With Mixed Checkout disabled, only empty cart when the variation ID is the same but with different attributes. PR#2540

includes/admin/class-wc-subscriptions-admin.php

@@ -1724,6 +1724,36 @@ class WC_Subscriptions_Admin {
 		);
 	}
 
+	/**
+	 * Insert a setting or an array of settings after another specific setting by its ID.
+	 *
+	 * @since 2.2.20
+	 * @param array  $settings                The original list of settings.
+	 * @param string $insert_after_setting_id The setting id to insert the new setting after.
+	 * @param array  $new_setting             The new setting to insert. Can be a single setting or an array of settings.
+	 * @param string $insert_type             The type of insert to perform. Can be 'single_setting' or 'multiple_settings'. Optional. Defaults to a single setting insert.
+	 */
+	public static function insert_setting_after( &$settings, $insert_after_setting_id, $new_setting, $insert_type = 'single_setting' ) {
+		if ( ! is_array( $settings ) ) {
+			return;
+		}
+
+		$original_settings = $settings;
+		$settings          = array();
+
+		foreach ( $original_settings as $setting ) {
+			$settings[] = $setting;
+
+			if ( isset( $setting['id'] ) && $insert_after_setting_id === $setting['id'] ) {
+				if ( 'single_setting' === $insert_type ) {
+					$settings[] = $new_setting;
+				} else {
+					$settings = array_merge( $settings, $new_setting );
+				}
+			}
+		}
+	}
+
 	/**
 	 * Outputs the contents of the "Renewal Orders" meta box.
 	 *

includes/class-wc-subscriptions-order.php

@@ -74,6 +74,8 @@ class WC_Subscriptions_Order {
 
 		// Autocomplete subscription orders when they only contain a synchronised subscription or a resubscribe
 		add_filter( 'woocommerce_payment_complete_order_status', __CLASS__ . '::maybe_autocomplete_order', 10, 2 );
+
+		add_filter( 'woocommerce_order_data_store_cpt_get_orders_query', array( __CLASS__, 'add_subscription_order_query_args' ), 10, 2 );
 	}
 
 	/*
@@ -1083,6 +1085,70 @@ class WC_Subscriptions_Order {
 		return $new_order_status;
 	}
 
+	/**
+	 * Map subscription related order arguments passed to @see wc_get_orders() to WP_Query args.
+	 *
+	 * @since 2.2.20
+	 * @param  array $query WP_Query arguments.
+	 * @param  array $args  @see wc_get_orders() arguments.
+	 * @return array The WP_Query query arguments.
+	 */
+	public static function add_subscription_order_query_args( $query, $args ) {
+		$order_type_meta_key_map = array(
+			'subscription_renewal'     => '_subscription_renewal',
+			'subscription_switch'      => '_subscription_switch',
+			'subscription_resubscribe' => '_subscription_resubscribe',
+		);
+
+		// Add meta query args when querying by subscription related orders.
+		foreach ( $order_type_meta_key_map as $order_type => $meta_key ) {
+			if ( ! isset( $args[ $order_type ] ) ) {
+				continue;
+			}
+
+			$value      = $args[ $order_type ];
+			$meta_query = array(
+				'key'     => $meta_key,
+				'value'   => $value,
+			);
+
+			// Map the value type to the appropriate compare arg.
+			if ( empty( $value ) ) {
+				$meta_query['compare'] = 'NOT EXISTS';
+				unset( $meta_query['value'] );
+			} elseif ( true === $value ) {
+				$meta_query['compare'] = 'EXISTS';
+				unset( $meta_query['value'] );
+			} elseif ( is_array( $value ) ) {
+				$meta_query['compare'] = 'IN';
+			} else {
+				$meta_query['compare'] = '=';
+			}
+
+			$query['meta_query'][] = $meta_query;
+		}
+
+		// Add query args when querying by subscription parent orders.
+		if ( isset( $args['subscription_parent'] ) ) {
+			$value = $args['subscription_parent'];
+
+			// Map the value type to post_in/post__not_in arg
+			if ( empty( $value ) ) {
+				$query['post__not_in'] = array_values( wcs_get_subscription_orders() );
+			} elseif ( true === $value ) {
+				$query['post__in']     = array_values( wcs_get_subscription_orders() );
+			} elseif ( is_array( $value ) ) {
+				$query['post__in']     = array_keys( array_flip( array_filter( array_map( 'wp_get_post_parent_id', $value ) ) ) );
+			} else {
+				if ( $parent = wp_get_post_parent_id( $value ) ) {
+					$query['post__in'] = array( $parent );
+				}
+			}
+		}
+
+		return $query;
+	}
+
 	/* Deprecated Functions */
 
 	/**