orderiom-api-package 0.3.0 → 0.3.2

package/package.json

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

package/src/modules/product.js

@@ -364,49 +364,48 @@ const actions = {
             basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
         } catch(e) {
             console.error(e);
-            return { type: 'error', msg: 'Basket not found' }
+            return { type: 'error', msg: 'Basket not found', data: [] }
         }
 
-        const result = [];
+        const list = (categories || state.categories);
 
         // TODO: It is recommended to use a new api instead of multiple api calls inside a loop.
-        (categories || state.categories).forEach(category => {
+        return Promise.all(list.map(category =>
             axios.get("api/restaurant/products", {
                 params: {
-                    categoryId: data.category.id,
+                    categoryId: category.id,
                     restaurantId,
                     basketId
                 }
-            }).then(res => {
-                const products = res.data.data;
-                products.forEach(m => {
-                    const productFoundInShoppingCart = state.ShoppingCart.find(p => p.RestaurantProductId === m.id);
-                    if (!productFoundInShoppingCart) {
-                        m.quantity = 0;
-                        return;
-                    }
-
-                    if (!m.is_package) {
-                        m.quantity = productFoundInShoppingCart.quantity;
-                        return;
-                    }
-
-                    let qty = 0;
-                    state.ShoppingCart.forEach(b => {
-                        if (b.RestaurantProductId !== m.id) return;
-                        qty += b.quantity;
-                    });
-                    m.quantity = qty;
-                })
-
-                result.push({...category, products});
-
-            }).catch(
-                commonErrorCallback()
-            );
-        });
-
-        return result
+            })
+        )).then(resArray => ({
+            type: 'success',
+            msg: '',
+            data: resArray.map((res, resIndex) => ({
+                ...list[resIndex],
+                products: res.data.data
+            }))
+        })).catch(error => {
+            const status = error.response ? error.response.status : null;
+            if (status === 422) {
+                return {
+                    type: 'error',
+                    msg: Object.values(error.response.data.error.validation).map(m => m[0]).toString(),
+                    data: []
+                }
+            } else if ([401, 403, 404, 400].includes(status)) {
+                return {
+                    type: 'error',
+                    msg: error.response.data.message.body,
+                    data: []
+                }
+            }
+            return {
+                type: 'error',
+                msg: 'Something went wrong',
+                data: []
+            }
+        })
     },
 };
 

package/src/modules/restaurant.js

@@ -212,7 +212,7 @@ const actions = {
         })
     },
     getBlogBySlug({ commit }, blogSlug) {
-        return axios.get('api/blogs/show/slug', { params: {blogSlug}}).then(res => {
+        return axios.get('api/blogs/show/slug', { params: {blogSlug, restaurantId}}).then(res => {
             commit('setBlog', res.data.data);
             return { type: 'success', msg: 'ok' }
         }).catch(error => {