Changeset 3282503

Timestamp:

04/26/2025 06:30:59 PM (11 months ago)

Author:

bitsstech

Message:

Bug Fixes. version 1.24.5

Location:

shipment-tracker-for-woocommerce/trunk

Files:

• README.txt (modified) (1 diff)
• admin/class-bt-sync-shipment-tracking-admin.php (modified) (6 diffs)
• bt-sync-shipment-tracking.php (modified) (2 diffs)
• includes/class-bt-sync-shipment-tracking.php (modified) (2 diffs)
• includes/shipping_providers/shiprocket.php (modified) (1 diff)
• public/class-bt-sync-shipment-tracking-public.php (modified) (7 diffs)

shipment-tracker-for-woocommerce/trunk/README.txt

@@ -495 +495 @@
     }
                 
-    add_filter('bt_sync_shimpent_track_pincode_checker_shipping_to_text', 'bt_sync_shimpent_track_pincode_checker_shipping_to_text');
+    add_filter('bt_shiprocket_order_object', 'bt_shiprocket_order_object',10,2);
+    function bt_shiprocket_order_object($order_id, $shiprocket_order) {
+        //modify shiprocket order object before pushing order to shiprocket
+        return $shiprocket_order;
+    }
+
+    add_filter('bt_dynamic_courier_rates', 'bt_dynamic_courier_rates',10,3);
+    function bt_dynamic_courier_rates( $rates , $package, $bt_sst_courier_rate_provider) {
+        //modify the dynamic courier rates populated by the plugin and return back the rates array
+        return $rates;
+    }
+
+    add_filter('bt_sync_shimpent_track_pincode_checker_shipping_to_text', 'bt_sync_shimpent_track_pincode_checker_shipping_to_text');
     function bt_sync_shimpent_track_pincode_checker_shipping_to_text($content) {
         $content = 'Select a delivery location to see product availability and delivery options';

shipment-tracker-for-woocommerce/trunk/admin/class-bt-sync-shipment-tracking-admin.php

@@ -1383 +1383 @@
              $body     = wp_remote_retrieve_body( $response );
             
+            //  echo "<pre>"; print_r($body); die;
             $response1 = array(
                 "status" => true,
@@ -1547 +1548 @@
     
         if (!empty($QMessage['order'])) {
-            if (empty($QMessage['shipment_current'])) {
+
+
+            if($QMessage['order']['status']=="failed"){
+                $event_name = "failed_order";
+            }
+            else if($QMessage['order']['status']=="cancelled"){
+                $event_name = "canceled_order";
+            }
+            else if (empty($QMessage['shipment_current'])) {
                 // probably a new order
-                if($QMessage['order']['status']=="failed"){
-                    $event_name = "failed_order";
-                }else{
-                    $event_name = "new_order";
-                }
+                $event_name = "new_order";
                 
             } else if (empty($QMessage['shipment_old']) || 
@@ -1567 +1572 @@
                 } else if ($current_status == "delivered") {
                     $event_name = "delivered";
+                } else if ($current_status == "canceled") {
+                    $event_name = "canceled";
                 }
             }
         }
-    
         return $event_name;
     }
@@ -1830 +1836 @@
 
     function handle_admin_init(){
-        $_GET = array_map('sanitize_text_field', $_GET);
+        
         if(isset($_GET['bt_push_to_shiprocket']) && $_GET['bt_push_to_shiprocket']==1 && (isset($_GET['post']) || isset($_GET['id']))){
             $order_id=isset($_GET['post']) ? $_GET['post'] : $_GET['id'];
@@ -1867 +1873 @@
 
     function get_st_form_with_data() {
-        $_GET = array_map('sanitize_text_field', $_GET);
+    
         $nonce = $_GET['nonce'];
         if ( ! wp_verify_nonce( $nonce, 'get_st_form_with_data' ) ) {
@@ -2891 +2897 @@
 
 
+function bt_sst_get_city_state_by_pincode($pincode, $country) {
+    $data = [];
+
+    if (empty($pincode) || empty($country)) {
+        return $data;
+    }
+
+    if (strtoupper($country) === 'IN') {
+        $obj = new Bt_Sync_Shipment_Tracking_Shiprocket();
+
+            $locality_data = $obj->get_locality($pincode);
+            if (is_array($locality_data) && isset($locality_data['state_code'])) {
+                $locality_data['state'] = $locality_data['state_code'];
+                $data = $locality_data;
+            }
+    }
+
+    return $data;
+}

shipment-tracker-for-woocommerce/trunk/bt-sync-shipment-tracking.php

@@ -17 +17 @@
  * Plugin URI:        https://shipment-tracker-for-woocommerce.bitss.tech/
  * Description:       Most comprehensive shipment tracking plugin that extends your woocommerce store with shipment related features. Keeps you & your customers informed about shipment movement.
- * Version:           1.4.24.5
+ * Version:           1.4.24.6
  * Author:            Bitss Techniques
  * Author URI:        https://shipment-tracker-for-woocommerce.bitss.tech
@@ -59 +59 @@
 
 define( 'Carbon_Fields\URL', trailingslashit( plugin_dir_url( __FILE__ ) ) . 'vendor/htmlburger/carbon-fields/' );//fix for Bitnami installations.
-define( 'BT_SYNC_SHIPMENT_TRACKING_VERSION', '1.4.24.5' );
+define( 'BT_SYNC_SHIPMENT_TRACKING_VERSION', '1.4.24.6' );
 define( 'BT_SHIPPING_PROVIDERS', array('delhivery' =>'Delhivery','nimbuspost' => 'Nimbuspost (Deprecated)','nimbuspost_new' => 'Nimbuspost','shipmozo'=>'Shipmozo','shiprocket' => 'Shiprocket', 'xpressbees' => 'Xpressbees', 'manual' =>'Custom Shipping') );
 define( 'BT_SHIPPING_PROVIDERS_WITH_NONE', array('none' =>'none','delhivery' =>'Delhivery', 'nimbuspost' => 'Nimbuspost (OLD)','nimbuspost_new' => 'Nimbuspost(NEW)','shipmozo'=>'Shipmozo','shiprocket' => 'Shiprocket', 'xpressbees' => 'Xpressbees','manual' =>'Custom Shipping') );

shipment-tracker-for-woocommerce/trunk/includes/class-bt-sync-shipment-tracking.php

@@ -738 +738 @@
                     'new_order' => 'New Order',
                     'failed_order' => 'Failed Order',
+                    'canceled_order' => 'Canceled Order',
                     //'out_for_pickup' => 'Out For Pickup',
                     'in_transit' => 'In Transit',
@@ -776 +777 @@
                                             <option value="new-order">New Order</option>
                                             <option value="failed-order">Failed Order</option>
+                                            <option value="canceled-order">Canceled Order</option>
                                             <option value="in-transit"> In Transit</option>
                                             <option value="out-for-delivery">Out for Delivery</option>
                                             <option value="delivered">Delivered</option>
+                                            <option value="abandoned-cart">Abandoned Cart</option>
                                             <option value="review-after-delivery">Review after Delivery</option>
                                         </select>

shipment-tracker-for-woocommerce/trunk/includes/shipping_providers/shiprocket.php

@@ -698 +698 @@
         $so["height"] = $total_height_cm>0?$total_height_cm:0.5;
         $so["weight"] = $total_weight_kg>0?$total_weight_kg:0.1;
-
+        $so = apply_filters( 'bt_shiprocket_order_object', $order_id, $so );
         return $so;
     }

shipment-tracker-for-woocommerce/trunk/public/class-bt-sync-shipment-tracking-public.php

@@ -1499 +1499 @@
                             $delivery_date = " (Edd: " . $d . ")";
                         }
-        
+                    
                         $WC_Shipping_Rate = new WC_Shipping_Rate();
         
                         $WC_Shipping_Rate->set_id($id);
                         $WC_Shipping_Rate->set_label($lable . $delivery_date);
+                        $WC_Shipping_Rate->add_meta_data("edd", $delivery_date);
                         $WC_Shipping_Rate->set_method_id($method_id);
                         $WC_Shipping_Rate->set_cost($cost);
@@ -1514 +1515 @@
                         $rates[$id] = $WC_Shipping_Rate;
                     }
+                        
                 }else{
                     //international order
@@ -1553 +1555 @@
                         $WC_Shipping_Rate->set_id($id);
                         $WC_Shipping_Rate->set_label($lable . $delivery_date);
+                        $WC_Shipping_Rate->add_meta_data("edd", $delivery_date);
                         $WC_Shipping_Rate->set_method_id($method_id);
                         $WC_Shipping_Rate->set_cost($cost);
@@ -1715 +1718 @@
                         $WC_Shipping_Rate->set_id($id);
                         $WC_Shipping_Rate->set_label($lable . $delivery_date);
+                        $WC_Shipping_Rate->add_meta_data("edd", $delivery_date);
                         $WC_Shipping_Rate->set_method_id($method_id);
                         $WC_Shipping_Rate->set_cost($cost);
@@ -1867 +1871 @@
                         $WC_Shipping_Rate->set_id($id);
                         $WC_Shipping_Rate->set_label($lable . $delivery_date);
+                        $WC_Shipping_Rate->add_meta_data("edd", $delivery_date);
                         $WC_Shipping_Rate->set_method_id($method_id);
                         $WC_Shipping_Rate->set_cost($cost);
@@ -2038 +2043 @@
                         $WC_Shipping_Rate->set_id($id);
                         $WC_Shipping_Rate->set_label($lable . $delivery_date);
+                        $WC_Shipping_Rate->add_meta_data("edd", $delivery_date);
                         $WC_Shipping_Rate->set_method_id($method_id);
                         $WC_Shipping_Rate->set_cost($cost);
@@ -2054 +2060 @@
  
         }
+        $rates = apply_filters( 'bt_dynamic_courier_rates', $rates , $package, $bt_sst_courier_rate_provider);
         return $rates;
     }