Adjustments for Custom Order Tables compatibility (#2420)

asumaran · web-flow · commit 28399f6f983a · 2022-09-12T12:53:50.000-05:00
* Fixes math operation on empty string

`wc_parse_relative_date_option` will return an array. For that reason, it will cause to skip the validation because it will never be empty.

Later below, `$retention[‘number’]` is attempted unsuccessfully because `$retention[‘number’]` will be an empty string when the “Retain Stripe Data” option is not defined, causing an error and stopping the data removal.

* User Order method to update meta data

* Remove unused method

* Get order meta by using the `get_meta` method

* Add changelog entries

* Tweaks `get_order_by_source_id` to be compatible with Custom Order Tables

Avoids using the `wp_posts` table to get the order ID, instead uses the `wc_get_orders` which is compatible with COT.

* Tweaks `get_order_by_charge_id` to be compatible with Custom Order Tables

* Tweaks `get_order_by_intent_id` to be compatible with Custom Order Tables

* Tweaks `get_order_by_setup_intent_id` to be compatible with Custom Order Tables

* Remove unused method `delete_attribute`

* Check OrderUtil class exists before using it

* Use full path for class existence validation

* Check if current order exist
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 6.8.0 - 2022-xx-xx =
+* Fix - Minor adjustments for Custom Order Tables compatibility.
 
 = 6.7.0 - 2022-09-06 =
 * Fix - Check payment method before updating payment method title.
diff --git a/includes/admin/class-wc-stripe-privacy.php b/includes/admin/class-wc-stripe-privacy.php
@@ -405,7 +405,7 @@ public function is_retention_expired( $created_date ) {
 		$retention  = wc_parse_relative_date_option( get_option( 'woocommerce_gateway_stripe_retention' ) );
 		$is_expired = false;
 		$time_span  = time() - strtotime( $created_date );
-		if ( empty( $retention ) || empty( $created_date ) ) {
+		if ( empty( $retention['number'] ) || empty( $created_date ) ) {
 			return false;
 		}
 		switch ( $retention['unit'] ) {
diff --git a/includes/class-wc-stripe-helper.php b/includes/class-wc-stripe-helper.php
@@ -3,6 +3,8 @@
 	exit;
 }
 
+use Automattic\WooCommerce\Utilities\OrderUtil;
+
 /**
  * Provides static methods as helpers.
  *
@@ -373,7 +375,20 @@ public static function get_webhook_url() {
 	public static function get_order_by_source_id( $source_id ) {
 		global $wpdb;
 
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $source_id, '_stripe_source_id' ) );
+		if ( class_exists( 'Automattic\WooCommerce\Utilities\OrderUtil' ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
+			$orders   = wc_get_orders(
+				[
+					'limit'      => 1,
+					'meta_query' => [
+						'key'   => '_stripe_source_id',
+						'value' => $source_id,
+					],
+				]
+			);
+			$order_id = current( $orders ) ? current( $orders )->get_id() : false;
+		} else {
+			$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $source_id, '_stripe_source_id' ) );
+		}
 
 		if ( ! empty( $order_id ) ) {
 			return wc_get_order( $order_id );
@@ -396,7 +411,17 @@ public static function get_order_by_charge_id( $charge_id ) {
 			return false;
 		}
 
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $charge_id, '_transaction_id' ) );
+		if ( class_exists( 'Automattic\WooCommerce\Utilities\OrderUtil' ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
+			$orders   = wc_get_orders(
+				[
+					'transaction_id' => $charge_id,
+					'limit'          => 1,
+				]
+			);
+			$order_id = current( $orders ) ? current( $orders )->get_id() : false;
+		} else {
+			$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $charge_id, '_transaction_id' ) );
+		}
 
 		if ( ! empty( $order_id ) ) {
 			return wc_get_order( $order_id );
@@ -415,7 +440,20 @@ public static function get_order_by_charge_id( $charge_id ) {
 	public static function get_order_by_intent_id( $intent_id ) {
 		global $wpdb;
 
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_intent_id' ) );
+		if ( class_exists( 'Automattic\WooCommerce\Utilities\OrderUtil' ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
+			$orders   = wc_get_orders(
+				[
+					'limit'      => 1,
+					'meta_query' => [
+						'key'   => '_stripe_intent_id',
+						'value' => $intent_id,
+					],
+				]
+			);
+			$order_id = current( $orders ) ? current( $orders )->get_id() : false;
+		} else {
+			$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_intent_id' ) );
+		}
 
 		if ( ! empty( $order_id ) ) {
 			return wc_get_order( $order_id );
@@ -434,7 +472,20 @@ public static function get_order_by_intent_id( $intent_id ) {
 	public static function get_order_by_setup_intent_id( $intent_id ) {
 		global $wpdb;
 
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_setup_intent' ) );
+		if ( class_exists( 'Automattic\WooCommerce\Utilities\OrderUtil' ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
+			$orders   = wc_get_orders(
+				[
+					'limit'      => 1,
+					'meta_query' => [
+						'key'   => '_stripe_setup_intent',
+						'value' => $intent_id,
+					],
+				]
+			);
+			$order_id = current( $orders ) ? current( $orders )->get_id() : false;
+		} else {
+			$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_setup_intent' ) );
+		}
 
 		if ( ! empty( $order_id ) ) {
 			return wc_get_order( $order_id );
diff --git a/includes/payment-methods/class-wc-gateway-stripe-multibanco.php b/includes/payment-methods/class-wc-gateway-stripe-multibanco.php
@@ -226,7 +226,7 @@ public function email_instructions( $order, $sent_to_admin, $plain_text = false
 		if ( ! $sent_to_admin && 'stripe_multibanco' === $payment_method && $order->has_status( 'on-hold' ) ) {
 			WC_Stripe_Logger::log( 'Sending multibanco email for order #' . $order_id );
 
-			$this->get_instructions( $order_id, $plain_text );
+			$this->get_instructions( $order, $plain_text );
 		}
 	}
 
@@ -235,10 +235,14 @@ public function email_instructions( $order, $sent_to_admin, $plain_text = false
 	 *
 	 * @since 4.1.0
 	 * @version 4.1.0
-	 * @param int $order_id
+	 * @param int|WC_Order $order
 	 */
-	public function get_instructions( $order_id, $plain_text = false ) {
-		$data = get_post_meta( $order_id, '_stripe_multibanco', true );
+	public function get_instructions( $order, $plain_text = false ) {
+		if ( true === is_int( $order ) ) {
+			$order = wc_get_order( $order );
+		}
+
+		$data = $order->get_meta( '_stripe_multibanco' );
 
 		if ( $plain_text ) {
 			esc_html_e( 'MULTIBANCO INFORMAÇÕES DE ENCOMENDA:', 'woocommerce-gateway-stripe' ) . "\n\n";
@@ -289,7 +293,7 @@ public function save_instructions( $order, $source_object ) {
 
 		$order_id = $order->get_id();
 
-		update_post_meta( $order_id, '_stripe_multibanco', $data );
+		$order->update_meta_data( '_stripe_multibanco', $data );
 	}
 
 	/**
diff --git a/readme.txt b/readme.txt
@@ -129,5 +129,6 @@ If you get stuck, you can ask for help in the Plugin Forum.
 == Changelog ==
 
 = 6.8.0 - 2022-xx-xx =
+* Fix - Minor adjustments for Custom Order Tables compatibility.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).
diff --git a/tests/phpunit/helpers/class-wc-helper-product.php b/tests/phpunit/helpers/class-wc-helper-product.php
@@ -345,23 +345,6 @@ public static function create_attribute( $raw_name = 'size', $terms = [ 'small'
 		return $return;
 	}
 
-	/**
-	 * Delete an attribute.
-	 *
-	 * @param int $attribute_id ID to delete.
-	 *
-	 * @since 2.3
-	 */
-	public static function delete_attribute( $attribute_id ) {
-		global $wpdb;
-
-		$attribute_id = absint( $attribute_id );
-
-		$wpdb->query(
-			$wpdb->prepare( "DELETE FROM {$wpdb->prefix}woocommerce_attribute_taxonomies WHERE attribute_id = %d", $attribute_id )
-		);
-	}
-
 	/**
 	 * Creates a new product review on a specific product.
 	 *
@@ -383,14 +366,4 @@ public static function create_product_review( $product_id, $review_content = 'Re
 		];
 		return wp_insert_comment( $data );
 	}
-
-	/**
-	 * A helper function for hooking into save_post during the test_product_meta_save_post test.
-	 * @since 3.0.1
-	 *
-	 * @param int $id ID to update.
-	 */
-	public static function save_post_test_update_meta_data_direct( $id ) {
-		update_post_meta( $id, '_test2', 'world' );
-	}
 }

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ public function is_retention_expired( $created_date ) {`
`405`	`405`	`$retention = wc_parse_relative_date_option( get_option( 'woocommerce_gateway_stripe_retention' ) );`
`406`	`406`	`$is_expired = false;`
`407`	`407`	`$time_span = time() - strtotime( $created_date );`
`408`		`- if ( empty( $retention ) \|\| empty( $created_date ) ) {`
	`408`	`+ if ( empty( $retention['number'] ) \|\| empty( $created_date ) ) {`
`409`	`409`	`return false;`
`410`	`410`	`}`
`411`	`411`	`switch ( $retention['unit'] ) {`