Revert order wrapper class (#4298)

* Revert "Implementing the order wrapper class in the new checkout (#4111)"

This reverts commit 154f4df.

* Revert "Implementing the order wrapper class in the root files (#4112)"

This reverts commit f6cb1de.

* Revert "Implementing the order wrapper class in compatibility classes (#4109)"

This reverts commit 91167e3.

* Revert "Implementing the order wrapper class in abstract classes and webhook handler (#4106)"

This reverts commit 6e3fa25.

* Revert "Implementing the order wrapper class in legacy checkout methods (#4107)"

This reverts commit 7b74182.

* Revert "Implementing the order wrapper class in express payment methods (#4110)"

This reverts commit 893842d.

* Revert "Implementing the order wrapper class in admin classes (#4108)"

This reverts commit 3eda8c6.

* Revert "Fix fatal error in subscription payment method switch in legacy checkout (#4222)"

This reverts commit 0e90669.

* Revert "Implementing the Stripe order class in unit tests (#4086)"

This reverts commit 391719d.

* Revert "Fix fatal error in subscription payment method switch (#4205)"

This reverts commit 6aa4c89.

* Remove remaining calls to to_instance

---------

Co-authored-by: daledupreez <[email protected]>

Author: annemirasol

changelog.txt

@@ -6,14 +6,11 @@
 * Dev - Renames all references to "Smart Checkout" and "Single Payment Element" (and "SPE") to "Optimized Checkout" (and "OC"), following the feature rebranding.
 * Tweak - Updates the "Smart Checkout" setting name to "Optimized Checkout", and the description accordingly.
 * Fix - Checks for the existence of the WC_Stripe_Feature_Flags class before including it during extension initialization.
-* Dev - Implements the new Stripe order class into the new checkout experience files.
 * Dev - Splits the code coverage GitHub Actions Workflow into two separate actions.
-* Dev - Implements the new Stripe order class into the root extension files.
 * Fix - Fixes the listing of payment methods in the Stripe settings page when the Smart Checkout is enabled.
 * Tweak - Passes the correct parent payment method configuration ID (retrieved from the backend) to the Smart Checkout payment element.
 * Tweak - Removes the Stripe icon beside the Smart Checkout payment element from the checkout pages.
 * Add - New setting to allow merchants to set their preferred title for the Smart Checkout payment element. Defaults to "Stripe".
-* Dev - Implements the new Stripe order class into the compatibility classes.
 * Dev - Updates the Code Sniffer package to version 1.0.0.
 * Update - Add ECE support for One Page Checkout and other dynamic cart update scenarios
 * Fix - Show error notice when 'Add payment method' fails on My Account page in block-based themes.
@@ -38,17 +35,12 @@
 * Dev - Improves Smart Checkout code with shared and new methods, on both front and backend.
 * Fix - Fixes the saving of payment methods when Smart Checkout is enabled.
 * Tweak - Correctly handles the display of payment method instructions when Smart Checkout is enabled.
-* Dev - Implements the new Stripe order class into abstract/base classes, and the webhook handler.
-* Dev - Implements the new Stripe order class into the legacy checkout classes.
 * Dev - Do not generate filenames with underscores.
 * Fix - Fixes the Stripe checkout container visuals when Smart Checkout is disabled.
-* Dev - Implements the new Stripe order class into the express checkout classes.
-* Dev - Implements the new Stripe order class into the wp-admin related classes.
 * Dev - Replaces references to order status values with their respective constants from the WooCommerce plugin.
 * Tweak - Updates the Smart Checkout (classic/shortcode checkout version) to make all the payment methods look as similar as possible to any other WooCommerce payment method.
 * Tweak - Updates the Smart Checkout (block checkout version) to make all the payment methods look as similar as possible to any other WooCommerce payment method.
 * Fix - Improves the subscriptions detached admin notice, making it less intrusive and limiting the querying to 5 subscriptions (avoiding slow loading times).
-* Dev - Implements the new Stripe order class into the PHP unit tests.
 * Dev - Introduces new payment method constants for the express methods: Google Pay, Apple Pay, Link, and Amazon Pay (backend version).
 * Dev - Introduces a new Stripe Order class to wrap Stripe-specific logic and data on the backend.
 * Dev - Improves how we handle express payment method titles by introducing new constants and methods to replace duplicate code.
@@ -89,8 +81,6 @@
 * Add - Support for BECS Direct Debit as a new payment method for Australian accounts.
 * Update - Back button on the settings pages.
 * Update - Use individual product tax status instead of storewide tax setup when determining express checkout availability.
-* Fix - Ensure the subscription object is not converted into a Stripe order object.
-* Fix - Ensure the subscription and pre-order objects are not converted into a Stripe order object in legacy experience.
 * Update - Credit and Bank (BECS and ACSS) icons on the Block checkout page.
 * Fix - Fix BLIK visibility based on account and billing countries.
 * Add - Use Stripe Configuration API to manage payment methods enabled/disabled states.

includes/abstracts/abstract-wc-stripe-payment-gateway-voucher.php

@@ -227,7 +227,7 @@ public function javascript_params() {
 
 		if ( $this->is_valid_pay_for_order_endpoint() ) {
 			$order_id                          = absint( get_query_var( 'order-pay' ) );
-			$stripe_params['stripe_order_key'] = ! empty( $order_id ) ? WC_Stripe_Order::get_by_id( $order_id )->get_order_key() : null;
+			$stripe_params['stripe_order_key'] = ! empty( $order_id ) ? wc_get_order( $order_id )->get_order_key() : null;
 		}
 
 		return $stripe_params;
@@ -256,19 +256,19 @@ public function init_form_fields() {
 	 */
 	public function process_payment( $order_id, $retry = true, $force_save_save = false ) {
 		try {
-			$order = WC_Stripe_Order::get_by_id( $order_id );
+			$order = wc_get_order( $order_id );
 
 			if ( ! in_array( $order->get_billing_country(), $this->supported_countries ) ) {
 				throw new \Exception( __( 'This payment method is not available in the selected country', 'woocommerce-gateway-stripe' ) );
 			}
 
 			$intent = $this->create_or_update_payment_intent( $order );
 
-			$order->set_upe_payment_type( $this->stripe_id );
+			$order->update_meta_data( '_stripe_upe_payment_type', $this->stripe_id );
 			$order->update_status( OrderStatus::PENDING, __( 'Awaiting payment.', 'woocommerce-gateway-stripe' ) );
 			$order->save();
 
-			$order->add_payment_intent_to_order( $intent->id );
+			WC_Stripe_Helper::add_payment_intent_to_order( $intent->id, $order );
 
 			return [
 				'result'               => 'success',
@@ -375,7 +375,7 @@ public function update_payment_intent_ajax() {
 				throw new \Exception( __( 'Order Id not found, send an order id', 'woocommerce-gateway-stripe' ) );
 			}
 
-			$order = WC_Stripe_Order::get_by_id( $order_id );
+			$order = wc_get_order( $order_id );
 
 			$order_key = isset( $_POST['stripe_order_key'] ) ? wc_clean( wp_unslash( $_POST['stripe_order_key'] ) ) : null;
 			if ( $order->get_order_key() !== $order_key ) {
@@ -386,7 +386,7 @@ public function update_payment_intent_ajax() {
 			$intent = $this->create_or_update_payment_intent( $order );
 
 			$order->update_status( OrderStatus::PENDING, __( 'Awaiting payment.', 'woocommerce-gateway-stripe' ) );
-			$order->set_upe_payment_type( $this->stripe_id );
+			$order->update_meta_data( '_stripe_upe_payment_type', $this->stripe_id );
 			$order->save();
 
 			wp_send_json(