diff --git a/src/views/AdjustInventory.vue b/src/views/AdjustInventory.vue index 6571314..aa90d6d 100644 --- a/src/views/AdjustInventory.vue +++ b/src/views/AdjustInventory.vue @@ -2,7 +2,6 @@ - {{ translate("Adjust Inventory") }} @@ -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 index e655085..4ff2cec 100644 --- a/src/views/ScheduledIncomingInventory.vue +++ b/src/views/ScheduledIncomingInventory.vue @@ -2,7 +2,6 @@ - {{ translate("Scheduled Incoming Inventory") }} @@ -64,7 +63,7 @@ -
+

{{ translate("No jobs are scheduled for incoming inventory") }}

@@ -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 index 0b6caad..96268bb 100644 --- a/src/views/ScheduledRestock.vue +++ b/src/views/ScheduledRestock.vue @@ -2,7 +2,6 @@ - {{ translate("Scheduled product launch") }} @@ -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 index ff1b66f..cb64aca 100644 --- a/src/views/ScheduledRestockReview.vue +++ b/src/views/ScheduledRestockReview.vue @@ -47,7 +47,7 @@ {{ translate("Shopify store") }} -

{{ currentJob.shopId ? (shopifyShops.find(shop => shop.shopId === currentJob.shopId)?.name || currentJob.shopId) : translate("No shop selected") }}

+

{{ currentJob.shopId ? (getShopNameById(currentJob.shopId) || currentJob.shopId) : translate("No shop selected") }}

@@ -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") },