Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored: setEcomStore and setShopifyConfig actions to accept ID. (#2tzh44d) #241

Merged
merged 11 commits into from
Oct 10, 2022
Merged

Refactored: setEcomStore and setShopifyConfig actions to accept ID. (#2tzh44d) #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
383b385
Implemented: Validation on runtime set by user to accept only future …
k2maan Sep 13, 2022
25b04b9
Fixed: Indentations
k2maan Sep 13, 2022
06f37a2
Improved: Removed unnecessary code (method and getter) (#2tzb5w4)
k2maan Sep 13, 2022
87dc4ed
Refactored: setEcomStore and setCurrentShopifyConfig actions to accep…
k2maan Sep 20, 2022
0fd3d5c
Reverting: pushed unwanted file
k2maan Sep 20, 2022
c7c082d
Added find function with the desired usage
k2maan Sep 26, 2022
8d22484
Refactored by removing and modifying unnecessary code
k2maan Oct 7, 2022
57fe77e
Refactored code, improved variable names and used state instead of ge…
k2maan Oct 10, 2022
e064808
Refactored code and improved readability
k2maan Oct 10, 2022
a41a43a
Renamed: variable name for shopifyConfig as per the pattern (#2tzh44d))
adityasharma7 Oct 10, 2022
e5385f1
Reverted: unwanted spaces (#2tzh44d)
adityasharma7 Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/store/modules/user/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,18 @@ const actions: ActionTree<UserState, RootState> = {
/**
* update current eComStore information
*/
async setEcomStore({ commit, dispatch }, payload) {
async setEcomStore({ state, commit, dispatch }, payload) {
dispatch('job/clearJobState', null, { root: true });
commit(types.USER_CURRENT_ECOM_STORE_UPDATED, payload.eComStore);
dispatch('getShopifyConfig', payload.eComStore.productStoreId);
let productStore = payload.productStore;
if(!productStore) {
productStore = this.state.user.current.stores.find((store: any) => store.productStoreId === payload.productStoreId);
}

commit(types.USER_CURRENT_ECOM_STORE_UPDATED, productStore);
dispatch('getShopifyConfig', productStore.productStoreId);
await UserService.setUserPreference({
'userPrefTypeId': 'SELECTED_BRAND',
'userPrefValue': payload.eComStore.productStoreId
'userPrefValue': productStore.productStoreId
});
},
/**
Expand Down Expand Up @@ -204,7 +209,12 @@ const actions: ActionTree<UserState, RootState> = {
/**
* update current shopify config id
*/
async setCurrentShopifyConfig({ commit, dispatch }, shopifyConfig) {
async setCurrentShopifyConfig({ commit, dispatch, state }, payload) {
let shopifyConfig = payload.shopifyConfig;
if(!shopifyConfig) {
shopifyConfig = state.shopifyConfigs.find((configs: any) => configs.shopifyConfigId === payload.shopifyConfigId)
}

commit(types.USER_CURRENT_SHOPIFY_CONFIG_UPDATED, shopifyConfig ? shopifyConfig : {});
dispatch('job/clearJobState', null, { root: true });
},
Expand Down Expand Up @@ -297,4 +307,4 @@ const actions: ActionTree<UserState, RootState> = {
}
}

export default actions;
export default actions;
9 changes: 3 additions & 6 deletions src/views/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,13 @@ export default defineComponent({
})
},
methods: {
setEComStore(store: any) {
setEComStore(event: any) {
if(this.userProfile) {
this.store.dispatch('user/setEcomStore', {
'eComStore': this.userProfile.stores.find((str: any) => str.productStoreId == store['detail'].value)
})
this.store.dispatch('user/setEcomStore', { 'productStoreId': event.detail.value })
}
},
setShopifyConfig(event: any){
const shopifyConfig = this.shopifyConfigs.find((shopifyConfig: any) => shopifyConfig.shopifyConfigId === event.detail.value)
this.store.dispatch('user/setCurrentShopifyConfig', shopifyConfig);
this.store.dispatch('user/setCurrentShopifyConfig', { 'shopifyConfigId': event.detail.value });
},
async changeTimeZone() {
const timeZoneModal = await modalController.create({
Expand Down