@alexsab-ru/scripts 0.8.4 → 0.9.0

package/lib/form.js

@@ -78,10 +78,10 @@ const showMessageModal = (messageModal, icon, message) => {
 };
 
 const propsParams = {
-	callback: null, 
-	callback_error: null, 
+	callback: null,
+	callback_error: null,
 	validation: null,
-	ct_routeKey: '', 
+	ct_routeKey: '',
 	confirmModalText: '',
 	verbose: false,
 	agreeSelector: "agree",
@@ -96,7 +96,7 @@ export const connectForms = (url, props = propsParams) => {
 		element.addEventListener("input", maskphone);
 		element.addEventListener("change", () => phoneChecker(element));
 	});
-	
+
 	// AGREE CHECKBOX
 	// Проверка на состояние чекбокса, показ/скрытие ошибки
 	document.querySelectorAll("input[name=" + props.agreeSelector + "]").forEach(function (element) {
@@ -109,7 +109,7 @@ export const connectForms = (url, props = propsParams) => {
 			}
 		});
 	});
-	
+
 	// CHANGE textarea для всез браузеров
 	document.querySelectorAll("textarea").forEach(function (textarea) {
 		if (textarea.addEventListener) {
@@ -128,7 +128,7 @@ export const connectForms = (url, props = propsParams) => {
 			});
 		}
 	});
-	
+
 async function submitForm(form){
 	const btn = form.querySelector('[type="submit"]');
 	const btnText = btn.value || btn.innerText;
@@ -163,6 +163,10 @@ async function submitForm(form){
 	reachGoal("form_submit");
 
 	let formData = new FormData(form);
+	let sendMailCookie = props.sendMailCookie;
+	if(formData.get('dealer')) {
+		sendMailCookie += "_" + formData.get('dealer');
+	}
 	if(getCookie('fta')) {
 		formData.append("fta", true);
 	}
@@ -243,8 +247,10 @@ async function submitForm(form){
 				}
 				return;
 			} else {
-				reachGoal("form_success", formDataObj);
-				setCookie(props.sendMailCookie, true, {'domain': window.location.hostname,'path':'/','expires':600});								
+				if(data.attention != true) {
+					reachGoal("form_success", formDataObj);
+				}
+				setCookie(sendMailCookie, true, {'domain': window.location.hostname,'path':'/','expires':600});
 				// Вызов callback при успехе
 				if (props.callback && typeof props.callback === 'function') {
 					props.callback(data);
@@ -257,7 +263,7 @@ async function submitForm(form){
 		.catch((error) => {
 			reachGoal("form_error");
 			console.error("Ошибка отправки данных формы: " + error);
-			deleteCookie(props.sendMailCookie);
+			deleteCookie(sendMailCookie);
 			// Вызов callback_error при ошибке
 			if (props.callback_error && typeof props.callback_error === 'function') {
 				props.callback_error(data);
@@ -271,10 +277,11 @@ async function submitForm(form){
 
 async function sendForm(form) {
 	let formData = new FormData(form);
+	let sendMailCookie = props.sendMailCookie;
 	if(formData.get('dealer')) {
-		props.sendMailCookie += "_" + formData.get('dealer');
+		sendMailCookie += "_" + formData.get('dealer');
 	}
-	if (getCookie(props.sendMailCookie)) {
+	if (getCookie(sendMailCookie)) {
 		const confirmModal = document.getElementById('confirm-modal');
 		if (confirmModal) {
 			confirmModal.querySelector('p').innerHTML = props.confirmModalText || '<span style="color: tomato; font-weight: bold">ПЕРЕДАЙ ТЕКСТ В ОБЪЕКТЕ <br><pre style="color: black; font-weight: 400">props = {confirmModalText: <i>"text"</i>}</pre></span>';
@@ -290,7 +297,7 @@ async function sendForm(form) {
 					// Закрываем модальное окно
 					confirmModal.classList.add("hidden");
 					// Удаляем куку
-					deleteCookie(props.sendMailCookie);
+					deleteCookie(sendMailCookie);
 					// Повторно отправляем форму
 					await submitForm(form);
 					return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexsab-ru/scripts",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "common libs for websites",
   "main": "index.js",
   "scripts": {