orderiom-api-package 0.2.49 → 0.2.50

package/package.json

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

package/src/modules/order.js

@@ -350,50 +350,69 @@ const actions = {
             });
     },
     deleteFromBasket({ dispatch, rootState }, data) {
-        let item = rootState.orderiomApiPackage.product.ShoppingCart.find(
-            (f) => f.RestaurantProductId == data.productId
+        const basketProduct = rootState.orderiomApiPackage.product.ShoppingCart.find(f =>
+            f.RestaurantProductId === Number(data.productId)
         );
+
+        if(!basketProduct){
+            return {
+                type: 'error',
+                msg: 'Product not found'
+            }
+        }
+
         const basket = JSON.parse(localStorage.getItem("basket"));
         const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
             basketId: basket.find((basket) => basket.restaurantId == data.restaurantId).basketId
         } : {}
-        axios
-            .get("api/basket/delete-basket-product", {
-                params: {
-                    ...basketId,
-                    basketProductId: item.basketProductId,
-                    restaurantId: data.restaurantId,
-                },
-            })
-            .then(() => {
-                dispatch("product/getBasket", data.restaurantId, { root: true }).then(() => {
-                    dispatch(
-                        "product/getProducts",
-                        { category: rootState.orderiomApiPackage.product.selectedCategory, restaurantId: data.restaurantId }, { root: true }
-                    );
-                })
-            })
-            .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
-
-                        }
-                    }
 
+        basketProduct.deleting = true;
+        return axios.get("api/basket/delete-basket-product", {
+            params: {
+                ...basketId,
+                basketProductId: basketProduct.basketProductId,
+                restaurantId: data.restaurantId,
+            },
+        }).then(async () => {
+            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'){
+                return {
+                    type: 'error',
+                    msg: 'There was an error in fetching basket and products'
                 }
-
-            });
+            }
+            return {
+                type: 'success',
+                msg: ''
+            }
+        }).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 => { return m[0] }).toString()
+                }
+            } else if ([401, 403, 404, 400].includes(status)) {
+                return {
+                    type: 'error',
+                    msg: error.response.data.message.body
+                }
+            }
+            return {
+                type: 'error',
+                msg: 'Something went wrong'
+            }
+        }).finally(() => {
+            basketProduct.deleting = false;
+        });
     },
     deleteFromBasketWithAttr({ dispatch, rootState }, data) {
         const basket = JSON.parse(localStorage.getItem("basket"));

package/src/modules/product.js

@@ -69,7 +69,11 @@ const mutations = {
         state.selectedProduct = product
     },
     SetShoppingCart(state, products) {
-        state.ShoppingCart = products;
+        state.ShoppingCart = products.map(item => ({
+            ...item,
+            deleting: false,
+            changingQuantity: false,
+        }));
     },
     SetSubtotalPrice(state, SubtotalPrice) {
         state.SubtotalPrice = SubtotalPrice;
@@ -299,21 +303,22 @@ const actions = {
             commit("setProduct", products);
             return { type: 'success', data: products }
         }).catch(error => {
-            if(!error.response) return;
-
-            const status = error.response.status;
+            const status = error.response ? error.response.status : null;
             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)) {
+            } else if ([401, 403, 404, 400].includes(status)) {
                 return {
                     type: 'error',
                     msg: error.response.data.message.body
                 }
             }
+            return {
+                type: 'error',
+                msg: 'Something went wrong'
+            }
         });
     },
     getBasket({ commit, rootState }, restaurantId) {