Merge pull request #86 from aplijobs/fix/referral

Fix ref references with referral full name
aplijobs · May 18, 2023 · 3b44e23 · 3b44e23
2 parents 58c86c9 + fbfe5f6
commit 3b44e23
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js
@@ -25,7 +25,7 @@ const runSDK = ({ baseUrl, websiteToken, referral }) => {
   }
 
   window.$chatwoot = {
-    ref: referral,
+    referral: referral,
     baseUrl,
     hasLoaded: false,
     hideMessageBubble: chatwootSettings.hideMessageBubble || false,
@@ -168,7 +168,7 @@ const runSDK = ({ baseUrl, websiteToken, referral }) => {
       iframe.src = IFrameHelper.getUrl({
         baseUrl: window.$chatwoot.baseUrl,
         websiteToken: window.$chatwoot.websiteToken,
-        ref: window.$chatwoot.ref
+        referral: window.$chatwoot.referral
       });
 
       window.$chatwoot.resetTriggered = true;

diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
@@ -55,18 +55,22 @@ const updateCampaignReadStatus = () => {
 };
 
 export const IFrameHelper = {
-  getUrl({ baseUrl, websiteToken, ref }) {
-    return `${baseUrl}/widget?website_token=${websiteToken}&ref=${ref}`;
+  getUrl({ baseUrl, websiteToken, referral }) {
+    let ref = '';
+    if (referral) {
+      ref = `&referral=${referral}`
+    }
+    return `${baseUrl}/widget?website_token=${websiteToken}${ref}`;
   },
-  createFrame: ({ baseUrl, websiteToken, ref }) => {
+  createFrame: ({ baseUrl, websiteToken, referral }) => {
     if (IFrameHelper.getAppFrame()) {
       return;
     }
 
     loadCSS();
     const iframe = document.createElement('iframe');
     const cwCookie = Cookies.get(`cw_conversation_${websiteToken}`);
-    let widgetUrl = IFrameHelper.getUrl({ baseUrl, websiteToken, ref });
+    let widgetUrl = IFrameHelper.getUrl({ baseUrl, websiteToken, referral });
     if (cwCookie) {
       widgetUrl = `${widgetUrl}&cw_conversation=${cwCookie}`;
     }

diff --git a/app/javascript/widget/store/modules/conversation/actions.js b/app/javascript/widget/store/modules/conversation/actions.js
@@ -22,6 +22,10 @@ export const actions = {
       const [message = {}] = messages;
       commit('pushMessageToConversation', message);
       dispatch('conversationAttributes/getAttributes', {}, { root: true });
+      const ref = new URLSearchParams(window.location.search).get('referral');
+      if (ref) {
+        await setCustomAttributes({"ref": ref});
+      }
     } catch (error) {
       captureSentryException(error);
     } finally {
@@ -100,8 +104,8 @@ export const actions = {
       commit('conversation/setMetaUserLastSeenAt', lastSeen, { root: true });
       commit('setMessagesInConversation', formattedMessages);
       commit('setConversationListLoading', false);
-      const ref = new URLSearchParams(window.location.search).get('ref');
-      if(ref) {
+      const ref = new URLSearchParams(window.location.search).get('referral');
+      if (ref) {
         await setCustomAttributes({"ref": ref});
       }
     } catch (error) {

diff --git a/app/javascript/widget/views/Home.vue b/app/javascript/widget/views/Home.vue
@@ -44,7 +44,10 @@ export default {
   },
   methods: {
     startConversation() {
-      this.$store.dispatch('conversation/createConversation', {});
+      const ref = new URLSearchParams(window.location.search).get('referral');
+      if (ref) {
+        this.$store.dispatch('conversation/createConversation', {});
+      }
       if (this.preChatFormEnabled && !this.conversationSize) {
         return this.replaceRoute('prechat-form');
       }