up

src/langs/fa.json

@@ -890,11 +890,9 @@
     "payment_methods_update": "ویرایش روش پرداخت"
   },
   "order_status": {
-    "pendingPayment": "در انتظار پرداخت",
-    "paid": "پرداخت شده",
+    "new": "جدید",
     "confirmed": "تایید شده",
     "preparing": "در حال آماده سازی",
-    "ready": "آماده",
     "shipped": "ارسال شده",
     "completed": "تکمیل شده",
     "canceled": "لغو شده",

src/pages/orders/Details.tsx

@@ -96,8 +96,8 @@ const OrderDetails: FC = () => {
     // منطق نمایش دکمه‌ها
     const isCashPayment = order.paymentMethod?.method === PaymentMethodEnum.Cash
     const isCreditCardPayment = order.paymentMethod?.method === PaymentMethodEnum.CreditCard
-    const isPendingPayment = order.status === OrderStatus.PENDING_PAYMENT
-    const isOrderPaid = order.status === OrderStatus.PAID
+    const isPendingPayment = order.status === OrderStatus.NEW
+    const isOrderPaid = order.payments?.some(payment => payment.status === PaymentStatusEnum.Paid)
     const isPreparing = order.status === OrderStatus.PREPARING
     const isCanceled = order.status === OrderStatus.CANCELED
     const isCompleted = order.status === OrderStatus.COMPLETED

src/pages/orders/components/OrderFiltersFields.tsx

@@ -15,10 +15,8 @@ export const useOrderFiltersFields = (): FieldType[] => {
             placeholder: 'وضعیت سفارش',
             defaultValue: [],
             options: [
-                { label: 'در انتظار پرداخت', value: OrderStatus.PENDING_PAYMENT },
-                { label: 'پرداخت شده', value: OrderStatus.PAID },
+                { label: 'در انتظار پرداخت', value: OrderStatus.NEW },
                  { label: 'در حال آماده سازی', value: OrderStatus.PREPARING },
-                { label: 'آماده', value: OrderStatus.READY },
                  { label: 'تحویل به پیشخدمت', value: OrderStatus.DELIVERED_TO_WAITER },
                 { label: 'تحویل به پذیرش', value: OrderStatus.DELIVERED_TO_RECEPTIONIST },
                 { label: 'ارسال شده', value: OrderStatus.SHIPPED },

src/pages/orders/components/OrderTableColumns.tsx

@@ -17,10 +17,8 @@ interface GetOrderTableColumnsParams {
 
 const getStatusVariant = (status: string): 'success' | 'error' | 'warning' | 'info' | 'pending' => {
     const variantMap: Record<string, 'success' | 'error' | 'warning' | 'info' | 'pending'> = {
-        'pendingPayment': 'pending',
-        'paid': 'info',
+        'new': 'pending',
         'preparing': 'warning',
-        'ready': 'info',
         'shipped': 'info',
         'completed': 'success',
         'canceled': 'error',

src/pages/orders/enum/Enum.ts

@@ -1,8 +1,6 @@
 export enum OrderStatus {
-  PENDING_PAYMENT = "pendingPayment",
-  PAID = "paid",
+  NEW = "new",
   PREPARING = "preparing",
-  READY = "ready",
   DELIVERED_TO_WAITER = "deliveredToWaiter",
   DELIVERED_TO_RECEPTIONIST = "deliveredToReceptionist",
   SHIPPED = "shipped",