From 27f522e75c9d945be00fab70d5c649f2ab335308 Mon Sep 17 00:00:00 2001
From: Mohammed Al-yaseen <mohammed.o.alyaseen@gmail.com>
Date: Wed, 5 Nov 2025 18:24:34 +0300
Subject: [PATCH] fix discount calculating

---
 src/components/OrderSummary/OrderSummary.tsx | 14 +++++++++-----
 src/features/order/orderSlice.ts             |  8 ++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/OrderSummary/OrderSummary.tsx b/src/components/OrderSummary/OrderSummary.tsx
index b8fb973..0aced66 100644
--- a/src/components/OrderSummary/OrderSummary.tsx
+++ b/src/components/OrderSummary/OrderSummary.tsx
@@ -44,13 +44,17 @@ export default function OrderSummary() {
             <ProText type="secondary">{t("cart.basketTotal")}</ProText>
             <ArabicPrice price={subtotal} />
           </div>
-          {orderType != OrderType.DineIn && <div className={styles.summaryRow}>
-            <ProText type="secondary">{t("cart.deliveryFee")}</ProText>
-            <ArabicPrice price={Number(restaurant?.delivery_fees || 0)} />
-          </div>}
+          {orderType != OrderType.DineIn && (
+            <div className={styles.summaryRow}>
+              <ProText type="secondary">{t("cart.deliveryFee")}</ProText>
+              <ArabicPrice price={Number(restaurant?.delivery_fees || 0)} />
+            </div>
+          )}
           <div className={styles.summaryRow}>
             <ProText type="secondary">{t("cart.discount")}</ProText>
-            <ArabicPrice price={highestLoyaltyItem?.price || 0} />
+            <ArabicPrice
+              price={useLoyaltyPoints ? highestLoyaltyItem?.price || 0 : 0}
+            />
           </div>
           <div className={styles.summaryRow}>
             <ProText type="secondary">{t("cart.tax")}</ProText>
diff --git a/src/features/order/orderSlice.ts b/src/features/order/orderSlice.ts
index 6fb7cff..c02a2a9 100644
--- a/src/features/order/orderSlice.ts
+++ b/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 ? loyaltyDiscount : 0) +
+        deliveryFee
+      );};
 
 export default orderSlice.reducer;