mod-build 3.4.12-beta.2 → 3.4.13-beta.2

package/package.json

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

package/src/scripts/qs-form.js

@@ -672,12 +672,14 @@ modForm.submitFormDataToQSApi = function(formData, successCallback, errorCallbac
  */
 modForm.processQSFormSubmitSuccess = function(response, xhr) {
 	var cookieData,
-		responseData = response.RESPONSE;
+		responseData = response.RESPONSE,
+		dataCaptureKey = responseData.DCK;
+
+	window.projectId = responseData.HASHEDDCK;
 
 	// If submission was succesful
-	if (responseData.DCK != null && xhr.status === 200) {
-		var dataCaptureKey = responseData.DCK,
-			clickKeyUUID = this.opts.formData.CLK,
+	if (dataCaptureKey != null && xhr.status === 200) {
+		var clickKeyUUID = this.opts.formData.CLK,
 			landingPage = window.location.hostname + window.location.pathname;
 
 		// Setting GA User ID and several custom dimensions after a successful form submit request
@@ -756,16 +758,16 @@ modForm.processQSFormSubmitSuccess = function(response, xhr) {
 			}
 		}
 
-		// Set results page to HRC if the site is eligible
-		if (this.isQsSiteEligibleForHrc() && response.RESPONSE.HASHEDDCK) {
-			window.projectId = response.RESPONSE.HASHEDDCK;
+		// Set results page to HRC if the site is eligible, there's a DCK
+		// and the results page opt is not defined yet (emerging trades have results page defined and should not redirect to the HRC)
+		if (this.isQsSiteEligibleForHrc() && window.projectId && !this.opts.resultsPage) {
 			this.opts.resultsPage = this.getProjExUrl();
-			this.opts.resultsPage += (this.opts.resultsPage.indexOf('?') < 0 ? '?' : '&') + 'DCK=' + response.RESPONSE.DCK;
+			this.opts.resultsPage += (this.opts.resultsPage.indexOf('?') < 0 ? '?' : '&') + 'DCK=' + dataCaptureKey;
+		}
 
-			// Append TY to HRC URL for QS tracking purpose
-			if (typeof this.opts.appendTyToHrcUrl !== 'undefined' && this.opts.appendTyToHrcUrl === true) {
-				this.opts.resultsPage += '&' + (responseData.MATCHES.length > 0 ? 'ThankYou' : 'Sorry');
-			}
+		// Append TY to HRC URL for QS tracking purpose
+		if (typeof this.opts.appendTyToHrcUrl !== 'undefined' && this.opts.appendTyToHrcUrl === true) {
+			this.opts.resultsPage += '&' + (responseData.MATCHES.length > 0 ? 'ThankYou' : 'Sorry');
 		}
 
 		// Renamed thankyou page to results page to be more explicit that TYP is dying

package/src/scripts/vendor/google-tag-manager-head.js

@@ -3,4 +3,4 @@ var gtm_container_ID = window.isQSPage ? '{{qs_gtm_container_ID}}' : '{{gtm_cont
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','{{gtm_container_ID}}');
+})(window,document,'script','dataLayer',gtm_container_ID);