diff --git a/src/views/Fulfillment.vue b/src/views/Fulfillment.vue index 5bbf32a0..a9cb0234 100644 --- a/src/views/Fulfillment.vue +++ b/src/views/Fulfillment.vue @@ -16,7 +16,8 @@ {{ $t("Ship packed orders") }} - {{ getTemporalExpression('SHIP_PKD_ODRS') }} + {{ getTemporalExpression('SHIP_PKD_ODRS') }} + @@ -31,7 +32,8 @@ {{ $t("Order fulfillment") }} - {{ getTemporalExpression('ODR_FLMNT_HST') }} + {{ getTemporalExpression('ODR_FLMNT_HST') }} + @@ -85,6 +87,7 @@ import { IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -117,6 +120,7 @@ export default defineComponent({ IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -134,7 +138,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: true } }, computed: { @@ -216,6 +221,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 16c76f30..af1bda7a 100644 --- a/src/views/Inventory.vue +++ b/src/views/Inventory.vue @@ -25,7 +25,8 @@ {{ $t("Hard sync") }} - {{ getTemporalExpression('HARD_SYNC') }} + {{ getTemporalExpression('HARD_SYNC') }} + @@ -108,6 +109,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: true } }, computed: { @@ -212,12 +214,13 @@ export default defineComponent({ this.getTemporalExpr(this.getJobStatus(this.jobEnums[enumId]))?.description : this.$t('Disabled') }, - fetchJobs(){ - this.store.dispatch("job/fetchJobs", { + async fetchJobs(){ + 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 f5435858..1a362d1e 100644 --- a/src/views/Orders.vue +++ b/src/views/Orders.vue @@ -16,27 +16,33 @@ {{ $t("New orders") }} - {{ getTemporalExpression('IMP_NEW_ORDERS') }} + {{ getTemporalExpression('IMP_NEW_ORDERS') }} + {{ $t("Approve orders") }} - {{ getTemporalExpression('APR_ORD') }} + {{ getTemporalExpression('APR_ORD') }} + {{ $t("Update orders") }} - {{ getTemporalExpression('UPDT_ORDS') }} + {{ getTemporalExpression('UPDT_ORDS') }} + {{ $t("Cancelled orders") }} - {{ getTemporalExpression('IMP_CANCELLED_ORDERS') }} + {{ getTemporalExpression('IMP_CANCELLED_ORDERS') }} + {{ $t("Cancelled items") }} - {{ getTemporalExpression('IMP_CANCELLED_ITEMS') }} + {{ getTemporalExpression('IMP_CANCELLED_ITEMS') }} + {{ $t("Returns") }} - {{ getTemporalExpression('IMP_RETURNS') }} + {{ getTemporalExpression('IMP_RETURNS') }} + @@ -68,15 +74,18 @@ {{ $t("Completed orders") }} - {{ getTemporalExpression('UPLD_CMPLT_ORDRS') }} + {{ getTemporalExpression('UPLD_CMPLT_ORDRS') }} + {{ $t("Cancelled orders") }} - {{ getTemporalExpression('UPLD_CNCLD_ORDRS') }} + {{ getTemporalExpression('UPLD_CNCLD_ORDRS') }} + {{ $t("Refunds") }} - {{ getTemporalExpression('UPLD_REFUNDS') }} + {{ getTemporalExpression('UPLD_REFUNDS') }} + @@ -101,6 +110,7 @@ import { IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -129,6 +139,7 @@ export default defineComponent({ IonLabel, IonMenuButton, IonPage, + IonSkeletonText, IonTitle, IonToggle, IonToolbar, @@ -146,7 +157,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: true } }, computed: { @@ -270,6 +282,7 @@ export default defineComponent({ "enumTypeId": "ORDER_SYS_JOB" } }); + this.isLoading = false } }, mounted () { diff --git a/src/views/Product.vue b/src/views/Product.vue index 01358e12..d040f7d2 100644 --- a/src/views/Product.vue +++ b/src/views/Product.vue @@ -16,11 +16,13 @@ {{ $t("Import products") }} - {{ getTemporalExpression('IMP_PRDTS') }} + {{ getTemporalExpression('IMP_PRDTS') }} + {{ $t("Sync products") }} - {{ getTemporalExpression('SYNC_PRDTS') }} + {{ getTemporalExpression('SYNC_PRDTS') }} + {{ $t("Sync products and category structures from Shopify into HotWax Commerce and keep them up to date.") }} @@ -124,7 +126,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: true } }, mounted () { @@ -185,13 +188,14 @@ export default defineComponent({ this.getTemporalExpr(this.getJobStatus(this.jobEnums[enumId]))?.description : this.$t('Disabled') }, - fetchJobs(){ - this.store.dispatch("job/fetchJobs", { + async fetchJobs(){ + await this.store.dispatch("job/fetchJobs", { "inputFields":{ "enumTypeId": "PRODUCT_SYS_JOB" } }); this.store.dispatch('webhook/fetchWebhooks') + this.isLoading = false } }, setup() {
{{ $t("Sync products and category structures from Shopify into HotWax Commerce and keep them up to date.") }}