orderiom-api-package 0.4.11 → 0.4.13

package/package.json

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

package/src/common.js

@@ -1,5 +1,7 @@
 import axios from "axios";
 
+export const weekdays = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
+
 export const restaurantIdEnv = process.env.VUE_APP_RESTAURANT_ID
 	? parseInt(process.env.VUE_APP_RESTAURANT_ID)
 	: window.dynamicData && window.dynamicData.VUE_APP_RESTAURANT_ID
@@ -37,7 +39,7 @@ export function calculateBasketIdParameter(isLogin, restaurantId) {
 		console.error(e);
 		throw new Error('Basket not found');
 	}
-	const foundBasket = baskets.find(basket => Number(basket.restaurantId) === (Number(restaurantId) || restaurantIdEnv));
+	const foundBasket = baskets.findLast(basket => Number(basket.restaurantId) === (Number(restaurantId) || restaurantIdEnv));
 	if(!foundBasket){
 		throw new Error('Basket not found');
 	}
@@ -78,6 +80,19 @@ export function updateBasket({commit, basketId, res, restaurantId}){
 	return true;
 }
 
+export function deliveryCodeToName(code) {
+	switch (code){
+		case 1:
+			return 'delivery';
+		case 2:
+			return 'pickup';
+		case 3:
+			return 'here';
+		default:
+			return null;
+	}
+}
+
 axios.defaults.baseURL = process.env.VUE_APP_BASE_API_URL || window.dynamicData.VUE_APP_BASE_API_URL;
 axios.interceptors.request.use(config => {
 	const token = localStorage.getItem("privateToken") || localStorage.getItem("publicToken");

package/src/modules/order.js

@@ -593,6 +593,22 @@ const actions = {
           // commit('setorder', res.data.data.order)
           // commit('setuserOrder', JSON.parse(res.data.data.order.user_details));
           // commit('setshippigPriceOrder', res.data.data.order.shipping_price);
+          const basketData = JSON.parse(localStorage.getItem("basket"));
+          if (basketData) {
+              const index = basketId
+                  ? basketData.findIndex(item => Number(item.basketId) === Number(basketId))
+                  : basketData.findIndex(item => Number(item.restaurantId) === Number(data.restaurantId || restaurantIdEnv))
+              if (index > -1) {
+                  basketData.splice(index, 1);
+                  localStorage.setItem("basket", JSON.stringify(basketData));
+              }
+          }
+
+          commit("product/SetSubtotalPrice", "0.00", {root: true});
+          commit("product/SetShoppingCart", [], {root: true});
+          commit("product/setBasketInfo", {}, {root: true});
+          commit("product/setDeliveryTime", "", {root: true});
+          commit("product/SetTotalPrice", "0.00", { root: true });
 
           if (
               (
@@ -618,23 +634,6 @@ const actions = {
               window.location = res.data.data.paymentLink;
           }
 
-          const basketData = JSON.parse(localStorage.getItem("basket"));
-          if (basketData) {
-              const index = basketId
-                  ? basketData.findIndex(item => Number(item.basketId) === Number(basketId))
-                  : basketData.findIndex(item => Number(item.restaurantId) === Number(data.restaurantId || restaurantIdEnv))
-              if (index > -1) {
-                  basketData.splice(index, 1);
-                  localStorage.setItem("basket", JSON.stringify(basketData));
-              }
-          }
-
-          commit("product/SetSubtotalPrice", "0.00", {root: true});
-          commit("product/SetShoppingCart", [], {root: true});
-          commit("product/setBasketInfo", {}, {root: true});
-          commit("product/setDeliveryTime", "", {root: true});
-          commit("product/SetTotalPrice", "0.00", { root: true });
-
           return {
               type: "success",
               msg: "ok",
@@ -817,6 +816,21 @@ const actions = {
       })
       .catch(commonErrorCallback());
   },
+    formatDate({}, date){
+        if(!date) return null;
+        return [
+            date.getFullYear(),
+            (date.getMonth() + 1).toString().padStart(2, '0'),
+            (date.getDate()).toString().padStart(2, '0')
+        ].join('-')
+    },
+    formatTime({}, date){
+        if(!date) return null;
+        return [
+            date.getHours().toString().padStart(2, '0'),
+            date.getMinutes().toString().padStart(2, '0'),
+        ].join(':')
+    },
   addDeliveryTimeToBasket({ dispatch, rootState }, data) {
       let basketId = undefined;
       try {
@@ -829,18 +843,27 @@ const actions = {
           return { type: "error", msg: "Basket not found" };
       }
 
+      let delivery_time = null;
+      if(data.delivery_time instanceof Date){
+          delivery_time = [
+              dispatch('formatDate', data.delivery_time),
+              dispatch('formatTime', data.delivery_time),
+          ].join(' ')
+      }else if(data.date && data.time){
+          delivery_time = data.date + ' ' + data.time
+      }
+
     return $http
       .post("api/basket/add-delivery-time", {
         basketId,
-        delivery_time:
-          data.date && data.time ? data.date + " " + data.time : null,
+        delivery_time,
         deliveryType: data.deliveryType,
         duration: data.duration || undefined,
-        restaurantId,
+        restaurantId: data.restaurantId,
       })
       .then((res) => {
         // console.log(res);
-        dispatch("product/getBasket", restaurantId, { root: true });
+        dispatch("product/getBasket", data.restaurantId, { root: true });
         return {
           type: "success",
           msg: "ok",

package/src/modules/product.js

@@ -1,4 +1,4 @@
-import {commonErrorCallback, calculateBasketIdParameter, updateBasket, restaurantIdEnv, $http} from '../common';
+import {commonErrorCallback, calculateBasketIdParameter, updateBasket, deliveryCodeToName, weekdays, restaurantIdEnv, $http} from '../common';
 
 const state = () => ({
     selectedTime: null,
@@ -56,7 +56,52 @@ const getters = {
 
 		return subCategories
 
-	}
+	},
+    deliveryType(state){
+      return deliveryCodeToName(state.basketInfo.deliveryType);
+    },
+    deliveryTimes(state, getters){
+        if(!getters.deliveryType) return [];
+        const property = getters.deliveryType === 'delivery'
+            ? 'restaurantAvailableTimes'
+            : getters.deliveryType === 'here'
+                ? 'hereTimes'
+                : 'restaurantTakeawayTimes';
+        return state.restaurantInfo[property] || [];
+    },
+    disabledDates(state, getters){
+        const allowedWeekDays = Array.from(new Set(
+            getters.deliveryTimes.map(item => item.weekday)
+        )).map(item => weekdays.indexOf(item) + 1)
+
+        return {weekdays: [1, 2, 3, 4, 5, 6, 7].filter(item => !allowedWeekDays.includes(item))};
+    },
+    availableTimes(state, getters){
+        const result = {};
+        getters.deliveryTimes.forEach(range => {
+            if(!result[range.weekday]) result[range.weekday] = [];
+            const start = range.open_at.slice(0, 5).split(':').map(item => Number(item));
+            const end = range.close_at.slice(0, 5).split(':').map(item => Number(item));
+            const allowedHours = Array.from({ length: (end[0] + 1) - start[0] }, (_, index) => start[0] + index);
+            const allowedMinutes = {};
+
+            allowedHours.forEach(hour => {
+                if(hour < end[0] && hour > start[0]) allowedMinutes[hour] = {start: 0, end: 59};
+                else if (hour === start[0] && hour === end[0]) allowedMinutes[hour] = { start: start[1], end: end[1] };
+                else if (hour === start[0]) allowedMinutes[hour] = { start: start[1], end: 59 }
+                else if(hour === end[0]) allowedMinutes[hour] = { start: 0, end: end[1]}
+                else allowedMinutes[hour] = null;
+            })
+
+            result[range.weekday].push({
+                start,
+                end,
+                allowedHours,
+                allowedMinutes
+            })
+        });
+        return result;
+    }
 }
 const mutations = {
     setSelectedDate(state, date) {
@@ -485,6 +530,36 @@ const actions = {
             commonErrorCallback()
         );
     },
+    minDateTimeForDelivery ({ state }, deliveryType){
+        const dt = deliveryType ? deliveryType : deliveryCodeToName(state.basketInfo.deliveryType)
+        if(!dt) return null;
+
+        const result = new Date();
+        const closedToday = state.restaurantInfo ? state.restaurantInfo.closed : false;
+        const minHour =
+            result.getHours() + Number(state.restaurantInfo[`${dt}_hours`] || 0);
+        const isTomorrow = closedToday && minHour < 24;
+        result.setHours(
+            isTomorrow ? 24 : minHour,
+            isTomorrow ? 0 : result.getMinutes(),
+            0,
+            0
+        );
+
+        return result;
+    },
+    maxDateTimeForDelivery ({state}, deliveryType){
+        const dt = deliveryType ? deliveryType : deliveryCodeToName(state.basketInfo.deliveryType)
+        if(!dt) return null;
+
+        const ad = state.restaurantInfo[`${dt}_available_days`];
+        if(!ad) return null;
+
+        const result = new Date();
+        result.setHours(23, 59, 0, 0)
+        result.setDate(result.getDate() + Number(ad));
+        return result;
+    }
 };
 
 export default {