diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue index 3581e0e0..57ffe85e 100644 --- a/src/views/InProgress.vue +++ b/src/views/InProgress.vue @@ -389,7 +389,8 @@ export default defineComponent({ }, methods: { getRejectionReasonDescription (rejectionReasonId: string) { - return this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)?.description; + const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId) + return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId; }, async openRejectReasonPopover(ev: Event, item: any, order: any) { const reportIssuePopover = await popoverController.create({ diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue index 46a07f64..2170f334 100644 --- a/src/views/OrderDetail.vue +++ b/src/views/OrderDetail.vue @@ -683,7 +683,8 @@ export default defineComponent({ } }, getRejectionReasonDescription (rejectionReasonId: string) { - return this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)?.description; + const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId) + return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId; }, isEntierOrderRejectionEnabled(order: any) { return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue)) && order.hasRejectedItem