orderiom-api-package 0.4.16 → 0.4.18

package/index.d.ts

@@ -4,7 +4,8 @@ export const install: any;
 export const modules: Object;
 export const $http: Object;
 export const weekdays: string[];
-
+export const formatDate: (date: Date) => string;
+export const formatTime: (date: Date) => string;
 
 export interface AuthState<SignedIn extends boolean> {
 	publicToken: string | null,

package/index.js

@@ -1,7 +1,7 @@
 import apiStore from './src';
 import enMsg from "./src/messages/en-api.json";
 import deMsg from "./src/messages/de-api.json";
-import {$http, weekdays} from './src/common';
+import {$http, weekdays, formatDate, formatTime} from './src/common';
 
 function install(Vue, options = {}, config = {}) {
     if (!options.store) console.log('Please provide a store!!');
@@ -14,4 +14,6 @@ export default {
     modules: apiStore.modules,
     $http,
     weekdays,
+    formatDate,
+    formatTime,
 }

package/package.json

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

package/src/common.js

@@ -93,6 +93,23 @@ export function deliveryCodeToName(code) {
 	}
 }
 
+export function formatDate(date){
+	if(!date) return null;
+	return [
+		date.getFullYear(),
+		(date.getMonth() + 1).toString().padStart(2, '0'),
+		(date.getDate()).toString().padStart(2, '0')
+	].join('-')
+}
+
+export function formatTime(date){
+	if(!date) return null;
+	return [
+		date.getHours().toString().padStart(2, '0'),
+		date.getMinutes().toString().padStart(2, '0'),
+	].join(':')
+}
+
 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

@@ -1,6 +1,8 @@
 import {
   commonErrorCallback,
   calculateBasketIdParameter,
+    formatTime,
+    formatDate,
   restaurantIdEnv,
   updateBasket,
   $http,
@@ -816,21 +818,6 @@ 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 {
@@ -846,8 +833,8 @@ const actions = {
       let delivery_time = null;
       if(data.delivery_time instanceof Date){
           delivery_time = [
-              dispatch('formatDate', data.delivery_time),
-              dispatch('formatTime', data.delivery_time),
+              formatDate(data.delivery_time),
+              formatTime(data.delivery_time)
           ].join(' ')
       }else if(data.date && data.time){
           delivery_time = data.date + ' ' + data.time

package/src/modules/product.js

@@ -67,7 +67,7 @@ const getters = {
             : getters.deliveryType === 'here'
                 ? 'hereTimes'
                 : 'restaurantTakeawayTimes';
-        return rootState.restaurantInfo[property] || [];
+        return rootState.orderiomApiPackage.restaurant.restaurantInfo[property] || [];
     },
     disabledDates(state, getters){
         const allowedWeekDays = Array.from(new Set(
@@ -101,6 +101,36 @@ const getters = {
             })
         });
         return result;
+    },
+    minDateTimeForDelivery (state, getters, rootState){
+        const dt = deliveryCodeToName(state.basketInfo.deliveryType)
+        if(!dt) return null;
+
+        const result = new Date();
+        const closedToday = rootState.orderiomApiPackage.restaurant.restaurantInfo ? rootState.orderiomApiPackage.restaurant.restaurantInfo.closed : false;
+        const minHour =
+            result.getHours() + Number(rootState.orderiomApiPackage.restaurant.restaurantInfo[`${dt}_hours`] || 0);
+        const isTomorrow = closedToday && minHour < 24;
+        result.setHours(
+            isTomorrow ? 24 : minHour,
+            isTomorrow ? 0 : result.getMinutes(),
+            0,
+            0
+        );
+
+        return result;
+    },
+    maxDateTimeForDelivery (state, getters, rootState){
+        const dt = deliveryCodeToName(state.basketInfo.deliveryType)
+        if(!dt) return null;
+
+        const ad = rootState.orderiomApiPackage.restaurant.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;
     }
 }
 const mutations = {
@@ -530,36 +560,6 @@ const actions = {
             commonErrorCallback()
         );
     },
-    minDateTimeForDelivery ({ state, rootState }, deliveryType){
-        const dt = deliveryType ? deliveryType : deliveryCodeToName(state.basketInfo.deliveryType)
-        if(!dt) return null;
-
-        const result = new Date();
-        const closedToday = rootState.restaurantInfo ? rootState.restaurantInfo.closed : false;
-        const minHour =
-            result.getHours() + Number(rootState.restaurantInfo[`${dt}_hours`] || 0);
-        const isTomorrow = closedToday && minHour < 24;
-        result.setHours(
-            isTomorrow ? 24 : minHour,
-            isTomorrow ? 0 : result.getMinutes(),
-            0,
-            0
-        );
-
-        return result;
-    },
-    maxDateTimeForDelivery ({state, rootState}, deliveryType){
-        const dt = deliveryType ? deliveryType : deliveryCodeToName(state.basketInfo.deliveryType)
-        if(!dt) return null;
-
-        const ad = rootState.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 {