@subiz/widget-v4 4.0.99 → 4.1.2

package/compiled_src/util/common.js

@@ -83,7 +83,6 @@ exports.requestAnimationFrame = requestAnimationFrame;
 var setTimeout = f.contentWindow.setTimeout;
 exports.setTimeout = setTimeout;
 var setInterval = f.contentWindow.setInterval;
-
 exports.setInterval = setInterval;
 function convoOfEv(ev) {
   if (!ev) return '';
@@ -278,7 +277,6 @@ function trimStart(s, prefix) {
   while (s.charAt(0) === prefix) s = s.substr(1);
   return s;
 }
-
 function throttle(func, wait, options) {
   var context, args, result;
   var timeout = null;
@@ -343,7 +341,7 @@ function orderBy(a, k, d) {
   return clone;
 }
 function isPhone(phone) {
-  var re = /^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/im;
+  var re = /^[\+]?[(]?[0-9]{2,3}[)]?[-\s\.]?[0-9]{3,4}[-\s\.]?[0-9]{4,6}$/im;
   return re.test(String(phone));
 }
 function isURL(url) {
@@ -427,7 +425,6 @@ function replaceCssVariablePlugin(css, setting) {
       ret.push(item);
       continue;
     }
-
     var path = item.type.substr(2, item.type.length - 3);
     var val = op.get(setting, path) || op.get(DEFVAL, path) || '';
     ret.push(val);
@@ -493,14 +490,12 @@ function replaceCssVariable(css, setting) {
       ret.push(val + 5);
       continue;
     }
-
     var path = item.type.substr(2, item.type.length - 3);
     var val = op.get(setting, path) || op.get(DEFVAL, path) || '';
     val = norm2(val);
     if (['mobile_button.width', 'mobile_button.height', 'mobile_button.margin_x', 'mobile_button.margin_y', 'desktop_button.width', 'desktop_button.height', 'desktop_button.margin_x', 'desktop_button.margin_y', 'width', 'height'].includes(path)) {
       val += 'px';
     }
-
     if (path === 'height' && op.get(setting, 'window_mode') === 'full') {
       ret.push('100%');
       continue;
@@ -509,7 +504,6 @@ function replaceCssVariable(css, setting) {
   }
   return ret.join('');
 }
-
 function tokenize(arr, token) {
   if (!arr || !arr.length) return [];
   var out = [];
@@ -573,23 +567,18 @@ function js2css(js, onlyprops, variables) {
   var newjs = {};
   for (var prop in js) {
     if (!js.hasOwnProperty(prop)) continue;
-
     if (onlyprops && onlyprops.length > 0 && onlyprops.indexOf(prop) === -1) continue;
-
     if (typeof js[prop] === 'string') newjs[prop] = trim(js[prop]);else newjs[prop] = js[prop];
   }
   js = newjs;
   let style = '';
   for (var prop in js) {
     if (!js.hasOwnProperty(prop)) continue;
-
     var filter = '';
     if (js.blur) filter += 'blur(' + js.blur + ') ';
     if (js.grayscale) filter += 'grayscale(' + js + ') ';
     if (filter) style += 'filter: ' + filter + '!important;';
-
     if (js.rotate !== undefined) style += 'transform:rotate(' + js.rotate + ') !important;';
-
     if (js[prop] !== undefined) {
       let propval = js[prop] + '';
       map(variables, (value, name) => {
@@ -603,22 +592,15 @@ function js2css(js, onlyprops, variables) {
 }
 function browserName() {
   var isOpera = !!window.opr && !!opr.addons || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
-
   var isFirefox = typeof InstallTrigger !== 'undefined';
-
   var isSafari = /constructor/i.test(window.HTMLElement) || function (p) {
     return p.toString() === '[object SafariRemoteNotification]';
   }(!window['safari'] || typeof safari !== 'undefined' && window['safari'].pushNotification);
-
   var isIE = false || !!document.documentMode;
-
   var isEdge = !isIE && !!window.StyleMedia;
-
   var isChrome = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime);
   if (!isChrome) isChrome = navigator.userAgent.indexOf('Chrome');
-
   var isEdgeChromium = isChrome && navigator.userAgent.indexOf('Edg') != -1;
-
   var isBlink = (isChrome || isOpera) && !!window.CSS;
   if (isOpera) return 'opera';
   if (isFirefox) return 'firefox';
@@ -642,7 +624,6 @@ function osName() {
   if (window.navigator.userAgent.indexOf('Linux') != -1) OSName = 'Linux';
   return OSName;
 }
-
 function check_frequently(freq, lastrun, store) {
   if (!lastrun) return true;
   if (op.get(freq, 'once_per_user')) return false;
@@ -658,7 +639,6 @@ function check_frequently(freq, lastrun, store) {
 function checkRunConditions(freq, conds, lastrun, store) {
   var acc = store.matchAccount() || {};
   var location = store.matchLocation() || {};
-
   if (!check_frequently(freq, lastrun, store)) return false;
   for (var i = 0; i < size(conds); i++) {
     var cond = conds[i];
@@ -671,7 +651,6 @@ function checkRunConditions(freq, conds, lastrun, store) {
           });
           if (found) return false;
         }
-
         let urls = filter(cond.urls, url => norm(url));
         if (size(urls) > 0) {
           let found = find(urls, url => {
@@ -905,7 +884,6 @@ function diffYear(a, b, tzoffset) {
 function sameDay(a, b, tzoffset) {
   return diffDay(a, b, tzoffset) === 0;
 }
-
 function shortTime(utcms, tzoffset, now) {
   var machineoffsetmin = -new Date().getTimezoneOffset();
   var offsetmin = machineoffsetmin;
@@ -928,13 +906,9 @@ function shortTime(utcms, tzoffset, now) {
   let tzdate = tztime.getDate();
   if (tzhour < 10) tzhour = '0' + tzhour;
   if (tzmin < 10) tzmin = '0' + tzmin;
-
   if (sameDay(time, now, tzoffset)) return tzhour + ':' + tzmin;
-
   if (diffDay(time, now, tzoffset) <= 5) return tzdddd + ', ' + tzhour + ':' + tzmin;
-
   if (diffYear(time, now, tzoffset) === 0) return tzmonthname + ' ' + tzdate + ', ' + tzhour + ':' + tzmin;
-
   return tzyear + '/' + tzmonth + '/' + tzdate + ', ' + tzhour + ':' + tzmin;
 }
 function unixSec(t) {
@@ -953,7 +927,6 @@ function getMs(t) {
   }
   return t * 1e3;
 }
-
 function detectLang() {
   let urllang = getUrlParameter('sbz_locale');
   let doclang = document.getElementsByTagName('html')[0].getAttribute('xml:lang') || document.getElementsByTagName('html')[0].getAttribute('lang');

package/compiled_src/util/extractor.js

@@ -57,7 +57,6 @@ function extractEmails(text) {
 function extractPhones(msg) {
   msg = msg || '';
   var fgmsg = '';
-
   var realchmap = {};
   for (var i = 0; i < msg.length; i++) {
     var ch = msg.charAt(i);

package/compiled_src/util/gate.test.js

@@ -4,7 +4,6 @@ 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

@@ -10,7 +10,6 @@ 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;

package/compiled_src/util/op.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.get = get;
 exports.set = set;
-
 var toStr = Object.prototype.toString;
 var isArray = Array.isArray || function (obj) {
   return toStr.call(obj) === '[object Array]';

package/compiled_src/util/order.js

@@ -51,7 +51,6 @@ function calcOrderTotal(order) {
     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;
@@ -67,7 +66,6 @@ function calcOrderTotal(order) {
     item.total = price;
     subtotal += price;
   });
-
   let taxM = {};
   op.map(order.items, (item, i) => {
     if (!item.product) return;
@@ -89,7 +87,6 @@ function calcOrderTotal(order) {
   } 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')) {
@@ -105,7 +102,6 @@ function calcOrderTotal(order) {
   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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.99",
+	"version": "4.1.2",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -19,7 +19,7 @@
 		"file-loader": "^6.2.0",
 		"less": "^4.1.3",
 		"less-loader": "^11.1.0",
-		"marked": "^4.2.3",
+		"marked": "^4.2.4",
 		"preact": "^10.11.3"
 	},
 	"devDependencies": {
@@ -31,10 +31,10 @@
 		"babel-loader": "^9.1.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
-		"puppeteer": "^19.3.0",
+		"puppeteer": "^19.4.0",
 		"webpack": "^5.75.0",
 		"webpack-bundle-analyzer": "^4.7.0",
-		"webpack-cli": "^5.0.0",
+		"webpack-cli": "^5.0.1",
 		"webpack-dev-server": "^4.11.1"
 	}
 }

package/src/chatbox/Header.js

@@ -187,7 +187,8 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
 		return (
 			<div
 				class={`widget-header--wrap-button-back ${unreadcount ? 'widget-header--has-convo-unred' : ''}`}
-				onClick={(e) => this.onBackClick(e)}>
+				onClick={(e) => this.onBackClick(e)}
+			>
 				<div class='widget-header--button-back' data-tooltip={this.props.t('menu_back')}></div>
 				{$unreadcount}
 			</div>
@@ -202,7 +203,8 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
 				class='widget-header--button widget-header--button-close'
 				data-tooltip={this.props.t('close')}
 				data-tooltip-position='bottom'
-				onClick={(e) => this.onCloseClick(e)}>
+				onClick={(e) => this.onCloseClick(e)}
+			>
 				<span class='widget-header--button-close-icon'></span>
 			</div>
 		)
@@ -227,4 +229,8 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
 	}
 }
 
-let getJoinedNameMember = (agents) => sb.map(agents, (agent) => agent.name).join(', ')
+let getJoinedNameMember = (agents) => {
+	agents = sb.filter(agents, (agent) => sb.trim(agent.fullname))
+	if (!agents.length) return null
+	return sb.map(agents, (agent) => agent.fullname).join(', ')
+}

package/src/lib.js

@@ -20,18 +20,6 @@ class Widget {
 		this.store.onConvoEvent({_isMounted: true}, (ev) => sb.map(this.subs, (sub) => sub(ev)))
 	}
 
-	setLang(obj) {
-		var xhttp = new XMLHttpRequest()
-		xhttp.open('GET', 'https://api.sbz.vn/4.0/oldlang', true)
-		xhttp.send()
-	}
-
-	toggleLangDebugMode() {
-		var xhttp = new XMLHttpRequest()
-		xhttp.open('GET', 'https://api.sbz.vn/4.0/oldlangdebug', true)
-		xhttp.send()
-	}
-
 	async waitReady(cb) {
 		await this.store.readyGate.entry()
 		cb()
@@ -146,10 +134,7 @@ class Widget {
 	version = () => '4.5'
 
 	setSetting = (setting) => this.store.setSetting({account_setting: setting})
-	getSetting = (_) => ({account_setting: sb.cloneDeep(this.store.matchAccountSetting())})
-
 	getUser = () => sb.parseJSON(sb.stringify(this.store.matchUser()))
-
 	setViewingProduct = (p) => this.store.linkProduct(p)
 	getViewingProduct = () => this.store.getLinkedProduct()
 
@@ -160,6 +145,11 @@ class Widget {
 		return this.pluginMgr.setCurrentChatboxLocale(locale)
 	}
 
+	async setLanguage(locale) {
+		await this.domGate.entry()
+		return this.pluginMgr.setCurrentChatboxLocale(locale)
+	}
+
 	async setPluginLocale(id, locale) {
 		await this.domGate.entry()
 		return this.pluginMgr.setPluginLocale(id, locale)

package/src/store/store.js

@@ -469,7 +469,7 @@ export default class Store {
 
 				let convo = this.cache.match('convo_' + id) || {}
 				let mem = sb.find(convo.members, (m) => m.id === user.id)
-				mem.seen_at = Date.now()
+				if (mem) mem.seen_at = Date.now()
 				this._setConvo(convo)
 				this.g_haveSentSeenM[lastmsgsent.id] = true
 			})

package/src/util/common.js

@@ -312,7 +312,7 @@ export function orderBy(a, k, d) {
 }
 
 export function isPhone(phone) {
-	var re = /^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/im
+	var re = /^[\+]?[(]?[0-9]{2,3}[)]?[-\s\.]?[0-9]{3,4}[-\s\.]?[0-9]{4,6}$/im
 	return re.test(String(phone))
 }