Improved: Removed the Shopify cancellation reason and added logic to …

…fetch the cancellation reason from the enum group(hotwax#488)
R-Sourabh · Jan 22, 2025 · 8da3f53 · 8da3f53
1 parent 348fd53
commit 8da3f53
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/components/ConfirmCancelModal.vue b/src/components/ConfirmCancelModal.vue
@@ -134,7 +134,7 @@ export default defineComponent({
     },
     getCancelReasonDescription(cancelReasonId: string) {
       const reason = this.cancelReasons?.find((reason: any) => reason.enumId === cancelReasonId)
-      return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
+      return reason?.enumDescription ? reason.enumDescription : reason?.enumId;
     },
     async cancelOrder() {
       emitter.emit("presentLoader");

diff --git a/src/components/ReportAnIssuePopover.vue b/src/components/ReportAnIssuePopover.vue
@@ -7,7 +7,7 @@
     </ion-list>
     <ion-list v-else>
       <ion-item v-for="reason in cancelReasons" :key="reason.enumId" @click="updateIssue(reason.enumId)" button>
-        {{ reason.description ? translate(reason.description) : reason.enumDescription ? translate(reason.enumDescription) : reason.enumId  }}
+        {{ reason.enumDescription ? translate(reason.enumDescription) : reason.enumId  }}
       </ion-item>
     </ion-list>
   </ion-content>

diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
@@ -91,10 +91,10 @@ const actions: ActionTree<UtilState, RootState> = {
     let cancelReasons = [];
     const payload = {
       "inputFields": {
-        "enumTypeId": "ODR_ITM_CH_REASON"
+        "enumerationGroupId": "BOPIS_CNCL_RES"
       },
-      "fieldList": ["enumId", "description"],
-      "entityName": "Enumeration",
+      "fieldList": ["enumId", "enumDescription"],
+      "entityName": "EnumerationGroupAndMember",
       "distinct": "Y",
       "viewSize": 100,
       "orderBy": "sequenceNum"

diff --git a/src/views/OrderDetailUpdated.vue b/src/views/OrderDetailUpdated.vue
@@ -799,7 +799,7 @@ export default defineComponent({
     },
     getCancelReasonDescription(cancelReasonId: string) {
       const reason = this.cancelReasons?.find((reason: any) => reason.enumId === cancelReasonId)
-      return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
+      return reason?.enumDescription ? reason.enumDescription : reason?.enumId;
     },
     isEntierOrderRejectionEnabled(order: any) {
       return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue)) && this.hasRejectedItems