@subiz/widget-v4 4.0.69 → 4.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.69",
+	"version": "4.0.72",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,7 +14,7 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.22.0",
+		"core-js": "^3.22.1",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.2",
@@ -23,15 +23,16 @@
 		"preact": "^10.7.1"
 	},
 	"devDependencies": {
+		"@babel/cli": "^7.17.5",
 		"@babel/core": "^7.17.9",
 		"@babel/plugin-proposal-class-properties": "^7.16.7",
 		"@babel/plugin-transform-react-jsx": "^7.17.3",
 		"@babel/preset-env": "^7.16.11",
-		"@babel/cli": "^7.17.5",
 		"babel-loader": "^8.2.4",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
-		"puppeteer": "^13.5.2",
+		"prettier": "^2.6.2",
+		"puppeteer": "^13.6.0",
 		"webpack": "^5.72.0",
 		"webpack-bundle-analyzer": "^4.5.0",
 		"webpack-cli": "^4.9.2",

package/src/order/order.js

@@ -144,7 +144,7 @@ export default class Order extends common.Com {
 	renderDesktopPaymentMethod(order) {
 		return null
 		let editmode = false
-		if (!order.status || order.status == 'new') {
+		if (!order.status || order.status == 'open') {
 			editmode = !order.user_confirmation
 		}
 
@@ -246,7 +246,7 @@ export default class Order extends common.Com {
 
 	renderDesktopShipping(order) {
 		let editmode = false
-		if (!order.status || order.status == 'new') {
+		if (!order.status || order.status == 'open') {
 			editmode = !order.user_confirmation
 		}
 
@@ -566,7 +566,7 @@ export default class Order extends common.Com {
 		)
 
 		let editmode = false
-		if (!order.status || order.status == 'new') {
+		if (!order.status || order.status == 'open') {
 			editmode = !order.user_confirmation
 		}
 		let $note = null
@@ -611,7 +611,7 @@ export default class Order extends common.Com {
 	}
 
 	renderStatusBadge(order) {
-		let status = order.status || 'new'
+		let status = order.status || 'open'
 		return (
 			<div style='float: right !important;' class={'order_status order_status__' + status}>
 				{status}
@@ -620,7 +620,7 @@ export default class Order extends common.Com {
 	}
 
 	renderShippingInfo(order) {
-		if (order.status != 'new' || order.user_confirmation) {
+		if (order.status != 'open' || order.user_confirmation) {
 			// read only
 		}
 
@@ -752,7 +752,7 @@ export default class Order extends common.Com {
 	renderDesktopProducts(order) {
 		let $products = null
 		let editmode = false
-		if (!order.status || order.status == 'new') {
+		if (!order.status || order.status == 'open') {
 			editmode = !order.user_confirmation
 		}
 
@@ -868,10 +868,10 @@ export default class Order extends common.Com {
 			</div>
 		)
 
-		
-		
 
-		if (order.user_confirmation || order.status != 'new') {
+
+
+		if (order.user_confirmation || order.status != 'open') {
 			$status = null
 			if (this.props.cid)
 			$close = (
@@ -881,7 +881,7 @@ export default class Order extends common.Com {
 			)
 		}
 
-	
+
 
 		return (
 			<div class='order' style='height: 100% !important'>
@@ -912,7 +912,7 @@ export default class Order extends common.Com {
 	renderActions(order) {
 		let $actions = null
 		let editmode = false
-		if (!order.status || order.status == 'new') {
+		if (!order.status || order.status == 'open') {
 			editmode = !order.user_confirmation
 		}
 

package/src/store/store.js

@@ -11,16 +11,6 @@ cookie.expiresMultiplier = 60 * 60 * 24 // days
 cookie.defaults.expires = 3650 // 10 year
 
 const MAX_CONVO = 20
-const ga_client_id = ''
-
-setTimeout(() => {
-	if (window.gtag) {
-		window.gtag('get', 'UA-XXXXXXXX-Y', 'client_id', (clientid) => {
-			ga_client_id = clientid
-		})
-	}
-}, 100)
-
 const page_loaded = sb.Date.now()
 
 // available localstorage key mask, user, session, hasManuallyClosed, isopen, close_preview_at, lastview, bot_run_logs, plugin_run_logs
@@ -749,7 +739,7 @@ export default class Store {
 		this._typing(cid)
 	}
 
-	_typing = sb.throttle((convoid) => this.api.sendTyping(convoid), 3000)
+	_typing = sb.throttle((convoid) => this.api.sendTyping(convoid), 3000, {trailing: false})
 
 	async startConvo(req) {
 		await this.readyGate.entry()
@@ -1100,9 +1090,10 @@ const inmemCookie = {
 // getGaClientId returns ID of the client in Google Analytics
 // return empty string if GA is not installed
 function getGaClientId() {
-	if (ga_client_id) return ga_client_id
-	if (!hasGA()) return ga_client_id
+	if (!window.ga) return
+	if (!window.ga.getAll) return
 	var allTrackers = window.ga.getAll() || []
+	let ga_client_id = ''
 	allTrackers.forEach(function (tracker) {
 		ga_client_id = tracker.get('clientId')
 	})
@@ -1110,15 +1101,14 @@ function getGaClientId() {
 	return ga_client_id
 }
 
-// hasGA tells if the website is using Google Analytics or not
-const hasGA = () => !!((window.ga && window.ga.getAll) || window.gtag)
-
 // getGaTrackingIds returns all tracking ids in Google Analytics
 // return empty array if GA is not installed
 function getGaTrackingIds() {
 	var trackingIds = []
-	if (!hasGA()) return trackingIds
+	if (!(window.ga && window.ga.getAll)) return trackingIds
 
+	if (!window.ga) return []
+	if (!window.ga.getAll) return []
 	const allTrackers = window.ga.getAll() || []
 	allTrackers.forEach(function (tracker) {
 		var trackingId = tracker.get('trackingId')
@@ -1135,19 +1125,16 @@ function sendToFBPixel(category, action, label) {
 }
 
 function sendToGA(category, action, label) {
-	if (!hasGA()) return
-
-	if (window.gtag) {
-		window.gtag('event', category + '.' + action, label)
-		return
-	}
-
-	if (window.ga) {
+	console.log('SENT.', category, action, label)
+	if (window.ga && window.ga.getAll) {
 		const allTrackers = window.ga.getAll() || []
 		allTrackers.forEach(function (tracker) {
 			const name = tracker.get('name')
 			window.ga(name + '.send', 'event', category, action, label)
 		})
+	} else {
+		// only send gtag when ga is not available
+		if (window.gtag) window.gtag('event', category, {Action: action, Label: label})
 	}
 }
 

package/up

@@ -38,6 +38,6 @@ sleep 5
 
 echo "Remove cloudfare cache"
 # PURGE CLOUD FLARE CACHE
-curl -X POST "https://api.cloudflare.com/client/v4/zones/e8f5c860cbbc130dd389313324a6c35e/purge_cache" -H "X-Auth-Email: thanhpham@vietnambiz.com" -H "X-Auth-Key: $(cat ~/.cloudflare)"
+curl -X POST "https://api.cloudflare.com/client/v4/zones/e8f5c860cbbc130dd389313324a6c35e/purge_cache" -H "X-Auth-Email: thanhpham@vietnambiz.com" -H "X-Auth-Key: $(cat ~/.cloudflare)" -H "Content-Type: application/json" --data '{"purge_everything":true}'
 
 echo "Success. $(cat dist/HASH)"