danak/negareh-console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Requests

Browse Source
This commit is contained in:
hamid zarghami
2026-02-22 16:30:11 +03:30
parent 0d25091e71
commit b308150303
20 changed files with 890 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+661 -20
View File
File diff suppressed because it is too large Load Diff
src/config/Paths.tsx
+7 -3
View File
@@ -1,10 +1,14 @@
export const Paths = {
home: '/home',
profile: '/profile',
myOrders: '/my-orders',
myRequests: '/my-requests',
proformaInvoice: '/proforma-invoice',
newOrder: '/new-order',
orderDetails: '/order/',
newRequest: '/new-request',
requestDetails: '/request/',
request: {
myRequest: '/my-requests',
newRequest: '/new-request',
},
tickets: {
list: '/tickets/list',
create: '/tickets/create',
src/locale/fa.ts
+1
View File
@@ -13,6 +13,7 @@ export const fa = {
submitYourOrder: "سفارش خودرا ثبت کنید",
submitYourOrderDescription: "کارت ویزیت ، کاتالوگ ، بروشور و...",
newOrder: "سفارش جدید",
myRequests: "درخواست های من",
},
announcement: {
announcements: "اطلاعیه ها",
src/pages/home/Home.tsx
+1 -1
View File
@@ -25,7 +25,7 @@ const Home: FC = () => {
<h4 className='mt-4 text-center font-medium'>
{t('home.submitNewOrder')}
</h4>
<Link to={Paths.newOrder}>
<Link to={Paths.newRequest}>
<Button
className='mt-2.5'>
<div className='flex gap-1'>
src/pages/order/hooks/useOrderData.ts
-60
View File
@@ -1,60 +0,0 @@
import { useMutation, useQuery } from "@tanstack/react-query";
import * as api from "../service/OrderService";
import type { TabMyOrdersEnum } from "../enum/OrderEnum";
import type { AddTicketType } from "../type/Types";
export const useGetProducts = () => {
return useQuery({
queryKey: ["products"],
queryFn: api.getProducts,
});
};
export const useGetAttributes = (id?: string) => {
return useQuery({
queryKey: ["products-attributes", id],
queryFn: () => api.getAttributes(id),
enabled: !!id,
});
};
export const useSubmitOrder = () => {
return useMutation({
mutationFn: api.submitOrder,
});
};
export const useGetMyOrders = (page: number = 1, statuses: TabMyOrdersEnum) => {
return useQuery({
queryKey: ["my-orders", page, statuses],
queryFn: () => api.getMyOrders(page, statuses),
});
};
export const useGetOrderDetails = (id: string) => {
return useQuery({
queryKey: ["order", id],
queryFn: () => api.getOrderDetails(id),
enabled: !!id,
});
};
export const useGetTickets = (orderId: string) => {
return useQuery({
queryKey: ["tickets", orderId],
queryFn: () => api.getTickets(orderId),
enabled: !!orderId,
});
};
export const useAddTicket = () => {
return useMutation({
mutationFn: ({
orderId,
params,
}: {
orderId: string;
params: AddTicketType;
}) => api.addTicket(orderId, params),
});
};
src/pages/order/service/OrderService.ts
-80
View File
@@ -1,80 +0,0 @@
import axios from "@/config/axios";
import type {
AddTicketType,
AttributeResponseType,
MyOrdersResponseType,
OrderDetailResponseType,
OrderType,
ProductsResponseType,
TicketsResponseType,
} from "../type/Types";
import { OrderStatusEnum, TabMyOrdersEnum } from "../enum/OrderEnum";
export const getProducts = async () => {
const { data } = await axios.get<ProductsResponseType>(`/public/products`);
return data;
};
export const getAttributes = async (productId?: string) => {
const { data } = await axios.get<AttributeResponseType>(
`/public/entity/${productId}/field`,
);
return data;
};
export const submitOrder = async (params: OrderType[]) => {
const { data } = await axios.post(`/public/request`, { items: params });
return data;
};
export const getMyOrders = async (
page: number = 1,
active: TabMyOrdersEnum,
) => {
const statuses =
active === TabMyOrdersEnum.IN_PROGRESS
? [
OrderStatusEnum.DESIGN_FINISHED,
OrderStatusEnum.DESIGN_INITIATED,
OrderStatusEnum.DESIGN_REVISION,
OrderStatusEnum.IN_PRINTING,
OrderStatusEnum.AFTER_PRINT_BOXING,
OrderStatusEnum.AFTER_PRINT_CARTONING,
OrderStatusEnum.AFTER_PRINT_COVER,
OrderStatusEnum.READY_FOR_DELIVERY,
OrderStatusEnum.READY_TO_PRINTING,
]
: active === TabMyOrdersEnum.CANCELLED
? [OrderStatusEnum.CANCELED]
: active === TabMyOrdersEnum.DELIVERED
? [OrderStatusEnum.DELIVERED]
: undefined;
let query = `?page=${page}`;
if (statuses) {
query += `&statuses=${statuses}`;
}
const { data } = await axios.get<MyOrdersResponseType>(
`/public/request${query}`,
);
return data;
};
export const getOrderDetails = async (id: string) => {
const { data } = await axios.get<OrderDetailResponseType>(
`/public/orders/${id}`,
);
return data;
};
export const getTickets = async (id: string) => {
const { data } = await axios.get<TicketsResponseType>(
`/public/ticket/order/item/${id}`,
);
return data;
};
export const addTicket = async (id: string, params: AddTicketType) => {
const { data } = await axios.post(`/public/ticket/order/item/${id}`, params);
return data;
};
src/pages/order/MyOrders.tsx → src/pages/request/MyRequests.tsx
+13 -13
View File
@@ -1,19 +1,19 @@
import Tabs from '@/components/Tabs'
import { useState, type FC } from 'react'
import { TabMyOrdersEnum } from './enum/OrderEnum'
import { TabMyRequestsEnum } from './enum/RequestEnum'
import Filters from '@/components/Filters'
import Button from '@/components/Button'
import { AddSquare, Eye } from 'iconsax-react'
import Table from '@/components/Table'
import { useGetMyOrders } from './hooks/useOrderData'
import { useGetMyRequests } from './hooks/useRequestData'
import moment from 'moment-jalaali'
import { Link } from 'react-router-dom'
import { Paths } from '@/config/Paths'
const MyOrders: FC = () => {
const MyRequests: FC = () => {
const [page, setPage] = useState<number>(1)
const [activeTab, setActiveTab] = useState<TabMyOrdersEnum>(TabMyOrdersEnum.ALL)
const { data } = useGetMyOrders(page, activeTab)
const [activeTab, setActiveTab] = useState<TabMyRequestsEnum>(TabMyRequestsEnum.ALL)
const { data } = useGetMyRequests(page, activeTab)
return (
<div className='mt-5'>
@@ -24,13 +24,13 @@ const MyOrders: FC = () => {
<div className='mt-10'>
<Tabs
items={[
{ label: 'همه', value: TabMyOrdersEnum.ALL },
{ label: 'در حال انجام', value: TabMyOrdersEnum.IN_PROGRESS },
{ label: 'تکمیل داده شده', value: TabMyOrdersEnum.DELIVERED },
{ label: 'کنسل شده', value: TabMyOrdersEnum.CANCELLED },
{ label: 'همه', value: TabMyRequestsEnum.ALL },
{ label: 'در حال انجام', value: TabMyRequestsEnum.IN_PROGRESS },
{ label: 'تکمیل داده شده', value: TabMyRequestsEnum.DELIVERED },
{ label: 'کنسل شده', value: TabMyRequestsEnum.CANCELLED },
]}
activeTab={activeTab}
onTabChange={(tab) => setActiveTab(tab as TabMyOrdersEnum)}
onTabChange={(tab) => setActiveTab(tab as TabMyRequestsEnum)}
/>
</div>
@@ -52,7 +52,7 @@ const MyOrders: FC = () => {
onChange={() => { }}
/>
<Link to={Paths.newOrder}>
<Link to={Paths.newRequest}>
<Button
className='w-fit px-5'
>
@@ -107,7 +107,7 @@ const MyOrders: FC = () => {
title: '',
render: (item) => {
return (
<Link to={Paths.orderDetails + item.id}>
<Link to={Paths.requestDetails + item.id}>
<Eye
size={20}
color='#000000'
@@ -129,4 +129,4 @@ const MyOrders: FC = () => {
)
}
export default MyOrders
export default MyRequests
src/pages/order/NewOrder.tsx → src/pages/request/NewRequest.tsx
+12 -12
View File
@@ -1,27 +1,27 @@
import { useState, type FC } from 'react'
import Order from './components/Order'
import Request from './components/Request'
import Button from '@/components/Button'
import { TickSquare } from 'iconsax-react'
import { useOrderStore } from './store/OrderStore'
import { useSubmitOrder } from './hooks/useOrderData'
import { useRequestStore } from './store/RequestStore'
import { useSubmitRequest } from './hooks/useRequestData'
import { toast } from '@/shared/toast'
import { useNavigate } from 'react-router-dom'
import { Paths } from '@/config/Paths'
import { extractErrorMessage } from '@/config/func'
const NewOrder: FC = () => {
const NewRequest: FC = () => {
const navigate = useNavigate()
const { mutate: submitOrder, isPending } = useSubmitOrder()
const [showOrders, setShowOrders] = useState([0])
const { items } = useOrderStore()
const { mutate: submitRequest, isPending } = useSubmitRequest()
const [showRequests, setShowRequests] = useState([0])
const { items } = useRequestStore()
const onSubmit = () => {
if (items.length > 0) {
submitOrder(items, {
submitRequest(items, {
onSuccess: () => {
toast('سفارش با موفقیت ثبت شد', 'success')
navigate(Paths.myOrders)
navigate(Paths.myRequests)
},
onError: (error) => {
toast(extractErrorMessage(error), 'error')
@@ -51,9 +51,9 @@ const NewOrder: FC = () => {
</Button>
</div>
{showOrders.map((item) => {
{showRequests.map((item) => {
return (
<Order addNewItem={() => setShowOrders([...showOrders, showOrders.length])} key={item} />
<Request addNewItem={() => setShowRequests([...showRequests, showRequests.length])} key={item} />
)
})}
@@ -61,4 +61,4 @@ const NewOrder: FC = () => {
)
}
export default NewOrder
export default NewRequest
src/pages/order/OrderDetail.tsx → src/pages/request/RequestDetail.tsx
+4 -4
View File
@@ -1,13 +1,13 @@
import { type FC } from 'react'
import { Receipt1 } from 'iconsax-react'
import { useParams } from 'react-router-dom'
import { useGetOrderDetails } from './hooks/useOrderData'
import { useGetRequestDetails } from './hooks/useRequestData'
import TicketSection from './components/TicketSection'
const OrderDetail: FC = () => {
const RequestDetail: FC = () => {
const { id } = useParams()
const { data } = useGetOrderDetails(id!)
const { data } = useGetRequestDetails(id!)
return (
<div className="w-full min-h-screen bg-[#eceef6] p-6">
@@ -80,4 +80,4 @@ const OrderDetail: FC = () => {
)
}
export default OrderDetail
export default RequestDetail
src/pages/order/components/ManageAttribute.tsx → src/pages/request/components/ManageAttribute.tsx
+14 -10
View File
@@ -1,7 +1,7 @@
import { type FC } from 'react'
import type { AttributeType, OrderType } from '../type/Types'
import type { AttributeType, RequestType } from '../type/Types'
import { clx } from '@/helpers/utils'
import { FieldTypeEnum } from '../enum/OrderEnum'
import { FieldTypeEnum } from '../enum/RequestEnum'
import Select from '@/components/Select'
import { Checkbox } from '@/components/ui/checkbox'
import RadioGroup from '@/components/RadioGroup'
@@ -12,13 +12,17 @@ import type { FormikProps } from 'formik'
type Props = {
attributes?: AttributeType[],
formik: FormikProps<OrderType>
formik: FormikProps<RequestType>
}
const SERVICE_LINKS_LABEL = 'لینک سرویس ها'
const ManageAttribute: FC<Props> = (props) => {
const { attributes, formik } = props
const getAttributeLabel = (name: string) => name === SERVICE_LINKS_LABEL ? name : 'request'
const handleChange = (attributeId: string, value: string) => {
const attribute = formik.values.attributes
const index: number = attribute.findIndex(o => o.attributeId === attributeId)
@@ -42,7 +46,7 @@ const ManageAttribute: FC<Props> = (props) => {
<div className='mt-6' key={item.id}>
<Select
placeholder={`انتخاب ${item.isRequired ? '(اجباری)' : '(اختاری)'}`}
label={item.name}
label={getAttributeLabel(item.name)}
items={item.options?.map((value) => {
return {
label: value.value,
@@ -56,7 +60,7 @@ const ManageAttribute: FC<Props> = (props) => {
else if (item.type === FieldTypeEnum.checkbox)
return (
<div key={item.id} className='mt-6'>
<div className='text-sm mb-3'>{item.name}</div>
<div className='text-sm mb-3'>{getAttributeLabel(item.name)}</div>
<div className='flex gap-5 flex-wrap'>
{
item.options?.map((value) => {
@@ -80,7 +84,7 @@ const ManageAttribute: FC<Props> = (props) => {
const object = formik.values.attributes.find(o => o.attributeId === item.id)
return (
<div key={item.id} className='mt-6'>
<div className='text-sm mb-3'>{item.name}</div>
<div className='text-sm mb-3'>{getAttributeLabel(item.name)}</div>
<RadioGroup
items={item.options?.map((value) => {
return {
@@ -101,7 +105,7 @@ const ManageAttribute: FC<Props> = (props) => {
<DatePickerComponent
onChange={(date) => handleChange(item.id, date)}
placeholder=''
label={item.name}
label={getAttributeLabel(item.name)}
/>
</div>
)
@@ -109,7 +113,7 @@ const ManageAttribute: FC<Props> = (props) => {
return (
<div key={item.id} className='mt-6'>
<Input
label={item.name}
label={getAttributeLabel(item.name)}
type={item.type}
onChange={(e) => handleChange(item.id, e.target.value)}
/>
@@ -119,7 +123,7 @@ const ManageAttribute: FC<Props> = (props) => {
return (
<div key={item.id} className='mt-6'>
<Textarea
label={item.name}
label={getAttributeLabel(item.name)}
onChange={(e) => handleChange(item.id, e.target.value)}
/>
</div>
@@ -131,4 +135,4 @@ const ManageAttribute: FC<Props> = (props) => {
)
}
export default ManageAttribute
export default ManageAttribute
src/pages/order/components/ProductsSelect.tsx → src/pages/request/components/ProductsSelect.tsx
+2 -2
View File
@@ -1,5 +1,5 @@
import { type FC, type SelectHTMLAttributes } from 'react'
import { useGetProducts } from '../hooks/useOrderData'
import { useGetProducts } from '../hooks/useRequestData'
import Select from '@/components/Select'
type Props = {
@@ -25,4 +25,4 @@ const ProductsSelect: FC<Props> = (props) => {
)
}
export default ProductsSelect
export default ProductsSelect
src/pages/order/components/Order.tsx → src/pages/request/components/Request.tsx
+11 -11
View File
@@ -9,22 +9,22 @@ import { AddSquare, Edit } from 'iconsax-react'
import ProductsSelect from './ProductsSelect'
import { useFormik } from 'formik'
import * as Yup from 'yup'
import type { AttachmentsType, OrderType, ProductType } from '../type/Types'
import { useGetAttributes, useGetProducts } from '../hooks/useOrderData'
import type { AttachmentsType, RequestType, ProductType } from '../type/Types'
import { useGetAttributes, useGetProducts } from '../hooks/useRequestData'
import ManageAttribute from './ManageAttribute'
import { useMultiUpload, useSingleUpload } from '@/pages/uploader/hooks/useUploader'
import { useOrderStore } from '../store/OrderStore'
import { useRequestStore } from '../store/RequestStore'
import { clx } from '@/helpers/utils'
type Props = {
addNewItem: () => void,
}
const Order: FC<Props> = ({ addNewItem }) => {
const Request: FC<Props> = ({ addNewItem }) => {
const { data } = useGetProducts()
const { setItems, items } = useOrderStore()
const [indexOrder, setIndexOrder] = useState<number>(-1)
const { setItems, items } = useRequestStore()
const [indexRequest, setIndexRequest] = useState<number>(-1)
const [isEditMode, setIsEditMode] = useState<boolean>(false)
const [productSelected, setProductSelected] = useState<ProductType>()
const [voiceFile, setVoiceFile] = useState<File>()
@@ -33,7 +33,7 @@ const Order: FC<Props> = ({ addNewItem }) => {
const singleUpload = useSingleUpload()
const multiUpload = useMultiUpload()
const formik = useFormik<OrderType>({
const formik = useFormik<RequestType>({
initialValues: {
productId: undefined,
attachments: [],
@@ -69,9 +69,9 @@ const Order: FC<Props> = ({ addNewItem }) => {
}
})
}
if (indexOrder === -1) {
if (indexRequest === -1) {
values.attachments = attachments
setIndexOrder(items.length)
setIndexRequest(items.length)
setItems([...items, values])
addNewItem()
setIsEditMode(true)
@@ -81,7 +81,7 @@ const Order: FC<Props> = ({ addNewItem }) => {
}
const items_edit = [...items]
items_edit[indexOrder] = values
items_edit[indexRequest] = values
setItems(items_edit)
}
}
@@ -188,4 +188,4 @@ const Order: FC<Props> = ({ addNewItem }) => {
)
}
export default Order
export default Request
src/pages/order/components/TicketSection.tsx → src/pages/request/components/TicketSection.tsx
+4 -27
View File
@@ -1,5 +1,4 @@
import Button from '@/components/Button'
import Input from '@/components/Input'
import UploadBox from '@/components/UploadBox'
import { Microphone, Paperclip2 } from 'iconsax-react'
import { useState, type FC } from 'react'
@@ -7,24 +6,21 @@ import { useVoiceRecorder } from '@/hooks/useVoiceRecorder'
import { Play, Pause } from 'iconsax-react'
import { useMultiUpload, useSingleUpload } from '@/pages/uploader/hooks/useUploader'
import type { AddTicketType } from '../type/Types'
import { useAddTicket, useGetOrderDetails, useGetTickets } from '../hooks/useOrderData'
import { useAddTicket, useGetTickets } from '../hooks/useRequestData'
import { useParams } from 'react-router-dom'
import { toast } from '@/shared/toast'
import { extractErrorMessage, getFileNameAndExtensionFromUrl } from '@/config/func'
import VoicePlayer from '@/components/VoicePlayer'
import Select from '@/components/Select'
const TicketSection: FC = () => {
const { id } = useParams()
const { data: order } = useGetOrderDetails(id!)
const [itemId, setItemId] = useState<string>('')
const [message, setMessage] = useState('')
const [files, setFiles] = useState<File[]>([])
const addTicket = useAddTicket()
const { data, refetch } = useGetTickets(itemId)
const { data, refetch } = useGetTickets(id!)
const singleUpload = useSingleUpload()
const multiUpload = useMultiUpload()
@@ -69,7 +65,7 @@ const TicketSection: FC = () => {
})
}
addTicket.mutate({ orderId: itemId, params: params }, {
addTicket.mutate({ requestId: id!, params: params }, {
onSuccess: () => {
toast('پیام شما با موفقیت ارسال شد')
refetch()
@@ -92,26 +88,7 @@ const TicketSection: FC = () => {
return (
<div className="bg-white rounded-2xl p-6">
{/* Designer Name */}
<div className="mt-6 rowTwoInput">
<Input
label="نام طراح"
placeholder="عباس حسینی"
readOnly
/>
<Select
items={order?.data?.items?.map((item) => {
return {
label: item.product?.title,
value: item.id + ''
}
}) || []}
onChange={(e) => setItemId(e.target.value)}
label='انتخاب محصول'
placeholder='انتخاب'
/>
</div>
{
data?.data?.map((item) => {
if (item.user)
@@ -273,4 +250,4 @@ const TicketSection: FC = () => {
)
}
export default TicketSection
export default TicketSection
src/pages/order/enum/OrderEnum.ts → src/pages/request/enum/RequestEnum.ts
+2 -2
View File
@@ -1,4 +1,4 @@
export const enum TabMyOrdersEnum {
export const enum TabMyRequestsEnum {
ALL = "all",
IN_PROGRESS = "in_progress",
CONFIRMED = "confirmed",
@@ -16,7 +16,7 @@ export const enum FieldTypeEnum {
date = "date",
}
export enum OrderStatusEnum {
export enum RequestStatusEnum {
CREATED = "created",
INVOICED = "invoiced",
src/pages/request/hooks/useRequestData.ts
+60
View File
@@ -0,0 +1,60 @@
import { useMutation, useQuery } from "@tanstack/react-query";
import * as api from "../service/RequestService";
import type { TabMyRequestsEnum } from "../enum/RequestEnum";
import type { AddTicketType } from "../type/Types";
export const useGetProducts = () => {
return useQuery({
queryKey: ["products"],
queryFn: api.getProducts,
});
};
export const useGetAttributes = (id?: string) => {
return useQuery({
queryKey: ["products-attributes", id],
queryFn: () => api.getAttributes(id),
enabled: !!id,
});
};
export const useSubmitRequest = () => {
return useMutation({
mutationFn: api.submitRequest,
});
};
export const useGetMyRequests = (page: number = 1, statuses: TabMyRequestsEnum) => {
return useQuery({
queryKey: ["my-requests", page, statuses],
queryFn: () => api.getMyRequests(page, statuses),
});
};
export const useGetRequestDetails = (id: string) => {
return useQuery({
queryKey: ["request", id],
queryFn: () => api.getRequestDetails(id),
enabled: !!id,
});
};
export const useGetTickets = (requestId: string) => {
return useQuery({
queryKey: ["tickets", requestId],
queryFn: () => api.getTickets(requestId),
enabled: !!requestId,
});
};
export const useAddTicket = () => {
return useMutation({
mutationFn: ({
requestId,
params,
}: {
requestId: string;
params: AddTicketType;
}) => api.addTicket(requestId, params),
});
};
src/pages/request/service/RequestService.ts
+80
View File
@@ -0,0 +1,80 @@
import axios from "@/config/axios";
import type {
AddTicketType,
AttributeResponseType,
MyRequestsResponseType,
RequestDetailResponseType,
RequestType,
ProductsResponseType,
TicketsResponseType,
} from "../type/Types";
import { RequestStatusEnum, TabMyRequestsEnum } from "../enum/RequestEnum";
export const getProducts = async () => {
const { data } = await axios.get<ProductsResponseType>(`/public/products`);
return data;
};
export const getAttributes = async (productId?: string) => {
const { data } = await axios.get<AttributeResponseType>(
`/public/entity/${productId}/field`,
);
return data;
};
export const submitRequest = async (params: RequestType[]) => {
const { data } = await axios.post(`/public/request`, { items: params });
return data;
};
export const getMyRequests = async (
page: number = 1,
active: TabMyRequestsEnum,
) => {
const statuses =
active === TabMyRequestsEnum.IN_PROGRESS
? [
RequestStatusEnum.DESIGN_FINISHED,
RequestStatusEnum.DESIGN_INITIATED,
RequestStatusEnum.DESIGN_REVISION,
RequestStatusEnum.IN_PRINTING,
RequestStatusEnum.AFTER_PRINT_BOXING,
RequestStatusEnum.AFTER_PRINT_CARTONING,
RequestStatusEnum.AFTER_PRINT_COVER,
RequestStatusEnum.READY_FOR_DELIVERY,
RequestStatusEnum.READY_TO_PRINTING,
]
: active === TabMyRequestsEnum.CANCELLED
? [RequestStatusEnum.CANCELED]
: active === TabMyRequestsEnum.DELIVERED
? [RequestStatusEnum.DELIVERED]
: undefined;
let query = `?page=${page}`;
if (statuses) {
query += `&statuses=${statuses}`;
}
const { data } = await axios.get<MyRequestsResponseType>(
`/public/request${query}`,
);
return data;
};
export const getRequestDetails = async (id: string) => {
const { data } = await axios.get<RequestDetailResponseType>(
`/public/request/${id}`,
);
return data;
};
export const getTickets = async (id: string) => {
const { data } = await axios.get<TicketsResponseType>(
`/public/ticket/ref/${id}`,
);
return data;
};
export const addTicket = async (id: string, params: AddTicketType) => {
const { data } = await axios.post(`/public/ticket/ref/${id}`, params);
return data;
};
src/pages/order/store/OrderStore.ts → src/pages/request/store/RequestStore.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import { create } from "zustand";
import type { StoreType } from "../type/Types";
export const useOrderStore = create<StoreType>((set) => ({
export const useRequestStore = create<StoreType>((set) => ({
items: [],
setItems(value) {
set({ items: value });
src/pages/order/type/Types.ts → src/pages/request/type/Types.ts
+7 -7
View File
@@ -1,5 +1,5 @@
import type { BaseResponse } from "@/shared/types/Types";
import type { FieldTypeEnum } from "../enum/OrderEnum";
import type { FieldTypeEnum } from "../enum/RequestEnum";
import type { RowDataType } from "@/components/types/TableTypes";
export type CategoryType = {
@@ -17,7 +17,7 @@ export type AttachmentsType = {
type: string;
};
export type OrderType = {
export type RequestType = {
productId?: string;
quantity?: number;
attributes: {
@@ -63,11 +63,11 @@ export type ProductType = {
export type ProductsResponseType = BaseResponse<ProductType[]>;
export type StoreType = {
items: OrderType[];
setItems: (value: OrderType[]) => void;
items: RequestType[];
setItems: (value: RequestType[]) => void;
};
export interface MyOrderType extends RowDataType {
export interface MyRequestType extends RowDataType {
balance: number;
createdAt: string;
discount: number;
@@ -96,9 +96,9 @@ export interface MyOrderType extends RowDataType {
}[];
}
export type MyOrdersResponseType = BaseResponse<MyOrderType[]>;
export type MyRequestsResponseType = BaseResponse<MyRequestType[]>;
export type OrderDetailResponseType = BaseResponse<MyOrderType>;
export type RequestDetailResponseType = BaseResponse<MyRequestType>;
export type AddTicketType = {
content: string;
src/router/MainRouter.tsx
+6 -6
View File
@@ -4,10 +4,10 @@ import Home from '../pages/home/Home'
import SideBar from '../shared/Sidebar'
import Header from '../shared/Header'
import { Paths } from '@/config/Paths'
import MyOrders from '@/pages/order/MyOrders'
import MyRequests from '@/pages/request/MyRequests'
import ProformaInvoice from '@/pages/invoice/ProformaInvoice'
import NewOrder from '@/pages/order/NewOrder'
import OrderDetail from '@/pages/order/OrderDetail'
import NewRequest from '@/pages/request/NewRequest'
import RequestDetail from '@/pages/request/RequestDetail'
import TicketList from '@/pages/ticket/TicketList'
import CreateTicket from '@/pages/ticket/CreateTicket'
import TicketDetail from '@/pages/ticket/Detail'
@@ -30,10 +30,10 @@ const MainRouter: FC = () => {
<Routes>
<Route path="/" element={<Home />} />
<Route path={Paths.home} element={<Home />} />
<Route path={Paths.myOrders} element={<MyOrders />} />
<Route path={Paths.myRequests} element={<MyRequests />} />
<Route path={Paths.proformaInvoice} element={<ProformaInvoice />} />
<Route path={Paths.newOrder} element={<NewOrder />} />
<Route path={`${Paths.orderDetails}:id`} element={<OrderDetail />} />
<Route path={Paths.newRequest} element={<NewRequest />} />
<Route path={`${Paths.requestDetails}:id`} element={<RequestDetail />} />
<Route path={Paths.tickets.list} element={<TicketList />} />
<Route path={Paths.tickets.create} element={<CreateTicket />} />
<Route path={`${Paths.tickets.detail}:id`} element={<TicketDetail />} />
src/shared/Sidebar.tsx
+4 -4
View File
@@ -54,9 +54,9 @@ const SideBar: FC = () => {
<SideBarItem
icon={<Element3 size={iconSizeSideBar} color='#4F5260' />}
title={t('sidebar.myOrders')}
isActive={isActive('/my-orders')}
link={Paths.myOrders}
title={t('sidebar.myRequests')}
isActive={isActive('/my-requests')}
link={Paths.request.myRequest}
/>
<SideBarItem
@@ -108,7 +108,7 @@ const SideBar: FC = () => {
<div className='bg-[#F5F7FC] rounded-2xl p-4 text-center'>
<div className='text-[15px] font-medium'>{t('sidebar.submitYourOrder')}</div>
<div className='mt-2.5 text-[13px] text-[#7B7E8B]'>{t('sidebar.submitYourOrderDescription')}</div>
<Link to={Paths.newOrder}>
<Link to={Paths.newRequest}>
<Button
className='flex items-center mt-2.5'
>