orderiom-api-package 0.2.57 → 0.2.58

package/package.json

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

@@ -38,23 +38,23 @@ export function calculateBasketIdParameter(isLogin) {
 	return foundBasket.basketId;
 }
 
-export function updateBasket({commit}, basketId, res){
+export function updateBasket({commit, basketId, res, isOutsideProduct}){
 	const basketInfo = res.data.data;
-	commit('product/setBasketInfo', basketInfo);
+	commit(`${isOutsideProduct ? 'product/' : ''}setBasketInfo`, basketInfo);
 
 	// TODO: why two separate states use same value?
-	commit('product/SetSubtotalPrice', basketInfo.totalPrice);
-	commit('product/SetTotalPrice', basketInfo.totalPrice);
+	commit(`${isOutsideProduct ? 'product/' : ''}SetSubtotalPrice`, basketInfo.totalPrice);
+	commit(`${isOutsideProduct ? '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);
+	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'));
@@ -67,6 +67,6 @@ export function updateBasket({commit}, basketId, res){
 		localStorage.setItem('basket', JSON.stringify(baskets));
 	}
 
-	commit('product/basketLoadedOnce');
+	commit(`${isOutsideProduct ? 'product/' : ''}basketLoadedOnce`);
 	return true;
 }

package/src/modules/order.js

@@ -694,7 +694,7 @@ const actions = {
             commonErrorCallback()
         );
     },
-    editCartProductExtraInfo({rootState, commit}, {basketProductId, extraInfo}){
+    editCartProductExtraInfo({rootState, commit}, data){
         let basketId = undefined;
         try{
             basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
@@ -705,10 +705,9 @@ const actions = {
 
         axios.post('api/basket/update-extraInfo', {
             basketId,
-            basketProductId,
-            extraInfo
+            ...data
         }).then(res =>
-            updateBasket({commit}, basketId, res)
+            updateBasket({commit, basketId, res, isOutsideProduct: true})
         ).catch(
             commonErrorCallback()
         );

package/src/modules/product.js

@@ -273,7 +273,7 @@ const actions = {
                 restaurantId
             }
         }).then(res =>
-            updateBasket({commit}, basketId, res)
+            updateBasket({commit, basketId, res, isOutsideProduct: false})
         ).catch(error => {
             console.error(error);
             return false;