mod-build 3.6.76-beta.2 → 3.6.77-beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.76
+
+- Add EIN field to data for Mod endpoint
+
 ## 3.6.75
 
 - Update grab-shared-scripts task to consider isPathSubdirectory flag for modalytics script path

package/gulp-tasks/templates.js

@@ -236,10 +236,14 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		const service = templatesData.service ? templatesData.service.toLowerCase().replace(' ', '_') : templatesData.primary_trade.toLowerCase().replace(' ', '_');
 		const apiEnv = 'https://' + (templatesData.nodeEnv === 'modernize.com' ? 'hs.leadpost.net/' : 'hsleadpost1.quinstage.com/');
 		const url = `${apiEnv}coreg/getTCPAConsent?website=${website}&service=${service}&affiliateKey=${affiliateKey}&c_level=${c_level}`;
+		const reqConfig = {
+			url: url,
+			encoding: 'latin1'
+		};
 		console.time('Finished fetch-tcpa-from-sitegenie after');
 		console.log('Starting fetch-tcpa-from-sitegenie: ',url);
 		await new Promise(function(resolve) {
-			request(url, async function(err, xhr, response) {
+			request(reqConfig, async function(err, xhr, response) {
 				if (xhr.statusCode !== 200) {
 					throw new Error(`${xhr.statusCode}: Error while fetching TCPA`);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.76-beta.2",
+  "version": "3.6.77-beta.1",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/scripts/mod-form-contractor.js

@@ -295,6 +295,22 @@ modForm.submitContractorFormDataToApi = function(formData, successCallback, erro
 	}
 };
 
+/**
+ * Check if the submitted info qualifies as small business to show corresponding thank you block
+ * @returns {Boolean} - true if small business
+ */
+modForm.isSmallBusiness = function() {
+	var $annualRevenue = this.opts.form.find('[name="annualRevenue"]').val(),
+		smbRevenueAnswers = ['Under $250,000', 'I\'m a Sales Rep'],
+		isSmallBus = false;
+
+	if (smbRevenueAnswers.indexOf($annualRevenue) > -1) {
+		isSmallBus = true;
+	}
+
+	return isSmallBus;
+};
+
 /**
  * Process data to the new API required format
  * @param {Object} formData - form data
@@ -340,8 +356,8 @@ modForm.formatContractorDataForModApi = function(formData, currentStep) {
 				annualRevenue: formData.annualRevenue,
 				buysLeads: formData.buysLeads,
 				crmInUse: formData.crmInUse,
-				ein: formData.ein,
 				whoCallsLeads: formData.whoCallsLeads,
+				ein: formData.ein,
 				websiteUrl: formData.websiteUrl,
 				companyZip: formData.companyZip
 			}
@@ -397,57 +413,6 @@ modForm.initResubmitBtn = function() {
 	});
 };
 
-modForm.isSmallBusiness = function(annualRevenue) {
-	const smbRevenueAnswers = ['I\'m a sales rep', '$0 - $500K', '$500K - $1M'];
-	if (!annualRevenue) {
-	  console.error('No annual revenue provided');
-	  return false;
-	}
-
-	return smbRevenueAnswers.indexOf(annualRevenue) > -1;
-}
-
-/**
- * Email
- * @param {String} email - email address to validate
- * @returns {Boolean} isFreeEmail
- */
-modForm.isFreeEmail = function(email) {
-	let isFreeEmail = false;
-	const freeDomains = ['gmail', 'hotmail', 'msn', 'aol', 'yahoo', 'ymail', 'comcast', 'icloud'];
-
-	if (email) {
-	  const emailAddress = email.toLowerCase();
-	  isFreeEmail = freeDomains.some(domain => emailAddress.includes(domain));
-	}
-
-	return isFreeEmail;
-}
-
-/**
- * Check if data meets criteria to match with CXP
- * @returns {Boolean} - true if meets CXP criteria
- */
-modForm.isSupportedByCxp = function(formData) {
-	if (formData.primaryProjectClass === 'Solar') {
-	  return false;
-	}
-
-	return true;
-};
-
-/**
- * Check if the submitted info meets the criteria of a Marketing Qualified Lead (MQL, a lead who is more likely to become a customer than other leads)
- * @returns {Boolean} - true if meets MQL Criteria
- */
-modForm.meetsMQLCriteria = function(formData) {
-	if (this.isFreeEmail(formData.email) && formData.websiteUrl === '') {
-		return false;
-	}
-
-	return true;
-};
-
 /**
  * Process form after succesful submit
  * @param {Object} response - response data
@@ -517,9 +482,8 @@ modForm.processContractorFormSubmitSuccess = function(response, currentStep, xhr
 
 		// Thankyou blocks logic
 		var $tyStateBlocks = _this.opts.form.find('.ty-state-block'),
-			$cxpTyp = _this.opts.form.find('.ty-state-block-cxp'),
-			$noserviceTyp = _this.opts.form.find('.ty-state-block-noservice'),
-			$generalTyp = _this.opts.form.find('.ty-state-block-success'),
+			$otherTyp = _this.opts.form.find('.ty-state-block-other'),
+			$sbssTyp = _this.opts.form.find('.ty-state-block-sbss'),
 			$generalTyp = _this.opts.form.find('.ty-state-block-success'),
 			$primaryProjectClass = _this.opts.form.find('select[name="primaryProjectClass"]'),
 			tyStateGAName;
@@ -530,18 +494,16 @@ modForm.processContractorFormSubmitSuccess = function(response, currentStep, xhr
 		// Check what type of TY page to show
 		$tyStateBlocks.hide();
 
-		const meetsModCriteria = _this.meetsMQLCriteria(_this.getFormData());
-		const meetsCxpCriteria = _this.isSupportedByCxp(_this.getFormData());
-
-		if (meetsModCriteria) {
+		if ($primaryProjectClass.val() === 'Other') {
+			tyStateGAName = 'thankyou-other';
+			$otherTyp.show();
+			_this.initResubmitBtn();
+		} else if (_this.isSmallBusiness()) { // if is small business
+			tyStateGAName = 'thankyou-smallbusiness';
+			$sbssTyp.show();
+		} else {
 			tyStateGAName = 'thankyou';
 			$generalTyp.show();
-		} else if (meetsCxpCriteria) {
-			tyStateGAName = 'thankyou-cxp';
-			$cxpTyp.show();
-		} else {
-			tyStateGAName = 'thankyou-noservice';
-			$noserviceTyp.show();
 		}
 
 		// Track TY page in GA