fix location restaurant + show service area in new address

src/app/[name]/(Dialogs)/order/checkout/[id]/components/SummarySection.tsx

@@ -94,8 +94,8 @@ export const SummarySection = ({ cartModal, onToggleCartModal, deliveryType }: S
             description: description || '',
             deliveryMethodId: storeDeliveryType,
             paymentMethodId: paymentType,
-            ...(selectedAddressId && !isDeliveryCar && { addressId: selectedAddressId }),
-            ...(carAddress && { carAddress }),
+            ...(isCourierDelivery && selectedAddressId && { addressId: selectedAddressId }),
+            ...(isDeliveryCar && carAddress && { carAddress }),
         };
 
         saveAllMethod(saveAllMethodData, {
@@ -113,7 +113,7 @@ export const SummarySection = ({ cartModal, onToggleCartModal, deliveryType }: S
                 if (paymentType && paymentType !== '0') {
                     orderData.paymentMethodId = paymentType;
                 }
-                if (selectedAddressId && !isDeliveryCar) {
+                if (isCourierDelivery && selectedAddressId) {
                     orderData.addressId = selectedAddressId;
                 }
                 if (tableNumber > 0) {

src/app/[name]/(Dialogs)/order/checkout/[id]/page.tsx

@@ -71,13 +71,18 @@ function OrderDetailInex() {
         }
     }, [cartItems?.data?.paymentMethodId, setPaymentType, setIsSelectedPayment]);
 
+    const selectedDeliveryMethod = useMemo(() => {
+        if (!shipmentMethod?.data || !deliveryType) return null;
+        return shipmentMethod.data.find((item) => item.id === deliveryType);
+    }, [shipmentMethod?.data, deliveryType]);
+
     useEffect(() => {
-        if (cartItems?.data?.addressId) {
+        if (cartItems?.data?.addressId && selectedDeliveryMethod?.method === 'deliveryCourier') {
             const addressId = cartItems.data.addressId;
             setIsSelectedAddress(true);
             setSelectedAddressId(addressId ?? null);
         }
-    }, [cartItems?.data?.addressId, setIsSelectedAddress, setSelectedAddressId]);
+    }, [cartItems?.data?.addressId, setIsSelectedAddress, setSelectedAddressId, selectedDeliveryMethod]);
 
     useEffect(() => {
         if (cartItems?.data?.coupon?.couponCode && cartItems.data.couponDiscount > 0) {
@@ -85,11 +90,6 @@ function OrderDetailInex() {
         }
     }, [cartItems?.data?.coupon?.couponCode, cartItems?.data?.couponDiscount]);
 
-    const selectedDeliveryMethod = useMemo(() => {
-        if (!shipmentMethod?.data || !deliveryType) return null;
-        return shipmentMethod.data.find((item) => item.id === deliveryType);
-    }, [shipmentMethod?.data, deliveryType]);
-
     return (
         <div className='h-full bg-inherit flex flex-col gap-5'>
             <CheckoutHeader />