@subiz/widget-v4 4.0.70 → 4.0.73

package/assets/less/order.less

@@ -449,11 +449,6 @@ div.order__card.order__card__active {
 	.color(white);
 }
 
-.order_status.order_status__processing {
-	background: @primary-color;
-	.color(white);
-}
-
 .order_status.order_status__shipping {
 	background: @black;
 	.color(white);
@@ -474,7 +469,7 @@ div.order__card.order__card__active {
 	.color(white);
 }
 
-.order_status.order_status__new {
+.order_status.order_status__open {
 	background: @yellow;
 	.color(white);
 }

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();
     });
 
@@ -435,7 +437,7 @@ class Order extends common.Com {
     return null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -528,7 +530,7 @@ 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;
     }
 
@@ -835,7 +837,7 @@ class Order extends common.Com {
     }, (0, _preact.h)("div", null, "Ph\xED v\u1EADn chuy\u1EC3n"), (0, _preact.h)("div", null, _index.default.get(order, 'shipping.fee', 0), " d"));
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -871,7 +873,7 @@ class Order extends common.Com {
   }
 
   renderStatusBadge(order) {
-    let status = order.status || 'new';
+    let status = order.status || 'open';
     return (0, _preact.h)("div", {
       style: "float: right !important;",
       class: 'order_status order_status__' + status
@@ -879,7 +881,7 @@ class Order extends common.Com {
   }
 
   renderShippingInfo(order) {
-    if (order.status != 'new' || order.user_confirmation) {}
+    if (order.status != 'open' || order.user_confirmation) {}
 
     let shipping_provider = _index.default.get(order, 'shipping.shipping_provider');
 
@@ -985,7 +987,7 @@ class Order extends common.Com {
     let $products = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -1089,7 +1091,7 @@ class Order extends common.Com {
       onClick: this.onCancel
     }, this.props.t('cancel_order'));
 
-    if (order.user_confirmation || order.status != 'new') {
+    if (order.user_confirmation || order.status != 'open') {
       $status = null;
       if (this.props.cid) $close = (0, _preact.h)("div", {
         class: "order_btn order__btn__light mt-3",
@@ -1121,7 +1123,7 @@ class Order extends common.Com {
     let $actions = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 

package/compiled_src/store/store.js

@@ -29,14 +29,6 @@ cookie.defaults.path = '/';
 cookie.expiresMultiplier = 60 * 60 * 24;
 cookie.defaults.expires = 3650;
 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 = _index.default.Date.now();
 
@@ -178,7 +170,9 @@ class Store {
 
     _defineProperty(this, "seenQueue", []);
 
-    _defineProperty(this, "_typing", _index.default.throttle(convoid => this.api.sendTyping(convoid), 3000));
+    _defineProperty(this, "_typing", _index.default.throttle(convoid => this.api.sendTyping(convoid), 3000, {
+      trailing: false
+    }));
 
     _defineProperty(this, "onConvoEvent", (o, cb) => this.pubsub.on2(o, 'events', cb));
 
@@ -1190,20 +1184,21 @@ const inmemCookie = {
 };
 
 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');
   });
   return ga_client_id;
 }
 
-const hasGA = () => !!(window.ga && window.ga.getAll || window.gtag);
-
 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');
@@ -1221,19 +1216,19 @@ function sendToFBPixel(category, action, label) {
 }
 
 function sendToGA(category, action, label) {
-  if (!hasGA()) return;
+  console.log('SENT.', category, action, label);
 
-  if (window.gtag) {
-    window.gtag('event', category + '.' + action, label);
-    return;
-  }
-
-  if (window.ga) {
+  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 {
+    if (window.gtag) window.gtag('event', category, {
+      Action: action,
+      Label: label
+    });
   }
 }
 

package/dist/132.js

@@ -4101,6 +4101,7 @@ class order_Order extends common/* Com */.up {
       loading: true,
       order: {},
       err: {},
+      shipping_address: 'new',
       selectedProvince: null,
       selectedDistrict: null,
       selectedWard: null,
@@ -4393,16 +4394,17 @@ class order_Order extends common/* Com */.up {
 
     order_defineProperty(this, "onCancel", () => {
       if (this.props.onResponse) this.props.onResponse('rejected');
-      this.close();
-    });
 
-    order_defineProperty(this, "close", () => {
       if (this.props.cid && !this.state.order.user_confirmation) {
         let order = util/* default.cloneDeep */.Z.cloneDeep(this.state.order);
         order.user_confirmation = 'rejected';
         this.props.store.updateOrder(order);
       }
 
+      this.close();
+    });
+
+    order_defineProperty(this, "close", () => {
       if (this.props.onClose) this.props.onClose();
     });
 
@@ -4472,7 +4474,7 @@ class order_Order extends common/* Com */.up {
     return null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -4563,7 +4565,7 @@ class order_Order extends common/* Com */.up {
   renderDesktopShipping(order) {
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -4864,7 +4866,7 @@ class order_Order extends common/* Com */.up {
     }, (0,preact_module.h)("div", null, "Ph\xED v\u1EADn chuy\u1EC3n"), (0,preact_module.h)("div", null, util/* default.get */.Z.get(order, 'shipping.fee', 0), " d"));
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -4900,7 +4902,7 @@ class order_Order extends common/* Com */.up {
   }
 
   renderStatusBadge(order) {
-    let status = order.status || 'new';
+    let status = order.status || 'open';
     return (0,preact_module.h)("div", {
       style: "float: right !important;",
       class: 'order_status order_status__' + status
@@ -4908,7 +4910,7 @@ class order_Order extends common/* Com */.up {
   }
 
   renderShippingInfo(order) {
-    if (order.status != 'new' || order.user_confirmation) {}
+    if (order.status != 'open' || order.user_confirmation) {}
 
     let shipping_provider = util/* default.get */.Z.get(order, 'shipping.shipping_provider');
     if (!shipping_provider) return null;
@@ -5008,7 +5010,7 @@ class order_Order extends common/* Com */.up {
     let $products = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }
 
@@ -5112,7 +5114,7 @@ class order_Order extends common/* Com */.up {
       onClick: this.onCancel
     }, this.props.t('cancel_order'));
 
-    if (order.user_confirmation || order.status != 'new') {
+    if (order.user_confirmation || order.status != 'open') {
       $status = null;
       if (this.props.cid) $close = (0,preact_module.h)("div", {
         class: "order_btn order__btn__light mt-3",
@@ -5144,7 +5146,7 @@ class order_Order extends common/* Com */.up {
     let $actions = null;
     let editmode = false;
 
-    if (!order.status || order.status == 'new') {
+    if (!order.status || order.status == 'open') {
       editmode = !order.user_confirmation;
     }