orderiom-api-package 0.2.55 → 0.2.57

package/package.json

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

package/src/common.js

@@ -36,4 +36,37 @@ export function calculateBasketIdParameter(isLogin) {
 		throw new Error('Basket not found');
 	}
 	return foundBasket.basketId;
+}
+
+export function updateBasket({commit}, basketId, res){
+	const basketInfo = res.data.data;
+	commit('product/setBasketInfo', basketInfo);
+
+	// TODO: why two separate states use same value?
+	commit('product/SetSubtotalPrice', basketInfo.totalPrice);
+	commit('product/SetTotalPrice', basketInfo.totalPrice);
+
+	commit('product/SetShoppingCart', basketInfo.products);
+	commit('product/setDeliveryTime', basketInfo.deliveryTime);
+	commit('product/setVoucherCode', basketInfo.voucher_code);
+	commit('product/setVoucherValue', basketInfo.voucherValue);
+	commit('product/setTotalWithDiscount', basketInfo.totalWithDiscount);
+	commit('product/setDelivertType', basketInfo.deliveryType);
+	commit('product/setPostalCode', basketInfo.postalCode);
+	commit('product/setTip', basketInfo.tip);
+	commit('product/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('product/basketLoadedOnce');
+	return true;
 }

package/src/modules/order.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { commonErrorCallback, calculateBasketIdParameter, restaurantId } from '../common';
+import {commonErrorCallback, calculateBasketIdParameter, restaurantId, updateBasket} from '../common';
 
 const state = () => ({
     productOrder: null,
@@ -693,6 +693,25 @@ const actions = {
         }).catch(
             commonErrorCallback()
         );
+    },
+    editCartProductExtraInfo({rootState, commit}, {basketProductId, extraInfo}){
+        let basketId = undefined;
+        try{
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+        } catch(e) {
+            console.error(e);
+            return {type: 'error', msg: 'Basket not found'};
+        }
+
+        axios.post('api/basket/update-extraInfo', {
+            basketId,
+            basketProductId,
+            extraInfo
+        }).then(res =>
+            updateBasket({commit}, basketId, res)
+        ).catch(
+            commonErrorCallback()
+        );
     }
 }
 export default {

package/src/modules/product.js

@@ -1,6 +1,6 @@
 import axios from "axios";
 import Vue from 'vue';
-import { commonErrorCallback, calculateBasketIdParameter, restaurantId } from '../common';
+import {commonErrorCallback, calculateBasketIdParameter, restaurantId, updateBasket} from '../common';
 
 const state = () => ({
     selectedTime: null,
@@ -257,51 +257,24 @@ 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
-            }
-        }).then(res => {
-            const basketInfo = res.data.data;
-            commit('setBasketInfo', basketInfo);
-
-            // 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);
-
-            //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,
-                    basketId: basketInfo.id,
-                });
-                localStorage.setItem("basket", JSON.stringify(basket));
+                basketId,
+                restaurantId
             }
-            commit('basketLoadedOnce');
-            return true;
-        }).catch(error => {
+        }).then(res =>
+            updateBasket({commit}, basketId, res)
+        ).catch(error => {
             console.error(error);
             return false;
         }).finally(() => {