orderiom-api-package 0.2.57 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.2.57",
+  "version": "0.3.0",
   "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/messages/de-api.json

@@ -158,5 +158,9 @@
     "pattern_successfully_updated": "Muster erfolgreich aktualisiert.",
     "start_or_end_date_break_is_required": "Start oder Enddatum unterbrechung ist erforderlich.",
     "pattern_is_required": "Sie müssen Ihrem Muster Produkte hinzufügen.",
-    "newsletter_successfully_added": "Ihre E-Mail wurde erfolgreich hinzugefügt."
+    "newsletter_successfully_added": "Ihre E-Mail wurde erfolgreich hinzugefügt.",
+    "There was an error in fetching the blogs": "Beim Abrufen der Blogs ist ein Fehler aufgetreten",
+    "There was an error in fetching the blog": "Beim Abrufen des Blogs ist ein Fehler aufgetreten",
+    "Something went wrong": "Etwas ist schief gelaufen",
+    "Basket not found": "Korb nicht gefunden"
 }

package/src/messages/en-api.json

@@ -158,5 +158,9 @@
     "pattern_successfully_updated": "pattern successfully updated.",
     "start_or_end_date_break_is_required": "start or end date break is required.",
     "pattern_is_required": "you have to add products to your pattern.",
-    "newsletter_successfully_added": "Your email has been added successfuly."
+    "newsletter_successfully_added": "Your email has been added successfuly.",
+    "There was an error in fetching the blogs": "There was an error in fetching the blogs",
+    "There was an error in fetching the blog": "There was an error in fetching the blog",
+    "Something went wrong": "Something went wrong",
+    "Basket not found": "Basket not found"
 }

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);
@@ -703,15 +703,15 @@ const actions = {
             return {type: 'error', msg: 'Basket not found'};
         }
 
-        axios.post('api/basket/update-extraInfo', {
+        return axios.post('api/basket/update-extraInfo', {
             basketId,
-            basketProductId,
-            extraInfo
+            ...data
         }).then(res =>
-            updateBasket({commit}, basketId, res)
-        ).catch(
-            commonErrorCallback()
-        );
+            updateBasket({commit, basketId, res, isOutsideProduct: true})
+        ).catch(err => {
+            console.error(err);
+            return false;
+        });
     }
 }
 export default {

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;
@@ -357,7 +357,57 @@ const actions = {
         }).finally(() => {
             commit('finishChangingDeliveryType');
         });
-    }
+    },
+    getProductsFromAllCategories({ commit, state, rootState }, categories = null) {
+        let basketId = undefined;
+        try{
+            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken);
+        } catch(e) {
+            console.error(e);
+            return { type: 'error', msg: 'Basket not found' }
+        }
+
+        const result = [];
+
+        // TODO: It is recommended to use a new api instead of multiple api calls inside a loop.
+        (categories || state.categories).forEach(category => {
+            axios.get("api/restaurant/products", {
+                params: {
+                    categoryId: data.category.id,
+                    restaurantId,
+                    basketId
+                }
+            }).then(res => {
+                const products = res.data.data;
+                products.forEach(m => {
+                    const productFoundInShoppingCart = state.ShoppingCart.find(p => p.RestaurantProductId === m.id);
+                    if (!productFoundInShoppingCart) {
+                        m.quantity = 0;
+                        return;
+                    }
+
+                    if (!m.is_package) {
+                        m.quantity = productFoundInShoppingCart.quantity;
+                        return;
+                    }
+
+                    let qty = 0;
+                    state.ShoppingCart.forEach(b => {
+                        if (b.RestaurantProductId !== m.id) return;
+                        qty += b.quantity;
+                    });
+                    m.quantity = qty;
+                })
+
+                result.push({...category, products});
+
+            }).catch(
+                commonErrorCallback()
+            );
+        });
+
+        return result
+    },
 };
 
 export default {