orderiom-api-package 0.4.94 → 0.4.96

package/package.json

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

package/src/common.js

@@ -149,13 +149,17 @@ const getAuthToken = async ($store, hadPrivateToken = false) => {
 
 		if(hadPrivateToken) {
 			$store.commit("auth/clearAuthData");
-			await $store.dispatch('unassignBasket');
+			await $store.dispatch('auth/unassignBasket');
 		}
 	} catch (error) {
 		return commonErrorCallback()(error)
 	} finally {
 		while (reqBuffer.length) {
-			reqBuffer.shift()(); // First in First out
+			let basketId = null;
+			if(hadPrivateToken){
+				basketId = calculateBasketIdParameter(false, restaurantIdEnv())
+			}
+			reqBuffer.shift()(basketId); // First in First out
 		}
 		isFetchingToken = false;
 	}
@@ -190,10 +194,19 @@ export const defineInterceptors = ({$store}) => {
 			localStorage.removeItem("publicToken");
 
 			// Push the request to waitlist and wait for new token to be fetched
-			reqBuffer.push(() => {
+			reqBuffer.push((basketId = null) => {
 				const newToken = localStorage.getItem("publicToken");
 				if(newToken){
 					config.headers["Authorization"] = `Bearer ${newToken}`
+
+					// basketId is available only when unassign-basket is called right before resolving the request from waitlist
+					if(basketId){
+						const key = config.method === 'get' ? 'params' : 'data';
+						const data = config[key] || {};
+						if(!data.basketId) data.basketId = basketId;
+						config[key] = data;
+					}
+
 					resolve(config);
 				} else {
 					config.headers["Authorization"] = undefined;

package/src/messages/ar-api.json

@@ -24,6 +24,8 @@
     "id_is_required": "يرجى اختيار المعرف.",
     "id_should_be_numeric": "يجب أن يكون المعرف رقميًا.",
     "email_is_required": "يرجى إدخال البريد الإلكتروني.",
+    "phone_is_required": "الرجاء إدخال رقم هاتفك المحمول.",
+    "birth_date_is_required": "الرجاء إدخال تاريخ ميلادك.",
     "email_should_be_valid": "يجب أن يكون البريد الإلكتروني صالحًا.",
     "text_is_required": "يرجى إدخال النص.",
     "name_is_required": "يرجى إدخال الاسم.",

package/src/messages/de-api.json

@@ -24,6 +24,8 @@
     "id_is_required": "Bitte wählen Sie Ihre ID.",
     "id_should_be_numeric": "Ihre ID muss eine Nummer sein",
     "email_is_required": "Bitte geben Sie Ihre E-Mail-Adresse ein.",
+    "phone_is_required": "Bitte geben Sie Ihre Mobiltelefon ein.",
+    "birth_date_is_required": "Bitte geben Sie Ihr Geburtsdatum ein.",
     "email_should_be_valid": "Die E-Mail muss eine gültige E-Mail-Adresse sein.",
     "text_is_required": "Bitte geben Sie Ihren Text ein.",
     "name_is_required": "Bitte geben Sie Ihren Namen ein.",

package/src/messages/en-api.json

@@ -24,6 +24,8 @@
     "id_is_required": "Please select your id.",
     "id_should_be_numeric": "Your id must be a number",
     "email_is_required": "Please insert your email.",
+    "phone_is_required": "Please enter your mobile number.",
+    "birth_date_is_required": "Please enter your birth date.",
     "email_should_be_valid": "The email must be a valid email address.",
     "text_is_required": "Please insert your text.",
     "name_is_required": "Please insert your name.",

package/src/messages/fr-api.json

@@ -24,6 +24,8 @@
 	"id_is_required": "Veuillez sélectionner votre identifiant.",
 	"id_should_be_numeric": "Votre identifiant doit être un nombre",
 	"email_is_required": "Veuillez insérer votre email.",
+    "phone_is_required": "Veuillez saisir votre numéro de téléphone portable.",
+    "birth_date_is_required": "Veuillez saisir votre date de naissance.",
 	"email_should_be_valid": "L'email doit être une adresse email valide.",
 	"text_is_required": "Veuillez insérer votre texte.",
 	"name_is_required": "Veuillez insérer votre nom.",

package/src/modules/order.js

@@ -651,9 +651,10 @@ const actions = {
 				delete validation.name;
 				delete validation.validTime;
 
+        const messages = Object.values(validation);
 				return {
 					type: 'error',
-					msg: Object.values(validation)[0][0],
+					msg: messages.length ? messages[0][0] : '',
 					name,
 					validTime,
           inStock
@@ -879,9 +880,10 @@ const actions = {
 				delete validation.name;
 				delete validation.validTime;
 
+        const messages = Object.values(validation);
 				return {
 					type: 'error',
-					msg: Object.values(validation)[0][0],
+					msg: messages.length ? messages[0][0] : '',
 					name,
 					validTime,
           inStock