@subiz/widget-v4 4.1.37 → 4.1.40

package/compiled_src/chatbox/Typing.js

@@ -31,9 +31,9 @@ class Typing extends _common.Com {
         });
         return;
       }
-      let ag = this.props.store.matchAgent(ev.by.id) || {};
-      if (ag.type == 'agent') return;
       if (_index.default.get(ev, 'type') !== 'conversation_typing') return;
+      let ag = this.props.store.matchAgent(_index.default.get(ev, 'by.id')) || {};
+      if (ag.type == 'agent') return;
       this.setState({
         ev: ev,
         isShow: true

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

@@ -133,21 +133,40 @@ class Widget {
     let {
       body: impression
     } = await this.store.sendImpression(formid);
-    impressionToken = _index.default.get(impression, 'impression_token') || '';
-    this.impressionTokens[formid] = impressionToken;
-    return impressionToken;
+    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: val.key,
+        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);
-    return this.store.sendConversion(formid, values, impressionToken);
+    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;
@@ -226,7 +240,9 @@ class Popup extends _common.Com {
       let user = _index.default.cloneDeep(this.props.store.matchUser());
       let is_lead = false;
       let modifiedPairs = {};
+      console.log('333333333333');
       for (var pair of formData.entries()) {
+        console.log('44444444444444444');
         if (modifiedPairs[pair[0]]) {
           let currentValue = _index.default.get(modifiedPairs, `${pair[0]}.1`, '');
           currentValue += `,${pair[1]}`;
@@ -235,7 +251,9 @@ class Popup extends _common.Com {
           modifiedPairs[pair[0]] = [pair[0], pair[1]];
         }
       }
+      console.log('1111111111111', Object.entries(modifiedPairs));
       for (const [_, pair] of Object.entries(modifiedPairs)) {
+        console.log('2222222222222', pair);
         let page = _index.default.get(this.props.plugin.popup, `pages.${this.getPageIndex()}`);
         let form = _index.default.find(page.components, com => com.type === 'form');
         let fields = _index.default.get(form, 'form.fields', []);
@@ -259,8 +277,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/campaign.js

@@ -37,7 +37,9 @@ function trackAreaClicked(selector, cb) {
     on('click', selector, cb);
   });
 }
-function trackInactivity(seconds = 0, cb) {
+function trackInactivity() {
+  let seconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  let cb = arguments.length > 1 ? arguments[1] : undefined;
   let events = ['scroll', 'keyup', 'keydown', 'mousemove', 'mousewheel', 'mouseenter', 'mouseover', 'mousedown', 'touchstart', 'touchmove', 'touchenter'];
   let inactiveSeconds = 0;
   let resetTime = () => {
@@ -60,7 +62,9 @@ let timeOnPage = 0;
 common.setInterval(() => {
   timeOnPage += 5;
 }, 5000);
-function trackTimeOnPage(seconds = 0, cb) {
+function trackTimeOnPage() {
+  let seconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  let cb = arguments.length > 1 ? arguments[1] : undefined;
   if (seconds < 1) {
     return common.setTimeout(function () {
       cb(seconds);

package/compiled_src/util/common.js

@@ -159,7 +159,10 @@ function getMsgField(ev, fieldName) {
 function isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item);
 }
-function merge(target, ...sources) {
+function merge(target) {
+  for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    sources[_key - 1] = arguments[_key];
+  }
   if (!sources.length) return target;
   const source = sources.shift();
   if (isObject(target) && isObject(source)) {
@@ -724,9 +727,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;
         }
@@ -960,7 +963,8 @@ function getUrlParameter() {
 }
 var sleep = ms => new Promise(res => setTimeout(res, ms));
 exports.sleep = sleep;
-function formatCurrency(val, currency = 'VND') {
+function formatCurrency(val) {
+  let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'VND';
   let currencyObj = ALL_CURRENCIES.find(cur => cur.code === currency) || {
     name: 'Dong',
     code: 'VND',

package/compiled_src/util/order.js

@@ -14,7 +14,8 @@ op.map = common.map;
 op.each = common.each;
 op.size = common.size;
 op.find = common.find;
-function getProductPropName(product, seperator = ' - ') {
+function getProductPropName(product) {
+  let seperator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ' - ';
   let options = op.get(product, 'options', []);
   let props = op.get(product, 'props', []);
   let multiPropsOptions = op.filter(options, option => op.size(option.values) > 1);
@@ -25,7 +26,8 @@ function getProductPropName(product, seperator = ' - ') {
   });
   return names.join(seperator);
 }
-function getOrderDisplayName(order = {}) {
+function getOrderDisplayName() {
+  let order = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return order.number || order.id || '';
 }
 function displayOrderShippingAddress(order, isShorten) {

package/compiled_src/util/pubsub.js

@@ -14,9 +14,12 @@ class Pubsub {
   }
   publish(topic, payload, payload2, payload3) {
     this.listeners[topic] = filter(this.listeners[topic], sub => sub.obj._isMounted);
-    map(this.listeners[topic], ({
-      cb
-    }) => cb(payload, payload2, payload3));
+    map(this.listeners[topic], _ref => {
+      let {
+        cb
+      } = _ref;
+      return cb(payload, payload2, payload3);
+    });
   }
   on2(obj, topic, cb) {
     if (!this.listeners[topic]) this.listeners[topic] = [];