From 6cec6d611af9d96a18db340e101e44396ad4adda Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Mon, 8 Apr 2024 19:03:34 +0530 Subject: [PATCH 1/6] Updated: app version for minor release (v1.18.0). --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 362e29ae..82326be0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "preorder-app", - "version": "1.17.0", + "version": "1.18.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "preorder-app", - "version": "1.17.0", + "version": "1.18.0", "dependencies": { "@capacitor/android": "^2.5.0", "@capacitor/core": "^2.4.7", diff --git a/package.json b/package.json index 69230ff9..b352e80c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "preorder-app", - "version": "1.17.0", + "version": "1.18.0", "private": true, "description": "HotWax Commece Pre-order App", "scripts": { From e3272879baeb5e81d72a8c6841a90203624bfd55 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Tue, 3 Sep 2024 10:58:42 +0530 Subject: [PATCH 2/6] Improved: Passed selected productStoreId while uploading file for releasing, cancelling or updating promise date (#296). --- src/services/OrderService.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/services/OrderService.ts b/src/services/OrderService.ts index c18f4017..e687ce32 100644 --- a/src/services/OrderService.ts +++ b/src/services/OrderService.ts @@ -1,4 +1,5 @@ import { api } from '@/adapter'; +import store from '@/store'; const findOrder = async (payload: any): Promise => { return api({ @@ -20,7 +21,7 @@ const releaseItems = async (payload: any): Promise => { return api({ url: "uploadJsonFile", method: "post", - data: payload.data, + data: {...payload.data, "productStoreId": store.state.user.currentEComStore.productStoreId}, headers: payload.headers }); } @@ -29,7 +30,7 @@ const cancelItems = async (payload: any): Promise => { return api({ url: "uploadJsonFile", method: "post", - data: payload.data, + data: {...payload.data, "productStoreId": store.state.user.currentEComStore.productStoreId}, headers: payload.headers }); } @@ -38,7 +39,7 @@ const updatePromiseDateItems = async (payload: any): Promise => { return api({ url: "uploadJsonFile", method: "post", - data: payload.data, + data: {...payload.data, "productStoreId": store.state.user.currentEComStore.productStoreId}, headers: payload.headers }); } From cbcc900e9e6df63b0d6330ceda66f1e462f189dd Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Tue, 3 Sep 2024 19:02:42 +0530 Subject: [PATCH 3/6] Improved: Passed productStoreId in the needed format (#296). --- src/services/OrderService.ts | 7 +++---- src/views/orders.vue | 3 +++ src/views/product-details.vue | 3 +++ src/views/promise-date-modal.vue | 2 ++ src/views/warehouse-modal.vue | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/services/OrderService.ts b/src/services/OrderService.ts index e687ce32..c18f4017 100644 --- a/src/services/OrderService.ts +++ b/src/services/OrderService.ts @@ -1,5 +1,4 @@ import { api } from '@/adapter'; -import store from '@/store'; const findOrder = async (payload: any): Promise => { return api({ @@ -21,7 +20,7 @@ const releaseItems = async (payload: any): Promise => { return api({ url: "uploadJsonFile", method: "post", - data: {...payload.data, "productStoreId": store.state.user.currentEComStore.productStoreId}, + data: payload.data, headers: payload.headers }); } @@ -30,7 +29,7 @@ const cancelItems = async (payload: any): Promise => { return api({ url: "uploadJsonFile", method: "post", - data: {...payload.data, "productStoreId": store.state.user.currentEComStore.productStoreId}, + data: payload.data, headers: payload.headers }); } @@ -39,7 +38,7 @@ const updatePromiseDateItems = async (payload: any): Promise => { return api({ url: "uploadJsonFile", method: "post", - data: {...payload.data, "productStoreId": store.state.user.currentEComStore.productStoreId}, + data: payload.data, headers: payload.headers }); } diff --git a/src/views/orders.vue b/src/views/orders.vue index f85d2297..40716658 100644 --- a/src/views/orders.vue +++ b/src/views/orders.vue @@ -285,6 +285,7 @@ export default defineComponent({ selectedItemsCount: 'order/getSelectedItemsCount', userProfile: 'user/getUserProfile', query: 'order/getQuery', + currentEComStore: 'user/getCurrentEComStore', }), }, async ionViewWillEnter() { @@ -326,6 +327,7 @@ export default defineComponent({ const fileName = "ReleaseItems_" + Date.now() +".json"; formData.append("uploadedFile", blob, fileName); formData.append("configId", "MDM_REL_ORD_ITM_JSON"); + formData.append("param_productStoreId", this.currentEComStore.productStoreId); this.deselectSelectedItems(); return this.store.dispatch("order/releaseItems", { headers: { @@ -346,6 +348,7 @@ export default defineComponent({ const fileName = "CancelItems_" + Date.now() +".json"; formData.append("uploadedFile", blob, fileName); formData.append("configId", "MDM_CAN_ORD_ITM_JSON"); + formData.append("param_productStoreId", this.currentEComStore.productStoreId); this.deselectSelectedItems(); return this.store.dispatch("order/cancelItems", { headers: { diff --git a/src/views/product-details.vue b/src/views/product-details.vue index 5df0ab15..a0fc84b4 100644 --- a/src/views/product-details.vue +++ b/src/views/product-details.vue @@ -447,6 +447,8 @@ export default defineComponent({ const fileName = "ReleaseItems_" + Date.now() +".json"; formData.append("uploadedFile", blob, fileName); formData.append("configId", "MDM_REL_ORD_ITM_JSON"); + formData.append("param_productStoreId", this.currentEComStore.productStoreId); + return this.store.dispatch("order/releaseItems", { headers: { 'Content-Type': 'multipart/form-data;' @@ -475,6 +477,7 @@ export default defineComponent({ const fileName = "CancelItems_" + Date.now() +".json"; formData.append("uploadedFile", blob, fileName); formData.append("configId", "MDM_CAN_ORD_ITM_JSON"); + formData.append("param_productStoreId", this.currentEComStore.productStoreId); return this.store.dispatch("order/cancelItems", { headers: { 'Content-Type': 'multipart/form-data;' diff --git a/src/views/promise-date-modal.vue b/src/views/promise-date-modal.vue index 7582adf0..7dfcf474 100644 --- a/src/views/promise-date-modal.vue +++ b/src/views/promise-date-modal.vue @@ -53,6 +53,7 @@ export default defineComponent({ ...mapGetters({ jobTotal: 'job/getTotal', getSelectedItemsToUpdatePromiseDate: 'order/getSelectedItemsToUpdatePromiseDate', + currentEComStore: 'user/getCurrentEComStore', }), disableUpdate(): boolean { return this.promisedDatetime === '' || (this.item && this.item.promisedDatetime && DateTime.fromFormat(this.item.promisedDatetime, "yyyy-MM-dd hh:mm:ss.SSS").toFormat("yyyy-MM-dd") === this.promisedDatetime); @@ -94,6 +95,7 @@ export default defineComponent({ const fileName = "UpdatePromiseDateItems_" + Date.now() +".json"; formData.append("uploadedFile", blob, fileName); formData.append("configId", "MDM_UPD_ORD_ITM_JSON"); + formData.append("param_productStoreId", this.currentEComStore.productStoreId); return this.store.dispatch("order/updatePromiseDateItems", { headers: { 'Content-Type': 'multipart/form-data;' diff --git a/src/views/warehouse-modal.vue b/src/views/warehouse-modal.vue index 31492143..3a3579b1 100644 --- a/src/views/warehouse-modal.vue +++ b/src/views/warehouse-modal.vue @@ -145,6 +145,7 @@ export default defineComponent({ const fileName = "ReleaseItemsToWarehouse_" + Date.now() +".json"; formData.append("uploadedFile", blob, fileName); formData.append("configId", "MDM_REL_ORD_ITM_JSON"); + formData.append("param_productStoreId", this.currentEComStore.productStoreId); return this.store.dispatch("order/releaseItems", { headers: { 'Content-Type': 'multipart/form-data;' From 96d691eef5cd9a06eaf9a4f8b51648522d8fb4c3 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Wed, 11 Sep 2024 16:44:24 +0530 Subject: [PATCH 4/6] Updated: app version for patch release v1.18.1. --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4aaa7994..88b8a73b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "preorder-app", - "version": "1.18.0", + "version": "1.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "preorder-app", - "version": "1.18.0", + "version": "1.18.1", "dependencies": { "@capacitor/android": "^2.5.0", "@capacitor/core": "^2.4.7", diff --git a/package.json b/package.json index 469464c9..be760c54 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "preorder-app", - "version": "1.18.0", + "version": "1.18.1", "private": true, "description": "HotWax Commece Pre-order App", "scripts": { From cf1010d3c89d28ffa7da0f74b496f162614fe4f7 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Wed, 11 Sep 2024 16:47:02 +0530 Subject: [PATCH 5/6] Updated: app version for patch release v1.17.1. --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 88b8a73b..8455e7b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "preorder-app", - "version": "1.18.1", + "version": "1.17.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "preorder-app", - "version": "1.18.1", + "version": "1.17.1", "dependencies": { "@capacitor/android": "^2.5.0", "@capacitor/core": "^2.4.7", diff --git a/package.json b/package.json index be760c54..ec7b5862 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "preorder-app", - "version": "1.18.1", + "version": "1.17.1", "private": true, "description": "HotWax Commece Pre-order App", "scripts": { From e4d5d72ef409da15f6cb9ca157d9c5849027b8ad Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Wed, 11 Sep 2024 16:56:49 +0530 Subject: [PATCH 6/6] Updated: app version for minor release v1.18.0. --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8455e7b3..4aaa7994 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "preorder-app", - "version": "1.17.1", + "version": "1.18.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "preorder-app", - "version": "1.17.1", + "version": "1.18.0", "dependencies": { "@capacitor/android": "^2.5.0", "@capacitor/core": "^2.4.7", diff --git a/package.json b/package.json index ec7b5862..469464c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "preorder-app", - "version": "1.17.1", + "version": "1.18.0", "private": true, "description": "HotWax Commece Pre-order App", "scripts": {