orderiom-api-package 0.3.7 → 0.3.9

package/package.json

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

package/src/common.js

@@ -40,21 +40,22 @@ export function calculateBasketIdParameter(isLogin, restaurantId) {
 
 export function updateBasket({commit, basketId, res, isOutsideProduct, restaurantId}){
 	const basketInfo = res.data.data;
-	commit(`${isOutsideProduct ? 'product/' : ''}setBasketInfo`, basketInfo);
+	const scope = isOutsideProduct ? 'product/' : '';
+	commit(`${scope}setBasketInfo`, basketInfo);
 
 	// TODO: why two separate states use same value?
-	commit(`${isOutsideProduct ? 'product/' : ''}SetSubtotalPrice`, basketInfo.totalPrice);
-	commit(`${isOutsideProduct ? 'product/' : ''}SetTotalPrice`, basketInfo.totalPrice);
+	commit(`${scope}SetSubtotalPrice`, basketInfo.totalPrice);
+	commit(`${scope}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);
+	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);
 
 	if (parseInt(basketInfo.id) !== parseInt(basketId)) {
 		const baskets = JSON.parse(localStorage.getItem('basket'));

package/src/modules/order.js

@@ -716,6 +716,7 @@ const actions = {
 
         return axios.post('api/basket/update-extraInfo', {
             basketId,
+            restaurantId: data.restaurantId || restaurantIdEnv,
             ...data
         }).then(res =>
             updateBasket({commit, basketId, res, isOutsideProduct: true, restaurantId: data.restaurantId})

package/src/modules/product.js

@@ -258,6 +258,8 @@ const actions = {
         );
     },
     getBasket({ commit, rootState }, data) {
+        if(typeof data === 'string' || typeof data === 'number') data = {restaurantId: data};
+
         let basketId = undefined;
         try{
             basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data ? data.restaurantId : undefined);