Merge remote-tracking branch 'origin/main'

src/components/LoyaltyCard/LoyaltyCard.tsx

@@ -19,6 +19,7 @@ const LoyaltyCard = () => {
       (restaurant?.customer_loyalty_points || 0) <=
     0;
 
+
   return (
     <div className={styles.loyaltyContainer}>
       <Card className={styles.loyaltyCard}>
@@ -35,6 +36,7 @@ const LoyaltyCard = () => {
             </div>
           </div>
         )}
+        {!isHasLoyaltyGift && (
           <Row
             justify="space-between"
             align="middle"
@@ -90,7 +92,8 @@ const LoyaltyCard = () => {
               <PresentIcon />
             </Col>
           </Row>
-        {token && (
+        )}
+        {token && !isHasLoyaltyGift && (
           <Row justify="space-between" align="middle">
             <Col>
               <div className={styles.presentIcon}>

src/components/OrderSummary/OrderSummary.tsx

@@ -11,6 +11,7 @@ import {
 } from "features/order/orderSlice";
 import { OrderType } from "pages/checkout/hooks/types";
 import { useTranslation } from "react-i18next";
+import { useParams } from "react-router-dom";
 import { useGetRestaurantDetailsQuery } from "redux/api/others";
 import { useAppDispatch, useAppSelector } from "redux/hooks";
 import ProText from "../ProText";
@@ -20,7 +21,8 @@ import styles from "./OrderSummary.module.css";
 export default function OrderSummary() {
   const { t } = useTranslation();
   const { useLoyaltyPoints } = useAppSelector(selectCart);
-  const { data: restaurant } = useGetRestaurantDetailsQuery("595");
+  const { subdomain } = useParams();
+  const { data: restaurant } = useGetRestaurantDetailsQuery(subdomain);
   const { orderType } = useAppSelector(selectCart);
   const dispatch = useAppDispatch();
   const subtotal = useAppSelector(selectCartTotal);
@@ -44,13 +46,21 @@ export default function OrderSummary() {
             <ProText type="secondary">{t("cart.basketTotal")}</ProText>
             <ArabicPrice price={subtotal} />
           </div>
-          {orderType != OrderType.DineIn && <div className={styles.summaryRow}>
+          {orderType != OrderType.DineIn && (
+            <div className={styles.summaryRow}>
               <ProText type="secondary">{t("cart.deliveryFee")}</ProText>
               <ArabicPrice price={Number(restaurant?.delivery_fees || 0)} />
-          </div>}
+            </div>
+          )}
           <div className={styles.summaryRow}>
             <ProText type="secondary">{t("cart.discount")}</ProText>
-            <ArabicPrice price={highestLoyaltyItem?.price || 0} />
+            <ArabicPrice
+              price={
+                useLoyaltyPoints && restaurant?.is_loyalty_enabled === 1
+                  ? highestLoyaltyItem?.price || 0
+                  : 0
+              }
+            />
           </div>
           <div className={styles.summaryRow}>
             <ProText type="secondary">{t("cart.tax")}</ProText>
@@ -65,7 +75,7 @@ export default function OrderSummary() {
           </div>
         </Space>
 
-        {isHasLoyaltyGift && (
+        {isHasLoyaltyGift && restaurant?.is_loyalty_enabled === 1 && (
           <>
             <br />
             <br />
@@ -86,7 +96,10 @@ export default function OrderSummary() {
           </div>
         )}
 
-        {isHasLoyaltyGift && useLoyaltyPoints && highestLoyaltyItem && (
+        {isHasLoyaltyGift &&
+          useLoyaltyPoints &&
+          highestLoyaltyItem &&
+          restaurant?.is_loyalty_enabled === 1 && (
             <div style={{ marginTop: 8, color: "green", fontSize: "12px" }}>
               {t("cart.loyaltyDiscountApplied", {
                 itemName: highestLoyaltyItem.name,

src/features/order/orderSlice.ts

@@ -650,7 +650,11 @@ export const selectGrandTotal = (state: RootState) => {
       ? Number(state.order.restaurant?.delivery_fees) || 0
       : 0;
 
-  return subtotal + taxAmount - loyaltyDiscount + deliveryFee;
+      return (
-};
+        subtotal +
+        taxAmount -
+        (state.order.useLoyaltyPoints && state.order.restaurant?.is_loyalty_enabled === 1 ? loyaltyDiscount : 0) +
+        deliveryFee
+      );};
 
 export default orderSlice.reducer;