orderiom-api-package 0.2.40 → 0.2.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.2.40",
+  "version": "0.2.42",
   "description": "this package will install all neccessary api calls for every orderiom restaurant",
   "main": "index.js",
   "scripts": {

package/src/modules/product.js

@@ -3,6 +3,23 @@ import Vue from 'vue';
 
 const restaurantId = process.env.VUE_APP_RESTAURANT_ID;
 
+function calculateBasketIdParameter(isLogin) {
+    if(isLogin) return undefined;
+    // localStorage might fail
+    let baskets = [];
+    try{
+        baskets = JSON.parse(localStorage.getItem("basket")) || [];
+    }catch(e){
+        console.error(e);
+        throw new Error('Basket not found');
+    }
+    const foundBasket = baskets.find(basket => basket.restaurantId === restaurantId);
+    if(!foundBasket){
+        throw new Error('Basket not found');
+    }
+    return foundBasket.basketId;
+}
+
 const state = () => ({
     selectedTime: null,
     selectedDate: null,
@@ -113,22 +130,9 @@ const mutations = {
     }
 };
 const actions = {
-    calculateBasketIdParameter({ rootState }){
-        if(rootState.orderiomApiPackage.auth.privateToken) return undefined;
-        // localStorage might fail
-        let baskets = [];
-        try{
-            baskets = JSON.parse(localStorage.getItem("basket")) || [];
-        }catch(e){
-            console.error(e);
-            throw new Error('Basket not found');
-        }
-        const foundBasket = baskets.find(basket => basket.restaurantId === restaurantId);
-        if(!foundBasket){
-            throw new Error('Basket not found');
-        }
-        return foundBasket.basketId;
-    },
+    // TODO: note the axios in loop
+    // Orderiom api doesn't use this function
+    // check whether ordermood is using this function or not
     getCategoriesWithProducts({ commit, dispatch }, restaurantId) {
         return axios
             .get("api/restaurant/category", { params: { restaurantId: restaurantId } })
@@ -193,6 +197,8 @@ const actions = {
             .get("api/restaurant/category", { params: { restaurantId: restaurantId } })
             .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
                 axios
                     .get("api/restaurant/category", { params: { restaurantId: restaurantId, extra: 1 } })
                     .then((res) => {
@@ -246,13 +252,14 @@ const actions = {
                 }
             });
     },
-    getProducts({ commit, state, dispatch }, data) {
+    getProducts({ commit, state, rootState }, data) {
         commit("setSelectedCategory", data.category);
 
         let basketId = undefined;
         try{
-            basketId = dispatch('calculateBasketIdParameter');
-        } catch {
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+        } catch(e) {
+            console.error(e);
             return { type: 'error', msg: 'Basket not found' }
         }
 
@@ -450,11 +457,12 @@ const actions = {
             }
         });
     },
-    changeDeliveryMethod({ commit, dispatch, rootState }, deliveryType){
+    changeDeliveryMethod({ commit, dispatch, rootState, state }, deliveryType){
         let basketId = undefined;
         try{
-            basketId = dispatch('calculateBasketIdParameter');
-        } catch {
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+        } catch(e) {
+            console.error(e);
             return { type: 'error', msg: 'Basket not found' }
         }
 
@@ -470,6 +478,11 @@ const actions = {
                 return { type: 'error', msg: 'There was an error in updating the delivery type' }
             }
 
+            dispatch('getProducts', {
+                restaurantId,
+                category: state.selectedCategory || state.categories[0]
+            });
+
             const result = await dispatch("getBasket", restaurantId);
 
             return {