orderiom-api-package 0.3.17 → 0.3.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "description": "This package will install all necessary API calls for every orderiom restaurant",
   "main": "index.js",
   "scripts": {

package/src/modules/order.js

@@ -50,20 +50,13 @@ const mutations = {
 const actions = {
     async shoppingCartUpdateCallback({ dispatch, rootState }, data){
         const getBasketSuccess = await dispatch("product/getBasket", data.restaurantId, { root: true });
-        const getProductsResult = await dispatch(
-            "product/getProducts",
-            {
-                category: rootState.orderiomApiPackage.product.selectedCategory,
-                restaurantId: data.restaurantId
-            },
-            { root: true }
-        );
-        if(!getBasketSuccess || getProductsResult.type !== 'success'){
+        if(!getBasketSuccess){
             return {
                 type: 'error',
                 msg: 'There was an error in fetching the basket and products'
             }
         }
+
         return {
             type: 'success',
             msg: ''
@@ -105,11 +98,11 @@ const actions = {
             .post("api/order/create-basket", data)
             .then(async res => {
                 basketData.push({
-                    restaurantId: restaurantIdEnv,
+                    restaurantId: data.restaurantId || restaurantIdEnv,
                     basketId: res.data.data.basketId,
                 });
                 localStorage.setItem("basket", JSON.stringify(basketData));
-                const result = await dispatch('product/getBasket', restaurantIdEnv, { root: true }) ;
+                const result = await dispatch('product/getBasket', data.restaurantId || restaurantIdEnv, { root: true }) ;
                 return {
                     type:  result ? 'success' : 'error',
                     msg:  result  ? 'Basket created' : 'There was an error in fetching the basket info',
@@ -728,7 +721,7 @@ const actions = {
             restaurantId: data.restaurantId || restaurantIdEnv,
             ...data
         }).then(res =>
-            updateBasket({commit, basketId, res, restaurantId: data.restaurantId})
+            updateBasket({commit, basketId, res, restaurantId: data ? data.restaurantId : undefined})
         ).catch(err => {
             console.error(err);
             return false;

package/src/modules/product.js

@@ -6,6 +6,7 @@ const state = () => ({
     selectedTime: null,
     selectedDate: null,
     categories: [],
+	subCategoris: [],
     selectedCategory: null,
     products: null,
     selectedProduct: null,
@@ -118,7 +119,10 @@ const mutations = {
     },
     basketLoadedOnce(state){
         state.basketLoadedOnce = true;
-    }
+    },
+    setSubCategories(state , subCategoris){
+		state.subCategoris = subCategoris;
+	}
 };
 const actions = {
     // TODO: note the axios in loop
@@ -215,6 +219,7 @@ const actions = {
         commit("setSelectedCategory", data.category);
 
         let basketId = undefined;
+        const subCategoris =[];
         try{
             basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data.restaurantId);
         } catch(e) {
@@ -227,36 +232,18 @@ const actions = {
             restaurantId: data.restaurantId,
             basketId
         }}).then(res => {
-            let products = res.data.data;
-            products.map(m => {
-                if (state.ShoppingCart.find(
-                    (p) => p.RestaurantProductId == m.id
-                )) {
-                    if (!m.is_package) {
-                        Vue.set(m, 'quantity', state.ShoppingCart.find(
-                            (p) => p.RestaurantProductId == m.id
-                        ).quantity)
-                    }
-                    else {
-                        const productsInBasket = [];
-                        state.ShoppingCart.map(b => {
-                            if (b.RestaurantProductId == m.id) {
-                                productsInBasket.push(
-                                    b.quantity
-                                );
-                            }
-                        });
-                        let qty = productsInBasket.reduce(function (a, b) {
-                            return a + b;
-                        }, 0);
-                        Vue.set(m, 'quantity', qty)
-                    }
-                } else {
-                    Vue.set(m, 'quantity', 0)
-                }
-            })
-            commit("setProduct", products);
-            return { type: 'success', data: products }
+            res.data.data.forEach(productInCategory => {
+                if(productInCategory.subcategory_name && !state.subCategoris.includes(productInCategory.subcategory_name)){
+					subCategoris.push(productInCategory.subcategory_name)
+				}
+                productInCategory.quantity = state.ShoppingCart
+                    .filter(itemInCart => Number(itemInCart.RestaurantProductId) === Number(productInCategory.id))
+                    .reduce((a, b) => a.quantity + b.quantity, 0)
+            });
+
+			commit('setSubCategories' , subCategoris)
+            commit("setProduct", res.data.data);
+            return { type: 'success', data: res.data.data }
         }).catch(
             commonErrorCallback()
         );
@@ -276,7 +263,7 @@ const actions = {
         return axios.get('api/basket', {
             params: {
                 basketId,
-                restaurantId: restaurantIdEnv
+                restaurantId: data.restaurantId || restaurantIdEnv
             }
         }).then(res =>
             updateBasket({commit, basketId, res, restaurantId: data ? data.restaurantId : undefined})

package/src/modules/restaurant.js

@@ -145,7 +145,7 @@ const actions = {
     addReservedTables({ commit }, data) {
         return axios  
         .post("api/restaurant/reserve-table", {
-            restaurantId: restaurantIdEnv,
+            restaurantId: data.restaurantId || restaurantIdEnv,
             people: data.people,
             date: data.date,
             time: data.time,
@@ -176,11 +176,11 @@ const actions = {
             return commonErrorCallback()(error);
         })
     },
-    getBlogsByTag({ commit }, tagId) {
+    getBlogsByTag({ commit }, tagId, restaurantId = null) {
         commit('startFetchingBlogs');
         return axios.get('/api/blogs/by-tag', {
             params: {
-                restaurantId: restaurantIdEnv,
+                restaurantId: restaurantId || restaurantIdEnv,
                 tagId
             }
         }).then(res => {
@@ -211,8 +211,8 @@ const actions = {
             return commonErrorCallback()(error);
         })
     },
-    getBlogBySlug({ commit }, blogSlug) {
-        return axios.get('api/blogs/show/slug', { params: {blogSlug, restaurantId: restaurantIdEnv}}).then(res => {
+    getBlogBySlug({ commit }, blogSlug, restaurantId = null) {
+        return axios.get('api/blogs/show/slug', { params: {blogSlug, restaurantId: restaurantId || restaurantIdEnv}}).then(res => {
             commit('setBlog', res.data.data);
             return { type: 'success', msg: 'ok' }
         }).catch(error => {