- {order.items.map((item) => {
+ {items.map((item) => {
+ const imageUrl = getFoodImage(item.food.images);
return (
- {order.price} T
+ {formattedPrice} T
@@ -163,17 +118,26 @@ function OrdersIndex() {
}
const secondTab = () => {
- return currentOrders.map((order) => {
+ if (previousOrders.length === 0) {
+ return [
سفارش قبلی وجود ندارد
];
+ }
+
+ return previousOrders.map((order) => {
+ const address = order.address?.address || 'آدرس ثبت نشده';
+ const formattedDate = formatDate(order.createdAt);
+ const formattedPrice = order.total.toLocaleString('fa-IR');
+ const items: HistoryOrderItem[] = order.items || [];
+
return (
-
{order.address}
+
{address}
-
{order.date}
+
{formattedDate}
@@ -181,13 +145,14 @@ function OrdersIndex() {
- {order.items.map((item) => {
+ {items.map((item) => {
+ const imageUrl = getFoodImage(item.food.images);
return (
- {order.price} T
+ {formattedPrice} T
@@ -222,12 +187,14 @@ function OrdersIndex() {
{firstTab()}}
- title={categories[0].title} icon={categories[0].icon}>
-
+ title={categories[0].title}
+ icon={categories[0].icon}
+ />
{secondTab()}}
- title={categories[1].title} icon={categories[1].icon}>
-
+ title={categories[1].title}
+ icon={categories[1].icon}
+ />
)
diff --git a/src/app/[name]/(Main)/order/history/service/Service.ts b/src/app/[name]/(Main)/order/history/service/Service.ts
new file mode 100644
index 0000000..c8f0cfc
--- /dev/null
+++ b/src/app/[name]/(Main)/order/history/service/Service.ts
@@ -0,0 +1,7 @@
+import { api } from "@/config/axios";
+import { OrdersResponse } from "../types/Types";
+
+export const getOrders = async (): Promise
=> {
+ const { data } = await api.get("/public/orders");
+ return data;
+};
diff --git a/src/app/[name]/(Main)/order/history/types/Types.ts b/src/app/[name]/(Main)/order/history/types/Types.ts
new file mode 100644
index 0000000..2eb1af5
--- /dev/null
+++ b/src/app/[name]/(Main)/order/history/types/Types.ts
@@ -0,0 +1,165 @@
+import { BaseResponse } from "@/app/[name]/(Main)/types/Types";
+import { ServiceArea } from "@/app/[name]/(Dialogs)/order/checkout/types/Types";
+
+export interface HistoryOrderUser {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ firstName: string;
+ lastName: string;
+ phone: string;
+ birthDate: string;
+ marriageDate: string;
+ referrer: string | null;
+ isActive: boolean;
+ gender: boolean;
+ wallet: number;
+ points: number;
+}
+
+export interface HistoryOrderRestaurant {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ name: string;
+ slug: string;
+ logo: string | null;
+ address: string | null;
+ menuColor: string | null;
+ latitude: number | null;
+ longitude: number | null;
+ serviceArea: ServiceArea;
+ isActive: boolean;
+ establishedYear: number | null;
+ phoneNumber: string | null;
+ phone: string;
+ instagram: string | null;
+ telegram: string | null;
+ whatsapp: string | null;
+ description: string | null;
+ seoTitle: string | null;
+ seoDescription: string | null;
+ tagNames: string | null;
+ images: string | null;
+ vat: number;
+ domain: string;
+}
+
+export interface HistoryOrderDeliveryMethod {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ title: string;
+ method: "dineIn" | "pickup" | "deliveryCar" | "deliveryCourier";
+ restaurant: string;
+ deliveryFee: number;
+ minOrderPrice: number;
+ description: string;
+ enabled: boolean;
+ order: number;
+}
+
+export interface HistoryOrderAddress {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ user: string;
+ title: string;
+ address: string;
+ city: string;
+ province: string;
+ postalCode: string;
+ latitude: number;
+ longitude: number;
+ phone: string;
+ isDefault: boolean;
+}
+
+export interface HistoryOrderPaymentMethod {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ restaurant: string;
+ title: string;
+ method: "CardOnDelivery" | "Cash" | "Online";
+ gateway: string | null;
+ description: string;
+ enabled: boolean;
+ order: number;
+ merchantId: string | null;
+}
+
+export interface HistoryOrderFood {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ restaurant: string;
+ category: string;
+ title: string;
+ desc: string | null;
+ content: string | null;
+ price: number;
+ points: number | null;
+ order: number | null;
+ prepareTime: number | null;
+ sat: boolean;
+ sun: boolean;
+ mon: boolean;
+ breakfast: boolean;
+ noon: boolean;
+ dinner: boolean;
+ stock: number;
+ stockDefault: number;
+ isActive: boolean;
+ images: string | null;
+ inPlaceServe: boolean;
+ pickupServe: boolean;
+ rate: number;
+ discount: number;
+}
+
+export interface HistoryOrderItem {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ order: string;
+ food: HistoryOrderFood;
+ quantity: number;
+ unitPrice: number;
+ discount: number;
+ totalPrice: number;
+}
+
+export interface HistoryOrder {
+ id: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ user: HistoryOrderUser;
+ restaurant: HistoryOrderRestaurant;
+ deliveryMethod: HistoryOrderDeliveryMethod;
+ address: HistoryOrderAddress | null;
+ paymentMethod: HistoryOrderPaymentMethod;
+ orderNumber: number;
+ couponDiscount: number;
+ itemsDiscount: number;
+ totalDiscount: number;
+ subTotal: number;
+ tax: number;
+ shipmentFee: number;
+ total: number;
+ totalItems: number;
+ status: string;
+ paymentStatus: string;
+ items: HistoryOrderItem[];
+}
+
+export type OrdersResponse = BaseResponse;
+
diff --git a/src/lib/api/axiosInstance.ts b/src/lib/api/axiosInstance.ts
index 112657f..c2d51e3 100644
--- a/src/lib/api/axiosInstance.ts
+++ b/src/lib/api/axiosInstance.ts
@@ -59,15 +59,8 @@ axiosInstance.interceptors.response.use(
token: refreshTokenValue,
});
- // Support both response structures
- const accessToken =
- data?.results?.data?.accessToken?.token ||
- data?.data?.tokens?.accessToken?.token ||
- data?.accessToken;
- const refreshTokenValueNew =
- data?.results?.data?.refreshToken?.token ||
- data?.data?.tokens?.refreshToken?.token ||
- data?.refreshToken;
+ const accessToken = data?.data?.accessToken?.token;
+ const refreshTokenValueNew = data?.data?.refreshToken?.token;
if (accessToken) {
await setToken(accessToken);
@@ -88,9 +81,9 @@ axiosInstance.interceptors.response.use(
await removeToken();
await removeRefreshToken();
if (typeof window !== "undefined") {
- const pathname = window.location.pathname;
- const slug = pathname.split("/")[1];
- window.location.href = slug ? `/${slug}` : `/`;
+ // const pathname = window.location.pathname;
+ // const slug = pathname.split("/")[1];
+ // window.location.href = slug ? `/${slug}` : `/`;
}
return Promise.reject(refreshError);
} finally {