orderiom-api-package 0.2.36 → 0.2.38

package/package.json

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

package/src/modules/product.js

@@ -232,61 +232,61 @@ const actions = {
     },
     getProducts({ commit, state }, data) {
         commit("setSelectedCategory", data.category);
-        return axios
-            .get("api/restaurant/products", { params: { categoryId: data.category.id, restaurantId: data.restaurantId } })
-            .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)
+
+        const params = {
+            categoryId: data.category.id,
+            restaurantId: data.restaurantId,
+        };
+        if(data.deliveryType) params.deliveryType = data.deliveryType;
+
+        return axios.get("api/restaurant/products", params).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)
                     }
-                })
-                commit("setProduct", products);
-                return {
-                    type: 'success',
-                    data: products
+                    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)
                 }
             })
-            .catch((error) => {
-                if (error.response) {
-                    if (error.response.status == 422) {
-                        return {
-                            type: 'error',
-                            msg: Object.values(error.response.data.error.validation).map(m => { return m[0] }).toString()
-                        }
-                    }
-                    if (error.response.status == 401 || error.response.status == 403 || error.response.status == 404 || error.response.status == 400) {
-
-                        return {
-                            type: 'error',
-                            msg: error.response.data.message.body
-                        }
-                    }
+            commit("setProduct", products);
+            return { type: 'success', data: products }
+        }).catch(error => {
+            if(!error.response) return;
 
+            const status = error.response.status;
+            if (status === 422) {
+                return {
+                    type: 'error',
+                    msg: Object.values(error.response.data.error.validation).map(m => { return m[0] }).toString()
                 }
-            });
+            }
+            if ([401, 403, 404, 400].includes(status)) {
+                return {
+                    type: 'error',
+                    msg: error.response.data.message.body
+                }
+            }
+        });
     },
     getBasket({ commit, rootState }, restaurantId) {
         const basket = JSON.parse(localStorage.getItem("basket"));
@@ -456,7 +456,7 @@ const actions = {
             restaurantId: !basketId ? restaurantId : undefined
         }).then(async res => {
             if(res.data.message.type !== 'success'){
-                return { type: 'error', msg: 'Could not update delivery type' }
+                return { type: 'error', msg: 'There was an error in updating the delivery type' }
             }
 
             const result = await dispatch("getBasket", restaurantId);
@@ -464,7 +464,7 @@ const actions = {
             return {
                 type: result ? 'success' : 'error',
                 msg: !result ?
-                    'Could not get basket info'
+                    'There was an error in fetching the basket info'
                     :
                     rootState.orderiomApiPackage.product.ShoppingCart.length < shoppingCartItems ?
                         'Some items are removed from the cart'
@@ -473,7 +473,7 @@ const actions = {
             }
         }).catch(err => {
             console.error(err);
-            return { type: 'error', msg: 'Could not update delivery type' }
+            return { type: 'error', msg: 'There was an error in updating the delivery type' }
         }).finally(() => {
             commit('finishChangingDeliveryType');
         });

package/src/modules/restaurant.js

@@ -294,7 +294,7 @@ const actions = {
             if(!error.response){
                 return {
                     type: 'error',
-                    msg: 'Could not fetch blogs',
+                    msg: 'There was an error in fetching the blogs',
                     tagName: ''
                 }
             }