orderiom-api-package 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "This package will install all necessary API calls for every orderiom restaurant",
   "main": "index.js",
   "types": "index.d.ts",

package/src/modules/order.js

@@ -683,7 +683,10 @@ const actions = {
   updatePaymentStatus({ dispatch, commit }, data) {
     return $http
       .get(`api/payment/update`, {
-        params: { paymentId: data.paymentId, status: data.status , orderId:data.orderId },
+        params: {
+          paymentId: data.paymentId, status: data.status , orderId:data.orderId,
+          sessionId: data.sessionId || null, sessionResult: data.sessionResult || null // adyen payment
+        },
       })
       .then((res) => {
         const status = res.data.data.status;

package/src/modules/product.js

@@ -143,15 +143,23 @@ const mutations = {
 	}
 };
 const actions = {
-    getCategories({ commit, dispatch }, restaurantId) {
+    getCategories({ commit, dispatch, rootState }, restaurantId) {
+        let basketId = undefined;
+        try {
+            basketId = calculateBasketIdParameter(
+                !!rootState.orderiomApiPackage.auth.privateToken, restaurantId
+            );
+        } catch(e) {
+            console.error("getCategories: " + e);
+        }
         return $http
-            .get("api/restaurant/category", { params: { restaurantId: restaurantId } })
+            .get("api/restaurant/category", { params: { restaurantId: restaurantId, basketId: basketId } })
             .then((res) => {
                 let categories = res.data.data;
                 //TODO: why calling an api write after another while we can do it together?
                 //TODO: this api call returns empty on restaurant refresh
                 $http
-                    .get("api/restaurant/category", { params: { restaurantId: restaurantId, extra: 1 } })
+                    .get("api/restaurant/category", { params: { restaurantId: restaurantId, extra: 1, basketId: basketId } })
                     .then((res) => {
                         if (res.data.data.length) {
                             categories = [...categories, ...res.data.data];
@@ -189,12 +197,21 @@ const actions = {
     },
     getProducts({ commit, state, rootState }, data) {
         commit("setSelectedCategory", data.category);
-
+        let basketId = undefined;
+        try {
+            basketId = calculateBasketIdParameter(
+                !!rootState.orderiomApiPackage.auth.privateToken,
+                data ? data.restaurantId : undefined
+            );
+        } catch(e) {
+            console.error("getProducts: " + e);
+        }
         return $http.get("api/restaurant/products", {
             params: {
                 categoryId: data.category.id,
                 restaurantId: data.restaurantId,
                 delivery_time: state.deliveryTime || undefined,
+                basketId: basketId
             }
         }).then(res => {
             res.data.data.forEach(productInCategory => {
@@ -234,10 +251,19 @@ const actions = {
             commit('finishFetchingBasket')
         });
     },
-    getAttributeItems({ commit }, data) {
+    getAttributeItems({ commit, state, rootState }, data) {
+        let basketId = undefined;
+        try {
+            basketId = calculateBasketIdParameter(
+                !!rootState.orderiomApiPackage.auth.privateToken,
+                data ? data.restaurantId : undefined
+            );
+        } catch(e) {
+            console.error("getAttributeItems: " + e);
+        }
         return $http.get('api/restaurant/category-attributes-items', {
             params: {
-                restaurantId: data.restaurantId, categoryId: data.category.id,
+                restaurantId: data.restaurantId, categoryId: data.category.id, basketId: basketId
             }
         }).then((result) => {
             commit('setAttributeItems', result.data.data)
@@ -245,11 +271,21 @@ const actions = {
             commonErrorCallback()
         );
     },
-    getPackage({ commit }, data) {
+    getPackage({ commit, state, rootState }, data) {
+        let basketId = undefined;
+        try {
+            basketId = calculateBasketIdParameter(
+                !!rootState.orderiomApiPackage.auth.privateToken,
+                data ? data.restaurantId : undefined
+            );
+        } catch(e) {
+            console.error("getPackage: " + e);
+        }
         return $http.get('api/restaurant/product-packages', {
             params: {
                 productId: data.productId,
-                restaurantId: data.restaurantId
+                restaurantId: data.restaurantId,
+                basketId: basketId
             }
         }).then((result) => {
             commit('setProductPackage', result.data.data)
@@ -313,13 +349,21 @@ const actions = {
     },
     getProductsFromAllCategories({ commit, state, rootState }, {categories = null, restaurantId = null}) {
         const list = (categories || state.categories);
-
+        let basketId = undefined;
+        try {
+            basketId = calculateBasketIdParameter(
+                !!rootState.orderiomApiPackage.auth.privateToken, restaurantId
+            );
+        } catch(e) {
+            console.error("getProductsFromAllCategories: " + e);
+        }
         // TODO: It is recommended to use a new api instead of multiple api calls inside a loop.
         return Promise.all(list.map(category =>
             $http.get("api/restaurant/products", {
                 params: {
                     categoryId: category.id,
                     restaurantId: restaurantId || restaurantIdEnv,
+                    basketId: basketId
                 }
             })
         )).then(resArray => ({