@subiz/widget-v4 4.0.52 → 4.0.57

package/cloudflare_worker.js

@@ -16,7 +16,7 @@ document.body.appendChild(tag)`
 
 	return new Response(body, {
 		headers: {
-			'Cache-Control': 'public, max-age=3600, must-revalidate, s-maxage=300, no-transform',
+			'Cache-Control': 'public, max-age=300, must-revalidate, s-maxage=300, no-transform',
 			'Content-Type': 'text/javascript',
 		},
 		status: 200,

package/compiled_src/chatbox/OrderAttachments.js

@@ -61,12 +61,9 @@ class ProductAttachments extends _common.Com {
         }));
       }
 
-      let {
-        total
-      } = this.props.store.getOrderTotal(order);
       let $total = (0, _preact.h)("div", {
         class: "order_attachment__footer"
-      }, (0, _preact.h)("div", null, this.props.t('total')), ' ', (0, _preact.h)("div", null, (0, _preact.h)("b", null, _index.default.formatCurrency(total))));
+      }, (0, _preact.h)("div", null, this.props.t('total')), ' ', (0, _preact.h)("div", null, (0, _preact.h)("b", null, _index.default.formatCurrency(order.total))));
 
       let addr = _index.default.get(order, 'shipping.address', {});
 

package/compiled_src/notif/notif.js

@@ -132,7 +132,7 @@ class Notif extends _common.Com {
 
       let profiles = _index.default.get(this.props, 'plugin.notification.profiles', []);
 
-      let user = profiles[Math.floor(Math.random() * _index.default.size(profiles))];
+      let user = profiles[Math.floor(Math.random() * _index.default.size(profiles))] || {};
 
       if (user.avatar_url && user.avatar_url.startsWith('http')) {
         await _index.default.preloadImg(user.avatar_url);
@@ -154,6 +154,10 @@ class Notif extends _common.Com {
 
       let i18n_message = i18n_messages[Math.floor(Math.random() * _index.default.size(i18n_messages))];
 
+      let fallbackmsgs = _index.default.get(this.props, 'plugin.notification.message_quill_deltas', []);
+
+      let fallbackmessage = fallbackmsgs[Math.floor(Math.random() * _index.default.size(fallbackmsgs))];
+
       let i18n_title = _index.default.get(this.props, 'plugin.notification.i18n_title_quill_delta');
 
       return this.setState({
@@ -161,8 +165,8 @@ class Notif extends _common.Com {
         last_show: _index.default.Date.now(),
         timestamp: timestamp,
         user: user,
-        title: this.props.t.i18n(i18n_title),
-        message: this.props.t.i18n(i18n_message)
+        title: this.props.t.i18n(i18n_title) || _index.default.get(this.props, 'plugin.notification.title_quill_delta'),
+        message: this.props.t.i18n(i18n_message) || fallbackmessage
       });
     }
 

package/compiled_src/plugin.js

@@ -411,7 +411,7 @@ const getLocale = (plugin, loc) => {
 
   let found = _index.default.find(plugin.locales, l => l.toLowerCase().trim() === loc.toLowerCase().trim());
 
-  if (found) return loc;
+  if (found) return found;
   found = _index.default.find(plugin.locales, l => {
     l = l.replace('-', '_').split('_')[0].trim().toLowerCase();
     let compareloc = loc.replace('-', '_').split('_')[0].trim().toLowerCase();

package/compiled_src/store/store.js

@@ -1015,146 +1015,6 @@ class Store {
     setTimeout(() => this.loopTime(), 60000);
   }
 
-  getOrderTotal(order) {
-    let subtotal = 0;
-
-    _index.default.map(order.items, item => {
-      if (!item.product) return 0;
-      let price = item.product.price * 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 = item.discount;
-
-          if (item.discount_before_tax && computed_discount > 0) {
-            price = price - computed_discount;
-            if (price <= 0) price = 0;
-          }
-        }
-      }
-
-      subtotal += price;
-    });
-
-    let computed_discount = 0;
-
-    _index.default.map(order.items, item => {
-      if (!item.discount_type) return;
-      if (!item.product) return 0;
-      let price = item.product.price * 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 = item.discount;
-
-        if (!item.discount_before_tax && itemdiscount > 0) {
-          if (itemdiscount > price + taxprice) itemdiscount = price + taxprice;
-          computed_discount += itemdiscount;
-        }
-      }
-    });
-
-    let totaltax = 0;
-    let taxM = {};
-
-    _index.default.map(order.items, (item, i) => {
-      if (!item.product) return;
-      let tax = item.product.tax;
-      if (!tax) return;
-      if (!tax.id) return;
-      let price = item.product.price * 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 = item.discount;
-
-          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
-      };
-    });
-
-    if (order.discount_before_tax) {
-      if (order.discount_type == 'percentage' && order.discount_percentage > 0) {
-        _index.default.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 = order.discount;
-
-        if (subtotal > 0) {
-          _index.default.map(taxM, t => {
-            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;
-
-        _index.default.map(taxM, t => taxprice += t.taxprice);
-
-        computed_discount += (subtotal + taxprice) * order.discount_percentage / 10000;
-      } else if (order.discount_type == 'amount') {
-        let discount = order.discount;
-        computed_discount += discount;
-      }
-    }
-
-    let shippingfee = lo.get(order, 'shipping.fee');
-
-    if (shippingfee > 0) {
-      if (_index.default.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;
-
-    _index.default.map(taxM, t => taxprice += t.taxprice);
-
-    let total = subtotal + taxprice - computed_discount + shippingfee;
-    let adj = order.adjustment;
-    total += adj;
-    if (total < 0) total = 0;
-    return {
-      subtotal,
-      computed_discount,
-      taxM,
-      total
-    };
-  }
-
   replaceFileUrl(src) {
     if (!src) return '';
     if (_index.default.startsWith(src, '/')) return src;

package/compiled_src/util/campaign.js

@@ -26,7 +26,7 @@ function trackScrollingPercentage(percent, cb) {
     let scrollTop = e.srcElement.scrollingElement ? e.srcElement.scrollingElement.scrollTop : e.srcElement.scrollTop;
     let scrollHeight = e.srcElement.scrollingElement ? e.srcElement.scrollingElement.scrollHeight : e.srcElement.scrollHeight;
 
-    if (scrollTop > 0 && scrollHeight > 0 && scrollTop / scrollHeight >= percent) {
+    if (scrollTop > 0 && scrollHeight > 0 && (scrollTop + window.innerHeight) / scrollHeight >= percent) {
       if (cb) cb();
       window.removeEventListener('scroll', handleScroll, false);
     }
@@ -41,7 +41,12 @@ function trackAreaClicked(selector, cb) {
   common.map(selector.split('\n'), selector => {
     selector = common.trim(selector);
     if (!selector) return;
-    let doms = document.querySelectorAll(selector);
+    let doms = [];
+
+    try {
+      doms = document.querySelectorAll(selector);
+    } catch (e) {}
+
     common.map(doms, dom => {
       if (!dom) return;
       dom.addEventListener('click', cb, false);