orderiom-api-package 0.2.54 → 0.2.56

package/package.json

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

package/src/modules/product.js

@@ -53,6 +53,7 @@ const mutations = {
     SetShoppingCart(state, products) {
         state.ShoppingCart = products.map(item => ({
             ...item,
+            extra_info: item.extra_info ? JSON.parse(item.extra_info) : item.extra_info,
             deleting: false,
             changingQuantity: false,
         }));
@@ -256,60 +257,58 @@ const actions = {
             commonErrorCallback()
         );
     },
-    getBasket({ commit, rootState }, restaurantId) {
-        const basket = JSON.parse(localStorage.getItem("basket"));
-        const basketId = !rootState.orderiomApiPackage.auth.privateToken ? {
-            basketId: basket.find((basket) => basket.restaurantId == restaurantId).basketId
-        } : {}
+    getBasket({ commit, rootState }) {
+        let basketId = undefined;
+        try{
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+        } catch(e) {
+            console.error(e);
+            return false;
+        }
 
         commit('startFetchingBasket');
-        return axios
-            .get('api/basket', { params: { ...basketId, restaurantId } }).then(res => {
-                const basketInfo = res.data.data;
-                const id = res.data.data.id;
-                const ShoppingCart = res.data.data.products;
-                const SubtotalPrice = res.data.data.totalPrice;
-                const deliveryTime = res.data.data.deliveryTime;
-                const totalPrice = res.data.data.totalPrice;
-                const voucherValue = res.data.data.voucherValue;
-                const voucher_code = res.data.data.voucher_code;
-                const totalWithDiscount = res.data.data.totalWithDiscount;
-                const delivertYype = res.data.data.deliveryType;
-                const postalCode = res.data.data.postalCode;
-                const tip = res.data.data.tip;
-                const shipping_price = res.data.data.shipping_price;
-                commit('setBasketInfo', basketInfo)
-                commit("SetSubtotalPrice", SubtotalPrice);
-                commit("SetTotalPrice", totalPrice);
-                commit("SetShoppingCart", ShoppingCart);
-                commit("setDeliveryTime", deliveryTime);
-                commit('setVoucherCode', voucher_code);
-                commit('setVoucherValue', voucherValue);
-                commit('setTotalWithDiscount', totalWithDiscount);
-                commit('setDelivertType', delivertYype);
-                commit('setPostalCode', postalCode);
-                commit('setTip', tip);
-                commit('setshippingPrice', shipping_price);
-                if (id != basketId) {
-                    const index = basket.indexOf(basket.find((basket) => basket.restaurantId == restaurantId));
-                    if (index > -1) {
-                        basket.splice(index, 1);
-                    }
-                    basket.push({
-                        restaurantId: restaurantId,
-                        basketId: id,
-                    });
-                    localStorage.setItem("basket", JSON.stringify(basket));
+        return axios.get('api/basket', {
+            params: {
+                basketId,
+                restaurantId
+            }
+        }).then(res => {
+            const basketInfo = res.data.data;
+            commit('setBasketInfo', basketInfo);
 
-                }
-                commit('basketLoadedOnce');
-                return true;
-            }).catch(error => {
-                console.error(error);
-                return false;
-            }).finally(() => {
-                commit('finishFetchingBasket')
-            });
+            // TODO: why two separate states use same value?
+            commit('SetSubtotalPrice', basketInfo.totalPrice);
+            commit('SetTotalPrice', basketInfo.totalPrice);
+
+            commit('SetShoppingCart', basketInfo.products);
+            commit('setDeliveryTime', basketInfo.deliveryTime);
+            commit('setVoucherCode', basketInfo.voucher_code);
+            commit('setVoucherValue', basketInfo.voucherValue);
+            commit('setTotalWithDiscount', basketInfo.totalWithDiscount);
+            commit('setDelivertType', basketInfo.deliveryType);
+            commit('setPostalCode', basketInfo.postalCode);
+            commit('setTip', basketInfo.tip);
+            commit('setshippingPrice', basketInfo.shipping_price);
+
+            if (parseInt(basketInfo.id) !== parseInt(basketId)) {
+                const baskets = JSON.parse(localStorage.getItem('basket'));
+                const basketIndex  = baskets.findIndex(basket => parseInt(basket.restaurantId) === restaurantId);
+                if (basketIndex > -1) baskets.splice(basketIndex, 1);
+                baskets.push({
+                    restaurantId,
+                    basketId: basketInfo.id,
+                });
+                localStorage.setItem('basket', JSON.stringify(baskets));
+            }
+
+            commit('basketLoadedOnce');
+            return true;
+        }).catch(error => {
+            console.error(error);
+            return false;
+        }).finally(() => {
+            commit('finishFetchingBasket')
+        });
     },
     getAttributeItems({ commit }, data) {
         return axios.get('api/restaurant/category-attributes-items', {