fixes

src/pages/cart/components/CartMobileTabletLayout.tsx

@@ -143,7 +143,7 @@ export default function CartMobileTabletLayout({
             </Card>
           </div>
 
-          <YouMightAlsoLike />
+          {/* <YouMightAlsoLike /> */}
 
           <SpecialRequestCard />
 

src/pages/checkout/page.tsx

@@ -70,6 +70,7 @@ export default function CheckoutPage() {
                 name="roomNumber"
                 placeholder={t("address.roomNo")}
                 value={order?.roomNumber}
+                required
               />
             )}
             {orderType === OrderType.ToOffice && (
@@ -78,6 +79,7 @@ export default function CheckoutPage() {
                 name="officeNumber"
                 placeholder={t("address.officeNo")}
                 value={order?.officeNumber}
+                required
               />
             )}
             {orderType === OrderType.Redeem && <VoucherSummary />}
@@ -91,7 +93,7 @@ export default function CheckoutPage() {
             )}
 
             {/* Collection Method */}
-            {orderType === OrderType.Pickup && (
+            {/* {orderType === OrderType.Pickup && (
               <ProInputCard title={t("cart.collectionMethod")}>
                 <Form.Item
                   name="collectionMethod"
@@ -123,7 +125,7 @@ export default function CheckoutPage() {
                   />
                 </Form.Item>
               </ProInputCard>
-            )}
+            )} */}
 
             {/* Reward Your Waiter */}
             {/* {orderType !== OrderType.Redeem && orderType !== OrderType.Gift && (
@@ -133,7 +135,7 @@ export default function CheckoutPage() {
               <EarnLoyaltyPointsCard />
             )}
             <BriefMenuCard />
-            <Ads1 />
+            {/* <Ads1 /> */}
             <OrderSummary />
           </Layout.Content>
 

src/pages/order/page.tsx

@@ -450,7 +450,7 @@ export default function OrderPage() {
             )}
           </Card>
 
-          <Ads2 />
+          {/* <Ads2 /> */}
 
           {/* <ProInputCard
           title={
@@ -506,7 +506,7 @@ export default function OrderPage() {
           <PaymentDetails order={orderDetails?.order} />
 
           {/* inviteToBill */}
-          {!hasClosedStatus && (
+          {/* {!hasClosedStatus && (
             <ProInputCard
               title={
                 <>
@@ -622,7 +622,7 @@ export default function OrderPage() {
                 </ProText>
               </Button>
             </ProInputCard>
-          )}
+          )} */}
 
           <QRBottomSheet isOpen={isOpen} onClose={() => setIsOpen(false)} />
 
@@ -671,25 +671,25 @@ export default function OrderPage() {
             onClose={() => setIsRateOrderOpen(false)}
           />
 
-          {!hasClosedStatus ||
-            (hasCanceledByCustomerStatus && <CancelOrderBottomSheet />)}
+          {(!hasClosedStatus && !hasCanceledByCustomerStatus) && (
+            <CancelOrderBottomSheet />
+          )}
         </Layout.Content>
 
-        {hasClosedStatus ||
-          (hasCanceledByCustomerStatus && (
-            <Layout.Footer className={styles.checkoutButtonContainer}>
-              <Button
-                type="primary"
-                shape="round"
-                className={styles.checkoutButton}
-                onClick={() => {
-                  navigate(`/${restaurant?.subdomain}/menu`);
-                }}
-              >
-                {t("order.newOrder")}
-              </Button>
-            </Layout.Footer>
-          ))}
+        {(hasClosedStatus || hasCanceledByCustomerStatus) && (
+          <Layout.Footer className={styles.checkoutButtonContainer}>
+            <Button
+              type="primary"
+              shape="round"
+              className={styles.checkoutButton}
+              onClick={() => {
+                navigate(`/${restaurant?.subdomain}/menu`);
+              }}
+            >
+              {t("order.newOrder")}
+            </Button>
+          </Layout.Footer>
+        )}
       </Layout>
       <SplitBillParticipantsBottomSheet
         isOpen={isSplitBillParticipantsBottomSheetOpen}