diff --git a/src/components/Icons/order/RateIcon.tsx b/src/components/Icons/order/RateIcon.tsx
index e8137a9..bcedfea 100644
--- a/src/components/Icons/order/RateIcon.tsx
+++ b/src/components/Icons/order/RateIcon.tsx
@@ -17,7 +17,7 @@ const RateIcon = ({ className, onClick }: RateIconType) => {
       <path
         d="M26.4351 131.263C18.2009 129.563 9.45442 127.066 4.20797 120.496C-0.552335 114.535 -1.36302 105.7 2.23265 98.9722C7.4747 89.1632 20.3229 84.8319 24.4402 74.5003C27.401 67.0706 24.9679 58.7427 24.4263 50.7633C23.852 42.2992 25.5683 33.5602 30.0859 26.379C34.6035 19.1981 42.0585 13.7282 50.4398 12.4131C62.6515 10.4973 74.6822 17.2329 87.0409 17.0031C101.49 16.7343 113.941 7.17211 127.741 2.8807C135.732 0.395575 144.272 -0.303884 152.561 0.847569C160.267 1.91822 168.283 4.99429 172.479 11.5457C176.514 17.8476 176.178 25.8983 178.116 33.1264C180.159 40.7481 184.913 47.6136 191.329 52.2072C195.925 55.498 201.301 57.6369 205.675 61.218C209.591 64.4246 212.539 68.6589 215.048 73.0551C218.27 78.7035 220.892 84.8722 221.249 91.3654C221.937 103.879 213.897 115.647 203.429 122.538C192.961 129.429 180.37 132.237 167.99 134.188C158.175 135.734 148.289 136.826 138.373 137.458C128.55 138.083 118.471 138.613 108.638 137.94C105.646 137.735 102.889 136.912 99.9902 136.244C96.2772 135.389 92.5503 135.76 88.7856 135.959C78.9527 136.48 69.0879 136.405 59.2637 135.738C49.4395 135.072 39.6552 133.813 29.9831 131.967C28.7985 131.741 27.616 131.506 26.4351 131.263Z"
         fill="#FFB700"
-        fill-opacity="0.12"
+        fillOpacity="0.12"
       />
       <path
         d="M149.572 150H69.6144C67.3832 150 65.5576 148.174 65.5576 145.943V145.546C65.5576 143.315 67.3832 141.489 69.6144 141.489H149.572C151.803 141.489 153.629 143.315 153.629 145.546V145.943C153.629 148.174 151.803 150 149.572 150Z"
@@ -42,22 +42,22 @@ const RateIcon = ({ className, onClick }: RateIconType) => {
       <path
         d="M142.231 13.9854C142.231 10.7734 139.603 8.14526 136.391 8.14526H134.134C114.797 23.8846 96.1683 40.5151 79.0111 58.5438C78.5128 59.0675 78.0168 59.5935 77.5195 60.1188V89.5343C80.7173 86.54 83.9063 83.5363 87.0804 80.5174C88.8163 78.8666 90.5472 77.2104 92.2788 75.5549C108.944 60.8335 125.605 46.108 142.231 31.3423L142.231 13.9854Z"
         fill="#FFB700"
-        fill-opacity="0.12"
+        fillOpacity="0.12"
       />
       <path
         d="M95.8987 119.961C93.5809 122.338 91.2756 124.728 88.9967 127.149C85.3554 131.016 81.8398 134.99 78.3311 138.969C79.3493 140.693 81.2222 141.859 83.3584 141.859H99.6052C101.571 139.656 103.547 137.461 105.543 135.286C111.156 129.168 116.897 123.176 122.743 117.288C129.246 111.064 135.741 104.833 142.23 98.5942V76.4097C137.105 80.4905 132.061 84.6713 127.162 89.03C116.203 98.7802 105.84 109.178 95.8987 119.961Z"
         fill="#FFB700"
-        fill-opacity="0.12"
+        fillOpacity="0.12"
       />
       <path
         d="M142.231 116.867C136.361 122.2 130.579 127.631 124.896 133.164C121.948 136.035 119.027 138.934 116.13 141.858H130.067C132.121 139.96 134.17 138.057 136.206 136.14C138.217 134.247 140.225 132.35 142.231 130.453V116.867Z"
         fill="#FFB700"
-        fill-opacity="0.12"
+        fillOpacity="0.12"
       />
       <path
         d="M114.568 8.14502H100.676C92.7524 14.6636 85.003 21.3827 77.5195 28.407V37.3576C83.8437 32.2819 90.1625 27.196 96.5533 22.2048C102.559 17.5142 108.55 12.811 114.568 8.14502Z"
         fill="#FFB700"
-        fill-opacity="0.12"
+        fillOpacity="0.12"
       />
       <path
         d="M111.138 11.8819C111.138 12.6409 110.523 13.2561 109.764 13.2561C109.005 13.2561 108.39 12.6409 108.39 11.8819C108.39 11.1229 109.005 10.5073 109.764 10.5073C110.523 10.5073 111.138 11.1226 111.138 11.8819Z"
diff --git a/src/components/InputCard.tsx b/src/components/InputCard.tsx
index c06f538..ba0fbb6 100644
--- a/src/components/InputCard.tsx
+++ b/src/components/InputCard.tsx
@@ -26,7 +26,7 @@ export default function InputCard({
   };
   return (
     <>
-      <ProInputCard title={title} dividerStyle={{ margin: "5px 0 0 0" }}>
+      <ProInputCard title={title}>
         <Form.Item
           name={name}
           rules={[{ required, message: reuireqMessage }]}
diff --git a/src/components/OrderSummary/OrderSummary.tsx b/src/components/OrderSummary/OrderSummary.tsx
index 24ca1ce..3dae530 100644
--- a/src/components/OrderSummary/OrderSummary.tsx
+++ b/src/components/OrderSummary/OrderSummary.tsx
@@ -44,7 +44,7 @@ export default function OrderSummary() {
     textAlign: "center",
   };
 
-  const vat = (restaurant?.vat ?? 0) / 100 * subtotal || 0
+  const vat = ((restaurant?.vat ?? 0) / 100) * subtotal || 0;
 
   return (
     <>
@@ -167,7 +167,7 @@ export default function OrderSummary() {
               />
             </div>
           )}
-            {orderType !== OrderType.Redeem && (
+          {orderType !== OrderType.Redeem && (
             <div className={styles.summaryRow}>
               <ProText type="secondary" style={titlesStyle}>
                 {t("cart.otherTaxes")}
diff --git a/src/features/order/orderSlice.ts b/src/features/order/orderSlice.ts
index ae57e43..bfb95a8 100644
--- a/src/features/order/orderSlice.ts
+++ b/src/features/order/orderSlice.ts
@@ -702,7 +702,8 @@ const orderSlice = createSlice({
       }
     },
     updateOrder(state, action: PayloadAction<any>) {
-      state.order = { ...state.order, ...action.payload };
+      state.order = { ...(state.order || {}), ...action.payload };
+      
       if (typeof window !== "undefined") {
         localStorage.setItem(
           CART_STORAGE_KEYS.ORDER,
diff --git a/src/pages/checkout/hooks/useOrder.ts b/src/pages/checkout/hooks/useOrder.ts
index 5de57d0..e175d8a 100644
--- a/src/pages/checkout/hooks/useOrder.ts
+++ b/src/pages/checkout/hooks/useOrder.ts
@@ -44,7 +44,7 @@ export default function useOrder() {
     giftDetails,
     order,
     restaurant,
-  } = useAppSelector(selectCart);
+  } = useAppSelector((state) => state.order);
   const highestLoyaltyItem = useAppSelector(selectHighestPricedLoyaltyItem);
   const { useLoyaltyPoints } = useAppSelector(selectCart);
 
@@ -54,8 +54,6 @@ export default function useOrder() {
 
   const [createOrder] = useCreateOrderMutation();
 
-  console.log(order);
-
   const getDeliveryMethod = useCallback(() => {
     if (orderType === OrderType.Delivery) return 1;
     if (orderType === OrderType.Pickup) return 2;
@@ -77,6 +75,8 @@ export default function useOrder() {
       duration: 0,
     });
 
+    console.log(order?.roomNumber);
+
     createOrder({
       phone: mobilenumber || phone || giftDetails?.senderPhone,
       comment: specialRequest,
@@ -204,6 +204,14 @@ export default function useOrder() {
     location?.lat,
     location?.lng,
     location?.address,
+    order,
+    pickupTime,
+    pickupDate,
+    plateCar,
+    pickupType,
+    discountAmount,
+    subtotal,
+    restaurant,
     t,
     navigate,
     subdomain,