@subiz/widget-v4 4.0.82 → 4.0.86

package/compiled_src/chatbox/ChatButton.js

@@ -247,21 +247,17 @@ class ChatButton extends _common.Com {
   }
 
   onProfileReady() {
-    if (this.state.buttonLoaded) this.setState({
+    if (this._buttonLoaded) this.setState({
       opacity: 1
     });
-    this.setState({
-      profileLoaded: true
-    });
+    this._profileLoaded = true;
   }
 
   onButtonReady() {
-    if (this.state.profileLoaded) this.setState({
+    if (this._profileLoaded) this.setState({
       opacity: 1
     });
-    this.setState({
-      buttonLoaded: true
-    });
+    this._buttonLoaded = true;
   }
 
   renderButton() {

package/compiled_src/chatbox/TextMessage.js

@@ -105,11 +105,10 @@ class TextMessage extends _common.Com {
     deltas = _index.default.parseJSON(deltas) || {};
     deltas = deltas.ops || [];
 
-    let isMarkdown = _index.default.find(deltas, delta => _index.default.get(delta, 'attributes.bold') || _index.default.get(delta, 'attributes.italic') || _index.default.get(delta, 'attributes.underline'));
+    let isMarkdown = _index.default.find(deltas, delta => _index.default.get(delta, 'attributes.bold') || _index.default.get(delta, 'attributes.italic') || _index.default.get(delta, 'attributes.underline') || _index.default.get(delta, 'insert.emoji'));
 
     if (isMarkdown) {
       var text = deltaToMarkdown(deltas);
-      console.log('text', text);
       return this.renderMarkdown(text);
     }
 

package/compiled_src/chatbox/Typing.js

@@ -41,7 +41,7 @@ class Typing extends _common.Com {
         return;
       }
 
-      let ag = this.props.store.matchAgent(ev.by.id);
+      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({

package/compiled_src/chatbox/Widget.js

@@ -189,11 +189,14 @@ class Widget extends _common.Com {
 
     let user = _index.default.cloneDeep(this.props.store.matchUser());
 
+    let is_lead = false;
+
     _index.default.map(data, (field, key) => {
       if (!key.startsWith('attr:')) return;
       var attr = {
         key: key.substr(5)
       };
+      is_lead = is_lead || key == 'emails' || key == 'phones';
       if (field.type === 'number') attr.number = parseInt(field.value);
       if (field.type === 'datetime') attr.datetime = new _index.default.Date(field.value).toISOString();
       if (field.type === 'list') attr.list = field.value;
@@ -202,6 +205,11 @@ class Widget extends _common.Com {
       _index.default.setUserAttr(user, attr);
     });
 
+    if (is_lead) _index.default.setUserAttr(user, {
+      key: 'lead_source',
+      text: 'widget'
+    });
+
     let firstmsg = _index.default.get(data, 'question.value');
 
     let groupid = _index.default.get(data, 'group.value', '');
@@ -241,11 +249,11 @@ class Widget extends _common.Com {
     this.setState({
       creatingError: null
     });
+    await this.props.store.setUser(user);
     const {
       error,
       convo
     } = await this.props.store.startConvo(req);
-    this.props.store.setUser(user);
 
     if (error) {
       this.setState({

package/compiled_src/popup/popup.js

@@ -280,6 +280,8 @@ class Popup extends _common.Com {
 
       let user = _index.default.cloneDeep(this.props.store.matchUser());
 
+      let is_lead = false;
+
       for (var pair of formData.entries()) {
         let page = _index.default.get(this.props.plugin.popup, `pages.${this.getPageIndex()}`);
 
@@ -298,6 +300,7 @@ class Popup extends _common.Com {
         let key = pair[0];
         if (key === 'email') key = 'emails';
         if (key === 'phone') key = 'phones';
+        is_lead = is_lead || key == 'emails' || key == 'phones';
 
         _index.default.setUserAttr(user, {
           key: key,
@@ -305,6 +308,10 @@ class Popup extends _common.Com {
         });
       }
 
+      if (is_lead) _index.default.setUserAttr(user, {
+        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);
     }

package/compiled_src/store/store.js

@@ -1232,7 +1232,10 @@ function sendToFBPixel(category, action, label) {
 }
 
 function sendToGA(category, action, label) {
-  console.log('SENT.', category, action, label);
+  if (window.gtag) window.gtag('event', category, {
+    Action: action,
+    Label: label
+  });
 
   if (window.ga && window.ga.getAll) {
     const allTrackers = window.ga.getAll() || [];
@@ -1240,11 +1243,6 @@ function sendToGA(category, action, label) {
       const name = tracker.get('name');
       window.ga(name + '.send', 'event', category, action, label);
     });
-  } else {
-    if (window.gtag) window.gtag('event', category, {
-      Action: action,
-      Label: label
-    });
   }
 }
 

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: {}
       });
@@ -257,21 +258,17 @@ class ChatButton extends common/* Com */.up {
   }
 
   onProfileReady() {
-    if (this.state.buttonLoaded) this.setState({
+    if (this._buttonLoaded) this.setState({
       opacity: 1
     });
-    this.setState({
-      profileLoaded: true
-    });
+    this._profileLoaded = true;
   }
 
   onButtonReady() {
-    if (this.state.profileLoaded) this.setState({
+    if (this._profileLoaded) this.setState({
       opacity: 1
     });
-    this.setState({
-      buttonLoaded: true
-    });
+    this._buttonLoaded = true;
   }
 
   renderButton() {
@@ -1295,7 +1292,7 @@ class Buttons extends common/* Com */.up {
           href: 'tel:' + button.phone_number,
           key: index,
           title: button.title
-        }, button.title);
+        }, this.props.t.i18n(button.i18n_title) || button.title);
       }
 
       if (button.type === 'url_button') {
@@ -1305,7 +1302,7 @@ class Buttons extends common/* Com */.up {
           target: "_blank",
           key: index,
           title: button.title
-        }, button.title || button.url);
+        }, this.props.t.i18n(button.i18n_title) || button.title || button.url);
       }
 
       if (button.type === 'postback_button') {
@@ -1313,7 +1310,7 @@ class Buttons extends common/* Com */.up {
           class: "url-button-attachment",
           href: "javascript:;",
           onClick: _ => this.props.onSelect(button)
-        }, button.title);
+        }, this.props.t.i18n(button.i18n_title) || button.title);
       }
 
       if (button.type === 'widget_ask_desktop_notify_button') return null;
@@ -1347,7 +1344,8 @@ class ButtonAttachments extends common/* Com */.up {
     });
     return (0,preact_module.h)(Buttons, {
       store: this.props.store,
-      buttons: buttons
+      buttons: buttons,
+      t: this.props.t
     });
   }
 
@@ -1956,7 +1954,10 @@ class GenericTemplateAttachments extends common/* Com */.up {
     this.setState({
       focusing: eleindex
     });
-    this.galleryRef.current.scrollLeft = 190 * eleindex - 20;
+    this.galleryRef.current.scrollTo({
+      left: 220 * eleindex,
+      behavior: 'smooth'
+    });
   }
 
   render() {
@@ -1967,21 +1968,26 @@ class GenericTemplateAttachments extends common/* Com */.up {
     if (generics.length === 0) return null;
     var $generics = util/* default.map */.Z.map(generics, (gen, index) => {
       var $eles = util/* default.map */.Z.map(gen.elements, ele => {
-        let $title = ele.title ? (0,preact_module.h)("div", {
+        let title = this.props.t.i18n(ele.i18n_title) || ele.title;
+        let subtitle = this.props.t.i18n(ele.i18n_subtitle) || ele.subtitle;
+        let $title = title ? (0,preact_module.h)("div", {
           class: "generic-attachment--element-title"
-        }, ele.title) : null;
-        let $subtitle = ele.subtitle ? (0,preact_module.h)("div", {
+        }, title) : null;
+        let $subtitle = subtitle ? (0,preact_module.h)("div", {
           class: "generic-attachment--element-subtitle"
-        }, ele.subtitle) : null;
+        }, subtitle) : null;
         return (0,preact_module.h)("div", {
           class: "generic-attachment--element swiper-slide"
         }, (0,preact_module.h)("div", null, (0,preact_module.h)("img", {
           alt: "generic attachment element",
           class: "generic-attachment--element-img",
           src: this.props.store.replaceFileUrl(ele.image_url)
-        })), $title, $subtitle, (0,preact_module.h)(Buttons, {
+        })), (0,preact_module.h)("div", {
+          class: "generic-attachment--element-content"
+        }, $title, $subtitle), (0,preact_module.h)(Buttons, {
           buttons: ele.buttons,
-          onSelect: button => this.props.onSelect(button)
+          onSelect: button => this.props.onSelect(button),
+          t: this.props.t
         }));
       });
       let elements = util/* default.get */.Z.get(attachments, '0.elements', []);
@@ -2031,17 +2037,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
+            }, this.props.t.i18n(button.i18n_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
+            }, this.props.t.i18n(button.i18n_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)
+            }, this.props.t.i18n(button.i18n_title) || button.title);
+          }
+        }));
+      }
+
       let $title = (0,preact_module.h)("a", {
         href: url,
         class: "product_attachment__title",
@@ -2070,7 +2112,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;
   }
@@ -2226,8 +2268,7 @@ img { max-width: 100%; display: block; margin: 10px auto; }
 * { white-space: normal }
 ul > li { margin-bottom: 5px }
 ul:last-child { margin-bottom: 0 }
-p:first-child { margin-top: 0;}
-p:last-child { margin-bottom: 0;}
+p { margin-bottom: 0; margin-top: 0;}
 </style>
 <div>${html}</div>`;
     let links = this.shadowRoot.querySelectorAll('a');
@@ -2271,6 +2312,11 @@ class TextMessage extends common/* Com */.up {
   render() {
     var format = util/* default.get */.Z.get(this.props.ev, 'data.message.format', 'plaintext');
     if (format === 'markdown') return this.renderMarkdown();
+    if (format === 'delta') return this.renderDelta();
+    return this.renderPlainText();
+  }
+
+  renderPlainText() {
     var text = util/* default.get */.Z.get(this.props.ev, 'data.message.text');
     text = util/* default.trim */.Z.trim(text);
     if (util/* default.size */.Z.size(text) === 0) return null;
@@ -2316,8 +2362,22 @@ class TextMessage extends common/* Com */.up {
     }, tags);
   }
 
-  renderMarkdown() {
-    var text = util/* default.get */.Z.get(this.props.ev, 'data.message.text');
+  renderDelta() {
+    let deltas = util/* default.get */.Z.get(this.props.ev, 'data.message.quill_delta');
+    deltas = util/* default.parseJSON */.Z.parseJSON(deltas) || {};
+    deltas = deltas.ops || [];
+    let isMarkdown = util/* default.find */.Z.find(deltas, delta => util/* default.get */.Z.get(delta, 'attributes.bold') || util/* default.get */.Z.get(delta, 'attributes.italic') || util/* default.get */.Z.get(delta, 'attributes.underline') || util/* default.get */.Z.get(delta, 'insert.emoji'));
+
+    if (isMarkdown) {
+      var text = deltaToMarkdown(deltas);
+      return this.renderMarkdown(text);
+    }
+
+    return this.renderPlainText();
+  }
+
+  renderMarkdown(text) {
+    if (!text) text = util/* default.get */.Z.get(this.props.ev, 'data.message.text');
     if (util/* default.size */.Z.size(text) === 0) return null;
     let byType = util/* default.get */.Z.get(this.props.ev, 'by.type');
     text = util/* default.trim */.Z.trim(text);
@@ -2341,6 +2401,48 @@ class TextMessage extends common/* Com */.up {
   }
 
 }
+
+function deltaToMarkdown(deltas) {
+  let output = '';
+  util/* default.each */.Z.each(deltas, (delta, idx) => {
+    let text = '';
+    let insert = delta.insert;
+    let attributes = delta.attributes;
+    if (insert.emoji) text = emojiCodes[insert.emoji] || '';
+
+    if (attributes) {
+      if (attributes.italic && attributes.bold) text = `*__${insert}__*`;else if (attributes.italic) text = `*${insert}*`;else if (attributes.bold) text = `**${insert}**`;else text = insert;
+    }
+
+    if (insert.dynamicField) text = `${util/* default.get */.Z.get(insert, 'dynamicField.text', '')}`;
+
+    if (!insert.emoji && !attributes && !insert.dynamicField) {
+      text = insert || '';
+      text = text.replace(/\n/g, '<br/>');
+    }
+
+    output += text;
+  });
+  return output;
+}
+
+const emojiCodes = {
+  like: '👍',
+  unlike: '👎',
+  angry: '😠',
+  confused: '😕',
+  crying: '😢',
+  grinning: '😀',
+  'heart-eyes': '😍',
+  neutral: '😐',
+  sleepy: '😪',
+  sad: '😞',
+  smiling: '😄',
+  'tongue-out': '😛',
+  tired: '😩',
+  surprised: '😮',
+  wink: '😉'
+};
 ;// CONCATENATED MODULE: ./src/chatbox/time.js
 
 var g_pub = new util/* default.Pubsub */.Z.Pubsub();
@@ -2679,7 +2781,8 @@ class Event extends common/* Com */.up {
         ev: ev
       }), (0,preact_module.h)(ButtonAttachments, {
         store: this.props.store,
-        ev: ev
+        ev: ev,
+        t: this.props.t
       }), (0,preact_module.h)(FormAttachments, {
         store: this.props.store,
         onSubmit: this.props.onFormSubmit,
@@ -2693,9 +2796,11 @@ class Event extends common/* Com */.up {
       }), (0,preact_module.h)(GenericTemplateAttachments, {
         store: this.props.store,
         ev: ev,
-        onSelect: e => this.choosePostbackBtn(e)
+        onSelect: e => this.choosePostbackBtn(e),
+        t: this.props.t
       }), (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, {
@@ -2767,7 +2872,8 @@ class Event extends common/* Com */.up {
       ev: ev
     }), (0,preact_module.h)(ButtonAttachments, {
       store: this.props.store,
-      ev: ev
+      ev: ev,
+      t: this.props.t
     }), (0,preact_module.h)(FormAttachments, {
       store: this.props.store,
       onSubmit: this.props.onFormSubmit,
@@ -3149,6 +3255,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 +3269,7 @@ class Typing extends common/* Com */.up {
         this.setState({
           isShow: false
         });
-      }, 10000);
+      }, 5000);
     });
   }
 
@@ -4061,6 +4169,7 @@ class order_Order extends common/* Com */.up {
       loading: true,
       order: {},
       err: {},
+      shipping_address: 'new',
       selectedProvince: null,
       selectedDistrict: null,
       selectedWard: null,
@@ -4353,16 +4462,17 @@ class order_Order extends common/* Com */.up {
 
     order_defineProperty(this, "onCancel", () => {
       if (this.props.onResponse) this.props.onResponse('rejected');
-      this.close();
-    });
 
-    order_defineProperty(this, "close", () => {
       if (this.props.cid && !this.state.order.user_confirmation) {
         let order = util/* default.cloneDeep */.Z.cloneDeep(this.state.order);
         order.user_confirmation = 'rejected';
         this.props.store.updateOrder(order);
       }
 
+      this.close();
+    });
+
+    order_defineProperty(this, "close", () => {
       if (this.props.onClose) this.props.onClose();
     });
 
@@ -4432,7 +4542,7 @@ class order_Order extends common/* Com */.up {
     return null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -4523,7 +4633,7 @@ class order_Order extends common/* Com */.up {
   renderDesktopShipping(order) {
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -4824,7 +4934,7 @@ class order_Order extends common/* Com */.up {
     }, (0,preact_module.h)("div", null, "Ph\xED v\u1EADn chuy\u1EC3n"), (0,preact_module.h)("div", null, util/* default.get */.Z.get(order, 'shipping.fee', 0), " d"));
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -4860,7 +4970,7 @@ class order_Order extends common/* Com */.up {
   }
 
   renderStatusBadge(order) {
-    let status = order.status || 'new';
+    let status = order.status || 'open';
     return (0,preact_module.h)("div", {
       style: "float: right !important;",
       class: 'order_status order_status__' + status
@@ -4868,7 +4978,7 @@ class order_Order extends common/* Com */.up {
   }
 
   renderShippingInfo(order) {
-    if (order.status != 'new' || order.user_confirmation) {}
+    if (order.status != 'open' || order.user_confirmation) {}
 
     let shipping_provider = util/* default.get */.Z.get(order, 'shipping.shipping_provider');
     if (!shipping_provider) return null;
@@ -4968,7 +5078,7 @@ class order_Order extends common/* Com */.up {
     let $products = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -5072,7 +5182,7 @@ class order_Order extends common/* Com */.up {
       onClick: this.onCancel
     }, this.props.t('cancel_order'));
 
-    if (order.user_confirmation || order.status != 'new') {
+    if (order.user_confirmation || order.status != 'open') {
       $status = null;
       if (this.props.cid) $close = (0,preact_module.h)("div", {
         class: "order_btn order__btn__light mt-3",
@@ -5104,7 +5214,7 @@ class order_Order extends common/* Com */.up {
     let $actions = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -5644,17 +5754,23 @@ class Widget extends common/* Com */.up {
     if (hasError) return this.forceUpdate();
     let data = util/* default.cloneDeep */.Z.cloneDeep(this.state.formData);
     let user = util/* default.cloneDeep */.Z.cloneDeep(this.props.store.matchUser());
+    let is_lead = false;
     util/* default.map */.Z.map(data, (field, key) => {
       if (!key.startsWith('attr:')) return;
       var attr = {
         key: key.substr(5)
       };
+      is_lead = is_lead || key == 'emails' || key == 'phones';
       if (field.type === 'number') attr.number = parseInt(field.value);
       if (field.type === 'datetime') attr.datetime = new util/* default.Date */.Z.Date(field.value).toISOString();
       if (field.type === 'list') attr.list = field.value;
       if (field.type === 'text' || field.type === 'boolean') attr[field.type] = field.value;
       util/* default.setUserAttr */.Z.setUserAttr(user, attr);
     });
+    if (is_lead) util/* default.setUserAttr */.Z.setUserAttr(user, {
+      key: 'lead_source',
+      text: 'widget'
+    });
     let firstmsg = util/* default.get */.Z.get(data, 'question.value');
     let groupid = util/* default.get */.Z.get(data, 'group.value', '');
 
@@ -5693,11 +5809,11 @@ class Widget extends common/* Com */.up {
     this.setState({
       creatingError: null
     });
+    await this.props.store.setUser(user);
     const {
       error,
       convo
     } = await this.props.store.startConvo(req);
-    this.props.store.setUser(user);
 
     if (error) {
       this.setState({
@@ -6563,11 +6679,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';