Improved: showing reason id if no description is present (#813)

hotwax · Nov 13, 2024 · 584ec7f · 584ec7f
1 parent 05a0429
commit 584ec7f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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;
+      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
@@ -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;
+      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