orderiom-api-package 0.4.20 → 0.4.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.4.20",
+  "version": "0.4.22",
   "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

@@ -68,7 +68,7 @@ const actions = {
   async shoppingCartUpdateCallback({ dispatch, rootState }, data) {
     const getBasketSuccess = await dispatch(
       "product/getBasket",
-      data.restaurantId,
+      data ? data.restaurantId : undefined,
       { root: true }
     );
     if (!getBasketSuccess) {
@@ -85,21 +85,10 @@ 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,
-        restaurantId: data.restaurantId,
+        delivery_time: data && data.delivery_time ? data.delivery_time : null,
+        restaurantId: data ? data.restaurantId : undefined,
       })
       .then((res) => {
         basketData.push({
@@ -397,7 +386,7 @@ const actions = {
       try {
           basketId = calculateBasketIdParameter(
               !!rootState.orderiomApiPackage.auth.privateToken,
-              data.restaurantId
+              data ? data.restaurantId : undefined
           );
       } catch (e) {
           console.error(e);
@@ -415,7 +404,7 @@ const actions = {
       })
       .then(async () => {
         return await dispatch("shoppingCartUpdateCallback", {
-          restaurantId: data.restaurantId,
+          restaurantId: data ? data.restaurantId : undefined,
         });
       })
       .catch(commonErrorCallback())
@@ -580,7 +569,7 @@ const actions = {
 
       return $http.post("api/order/create-order", {
           basketId,
-          restaurantId: data.restaurantId || undefined,
+          restaurantId: data.restaurantId,
           paymentType: data.paymentType,
           ...(data.paymentType === "payFix" && {
               qrCode: data.payfix_qrcode,
@@ -687,22 +676,18 @@ const actions = {
       try {
           basketId = calculateBasketIdParameter(
               !!rootState.orderiomApiPackage.auth.privateToken,
-              data.restaurantId
+              data ? data.restaurantId : undefined
           );
       } catch (e) {
           console.error(e);
           return { type: "error", msg: "Basket not found" };
       }
 
-    const restaurantID = data.restaurantId
-      ? { restaurantId: data.restaurantId }
-      : {};
-
     $http
       .get("api/payment/prepare", {
         params: {
           basketId,
-          ...restaurantID,
+          restaurantId: data ? data.restaurantId : undefined,
         },
       })
       .then((result) => {
@@ -981,7 +966,7 @@ const actions = {
       try {
           basketId = calculateBasketIdParameter(
               !!rootState.orderiomApiPackage.auth.privateToken,
-              data.restaurantId
+              data ? data.restaurantId : undefined
           );
       } catch (e) {
           console.error(e);
@@ -991,7 +976,7 @@ const actions = {
     return $http
       .post("api/order/is-valid", null, {
         params: {
-          restaurantId: data.restaurantId,
+          restaurantId: data ? data.restaurantId : undefined,
           basketId,
         },
       })
@@ -1018,7 +1003,7 @@ const actions = {
     return $http
       .post("api/basket/update-extraInfo", {
         basketId,
-        restaurantId: data.restaurantId || restaurantIdEnv,
+        restaurantId: data ? data.restaurantId : undefined,
         ...data,
       })
       .then((res) =>
@@ -1039,7 +1024,7 @@ const actions = {
     try {
       basketId = calculateBasketIdParameter(
           !!rootState.orderiomApiPackage.auth.privateToken,
-          data.restaurantId
+          data ? data.restaurantId : undefined
       );
     } catch (e) {
       console.error(e);
@@ -1048,14 +1033,14 @@ const actions = {
 
     return $http.post("api/basket/update-basket-extraInfo", {
       basketId,
-      restaurantId: data.restaurantId || restaurantIdEnv,
+      restaurantId: data ? data.restaurantId : undefined,
       ...data,
     }).then((res) =>
       updateBasket({
         commit,
         basketId,
         res,
-        restaurantId: data.restaurantId || restaurantIdEnv,
+        restaurantId: data ? data.restaurantId : undefined,
       })
     ).catch(err => {
       console.error(err);

package/src/modules/product.js

@@ -330,7 +330,7 @@ const actions = {
         }
         return $http.get("api/restaurant/pinned-products", {
             params: {
-                restaurantId: data.restaurantId,
+                restaurantId: data ? data.restaurantId : undefined,
                 basketId: basketId
             }
         }).then(res => {
@@ -359,11 +359,14 @@ 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{
-            basketId = calculateBasketIdParameter(!!rootState.orderiomApiPackage.auth.privateToken, data ? data.restaurantId : undefined);
+            basketId = calculateBasketIdParameter(
+                !!rootState.orderiomApiPackage.auth.privateToken,
+                data ? data.restaurantId : undefined
+            );
         } catch(e) {
             console.error(e);
             return false;
@@ -373,7 +376,7 @@ const actions = {
         return $http.get('api/basket', {
             params: {
                 basketId,
-                restaurantId: data.restaurantId || restaurantIdEnv
+                restaurantId: data ? data.restaurantId : undefined,
             }
         }).then(res =>
             updateBasket({commit, basketId, res, restaurantId: data ? data.restaurantId : undefined})
@@ -396,7 +399,9 @@ const actions = {
         }
         return $http.get('api/restaurant/category-attributes-items', {
             params: {
-                restaurantId: data.restaurantId, categoryId: data.category.id, basketId: basketId
+                restaurantId: data.restaurantId,
+                categoryId: data.category.id,
+                basketId
             }
         }).then((result) => {
             commit('setAttributeItems', result.data.data)