@subiz/widget-v4 4.1.149 → 4.1.151

package/assets/less/message.less

@@ -923,10 +923,30 @@ a.product_attachment__title {
 .message-text-inline-image-wrapper {
 	display: block;
 	margin-top: 8px;
-  margin-bottom: 8px;
+	margin-bottom: 8px;
 	max-width: 100%;
 }
 
 .message-text-inline-image {
 	width: 100%;
 }
+
+.text-message-ul {
+	display: block;
+	list-style-type: disc;
+	margin-block-start: 8px;
+	margin-block-end: 8px;
+	padding-inline-start: 20px;
+}
+
+.text-message-ol {
+	display: block;
+	list-style-type: decimal;
+	margin-block-start: 8px;
+	margin-block-end: 8px;
+	padding-inline-start: 20px;
+}
+
+.text-message-li {
+	display: list-item;
+}

package/compiled_src/chatbox/TextMessage.js

@@ -81,7 +81,8 @@ class TextMessage extends _common.Com {
         title: t
       }, (0, _preact.h)(_block.default, {
         block: block,
-        onLink: this.props.onLink
+        onLink: this.props.onLink,
+        textMessage: true
       }), this.renderTime());
     }
     let msgcls = 'message-user message-text--user';
@@ -91,7 +92,8 @@ class TextMessage extends _common.Com {
       title: t
     }, (0, _preact.h)(_block.default, {
       block: block,
-      onLink: this.props.onLink
+      onLink: this.props.onLink,
+      textMessage: true
     }));
   }
 }

package/compiled_src/chatbox/block.js

@@ -35,9 +35,9 @@ class Block extends _common.Com {
     });
     if (block.type == 'bullet_list' || block.type == 'ordered_list') {
       if (block.type == 'bullet_list') {
-        ele.tag = 'ol';
-      } else {
         ele.tag = 'ul';
+      } else {
+        ele.tag = 'ol';
       }
     }
     if (block.type == 'list_item') {
@@ -135,11 +135,11 @@ class Block extends _common.Com {
     switch (ele.tag) {
       case 'img':
         return (0, _preact.h)("a", {
-          class: "message-text-inline-image-wrapper",
+          class: this.props.textMessage ? 'message-text-inline-image-wrapper' : '',
           href: _index.default.get(ele, 'attrs.src'),
           target: "_blank"
         }, (0, _preact.h)("img", {
-          class: "message-text-inline-image",
+          class: this.props.textMessage ? 'message-text-inline-image' : '',
           src: _index.default.get(ele, 'attrs.src'),
           alt: _index.default.get(ele, 'attrs.alt') || ''
         }));
@@ -158,9 +158,17 @@ class Block extends _common.Com {
       case 'h6':
         return (0, _preact.h)("h6", null, $body);
       case 'ol':
-        return (0, _preact.h)("ol", null, $body);
+        return (0, _preact.h)("ol", {
+          class: this.props.textMessage ? 'text-message-ol' : ''
+        }, $body);
       case 'ul':
-        return (0, _preact.h)("ul", null, $body);
+        return (0, _preact.h)("ul", {
+          class: this.props.textMessage ? 'text-message-ul' : ''
+        }, $body);
+      case 'li':
+        return (0, _preact.h)("li", {
+          class: this.props.textMessage ? 'text-message-li' : ''
+        }, $body);
       case 'span':
         return (0, _preact.h)("span", null, $body);
       case 'em':

package/compiled_src/store/api.js

@@ -64,6 +64,7 @@ class _default {
         body,
         error
       } = await ajax.setBaseUrl('https://api5.subiz.com.vn/4.1').withCredentials(true).setQuery({
+        'account-id': this.accid,
         description: 'upload\n user-client: web-widget',
         name: file.name.replace(/\s+/g, '_'),
         size: file.size,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.149",
+	"version": "4.1.151",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",

package/src/chatbox/TextMessage.js

@@ -80,7 +80,7 @@ export default class TextMessage extends Com {
 		if (byType === 'agent') {
 			return (
 				<div class='message-agent message-text--agent' title={t}>
-					<Block block={block} onLink={this.props.onLink} />
+					<Block block={block} onLink={this.props.onLink} textMessage/>
 					{this.renderTime()}
 				</div>
 			)
@@ -89,7 +89,7 @@ export default class TextMessage extends Com {
 		if (this.props.ev._error) msgcls += ' message-user--error'
 		return (
 			<div class={msgcls} title={t}>
-				<Block block={block} onLink={this.props.onLink} />
+				<Block block={block} onLink={this.props.onLink} textMessage/>
 			</div>
 		)
 	}

package/src/chatbox/block.js

@@ -32,9 +32,9 @@ export default class Block extends Com {
 		})
 		if (block.type == 'bullet_list' || block.type == 'ordered_list') {
 			if (block.type == 'bullet_list') {
-				ele.tag = 'ol'
-			} else {
 				ele.tag = 'ul'
+			} else {
+				ele.tag = 'ol'
 			}
 		}
 
@@ -145,9 +145,13 @@ export default class Block extends Com {
 		switch (ele.tag) {
 			case 'img':
 				return (
-					<a class='message-text-inline-image-wrapper' href={sb.get(ele, 'attrs.src')} target='_blank'>
+					<a
+						class={this.props.textMessage ? 'message-text-inline-image-wrapper' : ''}
+						href={sb.get(ele, 'attrs.src')}
+						target='_blank'
+					>
 						<img
-							class='message-text-inline-image'
+							class={this.props.textMessage ? 'message-text-inline-image' : ''}
 							src={sb.get(ele, 'attrs.src')}
 							alt={sb.get(ele, 'attrs.alt') || ''}
 						/>
@@ -168,9 +172,11 @@ export default class Block extends Com {
 			case 'h6':
 				return <h6>{$body}</h6>
 			case 'ol':
-				return <ol>{$body}</ol>
+				return <ol class={this.props.textMessage ? 'text-message-ol' : ''}>{$body}</ol>
 			case 'ul':
-				return <ul>{$body}</ul>
+				return <ul class={this.props.textMessage ? 'text-message-ul' : ''}>{$body}</ul>
+			case 'li':
+				return <li class={this.props.textMessage ? 'text-message-li' : ''}>{$body}</li>
 			case 'span':
 				return <span>{$body}</span>
 			case 'em':

package/src/store/api.js

@@ -274,6 +274,7 @@ export default class {
 			.setBaseUrl('https://api5.subiz.com.vn/4.1')
 			.withCredentials(true)
 			.setQuery({
+				'account-id': this.accid,
 				description: 'upload\n user-client: web-widget',
 				name: file.name.replace(/\s+/g, '_'),
 				size: file.size,

package/dist/127.js

@@ -1,273 +0,0 @@
-"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__(8150);
-/* 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;
-}
-
-/***/ })
-
-}]);