Changeset 3452273

Timestamp:

02/02/2026 05:08:18 PM (3 weeks ago)

Author:

routedev

Message:

Fix local pickup flag resolution and prevent false positives

Location:

routeapp/trunk

Files:

• public/class-routeapp-public.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• routeapp.php (modified) (2 diffs)

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

@@ -952 +952 @@
 
         //MSS-6533: Add local pickup flag and excluded shipping methods meta data to the order
-        $updated |= $this->updateRouteOrderMetaData( $order, $is_hpos, '_routeapp_order_local_pickup',
-            !$this->routeapp_is_shipping_method_allowed(false, $order) ? 1 : 0);
+        $updated |= $this->updateRouteOrderMetaData( $order, $is_hpos,'_routeapp_order_local_pickup', $this->routeapp_resolve_local_pickup_flag( $order ) );
         $updated |= $this->updateRouteOrderMetaData( $order, $is_hpos, '_routeapp_excluded_shipping_methods', $this->routeapp_get_excluded_shipping_methods());
 
@@ -1776 +1775 @@
     }
 
+    //MSS-6533
+    /**
+     * Resolve the local pickup flag in a FAIL-SAFE way.
+     *
+     * Priority:
+     * 1. Order shipping items
+     * 3. Checkout session (fallback only)
+     *
+     * @param WC_Order|null $order
+     *
+     * @return int 1 = local pickup, 0 = not local pickup
+     */
+    public function routeapp_resolve_local_pickup_flag( WC_Order $order = null): int {
+        $excluded_methods = $this->routeapp_get_excluded_shipping_methods();
+        if ( empty( $excluded_methods ) || ! is_array( $excluded_methods ) ) {
+            return 0;
+        }
+
+        // Order-based (most reliable).
+        if ( $order instanceof WC_Order ) {
+            $shipping_items = $order->get_shipping_methods();
+            if ( ! empty( $shipping_items ) ) {
+                foreach ( $shipping_items as $shipping_item ) {
+                    if ( ! $shipping_item instanceof WC_Order_Item_Shipping ) {
+                        continue;
+                    }
+                    $method_id = $shipping_item->get_method_id();
+                    if ( empty( $method_id ) ) {
+                        continue;
+                    }
+                    $method_id = explode( ':', $method_id )[0];
+                    if ( in_array( $method_id, $excluded_methods, true ) ) {
+                        return 1;
+                    }
+                }
+                return 0;
+            }
+        }
+
+        // Session fallback (checkout only).
+        if ( ! function_exists( 'WC' ) || ! WC()->session ) {
+            return 0;
+        }
+        $chosen = WC()->session->get( 'chosen_shipping_methods' );
+        $packages = WC()->session->get( 'shipping_for_package_0' );
+        if ( empty( $chosen[0] ) || empty( $packages['rates'] ) ) {
+            return 0;
+        }
+        $chosen_id = $chosen[0];
+        if ( ! isset( $packages['rates'][ $chosen_id ] ) ) {
+            return 0;
+        }
+        $method_id = explode( ':', $packages['rates'][ $chosen_id ]->id )[0];
+        if ( in_array( $method_id, $excluded_methods, true ) ) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+
 }
 

routeapp/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 4.0
 Tested up to: 6.7.1
-Stable tag: 2.2.35
+Stable tag: 2.2.36
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -106 +106 @@
 
 == Changelog ==
+
+= 2.2.36 =
+* Fix local pickup flag resolution and prevent false positives
 
 = 2.2.35 =

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.35
+ * Version:           2.2.36
  * Author:            Route
  * Author URI:        https://route.com/
@@ -26 +26 @@
  * Currently plugin version.
  */
-define( 'ROUTEAPP_VERSION', '2.2.35' );
+define( 'ROUTEAPP_VERSION', '2.2.36' );
 
 /**