@subiz/widget-v4 4.1.36 → 4.1.39

package/assets/less/widget.less

@@ -9,6 +9,7 @@
 
 	padding-left: @spacer3;
 	padding-right: @spacer3;
+	padding-bottom: @spacer3;
 }
 
 .convo-list--list {
@@ -243,7 +244,6 @@
 	align-items: center;
 	margin-left: auto;
 	margin-right: auto;
-	margin-bottom: @spacer3;
 	&::after {
 		display: none;
 	}

package/compiled_src/chatbox/Widget.js

@@ -965,6 +965,12 @@ class Widget extends _common.Com {
     _index.default.each(form.fields, f => {
       var newf = Object.assign({}, f);
       newf.value = _index.default.getUserAttr(user, f.key, f.type);
+      if (newf.key == 'emails' && !newf.value) {
+        newf.value = _index.default.getUserAttr(user, 'related_email', 'text');
+      }
+      if (newf.key == 'phones' && !newf.value) {
+        newf.value = _index.default.getUserAttr(user, 'related_phone', 'text');
+      }
       if (f.type === 'boolean' && !newf.value) newf.value = false;
       if (f.type === 'datetime' && newf.value) {
         newf.value = new _index.default.Date(data.value).toLocaleDateString('en-CA');

package/compiled_src/lib.js

@@ -26,6 +26,7 @@ class Widget {
     _defineProperty(this, "setViewingProduct", p => this.store.linkProduct(p));
     _defineProperty(this, "getViewingProduct", () => this.store.getLinkedProduct());
     _defineProperty(this, "track", () => this.store.track());
+    this.impressionTokens = {};
     this.domGate = new _index.default.Gate();
     this.store = new _store.default(ApiURL, FileURL, RealtimeURL, inmem, fake);
     window.sbz_store = this.store;
@@ -125,6 +126,48 @@ class Widget {
       message
     });
   }
+  async viewForm(formid) {
+    if (!formid || !_index.default.startsWith(formid, 'cp')) return;
+    let impressiontoken = this.impressionTokens[formid];
+    if (impressiontoken) return impressiontoken;
+    let {
+      body: impression
+    } = await this.store.sendImpression(formid);
+    impressiontoken = _index.default.get(impression, 'impression_token') || '';
+    this.impressionTokens[formid] = impressiontoken;
+    return impressiontoken;
+  }
+  async submitForm(formid, values) {
+    if (!formid || !_index.default.startsWith(formid, 'cp')) return;
+    let storeuser = _index.default.cloneDeep(this.store.matchUser());
+    let user = {
+      id: storeuser.id,
+      account_id: storeuser.account_id
+    };
+    let is_lead = false;
+    values = _index.default.map(values, val => {
+      let key = val.key;
+      if (key === 'email') key = 'emails';
+      if (key === 'phone') key = 'phones';
+      is_lead = is_lead || key == 'emails' || key == 'phones';
+      _index.default.setUserAttr(user, {
+        key: key,
+        [val.type || 'text']: val.value
+      });
+      return {
+        key: key,
+        type: val.type || 'text',
+        value: _index.default.stringify(val.value)
+      };
+    });
+    if (is_lead) _index.default.setUserAttr(user, {
+      key: 'lead_source',
+      text: 'plugin.' + formid
+    });
+    let impressiontoken = await this.viewForm(formid);
+    this.store.setUserDiff(user);
+    return this.store.sendConversion(formid, values, impressiontoken);
+  }
   startConvo(req) {
     return this.store.startConvo(req);
   }

package/compiled_src/popup/popup.js

@@ -113,8 +113,22 @@ class Popup extends _common.Com {
       if (fieldkey === 'email') fieldkey = 'emails';
       if (fieldkey === 'phone') fieldkey = 'phones';
       if (fieldkey !== 'emails' || fieldkey != 'phones' || fieldkey !== 'fullname') return;
+      if (fieldkey == 'emails') {
+        let text = _index.default.getUserAttr(user, 'related_email', 'text');
+        if (!text) return;
+        var input = this._formRef.current.elements[field.key];
+        if (!input) return;
+        input.value = text;
+      }
+      if (fieldkey == 'phones') {
+        let text = _index.default.getUserAttr(user, 'related_phone', 'text');
+        if (!text) return;
+        var input = this._formRef.current.elements[field.key];
+        if (!input) return;
+        input.value = text;
+      }
       _index.default.map(userAttributes, attr => {
-        if (fieldkey !== attr.key) return;
+        if (fieldkey !== attr.key || !attr.text) return;
         var input = this._formRef.current.elements[field.key];
         if (!input) return;
         input.value = attr.text;
@@ -259,8 +273,8 @@ class Popup extends _common.Com {
         key: 'lead_source',
         text: 'plugin.' + this.props.plugin.id
       });
-      this.props.store.sendConversion(this.props.plugin.id, summitFields, this.impressionToken);
       this.props.store.setUser(user);
+      this.props.store.sendConversion(this.props.plugin.id, summitFields, this.impressionToken);
     }
     for (let a of actions) {
       if (a.action === 'open_widget') this.props.showWidget('list');

package/compiled_src/store/store.js

@@ -467,6 +467,14 @@ class Store {
     this._setUser(user);
     return this.api.updateUser(user);
   }
+  async setUserDiff(user) {
+    if (!user) return;
+    await this.readyGate.entry();
+    let out = await this.api.updateUser(user);
+    if (out && out.code == 200 && out.body.id) {
+      this._setUser(out.body);
+    }
+  }
   _setUser(user) {
     user = _index.default.cloneDeep(user);
     let olduser = this.cache.match('user') || {};

package/compiled_src/util/common.js

@@ -724,9 +724,9 @@ function checkRunConditions(freq, conds, lastrun, store) {
         break;
       case 'user_is_a_contact':
         let attributes = op.get(store.matchUser(), 'attributes', []);
-        let email = find(attributes, att => att.key === 'emails');
-        let phone = find(attributes, att => att.key === 'phones');
-        let hasContact = email || phone;
+        let emailAttr = find(attributes, att => att.key === 'emails' && attr.text && att.key === 'related_email' && attr.text);
+        let phoneAttr = find(attributes, att => att.key === 'phones' && attr.text && att.key === 'related_phone' && attr.text);
+        let hasContact = emailAttr || phoneAttr;
         if (cond.user_is_a_contact) {
           if (!hasContact) return false;
         }