orderiom-api-package 0.3.9 → 0.3.11

package/package.json

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

package/src/common.js

@@ -38,24 +38,23 @@ export function calculateBasketIdParameter(isLogin, restaurantId) {
 	return foundBasket.basketId;
 }
 
-export function updateBasket({commit, basketId, res, isOutsideProduct, restaurantId}){
+export function updateBasket({commit, basketId, res, restaurantId}){
 	const basketInfo = res.data.data;
-	const scope = isOutsideProduct ? 'product/' : '';
-	commit(`${scope}setBasketInfo`, basketInfo);
+	commit(`product/setBasketInfo`, basketInfo, { root: true });
 
 	// TODO: why two separate states use same value?
-	commit(`${scope}SetSubtotalPrice`, basketInfo.totalPrice);
-	commit(`${scope}SetTotalPrice`, basketInfo.totalPrice);
+	commit(`product/SetSubtotalPrice`, basketInfo.totalPrice, { root: true });
+	commit(`product/SetTotalPrice`, basketInfo.totalPrice, { root: true });
 
-	commit(`${scope}SetShoppingCart`, basketInfo.products);
-	commit(`${scope}setDeliveryTime`, basketInfo.deliveryTime);
-	commit(`${scope}setVoucherCode`, basketInfo.voucher_code);
-	commit(`${scope}setVoucherValue`, basketInfo.voucherValue);
-	commit(`${scope}setTotalWithDiscount`, basketInfo.totalWithDiscount);
-	commit(`${scope}setDelivertType`, basketInfo.deliveryType);
-	commit(`${scope}setPostalCode`, basketInfo.postalCode);
-	commit(`${scope}setTip`, basketInfo.tip);
-	commit(`${scope}setshippingPrice`, basketInfo.shipping_price);
+	commit(`product/SetShoppingCart`, basketInfo.products, { root: true });
+	commit(`product/setDeliveryTime`, basketInfo.deliveryTime, { root: true });
+	commit(`product/setVoucherCode`, basketInfo.voucher_code, { root: true });
+	commit(`product/setVoucherValue`, basketInfo.voucherValue, { root: true });
+	commit(`product/setTotalWithDiscount`, basketInfo.totalWithDiscount, { root: true });
+	commit(`product/setDelivertType`, basketInfo.deliveryType, { root: true });
+	commit(`product/setPostalCode`, basketInfo.postalCode, { root: true });
+	commit(`product/setTip`, basketInfo.tip, { root: true });
+	commit(`product/setshippingPrice`, basketInfo.shipping_price, { root: true });
 
 	if (parseInt(basketInfo.id) !== parseInt(basketId)) {
 		const baskets = JSON.parse(localStorage.getItem('basket'));
@@ -68,6 +67,6 @@ export function updateBasket({commit, basketId, res, isOutsideProduct, restauran
 		localStorage.setItem('basket', JSON.stringify(baskets));
 	}
 
-	commit(`${isOutsideProduct ? 'product/' : ''}basketLoadedOnce`);
+	commit(`product/basketLoadedOnce`, null, { root: true });
 	return true;
 }

package/src/modules/order.js

@@ -581,7 +581,7 @@ const actions = {
         return axios
             .post("api/basket/add-delivery-time", {
                 ...basketId,
-                delivery_time: data.date + " " + data.time,
+                delivery_time: data.date && data.time ? data.date + " " + data.time : null,
                 restaurantId: data.restaurantId,
                 deliveryType: data.deliveryType
 
@@ -719,7 +719,7 @@ const actions = {
             restaurantId: data.restaurantId || restaurantIdEnv,
             ...data
         }).then(res =>
-            updateBasket({commit, basketId, res, isOutsideProduct: true, restaurantId: data.restaurantId})
+            updateBasket({commit, basketId, res, restaurantId: data.restaurantId})
         ).catch(err => {
             console.error(err);
             return false;

package/src/modules/product.js

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