From 5f0a9388b2314d13ea8a2eadd42a54e92744cccd Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Thu, 28 Nov 2024 15:43:05 +0530 Subject: [PATCH 1/2] Reverted: removed the caret sign from oms-api in package.json file(#726) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 24a35177..b89ba5f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "1.15.4", - "@hotwax/oms-api": "^1.14.0", + "@hotwax/oms-api": "1.14.0", "@ionic/core": "^7.6.0", "@ionic/vue": "^7.6.0", "@ionic/vue-router": "^7.6.0", @@ -2680,9 +2680,9 @@ } }, "node_modules/@hotwax/oms-api": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.16.0.tgz", - "integrity": "sha512-WZ3v0TxcHz5UZEBDX+GvZd/cqD08Kws42kGcseN2tfNf5kKWbfaDgWm6KEaBxLFuVBPBdRelRZhGj/nRIxBgGw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.14.0.tgz", + "integrity": "sha512-dYkrFEi0oJHKiJ/VctKmyIY4WTVV2lmljm1EflgQ/LM7BTJ9jVEeT1zgYJ5vO906kW7SWM4pl7mZI3dDCt1YCQ==", "dependencies": { "@types/node-json-transform": "^1.0.0", "axios": "^0.21.1", diff --git a/package.json b/package.json index f0a276d0..4b58abf3 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "1.15.4", - "@hotwax/oms-api": "^1.14.0", + "@hotwax/oms-api": "1.14.0", "@ionic/core": "^7.6.0", "@ionic/vue": "^7.6.0", "@ionic/vue-router": "^7.6.0", From 8e660abc908b210520254284572eb2cb8b33ba68 Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Thu, 28 Nov 2024 16:21:16 +0530 Subject: [PATCH 2/2] Improved: updated the oms-api version & passed token in getShopifyConfig service using client method(#726) --- package-lock.json | 8 ++++---- package.json | 2 +- src/store/modules/user/actions.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index b89ba5f1..af464c11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "1.15.4", - "@hotwax/oms-api": "1.14.0", + "@hotwax/oms-api": "1.15.0", "@ionic/core": "^7.6.0", "@ionic/vue": "^7.6.0", "@ionic/vue-router": "^7.6.0", @@ -2680,9 +2680,9 @@ } }, "node_modules/@hotwax/oms-api": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.14.0.tgz", - "integrity": "sha512-dYkrFEi0oJHKiJ/VctKmyIY4WTVV2lmljm1EflgQ/LM7BTJ9jVEeT1zgYJ5vO906kW7SWM4pl7mZI3dDCt1YCQ==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.15.0.tgz", + "integrity": "sha512-6WXJ5z5JaAxgKith6dblLchP471xUYcFaeggN5onWZBkgGx5NqkLT0rgLWTW/UcVQMokxKtzSc+mcJ4eI1mGww==", "dependencies": { "@types/node-json-transform": "^1.0.0", "axios": "^0.21.1", diff --git a/package.json b/package.json index 4b58abf3..6df3d9f4 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "1.15.4", - "@hotwax/oms-api": "1.14.0", + "@hotwax/oms-api": "1.15.0", "@ionic/core": "^7.6.0", "@ionic/vue": "^7.6.0", "@ionic/vue-router": "^7.6.0", diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts index 60051585..3fa8beb7 100644 --- a/src/store/modules/user/actions.ts +++ b/src/store/modules/user/actions.ts @@ -184,7 +184,7 @@ const actions: ActionTree = { commit(types.USER_PWA_STATE_UPDATED, payload); }, - async getShopifyConfig({ commit }, productStoreId) { + async getShopifyConfig({ commit, state }, productStoreId) { if (!productStoreId) { commit(types.USER_SHOPIFY_CONFIGS_UPDATED, []); commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, {}); @@ -192,7 +192,7 @@ const actions: ActionTree = { } try { - const shopifyConfigs = await UserService.getShopifyConfig(productStoreId); + const shopifyConfigs = await UserService.getShopifyConfig(productStoreId, state?.token); // TODO store and get preferred config let currentShopifyConfig = {}; shopifyConfigs.length > 0 && (currentShopifyConfig = shopifyConfigs[0])