orderiom-api-package 0.4.36 → 0.4.37

package/package.json

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

package/src/common.js

@@ -16,7 +16,7 @@ export function commonErrorCallback(unknownErrorMessage = 'Something went wrong'
 		if (status === 422) {
 			return {
 				type: 'error',
-				msg: Object.values(error.response.data.error.validation).map(m => m[0]).toString()
+				msg: Object.values(error.response.data.error.validation)[0],
 			}
 		} else if ([401, 403, 404, 400].includes(status)) {
 			return {
@@ -127,43 +127,44 @@ axios.interceptors.request.use(config => {
 }, error => {
 	return Promise.reject(error);
 });
-axios.interceptors.response.use(response => {
-	return response;
-}, error => {
-	if (
-		error.response &&
-		error.response.data &&
-		error.response.data.error &&
-		error.response.data.error.validation
-	) {
-		const validation = error.response.data.error.validation;
+axios.interceptors.response.use(
+	res => res,
+	error => {
+		if (
+			error.response &&
+			error.response.data &&
+			error.response.data.error &&
+			error.response.data.error.validation
+		) {
+			const validation = error.response.data.error.validation;
+
+			if (
+				(
+					Object.keys(validation).includes("basketId") &&
+					validation["basketId"][0] === "basket_does_not_exists"
+				) ||
+				(
+					Object.keys(validation).includes("restaurantId") &&
+					validation["restaurantId"][0] === "basket_does_not_exists"
+				)
+			) {
+				localStorage.removeItem("basket");
+			}
+		}
 
 		if (
-			(
-				Object.keys(validation).includes("basketId") &&
-				validation["basketId"][0] === "basket_does_not_exists"
-			) ||
-			(
-				Object.keys(validation).includes("restaurantId") &&
-				validation["restaurantId"][0] === "basket_does_not_exists"
-			)
+			error.response &&
+			error.response.data &&
+			error.response.data.message &&
+			error.response.data.message.body === "unauthenticated" &&
+			localStorage.getItem("privateToken")
 		) {
-			localStorage.removeItem("basket");
+			localStorage.clear();
+			window.location.reload();
 		}
-	}
 
-	if (
-		error.response &&
-		error.response.data &&
-		error.response.data.message &&
-		error.response.data.message.body === "unauthenticated" &&
-		localStorage.getItem("privateToken")
-	) {
-		localStorage.clear();
-		window.location.reload();
+		return Promise.reject(error);
 	}
-
-	return Promise.reject(error);
-});
+);
 
 export const $http = axios;

package/src/messages/de-api.json

@@ -132,8 +132,11 @@
     "Choose Your Address": "Wählen Sie Ihre Adresse",
     "Password doesn't match": "Passwort nicht übereinstimmen",
     "Please fill out this field": "Bitte füllen Sie dieses Feld aus",
-    "resources_have_been_reached": "Leider sind wir zu deiner gewählten Uhrzeit sehr ausgelastet und können dein Essen nicht zubereiten. Möchtest du deine Uhrzeit vielleicht auf {time} ändern?",
-	"is_not_available_for_your_selected_date": "{item} ist für das von Ihnen ausgewählte Datum nicht verfügbar.",
+
+    "resources_have_been_reached": "Leider sind wir zu deiner gewählten Zeit sehr ausgelastet und können dein Essen nicht zubereiten. Möchtest du deine Zeit vielleicht auf {validTime} ändern?",
+	"is_not_available_for_your_selected_date": "Leider ist {name} für Ihr ausgewähltes Datum nicht verfügbar.",
+	"the_product_is_not_available": "Leider ist {name} nicht auf Lager",
+
 	"request_submitted": "Ihre Anfrage wurde übermittelt!",
     "restaurant_past_time": "Das Restaurant ist nicht zur gewünschten Zeit geöffnet.",
     "we have updates! please refresh.": "wir haben Updates! bitte aktualisieren.",

package/src/messages/en-api.json

@@ -132,9 +132,12 @@
     "Choose Your Address": "Choose Your Address",
     "Password doesn't match": "Password doesn't match",
     "Please fill out this field": "Please fill out this field",
-    "resources_have_been_reached": "Unfortunately we are very busy at your selected time and we cannot prepare your food. You want to change your time to {time} maybe?",
-	"is_not_available_for_your_selected_date": "{item} is not available for your selected date.",
-    "request_submitted": "your request has been submitted!",
+
+    "resources_have_been_reached": "Unfortunately, we are very busy at your selected time and cannot prepare your food. Do you want to change your time to {validTime} maybe?",
+	"is_not_available_for_your_selected_date": "Unfortunately, {name} is not available for your selected date.",
+	"the_product_is_not_available": "Unfortunately, {name} is out of stock",
+
+	"request_submitted": "your request has been submitted!",
     "restaurant_past_time": "Restaurant is not open at your desired Time.",
     "we have updates! please refresh.": "we have updates! please refresh.",
     "invoice": "invoice",

package/src/messages/fr-api.json

@@ -132,8 +132,11 @@
 	"Choose Your Address": "Choisissez votre adresse",
 	"Password doesn't match": "Le mot de passe ne correspond pas",
 	"Please fill out this field": "Veuillez remplir ce champ",
-	"resources_have_been_reached": "Malheureusement, nous sommes très occupés à l'heure que vous avez choisie et ne pouvons pas préparer votre nourriture. Voulez-vous peut-être changer votre heure en {time}?",
-	"is_not_available_for_your_selected_date": "{item} n'est pas disponible pour la date sélectionnée.",
+
+	"resources_have_been_reached": "Malheureusement, nous sommes très occupés à l'heure que vous avez choisie et ne pouvons pas préparer votre nourriture. Voulez-vous peut-être changer votre heure en {validTime}?",
+	"is_not_available_for_your_selected_date": "Malheureusement, {name} n'est pas disponible pour la date sélectionnée.",
+	"the_product_is_not_available": "Malheureusement, {name} est en rupture de stock",
+
 	"request_submitted": "votre demande a été soumise!",
 	"restaurant_past_time": "Le restaurant n'est pas ouvert à l'heure souhaitée.",
 	"we have updates! please refresh.": "nous avons des mises à jour! veuillez rafraîchir.",

package/src/modules/order.js

@@ -566,82 +566,108 @@ const actions = {
       data.array.splice(index, 1);
     }
   },
-  createOrder({ commit, rootState }, data) {
-      let basketId = undefined;
-      try {
-          basketId = calculateBasketIdParameter(
-              !!rootState.orderiomApiPackage.auth.privateToken,
-              data.restaurantId
-          );
-      } catch (e) {
-          console.error(e);
-          return { type: "error", msg: "Basket not found" };
-      }
+	createOrder({commit, rootState}, data) {
+		let basketId = undefined;
+		try {
+			basketId = calculateBasketIdParameter(
+				!!rootState.orderiomApiPackage.auth.privateToken,
+				data.restaurantId
+			);
+		} catch (e) {
+			console.error(e);
+			return {type: "error", msg: "Basket not found"};
+		}
 
-      return $http.post("api/order/create-order", {
-          basketId,
-          restaurantId: data.restaurantId,
-          paymentType: data.paymentType,
-          ...(data.paymentType === "payFix" && {
-              qrCode: data.payfix_qrcode,
-              pin: data.payfix_pin,
-          }),
-          tablePaymentId: data.tablePaymentId ? data.tablePaymentId : null,
-          externalBasketItems: data.externalBasketItems ? data.externalBasketItems : null
-      }).then(res => {
-          // localStorage.setItem("orderId", res.data.data.order.id);
-          // commit('setproductOrder', res.data.data.product)
-          // commit('settotalPriceOrder', res.data.data.order.total_price)
-          // 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));
-              }
-          }
+		return $http.post("api/order/create-order", {
+			basketId,
+			restaurantId: data.restaurantId,
+			paymentType: data.paymentType,
+			...(data.paymentType === "payFix" && {
+				qrCode: data.payfix_qrcode,
+				pin: data.payfix_pin,
+			}),
+			tablePaymentId: data.tablePaymentId ? data.tablePaymentId : null,
+			externalBasketItems: data.externalBasketItems ? data.externalBasketItems : null
+		}).then(res => {
+			// localStorage.setItem("orderId", res.data.data.order.id);
+			// commit('setproductOrder', res.data.data.product)
+			// commit('settotalPriceOrder', res.data.data.order.total_price)
+			// 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 });
+			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 (
-              (
-                  res.data.data.paymentLink.includes("/paymentstatus/?") ||
-                  res.data.data.paymentLink.includes("/paymentstatus?")
-              ) &&
-              data.$router &&
-              data.routeName
-          ) {
-              data.$router.push({
-                  name: data.routeName,
-                  query: res.data.data.paymentLink
-                      .split("?")[1]
-                      .split("&")
-                      .map((query) => query.split("="))
-                      .reduce((result, element) => {
-                          if (!element) return result;
-                          result[element[0]] = element[1];
-                          return result;
-                      }, {}),
-              });
-          } else {
-              window.location = res.data.data.paymentLink;
-          }
+			if (
+				(
+					res.data.data.paymentLink.includes("/paymentstatus/?") ||
+					res.data.data.paymentLink.includes("/paymentstatus?")
+				) &&
+				data.$router &&
+				data.routeName
+			) {
+				data.$router.push({
+					name: data.routeName,
+					query: res.data.data.paymentLink
+						.split("?")[1]
+						.split("&")
+						.map((query) => query.split("="))
+						.reduce((result, element) => {
+							if (!element) return result;
+							result[element[0]] = element[1];
+							return result;
+						}, {}),
+				});
+			} else {
+				window.location = res.data.data.paymentLink;
+			}
 
-          return {
-              type: "success",
-              msg: "ok",
-          };
-      }).catch(commonErrorCallback());
-  },
+			return {
+				type: "success",
+				msg: "ok",
+			};
+		}).catch(error => {
+			const status = error.response ? error.response.status : null;
+			if (status === 422) {
+				const validation = error.response.data.error.validation;
+
+				const name = validation.name;
+				const validTime = validation.validTime;
+				delete validation.name;
+				delete validation.validTime;
+
+				return {
+					type: 'error',
+					msg: Object.values(validation)[0],
+					name,
+					validTime
+				}
+			} else if ([401, 403, 404, 400].includes(status)) {
+				return {
+					type: 'error',
+					msg: error.response.data.message.body
+				}
+			}
+			return {
+				type: 'error',
+				msg: 'Something went wrong'
+			}
+		});
+	},
   getOrder({ commit }, orderId) {
     return $http
       .get("api/order", {
@@ -814,45 +840,69 @@ const actions = {
       })
       .catch(commonErrorCallback());
   },
-  addDeliveryTimeToBasket({ commit, dispatch, rootState }, data) {
-      let basketId = undefined;
-      try {
-          basketId = calculateBasketIdParameter(
-              !!rootState.orderiomApiPackage.auth.privateToken,
-              data.restaurantId
-          );
-      } catch (e) {
-          console.error(e);
-          return { type: "error", msg: "Basket not found" };
-      }
+	addDeliveryTimeToBasket({commit, dispatch, rootState}, data) {
+		let basketId = undefined;
+		try {
+			basketId = calculateBasketIdParameter(
+				!!rootState.orderiomApiPackage.auth.privateToken,
+				data.restaurantId
+			);
+		} catch (e) {
+			console.error(e);
+			return {type: "error", msg: "Basket not found"};
+		}
 
-      let delivery_time = null;
-      if(data.delivery_time instanceof Date){
-          delivery_time = [
-              formatDate(data.delivery_time),
-              formatTime(data.delivery_time)
-          ].join(' ')
-      }else if(data.date && data.time){
-          delivery_time = data.date + ' ' + data.time
-      }
+		let delivery_time = null;
+		if (data.delivery_time instanceof Date) {
+			delivery_time = [
+				formatDate(data.delivery_time),
+				formatTime(data.delivery_time)
+			].join(' ')
+		} else if (data.date && data.time) {
+			delivery_time = data.date + ' ' + data.time
+		}
 
-      commit('setChangingDeliveryTime', true)
-      return $http.post("api/basket/add-delivery-time", {
-          basketId,
-          delivery_time,
-          deliveryType: data.deliveryType,
-          duration: data.duration || undefined,
-          restaurantId: data.restaurantId,
-      }).then(() => {
-          dispatch("product/getBasket", data.restaurantId, {root: true});
+		commit('setChangingDeliveryTime', true)
+		return $http.post("api/basket/add-delivery-time", {
+			basketId,
+			delivery_time,
+			deliveryType: data.deliveryType,
+			duration: data.duration || undefined,
+			restaurantId: data.restaurantId,
+		}).then(() => {
+			dispatch("product/getBasket", data.restaurantId, {root: true});
 
-          return {type: "success", msg: ""};
-      }).catch(
-          commonErrorCallback()
-      ).finally(() => {
-          commit('setChangingDeliveryTime', false)
-      });
-  },
+			return {type: "success", msg: ""};
+		}).catch(error => {
+			const status = error.response ? error.response.status : null;
+			if (status === 422) {
+				const validation = error.response.data.error.validation;
+
+				const name = validation.name;
+				const validTime = validation.validTime;
+				delete validation.name;
+				delete validation.validTime;
+
+				return {
+					type: 'error',
+					msg: Object.values(validation)[0],
+					name,
+					validTime
+				}
+			} else if ([401, 403, 404, 400].includes(status)) {
+				return {
+					type: 'error',
+					msg: error.response.data.message.body
+				}
+			}
+			return {
+				type: 'error',
+				msg: 'Something went wrong'
+			}
+		}).finally(() => {
+			commit('setChangingDeliveryTime', false)
+		});
+	},
   getOrderHistory({ commit }, data) {
     return $http
       .get("api/order/history", { params: data })