orderiom-api-package 0.4.21 → 0.4.23

package/package.json

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

package/src/modules/order.js

@@ -85,20 +85,9 @@ const actions = {
   },
   createBasket({}, data) {
     var basketData = JSON.parse(localStorage.getItem("basket") || "[]");
-    let delivery_time = data.delivery_time
-      ? { delivery_time: data.delivery_time }
-      : null;
-    // Date.prototype.addHours = function (h) {
-    //     this.setTime(this.getTime() + (h * 60 * 60 * 1000));
-    //     return this;
-    // }
-    // var date = new Date().addHours(1);
-    // let delivery_time =
-    //     `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()
-    //     } ${(date.getHours()).toString().padStart(2, '0')}:${(date.getMinutes()).toString().padStart(2, '0')}`
     return $http
       .post("api/basket/create", {
-        ...delivery_time,
+        delivery_time: data && data.delivery_time ? data.delivery_time : null,
         restaurantId: data ? data.restaurantId : undefined,
       })
       .then((res) => {

package/src/modules/product.js

@@ -108,12 +108,15 @@ const getters = {
 
         const result = new Date();
         const closedToday = rootState.orderiomApiPackage.restaurant.restaurantInfo ? rootState.orderiomApiPackage.restaurant.restaurantInfo.closed : false;
+        const delayTime = Number(rootState.orderiomApiPackage.restaurant.restaurantInfo[`${dt}_hours`] || 0);
         const minHour =
-            result.getHours() + Number(rootState.orderiomApiPackage.restaurant.restaurantInfo[`${dt}_hours`] || 0);
+            result.getHours() + parseInt(delayTime / 60);
+        const minMinutes =
+            result.getMinutes() + (delayTime % 60);
         const isTomorrow = closedToday && minHour < 24;
         result.setHours(
             isTomorrow ? 24 : minHour,
-            isTomorrow ? 0 : result.getMinutes(),
+            isTomorrow ? 0 : minMinutes,
             0,
             0
         );
@@ -359,7 +362,7 @@ const actions = {
         );
     },
     getBasket({ commit, rootState }, data) {
-        if(typeof data === 'string' || typeof data === 'number') data = {restaurantId: data};
+        if(['string', 'number', 'undefined'].includes(typeof data)) data = {restaurantId: data};
 
         let basketId = undefined;
         try{