@alexsab-ru/scripts 0.16.0 → 0.16.2

package/lib/analytics.js

@@ -15,17 +15,31 @@ export function reachGoal(eventAction, t = {}) {
 			});
 		}
 		if(window.calltouch_params) {
-			t.siteId = window.calltouch_params.site_id;
-			// console.log("sendToCallTouch:", t);
-			sendToCallTouch(t)
-			.then(result => {
-				console.log('Данные успешно отправлены в колтач:', eventAction, result);
-			})
-			.catch(error => {
-				console.error('Ошибка при отправке данных в колтач:', eventAction, error);
-			});
+			// sendToCallTouch внутри проверяет eventCategory === 'Lead',
+			// поэтому вызываем только для лидов, чтобы не делать лишнюю работу.
+			if(t.eventCategory === 'Lead') {
+				// Если siteId уже задан конкретным дилером (из data-атрибута),
+				// не перезатираем его глобальным значением из calltouch_params.
+				if(!t.siteId) {
+					var rawSiteId = window.calltouch_params.site_id;
+					t.siteId = Array.isArray(rawSiteId) ? rawSiteId[0] : rawSiteId;
+				}
+				// console.log("sendToCallTouch:", t);
+				sendToCallTouch(t)
+				.then(result => {
+					console.log('Данные успешно отправлены в колтач:', eventAction, result);
+				})
+				.catch(error => {
+					console.error('Ошибка при отправке данных в колтач:', eventAction, error);
+				});
+			}
 			if(window.ct) {
-				window.ct(window.calltouch_params.mod_id, 'goal', eventAction);
+				// mod_id может быть массивом (multi-project) или строкой (legacy).
+				var modIds = window.calltouch_params.mod_id;
+				var ids = Array.isArray(modIds) ? modIds : [modIds];
+				ids.forEach(function(modId) {
+					window.ct(modId, 'goal', eventAction);
+				});
 			}
 		}
 		ymGoal(eventAction, {

package/lib/calltouch/calltouch-module.js

@@ -98,16 +98,11 @@ function processEventData(eventData, sessionId) {
 function sendToCallTouch(options) {
 	return new Promise((resolve, reject) => {
 		try {
-			const { siteId, eventCategory, eventProperties, sessionId = window.call_value } = options;
-			
-			// Проверяем, что категория события - Lead
-			if (eventCategory !== 'Lead') {
-				return resolve({ status: 'skipped', message: 'Not a Lead event' });
-			}
-			
+			const { siteId, eventProperties, sessionId = window.call_value } = options;
+
 			// Проверяем обязательные параметры
-			if (!siteId) {
-				return reject(new Error('siteId is required'));
+			if (!siteId || typeof siteId !== 'string') {
+				return reject(new Error('siteId is required and must be a string'));
 			}
 			
 			// Обрабатываем данные с помощью оптимизированной функции

package/lib/form.js

@@ -79,6 +79,47 @@ const stateBtn = (btn, value, disable = false) => {
 	}
 };
 
+const hasFileUploadField = (form, selector) => {
+	if (!selector) {
+		return false;
+	}
+	return !!form.querySelector(selector);
+};
+
+const appendDropzoneFiles = (formData, { filesToUploadKey, fileFieldName }) => {
+	if (!filesToUploadKey || !fileFieldName) {
+		return;
+	}
+
+	const files = window[filesToUploadKey];
+	if (!Array.isArray(files)) {
+		return;
+	}
+
+	files.forEach((file) => {
+		formData.append(fileFieldName, file);
+	});
+};
+
+const resetDropzones = ({ dropzonesKey, filesToUploadKey }) => {
+	if (!dropzonesKey || !filesToUploadKey) {
+		return;
+	}
+
+	const dropzones = window[dropzonesKey];
+	if (Array.isArray(dropzones)) {
+		dropzones.forEach((dropzone) => {
+			if (dropzone && typeof dropzone.removeAllFiles === 'function') {
+				dropzone.removeAllFiles();
+			}
+		});
+	}
+
+	if (Array.isArray(window[filesToUploadKey])) {
+		window[filesToUploadKey] = [];
+	}
+};
+
 // Показ сообщения об ошибке
 export const showErrorMes = (form, el, text) => {
 	let field = form.querySelector(el);
@@ -111,6 +152,11 @@ const propsParams = {
 	verbose: false,
 	agreeSelector: "agree",
 	sendMailCookie: "SEND_MAIL",
+	fileUploadSelector: ".file-upload",
+	fileFieldName: "file[]",
+	filesToUploadKey: "filesToUpload",
+	dropzonesKey: "dropzones",
+	successOnAttentionPhone: "79000000000",
 }
 
 export const errorIcon = '<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52"><path fill="#ed1c24" d="M26,0A26,26,0,1,0,52,26,26,26,0,0,0,26,0Zm9.6,17.5a1.94,1.94,0,0,1,2,2,2,2,0,1,1-2-2Zm-19.2,0a1.94,1.94,0,0,1,2,2,2,2,0,1,1-2-2ZM39.65,40.69a.93.93,0,0,1-.45.11,1,1,0,0,1-.89-.55,13.81,13.81,0,0,0-24.62,0,1,1,0,1,1-1.78-.9,15.8,15.8,0,0,1,28.18,0A1,1,0,0,1,39.65,40.69Z"></path></svg>';
@@ -171,6 +217,9 @@ const submitForm = async (form) => {
 	const phone = form.querySelector('[name="phone"]');
 	const name = form.querySelector('[name="name"]');
 	const dealer = form.querySelector('[name="dealer"]');
+	const hasFileUpload = hasFileUploadField(form, props.fileUploadSelector);
+	const ftaCookie = Boolean(getCookie('fta'));
+	const verbose = Boolean(props.verbose || ftaCookie);
 
 	let validate;
 
@@ -256,11 +305,14 @@ const submitForm = async (form) => {
 	reachGoal("form_submit");
 
 	let formData = new FormData(form);
+	if (hasFileUpload) {
+		appendDropzoneFiles(formData, props);
+	}
 	let sendMailCookie = props.sendMailCookie;
 	if(formData.get('dealer')) {
 		sendMailCookie += "_" + formData.get('dealer');
 	}
-	if(getCookie('fta')) {
+	if(ftaCookie) {
 		formData.append("fta", true);
 	}
 	if(getCookie('__gtm_campaign_url')) {
@@ -284,6 +336,9 @@ const submitForm = async (form) => {
 		.split("&")
 		.forEach(function (pair) {
 			let param = pair.split("=");
+			if(!param[0]){
+				return;
+			}
 			if(formData.get(param[0])){
 				formData.set(param[0], decodeURIComponent(param[1]));
 			} else {
@@ -295,6 +350,7 @@ const submitForm = async (form) => {
 	// Считаем значения один раз, чтобы одинаково использовать их в try/catch и логах.
 	const dealerRouteKey = dealer && dealer.dataset ? (dealer.dataset.ctRouteKey || '').trim() : '';
 	const dealerModId = dealer && dealer.dataset ? (dealer.dataset.ctModId || '').trim() : '';
+	const dealerSiteId = dealer && dealer.dataset ? (dealer.dataset.ctSiteId || '').trim() : '';
 	const calltouchRouteKey = dealerRouteKey || props.ct_routeKey;
 	const scopedCtwName = dealerModId ? `ctw_${dealerModId}` : '';
 	const hasScopedCtw = scopedCtwName ? typeof window[scopedCtwName] !== 'undefined' : false;
@@ -303,13 +359,14 @@ const submitForm = async (form) => {
 	try {
 		// Для multi-project берём routeKey/mod_id у выбранного дилера (data-атрибуты select).
 		// Если дилерские значения отсутствуют, используем старый глобальный props.ct_routeKey.
-		props.verbose && console.log('Calltouch submit debug:', {
+		verbose && console.log('Calltouch submit debug:', {
 			formId: form.id || '',
 			phone: phone && phone.value ? phone.value : '',
 			name: name && name.value ? name.value : '',
 			dealerValue: dealer && dealer.value ? dealer.value : '',
 			dealerRouteKey,
 			dealerModId,
+			dealerSiteId,
 			fallbackRouteKey: props.ct_routeKey,
 			calltouchRouteKey,
 			scopedCtwName,
@@ -319,7 +376,7 @@ const submitForm = async (form) => {
 
 		// Отправка заявки на обратный вызов в CallTouch.
 		if(calltouchRouteKey != '') {
-			const requestData = await createRequest(calltouchRouteKey, phone.value, name.value, props.verbose, dealerModId);
+			const requestData = await createRequest(calltouchRouteKey, phone.value, name.value, verbose, dealerModId);
 			formData.append("ct_callback", true);
 			formData.append("ctw_createRequest", JSON.stringify(requestData));
 			if (dealerModId !== '') {
@@ -342,6 +399,7 @@ const submitForm = async (form) => {
 			formId: form.id || '',
 			dealerRouteKey,
 			dealerModId,
+			dealerSiteId,
 			fallbackRouteKey: props.ct_routeKey,
 			calltouchRouteKey,
 			scopedCtwName,
@@ -349,23 +407,40 @@ const submitForm = async (form) => {
 			hasGlobalCtw
 		});
 		formDataObj = getFormDataObject(formData, form.id);
+		// Если известен конкретный siteId дилера, прокидываем его,
+		// чтобы reachGoal → sendToCallTouch отправил лид в нужный проект.
+		if (dealerSiteId) {
+			formDataObj.siteId = dealerSiteId;
+		}
 	}
 
-	const params = new URLSearchParams([...formData]);
-
-	await fetch(url, {
-		method: "POST",
-		mode: "cors",
-		cache: "no-cache",
-		credentials: "same-origin",
-		headers: {
-			"Content-Type": "application/x-www-form-urlencoded",
-		},
-		body: params,
-	})
-		.then((res) => res.json())
+	const requestOptions = hasFileUpload
+		? {
+			method: "POST",
+			body: formData,
+		}
+		: {
+			method: "POST",
+			mode: "cors",
+			cache: "no-cache",
+			credentials: "same-origin",
+			headers: {
+				"Content-Type": "application/x-www-form-urlencoded",
+			},
+			body: new URLSearchParams([...formData]),
+		};
+
+	await fetch(url, requestOptions)
+		.then(async (res) => {
+			const text = await res.text();
+			try {
+				return JSON.parse(text);
+			} catch (error) {
+				throw new Error("Ошибка обработки данных");
+			}
+		})
 		.then((data) => {
-			props.verbose && console.log(data);
+			verbose && console.log(data);
 			stateBtn(btn, btnText);
 			if (data.answer == "required") {
 				reachGoal("form_required");
@@ -382,7 +457,9 @@ const submitForm = async (form) => {
 				}
 				return;
 			} else {
-				if(data.attention != true) {
+				const normalizedPhone = String(formData.get("phone") || (phone && phone.value ? phone.value : "")).replace(/\D/g, "");
+				const attentionPhone = String(props.successOnAttentionPhone || "").replace(/\D/g, "");
+				if(data.attention != true || (attentionPhone && normalizedPhone === attentionPhone)) {
 					reachGoal("form_success", formDataObj);
 				}
 				setCookie(sendMailCookie, true, {'domain': window.location.hostname,'path':'/','expires':600});
@@ -394,6 +471,9 @@ const submitForm = async (form) => {
 				}
 			}
 			form.reset();
+			if (hasFileUpload) {
+				resetDropzones(props);
+			}
 		})
 		.catch((error) => {
 			reachGoal("form_error");
@@ -469,4 +549,4 @@ document.querySelectorAll("form:not(.vue-form)").forEach((form) => {
 		await sendForm(form);
 	})
 });
-}
+}

package/package.json

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