@subiz/widget-v4 4.0.64 → 4.0.68

package/assets/less/chatbox.less

@@ -47,12 +47,17 @@
 @z-index-4: '@z_index_4';
 @z-index-5: '@z_index_5';
 
-
 // stop client css rule on all elements inside #subiz
 #sbz92 * {
 	all: unset !important;
 }
 
+.sbz_no_scroll {
+	overflow: hidden !important;
+	overflow-x: hidden !important;
+	overflow-y: hidden !important;
+}
+
 #sbz92 {
 	#makeImportant() !important;
 }

package/compiled_src/chatbox/ChatButton.js

@@ -146,7 +146,9 @@ class ChatButton extends _common.Com {
 
     let greeting = _index.default.get(accountSetting, 'greeting', {});
 
-    if (!greeting.message || !greeting.enabled) {
+    let text = this.props.t.i18n(_index.default.get(greeting, 'greeting', {})) || greeting.message;
+
+    if (!text || !greeting.enabled) {
       this.setState({
         previewEvent: {}
       });

package/compiled_src/chatbox/Event.js

@@ -200,6 +200,7 @@ class Event extends _common.Com {
         onSelect: e => this.choosePostbackBtn(e)
       }), (0, _preact.h)(_ProductAttachments.default, {
         t: this.props.t,
+        onPostback: e => this.choosePostbackBtn(e),
         store: this.props.store,
         ev: ev
       }), (0, _preact.h)(_OrderAttachments.default, {

package/compiled_src/chatbox/ProductAttachments.js

@@ -29,17 +29,53 @@ class ProductAttachments extends _common.Com {
 
     let $products = _index.default.map(products, (att, index) => {
       let product = att.product;
-      let $detailbtn = null;
+      let $detailbtns = [];
       let url = product.url || product.mobile_url;
       if (this.props.store.isMobile()) url = product.mobile_url || product.url;
-      if (url) $detailbtn = (0, _preact.h)("a", {
+      if (url && _index.default.size(product.buttons) == 0) $detailbtns.push((0, _preact.h)("a", {
         class: "product_attachment__btn",
         href: url,
         target: "_blank"
       }, this.props.t('detail'), (0, _preact.h)("img", {
         src: require('../../assets/img/external-link.svg'),
         class: "product_attachment__btn_external_link"
-      }));
+      })));
+      console.log("P", product);
+
+      if (_index.default.size(product.buttons) > 0) {
+        $detailbtns = $detailbtns.concat(_index.default.map(product.buttons, (button, index) => {
+          if (button.type === 'call_button') {
+            return (0, _preact.h)("a", {
+              class: "product_attachment__btn",
+              href: 'tel:' + button.phone_number,
+              key: index,
+              title: button.title
+            }, button.title);
+          }
+
+          if (button.type === 'url_button') {
+            return (0, _preact.h)("a", {
+              class: "product_attachment__btn",
+              href: button.url,
+              target: "_blank",
+              key: index,
+              title: button.title
+            }, button.title || this.props.t('detail'), ' ', (0, _preact.h)("img", {
+              src: require('../../assets/img/external-link.svg'),
+              class: "product_attachment__btn_external_link"
+            }));
+          }
+
+          if (button.type === 'postback_button') {
+            return (0, _preact.h)("a", {
+              class: "product_attachment__btn",
+              href: "javascript:;",
+              onClick: _ => this.props.onPostback(button)
+            }, button.title);
+          }
+        }));
+      }
+
       let $title = (0, _preact.h)("a", {
         href: url,
         class: "product_attachment__title",
@@ -68,7 +104,7 @@ class ProductAttachments extends _common.Com {
         src: this.props.store.replaceFileUrl(product.image)
       }))), $title, $subtitle, $price, (0, _preact.h)("div", {
         class: "product_attachment__btns"
-      }, $detailbtn));
+      }, $detailbtns));
     });
 
     return $products;

package/compiled_src/chatbox/Typing.js

@@ -41,6 +41,8 @@ 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;
       this.setState({
         ev: ev,
@@ -53,7 +55,7 @@ class Typing extends _common.Com {
         this.setState({
           isShow: false
         });
-      }, 10000);
+      }, 5000);
     });
   }
 

package/compiled_src/chatbox/main.js

