From f96ed1e5a319e256fbc68b472aa9b47a29b976b2 Mon Sep 17 00:00:00 2001
From: vickytechkey <vichunice@gmail.com>
Date: Wed, 14 Oct 2026 21:39:22 +0530
Subject: [PATCH] fix(branding): white-label carrier names to Express Delivery
 in customer order APIs

---
 orders/views.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/orders/views.py b/orders/views.py
index 32ad0fa..0ce9272 100644
--- a/orders/views.py
+++ b/orders/views.py
@@ -295,7 +295,7 @@ class OrderHistoryView(APIView):
                     assigned_carrier = 'Shadowfax Express'
 
             if assigned_carrier:
-                order_data['shipping_carrier'] = assigned_carrier
+                order_data['shipping_carrier'] = 'Express Delivery'
             
             # Aggregate status
             if order_data.get('status') == 'cancelled':
@@ -371,7 +371,7 @@ class OrderDetailView(APIView):
                 assigned_carrier = 'Shadowfax Express'
 
         if assigned_carrier:
-            order_data['shipping_carrier'] = assigned_carrier
+            order_data['shipping_carrier'] = 'Express Delivery'
 
         return Response(order_data)
 
@@ -937,17 +937,17 @@ class OrderTrackView(APIView):
                             norm_st = 'delivered' if 'delivered' in curr_st.lower() else ('out_for_delivery' if 'out for delivery' in curr_st.lower() else ('in_transit' if 'transit' in curr_st.lower() or any(h['status'] == 'picked_up' for h in formatted_history) else curr_st.lower().replace(' ', '_')))
                             live_data = {
                                 'status': 'success',
-                                'carrier': 'Delhivery Logistics',
+                                'carrier': 'Express Delivery',
                                 'data': {
-                                    'carrier': 'Delhivery Logistics',
+                                    'carrier': 'Express Delivery',
                                     'awb_number': str(awb_number),
                                     'current_status': norm_st,
-                                    'status_display': f"Delhivery: {curr_st} ({st_info.get('Instructions', '')})",
+                                    'status_display': f"{curr_st}" + (f" ({st_info.get('Instructions', '')})" if st_info.get('Instructions') else ""),
                                     'expected_delivery_date': ship.get('ExpectedDeliveryDate'),
                                     'picked_up_date': ship.get('PickedupDate') or ship.get('PickUpDate'),
                                     'tracking_history': formatted_history,
                                     'order_details': {
-                                        'carrier': 'Delhivery Logistics',
+                                        'carrier': 'Express Delivery',
                                         'awb_number': str(awb_number),
                                         'origin': ship.get('Origin'),
                                         'destination': ship.get('Destination'),
@@ -1033,7 +1033,7 @@ class OrderTrackView(APIView):
         # Ensure executive rider details are stripped for customer privacy
         customer_live_tracking = dict(live_data.get('data', {})) if isinstance(live_data.get('data'), dict) else {}
         customer_live_tracking.pop('rider_details', None)
-        carrier_name = customer_live_tracking.get('carrier') or detected_carrier or 'Delhivery Logistics'
+        carrier_name = 'Express Delivery'
         customer_live_tracking['carrier'] = carrier_name
 
         result = {