Merge pull request #414 from amansinghbais/#413

Improved: code to show rejection reasons from db instead of hardcoding (#413)
hotwax · Aug 2, 2024 · ce7cec8 · ce7cec8
2 parents 586ea45 + 49c588b
commit ce7cec8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 15 deletions.
diff --git a/.env.example b/.env.example
@@ -2,7 +2,6 @@ VUE_APP_I18N_LOCALE=en-US
 VUE_APP_I18N_FALLBACK_LOCALE=en-US
 VUE_APP_CACHE_MAX_AGE=3600
 VUE_APP_VIEW_SIZE=30
-VUE_APP_UNFILLABLE_REASONS=[{"id": "NO_VARIANCE_LOG", "label": "No reason"}, {"id": "NOT_IN_STOCK", "label": "Not in stock"}]
 VUE_APP_PRDT_IDENT_TYPE_ID=SHOPIFY_PROD_SKU
 VUE_APP_ORD_IDENT_TYPE_ID=SHOPIFY_ORD_NAME
 VUE_APP_BASE_URL=

diff --git a/src/components/RejectOrderModal.vue b/src/components/RejectOrderModal.vue
@@ -16,8 +16,8 @@
     <ion-list>
       <ion-list-header>{{ translate("Select reason") }}</ion-list-header>
       <ion-radio-group v-model="rejectReasonId">
-        <ion-item v-for="reason in unfillableReasons" :key="reason.id">
-          <ion-radio :value="reason.id" label-placement="end" justify="start">{{ translate(reason.label) }}</ion-radio>
+        <ion-item v-for="reason in rejectReasons" :key="reason.enumId">
+          <ion-radio :value="reason.enumId" label-placement="end" justify="start">{{ reason.description ? reason.description : reason.enumId }}</ion-radio>
         </ion-item>
       </ion-radio-group>
     </ion-list>
@@ -73,14 +73,14 @@ export default defineComponent({
   },
   data() {
     return {
-      unfillableReasons: JSON.parse(process.env.VUE_APP_UNFILLABLE_REASONS),
       rejectReasonId: ''
     }
   },
   computed: {
     ...mapGetters({
       order: "order/getCurrent",
       getProduct: 'product/getProduct',
+      rejectReasons: 'util/getRejectReasons',
     })
   },
   methods: {

diff --git a/src/components/ReportAnIssueModal.vue b/src/components/ReportAnIssueModal.vue
@@ -16,8 +16,8 @@
     <ion-list>
       <ion-list-header>{{ translate("Select reason") }}</ion-list-header>
       <ion-radio-group v-model="rejectReasonId">
-        <ion-item v-for="reason in unfillableReasons" :key="reason.id">
-          <ion-radio label-placement="end" justify="start" :value="reason.id">{{ translate(reason.label) }}</ion-radio>
+        <ion-item v-for="reason in rejectReasons" :key="reason.enumId">
+          <ion-radio label-placement="end" justify="start" :value="reason.enumId">{{ reason.description ? reason.description : reason.enumId }}</ion-radio>
         </ion-item>
       </ion-radio-group>
     </ion-list>
@@ -75,14 +75,14 @@ export default defineComponent({
   props: ['item'],
   data () {
     return {
-      unfillableReasons: JSON.parse(process.env.VUE_APP_UNFILLABLE_REASONS),
       rejectReasonId: ''
     }
   },
   computed: {
     ...mapGetters({
       order: "order/getCurrent",
       getProduct: 'product/getProduct',
+      rejectReasons: 'util/getRejectReasons',
     })
   },
   methods: {

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -75,10 +75,7 @@
   "New notification received.": "New notification received.",
   "No items found": "No items found",
   "No inventory details found": "No inventory details found",
-  "Not in stock": "Not in stock",
-  "Not in Stock": "Not in Stock",
   "No products found": "No products found",
-  "No reason": "No reason",
   "No notifications to show": "No notifications to show",
   "No picker assigned.": "No picker assigned.",
   "No picker found": "No picker found",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -72,9 +72,7 @@
   "New notification received.": "Nueva notificación recibida.",
   "No items found": "No se encontraron artículos",
   "No inventory details found": "No se encontraron detalles de inventario",
-  "Not in stock": "No disponible en el inventario",
   "No products found": "No se encontraron productos",
-  "No reason": "Sin razón",
   "No notifications to show": "No hay notificaciones para mostrar",
   "No picker assigned.": "No hay recolector asignado.",
   "No picker found": "No se encontró recolector",

diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -72,9 +72,7 @@
   "New notification received.": "新しい通知を受信しました。",
   "No items found": "アイテムが見つかりませんでした",
   "No inventory details found": "在庫の詳細が見つかりません",
-  "Not in Stock": "在庫切れ",
   "No products found": "商品が見つかりません",
-  "No reason": "理由なし",
   "No notifications to show": "表示する通知はありません",
   "No picker assigned.": "ピッカーが割り当てられていません。",
   "No picker found": "受取人が見つかりません",

diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
@@ -18,7 +18,8 @@ const actions: ActionTree<UtilState, RootState> = {
         "fieldList": ["enumId", "description"],
         "distinct": "Y",
         "entityName": "EnumTypeChildAndEnum",
-        "viewSize": 20 // keeping view size 20 as considering that we will have max 20 reasons
+        "viewSize": 20, // keeping view size 20 as considering that we will have max 20 reasons
+        "orderBy": "sequenceNum"
       }
 
       const resp = await UtilService.fetchRejectReasons(payload)