Changeset 2289186

Timestamp:

04/22/2020 11:15:53 AM (4 years ago)

Author:

LiamMcArthur

Message:

Added logic back in for auto-completing virtual orders.

Location:

autocomplete-woocommerce-orders

Files:

• tags/1.2.1/includes/class-admin.php (modified) (1 diff)
• tags/1.2.2 (added)
• tags/1.2.2/autocomplete-woocommerce-orders.php (added)
• tags/1.2.2/includes (added)
• tags/1.2.2/includes/class-aco.php (added)
• tags/1.2.2/includes/class-admin.php (added)
• tags/1.2.2/readme.txt (added)
• trunk/autocomplete-woocommerce-orders.php (modified) (1 diff)
• trunk/includes/class-admin.php (modified) (1 diff)
• trunk/readme.txt (modified) (1 diff)

autocomplete-woocommerce-orders/tags/1.2.1/includes/class-admin.php

@@ -72 +72 @@
             }
         } elseif ($mode == 'virtual') {
-            add_action( 'woocommerce_payment_complete_order_status', 'silkwave_auto_complete_paid_order', 10, 3 );
-            function silkwave_auto_complete_paid_order( $status, $order_id, $order ) {
-                return 'completed';
+            add_action( 'woocommerce_payment_complete_order_status', 'silkwave_auto_complete_virtual_paid_order', 10, 3 );
+            function silkwave_auto_complete_virtual_paid_order( $status, $order_id, $order ) {
+                $virtual_order = null;
+                if ( count( $order->get_items() ) > 0 ) {
+                    foreach ( $order->get_items() as $item ) {
+                        if ( 'line_item' == $item['type'] ) {
+                            if ( defined( 'WOOCOMMERCE_VERSION' ) && version_compare( WOOCOMMERCE_VERSION, '3.0', '<' ) ) {
+                                $_product = $order->get_product_from_item( $item );
+                            } else {
+                                $_product = $item->get_product();
+                            }
+                            if ( ! $_product->is_virtual() ) {
+                                $virtual_order = false;
+                                break;
+                            } else {
+                                $virtual_order = true;
+                            }
+                        }
+                    }
+                }
+                if ( $virtual_order ) {
+                    return 'completed';
+                }
             }
         }

autocomplete-woocommerce-orders/trunk/autocomplete-woocommerce-orders.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/autocomplete-woocommerce-orders/
  * Description: Autocomplete your WooCommerce orders with ease. This plugins works with most major payment providers including PayPal, SagePay and Stripe.
- * Version: 1.2.1
+ * Version: 1.2.
  * Author: Liam McArthur
  * Author URI: https://www.silkwave.co.uk

autocomplete-woocommerce-orders/trunk/includes/class-admin.php

@@ -72 +72 @@
             }
         } elseif ($mode == 'virtual') {
-            add_action( 'woocommerce_payment_complete_order_status', 'silkwave_auto_complete_paid_order', 10, 3 );
-            function silkwave_auto_complete_paid_order( $status, $order_id, $order ) {
-                return 'completed';
+            add_action( 'woocommerce_payment_complete_order_status', 'silkwave_auto_complete_virtual_paid_order', 10, 3 );
+            function silkwave_auto_complete_virtual_paid_order( $status, $order_id, $order ) {
+                $virtual_order = null;
+                if ( count( $order->get_items() ) > 0 ) {
+                    foreach ( $order->get_items() as $item ) {
+                        if ( 'line_item' == $item['type'] ) {
+                            if ( defined( 'WOOCOMMERCE_VERSION' ) && version_compare( WOOCOMMERCE_VERSION, '3.0', '<' ) ) {
+                                $_product = $order->get_product_from_item( $item );
+                            } else {
+                                $_product = $item->get_product();
+                            }
+                            if ( ! $_product->is_virtual() ) {
+                                $virtual_order = false;
+                                break;
+                            } else {
+                                $virtual_order = true;
+                            }
+                        }
+                    }
+                }
+                if ( $virtual_order ) {
+                    return 'completed';
+                }
             }
         }

autocomplete-woocommerce-orders/trunk/readme.txt

@@ -43 +43 @@
 == Changelog ==
 
+
+
+
 = 1.2.1 =
 * Reverted some core logic. It looks like this isn't working for some other gateways. A fix has also been pushed for Virtual orders