orderiom-api-package 0.3.33 → 0.3.35

package/package.json

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

package/src/common.js

@@ -1,6 +1,10 @@
 import axios from "axios";
 
-export const restaurantIdEnv = process.env.VUE_APP_RESTAURANT_ID ? parseInt(process.env.VUE_APP_RESTAURANT_ID) : null;
+export const restaurantIdEnv = process.env.VUE_APP_RESTAURANT_ID
+	? parseInt(process.env.VUE_APP_RESTAURANT_ID)
+	: window.dynamicData.VUE_APP_RESTAURANT_ID
+		? parseInt(window.dynamicData.VUE_APP_RESTAURANT_ID)
+		: null;
 
 export function commonErrorCallback(unknownErrorMessage = 'Something went wrong'){
 	return error => {
@@ -74,7 +78,7 @@ export function updateBasket({commit, basketId, res, restaurantId}){
 	return true;
 }
 
-axios.defaults.baseURL = process.env.VUE_APP_BASE_API_URL;
+axios.defaults.baseURL = window.dynamicData.VUE_APP_BASE_API_URL || process.env.VUE_APP_BASE_API_URL;
 axios.interceptors.request.use(config => {
 	const token = localStorage.getItem("privateToken") || localStorage.getItem("publicToken");
 	if (token) config.headers["Authorization"] = `Bearer ${token}`;

package/src/modules/auth.js

@@ -55,9 +55,9 @@ const actions = {
     auth({ commit }) {
         return $http
             .post("api/oauth/token", {
-                grant_type: process.env.VUE_APP_GRANT_TYPE,
-                client_id: process.env.VUE_APP_CLIENT_ID,
-                client_secret: process.env.VUE_APP_CLIENT_SECRET
+                grant_type: window.dynamicData.VUE_APP_GRANT_TYPE || process.env.VUE_APP_GRANT_TYPE,
+                client_id: window.dynamicData.VUE_APP_CLIENT_ID || process.env.VUE_APP_CLIENT_ID,
+                client_secret: window.dynamicData.VUE_APP_CLIENT_SECRET || process.env.VUE_APP_CLIENT_SECRET
             })
             .then(res => {
                 commit('setPublicToken', res.data.data.access_token)

package/src/modules/product.js

@@ -237,20 +237,13 @@ const actions = {
     getProducts({ commit, state, rootState }, data) {
         commit("setSelectedCategory", data.category);
 
-        let basketId = undefined;
-        try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data.restaurantId);
-        } catch(e) {
-            console.error(e);
-            return { type: 'error', msg: 'Basket not found' }
-        }
-
-        return $http.get("api/restaurant/products", {params: {
-            categoryId: data.category.id,
-            restaurantId: data.restaurantId,
-            delivery_time: data.delivery_time || undefined,
-            basketId
-        }}).then(res => {
+        return $http.get("api/restaurant/products", {
+            params: {
+                categoryId: data.category.id,
+                restaurantId: data.restaurantId,
+                delivery_time: state.deliveryTime || undefined,
+            }
+        }).then(res => {
             res.data.data.forEach(productInCategory => {
                 productInCategory.quantity = state.ShoppingCart
                     .filter(itemInCart => Number(itemInCart.RestaurantProductId) === Number(productInCategory.id))
@@ -366,14 +359,6 @@ const actions = {
         });
     },
     getProductsFromAllCategories({ commit, state, rootState }, {categories = null, restaurantId = null}) {
-        let basketId = undefined;
-        try{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, restaurantId);
-        } catch(e) {
-            console.error(e);
-            return { type: 'error', msg: 'Basket not found', data: [] }
-        }
-
         const list = (categories || state.categories);
 
         // TODO: It is recommended to use a new api instead of multiple api calls inside a loop.
@@ -382,7 +367,6 @@ const actions = {
                 params: {
                     categoryId: category.id,
                     restaurantId: restaurantId || restaurantIdEnv,
-                    basketId
                 }
             })
         )).then(resArray => ({