@subiz/widget-v4 4.0.77 → 4.0.80

package/assets/less/message.less

@@ -426,7 +426,7 @@ a.message_error {
 }
 
 .generic-attachment {
-	display: inline-block;
+	display: flex;
 	width: 100%;
 	overflow: hidden;
 	width: 100%;
@@ -436,6 +436,10 @@ a.message_error {
 	cursor: grab;
 }
 
+.generic-attachment--element-content {
+	flex: 1;
+}
+
 .generic-attachment--element {
 	border: 1px solid #d8d8d8;
 	background: white;
@@ -443,8 +447,10 @@ a.message_error {
 	overflow: hidden;
 	width: 220px;
 	margin-right: 10px;
-	display: inline-block;
 	vertical-align: top;
+	display: flex;
+	flex-direction: column;
+	flex-shrink: 0;
 
 	&:last-child {
 		margin-right: 0;
@@ -452,6 +458,7 @@ a.message_error {
 	.generic-attachment--element-img {
 		width: 100%;
 		height: 150px;
+		object-fit: cover;
 	}
 
 	.url-button-attachment:first-child {
@@ -479,6 +486,7 @@ a.message_error {
 		font-weight: 500;
 		font-size: 16px;
 		line-height: 20px;
+		white-space: normal;
 	}
 
 	.generic-attachment--element-subtitle {
@@ -688,13 +696,21 @@ a.product_attachment__title {
 	font-weight: 500;
 	.color(@black);
 
-	word-break: break-all;
+	word-break: break-word;
+	margin-bottom: 5px;
 }
 
 .product_attachment__subtitle {
+	white-space: pre-wrap;
+	display: -webkit-box;
+	-webkit-line-clamp: 3;
+	-webkit-box-orient: vertical;
+	overflow: hidden;
 	padding: 5px 10px;
 	.color(#aaa);
 	padding-top: 0;
+	padding-bottom: 0;
+	margin-bottom: 5px;
 }
 
 .product_attachment__btn_external_link {

package/compiled_src/chatbox/ButtonAttachments.js

@@ -36,7 +36,8 @@ class ButtonAttachments extends _common.Com {
 
     return (0, _preact.h)(_Buttons.default, {
       store: this.props.store,
-      buttons: buttons
+      buttons: buttons,
+      t: this.props.t
     });
   }
 

package/compiled_src/chatbox/Buttons.js

@@ -28,7 +28,7 @@ class Buttons extends _common.Com {
           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') {
@@ -38,7 +38,7 @@ class Buttons extends _common.Com {
           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') {
@@ -46,7 +46,7 @@ class Buttons extends _common.Com {
           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;

package/compiled_src/chatbox/Event.js

@@ -183,7 +183,8 @@ class Event extends _common.Com {
         ev: ev
       }), (0, _preact.h)(_ButtonAttachments.default, {
         store: this.props.store,
-        ev: ev
+        ev: ev,
+        t: this.props.t
       }), (0, _preact.h)(_FormAttachments.default, {
         store: this.props.store,
         onSubmit: this.props.onFormSubmit,
@@ -197,7 +198,8 @@ class Event extends _common.Com {
       }), (0, _preact.h)(_GenericTemplateAttachments.default, {
         store: this.props.store,
         ev: ev,
-        onSelect: e => this.choosePostbackBtn(e)
+        onSelect: e => this.choosePostbackBtn(e),
+        t: this.props.t
       }), (0, _preact.h)(_ProductAttachments.default, {
         t: this.props.t,
         onPostback: e => this.choosePostbackBtn(e),
@@ -272,7 +274,8 @@ class Event extends _common.Com {
       ev: ev
     }), (0, _preact.h)(_ButtonAttachments.default, {
       store: this.props.store,
-      ev: ev
+      ev: ev,
+      t: this.props.t
     }), (0, _preact.h)(_FormAttachments.default, {
       store: this.props.store,
       onSubmit: this.props.onFormSubmit,

package/compiled_src/chatbox/GenericTemplateAttachments.js

@@ -34,7 +34,10 @@ class GenericTemplateAttachments extends _common.Com {
     this.setState({
       focusing: eleindex
     });
-    this.galleryRef.current.scrollLeft = 190 * eleindex - 20;
+    this.galleryRef.current.scrollTo({
+      left: 220 * eleindex,
+      behavior: 'smooth'
+    });
   }
 
   render() {
@@ -50,21 +53,26 @@ class GenericTemplateAttachments extends _common.Com {
 
     var $generics = _index.default.map(generics, (gen, index) => {
       var $eles = _index.default.map(gen.elements, ele => {
-        let $title = ele.title ? (0, _preact.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.h)("div", {
           class: "generic-attachment--element-title"
-        }, ele.title) : null;
-        let $subtitle = ele.subtitle ? (0, _preact.h)("div", {
+        }, title) : null;
+        let $subtitle = subtitle ? (0, _preact.h)("div", {
           class: "generic-attachment--element-subtitle"
-        }, ele.subtitle) : null;
+        }, subtitle) : null;
         return (0, _preact.h)("div", {
           class: "generic-attachment--element swiper-slide"
         }, (0, _preact.h)("div", null, (0, _preact.h)("img", {
           alt: "generic attachment element",
           class: "generic-attachment--element-img",
           src: this.props.store.replaceFileUrl(ele.image_url)
-        })), $title, $subtitle, (0, _preact.h)(_Buttons.default, {
+        })), (0, _preact.h)("div", {
+          class: "generic-attachment--element-content"
+        }, $title, $subtitle), (0, _preact.h)(_Buttons.default, {
           buttons: ele.buttons,
-          onSelect: button => this.props.onSelect(button)
+          onSelect: button => this.props.onSelect(button),
+          t: this.props.t
         }));
       });
 

package/compiled_src/chatbox/ProductAttachments.js

@@ -40,7 +40,7 @@ class ProductAttachments extends _common.Com {
         src: require('../../assets/img/external-link.svg'),
         class: "product_attachment__btn_external_link"
       })));
-      console.log("P", product);
+      console.log('P', product);
 
       if (_index.default.size(product.buttons) > 0) {
         $detailbtns = $detailbtns.concat(_index.default.map(product.buttons, (button, index) => {
@@ -50,7 +50,7 @@ class ProductAttachments extends _common.Com {
               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') {
@@ -60,7 +60,7 @@ class ProductAttachments extends _common.Com {
               target: "_blank",
               key: index,
               title: button.title
-            }, button.title || this.props.t('detail'), ' ', (0, _preact.h)("img", {
+            }, this.props.t.i18n(button.i18n_title) || button.title || this.props.t('detail'), ' ', (0, _preact.h)("img", {
               src: require('../../assets/img/external-link.svg'),
               class: "product_attachment__btn_external_link"
             }));
@@ -71,7 +71,7 @@ class ProductAttachments extends _common.Com {
               class: "product_attachment__btn",
               href: "javascript:;",
               onClick: _ => this.props.onPostback(button)
-            }, button.title);
+            }, this.props.t.i18n(button.i18n_title) || button.title);
           }
         }));
       }

package/dist/0b82fa7e5c3b07b40a44.png

@@ -0,0 +1 @@
+module.exports = __webpack_public_path__ + "assets/img/emoji/messenger/sub_58.824_78.431.f910f2a.png";

package/dist/0f4af006e38ee8b93633.png

@@ -0,0 +1 @@
+module.exports = __webpack_public_path__ + "assets/img/emoji/messenger/sub_60.784_29.412.e36d284.png";

package/dist/132.js

@@ -161,9 +161,8 @@ 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 (!text || !greeting.enabled) {
+    if (!greeting.message || !greeting.enabled) {
       this.setState({
         previewEvent: {}
       });
@@ -2032,53 +2031,17 @@ 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 $detailbtns = [];
+      let $detailbtn = null;
       let url = product.url || product.mobile_url;
       if (this.props.store.isMobile()) url = product.mobile_url || product.url;
-      if (url && util/* default.size */.Z.size(product.buttons) == 0) $detailbtns.push((0,preact_module.h)("a", {
+      if (url) $detailbtn = (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",
@@ -2107,7 +2070,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"
-      }, $detailbtns));
+      }, $detailbtn));
     });
     return $products;
   }
@@ -2733,7 +2696,6 @@ 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, {
@@ -3187,8 +3149,6 @@ 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,
@@ -3201,7 +3161,7 @@ class Typing extends common/* Com */.up {
         this.setState({
           isShow: false
         });
-      }, 5000);
+      }, 10000);
     });
   }
 
@@ -4101,7 +4061,6 @@ class order_Order extends common/* Com */.up {
       loading: true,
       order: {},
       err: {},
-      shipping_address: 'new',
       selectedProvince: null,
       selectedDistrict: null,
       selectedWard: null,
@@ -4394,17 +4353,16 @@ 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();
     });
 
@@ -4474,7 +4432,7 @@ class order_Order extends common/* Com */.up {
     return null;
     let editmode = false;
 
-    if (!order.status || order.status == 'open') {
+    if (!order.status || order.status == 'new') {
       editmode = !order.user_confirmation;
     }
 
@@ -4565,7 +4523,7 @@ class order_Order extends common/* Com */.up {
   renderDesktopShipping(order) {
     let editmode = false;
 
-    if (!order.status || order.status == 'open') {
+    if (!order.status || order.status == 'new') {
       editmode = !order.user_confirmation;
     }
 
@@ -4866,7 +4824,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 == 'open') {
+    if (!order.status || order.status == 'new') {
       editmode = !order.user_confirmation;
     }
 
@@ -4902,7 +4860,7 @@ class order_Order extends common/* Com */.up {
   }
 
   renderStatusBadge(order) {
-    let status = order.status || 'open';
+    let status = order.status || 'new';
     return (0,preact_module.h)("div", {
       style: "float: right !important;",
       class: 'order_status order_status__' + status
@@ -4910,7 +4868,7 @@ class order_Order extends common/* Com */.up {
   }
 
   renderShippingInfo(order) {
-    if (order.status != 'open' || order.user_confirmation) {}
+    if (order.status != 'new' || order.user_confirmation) {}
 
     let shipping_provider = util/* default.get */.Z.get(order, 'shipping.shipping_provider');
     if (!shipping_provider) return null;
@@ -5010,7 +4968,7 @@ class order_Order extends common/* Com */.up {
     let $products = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'open') {
+    if (!order.status || order.status == 'new') {
       editmode = !order.user_confirmation;
     }
 
@@ -5114,7 +5072,7 @@ class order_Order extends common/* Com */.up {
       onClick: this.onCancel
     }, this.props.t('cancel_order'));
 
-    if (order.user_confirmation || order.status != 'open') {
+    if (order.user_confirmation || order.status != 'new') {
       $status = null;
       if (this.props.cid) $close = (0,preact_module.h)("div", {
         class: "order_btn order__btn__light mt-3",
@@ -5146,7 +5104,7 @@ class order_Order extends common/* Com */.up {
     let $actions = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'open') {
+    if (!order.status || order.status == 'new') {
       editmode = !order.user_confirmation;
     }
 
@@ -6605,13 +6563,11 @@ 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';