@subiz/widget-v4 4.0.70 → 4.0.73

package/src/order/order.js

@@ -21,6 +21,7 @@ export default class Order extends common.Com {
 		loading: true,
 		order: {},
 		err: {},
+		shipping_address: 'new',
 
 		selectedProvince: null,
 		selectedDistrict: null,
@@ -144,7 +145,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 +247,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 +567,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 +612,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 +621,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 +753,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,21 +869,16 @@ 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 = (
-				<div class='order_btn order__btn__light mt-3' onClick={this.close}>
-					{this.props.t('close')}
-				</div>
-			)
+				$close = (
+					<div class='order_btn order__btn__light mt-3' onClick={this.close}>
+						{this.props.t('close')}
+					</div>
+				)
 		}
 
-	
-
 		return (
 			<div class='order' style='height: 100% !important'>
 				<div class='order--content'>
@@ -912,7 +908,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
 		}
 
@@ -1132,15 +1128,15 @@ export default class Order extends common.Com {
 
 	onCancel = () => {
 		if (this.props.onResponse) this.props.onResponse('rejected')
-		this.close()
-	}
-
-	close = () => {
 		if (this.props.cid && !this.state.order.user_confirmation) {
 			let order = sb.cloneDeep(this.state.order)
 			order.user_confirmation = 'rejected'
 			this.props.store.updateOrder(order)
 		}
+		this.close()
+	}
+
+	close = () => {
 		if (this.props.onClose) this.props.onClose()
 	}
 }

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
-let 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
@@ -1100,11 +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')
 	})
@@ -1112,16 +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')
@@ -1138,16 +1125,16 @@ function sendToFBPixel(category, action, label) {
 }
 
 function sendToGA(category, action, label) {
-	if (!hasGA()) return
-
-	if (window.gtag) window.gtag('event', category, {Action: action, Label: label})
-
-	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})
 	}
 }