diff --git a/src/views/Fulfillment.vue b/src/views/Fulfillment.vue index e1becc8e..313372ef 100644 --- a/src/views/Fulfillment.vue +++ b/src/views/Fulfillment.vue @@ -16,7 +16,8 @@ {{ translate("Ship packed orders") }} - {{ getTemporalExpression('SHIP_PKD_ODRS') }} + {{ getTemporalExpression('SHIP_PKD_ODRS') }} + @@ -31,7 +32,8 @@ {{ translate("Order fulfillment") }} - {{ getTemporalExpression('ODR_FLMNT_HST') }} + {{ getTemporalExpression('ODR_FLMNT_HST') }} + @@ -46,15 +48,18 @@ {{ translate("Open BOPIS order notification") }} - {{ getTemporalExpression('OPN_BOPIS_ORD_NT') }} + {{ getTemporalExpression('OPN_BOPIS_ORD_NT') }} + {{ translate("Ready to pick BOPIS order notification") }} - {{ getTemporalExpression('READYPICK_BOPIS_ORD_NT') }} + {{ getTemporalExpression('READYPICK_BOPIS_ORD_NT') }} + {{ translate("Open shipping order notification") }} - {{ getTemporalExpression('OPEN_SHIPPING_ORD_NT') }} + {{ getTemporalExpression('OPEN_SHIPPING_ORD_NT') }} + @@ -110,6 +115,7 @@ import { IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -142,6 +148,7 @@ export default defineComponent({ IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -159,7 +166,8 @@ export default defineComponent({ isDesktop: isPlatform('desktop'), autoCancelDays: '', enumTypeId: 'FULFILLMENT_SYS_JOB', - initialLoadJobEnums: JSON.parse(process.env?.VUE_APP_INITIAL_JOB_ENUMS as string) as any + initialLoadJobEnums: JSON.parse(process.env?.VUE_APP_INITIAL_JOB_ENUMS as string) as any, + isLoading: false } }, computed: { @@ -233,6 +241,7 @@ export default defineComponent({ } }, async fetchJobs(){ + this.isLoading = true await this.store.dispatch("job/fetchJobs", { "inputFields": { "enumTypeId": "FULFILLMENT_SYS_JOB" @@ -241,6 +250,7 @@ export default defineComponent({ if (this.currentEComStore.productStoreId) { this.getAutoCancelDays(); } + this.isLoading = false }, async getAutoCancelDays(){ const payload = { diff --git a/src/views/Inventory.vue b/src/views/Inventory.vue index 877f055c..9185b398 100644 --- a/src/views/Inventory.vue +++ b/src/views/Inventory.vue @@ -16,7 +16,8 @@ {{ translate("Hard sync") }} - {{ getTemporalExpression('HARD_SYNC') }} + {{ getTemporalExpression('HARD_SYNC') }} + @@ -56,6 +57,7 @@ import { IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -83,6 +85,7 @@ export default defineComponent({ IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -100,6 +103,7 @@ export default defineComponent({ isDesktop: isPlatform('desktop'), enumTypeId: 'INVENTORY_SYS_JOB', webhookEnums: JSON.parse(process.env?.VUE_APP_WEBHOOK_ENUMS as string) as any, + isLoading: false } }, computed: { @@ -165,12 +169,14 @@ export default defineComponent({ this.getTemporalExpr(this.getJobStatus(this.jobEnums[enumId]))?.description : translate('Disabled') }, - fetchJobs(){ - this.store.dispatch("job/fetchJobs", { + async fetchJobs(){ + this.isLoading = true + await this.store.dispatch("job/fetchJobs", { "inputFields":{ "enumTypeId": "INVENTORY_SYS_JOB" } }); + this.isLoading = false }, fetchData() { this.store.dispatch('webhook/fetchWebhooks') diff --git a/src/views/Orders.vue b/src/views/Orders.vue index 91adf507..bfb01211 100644 --- a/src/views/Orders.vue +++ b/src/views/Orders.vue @@ -16,27 +16,33 @@ {{ translate("New orders") }} - {{ getTemporalExpression('IMP_NEW_ORDERS') }} + {{ getTemporalExpression('IMP_NEW_ORDERS') }} + {{ translate("Approve orders") }} - {{ getTemporalExpression('APR_ORD') }} + {{ getTemporalExpression('APR_ORD') }} + {{ translate("Update orders") }} - {{ getTemporalExpression('UPDT_ORDS') }} + {{ getTemporalExpression('UPDT_ORDS') }} + {{ translate("Cancelled orders") }} - {{ getTemporalExpression('IMP_CANCELLED_ORDERS') }} + {{ getTemporalExpression('IMP_CANCELLED_ORDERS') }} + {{ translate("Cancelled items") }} - {{ getTemporalExpression('IMP_CANCELLED_ITEMS') }} + {{ getTemporalExpression('IMP_CANCELLED_ITEMS') }} + {{ translate("Returns") }} - {{ getTemporalExpression('IMP_RETURNS') }} + {{ getTemporalExpression('IMP_RETURNS') }} + @@ -72,15 +78,18 @@ {{ translate("Completed orders") }} - {{ getTemporalExpression('UPLD_CMPLT_ORDRS') }} + {{ getTemporalExpression('UPLD_CMPLT_ORDRS') }} + {{ translate("Cancelled orders") }} - {{ getTemporalExpression('UPLD_CNCLD_ORDRS') }} + {{ getTemporalExpression('UPLD_CNCLD_ORDRS') }} + {{ translate("Refunds") }} - {{ getTemporalExpression('UPLD_REFUNDS') }} + {{ getTemporalExpression('UPLD_REFUNDS') }} + @@ -105,6 +114,7 @@ import { IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -133,6 +143,7 @@ export default defineComponent({ IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -150,7 +161,8 @@ export default defineComponent({ isJobDetailAnimationCompleted: false, isDesktop: isPlatform('desktop'), enumTypeId: 'ORDER_SYS_JOB', - initialLoadJobEnums: JSON.parse(process.env?.VUE_APP_INITIAL_JOB_ENUMS as string) as any + initialLoadJobEnums: JSON.parse(process.env?.VUE_APP_INITIAL_JOB_ENUMS as string) as any, + isLoading: false } }, computed: { @@ -268,12 +280,14 @@ export default defineComponent({ translate('Disabled') }, async fetchJobs(){ + this.isLoading = true; this.store.dispatch('webhook/fetchWebhooks') await this.store.dispatch("job/fetchJobs", { "inputFields": { "enumTypeId": "ORDER_SYS_JOB" } }); + this.isLoading = false } }, mounted () { diff --git a/src/views/Product.vue b/src/views/Product.vue index 07515198..539eca43 100644 --- a/src/views/Product.vue +++ b/src/views/Product.vue @@ -16,11 +16,13 @@ {{ translate("Import products") }} - {{ getTemporalExpression('IMP_PRDTS') }} + {{ getTemporalExpression('IMP_PRDTS') }} + {{ translate("Sync products") }} - {{ getTemporalExpression('SYNC_PRDTS') }} + {{ getTemporalExpression('SYNC_PRDTS') }} +

{{ translate("Sync products and category structures from Shopify into HotWax Commerce and keep them up to date.") }}

@@ -64,6 +66,7 @@ import { IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToolbar, IonToggle, @@ -91,6 +94,7 @@ export default defineComponent({ IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToolbar, IonToggle, @@ -126,7 +130,8 @@ export default defineComponent({ isDesktop: isPlatform('desktop'), webhookEnums: JSON.parse(process.env?.VUE_APP_WEBHOOK_ENUMS as string) as any, enumTypeId: 'PRODUCT_SYS_JOB', - initialLoadJobEnums: JSON.parse(process.env?.VUE_APP_INITIAL_JOB_ENUMS as string) as any + initialLoadJobEnums: JSON.parse(process.env?.VUE_APP_INITIAL_JOB_ENUMS as string) as any, + isLoading: false } }, mounted () { @@ -187,13 +192,15 @@ export default defineComponent({ this.getTemporalExpr(this.getJobStatus(this.jobEnums[enumId]))?.description : translate('Disabled') }, - fetchJobs(){ - this.store.dispatch("job/fetchJobs", { + async fetchJobs(){ + this.isLoading = true + await this.store.dispatch("job/fetchJobs", { "inputFields":{ "enumTypeId": "PRODUCT_SYS_JOB" } }); this.store.dispatch('webhook/fetchWebhooks') + this.isLoading = false } }, setup() {