@subiz/widget-v4 4.1.81 → 4.1.83

package/compiled_src/chatbox/Typing.js

@@ -33,7 +33,7 @@ class Typing extends _common.Com {
       }
       if (_index.default.get(ev, 'type') !== 'conversation_typing') return;
       let ag = this.props.store.matchAgent(_index.default.get(ev, 'by.id')) || {};
-      if (ag.type == 'agent') return;
+      if (ag.type == 'agent' && !_index.default.get(this.props.plugin, 'chatbox.show_agent_typing')) return;
       this.setState({
         ev: ev,
         isShow: true
@@ -48,11 +48,26 @@ class Typing extends _common.Com {
       }, 5000);
     });
   }
+  ShowTyping() {
+    this.setState({
+      isShow: true
+    });
+    if (this.timer) _index.default.clearTimeout(this.timer);
+    this.timer = _index.default.setTimeout(() => {
+      this.timer = null;
+      this.setState({
+        isShow: false
+      });
+    }, 5000);
+  }
   render() {
     let account = this.props.store.matchAccount();
     var cls = this.state.isShow ? '' : 'typing--hidden';
     let byid = _index.default.get(this.state.ev, 'by.display_id', _index.default.get(this.state.ev, 'by.id'));
     let agentName = _index.default.getAgentDisplayName(account, this.props.store.matchAgent(byid));
+    if (_index.default.get(this.props.plugin, 'chatbox.hide_agent_profile')) {
+      agentName = _index.default.get(account, 'name');
+    }
     return (0, _preact.h)("div", {
       class: `typing ${cls}`
     }, agentName, " ", this.props.t('typing'));

package/compiled_src/chatbox/Widget.js

@@ -127,6 +127,7 @@ class Widget extends _common.Com {
       quickReplyMessage: {}
     });
     this.props.store.onUpdate(this, _ => this.forceUpdate());
+    this.refTyping = (0, _preact.createRef)();
   }
   componentDidMount() {
     if (!this.props.store.isMobile()) this.focusInput();
@@ -151,6 +152,9 @@ class Widget extends _common.Com {
       this.updateFormDataFields();
     }
   }
