orderiom-api-package 0.2.55 → 0.2.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.2.55",
+  "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

@@ -257,17 +257,20 @@ const actions = {
             commonErrorCallback()
         );
     },
-    getBasket({ commit, rootState }, customRestaurantId = undefined) {
-        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: customRestaurantId || restaurantId
+                basketId,
+                restaurantId
             }
         }).then(res => {
             const basketInfo = res.data.data;
@@ -287,18 +290,17 @@ const actions = {
             commit('setTip', basketInfo.tip);
             commit('setshippingPrice', basketInfo.shipping_price);
 
-            //TODO: This condition is always true.
-            if (basketInfo.id != basketId) {
-                const index = basket.indexOf(basket.find((basket) => basket.restaurantId == restaurantId));
-                if (index > -1) {
-                    basket.splice(index, 1);
-                }
-                basket.push({
-                    restaurantId: restaurantId,
+            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(basket));
+                localStorage.setItem('basket', JSON.stringify(baskets));
             }
+
             commit('basketLoadedOnce');
             return true;
         }).catch(error => {