@subiz/widget-v4 4.1.106 → 4.1.108

package/package.json

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

package/src/popup/popup.js

@@ -906,6 +906,12 @@ export default class Popup extends Com {
 		return containercss
 	}
 
+	onClickOverlay() {
+		let popup = sb.get(this.props.plugin, 'popup', {})
+		if (!popup.overlay) return
+		this.setClose(true)
+	}
+
 	render() {
 		if (!this.props.t) return null
 		if (!this.state.cssready) return null
@@ -984,7 +990,7 @@ export default class Popup extends Com {
 		}
 
 		return (
-			<div class='overlay' style={overlaystyle}>
+			<div class='overlay' style={overlaystyle} onClick={() => this.onClickOverlay()}>
 				<div class={animation} style={this.js2css(containercss)} onClick={(e) => e.stopPropagation()}>
 					{this.renderCloseButton()}
 					<div style={this.js2css(bodycss)} onClick={(e) => this.onButtonClick(e, 'background')}>

package/src/util/common.js

@@ -124,7 +124,8 @@ export function extractText(text) {
 	var emoji = extractEmojis
 	emoji.type = 'emoji'
 
-	return pipeExtracts(text, [email, link, phone, emoji])
+	// extractLinks prefered over extractEmails becase some link is https://example.com/@something.vn would detect this is email over link
+	return pipeExtracts(text, [link, email, phone, emoji])
 }
 
 export function parseJSON(str) {
@@ -822,6 +823,40 @@ export function checkRunConditions(freq, conds, lastrun, store) {
 					if (!found) return false
 				}
 				break
+			case 'url_path':
+				let excludePaths = filter(cond.exclude_url_paths, (url) => norm(url))
+				if (size(excludePaths) > 0) {
+					let urlObj = new URL(window.location.href)
+					let pathname = urlObj.pathname || ''
+					if (typeof pathname === 'string' && pathname.endsWith('/')) {
+						pathname = pathname.substring(0, pathname.length - 1)
+					}
+					let found = find(excludePaths, (url) => {
+						if (typeof url === 'string' && url.endsWith('/')) {
+							url = url.substring(0, url.length - 1)
+						}
+						return pathname === url
+					})
+					if (found) return false
+				}
+
+				// ignore empty url
+				let paths = filter(cond.url_paths, (url) => norm(url))
+				if (size(paths) > 0) {
+					let urlObj = new URL(window.location.href)
+					let pathname = urlObj.pathname || ''
+					if (typeof pathname === 'string' && pathname.endsWith('/')) {
+						pathname = pathname.substring(0, pathname.length - 1)
+					}
+					let found = find(paths, (url) => {
+						if (typeof url === 'string' && url.endsWith('/')) {
+							url = url.substring(0, url.length - 1)
+						}
+						return pathname === url
+					})
+					if (!found) return false
+				}
+				break
 			case 'browser':
 				if (size(cond.browsers) > 0) {
 					var browsername = browserName()

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;
-}
-
-/***/ })
-
-}]);