diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue index 57ffe85e..52fb1217 100644 --- a/src/views/InProgress.vue +++ b/src/views/InProgress.vue @@ -390,7 +390,7 @@ export default defineComponent({ methods: { getRejectionReasonDescription (rejectionReasonId: string) { const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId) - return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId; + 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 2170f334..2c629020 100644 --- a/src/views/OrderDetail.vue +++ b/src/views/OrderDetail.vue @@ -684,7 +684,7 @@ export default defineComponent({ }, getRejectionReasonDescription (rejectionReasonId: string) { const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId) - return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId; + 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