Merge pull request #490 from R-Sourabh/#488-bopis-cancellation-reasons

ymaheshwari1 · web-flow · commit 5dc9cd077767 · 2025-01-22T19:05:17.000+05:30
Improved: Removed the Shopify cancellation reason and added logic to fetch the cancellation reason from the enum group(#488)
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/locales/en.json b/src/locales/en.json
@@ -16,6 +16,7 @@
   "Assign Pickers": "Assign Pickers",
   "Assigned for fulfillment": "Assigned for fulfillment",
   "Authorized": "Authorized",
+  "Bad review from friends/relatives": "Bad review from friends/relatives",
   "Browser TimeZone": "Browser TimeZone",
   "Browser time zone": "Browser time zone",
   "Catalog": "Catalog",
@@ -31,7 +32,7 @@
   "carrier": "carrier",
   "Control what your customers are allowed to edit on their order when they are editing their order on Re-route Fulfillment.": "Control what your customers are allowed to edit on their order when they are editing their order on Re-route Fulfillment.",
   "Change": "Change",
-  "Changed Mind": "Changed Mind",
+  "Changed my mind": "Changed my mind",
   "Choose language": "Choose language",
   "City": "City",
   "Click the backdrop to dismiss.": "Click the backdrop to dismiss.",
@@ -120,6 +121,7 @@
   "On rejecting this order, will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.": "On rejecting this order, { customerName } will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.",
   "Online ATP": "Online ATP",
   "on hand": "{ count } on hand",
+  "Other": "Other",
   "Other stores inventory": "Other stores inventory",
   "Order": "Order",
   "Order completed": "Order completed",
@@ -215,7 +217,6 @@
   "Shipping to store": "Shipping to store",
   "Ship to this address": "Ship to this address",
   "Shop": "Shop",
-  "Shopify Cancellation": "Shopify Cancellation",
   "Show shipping orders": "Show shipping orders",
   "Showing the next estimated time to sync cancelation to Shopify": "Showing the next estimated time to sync cancelation to Shopify",
   "Size:": "Size: {size}",
diff --git a/src/locales/es.json b/src/locales/es.json
@@ -16,6 +16,7 @@
   "Assign Pickers": "Asignar recolectores",
   "Assigned for fulfillment": "Assigned for fulfillment",
   "Authorized": "Authorized",
+  "Bad review from friends/relatives": "Bad review from friends/relatives",
   "Browser TimeZone": "Browser TimeZone",
   "Browser time zone": "Browser time zone",
   "Catalog": "Catálogo",
@@ -31,7 +32,7 @@
   "carrier": "carrier",
   "Control what your customers are allowed to edit on their order when they are editing their order on Re-route Fulfillment.": "Controle lo que sus clientes pueden editar en su pedido cuando editan su pedido en Reenrutar el cumplimiento.",
   "Change": "Cambiar",
-  "Changed Mind": "Changed Mind",
+  "Changed my mind": "Changed my mind",
   "Choose language": "Elegir idioma",
   "City": "Ciudad",
   "Click the backdrop to dismiss.": "Haz clic en el fondo para cerrar.",
@@ -118,6 +119,7 @@
   "On rejecting this order, will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.": "Al rechazar este pedido, {customerName} recibirá un correo electrónico con opciones de cumplimiento alternativas y este pedido se eliminará de su panel.",
   "Online ATP": "Online ATP",
   "on hand": "{ count } on hand",
+  "Other": "Other",
   "Other stores inventory": "Inventario de otras tiendas",
   "Order": "Orden",
   "Order completed": "Order completed",
@@ -213,7 +215,6 @@
   "Shipping to store": "Envío a la tienda",
   "Ship to this address": "Enviar a esta dirección",
   "Shop": "Comprar",
-  "Shopify Cancellation": "Shopify Cancellation",
   "Show shipping orders": "Mostrar órdenes de envío",
   "Showing the next estimated time to sync cancelation to Shopify": "Showing the next estimated time to sync cancelation to Shopify",
   "Sizes": "Tamaños",
diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -15,6 +15,7 @@
   "Assign Pickers": "受け取り人の割当",
   "Assigned for fulfillment": "Assigned for fulfillment",
   "Authorized": "Authorized",
+  "Bad review from friends/relatives": "Bad review from friends/relatives",
   "Browser TimeZone": "ブラウザーのタイムゾーン",
   "Browser time zone": "ブラウザーのタイムゾーン",
   "Catalog": "カタログ",
@@ -30,7 +31,7 @@
   "carrier": "carrier",
   "Control what your customers are allowed to edit on their order when they are editing their order on Re-route Fulfillment.": "お客様がリルート（受取方法や受取場所の変更）で注文を編集する際に、注文の編集を許可する内容を制御します。",
   "Change": "変更",
-  "Changed Mind": "Changed Mind",
+  "Changed my mind": "Changed my mind",
   "Choose language": "言語を選択",
   "City": "街",
   "Click the backdrop to dismiss.": "背景をクリックして閉じます。",
@@ -114,6 +115,7 @@
   "On rejecting this order, will be sent an email with alternate fulfilment options and this order will be removed from your dashboard.": "この注文を拒否すると、{customerName} に代替の配送オプションを含むメールが送信され、この注文はダッシュボードから削除されます。",
   "Online ATP": "Online ATP",
   "on hand": "{count} 在庫あり",
+  "Other": "Other",
   "Other stores inventory": "その他店舗在庫",
   "Order": "注文",
   "Order completed": "Order completed",
@@ -206,7 +208,6 @@
   "Shipping to store": "店舗に配送",
   "Ship to this address": "この住所に配送",
   "Shop": "ショップ",
-  "Shopify Cancellation": "Shopify Cancellation",
   "Show shipping orders": "出荷オーダーの表示",
   "Showing the next estimated time to sync cancelation to Shopify": "Showing the next estimated time to sync cancelation to Shopify",
   "Sizes": "サイズ",
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
