up

src/pages/order/List.tsx

@@ -119,6 +119,14 @@ const OrdersList: FC = () => {
                         {
                             key: 'designer',
                             title: 'مجری / طراح',
+                            render: (item) => {
+                                const designer = item.designer
+                                if (!designer || typeof designer === 'string') {
+                                    return <div>{typeof designer === 'string' ? designer : '—'}</div>
+                                }
+                                const name = `${designer.firstName ?? ''} ${designer.lastName ?? ''}`.trim()
+                                return <div>{name || designer.phone || '—'}</div>
+                            },
                         },
                         {
                             key: 'status',

src/pages/order/types/Types.ts

@@ -84,7 +84,7 @@ export interface OrderListItemType extends RowDataType {
   title: string;
   type: string;
   user: UserType;
-  designer: string | null;
+  designer: OrderDetailCreatorType | string | null;
   creator: string;
   orderNumber: number;
   status: string;

src/pages/product/components/CategoriesSelect.tsx

@@ -9,21 +9,27 @@ type Props = {
 
 } & SelectHTMLAttributes<HTMLSelectElement>
 
-const CategoriesSelect: FC<Props> = (props) => {
+const CategoriesSelect: FC<Props> = ({
+    isDisableShowLable,
+    placeholder,
+    error_text,
+    ...selectProps
+}) => {
 
     const { data: categories } = useGetCategory()
 
     return (
         <Select
-            label={props.isDisableShowLable ? undefined : 'دسته'}
-            placeholder={props.placeholder || 'انتخاب'}
+            label={isDisableShowLable ? undefined : 'دسته'}
+            placeholder={placeholder || 'انتخاب'}
+            error_text={error_text}
             items={categories?.data?.map((item) => {
                 return {
                     label: item.title,
                     value: item.id + ''
                 }
             }) || []}
-            {...props}
+            {...selectProps}
         />
     )
 }