@@ -184,11 +184,13 @@ class Main extends _common.Com {
 exports.default = Main;
 
 function restoreViewport() {
+  if (document.body && document.body.classList) document.body.classList.remove('sbz_no_scroll');
   let metatag = document.getElementById('subiz-meta-viewport');
   if (metatag) metatag.remove();
 }
 
 function modifyViewport() {
+  if (document.body && document.body.classList) document.body.classList.add('sbz_no_scroll');
   let metatag = document.createElement('meta');
   metatag.httpEquiv = 'X-UA-Compatible';
   metatag.name = 'viewport';

package/compiled_src/lib.js

@@ -24,7 +24,7 @@ _index.default.preloadWebfonts(['Roboto'], [400, 500]);
 
 class Widget {
   constructor(ApiURL, FileURL, RealtimeURL, inmem, fake, agenttoken) {
-    _defineProperty(this, "version", () => '4.4');
+    _defineProperty(this, "version", () => '4.5');
 
     _defineProperty(this, "setSetting", setting => this.store.setSetting({
       account_setting: setting
@@ -108,7 +108,21 @@ class Widget {
   }
 
   async sendMessage(convoid, message) {
-    this.store.sendConvoEvent(convoid, 'message_sent', {
+    if (!convoid) {
+      const {
+        convo,
+        error
+      } = await this.store.startConvo({
+        message: message.text,
+        initial_by: this.store.matchUser().id
+      });
+      if (error) return {
+        error
+      };
+      convoid = convo.id;
+    }
+
+    return this.store.sendConvoEvent(convoid, 'message_sent', {
       message
     });
   }
@@ -127,11 +141,11 @@ class Widget {
     this.pluginMgr.hideCurrentGreeting();
   }
 
-  async showWidget(view, convo) {
+  async showWidget(view, cid) {
     await this.domGate.entry();
     this.pluginMgr.showCurrentChatbox({
       view,
-      cid: convo
+      cid: cid
     });
   }
 

package/compiled_src/store/store.js

@@ -190,7 +190,10 @@ class Store {
     _defineProperty(this, "setIsOpen", isopen => {
       let lastisopen = this.kv.match('isopen');
       this.kv.put('isopen', isopen);
-      if (!lastisopen && isopen) sendEventToThirdParty('SUBIZ Chat', 'Opened', 'Subiz Windows');
+
+      if (!lastisopen && isopen) {
+        sendEventToThirdParty('SUBIZ Chat', 'Opened', 'Subiz Windows');
+      }
     });
 
     _defineProperty(this, "closePreview", () => this.kv.put('close_preview_at', new _index.default.Date().getTime()));
@@ -904,6 +907,20 @@ class Store {
 
     this.onWs(ret);
     sendEventToThirdParty('SUBIZ Chat', 'Sent', 'User');
+    let lastMsgSent = this.kv.match('last_msg_sent');
+
+    if (!lastMsgSent) {
+      let dataLayer = window.dataLayer || [];
+      dataLayer.push({
+        event: 'SUBIZ Chat',
+        event_action: 'Sent',
+        event_label: 'User',
+        first_interaction: 1
+      });
+    }
+
+    this.kv.put('last_msg_sent', _index.default.Date.now());
+    return ret;
   }
 
   _setConvo(convo) {
@@ -1044,7 +1061,7 @@ class Store {
   async loopTime() {
     let startms = _index.default.Date.now();
 
-    if (!_index.default.get(this.kv.match('user'), 'id')) return setTimeout(() => this.loopTime(), 30000);
+    if (!_index.default.get(this.kv.match('user'), 'id')) return setTimeout(() => this.loopTime(), 120000);
     let {
       body: t,
       error
@@ -1056,7 +1073,7 @@ class Store {
     var localMs = _index.default.Date.now();
 
     this.timeDiff = Math.floor(serverMs - localMs);
-    setTimeout(() => this.loopTime(), 60000);
+    setTimeout(() => this.loopTime(), 120000);
   }
 
   replaceFileUrl(src) {
@@ -1214,6 +1231,12 @@ function sendEventToThirdParty(category, action, label) {
   }));
   sendToGA(category, action, label);
   sendToFBPixel(category, action, label);
+  let dataLayer = window.dataLayer || [];
+  dataLayer.push({
+    event: category,
+    event_action: action,
+    event_label: label
+  });
 }
 
 let mobileCheck = function (a) {

package/compiled_src/util/common.js

@@ -422,7 +422,7 @@ function isURL(url) {
 }
 
 function isNumber(num) {
-  var reg = /^\d+$/;
+  var re = /^\d+$/;
   return re.test(String(num));
 }
 

package/dist/132.js

@@ -161,8 +161,9 @@ class ChatButton extends common/* Com */.up {
     let accountSetting = this.props.plugin.chatbox;
     if (new util/* default.Date */.Z.Date().getTime() - this.props.store.matchClosePreviewAt() < Ms30Mins) return;
     let greeting = util/* default.get */.Z.get(accountSetting, 'greeting', {});
+    let text = this.props.t.i18n(util/* default.get */.Z.get(greeting, 'greeting', {})) || greeting.message;
 
-    if (!greeting.message || !greeting.enabled) {
+    if (!text || !greeting.enabled) {
       this.setState({
         previewEvent: {}
       });
@@ -2031,17 +2032,53 @@ class ProductAttachments extends common/* Com */.up {
     let acc = this.props.store.matchAccount();
     let $products = util/* default.map */.Z.map(products, (att, index) => {
       let product = att.product;
-      let $detailbtn = null;
+      let $detailbtns = [];
       let url = product.url || product.mobile_url;
       if (this.props.store.isMobile()) url = product.mobile_url || product.url;
-      if (url) $detailbtn = (0,preact_module.h)("a", {
+      if (url && util/* default.size */.Z.size(product.buttons) == 0) $detailbtns.push((0,preact_module.h)("a", {
         class: "product_attachment__btn",
         href: url,
         target: "_blank"
       }, this.props.t('detail'), (0,preact_module.h)("img", {
         src: __webpack_require__(8453),
         class: "product_attachment__btn_external_link"
-      }));
+      })));
+      console.log("P", product);
+
+      if (util/* default.size */.Z.size(product.buttons) > 0) {
+        $detailbtns = $detailbtns.concat(util/* default.map */.Z.map(product.buttons, (button, index) => {
+          if (button.type === 'call_button') {
+            return (0,preact_module.h)("a", {
+              class: "product_attachment__btn",
+              href: 'tel:' + button.phone_number,
+              key: index,
+              title: button.title
+            }, button.title);
+          }
+
+          if (button.type === 'url_button') {
+            return (0,preact_module.h)("a", {
+              class: "product_attachment__btn",
+              href: button.url,
+              target: "_blank",
+              key: index,
+              title: button.title
+            }, button.title || this.props.t('detail'), ' ', (0,preact_module.h)("img", {
+              src: __webpack_require__(8453),
+              class: "product_attachment__btn_external_link"
+            }));
+          }
+
+          if (button.type === 'postback_button') {
+            return (0,preact_module.h)("a", {
+              class: "product_attachment__btn",
+              href: "javascript:;",
+              onClick: _ => this.props.onPostback(button)
+            }, button.title);
+          }
+        }));
+      }
+
       let $title = (0,preact_module.h)("a", {
         href: url,
         class: "product_attachment__title",
@@ -2070,7 +2107,7 @@ class ProductAttachments extends common/* Com */.up {
         src: this.props.store.replaceFileUrl(product.image)
       }))), $title, $subtitle, $price, (0,preact_module.h)("div", {
         class: "product_attachment__btns"
-      }, $detailbtn));
+      }, $detailbtns));
     });
     return $products;
   }
@@ -2696,6 +2733,7 @@ class Event extends common/* Com */.up {
         onSelect: e => this.choosePostbackBtn(e)
       }), (0,preact_module.h)(ProductAttachments, {
         t: this.props.t,
+        onPostback: e => this.choosePostbackBtn(e),
         store: this.props.store,
         ev: ev
       }), (0,preact_module.h)(OrderAttachments_ProductAttachments, {
@@ -3149,6 +3187,8 @@ class Typing extends common/* Com */.up {
         return;
       }
 
+      let ag = this.props.store.matchAgent(ev.by.id);
+      if (ag.type == 'agent') return;
       if (util/* default.get */.Z.get(ev, 'type') !== 'conversation_typing') return;
       this.setState({
         ev: ev,
@@ -3161,7 +3201,7 @@ class Typing extends common/* Com */.up {
         this.setState({
           isShow: false
         });
-      }, 10000);
+      }, 5000);
     });
   }
 
@@ -6563,11 +6603,13 @@ class Main extends common/* Com */.up {
 }
 
 function restoreViewport() {
+  if (document.body && document.body.classList) document.body.classList.remove('sbz_no_scroll');
   let metatag = document.getElementById('subiz-meta-viewport');
   if (metatag) metatag.remove();
 }
 
 function modifyViewport() {
+  if (document.body && document.body.classList) document.body.classList.add('sbz_no_scroll');
   let metatag = document.createElement('meta');
   metatag.httpEquiv = 'X-UA-Compatible';
   metatag.name = 'viewport';