Improved: Added a function to return the shop name by shopId, removed…

… the ion-menu-button, and removed the schedule time check from the upload function of the scheduled restock page (#304)
hotwax · Jan 2, 2025 · a678fd5 · a678fd5
1 parent 957ad71
commit a678fd5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/src/views/AdjustInventory.vue b/src/views/AdjustInventory.vue
@@ -2,7 +2,6 @@
   <ion-page>
     <ion-header>
       <ion-toolbar>
-        <ion-menu-button slot="start" />
         <ion-back-button default-href="/unified-inventory" slot="start" />
         <ion-title>{{ translate("Adjust Inventory") }}</ion-title>
         <!-- TODO: We need to discuss what to display on this button click. -->
@@ -128,7 +127,7 @@ import { defineComponent } from "vue";
 import { useRouter } from "vue-router";
 import { translate } from "@hotwax/dxp-components";
 import { addOutline, arrowForward, cloudUploadOutline, settingsOutline,  } from "ionicons/icons";
-import { IonBackButton, IonButton, IonChip, IonContent, IonHeader, IonIcon, IonItem, IonItemDivider, IonLabel, IonList, IonListHeader, IonMenuButton, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, modalController, alertController } from "@ionic/vue";
+import { IonBackButton, IonButton, IonChip, IonContent, IonHeader, IonIcon, IonItem, IonItemDivider, IonLabel, IonList, IonListHeader, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, modalController, alertController } from "@ionic/vue";
 import { jsonToCsv, showToast, hasError } from '@/utils';
 import { mapGetters, useStore } from "vuex";
 import { DateTime } from 'luxon';
@@ -152,7 +151,6 @@ export default defineComponent({
     IonLabel,
     IonList,
     IonListHeader,
-    IonMenuButton,
     IonPage,
     IonSelect,
     IonSelectOption,

diff --git a/src/views/ScheduledIncomingInventory.vue b/src/views/ScheduledIncomingInventory.vue
@@ -2,7 +2,6 @@
   <ion-page>
     <ion-header>
       <ion-toolbar>
-        <ion-menu-button slot="start" />
         <ion-back-button default-href="/unified-inventory" slot="start" />
         <ion-title>{{ translate("Scheduled Incoming Inventory") }}</ion-title>
       </ion-toolbar>
@@ -64,7 +63,7 @@
             </ion-item>
           </template>
         </ion-list>
-        <div v-if="!jobs.length" class="empty-state">
+        <div v-else class="empty-state">
           <p>{{ translate("No jobs are scheduled for incoming inventory") }}</p>
         </div>
       </main>
@@ -82,7 +81,6 @@ import {
   IonPage, 
   IonHeader, 
   IonToolbar, 
-  IonMenuButton, 
   IonTitle, 
   IonContent, 
   IonButton, 
@@ -110,7 +108,6 @@ export default defineComponent({
     IonPage,
     IonHeader,
     IonToolbar,
-    IonMenuButton,
     IonTitle,
     IonContent,
     IonButton,

diff --git a/src/views/ScheduledRestock.vue b/src/views/ScheduledRestock.vue
@@ -2,7 +2,6 @@
   <ion-page>
     <ion-header>
       <ion-toolbar>
-        <ion-menu-button slot="start" />
         <ion-back-button default-href="/scheduled-incoming-inventory" slot="start" />
         <ion-title>{{ translate("Scheduled product launch") }}</ion-title>
         <!-- TODO: We need to discuss what to display on this button click. -->
@@ -115,7 +114,7 @@ import { defineComponent } from "vue";
 import { useRouter } from "vue-router";
 import { translate } from "@hotwax/dxp-components";
 import { addOutline, arrowForwardOutline, cloudUploadOutline, ellipsisVerticalOutline } from "ionicons/icons";
-import { IonBackButton, IonButton, IonChip, IonContent, IonDatetime, IonHeader, IonIcon, IonInput, IonItem, IonItemDivider, IonLabel, IonList, IonListHeader, IonMenuButton, IonModal, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, modalController, alertController } from "@ionic/vue";
+import { IonBackButton, IonButton, IonChip, IonContent, IonDatetime, IonHeader, IonIcon, IonInput, IonItem, IonItemDivider, IonLabel, IonList, IonListHeader, IonModal, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, modalController, alertController } from "@ionic/vue";
 import parseFileMixin from '@/mixins/parseFileMixin';
 import { showToast, hasError } from '@/utils';
 import { mapGetters, useStore } from "vuex";
@@ -142,7 +141,6 @@ export default defineComponent({
     IonLabel,
     IonList,
     IonListHeader,
-    IonMenuButton,
     IonModal,
     IonPage,
     IonSelect,
@@ -286,11 +284,6 @@ export default defineComponent({
         return;
       }
       
-      if(!this.schedule) {
-        showToast(translate("Please select a schedule time"));
-        return;
-      }
-      
       if(!this.selectedFacility) {
         showToast(translate("Please select a facility"));
         return;

diff --git a/src/views/ScheduledRestockReview.vue b/src/views/ScheduledRestockReview.vue
@@ -47,7 +47,7 @@
             <ion-item lines="none"> 
               <ion-label>{{ translate("Shopify store") }}</ion-label>
               <ion-label slot="end">
-                <p>{{ currentJob.shopId ? (shopifyShops.find(shop => shop.shopId === currentJob.shopId)?.name || currentJob.shopId) : translate("No shop selected") }}</p>
+                <p>{{ currentJob.shopId ? (getShopNameById(currentJob.shopId) || currentJob.shopId) : translate("No shop selected") }}</p>
               </ion-label>
             </ion-item>
           </ion-list>
@@ -169,6 +169,10 @@ export default defineComponent({
         this.isJobNameUpdating = false
       }
     },
+    getShopNameById(shopId) {
+      const shop = this.shopifyShops.find(shop => shop.shopId === shopId);
+      return shop?.name;
+    },
     getTime(time) {
       return DateTime.fromMillis(time, { setZone: true}).toFormat("hh:mm a dd MMM yyyy")
     },