@subiz/widget-v4 4.1.197 → 4.1.199

package/assets/img/default_logo.svg

@@ -0,0 +1,5 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="200" height="200" fill="#002662"/>
+<path d="M93 35C93 30.5817 96.5817 27 101 27H131C160.271 27 184 50.7289 184 80V200H93V35Z" fill="white" fill-opacity="0.1"/>
+<path d="M22 147C22 119.386 44.3858 97 72 97H115C124.941 97 133 105.059 133 115V200H22V147Z" fill="white" fill-opacity="0.2"/>
+</svg>

package/assets/less/avatar.less

@@ -24,8 +24,8 @@
 .avatar.avatar__account {
 	width: 38px;
 	height: 38px;
-	border-radius: 8px;
-	margin-right: @spacer2;
+	border-radius: 38px;
+	margin-right: @spacer1;
 }
 
 .group-avatar--primary .group-avatar--agent-middle {

package/assets/less/message.less

@@ -1066,3 +1066,8 @@ a.product_attachment__title {
 .file-attachment.just-focused {
 	box-shadow: 0 0 0 2px #000;
 }
+
+.widget_body_empty_img {
+	max-width: 150px;
+	max-height: 150px;
+}

package/assets/less/widget.less

@@ -103,7 +103,7 @@
 }
 
 .convo-list--convo-time span {
-	font-size: 13px;
+	font-size: 14px;
 	line-height: 20px;
 	.color(@black);
 	opacity: 0.6;

package/assets/less/widget_header.less

@@ -50,6 +50,7 @@
 		.color(@text-color);
 		margin-top: 2.5px;
 		position: relative;
+		line-height: 1.5;
 	}
 }
 
@@ -93,6 +94,7 @@
 		-webkit-box-orient: vertical;
 		-webkit-line-clamp: 2;
 		overflow: hidden;
+		line-height: 1.5;
 	}
 }
 

package/compiled_src/bot.js

@@ -17,28 +17,13 @@ function _default(store) {
       run = () => true;
       let match = _index.default.checkRunConditions(bot.initiative_frequency, bot.conditions, store.matchLastBotRun(bot.id), store);
       if (!match) return;
-      if (bot.id.startsWith('at')) {
-        if (!bot.welcome_message) return;
+      let welcomMessages = bot.welcome_messages;
+      if (_index.default.size(welcomMessages)) {
         let {
           error
-        } = await store.startLightConvo(bot.id, bot.welcome_message, common.getLocale(bot, _index.default.detectLang()), false);
-        if (error) return console.error(error);
+        } = await store.startLightConvo(bot.id, bot.welcome_messages, common.getLocale(bot, _index.default.detectLang()), false);
         store.logBotRun(bot.id);
-        return;
       }
-      let {
-        error
-      } = await store.startConvo({
-        initial_by: bot.id,
-        locale: common.getLocale(bot, _index.default.detectLang()),
-        state: 'active',
-        members: [{
-          type: 'bot',
-          id: bot.id
-        }]
-      });
-      if (error) return console.error(error);
-      store.logBotRun(bot.id);
     };
     let triggers = _index.default.get(bot, 'triggers') || [];
     for (let tr of triggers) {

package/compiled_src/chatbox/Events.js

@@ -213,6 +213,7 @@ class Events extends _common.Com {
       class: "widget-body--events-container widget-body--events-container__error"
     }, (0, _preact.h)("img", {
       alt: "empty",
+      class: "widget_body_empty_img",
       src: convoemptyimg
     }), (0, _preact.h)("div", {
       class: "widget_body__events__error_msg"

package/compiled_src/chatbox/Header.js

@@ -26,7 +26,7 @@ class Header extends _common.Com {
         width: 38,
         height: 38,
         class: "avatar avatar__account",
-        src: this.props.store.replaceFileUrl(logoUrl) || require('../../assets/img/image_default.png')
+        src: this.props.store.replaceFileUrl(logoUrl) || require('../../assets/img/default_logo.svg')
       });
     });
   }