+  ShowTyping() {
+    this.refTyping.current && this.refTyping.current.ShowTyping();
+  }
   shouldShowForm() {
     let form;
     let accountSetting = this.props.plugin.chatbox || {};
@@ -217,13 +221,35 @@ class Widget extends _common.Com {
         field.error = this.props.t('error_empty');
         hasError = true;
       } else field.error = '';
-      if (key.substr(5) === 'emails' && !_index.default.isEmail(field.value) && field.is_required) {
-        field.error = this.props.t('error_email_invalid');
-        hasError = true;
+      if (key.substr(5) === 'emails') {
+        if (field.is_required) {
+          if (!_index.default.isEmail(field.value)) {
+            field.error = this.props.t('error_email_invalid');
+            hasError = true;
+          }
+        } else {
+          let value = field.value || '';
+          if (typeof value !== 'string') value = value + '';
+          if (value.trim() && !_index.default.isEmail(field.value)) {
+            field.error = this.props.t('error_email_invalid');
+            hasError = true;
+          }
+        }
       }
-      if (key.substr(5) === 'phones' && !_index.default.isPhone(field.value) && field.is_required) {
-        field.error = this.props.t('error_phone_invalid');
-        hasError = true;
+      if (key.substr(5) === 'phones') {
+        if (field.is_required) {
+          if (!_index.default.isPhone(field.value)) {
+            field.error = this.props.t('error_phone_invalid');
+            hasError = true;
+          }
+        } else {
+          let value = field.value || '';
+          if (typeof value !== 'string') value = value + '';
+          if (value.trim() && !_index.default.isPhone(field.value)) {
+            field.error = this.props.t('error_phone_invalid');
+            hasError = true;
+          }
+        }
       }
     });
     if (hasError) return this.forceUpdate();
@@ -771,7 +797,9 @@ class Widget extends _common.Com {
     }), (0, _preact.h)(_Typing.default, {
       store: this.props.store,
       cid: this.props.cid,
-      t: this.props.t
+      t: this.props.t,
+      plugin: this.props.plugin,
+      ref: this.refTyping
     })), (0, _preact.h)(_Rating.default, {
       forceView: this.props.view,
       plugin: this.props.plugin,

package/compiled_src/chatbox/main.js

@@ -161,6 +161,9 @@ class Main extends _common.Com {
   hideGreeting() {
     this.refButton.current && this.refButton.current.HideGreeting();
   }
+  showTyping() {
+    this.refWidget.current && this.refWidget.current.ShowTyping();
+  }
   hideWidget() {
     restoreViewport();
     this.props.store.setIsOpen(false);

package/compiled_src/lib.js

@@ -207,6 +207,10 @@ class Widget {
       cid: cid
     });
   }
+  async showTyping() {
+    await this.domGate.entry();
+    this.pluginMgr.showCurrentChatboxTyping();
+  }
   async hideWidget() {
     await this.domGate.entry();
     this.pluginMgr.hideCurrentChatbox();

package/compiled_src/plugin.js

@@ -256,6 +256,10 @@ class PluginMgr {
     let chatbox = this.findChatbox();
     if (chatbox) return chatbox.call('showWidget', p);
   }
+  showCurrentChatboxTyping() {
+    let chatbox = this.findChatbox();
+    if (chatbox) return chatbox.call('showTyping');
+  }
   showCurrentGreeting() {
     let chatbox = this.findChatbox();
     if (chatbox) return chatbox.call('showGreeting');

package/dist/127.js

@@ -0,0 +1,273 @@
+"use strict";
+(self["webpackChunk_subiz_widget_v4"] = self["webpackChunk_subiz_widget_v4"] || []).push([[127],{
+
+/***/ 6127:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": () => (/* binding */ ProductAttachments)
+/* harmony export */ });
+/* harmony import */ var _util_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6801);
+/* harmony import */ var _common_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2840);
+/* harmony import */ var preact__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172);
+
+
+
+class ProductAttachments extends _common_js__WEBPACK_IMPORTED_MODULE_1__/* .Com */ .Mw {
+  render() {
+    let byType = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(this.props.ev, 'by.type');
+    if (byType === 'user') return null;
+    let acc = this.props.store.matchAccount();
+    var attachments = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(this.props.ev, 'data.message.attachments', []);
+    let orders = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.filter(attachments, att => att.type === 'order' && att.order).map(att => att.order);
+    if (orders.length === 0) return null;
+    let $orders = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.map(orders, (order, index) => {
+      calcOrderTotal(order);
+      let $note = null;
+      if (order.note) {
+        $note = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label"
+        }, this.props.t('note')), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__note",
+          title: order.note
+        }, order.note));
+      }
+      let $products = null;
+      if (_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.size(order.items) > 0) {
+        $products = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label"
+        }, this.props.t('product')), _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.map(order.items, item => {
+          let product = item.product || {};
+          return (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+            class: "order_attachment__product"
+          }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("img", {
+            class: "order_attachment__product_img",
+            alt: '' + _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(product, 'id'),
+            src: _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(product, 'image', __webpack_require__(2876))
+          }), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+            style: "overflow: hidden !important;"
+          }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+            class: "order_attachment__product_name",
+            title: this.props.t.i18n(product.i18n_name) || product.name
+          }, this.props.t.i18n(product.i18n_name) || product.name), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+            class: "order_attachment__product_desc"
+          }, getProductPropName(product, ' / ')), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+            class: "order_attachment__product_desc"
+          }, this.props.t('qty'), " ", item.quantity, "\xA0\xB7\xA0", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(product.price))));
+        }));
+      }
+      let $total = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        class: "order_attachment__footer"
+      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        class: "d-flex align-items-center justify-content-between"
+      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, this.props.t('total')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("b", {
+        class: "order_attachment__total"
+      }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.total)))));
+      let phoneattr = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.find(_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'user.attributes', []), attr => attr.key === 'phones') || {
+        key: 'phones',
+        text: ''
+      };
+      let phone = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'shipping.address.phone', '').trim();
+      phone = phone || _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.trim(phoneattr.text);
+      if (phone) phone = this.props.t('phn') + ': ' + phone;
+      let $shipto = null;
+      if (displayOrderShippingAddress(order) || phone) {
+        $shipto = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label"
+        }, this.props.t('ship_to')), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, displayOrderShippingAddress(order)), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__text_truncate"
+        }, phone));
+      }
+      let $beforeTax = null;
+      if (order._discount_before_tax) {
+        $beforeTax = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__footer"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "d-flex align-items-center justify-content-between"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label no_margin"
+        }, this.props.t('subtotal_before_tax')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._order_value))), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "d-flex align-items-center justify-content-between"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label no_margin"
+        }, this.props.t('discount_before_tax')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, "-", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._discount_before_tax))));
+      }
+      let $subtotal = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        class: "d-flex align-items-center justify-content-between"
+      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        class: "order_attachment__label no_margin"
+      }, this.props.t('subtotal')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        style: ""
+      }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.subtotal)));
+      let $tax = null;
+      if (order.total_tax) {
+        let taxname = '';
+        if (_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.size(order._taxM) === 1) {
+          let tax = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order._taxM, '0.tax', {});
+          if (tax.name && tax.percentage) taxname = `(${tax.name} ${Math.round(tax.percentage || 0) / 100}%)`;
+        }
+        $tax = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "d-flex align-items-center justify-content-between"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label no_margin"
+        }, this.props.t('tax'), " ", taxname), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          style: ""
+        }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.total_tax)));
+      }
+      let $discount = null;
+      if (order.discount_type === 'percentage' && order.discount_percentage) {
+        $discount = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "d-flex align-items-center justify-content-between"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label no_margin"
+        }, this.props.t('discount_after_tax'), " (", Math.round(order.discount_percentage / 100), "%)"), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          style: ""
+        }, "-", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._computed_discount)));
+      }
+      if (order.discount_type === 'amount' && order.discount_amount) {
+        $discount = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "d-flex align-items-center justify-content-between"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label no_margin"
+        }, this.props.t('discount_after_tax')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "no-shrink"
+        }, "-", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._computed_discount)));
+      }
+      let $shipping = null;
+      if (_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'shipping.nominal_fee')) {
+        $shipping = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "d-flex align-items-center justify-content-between"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label no_margin"
+        }, this.props.t('shipping_fee')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          style: ""
+        }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'shipping.nominal_fee', 0))));
+      }
+      let $adjustment = null;
+      if (order.adjustment) {
+        $adjustment = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "d-flex align-items-center justify-content-between"
+        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "order_attachment__label no_margin"
+        }, order.adjustment_description), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+          class: "no-shrink"
+        }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.adjustment)));
+      }
+      $subtotal = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        class: "order_attachment__footer"
+      }, $subtotal, $tax, $shipping, $discount, $adjustment);
+      if (!$shipping && !$adjustment && !$discount && !$tax) {
+        $subtotal = null;
+      }
+      return (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        class: `order_attachment order_attachment__${byType}`
+      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
+        class: "order_attachment__header"
+      }, this.props.t('order'), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("span", {
+        class: "order_attachment__text_muted order_attachment__text_sm"
+      }, getOrderDisplayName(order))), $products, $shipto, $note, $beforeTax, $subtotal, $total);
+    });
+    return $orders;
+  }
+}
+function getProductPropName(product, seperator = ' - ') {
+  let options = op.get(product, 'options', []);
+  let props = op.get(product, 'props', []);
+  let multiPropsOptions = op.filter(options, option => op.size(option.values) > 1);
+  let names = [];
+  op.each(multiPropsOptions, option => {
+    let prop = op.find(props, prop => prop.key === option.key) || {};
+    if (prop.value) names.push(prop.value);
+  });
+  return names.join(seperator);
+}
+function getOrderDisplayName(order = {}) {
+  return order.number || order.id || '';
+}
+function displayOrderShippingAddress(order, isShorten) {
+  let addr = op.get(order, 'shipping.address', {});
+  let fulladdr = [addr.address, addr.ward, addr.district, addr.province].filter(a => a).join(', ').trim();
+  if (isShorten) fulladdr = shortenAddr(fulladdr);
+  return fulladdr;
+}
+function shortenAddr(str) {
+  str = str || '';
+  str = str.replace(/Hà Nội/gi, 'HN');
+  str = str.replace(/Hồ Chí Minh/gi, 'HCM');
+  str = str.replace(/Thành Phố/gi, 'TP');
+  return str;
+}
+function calcOrderTotal(order) {
+  let subtotal = 0;
+  let beforeTaxDiscount = 0;
+  let ordervalue = 0;
+  op.map(order.items, item => {
+    if (!item.product) return 0;
+    let price = op.get(item, 'product.price', 0) * (item.quantity || 0);
+    ordervalue += price;
+    if (item.discount_type == 'percentage') {
+      if (item.discount_percentage > 0) {
+        beforeTaxDiscount += price * item.discount_percentage / 10000;
+        price = price * (1 - (item.discount_percentage || 0) / 10000);
+      }
+    } else if (item.discount_type == 'amount') {
+      if (item.discount_amount > 0) {
+        beforeTaxDiscount += item.discount_amount;
+        price = price - (item.discount_amount || 0);
+        if (price <= 0) price = 0;
+      }
+    }
+    item.total = price;
+    subtotal += price;
+  });
+  let taxM = {};
+  op.map(order.items, (item, i) => {
+    if (!item.product) return;
+    let tax = item.product.tax;
+    if (!tax) return;
+    if (!tax.id) return;
+    let taxprice = item.total * tax.percentage / 10000;
+    item.total_tax = taxprice;
+    taxM[i] = {
+      tax: tax,
+      taxprice: taxprice
+    };
+  });
+  let totaltax = 0;
+  op.map(taxM, t => totaltax += t.taxprice);
+  let computed_discount = 0;
+  if (order.discount_type == 'percentage' && order.discount_percentage > 0) {
+    computed_discount = (subtotal + totaltax) * order.discount_percentage / 10000;
+  } else if (order.discount_type == 'amount') {
+    computed_discount = order.discount_amount || 0;
+  }
+  let shippingfee = op.get(order, 'shipping.nominal_fee', 0);
+  if (shippingfee > 0) {
+    if (op.get(order, 'shipping.tax.id')) {
+      let tax = order.shipping.tax;
+      let taxprice = shippingfee * (tax.percentage / 10000);
+      taxM['ship'] = {
+        tax: tax,
+        taxprice: taxprice
+      };
+      order.shipping.total_tax = taxprice;
+    }
+  }
+  totaltax = 0;
+  op.map(taxM, t => totaltax += t.taxprice);
+  let total = subtotal + totaltax - computed_discount + shippingfee;
+  total += order.adjustment || 0;
+  if (total < 0) total = 0;
+  order.subtotal = subtotal;
+  order._computed_discount = computed_discount;
+  order._taxM = taxM;
+  order.total = total;
+  order.total_tax = totaltax;
+  order._discount_before_tax = beforeTaxDiscount;
+  order._order_value = ordervalue;
+}
+
+/***/ })
+
+}]);