diff --git a/src/assets/locals/ar.json b/src/assets/locals/ar.json index 2683add..5923270 100644 --- a/src/assets/locals/ar.json +++ b/src/assets/locals/ar.json @@ -122,6 +122,8 @@ "carbs": "الكربوهيدرات", "fat": "الدهون", "viewCart": "عرض السلة", + "pay": "الدفع", + "payDescription": "الدفع", "rating": "التقييم ", "loyaltyPoints": "نقاط الولاء", "loyaltyDescription": "اشترى {{value}} وجبات واحصل على وجبة مجانية", @@ -419,6 +421,7 @@ "yourAmount": "مبلغك", "selectedTotal": "المجموع المحدد", "splitBillAmount": "مبلغ تقسيم الفاتورة", - "removeSplitWay": "إزالة طريقة التقسيم" + "removeSplitWay": "إزالة طريقة التقسيم", + "amount": "المبلغ" } } diff --git a/src/assets/locals/en.json b/src/assets/locals/en.json index ddd8c9e..bfc42de 100644 --- a/src/assets/locals/en.json +++ b/src/assets/locals/en.json @@ -168,7 +168,9 @@ "joinUs": "Join us", "joinUsDescription": "to earn loyalty points", "openingHours": "Opening Hours: {{openingTime}} - {{closingTime}}", - "restaurantIsClosed": "Restaurant is closed" + "restaurantIsClosed": "Restaurant is closed", + "pay": "Pay", + "payDescription": "Pay for your order" }, "cart": { "title": "Cart", @@ -431,6 +433,7 @@ "yourAmount": "Your Amount", "selectedTotal": "Selected Total", "splitBillAmount": "Split Bill Amount", - "removeSplitWay": "Remove Split Way" + "removeSplitWay": "Remove Split Way", + "amount": "Amount" } } diff --git a/src/pages/menu/components/MenuFooter/MenuFooter.tsx b/src/pages/menu/components/MenuFooter/MenuFooter.tsx index 276e3c0..8889b14 100644 --- a/src/pages/menu/components/MenuFooter/MenuFooter.tsx +++ b/src/pages/menu/components/MenuFooter/MenuFooter.tsx @@ -75,7 +75,7 @@ export function MenuFooter() { margin: "0 10px", }} > - {t("menu.viewCart")} + { orderType === OrderType.Pay ? t("menu.pay") : t("menu.viewCart")} { - if (isOpen && splitAmount > 0) { - dispatch(updateSplitBillAmount(splitAmount)); - } - }, [isOpen, splitAmount, dispatch]); - const handleSave = () => { dispatch(updateSplitBillAmount(splitAmount)); onClose(); @@ -68,6 +61,8 @@ export function EqualltyChoiceBottomSheet({ onRemoveSplitWay?.(); onClose(); }; + + console.log(grandTotal); return (
@@ -161,51 +163,47 @@ export function PayForYourItemsChoiceBottomSheet({ ); }) )} - - {selectedTotal > 0 && ( -
-
- - {t("splitBill.selectedTotal")}: - - -
-
- )} - +
+
- - + + {t("splitBill.selectedTotal")}: + +
+
+ + +
); }