Changeset 3142452

Timestamp:

08/27/2024 06:19:37 PM (18 months ago)

Author:

routedev

Message:

add new woocommerce column hooks

Location:

routeapp/trunk

Files:

• admin/class-routeapp-order-recover.php (modified) (1 diff)
• includes/class-routeapp-woocommerce.php (modified) (3 diffs)
• public/class-routeapp-public.php (modified) (1 diff)
• public/js/routeapp-order-sync.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• routeapp.php (modified) (2 diffs)

routeapp/trunk/admin/class-routeapp-order-recover.php

@@ -103 +103 @@
           'limit' => $batchSize,
           'offset' => $offset,
+          'date_created' => '>=' . $recoverFrom,
           'date_created' => '<=' . $recoverTo,
-          'date_created' => '>=' . $recoverFrom,
         ];
 

routeapp/trunk/includes/class-routeapp-woocommerce.php

@@ -22 +22 @@
    public function init() {
 
-      if ($this->routeapp_route_enabled_extra_columns()) {
-         add_filter( 'manage_edit-shop_order_columns', array( $this, 'routeapp_add_order_route_columns_header' ), 20 );
-         add_action( 'manage_shop_order_posts_custom_column',  array( $this, 'routeapp_manage_route_charge_posts_custom_column' ) );
-         add_action( 'restrict_manage_posts', array( $this, 'routeapp_display_admin_shop_order_route_protection_filter' ) );
-         add_action( 'pre_get_posts', array( $this, 'routeapp_process_admin_shop_order_route_protection' ) );
-      }
-   }
+        if ($this->routeapp_route_enabled_extra_columns()) {
+            add_filter( 'manage_edit-shop_order_columns', array( $this, 'routeapp_add_order_route_columns_header' ), 20 );
+            add_action( 'manage_shop_order_posts_custom_column',  array( $this, 'routeapp_manage_route_charge_posts_custom_column' ) , 99, 2 );
+            add_action( 'restrict_manage_posts', array( $this, 'routeapp_display_admin_shop_order_route_protection_filter' ) , 99 );
+            add_action( 'pre_get_posts', array( $this, 'routeapp_process_admin_shop_order_route_protection' ) , 99 );
+
+            add_action( 'manage_woocommerce_page_wc-orders_custom_column',  array( $this, 'routeapp_manage_route_charge_posts_custom_column' ) , 99, 2 );
+            add_action( 'manage_shop_order_custom_column',  array( $this, 'routeapp_manage_route_charge_posts_custom_column' ) , 99, 2 );
+
+            add_filter( 'manage_woocommerce_page_wc-orders_columns', array( $this, 'routeapp_add_order_route_columns_header' ), 20 );
+
+        }
+    }
 
     /**
@@ -56 +62 @@
     * @return void
     */
-   public function routeapp_manage_route_charge_posts_custom_column( $column ) {
-      global $post;
-      $order = wc_get_order( $post->ID );
+    public function routeapp_manage_route_charge_posts_custom_column( $column,  $orderParam ) {
+        global $post;
 
-      if (  $column === 'route_charge' ) {
-         echo wc_price( $this->routeapp_get_route_charge_fee( $order ), array( 'currency' => $order->get_currency() ) );
-      } else if ( $column === 'route_protection' ) {         
-         echo $this->routeapp_order_has_route_protection_fee( $order ) ? "Yes" : "No";
-      }
-   }
+        // Check if $orderParam is set and not null
+        if ( isset( $orderParam ) && ! is_null( $orderParam ) ) {
+            $order = $orderParam; // Get the order using $orderParam if it's valid
+        } else {
+            $order = wc_get_order( $post->ID ); // Fallback to global $post if $orderParam is not set
+        }
+
+        if (  $column === 'route_charge' ) {
+            echo wc_price( $this->routeapp_get_route_charge_fee( $order ), array( 'currency' => $order->get_currency() ) );
+        } else if ( $column === 'route_protection' ) {
+            echo $this->routeapp_order_has_route_protection_fee( $order ) ? "Yes" : "No";
+        }
+    }
 
     /**
@@ -101 +113 @@
     */
    public function routeapp_order_has_route_protection_fee( $order ) {
-      $route_protection = get_post_meta($order->get_id(), '_routeapp_route_protection', true);
+       $route_protection = "0";
+       if ( class_exists('Automattic\WooCommerce\Utilities\OrderUtil')
+         && OrderUtil::custom_orders_table_usage_is_enabled() ) {
+           // HPOS usage is enabled.
+           $route_protection = $order->get_meta('_routeapp_route_protection');
+       } else {
+           // Traditional CPT-based orders are in use.
+           $route_protection = get_post_meta($order->get_id(), '_routeapp_route_protection', true);
+       }
+       
       return $route_protection === "1";
    }

routeapp/trunk/public/class-routeapp-public.php

@@ -777 +777 @@
                     $acceptedCanceledStatuses = get_option('routeapp_cancel_order_statuses') ? get_option('routeapp_cancel_order_statuses') : [];
 
+
+                    foreach ($order->get_items('fee') as $fee) {
+                        if ($fee->get_name() === $this->routeapp_get_insurance_label()) {
+                            $insurance_selected = true;
+                            $insurance_amount = $fee->get_amount();
+                            if ( class_exists('Automattic\WooCommerce\Utilities\OrderUtil')
+                              && OrderUtil::custom_orders_table_usage_is_enabled() ) {
+                                // HPOS usage is enabled.
+                                $order->update_meta_data('_routeapp_route_charge', $insurance_amount );
+                                $order->update_meta_data('_routeapp_route_protection', $insurance_selected);
+                                $order->save();
+                            } else {
+                                // Traditional CPT-based orders are in use.
+                                update_post_meta( $order->get_id(), '_routeapp_route_charge', $insurance_amount );
+                                update_post_meta( $order->get_id(), '_routeapp_route_protection', $insurance_selected );
+                            }
+                        }
+                    }
+                    
                     if ( class_exists('Automattic\WooCommerce\Utilities\OrderUtil')
                         && OrderUtil::custom_orders_table_usage_is_enabled() ) {

routeapp/trunk/public/js/routeapp-order-sync.js

@@ -80 +80 @@
                         recoverTo = response.data.recoverTo;
                         waitTime = response.data.waitTime;
-
+                        processedCount = 0;
+                        offset = 0;
+                        
                         $('#message').html('<p> Orders processed: ' + totalOrders + '/' + processedCount + '</p>');
 

routeapp/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 4.0
 Tested up to: 6.4.1
-Stable tag: 2.2.18
+Stable tag: 2.2.20
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -106 +106 @@
 
 == Changelog ==
+= 2.2.20 =
+* Fix route information columns, display correct information
+
+= 2.2.19 =
+* Minor update on code format
+
 = 2.2.18 =
 * Update shipping tracking status for shipping providers

routeapp/trunk/routeapp.php

@@ -10 +10 @@
  * Plugin URI:        https://route.com/for-merchants/
  * Description:       Route allows shoppers to insure their orders with one-click during checkout, adding a layer of 3rd party trust while improving the customer shopping experience.
- * Version:           2.2.18
+ * Version:           2.2.20
  * Author:            Route
  * Author URI:        https://route.com/
@@ -26 +26 @@
  * Currently plugin version.
  */
-define( 'ROUTEAPP_VERSION', '2.2.18' );
+define( 'ROUTEAPP_VERSION', '2.2.20' );
 
 /**