@subiz/widget-v4 4.0.72 → 4.0.75

package/compiled_src/order/order.js

@@ -46,6 +46,7 @@ class Order extends common.Com {
       loading: true,
       order: {},
       err: {},
+      shipping_address: 'new',
       selectedProvince: null,
       selectedDistrict: null,
       selectedWard: null,
@@ -350,10 +351,7 @@ class Order extends common.Com {
 
     _defineProperty(this, "onCancel", () => {
       if (this.props.onResponse) this.props.onResponse('rejected');
-      this.close();
-    });
 
-    _defineProperty(this, "close", () => {
       if (this.props.cid && !this.state.order.user_confirmation) {
         let order = _index.default.cloneDeep(this.state.order);
 
@@ -361,6 +359,10 @@ class Order extends common.Com {
         this.props.store.updateOrder(order);
       }
 
+      this.close();
+    });
+
+    _defineProperty(this, "close", () => {
       if (this.props.onClose) this.props.onClose();
     });
 

package/compiled_src/store/store.js

@@ -305,7 +305,9 @@ class Store {
       platform: window.navigator.platform,
       referrer: document.URL,
       type: this.isMobile() ? 'mobile' : 'desktop',
-      language: navigator.language
+      language: navigator.language,
+      page_url: document.URL,
+      page_title: document.title
     };
     let ga_client_id = getGaClientId();
     if (ga_client_id) device.ga_client_id = ga_client_id;
@@ -857,9 +859,7 @@ class Store {
       by: {
         id: user.id,
         type: 'user',
-        device: {
-          referrer: document.URL
-        }
+        device: this.device
       },
       data,
       type,

package/compiled_src/util/campaign.js

@@ -80,7 +80,9 @@ function trackInactivity(seconds, cb) {
 }
 
 let timeOnPage = 0;
-setInterval(() => timeOnPage++, 1000);
+setInterval(() => {
+  timeOnPage += 5;
+}, 5000);
 
 function trackTimeOnPage(seconds, cb) {
   if (seconds < 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.72",
+	"version": "4.0.75",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,28 +14,28 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.22.1",
+		"core-js": "^3.22.5",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.2",
 		"less-loader": "^10.2.0",
-		"marked": "^4.0.14",
-		"preact": "^10.7.1"
+		"marked": "^4.0.15",
+		"preact": "^10.7.2"
 	},
 	"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-loader": "^8.2.4",
+		"@babel/cli": "^7.17.10",
+		"@babel/core": "^7.17.12",
+		"@babel/plugin-proposal-class-properties": "^7.17.12",
+		"@babel/plugin-transform-react-jsx": "^7.17.12",
+		"@babel/preset-env": "^7.17.12",
+		"babel-loader": "^8.2.5",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
 		"prettier": "^2.6.2",
-		"puppeteer": "^13.6.0",
-		"webpack": "^5.72.0",
+		"puppeteer": "^14.1.0",
+		"webpack": "^5.72.1",
 		"webpack-bundle-analyzer": "^4.5.0",
 		"webpack-cli": "^4.9.2",
-		"webpack-dev-server": "^4.8.1"
+		"webpack-dev-server": "^4.9.0"
 	}
 }

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,
@@ -868,21 +869,16 @@ export default class Order extends common.Com {
 			</div>
 		)
 
-
-
-
 		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'>
@@ -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

@@ -120,6 +120,8 @@ export default class Store {
 			referrer: document.URL,
 			type: this.isMobile() ? 'mobile' : 'desktop',
 			language: navigator.language,
+			page_url: document.URL,
+			page_title: document.title,
 		}
 
 		let ga_client_id = getGaClientId()
@@ -774,7 +776,7 @@ export default class Store {
 
 		var event = {
 			id: idempotency,
-			by: {id: user.id, type: 'user', device: {referrer: document.URL}},
+			by: {id: user.id, type: 'user', device: this.device},
 			data,
 			type,
 			created: this.now(),

package/src/util/campaign.js

@@ -81,12 +81,14 @@ export function trackInactivity(seconds, cb) {
 }
 
 let timeOnPage = 0 // seconds
-setInterval(() => timeOnPage++, 1000)
+setInterval(() => {
+	timeOnPage += 5
+}, 5000)
 
 // when user has been on the page for at least X seconds
 export function trackTimeOnPage(seconds, cb) {
 	if (seconds < 1) {
-		return setTimeout(function() {
+		return setTimeout(function () {
 			cb(seconds)
 		}, 100)
 	}