- {/* ستون اصلی */}
-
+
+ {/* اطلاعات کاربر سفارشدهنده و آدرس */}
+
{order?.notes && (
+
+
{/* اطلاعات سفارش */}
+
+
+ اطلاعات مشتری و آدرس
+
+
+
+
+
+
+ {/* اطلاعات کاربر */}
+
+
+
+
+ {order?.user ? (
+
+
+ {/* آدرس ارسال */}
+
+
+ {order?.user ? (
+
+
+ ) : (
+
+
+
+ {order.user.avatar ? (
+ 
+ ) : (
+
+
+
+ {(order.user.first_name?.charAt(0) || '') + (order.user.last_name?.charAt(0) || '') || 'U'}
+
+
+ )}
+
+
+ + {(order.user.first_name || 'نامشخص') + ' ' + (order.user.last_name || '')} +
+ + {order.user.verified ? 'تأیید شده' : 'تأیید نشده'} + +
+
+
+
+ {order.user.phone_number && (
+
+
+ ایمیل
+{order.user.email || 'ایمیل نامشخص'}
+
+
+ )}
+
+
+ شماره تلفن
++ {englishToPersian(order.user.phone_number)} +
+اطلاعات کاربر در دسترس نیست
+ )} +
+
+
+ {order?.shipping_address ? (
+
+
+
+ {order?.shipping_address ? (
+
+
+ ) : (
+
+
+
+ {order.shipping_address.name && (
+
+
+ نام:
+ {order.shipping_address.name}
+
+ )}
+ {order.shipping_address.address && (
+
+ آدرس:
+ {order.shipping_address.address}
+
+ )}
+ {(order.shipping_address.city || order.shipping_address.state) && (
+
+ شهر/استان:
+
+ {order.shipping_address.city || 'نامشخص'}{order.shipping_address.state ? `، ${order.shipping_address.state}` : ''}
+
+
+ )}
+ {order.shipping_address.region && (
+
+ منطقه:
+ {order.shipping_address.region}
+
+ )}
+ {order.shipping_address.postal_code && (
+
+ کد پستی:
+ {order.shipping_address.postal_code}
+
+ )}
+ {order.shipping_address.plaque && (
+
+ پلاک/واحد:
+
+ {order.shipping_address.plaque}{order.shipping_address.unit ? `، واحد ${order.shipping_address.unit}` : ''}
+
+
+ )}
+ {order.shipping_address.receiving_address && (
+
+ آدرس تحویل:
+ {order.shipping_address.receiving_address}
+
+ )}
+ آدرس ارسال در دسترس نیست
+ )} +
@@ -196,6 +350,30 @@ const OrderDetailPage = () => {
)}
+ {order?.shipping_method_id !== undefined && order?.shipping_method_id !== null && (
+ {formatDate(order.estimated_delivery)}
+
+ )}
+ {order?.selected_delivery_slot && (
+ متد ارسال
++ {shippingMethod + ? shippingMethod.name + : shippingMethods.length === 0 + ? `شناسه: ${order.shipping_method_id} (در حال بارگذاری...)` + : `شناسه: ${order.shipping_method_id}` + } +
+
+
+ )}
زمان تحویل انتخاب شده
++ {typeof order.selected_delivery_slot === 'object' + ? `${order.selected_delivery_slot.date || ''} ${order.selected_delivery_slot.from_hour || ''}:${order.selected_delivery_slot.to_hour || ''}` + : String(order.selected_delivery_slot) + } +
+
@@ -225,16 +403,32 @@ const OrderDetailPage = () => {
const baseWeight = (item.weight ?? 0) as number;
const weightGr = Math.round(baseWeight * 1000);
const formatFa = (n: number) => new Intl.NumberFormat('fa-IR').format(n);
+ const imageUrl = item.image_url || item.product_image;
return (
-
- {/* ستون جانبی */}
-
+
- {/* آدرسها - منتقل شده به زیر محصولات */}
-
+ {imageUrl && (
+
+ })
{
+ const target = e.target as HTMLImageElement;
+ target.style.display = 'none';
+ }}
+ />
+
+ )}
{item.product_name || `محصول شناسه: ${item.product_id}`}
{item.product_variant_name || `واریانت شناسه: ${item.product_variant_id}`}
+
@@ -270,87 +464,6 @@ const OrderDetailPage = () => {
)}
-
-
-
-
- آدرسها
-
-
-
-
-
-
-
- آدرس ارسال
-
-
- نام: {order?.shipping_address?.name || 'نام نامشخص'}
-آدرس: {order?.shipping_address?.address || 'آدرس نامشخص'}
-شهر: {order?.shipping_address?.city || 'شهر نامشخص'}, استان: {order?.shipping_address?.state || 'استان نامشخص'}
-منطقه: {order?.shipping_address?.region || 'منطقه نامشخص'}
-کد پستی: {order?.shipping_address?.postal_code || 'نامشخص'}
- {order?.shipping_address?.plaque && ( -پلاک: {order.shipping_address.plaque}, واحد: {order.shipping_address.unit || 'ندارد'}
- )} - {order?.shipping_address?.receiving_address && ( -آدرس تحویل: {order.shipping_address.receiving_address}
- )} -
- {/* اطلاعات کاربر سفارشدهنده */}
-
-
-
-
-
-
{/* اطلاعات پرداخت */}
-
-
- کاربر سفارشدهنده
-
-
-
-
- {order?.user ? (
-
-
-
- ) : (
-
-
- نام
-- {(order.user.first_name || 'نامشخص') + ' ' + (order.user.last_name || '')} -
-
-
- {order.user.phone_number && (
- {order.user.email || 'ایمیل نامشخص'}
-
-
- )}
- - {englishToPersian(order.user.phone_number)} -
-
-
- {order.user.verified ? 'تأیید شده' : 'تأیید نشده'}
-
-
- اطلاعات کاربر در دسترس نیست
- )} -
@@ -362,42 +475,42 @@ const OrderDetailPage = () => {
پرداخت
-
- جمع اقلام
- {formatCurrency(order?.net_total || 0)}
+
+
+ جمع اقلام
+ {formatCurrency(order?.net_total || 0)}
-
- مالیات
- {formatCurrency(order?.vat_total || 0)}
+
+ مالیات
+ {formatCurrency(order?.vat_total || 0)}
{order?.base_gold_price !== undefined && (
-
- قیمت پایه طلا
- {formatCurrency(order.base_gold_price)}
+
+ قیمت پایه طلا
+ {formatCurrency(order.base_gold_price)}
)}
-
- هزینه ارسال
- {formatCurrency(order?.shipping_total || 0)}
+
+ هزینه ارسال
+ {formatCurrency(order?.shipping_total || 0)}
{(order?.discount_total || 0) > 0 && (
-
- تخفیف کل
- -{formatCurrency(order?.discount_total || 0)}
+
-
+ تخفیف کل
+ -{formatCurrency(order?.discount_total || 0)}
)}
-
- مجموع نهایی
- {formatCurrency(order?.final_total || 0)}
+
- {/* آمار کلی */}
- setIsExplorerUploading(true)}
onUploadComplete={() => setIsExplorerUploading(false)}
/>
diff --git a/src/pages/shipping-methods/core/_models.ts b/src/pages/shipping-methods/core/_models.ts
index b5a7ece..45c1a9a 100644
--- a/src/pages/shipping-methods/core/_models.ts
+++ b/src/pages/shipping-methods/core/_models.ts
@@ -1,13 +1,20 @@
+export interface ShippingOpenHour {
+ from_hour: number;
+ to_hour: number;
+}
+
export interface ShippingMethod {
id: number;
name: string;
description?: string;
code: string;
enabled: boolean;
- cost: number;
max_weight: number;
min_weight: number;
priority: number;
+ time_note?: string;
+ open_hours: ShippingOpenHour[];
+ addresses: string[];
created_at?: string;
updated_at?: string;
}
diff --git a/src/pages/shipping-methods/core/_requests.ts b/src/pages/shipping-methods/core/_requests.ts
index 54e48b8..2781834 100644
--- a/src/pages/shipping-methods/core/_requests.ts
+++ b/src/pages/shipping-methods/core/_requests.ts
@@ -17,7 +17,10 @@ export const getShippingMethods = async () => {
const response = await httpGetRequest(
APIUrlGenerator(API_ROUTES.GET_SHIPPING_METHODS)
);
- return response.data.shipping_methods || [];
+ if (Array.isArray(response.data)) {
+ return response.data;
+ }
+ return response.data?.shipping_methods || [];
};
export const getShippingMethod = async (id: string) => {
diff --git a/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx b/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx
index dc24093..75f7ce7 100644
--- a/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx
+++ b/src/pages/shipping-methods/shipping-method-form/ShippingMethodFormPage.tsx
@@ -1,9 +1,11 @@
import React, { useEffect } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { useCreateShippingMethod, useShippingMethod, useUpdateShippingMethod } from '../core/_hooks';
+import { ShippingOpenHour } from '../core/_models';
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
+import { TagInput } from '@/components/ui/TagInput';
import { Truck } from 'lucide-react';
import { formatWithThousands, parseFormattedNumber } from '@/utils/numberUtils';
@@ -21,23 +23,43 @@ const ShippingMethodFormPage = () => {
description: '',
code: '',
enabled: true,
- cost: '',
max_weight: '',
min_weight: '',
priority: '',
+ time_note: '',
+ open_hours: [
+ {
+ from_hour: '',
+ to_hour: '',
+ },
+ ],
+ addresses: [] as string[],
});
useEffect(() => {
if (isEdit && data) {
+ const normalizedOpenHours = (data.open_hours || []).map((item: ShippingOpenHour) => ({
+ from_hour: item?.from_hour?.toString() || '',
+ to_hour: item?.to_hour?.toString() || '',
+ }));
setForm({
name: data.name || '',
description: data.description || '',
code: data.code || '',
enabled: data.enabled,
- cost: formatWithThousands(data.cost ?? ''),
max_weight: formatWithThousands(data.max_weight ?? ''),
min_weight: formatWithThousands(data.min_weight ?? ''),
priority: formatWithThousands(data.priority ?? ''),
+ time_note: data.time_note || '',
+ open_hours: normalizedOpenHours.length
+ ? normalizedOpenHours
+ : [
+ {
+ from_hour: '',
+ to_hour: '',
+ },
+ ],
+ addresses: data.addresses || [],
});
}
}, [isEdit, data]);
@@ -57,10 +79,21 @@ const ShippingMethodFormPage = () => {
description: form.description,
code: form.code,
enabled: form.enabled,
- cost: parseFormattedNumber(form.cost) ?? 0,
max_weight: parseFormattedNumber(form.max_weight) ?? 0,
min_weight: parseFormattedNumber(form.min_weight) ?? 0,
priority: parseFormattedNumber(form.priority) ?? 0,
+ time_note: form.time_note,
+ open_hours: form.open_hours
+ .map((item) => ({
+ from_hour: Number(item.from_hour),
+ to_hour: Number(item.to_hour),
+ }))
+ .filter(
+ (item) =>
+ !Number.isNaN(item.from_hour) &&
+ !Number.isNaN(item.to_hour)
+ ),
+ addresses: form.addresses,
};
if (isEdit && id) {
update({ id: Number(id), ...payload }, { onSuccess: () => navigate('/shipping-methods') });
@@ -96,10 +129,6 @@ const ShippingMethodFormPage = () => {
-
+ مجموع نهایی
+ {formatCurrency(order?.final_total || 0)}
-
);
+const getDefaultFilters = (): OrderFilters => ({
+ page: 1,
+ limit: 20,
+ status: 'pending',
+ payment_status: undefined,
+ search: '',
+ user_id: undefined,
+ invoice_id: undefined,
+ discount_code: undefined,
+ created_from: undefined,
+ created_to: undefined,
+ updated_from: undefined,
+ updated_to: undefined,
+ min_total: undefined,
+ max_total: undefined,
+});
+
+const toIsoDate = (date?: DateObject | null) => {
+ if (!date) return undefined;
+ try {
+ const g = date.convert(undefined);
+ const yyyy = g.year.toString().padStart(4, '0');
+ const mm = g.month.toString().padStart(2, '0');
+ const dd = g.day.toString().padStart(2, '0');
+ return `${yyyy}-${mm}-${dd}`;
+ } catch {
+ return undefined;
+ }
+};
+
+const fromIsoDate = (value?: string) => {
+ if (!value) return undefined;
+ try {
+ const d = new Date(value);
+ if (isNaN(d.getTime())) return undefined;
+ return new DateObject(d).convert(persian, persian_fa);
+ } catch {
+ return undefined;
+ }
+};
+
+const buildRangeValue = (from?: string, to?: string) => {
+ const start = fromIsoDate(from);
+ const end = fromIsoDate(to);
+ if (start && end) return [start, end];
+ if (start) return [start];
+ if (end) return [end];
+ return [];
+};
+
const OrdersListPage = () => {
const navigate = useNavigate();
const [statusUpdateId, setStatusUpdateId] = useState(null);
const [newStatus, setNewStatus] = useState('processing');
- const [filters, setFilters] = useState({
- page: 1,
- limit: 20,
- order_number: '',
- status: 'pending',
- payment_status: undefined,
- search: '',
- });
+ const [filters, setFilters] = useState(getDefaultFilters());
const { data: ordersData, isLoading, error } = useOrders(filters);
- // Temporarily disabled stats API
- // const { data: stats, isLoading: statsLoading } = useOrderStats(!isLoading);
- const stats = null;
- const statsLoading = false;
+ const { data: stats, isLoading: statsLoading, error: statsError } = useOrderStats(true);
const { mutate: updateStatus, isPending: isUpdating } = useUpdateOrderStatus();
+ const handleIdFilterChange = (key: keyof OrderFilters, raw: string) => {
+ const converted = persianToEnglish(raw).replace(/[^\d]/g, '');
+ const numeric = converted ? Number(converted) : undefined;
+ setFilters(prev => ({
+ ...prev,
+ [key]: numeric,
+ page: 1,
+ }));
+ };
+
+ const handleTextFilterChange = (key: keyof OrderFilters, value: string) => {
+ setFilters(prev => ({
+ ...prev,
+ [key]: value || undefined,
+ page: 1,
+ }));
+ };
+
+ const formatNumberDisplay = (val?: number) => {
+ if (val === undefined || val === null || Number.isNaN(val)) return '';
+ return formatWithThousands(val);
+ };
+
+ const handleAmountFilterChange = (key: keyof OrderFilters, raw: string) => {
+ const converted = persianToEnglish(raw);
+ const numeric = parseFormattedNumber(converted);
+ setFilters(prev => ({
+ ...prev,
+ [key]: numeric,
+ page: 1,
+ }));
+ };
+
+ const handleDateRangeChange = (startKey: keyof OrderFilters, endKey: keyof OrderFilters, range: (DateObject | null)[] | DateObject | null) => {
+ if (Array.isArray(range)) {
+ const [start, end] = range;
+ setFilters(prev => ({
+ ...prev,
+ [startKey]: toIsoDate(start),
+ [endKey]: toIsoDate(end),
+ page: 1,
+ }));
+ return;
+ }
+ setFilters(prev => ({
+ ...prev,
+ [startKey]: toIsoDate(range as DateObject | null),
+ [endKey]: undefined,
+ page: 1,
+ }));
+ };
+
+ const statsItems = useMemo(() => ([
+ {
+ title: 'کل سفارشات',
+ value: stats?.total_orders_count ?? 0,
+ icon: ShoppingCart,
+ color: 'yellow' as const,
+ },
+ {
+ title: 'مجموع فروش',
+ value: stats?.total_amount_of_sale ?? 0,
+ icon: DollarSign,
+ color: 'green' as const,
+ },
+ {
+ title: 'سفارشهای در انتظار',
+ value: stats?.total_order_pending ?? 0,
+ icon: Clock,
+ color: 'blue' as const,
+ },
+ {
+ title: 'میانگین سفارش',
+ value: stats?.order_avg ?? 0,
+ icon: TrendingUp,
+ color: 'purple' as const,
+ },
+ ]), [stats]);
+
const columns: TableColumn[] = useMemo(() => [
{ key: 'order_number', label: 'شماره سفارش', sortable: true, align: 'right', render: (v: string) => `#${v}` },
@@ -171,64 +292,24 @@ const OrdersListPage = () => {
- وضعیت پرداخت
-
+ وضعیت پرداخت
+
@@ -405,32 +518,31 @@ const OrderDetailPage = () => {
{Array.isArray((data as any)?.payments) && (data as any)?.payments.length > 0 && (
-
- روش پرداخت
- {formatPaymentType((data as any).payments[0].payment_type)}
+
diff --git a/src/pages/orders/orders-list/OrdersListPage.tsx b/src/pages/orders/orders-list/OrdersListPage.tsx
index 6450923..7b28ce1 100644
--- a/src/pages/orders/orders-list/OrdersListPage.tsx
+++ b/src/pages/orders/orders-list/OrdersListPage.tsx
@@ -1,26 +1,28 @@
import React, { useMemo, useState } from 'react';
-import { englishToPersian } from '@/utils/numberUtils';
+import { englishToPersian, persianToEnglish, formatWithThousands, parseFormattedNumber } from '@/utils/numberUtils';
import { useNavigate } from 'react-router-dom';
import { useOrders, useOrderStats, useUpdateOrderStatus } from '../core/_hooks';
-import { Order, OrderFilters, OrderStatus } from '../core/_models';
+import { OrderFilters, OrderStatus } from '../core/_models';
import { Button } from "@/components/ui/Button";
-import { Input } from "@/components/ui/Input";
import { Modal } from "@/components/ui/Modal";
import { Pagination } from "@/components/ui/Pagination";
-import { PageContainer, PageTitle, SectionTitle } from "@/components/ui/Typography";
+import { PageContainer, PageTitle } from "@/components/ui/Typography";
import { Table } from "@/components/ui/Table";
import { TableColumn } from "@/types";
+import { StatsCard } from '@/components/dashboard/StatsCard';
+import DatePicker from 'react-multi-date-picker';
+import persian from 'react-date-object/calendars/persian';
+import persian_fa from 'react-date-object/locales/persian_fa';
+import DateObject from 'react-date-object';
import {
ShoppingCart,
- Package,
DollarSign,
Clock,
Search,
Filter,
Eye,
Edit3,
- TrendingUp,
- Calendar
+ TrendingUp
} from 'lucide-react';
const getStatusColor = (status: OrderStatus) => {
@@ -59,26 +61,145 @@ const ListSkeleton = () => (
+ روش پرداخت
+ {formatPaymentType((data as any).payments[0].payment_type)}
)}
{order?.invoice_id && (
-
- شماره فاکتور
- {order.invoice_id}
+
+ شماره فاکتور
+ {order.invoice_id}
)}
{Array.isArray((data as any)?.payments) && (data as any)?.payments[0]?.transaction_id && (
-
- شناسه تراکنش
- {(data as any).payments[0].transaction_id}
+
+ شناسه تراکنش
+ {(data as any).payments[0].transaction_id}
)}
{Array.isArray((data as any)?.payments) && (data as any)?.payments[0]?.image_urls?.length > 0 && (
-
- رسید پرداخت
+
+ رسید پرداخت
)}
-
-
@@ -660,18 +634,12 @@ const ProductFormPage = () => {
-
-
-
-
-
-
-
-
- کل سفارشات
-- -- -
-
-
-
-
-
-
-
-
-
- کل فروش
-- -- -
-
-
-
-
-
-
-
-
-
- در انتظار
-- -- -
-
-
+
-
-
-
-
-
- میانگین سفارش
-- -- -
-
+ {statsLoading ? (
+ <>
+ {[...Array(4)].map((_, idx) => (
+
+ ))}
+
+ ) : (
+ statsItems.map((stat, index) => (
+
+ {statsError && (
+
+ خطا در دریافت آمار سفارشات
+
+ )}
{/* فیلترها */}
@@ -237,7 +318,7 @@ const OrdersListPage = () => {
+
+ handleIdFilterChange('user_id', e.target.value)}
+ placeholder="مثلا 1024"
+ className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-1 focus:ring-primary-500 dark:bg-gray-700 dark:text-gray-100"
+ />
+
+
+
+
+ handleIdFilterChange('invoice_id', e.target.value)}
+ placeholder="invoice_id"
+ className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-1 focus:ring-primary-500 dark:bg-gray-700 dark:text-gray-100"
+ />
+
+
+
+
+ handleTextFilterChange('discount_code', e.target.value)}
+ placeholder="مثلا SPRING2025"
+ className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-1 focus:ring-primary-500 dark:bg-gray-700 dark:text-gray-100"
+ />
+
+
+
+
+
+
+
+ handleAmountFilterChange('min_total', e.target.value)}
+ placeholder="مثلا 3000000"
+ className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-1 focus:ring-primary-500 dark:bg-gray-700 dark:text-gray-100"
+ />
+
+
+
+
+ handleAmountFilterChange('max_total', e.target.value)}
+ placeholder="مثلا 9000000"
+ className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-1 focus:ring-primary-500 dark:bg-gray-700 dark:text-gray-100"
+ />
+
+
+
+
+ handleDateRangeChange('created_from', 'created_to', range as any)}
+ format="YYYY/MM/DD"
+ range
+ calendar={persian}
+ locale={persian_fa}
+ calendarPosition="bottom-center"
+ inputClass="w-full px-3 py-3 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 placeholder-gray-500 dark:placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-primary-500"
+ containerClassName="w-full"
+ editable={false}
+ placeholder="از تاریخ / تا تاریخ"
+ />
+
+
+
+
+ handleDateRangeChange('updated_from', 'updated_to', range as any)}
+ format="YYYY/MM/DD"
+ range
+ calendar={persian}
+ locale={persian_fa}
+ calendarPosition="bottom-center"
+ inputClass="w-full px-3 py-3 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 placeholder-gray-500 dark:placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-primary-500"
+ containerClassName="w-full"
+ editable={false}
+ placeholder="از تاریخ / تا تاریخ"
+ />
+
+
فایلهای Explorer
-- تنها تصاویر مربعی پذیرفته میشوند و میتوانید ویدیو نیز اضافه کنید. -
-
-
-
@@ -112,6 +141,98 @@ const ShippingMethodFormPage = () => {
+
+
+
+
+
+
+
+
+
+
+
+
+ بازههای زمانی را به ساعت ۲۴ ساعته وارد کنید
+
+ {form.open_hours.map((item, index) => (
+
+
+
+ ))}
+
+
+
+
+ {
+ const value = (e.target as HTMLInputElement).value;
+ setForm(prev => {
+ const open_hours = [...prev.open_hours];
+ open_hours[index] = { ...open_hours[index], from_hour: value };
+ return { ...prev, open_hours };
+ });
+ }}
+ numeric
+ placeholder="مثلاً 9"
+ />
+
+
+
+ {
+ const value = (e.target as HTMLInputElement).value;
+ setForm(prev => {
+ const open_hours = [...prev.open_hours];
+ open_hours[index] = { ...open_hours[index], to_hour: value };
+ return { ...prev, open_hours };
+ });
+ }}
+ numeric
+ placeholder="مثلاً 18"
+ />
+
+
+
+
+
+ setForm(prev => ({ ...prev, addresses: values }))}
+ label="محدودههای پوشش"
+ placeholder="آدرس را تایپ و Enter کنید"
+ />
+
diff --git a/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx b/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx
index 600682f..5d6d973 100644
--- a/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx
+++ b/src/pages/shipping-methods/shipping-methods-list/ShippingMethodsListPage.tsx
@@ -2,7 +2,8 @@ import React, { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Button } from '@/components/ui/Button';
import { Modal } from '@/components/ui/Modal';
-import { Settings, Plus, Edit3, Trash2, Truck } from 'lucide-react';
+import { LoadingSpinner } from '@/components/ui/LoadingSpinner';
+import { Plus, Edit3, Trash2, Truck } from 'lucide-react';
import { useShippingMethods, useDeleteShippingMethod } from '../core/_hooks';
import { ShippingMethod } from '../core/_models';
@@ -12,6 +13,11 @@ const ShippingMethodsListPage = () => {
const { mutate: deleteMethod, isPending: isDeleting } = useDeleteShippingMethod();
const [deleteId, setDeleteId] = useState(null);
+ const formatOpenHours = (openHours: ShippingMethod['open_hours']) => {
+ if (!openHours || !openHours.length) return '-';
+ return openHours.map((item) => `${item.from_hour}-${item.to_hour}`).join('، ');
+ };
+
const handleCreate = () => navigate('/shipping-methods/create');
const handleEdit = (id: number) => navigate(`/shipping-methods/${id}/edit`);
@@ -20,6 +26,14 @@ const ShippingMethodsListPage = () => {
deleteMethod(deleteId, { onSuccess: () => setDeleteId(null) });
};
+ if (isLoading) {
+ return (
+
+
+ );
+ }
+
if (error) {
return (
@@ -57,8 +71,8 @@ const ShippingMethodsListPage = () => {
نام
کد
- هزینه
محدوده وزن
+ ساعات پاسخگویی
اولویت
وضعیت
عملیات
@@ -69,8 +83,8 @@ const ShippingMethodsListPage = () => {
{m.name}
{m.code}
- {m.cost}
{m.min_weight} - {m.max_weight}
+ {formatOpenHours(m.open_hours)}
{m.priority}
{m.enabled ? 'فعال' : 'غیرفعال'}
@@ -99,10 +113,11 @@ const ShippingMethodsListPage = () => {
-
{m.name}
-کد: {m.code} • هزینه: {m.cost}
+کد: {m.code} • وزن: {m.min_weight}-{m.max_weight}
وزن: {m.min_weight}-{m.max_weight} • اولویت: {m.priority}
+ ساعات پاسخگویی: {formatOpenHours(m.open_hours)}
+ اولویت: {m.priority}