orderiom-api-package 0.4.61 → 0.4.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.4.61",
+  "version": "0.4.63",
   "description": "This package will install all necessary API calls for every orderiom restaurant",
   "main": "index.js",
   "types": "index.d.ts",

package/src/modules/product.js

@@ -30,11 +30,15 @@ const state = () => ({
     pinnedProducts: null,
     showPinnedProducts: false,
 	fetchingProducts: false,
+	categoriesFetchedOnce: false,
 });
 const getters = {
 	fetchingProducts(state){
 		return !!state.fetchingProducts;
 	},
+	categoriesFetchedOnce(){
+		return !!state.categoriesFetchedOnce;
+	},
 	subCategories(state){
 		if(!state.products) return []
         if(state.showPinnedProducts) {
@@ -158,6 +162,9 @@ const getters = {
     }
 }
 const mutations = {
+	setCategoriesFetchedOnce(state){
+		state.setCategoriesFetchedOnce = true;
+	},
 	setFetchingProducts(state, isFetching){
 		state.fetchingProducts = isFetching;
 	},
@@ -261,6 +268,11 @@ const mutations = {
 	}
 };
 const actions = {
+	chooseCategory({commit, dispatch, state}, {category, restaurantId}){
+		commit("setSelectedCategory", category);
+		dispatch("getProducts", {category, restaurantId,});
+		dispatch("getAttributeItems", {category, restaurantId});
+	},
     getCategories({ commit, dispatch, rootState, state }, restaurantId) {
         let basketId = undefined;
         try {
@@ -270,65 +282,50 @@ const actions = {
         } catch(e) {
             console.error("getCategories: " + e);
         }
-        return $http
-            .get("api/restaurant/category", { params: { restaurantId: restaurantId, basketId: basketId } })
-            .then((res) => {
-                let categories = res.data.data;
-                //TODO: why calling an api write after another while we can do it together?
-                //TODO: this api call returns empty on restaurant refresh
-                $http
-                    .get("api/restaurant/category", { params: { restaurantId: restaurantId, extra: 1, basketId: basketId } })
-                    .then((res) => {
-                        if (res.data.data.length) {
-                            categories = [...categories, ...res.data.data];
-                            commit('setCategories', categories);
-                            if(categories.length){
-                                if(!state.selectedCategory) {
-                                    commit("setSelectedCategory", categories[0]);
-                                }else{
-                                    const catInList = categories.find(cat => cat.id === state.selectedCategory.id);
-                                    if(!catInList || JSON.stringify(state.selectedCategory) !== JSON.stringify(catInList)){
-                                        commit("setSelectedCategory", categories[0]);
-                                    }
-                                }
-                            }
 
-                            dispatch("getProducts", {
-                                category: state.selectedCategory,
-                                restaurantId,
-                            });
-                            dispatch("getAttributeItems", {
-                                category: state.selectedCategory,
-                                restaurantId
-                            });
-                        } else {
-                            commit('setCategories', categories);
-                            if(categories.length){
-                                if(!state.selectedCategory) {
-                                    commit("setSelectedCategory", categories[0]);
-                                }else{
-                                    const catInList = categories.find(cat => cat.id === state.selectedCategory.id);
-                                    if(!catInList || JSON.stringify(state.selectedCategory) !== JSON.stringify(catInList)){
-                                        commit("setSelectedCategory", categories[0]);
-                                    }
-                                }
-                            }
+        return $http.get("api/restaurant/category", { params: {
+			restaurantId,
+			basketId
+		}}).then(res => {
+			let categories = res.data.data;
 
-                            dispatch("getProducts", {
-                                category: state.selectedCategory,
-                                restaurantId,
-                            });
-                            dispatch("getAttributeItems", {
-                                category: state.selectedCategory,
-                                restaurantId
-                            });
-                        }
-                    });
-                return res
-            })
-            .catch(
-                commonErrorCallback()
-            );
+			$http.get("api/restaurant/category", { params: {
+				restaurantId,
+				basketId,
+				extra: 1,
+			}}).then(res => {
+				const extraCategories = res.data.data;
+
+				if (extraCategories.length) commit('setCategories', [...categories, ...extraCategories]);
+				else commit('setCategories', categories);
+
+				if(state.categories.length){
+					if(!state.selectedCategory) {
+						dispatch('chooseCategory', {
+							category: state.categories[0],
+							restaurantId
+						})
+					}else{
+						// if selected category is set then check if it is the same category. If it is the same then there is no need to do anything.
+						const catInList = categories.find(cat => cat.id === state.selectedCategory.id);
+						if(!catInList || JSON.stringify(state.selectedCategory) !== JSON.stringify(catInList)){
+							dispatch('chooseCategory', {
+								category: state.categories[0],
+								restaurantId
+							})
+						}
+					}
+				}
+			}).catch(
+				commonErrorCallback()
+			);
+
+			return res
+		}).catch(
+			commonErrorCallback()
+		).finally(() => {
+			commit('setCategoriesFetchedOnce');
+		});
     },
     getProducts({ commit, state, rootState }, data) {
         commit("setSelectedCategory", data.category);