orderiom-api-package 0.4.88 → 0.4.90

package/package.json

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

package/src/common.js

@@ -113,10 +113,10 @@ export function formatTime(date){
 }
 
 export function isTokenExpired(token) {
-	const base64Url = token.split(".")[1];
-	const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
-
 	try{
+		const base64Url = token.split(".")[1];
+		const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+
 		const jsonPayload = decodeURIComponent(
 			atob(base64)
 				.split("")

package/src/modules/order.js

@@ -603,31 +603,43 @@ const actions = {
 			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 {
+			const classicRedirect = (res) => {
 				window.location = res.data.data.paymentLink;
+				return res;
 			}
 
-			return res;
+			if(!data.$router || !data.routeName) return classicRedirect(res);
+
+			// find route name for vue-router
+			let name = null;
+			if(
+				res.data.data.paymentLink.includes("/paymentstatus/?") ||
+				res.data.data.paymentLink.includes("/paymentstatus?")
+			){
+				// Check string data.routeName to ensure backward compatibility
+				name = typeof data.routeName === 'string' ? data.routeName : data.routeName['paymentstatus']
+			}else if(
+				res.data.data.paymentLink.includes("/payment/?") ||
+				res.data.data.paymentLink.includes("/payment?")
+			){
+				// Check string data.routeName to ensure backward compatibility
+				name = typeof data.routeName === 'string' ? null : data.routeName['payment']
+			}
+
+			if(!name) return classicRedirect(res);
+
+			data.$router.push({
+				name,
+				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;
+					}, {}),
+			});
 		}).catch(error => {
 			const status = error.response ? error.response.status : null;
 			if (status === 422) {