diff --git a/src/pages/orders/ReturnCategories.tsx b/src/pages/orders/ReturnCategories.tsx index ebb2e3a..51e1b30 100644 --- a/src/pages/orders/ReturnCategories.tsx +++ b/src/pages/orders/ReturnCategories.tsx @@ -63,7 +63,7 @@ const ReturnCategories: FC = () => { returnReasons.map((reason: ReturnReasonType) => ( - +
diff --git a/src/pages/orders/ReturnDetails.tsx b/src/pages/orders/ReturnDetails.tsx index 6d65fca..b35cc6b 100644 --- a/src/pages/orders/ReturnDetails.tsx +++ b/src/pages/orders/ReturnDetails.tsx @@ -277,7 +277,7 @@ const ReturnDetails: FC = () => { * نیازمند تصویر
)} - {item.reason.fineRule && ( + {item.reason.fineRule && typeof item.reason.fineRule === 'object' && (
جریمه: {item.reason.fineRule.title} ({item.reason.fineRule.fine_percentage}%)
@@ -291,6 +291,18 @@ const ReturnDetails: FC = () => {
{item.comment}
)} + + {/* تصویر محصول برگشتی */} + {item.imagesUrl && ( +
+
تصویر اپلود :
+ تصویر کاربر برگشتی +
+ )} ))} diff --git a/src/pages/orders/types/Types.ts b/src/pages/orders/types/Types.ts index 5b2a3b6..5f12ff9 100644 --- a/src/pages/orders/types/Types.ts +++ b/src/pages/orders/types/Types.ts @@ -319,7 +319,7 @@ export type ReturnReasonType = { _id: string; title: string; is_mandatory_picture: boolean; - fineRule: FineRuleType; + fineRule?: FineRuleType | string; createdAt: string; updatedAt: string; }; @@ -427,6 +427,7 @@ export type ReturnOrderDetailReturnItemType = { shipmentItem: ReturnOrderDetailReturnItemShipmentItemType; quantity: number; comment: string; + imagesUrl?: string; reason: ReturnReasonType; status: string; createdAt: string;