orderiom-api-package 0.4.52 → 0.4.54

package/package.json

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

package/src/modules/product.js

@@ -28,9 +28,13 @@ const state = () => ({
     changingDeliveryType: false,
     basketLoadedOnce: false,
     pinnedProducts: null,
-    showPinnedProducts: false
+    showPinnedProducts: false,
+	fetchingProducts: false,
 });
 const getters = {
+	fetchingProducts(state){
+		return !!state.orderiomApiPackage.product.fetchingProducts;
+	},
 	subCategories(state){
 		if(!state.products) return []
         if(state.showPinnedProducts) {
@@ -74,17 +78,18 @@ const getters = {
             getters.deliveryTimes.map(item => item.weekday)
         )).map(item => weekdays.indexOf(item) + 1)
 
-		const start = rootState.orderiomApiPackage.restaurant.restaurantInfo.restaurant_close_times;
-		const end = rootState.orderiomApiPackage.restaurant.restaurantInfo.restaurant_end_close_times;
-        return [
-			{
-				weekdays: [1, 2, 3, 4, 5, 6, 7].filter(item => !allowedWeekDays.includes(item)),
-			},
-			{
-				start: start && start.length ? start[0] : null,
-				end: end && end.length ? end[0] : null
-			}
-		];
+		const result = [{
+			weekdays: [1, 2, 3, 4, 5, 6, 7].filter(item => !allowedWeekDays.includes(item)),
+		}];
+
+		let start = rootState.orderiomApiPackage.restaurant.restaurantInfo.restaurant_close_times;
+		let end = rootState.orderiomApiPackage.restaurant.restaurantInfo.restaurant_end_close_times;
+		start = start && start.length ? start[0] : null;
+		end = end && end.length ? end[0] : null;
+		if(start && end){
+			result.push({start, end})
+		}
+		return result;
     },
     availableTimes(state, getters){
         const result = {};
@@ -153,6 +158,9 @@ const getters = {
     }
 }
 const mutations = {
+	setFetchingProducts(state, isFetching){
+		state.fetchingProducts = isFetching;
+	},
     setSelectedDate(state, date) {
         state.selectedDate = date
     },
@@ -343,6 +351,7 @@ const actions = {
 			].join(' ')
 		}
 
+		commit('setFetchingProducts', true);
         return $http.get("api/restaurant/products", {
             params: {
                 categoryId: data.category.id,
@@ -362,7 +371,9 @@ const actions = {
             return { ...res, data: res.data.data }
         }).catch(
             commonErrorCallback()
-        );
+        ).finish(() => {
+			commit('setFetchingProducts', false);
+		});
     },
     getPinnedProducts({ commit, state, rootState }, data) {
         let basketId = undefined;