@@ -40,7 +40,7 @@ class Header extends _common.Com {
       height: 38,
       alt: acc.name,
       class: "avatar avatar__account",
-      src: this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/image_default.png')
+      src: this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/default_logo.svg')
     });
   }
   render() {

package/compiled_src/chatbox/QuickReplies.js

@@ -40,7 +40,8 @@ class QuickReplies extends _common.Com {
     }
     let $replies = _index.default.map(quickreplies, r => (0, _preact.h)("div", {
       class: "message_quick_reply",
-      onClick: e => this.props.onSelect(r)
+      onClick: e => this.props.onSelect(r),
+      title: r.title
     }, r.title));
     return (0, _preact.h)("div", {
       class: "message_quick_replies"

package/compiled_src/chatbox/Widget.js

@@ -117,7 +117,7 @@ class Widget extends _common.Com {
             id: botid,
             bot_version: oldconvo.bot_version
           }],
-          initial_by: this.props.store.matchUser().id,
+          initial_by: botid,
           is_testing: oldconvo.is_testing,
           greeting_message: greeting_msg
         });
@@ -815,6 +815,7 @@ class Widget extends _common.Com {
       }, (0, _preact.h)("div", {
         class: "empty-container"
       }, (0, _preact.h)("img", {
+        class: "widget_body_empty_img",
         alt: "empty",
         src: empty
       }), (0, _preact.h)("div", {

package/compiled_src/lib.js

@@ -198,40 +198,69 @@ 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) || {};
     if (req.welcome_message) {
-      return this.store.startLightConvo(req.bot_id, req.welcome_message, req.locale, req.is_testing, req.bot_version);
+      return this.store.startLightConvo(req.bot_id, [req.welcome_message], req.locale, req.is_testing, req.bot_version);
     }
     let members = req.members || [];
     if (req.bot_id) {

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));

package/compiled_src/store/store.js

@@ -744,7 +744,7 @@ class Store {
     setting = _index.default.cloneDeep(setting) || {};
     setting.account = Object.assign({}, setting.account, this.forceAcc);
     if (!setting.account.logo_url) {
-      setting.account.logo_url = 'https://vcdn.subiz-cdn.com/file/fiqpezhkmeyesdscyetk-default_logo.jpg';
+      setting.account.logo_url = 'https://vcdn.subiz-cdn.com/widget-v4/public/assets/img/default_logo.dd13a2b.svg';
     }
     if (setting.user) {
       setting.user.account_id = setting.account.id;
@@ -952,7 +952,7 @@ class Store {
     delete this.lightConvos[id];
     this.kv.put('light_convos', this.lightConvos);
   }
-  startLightConvo(botid, message, locale, is_testing, botversion) {
+  startLightConvo(botid, messages, locale, is_testing, botversion) {
     let convoid = 'cslight' + botid + '_' + this.now();
     let user = this.cache.match('user') || {};
     let old = this.lightConvos[convoid];
@@ -960,26 +960,31 @@ class Store {
       convo: old
     };
     let now = this.now();
-    let ev = {};
-    ev.created = now;
-    ev.event_time = now;
-    ev.id = 'evfake' + now;
-    ev.type = 'message_sent';
-    ev.by = {
-      id: botid,
-      type: 'bot'
-    };
-    ev.data = {
-      message: message
-    };
-    ev.data.message.conversation_id = convoid;
+    let lastev = {};
+    let newevs = _index.default.map(messages, (message, idx) => {
+      let ev = {};
+      ev.created = now;
+      ev.event_time = now;
+      ev.id = 'evfake' + now + idx;
+      ev.type = 'message_sent';
+      ev.by = {
+        id: botid,
+        type: 'bot'
+      };
+      ev.data = {
+        message: message
+      };
+      ev.data.message.conversation_id = convoid;
+      lastev = ev;
+      return ev;
+    });
     let newconvo = {
       id: convoid,
       locale: locale,
       initial_by: botid,
       created: now,
       actived: now,
-      last_message_sent: ev,
+      last_message_sent: lastev,
       members: [{
         type: 'user',
         id: user.id
@@ -995,13 +1000,13 @@ class Store {
         source: 'web'
       },
       traffic_source: 'direct',
-      events: [ev],
+      events: newevs,
       is_testing: is_testing,
       bot_versio: botversion
     };
     this.lightConvos[convoid] = newconvo;
     this.kv.put('light_convos', this.lightConvos);
-    this.pubsub.publish('events', ev);
+    this.pubsub.publish('events', lastev);
     return {
       convo: newconvo
     };