Implemented: do not dispatch stock/addProducts action while dispatchi…

…ng getRejHistory action (#283)
hotwax · Oct 11, 2023 · 2f7a6cb · 2f7a6cb
1 parent 2d32058
commit 2f7a6cb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/src/components/ProductListItem.vue b/src/components/ProductListItem.vue
@@ -13,7 +13,7 @@
     </ion-label>
     <!-- Only show stock if its not a ship to store order -->
     <div v-if="!isShipToStoreOrder">
-      <ion-note v-if="getProductStock(item.productId).quantityOnHandTotal >= 0 " :color="updateColor(getProductStock(item.productId))">
+      <ion-note v-if="getProductStock(item.productId).quantityOnHandTotal >= 0 " :color="updateColor(getProductStock(item.productId).quantityOnHandTotal)">
         {{ getProductStock(item.productId).quantityOnHandTotal }} {{ $t('pieces in stock') }}
       </ion-note>
       <ion-spinner v-else-if="isFetchingStock" color="medium" name="crescent" />
@@ -26,14 +26,15 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { IonIcon, IonItem, IonLabel, IonNote, IonSpinner, IonThumbnail } from "@ionic/vue";
+import { IonButton, IonIcon, IonItem, IonLabel, IonNote, IonSpinner, IonThumbnail } from "@ionic/vue";
 import { mapGetters, useStore } from 'vuex';
 import { ShopifyImg } from '@hotwax/dxp-components'
 import { cubeOutline } from 'ionicons/icons'
 
 export default defineComponent({
   name: "ProductListItem",
   components: {
+    IonButton,
     IonIcon,
     IonItem,
     IonLabel,

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -105,6 +105,7 @@
   "pending approval": "pending approval",
   "Picked by": "Picked by { pickers }",
   "Pick up location": "Pick up location",
+  "pieces in stock": "pieces in stock",
   "Product details": "Product details",
   "Product not found": "Product not found",
   "Products not found": "Products not found",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -104,6 +104,7 @@
   "pending approval": "pendiente de aprobación",
   "Picked by": "Picked by { pickers }",
   "Pick up location": "Ubicación de recogida",
+  "pieces in stock": "pieces in stock",
   "Product details": "Detalles del producto",
   "Product not found": "Producto no encontrado",
   "Products not found": "Productos no encontrados",

diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -104,6 +104,7 @@
   "pending approval": "承認待ち",
   "Picked by": "Picked by { pickers }",
   "Pick up location": "受取場所",
+  "pieces in stock": "pieces in stock",
   "Product details": "商品詳細",
   "Product not found": "商品が見つかりません",
   "Products not found": "商品が見つかりません",

diff --git a/src/store/modules/order/actions.ts b/src/store/modules/order/actions.ts
@@ -791,7 +791,6 @@ const actions: ActionTree<OrderState , RootState> ={
 
         // Get products that exist in order item rejection history
         await this.dispatch('product/fetchProducts', { productIds })
-        await this.dispatch('stock/addProducts', { productIds })
       } else {
         throw resp.data
       }

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -245,6 +245,7 @@ import {
   IonIcon,
   IonItem,
   IonLabel,
+  IonList,
   IonPage,
   IonSelect,
   IonSelectOption,
@@ -290,6 +291,7 @@ export default defineComponent({
     IonIcon,
     IonItem, 
     IonLabel, 
+    IonList,
     IonPage, 
     IonSelect, 
     IonSelectOption,