@subiz/widget-v4 4.0.92 → 4.0.94

package/compiled_src/util/common.test.js

@@ -1,9 +1,7 @@
 "use strict";
 
 const test = require('tape');
-
 const util = require('./common.js');
-
 test('util.getNotiDescription', t => {
   var tcs = [{
     desc: 'not a message sent',
@@ -442,11 +440,9 @@ test('mapize', t => {
     value: 4
   }];
   var m = util.mapize(arr, 'id');
-
   for (var i = 0; i < arr.length; i++) {
     t.equal(m[i], arr[i]);
   }
-
   t.end();
 });
 test('convo id from topic', t => {

package/compiled_src/util/extractor.js

@@ -10,15 +10,11 @@ exports.extractLinks = extractLinks;
 exports.extractPhones = extractPhones;
 exports.extractText = extractText;
 exports.pipeExtracts = pipeExtracts;
-
 var common = require('./common.js');
-
 let emojis = ['like', 'unlike', 'wink', 'tongue-out', 'tired', 'surprised', 'smiling', 'sleepy', 'sad', 'neutral', 'heart-eyes', 'grinning', 'crying', 'confused', 'angry', 'cry', 'heart_eyes', 'neutral_face', 'emoji--disappointed', 'smile', 'open_mouth', 'tired_face', 'stuck_out_tongue', 'moyai', 'thumbsdown', 'dislike', 'thumbsup', 'ok_hand', 'octopus', 'pig2', 'wave', 'mouse', 'mouse2', 'rat'];
 emojis = common.map(emojis, e => ':' + e + ':');
-
 function extractEmojis(text) {
   var out = [];
-
   for (var i = 0; i < text.length; i++) {
     for (var e = 0; e < emojis.length; e++) {
       if (text.indexOf(emojis[e], i) !== i) continue;
@@ -30,77 +26,63 @@ function extractEmojis(text) {
       break;
     }
   }
-
   return out;
 }
-
 function extractLinks(text) {
   text = text || '';
   var reg = /(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.,~#?&//=]*)/gim;
   var out = [];
   var match;
-
   while (match = reg.exec(text)) {
     out.push({
       index: match.index,
       length: reg.lastIndex - match.index
     });
   }
-
   return out;
 }
-
 function extractEmails(text) {
   text = text || '';
   var reg = /(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/gim;
   var out = [];
   var match;
-
   while (match = reg.exec(text)) {
     out.push({
       index: match.index,
       length: reg.lastIndex - match.index
     });
   }
-
   return out;
 }
-
 function extractPhones(msg) {
   msg = msg || '';
   var fgmsg = '';
-  var realchmap = {};
 
+  var realchmap = {};
   for (var i = 0; i < msg.length; i++) {
     var ch = msg.charAt(i);
-
     if (ch !== '.' && ch !== '-' && ch !== ' ') {
       fgmsg += ch;
       realchmap[fgmsg.length - 1] = i;
       continue;
     }
-
     var prevCh = i > 0 ? msg.charAt(i - 1) : '-';
     var nextCh = i < msg.length - 1 ? msg.charAt(i + 1) : '-';
     if ('0123456789'.indexOf(prevCh) !== -1 && '0123456789'.indexOf(nextCh) !== -1) continue;
     fgmsg += ch;
     realchmap[fgmsg.length - 1] = i;
   }
-
   var reg = /([0-9]{8,13})/gim;
   var out = [];
   var match;
-
   while (match = reg.exec(fgmsg)) {
     out.push({
       index: realchmap[match.index],
       length: realchmap[reg.lastIndex - 1] - realchmap[match.index] + 1
     });
   }
-
   return out;
 }
-
 function extract(text, extractor, type) {
   if (!text) return [];
   var out = [];
@@ -128,7 +110,6 @@ function extract(text, extractor, type) {
   });
   return common.filter(out, o => o.text !== '');
 }
-
 function pipeExtracts(text, extractors) {
   var out = [];
   if (common.size(extractors) === 0) return [{
@@ -143,7 +124,6 @@ function pipeExtracts(text, extractors) {
   });
   return out;
 }
-
 function extractText(text) {
   var link = extractLinks;
   link.type = 'link';

package/compiled_src/util/extractor.test.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var test = require('tape');
-
 var lo = require('lodash');
-
 let {
   extractEmails,
   extractPhones,
@@ -12,7 +10,6 @@ let {
   extractEmojis,
   maskEmojis
 } = require('./extractor.js');
-
 test('extract emails', t => {
   var tcs = [{
     text: 'email',

package/compiled_src/util/gate.js

@@ -4,13 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 class Gate {
   constructor(isOpen) {
     this.isOpen = isOpen === true;
     this.cbs = [];
   }
-
   open() {
     this.isOpen = true;
     let newcbs = [];
@@ -19,18 +17,15 @@ class Gate {
     });
     this.cbs = newcbs;
   }
-
   close() {
     this.isOpen = false;
   }
-
   entry(cb, lock) {
     if (this.isOpen) {
       if (lock) this.isOpen = false;
       cb && cb();
       return Promise.resolve();
     }
-
     return new Promise(resolve => {
       this.cbs.push(() => {
         if (lock) this.isOpen = false;
@@ -39,7 +34,5 @@ class Gate {
       });
     });
   }
-
 }
-
 exports.default = Gate;

package/compiled_src/util/gate.test.js

@@ -1,11 +1,10 @@
 "use strict";
 
 var test = require('tape');
-
 var Gate = require('./gate.js');
-
 test('gate', async t => {
   var gate = new Gate();
+
   var flip = 0;
   setTimeout(function () {
     flip = 1;

package/compiled_src/util/index.js

@@ -4,27 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var common = _interopRequireWildcard(require("./common.js"));
-
 var extractor = _interopRequireWildcard(require("./extractor.js"));
-
 var campaign = _interopRequireWildcard(require("./campaign.js"));
-
+var order = _interopRequireWildcard(require("./order.js"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var sb = {};
 sb = Object.assign(sb, common);
 sb.Gate = require('./gate.js').default;
-
+sb.Mutex = require('./mutex.js').default;
 var op = require('./op.js');
-
 sb.get = op.get;
 sb.set = op.set;
 sb.Pubsub = require('./pubsub.js').default;
 sb = Object.assign(sb, extractor);
 sb = Object.assign(sb, campaign);
+sb = Object.assign(sb, order);
 var _default = sb;
 exports.default = _default;

package/compiled_src/util/mutex.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+class Mutex {
+  constructor() {
+    this.isOpen = true;
+    this.cbs = [];
+  }
+  _check() {
+    if (!this.isOpen) return;
+    let cb = this.cbs.pop();
+    if (!cb) return;
+    this.isOpen = false;
+    cb();
+  }
+  lock() {
+    return new Promise(resolve => {
+      this.cbs.push(resolve);
+      this._check();
+    });
+  }
+  unlock() {
+    if (this.isOpen) return;
+    this.isOpen = true;
+    this._check();
+  }
+}
+exports.default = Mutex;

package/compiled_src/util/op.js

@@ -5,65 +5,52 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.get = get;
 exports.set = set;
-var toStr = Object.prototype.toString;
 
+var toStr = Object.prototype.toString;
 var isArray = Array.isArray || function (obj) {
   return toStr.call(obj) === '[object Array]';
 };
-
 function hasOwnProperty(obj, prop) {
   if (obj == null) return false;
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
-
 function getKey(key) {
   var intKey = parseInt(key);
   return intKey.toString() === key ? intKey : key;
 }
-
 function hasShallowProperty(obj, prop) {
   return typeof prop === 'number' && isArray(obj) || hasOwnProperty(obj, prop);
 }
-
 function getShallowProperty(obj, prop) {
   if (hasShallowProperty(obj, prop)) return obj[prop];
 }
-
 function get(obj, path, defaultValue) {
   if (typeof path === 'number') path = [path];
   if (!path || path.length === 0) return obj;
   if (obj == null) return defaultValue;
-
   if (typeof path === 'string') {
     return get(obj, path.split('.'), defaultValue);
   }
-
   var currentPath = getKey(path[0]);
   var nextObj = getShallowProperty(obj, currentPath);
   if (nextObj === void 0) return defaultValue;
   if (path.length === 1) return nextObj;
   return get(obj[currentPath], path.slice(1), defaultValue);
 }
-
 function set(obj, path, value) {
   if (typeof path === 'number') path = [path];
   if (!path || path.length === 0) return obj;
-
   if (typeof path === 'string') {
     return set(obj, path.split('.').map(getKey), value);
   }
-
   var currentPath = path[0];
   var currentValue = getShallowProperty(obj, currentPath);
-
   if (path.length === 1) {
     obj[currentPath] = value;
     return currentValue;
   }
-
   if (currentValue === void 0) {
     obj[currentPath] = typeof path[1] === 'number' ? [] : {};
   }
-
   return set(obj[currentPath], path.slice(1), value);
 }

package/compiled_src/util/order.js

@@ -0,0 +1,118 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.calcOrderTotal = calcOrderTotal;
+exports.displayOrderShippingAddress = displayOrderShippingAddress;
+exports.getOrderDisplayName = getOrderDisplayName;
+exports.getProductPropName = getProductPropName;
+const op = require('./op.js');
+const common = require('./common');
+op.filter = common.filter;
+op.map = common.map;
+op.each = common.each;
+op.size = common.size;
+op.find = common.find;
+function getProductPropName(product) {
+  let seperator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ' - ';
+  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() {
+  let order = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  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;
+}

package/compiled_src/util/pubsub.js

@@ -4,17 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var {
   filter,
   map
 } = require('./common.js');
-
 class Pubsub {
   constructor() {
     this.listeners = {};
   }
-
   publish(topic, payload, payload2, payload3) {
     this.listeners[topic] = filter(this.listeners[topic], sub => sub.obj._isMounted);
     map(this.listeners[topic], _ref => {
@@ -24,7 +21,6 @@ class Pubsub {
       return cb(payload, payload2, payload3);
     });
   }
-
   on2(obj, topic, cb) {
     if (!this.listeners[topic]) this.listeners[topic] = [];
     this.listeners[topic].push({
@@ -32,7 +28,5 @@ class Pubsub {
       cb
     });
   }
-
 }
-
 exports.default = Pubsub;

package/compiled_src/util/pubsub.test.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var test = require('tape');
-
 var Pubsub = require('./pubsub.js');
-
 test('pubsub simple', t => {
   var ps = new Pubsub();
   var msg = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.92",
+	"version": "4.0.94",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,28 +14,27 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.25.5",
+		"core-js": "^3.26.1",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.3",
-		"less-loader": "^11.0.0",
-		"marked": "^4.1.1",
-		"preact": "^10.11.1"
+		"less-loader": "^11.1.0",
+		"marked": "^4.2.3",
+		"preact": "^10.11.3"
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.19.3",
+		"@babel/core": "^7.20.2",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.19.0",
-		"@babel/preset-env": "^7.19.4",
-		"babel-loader": "^8.2.5",
+		"@babel/preset-env": "^7.20.2",
+		"babel-loader": "^9.1.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
-		"prettier": "^2.7.1",
-		"puppeteer": "^18.2.1",
-		"webpack": "^5.74.0",
-		"webpack-bundle-analyzer": "^4.6.1",
-		"webpack-cli": "^4.10.0",
+		"puppeteer": "^19.3.0",
+		"webpack": "^5.75.0",
+		"webpack-bundle-analyzer": "^4.7.0",
+		"webpack-cli": "^5.0.0",
 		"webpack-dev-server": "^4.11.1"
 	}
 }