diff --git a/public/thawani.png b/public/thawani.png
new file mode 100644
index 0000000..8e10ece
Binary files /dev/null and b/public/thawani.png differ
diff --git a/src/assets/locals/ar.json b/src/assets/locals/ar.json
index b0a6ad7..720cf49 100644
--- a/src/assets/locals/ar.json
+++ b/src/assets/locals/ar.json
@@ -334,7 +334,8 @@
"pickup": "استلام",
"setPickupTime": "تحديد وقت الاستلام",
"carPlateNumber": "رقم لوحة السيارة",
- "noItems": "لا يوجد عناصر في السلة"
+ "noItems": "لا يوجد عناصر في السلة",
+ "thawani": "ثواني"
},
"address": {
"title": "العنوان",
diff --git a/src/assets/locals/en.json b/src/assets/locals/en.json
index b2f0de4..122f702 100644
--- a/src/assets/locals/en.json
+++ b/src/assets/locals/en.json
@@ -353,7 +353,8 @@
"pickup": "Pickup",
"setPickupTime": "Set Pickup Time",
"carPlateNumber": "Car Plate Number",
- "noItems": "No items in cart"
+ "noItems": "No items in cart",
+ "thawani": "Thawani"
},
"address": {
"title": "Address",
diff --git a/src/components/Icons/RefershIcon.tsx b/src/components/Icons/RefershIcon.tsx
index e07c260..78ac1b8 100644
--- a/src/components/Icons/RefershIcon.tsx
+++ b/src/components/Icons/RefershIcon.tsx
@@ -18,9 +18,9 @@ const RefershIcon = ({ className, onClick, dimension }: RefershIconType) => {
);
diff --git a/src/components/PaymentMethods/PaymentMethods.tsx b/src/components/PaymentMethods/PaymentMethods.tsx
index 57cab9a..f9031e0 100644
--- a/src/components/PaymentMethods/PaymentMethods.tsx
+++ b/src/components/PaymentMethods/PaymentMethods.tsx
@@ -1,7 +1,7 @@
-import { Form, Radio, Space } from "antd";
+import { Form, Image, Radio, Space } from "antd";
import { Group } from "antd/es/radio";
import ArabicPrice from "components/ArabicPrice";
-import DifferentCardIcon from "components/Icons/paymentMethods/DifferentCardIcon";
+// import DifferentCardIcon from "components/Icons/paymentMethods/DifferentCardIcon";
import ProText from "components/ProText";
import {
selectCart,
@@ -14,7 +14,6 @@ import { colors, ProGray1 } from "../../ThemeConstants";
import ProInputCard from "../ProInputCard/ProInputCard";
import styles from "./PaymentMethods.module.css";
import { OrderType } from "pages/checkout/hooks/types.ts";
-import RCardIcon from "components/Icons/RCardIcon";
import { formatPriceUi } from "utils/helpers";
const PaymentMethods = () => {
@@ -22,7 +21,7 @@ const PaymentMethods = () => {
const { paymentMethod, orderType } = useAppSelector(selectCart);
const dispatch = useAppDispatch();
const grandTotal = useAppSelector(selectGrandTotal);
- const { isRTL } = useAppSelector((state) => state.locale);
+ // const { isRTL } = useAppSelector((state) => state.locale);
const options: {
label: React.ReactNode;
@@ -40,12 +39,14 @@ const PaymentMethods = () => {
- $
+ {/* $ */}
+
+
+ {t("checkout.cash")}
- {t("checkout.cash")}
>
),
value: "cash",
@@ -65,14 +66,26 @@ const PaymentMethods = () => {
{
label: (
<>
-
- {t("checkout.differentCard")}
+ {/* */}
+
+ {t("checkout.thawani")}
+
>
),
- value: "differentCard",
+ value: "thawani",
icon: (
-
+
),
hideCurrency: true,
diff --git a/src/features/order/orderSlice.ts b/src/features/order/orderSlice.ts
index bfb95a8..4d09f60 100644
--- a/src/features/order/orderSlice.ts
+++ b/src/features/order/orderSlice.ts
@@ -380,7 +380,11 @@ const orderSlice = createSlice({
// Clear all cart data from localStorage
if (typeof window !== "undefined") {
Object.values(CART_STORAGE_KEYS)
- .filter((key) => key !== CART_STORAGE_KEYS.ORDER_TYPE)
+ .filter(
+ (key) =>
+ key !== CART_STORAGE_KEYS.ORDER_TYPE &&
+ key !== CART_STORAGE_KEYS.PAYMENT_METHOD,
+ )
.forEach((key) => {
localStorage.removeItem(key);
});
@@ -703,7 +707,7 @@ const orderSlice = createSlice({
},
updateOrder(state, action: PayloadAction) {
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 e175d8a..3282cdc 100644
--- a/src/pages/checkout/hooks/useOrder.ts
+++ b/src/pages/checkout/hooks/useOrder.ts
@@ -75,8 +75,6 @@ export default function useOrder() {
duration: 0,
});
- console.log(order?.roomNumber);
-
createOrder({
phone: mobilenumber || phone || giftDetails?.senderPhone,
comment: specialRequest,
@@ -152,8 +150,9 @@ export default function useOrder() {
);
else {
const redirectMessageKey = "order-redirect-loader";
+
if (
- orderType === OrderType.Gift &&
+ localStorage.getItem("fascano_payment_method")?.toString() === '"thawani"' &&
mutationResult.data?.result?.orderID
) {
message.loading({