@subiz/widget-v4 4.1.196 → 4.1.198

package/compiled_src/chatbox/Header.js

@@ -32,13 +32,15 @@ class Header extends _common.Com {
   }
   renderAccountAvatar() {
     let acc = this.props.store.matchAccount() || {};
-    if (!acc.logo_url) return null;
+    let accSetting = this.props.plugin.chatbox || {};
+    let logo_url = _index.default.get(accSetting, 'header.logo_url') || _index.default.get(acc, 'logo_url');
+    if (!logo_url) return null;
     return (0, _preact.h)("img", {
       width: 38,
       height: 38,
       alt: acc.name,
       class: "avatar avatar__account",
-      src: this.props.store.replaceFileUrl(acc.logo_url) || require('../../assets/img/image_default.png')
+      src: this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/image_default.png')
     });
   }
   render() {
@@ -133,7 +135,7 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
     }, (0, _preact.h)("img", {
       alt: "logo",
       class: "social__account_logo",
-      src: this.props.store.replaceFileUrl(_index.default.get(acc, 'logo_url'))
+      src: this.props.store.replaceFileUrl(_index.default.get(accSetting, 'header.logo_url') || _index.default.get(acc, 'logo_url'))
     }), (0, _preact.h)("div", null, (0, _preact.h)("div", {
       class: "social__introduction"
     }, tags), (0, _preact.h)("div", {

package/compiled_src/lib.js

@@ -198,35 +198,64 @@ class Widget {
     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 (!formid || !values) return;
+    if (_index.default.startsWith(formid, 'cp')) {
+      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);
+    }
+    values = _index.default.filter(values, field => {
+      return field.key && field.value;
     });
-    if (is_lead) _index.default.setUserAttr(user, {
-      key: 'lead_source',
-      text: 'plugin.' + formid
+    let text = 'Khách điền form\n';
+    _index.default.map(values, field => {
+      text += '+ ' + field.key + ': ' + field.value + '\n';
+    });
+    return this.store.startConvo({
+      subject: 'Khách điền form',
+      touchpoint: {
+        channel: 'form',
+        source: window.location.hostname,
+        id: Date.now() + '_' + _index.default.randomString()
+      },
+      form_submission: {
+        id: formid,
+        values: values
+      },
+      message_sent: {
+        data: {
+          message: {
+            format: 'plaintext',
+            text: text
+          }
+        }
+      }
     });
-    let impressiontoken = await this.viewForm(formid);
-    this.store.setUserDiff(user);
-    return this.store.sendConversion(formid, values, impressiontoken);
   }
   startConvo(req) {
     req = _index.default.cloneDeep(req) || {};

package/compiled_src/store/api.js

@@ -49,16 +49,12 @@ class _default {
     _defineProperty(this, "listConversations", _ => this.apireq.addQuery('user_id', this.uid).addQuery('integration_id', `${this.accid}.subizv4.subikon`).get(`/accounts/${this.accid}/conversations`));
     _defineProperty(this, "listMessages", (cid, limit, start_id) => this.apireq.addQuery('limit', limit).addQuery('start_id', start_id).get(`/accounts/${this.accid}/conversations/${cid}/messages`));
     _defineProperty(this, "ajax", ajax);
-    _defineProperty(this, "start", extraData => {
-      let data = {
-        touchpoint: {
-          channel: 'subiz',
-          source: 'web'
-        }
-      };
-      _index.default.each(extraData, (v, k) => {
-        data[k] = v;
-      });
+    _defineProperty(this, "start", (extraData, tpchannel, tpsource, tpid) => {
+      let data = Object.assign({}, extraData);
+      if (!data.touchpoint) data.touchpoint = {};
+      if (!data.touchpoint.channel) data.touchpoint.channel = 'subiz';
+      if (!data.touchpoint.source) data.touchpoint.source = 'web';
+      data.source = _index.default.get(document, 'location.href');
       return this.apireq.post(`/accounts/${this.accid}/conversations`, data);
     });
     _defineProperty(this, "sendConvoEvent", (cid, ev) => this.apireq.addQuery('x-referer', _index.default.get(location, 'origin', '')).post(`/accounts/${this.accid}/conversations/${cid}/events`, ev));