orderiom-api-package 0.2.56 → 0.2.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.2.56",
+  "version": "0.2.58",
   "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, isOutsideProduct}){
+	const basketInfo = res.data.data;
+	commit(`${isOutsideProduct ? 'product/' : ''}setBasketInfo`, basketInfo);
+
+	// TODO: why two separate states use same value?
+	commit(`${isOutsideProduct ? 'product/' : ''}SetSubtotalPrice`, basketInfo.totalPrice);
+	commit(`${isOutsideProduct ? 'product/' : ''}SetTotalPrice`, basketInfo.totalPrice);
+
+	commit(`${isOutsideProduct ? 'product/' : ''}SetShoppingCart`, basketInfo.products);
+	commit(`${isOutsideProduct ? 'product/' : ''}setDeliveryTime`, basketInfo.deliveryTime);
+	commit(`${isOutsideProduct ? 'product/' : ''}setVoucherCode`, basketInfo.voucher_code);
+	commit(`${isOutsideProduct ? 'product/' : ''}setVoucherValue`, basketInfo.voucherValue);
+	commit(`${isOutsideProduct ? 'product/' : ''}setTotalWithDiscount`, basketInfo.totalWithDiscount);
+	commit(`${isOutsideProduct ? 'product/' : ''}setDelivertType`, basketInfo.deliveryType);
+	commit(`${isOutsideProduct ? 'product/' : ''}setPostalCode`, basketInfo.postalCode);
+	commit(`${isOutsideProduct ? 'product/' : ''}setTip`, basketInfo.tip);
+	commit(`${isOutsideProduct ? '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(`${isOutsideProduct ? '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,24 @@ const actions = {
         }).catch(
             commonErrorCallback()
         );
+    },
+    editCartProductExtraInfo({rootState, commit}, data){
+        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,
+            ...data
+        }).then(res =>
+            updateBasket({commit, basketId, res, isOutsideProduct: true})
+        ).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,
@@ -272,38 +272,9 @@ const actions = {
                 basketId,
                 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);
-
-            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 => {
+        }).then(res =>
+            updateBasket({commit, basketId, res, isOutsideProduct: false})
+        ).catch(error => {
             console.error(error);
             return false;
         }).finally(() => {