Changeset 3226449

Timestamp:

01/21/2025 06:26:46 PM (13 months ago)

Author:

routedev

Message:

display route fee correctly in woo dashboard

Location:

routeapp/trunk

Files:

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

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

@@ -802 +802 @@
                     $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 );
+                    $fees = $order->get_items('fee');
+                    if (!empty($fees)) {
+                        foreach ($fees 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);
+                                }
                             }
                         }
+                    } else {
+                        try {
+                            // Check if WC()->cart exists and is accessible
+                            if (class_exists('WC_Cart') && isset(WC()->cart) && WC()->cart instanceof WC_Cart) {
+                                // Fallback to WC()->cart->get_fees() if no fees are present in the order
+                                $cart_fees = WC()->cart->get_fees();
+                                if (!empty($cart_fees)) {
+                                    foreach ($cart_fees as $cart_fee) {
+                                        if ($cart_fee->name === $this->routeapp_get_insurance_label()) {
+                                            $insurance_selected = true;
+                                            $insurance_amount = $cart_fee->amount; // Correct method for cart fee 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);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } catch (Exception $e) {
+                            // Log the exception and ensure the application flow continues
+                            error_log("An error occurred while processing cart fees: " . $e->getMessage());
+                        }
+
                     }
-                    
+
                     if ( class_exists('Automattic\WooCommerce\Utilities\OrderUtil')
                         && OrderUtil::custom_orders_table_usage_is_enabled() ) {

routeapp/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 4.0
 Tested up to: 6.7.1
-Stable tag: 2.2.22
+Stable tag: 2.2.23
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -106 +106 @@
 
 == Changelog ==
+= 2.2.23 =
+* Display correctly route fee amount in orders admin view
+
 = 2.2.22 =
 * Fix problem for astracker shipment tracking compatibility 

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