Add HPOS compatibility and fixes

Author: IvanPetakNeuralab

includes/core/class-rfw-payment-gateway.php

@@ -5,6 +5,8 @@
 	return;
 }
 
+use Automattic\WooCommerce\Utilities\OrderUtil;
+
 /**
  * RFW_Payment_Gateway class
  */
@@ -312,7 +314,7 @@ public function display_capture_button( $order ) {
 	 * @return  void
 	 */
 	public function process_capture( $post_id ) {
-		if ( get_post_type( $post_id ) !== 'shop_order' ) {
+		if ( 'shop_order' !== OrderUtil::get_order_type( $post_id ) ) {
 			return;
 		}
 
@@ -348,7 +350,7 @@ public function process_capture( $post_id ) {
 			}
 		}
 
-		$this->send_capture_request( $charge_id, $order );
+		$this->send_capture_request( $charge_id, $order, true );
 	}
 
 
@@ -357,15 +359,18 @@ public function process_capture( $post_id ) {
 	 *
 	 * @param   string    $charge_id  ID of the order in Resolve system, used to capture funds.
 	 * @param   WC_Order  $order      Object of the order in WooCommerce.
+	 * @param   bool      $manual     Is the capture automatically initiated or manually by webshop administrator.
 	 *
 	 * @return  void
 	 */
-	private function send_capture_request( $charge_id, $order ) {
+	private function send_capture_request( $charge_id, $order, $manual = false ) {
 		$url_format = 'https://%s:%s@%s.resolvepay.com/api/charges/%s/capture';
 
 		$merchant_id = RFW_Data::get_settings( 'webshop-merchant-id', true );
 		$api_key     = RFW_Data::get_settings( 'webshop-api-key', true );
 
+		$captured_order_status = RFW_Data::get_captured_status();
+
 		$mode = RFW_Data::test_mode() ? 'app-sandbox' : 'app';
 		$url  = sprintf( $url_format, $merchant_id, $api_key, $mode, $charge_id );
 		$args = [
@@ -394,7 +399,9 @@ private function send_capture_request( $charge_id, $order ) {
 				} else {
 					do_action( 'rfw_order_payment_captured', $order );
 					// translators: charge ID.
-					$order->set_status( apply_filters( 'rfw_payment_captured_order_status', 'processing' ), sprintf( __( 'The payment was successfully captured! Resolve ID: %s.', 'resolve' ), '<b>' . $body['number'] . '</b>' ) );
+					$order->set_status( $captured_order_status, sprintf( __( 'The payment was successfully captured! Resolve ID: %s.', 'resolve' ), '<b>' . $body['number'] . '</b>' ), $manual );
+					// Prevent post status update overriding order status with value submited in form.
+					$_POST['order_status'] = 'wc-' . $captured_order_status;
 
 					$order->payment_complete( $body['number'] );
 					$order->add_meta_data( 'rfw_payment_captured', 'yes', true );

includes/utilities/class-rfw-data.php

@@ -243,4 +243,25 @@ public static function get_customer_data( $order ) {
 	public static function display_modal_link( $label = null ) {
 		return '<a href="#" id="rfw-apply">' . ( $label ?: __( 'Learn more', 'resolve' ) ) . '</a>';
 	}
+
+	/**
+	 * Allows changes to default capture status but double check if they are valid.
+	 *
+	 * @param   bool   $prefix  To return status with WC prefix or without.
+	 *
+	 * @return  string          Captured order status.
+	 */
+	public static function get_captured_status( $prefix = false ) {
+		$captured_order_status = apply_filters( 'rfw_payment_captured_order_status', 'processing' );
+		if ( 'processing' !== $captured_order_status ) {
+			$order_statuses = wc_get_order_statuses();
+
+			if ( ! isset( $order_statuses[ 'wc-' . $captured_order_status ] ) ) {
+				RFW_Logger::log( 'Custom order status: "' . $captured_order_status . '" is not a valid WC Order status, default capture status will be used (Processing).', 'warning' );
+				$captured_order_status = 'processing';
+			}
+		}
+
+		return $prefix ? 'wc-' . $captured_order_status : $captured_order_status;
+	}
 }

resolve-for-woocommerce.php

@@ -51,6 +51,21 @@ function rfw_admin_notice_missing_woocommerce() {
 	return;
 }
 
+/**
+ * Declare Resolve plugin compatible with HPOS.
+ *
+ * @return  void
+ */
+function rfw_hpos_compatible() {
+	if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
+		\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+	}
+}
+add_action( 'before_woocommerce_init', 'rfw_hpos_compatible' );
+
+/**
+ * RFW_Main class
+ */
 if ( ! class_exists( 'RFW_Main' ) ) {
 	class RFW_Main {