From addb9b6c903d5154c4a3d78299dcbaccb8630982 Mon Sep 17 00:00:00 2001
From: Grant Jordan <grant@granthjordan.com>
Date: Tue, 21 Jun 2022 10:24:16 -0500
Subject: [PATCH] Updated makeCalendly URL

---
 funnelScripts.js | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/funnelScripts.js b/funnelScripts.js
index b361eaf..b11c377 100644
--- a/funnelScripts.js
+++ b/funnelScripts.js
@@ -109,32 +109,23 @@ const makeCalendlyUrl = (base_url) => {
   try {
     $(function () {
       if ($("#iframe-inject-cal").length) {
+
+        let name = getTrackingId('name');
+        if (name === "null") {
+          name = getTrackingId('fullname');
+        }
+        let email = getTrackingId('email');
+        if (email === 'null') {
+          email = '';
+        }
+
         let linkInject = {
-          utm_source:
-            Cookies.get("utm_source") ||
-            getParameterByName("utm_source") ||
-            "null",
-          utm_medium:
-            Cookies.get("utm_medium") ||
-            getParameterByName("utm_medium") ||
-            "null",
-          utm_campaign:
-            Cookies.get("utm_campaign") ||
-            getParameterByName("utm_medium") ||
-            "null",
-          utm_content:
-            Cookies.get("utm_content") ||
-            getParameterByName("utm_content") ||
-            "null",
-          name:
-            Cookies.get("name") ||
-            getParameterByName("name") ||
-            getParameterByName("fullname") ||
-            "",
-          email:
-            Cookies.get("email") ||
-            getParameterByName("email") ||
-            "",
+          utm_source: getTrackingId('utm_source'),
+          utm_medium: getTrackingId('utm_medium'),
+          utm_campaign: getTrackingId('utm_campaign'),
+          utm_content: getTrackingId('utm_content'),
+          name: name,
+          email: email
         };
 
         for (const key in linkInject) {