orderiom-api-package 0.3.32 → 0.3.34

package/package.json

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

package/src/modules/product.js

@@ -38,7 +38,10 @@ const getters = {
 
 		ids.forEach(id=>{
 			let filter = state.products.find(i=> i.subcategory_id === id)
-			subCategories.push({name: filter.subcategory_name, id: filter.subcategory_id, imagePath: filter.subcategory_image})
+			subCategories.push({name: filter.subcategory_name, id: filter.subcategory_id, imagePath: filter.subcategory_image, priority: filter.subcategory_priority})
+            subCategories.sort(function(a,b) {
+                return a.priority - b.priority;
+            });
 		})
 
 		return subCategories
@@ -234,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))
@@ -363,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.
@@ -379,7 +367,6 @@ const actions = {
                 params: {
                     categoryId: category.id,
                     restaurantId: restaurantId || restaurantIdEnv,
-                    basketId
                 }
             })
         )).then(resArray => ({