diff --git a/src/app/[name]/(Dialogs)/cart/service/CartService.ts b/src/app/[name]/(Dialogs)/cart/service/CartService.ts
index 05bba95..8e14a79 100644
--- a/src/app/[name]/(Dialogs)/cart/service/CartService.ts
+++ b/src/app/[name]/(Dialogs)/cart/service/CartService.ts
@@ -1,5 +1,5 @@
import { api } from "@/config/axios";
-import { BulkCartItem, CartResponse } from "../types/Types";
+import { BulkCartItem, CartResponse, SaveAllMethod } from "../types/Types";
export const bulkCart = async (params: BulkCartItem) => {
const { data } = await api.post("/public/cart/items/bulk", params);
@@ -30,3 +30,8 @@ export const getCartSummary = async () => {
const { data } = await api.get("/public/cart/summary");
return data;
};
+
+export const saveAllMethod = async (params: SaveAllMethod) => {
+ const { data } = await api.patch("/public/cart/all", params);
+ return data;
+};
diff --git a/src/app/[name]/(Dialogs)/cart/store/Store.ts b/src/app/[name]/(Dialogs)/cart/store/Store.ts
new file mode 100644
index 0000000..ea682e2
--- /dev/null
+++ b/src/app/[name]/(Dialogs)/cart/store/Store.ts
@@ -0,0 +1,45 @@
+import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
+import { CartStoreType, SaveAllMethod } from "../types/Types";
+
+export const useCartStore = create
()(
+ persist(
+ (set, get) => ({
+ description: "",
+ setDescription: (value) => set({ description: value }),
+ deliveryMethodId: null,
+ setDeliveryMethodId: (value) => set({ deliveryMethodId: value }),
+ addressId: null,
+ setAddressId: (value) => set({ addressId: value }),
+ paymentMethodId: null,
+ setPaymentMethodId: (value) => set({ paymentMethodId: value }),
+ carAddress: null,
+ setCarAddress: (value) => set({ carAddress: value }),
+ reset: () =>
+ set({
+ description: "",
+ deliveryMethodId: null,
+ addressId: null,
+ paymentMethodId: null,
+ carAddress: null,
+ }),
+ getSaveAllMethodData: (): SaveAllMethod | null => {
+ const state = get();
+ if (!state.deliveryMethodId || !state.paymentMethodId) {
+ return null;
+ }
+ return {
+ description: state.description,
+ deliveryMethodId: state.deliveryMethodId,
+ ...(state.addressId && { addressId: state.addressId }),
+ paymentMethodId: state.paymentMethodId,
+ ...(state.carAddress && { carAddress: state.carAddress }),
+ };
+ },
+ }),
+ {
+ name: "cart-storage",
+ storage: createJSONStorage(() => localStorage),
+ }
+ )
+);
diff --git a/src/app/[name]/(Dialogs)/cart/types/Types.ts b/src/app/[name]/(Dialogs)/cart/types/Types.ts
index fda3183..983506c 100644
--- a/src/app/[name]/(Dialogs)/cart/types/Types.ts
+++ b/src/app/[name]/(Dialogs)/cart/types/Types.ts
@@ -85,3 +85,40 @@ export interface CartFood {
}
export type CartResponse = BaseResponse;
+
+export type SaveAllMethod = {
+ description: string;
+ deliveryMethodId: string;
+ addressId?: string;
+ paymentMethodId: string;
+ carAddress?: {
+ carModel: string;
+ carColor: string;
+ plateNumber: string;
+ };
+};
+
+export type CartStoreType = {
+ description: string;
+ setDescription: (value: string) => void;
+ deliveryMethodId: string | null;
+ setDeliveryMethodId: (value: string | null) => void;
+ addressId: string | null;
+ setAddressId: (value: string | null) => void;
+ paymentMethodId: string | null;
+ setPaymentMethodId: (value: string | null) => void;
+ carAddress: {
+ carModel: string;
+ carColor: string;
+ plateNumber: string;
+ } | null;
+ setCarAddress: (
+ value: {
+ carModel: string;
+ carColor: string;
+ plateNumber: string;
+ } | null
+ ) => void;
+ reset: () => void;
+ getSaveAllMethodData: () => SaveAllMethod | null;
+};
diff --git a/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSection.tsx b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSection.tsx
index 45d0a72..ecc2faa 100644
--- a/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSection.tsx
+++ b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/AddressSection.tsx
@@ -8,7 +8,6 @@ import Link from 'next/link';
import { useParams } from 'next/navigation';
import { useEffect, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
-import { useSetAddressCart } from '../../hooks/useOrderData';
import { useCheckoutStore } from '../../store/Store';
import useToggle from '@/hooks/helpers/useToggle';
import { AddressSelectionModal } from './AddressSelectionModal';
@@ -19,7 +18,6 @@ const formatAddress = (address: Address) => {
export const AddressSection = () => {
- const { mutate: setAddressCart } = useSetAddressCart();
const { setIsSelectedAddress, selectedAddressId, setSelectedAddressId, isSelectedShipment } = useCheckoutStore();
const params = useParams<{ name: string; id: string }>();
const { t } = useTranslation('parallels', { keyPrefix: 'OrderDetail' });
@@ -35,24 +33,16 @@ export const AddressSection = () => {
const defaultAddress = addresses.find(addr => addr.isDefault);
const addressToSet = defaultAddress || addresses.filter(addr => !addr.isDefault)[0];
if (addressToSet) {
- setAddressCart(addressToSet.id, {
- onSuccess: () => {
- setIsSelectedAddress(true);
- setSelectedAddressId(addressToSet.id);
- },
- });
+ setIsSelectedAddress(true);
+ setSelectedAddressId(addressToSet.id);
}
}
- }, [isLoading, addresses, setAddressCart, setIsSelectedAddress, selectedAddressId, setSelectedAddressId, isSelectedShipment]);
+ }, [isLoading, addresses, setIsSelectedAddress, selectedAddressId, setSelectedAddressId, isSelectedShipment]);
const handleSelectAddress = (addressId: string) => {
- setAddressCart(addressId, {
- onSuccess: () => {
- setIsSelectedAddress(true);
- setSelectedAddressId(addressId);
- setModalVisible(false);
- },
- });
+ setIsSelectedAddress(true);
+ setSelectedAddressId(addressId);
+ setModalVisible(false);
};
// پیدا کردن آدرس انتخاب شده یا آدرس پیشفرض یا اولین آدرس غیر پیشفرض
diff --git a/src/app/[name]/(Dialogs)/order/checkout/[id]/components/CarAddressSection.tsx b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/CarAddressSection.tsx
new file mode 100644
index 0000000..dcbf960
--- /dev/null
+++ b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/CarAddressSection.tsx
@@ -0,0 +1,81 @@
+'use client';
+
+import InputField from '@/components/input/InputField';
+import { useTranslation } from 'react-i18next';
+import { useCheckoutStore } from '../../store/Store';
+import { useCallback, useEffect } from 'react';
+
+export const CarAddressSection = () => {
+ const { t } = useTranslation('parallels', { keyPrefix: 'OrderDetail' });
+ const { carAddress, setCarAddress } = useCheckoutStore();
+
+ const handleCarModelChange = useCallback((e: React.ChangeEvent) => {
+ setCarAddress({
+ carModel: e.target.value,
+ carColor: carAddress?.carColor || '',
+ plateNumber: carAddress?.plateNumber || '',
+ });
+ }, [carAddress, setCarAddress]);
+
+ const handleCarColorChange = useCallback((e: React.ChangeEvent) => {
+ setCarAddress({
+ carModel: carAddress?.carModel || '',
+ carColor: e.target.value,
+ plateNumber: carAddress?.plateNumber || '',
+ });
+ }, [carAddress, setCarAddress]);
+
+ const handlePlateNumberChange = useCallback((e: React.ChangeEvent) => {
+ setCarAddress({
+ carModel: carAddress?.carModel || '',
+ carColor: carAddress?.carColor || '',
+ plateNumber: e.target.value,
+ });
+ }, [carAddress, setCarAddress]);
+
+ useEffect(() => {
+ if (!carAddress) {
+ setCarAddress({
+ carModel: '',
+ carColor: '',
+ plateNumber: '',
+ });
+ }
+ }, [carAddress, setCarAddress]);
+
+ return (
+
+
+
+ اطلاعات خودرو
+
+
+
+
+
+
+