gift: enhacnements

src/pages/checkout/hooks/useOrder.ts

@@ -39,6 +39,7 @@ export default function useOrder() {
     pickupTime,
     pickupDate,
     pickupType,
+    giftDetails,
     order,
   } = useAppSelector(selectCart);
   const highestLoyaltyItem = useAppSelector(selectHighestPricedLoyaltyItem);
@@ -70,7 +71,7 @@ export default function useOrder() {
     });
 
     createOrder({
-      phone: mobilenumber || phone || order?.senderPhone,
+      phone: mobilenumber || phone || giftDetails?.senderPhone,
       comment: specialRequest,
       delivery_method: getDeliveryMethod(),
       timeslot: "",
@@ -112,13 +113,13 @@ export default function useOrder() {
       delivery_address: location?.address,
       ...(orderType === OrderType.Gift
         ? {
-            receiverName: order?.receiverName,
-            receiverPhone: order?.receiverPhone,
-            specialMessage: order?.message,
-            keepNameSecret: order?.isSecret,
-            senderEmail: order?.senderEmail,
-            senderPhone: order?.senderPhone,
-            senderName: order?.senderName,
+            receiverName: giftDetails?.receiverName,
+            receiverPhone: giftDetails?.receiverPhone,
+            specialMessage: giftDetails?.message,
+            keepNameSecret: giftDetails?.isSecret,
+            senderEmail: giftDetails?.senderEmail,
+            senderPhone: giftDetails?.senderPhone,
+            senderName: giftDetails?.senderName,
             dineType: orderType,
           }
         : {}),
@@ -173,7 +174,7 @@ export default function useOrder() {
     orderType,
     restaurantID,
     items,
-    order,
+    giftDetails,
     discount.isDiscount,
     discount.isGift,
     discount.value,