diff --git a/addons/dine360_theme_chennora/views/checkout_address.xml b/addons/dine360_theme_chennora/views/checkout_address.xml
index 5c5e82e..6dd7abc 100644
--- a/addons/dine360_theme_chennora/views/checkout_address.xml
+++ b/addons/dine360_theme_chennora/views/checkout_address.xml
@@ -423,4 +423,16 @@
             </script>
         </xpath>
     </template>
+
+    <!-- 5. FINAL POLISH: Hide Shipping Info using CSS (Safest method) -->
+    <template id="chennora_hide_shipping_on_payment" inherit_id="website.layout" name="Chennora Hide Shipping on Payment">
+        <xpath expr="." position="inside">
+            <style>
+                /* Hide any row or div that contains shipping info in the checkout */
+                .js_shipping, .shipping_address, #shipping_and_billing {
+                    display: none !important;
+                }
+            </style>
+        </xpath>
+    </template>
 </odoo>
diff --git a/addons/dine360_uber/models/sale_order.py b/addons/dine360_uber/models/sale_order.py
index 552a21a..1575347 100644
--- a/addons/dine360_uber/models/sale_order.py
+++ b/addons/dine360_uber/models/sale_order.py
@@ -12,7 +12,12 @@ class SaleOrder(models.Model):
         
         # 1. Ensure fulfillment type is set
         if hasattr(self, 'fulfilment_type'):
-            self.write({'fulfilment_type': 'delivery'})
+            self.write({
+                'fulfilment_type': 'delivery',
+                'partner_shipping_id': self.partner_id.id
+            })
+        else:
+            self.write({'partner_shipping_id': self.partner_id.id})
 
         # 2. Find or Create the Uber Delivery carrier
         Carrier = self.env['delivery.carrier'].sudo()