@subiz/widget-v4 4.0.46 → 4.0.51

package/src/chatbox/main.js

@@ -45,6 +45,8 @@ export default class Main extends Com {
 			widgetView: '',
 			widgetConvoId: '',
 		})
+
+		this.checkExpand()
 		this.props.store.onResetCSS(this, () => this.refreshCSS())
 		this.props.store.onConvoEvent(this, (_) => this.checkExpand())
 		this.props.store.onUpdate(this, (_) => this.checkExpand())
@@ -114,7 +116,7 @@ export default class Main extends Com {
 	}
 
 	async showWidget(p) {
-		this.refButton.current && this.refButton.current.clearPreview()
+		this.refButton.current && this.refButton.current.ClearPreview()
 		if (!p.view) {
 			let lastview = this.props.store.matchLastview() || {}
 			p.view = sb.get(lastview, 'view')
@@ -136,11 +138,11 @@ export default class Main extends Com {
 	}
 
 	showGreeting() {
-		this.refButton.current && this.refButton.current.showGreeting()
+		this.refButton.current && this.refButton.current.ShowGreeting()
 	}
 
 	hideGreeting() {
-		this.refButton.current && this.refButton.current.hideGreeting()
+		this.refButton.current && this.refButton.current.HideGreeting()
 	}
 
 	hideWidget() {
@@ -151,7 +153,7 @@ export default class Main extends Com {
 	}
 
 	onWidgetClose() {
-		this.refButton.current && this.refButton.current.clearPreview()
+		this.refButton.current && this.refButton.current.ClearPreview()
 		this.props.store.setHasManuallyClosed()
 		this.hideWidget()
 	}

package/src/plugin.js

@@ -29,7 +29,7 @@ function Plugin(plugin, store, $container, lib) {
 
 	this.getState = () => state
 
-	var run = async function() {
+	var run = async function () {
 		if (_destroy) return
 		if (state !== 'hold') return
 
@@ -370,10 +370,15 @@ function downloadLanguage(store, locale, force) {
 }
 
 const getLocale = (plugin, loc) => {
-	let found = sb.find(plugin.locales, (l) => l === loc)
+	if (!loc) loc = ''
+	let found = sb.find(plugin.locales, (l) => l.toLowerCase().trim() === loc.toLowerCase().trim())
 	if (found) return loc
-	found = sb.find(plugin.locales, (l) => (l || '').toLowerCase().includes(loc.toLowerCase()))
-	if (found) return found
 
+	found = sb.find(plugin.locales, (l) => {
+		l = l.replace('-', '_').split('_')[0].trim().toLowerCase()
+		let compareloc = loc.replace('-', '_').split('_')[0].trim().toLowerCase()
+		return l == compareloc
+	})
+	if (found) return found
 	return plugin.locale || 'en-US'
 }

package/src/store/store.js

@@ -149,7 +149,7 @@ export default class Store {
 	overridePlugin(plugins) {
 		if (!Array.isArray(plugins)) throw 'plugins must be be an array'
 		let pluginM = {}
-		sb.map(plugins, function(plugin) {
+		sb.map(plugins, function (plugin) {
 			pluginM[plugin.id] = plugin
 		})
 		this.forcePlugins = pluginM
@@ -930,6 +930,143 @@ export default class Store {
 		setTimeout(() => this.loopTime(), 60000)
 	}
 
+	getPrice(obj, field, currency) {
+		if (!obj) return 0
+		if (!currency) return obj[field] || 0
+		let defcur = sb.get(this.matchAccount(), 'currency')
+		if (currency != defcur) return sb.get(obj, [field + '_locale', currency], 0)
+		return obj[field] || 0
+	}
+
+	getOrderTotal(order) {
+		let subtotal = 0
+		sb.map(order.items, (item) => {
+			if (!item.product) return 0
+			let price = this.getPrice(item.product, 'price', order.currency) * item.quantity
+
+			if (item.discount_type) {
+				if (item.discount_type == 'percentage') {
+					if (item.discount_before_tax && item.discount_percentage > 0) {
+						price = price * (1 - item.discount_percentage / 10000)
+					}
+				} else if (item.discount_type == 'amount') {
+					let computed_discount = this.getPrice(item, 'discount', order.currency)
+					if (item.discount_before_tax && computed_discount > 0) {
+						price = price - computed_discount
+						if (price <= 0) price = 0
+					}
+				}
+			}
+			subtotal += price
+		})
+
+		let computed_discount = 0
+		// add specific item discount after tax to computed_discount
+		sb.map(order.items, (item) => {
+			if (!item.discount_type) return
+			if (!item.product) return 0
+			let price = this.getPrice(item.product, 'price', order.currency) * item.quantity
+
+			let tax = item.product.tax
+			let taxprice = 0
+			if (tax && tax.id) taxprice = (price * tax.percentage) / 10000
+
+			if (item.discount_type == 'percentage' && !item.discount_before_tax && item.discount_percentage > 0) {
+				computed_discount += ((price + taxprice) * item.discount_percentage) / 10000
+			} else if (item.discount_type == 'amount') {
+				let itemdiscount = this.getPrice(item, 'discount', order.currency)
+				if (!item.discount_before_tax && itemdiscount > 0) {
+					// CAUTION: easy to miss condition
+					if (itemdiscount > price + taxprice) itemdiscount = price + taxprice
+					computed_discount += itemdiscount
+				}
+			}
+		})
+
+		// TAX
+		let totaltax = 0
+		let taxM = {}
+		sb.map(order.items, (item, i) => {
+			if (!item.product) return
+			let tax = item.product.tax
+			if (!tax) return
+			if (!tax.id) return
+			let price = this.getPrice(item.product, 'price', order.currency) * item.quantity
+
+			if (item.discount_type) {
+				if (item.discount_type == 'percentage') {
+					if (item.discount_before_tax && item.discount_percentage > 0) {
+						price = price * (1 - item.discount_percentage / 10000)
+					}
+				} else if (item.discount_type == 'amount') {
+					let computed_discount = this.getPrice(item, 'discount', order.currency)
+					if (item.discount_before_tax && computed_discount > 0) {
+						price = price - computed_discount
+						if (price <= 0) price = 0
+					}
+				}
+			}
+			let taxprice = (price * tax.percentage) / 10000
+
+			taxM[i] = {
+				tax: tax,
+				taxprice: taxprice,
+			}
+		})
+
+		// have discount before tax
+		if (order.discount_before_tax) {
+			// decrease tax by discount percentage
+			if (order.discount_type == 'percentage' && order.discount_percentage > 0) {
+				sb.map(taxM, (t) => {
+					t.taxprice = t.taxprice * (1 - order.discount_percentage / 10000)
+				})
+				computed_discount += (subtotal * order.discount_percentage) / 10000
+			} else if (order.discount_type == 'amount') {
+				let discount = this.getPrice(order, 'discount', order.currency)
+				if (subtotal > 0) {
+					sb.map(taxM, (t) => {
+						// CAUTION: easy to miss
+						if (discount > subtotal) discount = subtotal
+
+						t.taxprice = t.taxprice * (1 - discount / subtotal)
+					})
+				}
+				computed_discount += discount
+			}
+		} else {
+			if (order.discount_type == 'percentage' && order.discount_percentage > 0) {
+				let taxprice = 0
+				sb.map(taxM, (t) => (taxprice += t.taxprice))
+				computed_discount += ((subtotal + taxprice) * order.discount_percentage) / 10000
+			} else if (order.discount_type == 'amount') {
+				let discount = this.getPrice(order, 'discount', order.currency)
+				computed_discount += discount
+			}
+		}
+
+		// SHIP
+		let shippingfee = this.getPrice(order.shipping, 'fee', order.currency)
+		if (shippingfee > 0) {
+			if (sb.get(order, 'shipping.tax.id')) {
+				let tax = order.shipping.tax
+				let taxprice = (shippingfee * tax.percentage) / 10000
+				taxM['ship'] = {tax: tax, taxprice: taxprice}
+			}
+		}
+
+		let taxprice = 0
+		sb.map(taxM, (t) => (taxprice += t.taxprice))
+		let total = subtotal + taxprice - computed_discount + shippingfee
+
+		// add adjustment
+		let adj = this.getPrice(order, 'adjustment', order.currency)
+		total += adj
+
+		if (total < 0) total = 0
+		return {subtotal, computed_discount, taxM, total}
+	}
+
 	replaceFileUrl(src) {
 		if (!src) return ''
 
@@ -1042,7 +1179,7 @@ function getGaClientId() {
 	if (!hasGA()) return clientId
 
 	var allTrackers = window.ga.getAll() || []
-	allTrackers.forEach(function(tracker) {
+	allTrackers.forEach(function (tracker) {
 		clientId = tracker.get('clientId')
 	})
 
@@ -1059,7 +1196,7 @@ function getGaTrackingIds() {
 	if (!hasGA()) return trackingIds
 
 	const allTrackers = window.ga.getAll() || []
-	allTrackers.forEach(function(tracker) {
+	allTrackers.forEach(function (tracker) {
 		var trackingId = tracker.get('trackingId')
 		if (trackingId) trackingIds.push(trackingId)
 	})
@@ -1077,7 +1214,7 @@ function sendToGA(category, action, label) {
 	if (!hasGA()) return
 
 	const allTrackers = window.ga.getAll() || []
-	allTrackers.forEach(function(tracker) {
+	allTrackers.forEach(function (tracker) {
 		const name = tracker.get('name')
 		window.ga(name + '.send', 'event', category, action, label)
 	})
@@ -1090,7 +1227,7 @@ function sendEventToThirdParty(category, action, label) {
 }
 
 // from http://detectmobilebrowsers.com/
-let mobileCheck = (function(a) {
+let mobileCheck = (function (a) {
 	return (
 		/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
 			a,
@@ -1101,6 +1238,7 @@ let mobileCheck = (function(a) {
 	)
 })(navigator.userAgent || navigator.vendor || window.opera)
 
-let tabletCheck = /(ipad|tablet|(android(?!.*mobile))|(windows(?!.*phone)(.*touch))|kindle|playbook|silk|(puffin(?!.*(IP|AP|WP))))/.test(
-	navigator.userAgent,
-)
+let tabletCheck =
+	/(ipad|tablet|(android(?!.*mobile))|(windows(?!.*phone)(.*touch))|kindle|playbook|silk|(puffin(?!.*(IP|AP|WP))))/.test(
+		navigator.userAgent,
+	)

package/src/util/common.js

@@ -1071,6 +1071,12 @@ export function getUrlParameter() {
 
 export var sleep = (ms) => new Promise((res) => setTimeout(res, ms))
 
+export function formatCurrency(val) {
+	if (!val) return 0
+	val = Math.round(val)
+	return val.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,')
+}
+
 function replaceFileUrl(src) {
 	let fileurl = 'https://vcdn.subiz-cdn.com/file/'
 	if (!src) return ''