@subiz/widget-v4 4.1.79 → 4.1.81

package/compiled_src/chatbox/time.js

@@ -29,7 +29,7 @@ class Time extends _common.Com {
     if (this.props.ago) {
       if (this.props.short) {}
       if (!t && this.props.time > 0) t = ago(this.props.time, new _index.default.Date().getTime(), this.props.t);
-    } else t = _index.default.shortTime(this.props.time, this.props.tzoffset, Date.now(), forceLocale);
+    } else t = _index.default.shortTime(this.props.time, this.props.tzoffset, _index.default.Date.now(), forceLocale);
     if (this.props.uppercase) t = t.toUpperCase();
     if (t === this.state.t) return;
     this.setState({

package/compiled_src/store/api.js

@@ -145,7 +145,7 @@ class _default {
       let outuser;
       for (let i = 0; true; i++) {
         outuser = await ajax.setBaseUrl(this.ApiURL).withCredentials(true).addQuery('v', '6').addQuery('x-user-ref', this.ref).setParser('json').get(`/accounts/${this.accid}/users/${this.ref}`);
-        if (outuser.error && _index.default.get(outuser, 'body.code', '').indexOf('locked_account') != -1) break;
+        if (outuser.error && _index.default.get(outuser, 'body.error.code', '').indexOf('locked_account') != -1) break;
         if (!_index.default.get(outuser, 'body.id')) {
           let sleeptime = Math.min(2000 + i * 400, 60000);
           await _index.default.sleep(sleeptime);

package/compiled_src/store/store.js

@@ -326,13 +326,16 @@ class Store {
     this.pubsub.publish('account');
   }
   isMobile() {
-    return this.forceDevice === 'mobile' || this.device_type == 'mobile';
+    if (this.forceDevice) return this.forceDevice === 'mobile';
+    return this.device_type == 'mobile' || _index.default.get(window, 'screen.width', 1000) < 576;
   }
   isTablet() {
-    return this.forceDevice === 'tablet' || this.device_type == 'tablet';
+    if (this.forceDevice) return this.forceDevice === 'tablet';
+    return this.device_type == 'tablet';
   }
   isDesktop() {
-    return this.forceDevice === 'desktop' || !this.isMobile() && !this.isTable();
+    if (this.forceDevice) return this.forceDevice === 'desktop';
+    return !this.isMobile() && !this.isTable();
   }
   disconnect(key) {
     this.g_sync[key] = 0;
@@ -459,9 +462,26 @@ class Store {
         if (this.g_haveSentSeenM[lastmsgsent.id]) return;
         if (lastmsgsent.id === lastmsgsent.data.message.idempotency_key) return;
         this.api.markAsSeen(id, lastmsgsent.id);
+        this.pubsub.publish('events', {
+          created: _index.default.Date.now(),
+          type: 'message_pong',
+          by: {
+            type: 'user'
+          },
+          data: {
+            message: {
+              conversation_id: id,
+              id: '*',
+              pongs: [{
+                type: 'seen',
+                created: _index.default.Date.now()
+              }]
+            }
+          }
+        });
         let convo = this.cache.match('convo_' + id) || {};
         let mem = _index.default.find(convo.members, m => m.id === user.id);
-        if (mem) mem.seen_at = Date.now();
+        if (mem) mem.seen_at = _index.default.Date.now();
         this._setConvo(convo);
         this.g_haveSentSeenM[lastmsgsent.id] = true;
       });

package/loader.js

@@ -44,7 +44,7 @@ subizc2oasp.com
 	}
 
 	// we will try to inject the loader script the client site
-	// the first domain to try is: https://subiz.xyz/sbz/app.js?accid=34234234
+	// the first domain to try is: https://widget.subiz.net/sbz/app.js?accid=34234234
 	// if fail, try https://storage.googleapis.com/sbz/api.js?accid=34234234.
 	// If fail again, try sbz-65.com, sbz-95.comc, sbz-140.com and sbz-205.com.
 	// If all of those domains failed, we give up

package/old.md

@@ -0,0 +1 @@
+<script type="text/javascript">var subiz_account_id = "4216";(function() { var sbz = document.createElement("script"); sbz.type = "text/javascript"; sbz.async = true; sbz.src = ("https:" == document.location.protocol ? "https://" : "http://") + "widget.subiz.com/static/js/loader.js?v="+ (new Date()).getFullYear() + ("0" + ((new Date()).getMonth() + 1)).slice(-2) + ("0" + (new Date()).getDate()).slice(-2); var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(sbz, s);})();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.79",
+	"version": "4.1.81",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -9,7 +9,7 @@
 		"lib": "rm -rf compiled_src && npx babel --out-dir=compiled_src src"
 	},
 	"dependencies": {
-		"@subiz/ajax": "^3.0.14",
+		"@subiz/ajax": "^3.0.16",
 		"@subiz/flow": "^1.1.0",
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^4.0.24",
@@ -30,8 +30,8 @@
 		"babel-loader": "^9.1.3",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.0",
-		"puppeteer": "^22.10.0",
-		"webpack": "^5.91.0",
+		"puppeteer": "^22.12.0",
+		"webpack": "^5.92.1",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "^5.0.4"

package/src/chatbox/time.js

@@ -39,7 +39,7 @@ export default class Time extends Com {
 			}
 
 			if (!t && this.props.time > 0) t = ago(this.props.time, new sb.Date().getTime(), this.props.t)
-		} else t = sb.shortTime(this.props.time, this.props.tzoffset, Date.now(), forceLocale)
+		} else t = sb.shortTime(this.props.time, this.props.tzoffset, sb.Date.now(), forceLocale)
 
 		if (this.props.uppercase) t = t.toUpperCase()
 

package/src/store/api.js

@@ -63,7 +63,7 @@ export default class {
 					.addQuery('x-user-ref', this.ref)
 					.setParser('json')
 					.get(`/accounts/${this.accid}/users/${this.ref}`)
-				if (outuser.error && sb.get(outuser, 'body.code', '').indexOf('locked_account') != -1) break
+				if (outuser.error && sb.get(outuser, 'body.error.code', '').indexOf('locked_account') != -1) break
 
 				if (!sb.get(outuser, 'body.id')) {
 					let sleeptime = Math.min(2000 + i * 400, 60000)

package/src/store/store.js

@@ -202,15 +202,18 @@ export default class Store {
 	}
 
 	isMobile() {
-		return this.forceDevice === 'mobile' || this.device_type == 'mobile'
+		if (this.forceDevice) return this.forceDevice === 'mobile'
+		return this.device_type == 'mobile' || sb.get(window, 'screen.width', 1000) < 576
 	}
 
 	isTablet() {
-		return this.forceDevice === 'tablet' || this.device_type == 'tablet'
+		if (this.forceDevice) return this.forceDevice === 'tablet'
+		return this.device_type == 'tablet'
 	}
 
 	isDesktop() {
-		return this.forceDevice === 'desktop' || (!this.isMobile() && !this.isTable())
+		if (this.forceDevice) return this.forceDevice === 'desktop'
+		return !this.isMobile() && !this.isTable()
 	}
 
 	disconnect(key) {
@@ -523,9 +526,23 @@ export default class Store {
 				// send seen
 				this.api.markAsSeen(id, lastmsgsent.id)
 
+				// fire own event so guest code can update unread number
+				this.pubsub.publish('events', {
+					created: sb.Date.now(),
+					type: 'message_pong',
+					by: {type: 'user'},
+					data: {
+						message: {
+							conversation_id: id,
+							id: '*',
+							pongs: [{type: 'seen', created: sb.Date.now()}],
+						},
+					},
+				})
+
 				let convo = this.cache.match('convo_' + id) || {}
 				let mem = sb.find(convo.members, (m) => m.id === user.id)
-				if (mem) mem.seen_at = Date.now()
+				if (mem) mem.seen_at = sb.Date.now()
 				this._setConvo(convo)
 				this.g_haveSentSeenM[lastmsgsent.id] = true
 			})

package/dist/127.js

@@ -1,273 +0,0 @@
-"use strict";
-(self["webpackChunk_subiz_widget_v4"] = self["webpackChunk_subiz_widget_v4"] || []).push([[127],{
-
-/***/ 6127:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "default": () => (/* binding */ ProductAttachments)
-/* harmony export */ });
-/* harmony import */ var _util_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6801);
-/* harmony import */ var _common_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2840);
-/* harmony import */ var preact__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172);
-
-
-
-class ProductAttachments extends _common_js__WEBPACK_IMPORTED_MODULE_1__/* .Com */ .Mw {
-  render() {
-    let byType = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(this.props.ev, 'by.type');
-    if (byType === 'user') return null;
-    let acc = this.props.store.matchAccount();
-    var attachments = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(this.props.ev, 'data.message.attachments', []);
-    let orders = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.filter(attachments, att => att.type === 'order' && att.order).map(att => att.order);
-    if (orders.length === 0) return null;
-    let $orders = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.map(orders, (order, index) => {
-      calcOrderTotal(order);
-      let $note = null;
-      if (order.note) {
-        $note = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label"
-        }, this.props.t('note')), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__note",
-          title: order.note
-        }, order.note));
-      }
-      let $products = null;
-      if (_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.size(order.items) > 0) {
-        $products = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label"
-        }, this.props.t('product')), _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.map(order.items, item => {
-          let product = item.product || {};
-          return (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-            class: "order_attachment__product"
-          }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("img", {
-            class: "order_attachment__product_img",
-            alt: '' + _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(product, 'id'),
-            src: _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(product, 'image', __webpack_require__(2876))
-          }), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-            style: "overflow: hidden !important;"
-          }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-            class: "order_attachment__product_name",
-            title: this.props.t.i18n(product.i18n_name) || product.name
-          }, this.props.t.i18n(product.i18n_name) || product.name), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-            class: "order_attachment__product_desc"
-          }, getProductPropName(product, ' / ')), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-            class: "order_attachment__product_desc"
-          }, this.props.t('qty'), " ", item.quantity, "\xA0\xB7\xA0", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(product.price))));
-        }));
-      }
-      let $total = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        class: "order_attachment__footer"
-      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        class: "d-flex align-items-center justify-content-between"
-      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, this.props.t('total')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("b", {
-        class: "order_attachment__total"
-      }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.total)))));
-      let phoneattr = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.find(_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'user.attributes', []), attr => attr.key === 'phones') || {
-        key: 'phones',
-        text: ''
-      };
-      let phone = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'shipping.address.phone', '').trim();
-      phone = phone || _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.trim(phoneattr.text);
-      if (phone) phone = this.props.t('phn') + ': ' + phone;
-      let $shipto = null;
-      if (displayOrderShippingAddress(order) || phone) {
-        $shipto = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label"
-        }, this.props.t('ship_to')), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, displayOrderShippingAddress(order)), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__text_truncate"
-        }, phone));
-      }
-      let $beforeTax = null;
-      if (order._discount_before_tax) {
-        $beforeTax = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__footer"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "d-flex align-items-center justify-content-between"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label no_margin"
-        }, this.props.t('subtotal_before_tax')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._order_value))), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "d-flex align-items-center justify-content-between"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label no_margin"
-        }, this.props.t('discount_before_tax')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", null, "-", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._discount_before_tax))));
-      }
-      let $subtotal = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        class: "d-flex align-items-center justify-content-between"
-      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        class: "order_attachment__label no_margin"
-      }, this.props.t('subtotal')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        style: ""
-      }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.subtotal)));
-      let $tax = null;
-      if (order.total_tax) {
-        let taxname = '';
-        if (_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.size(order._taxM) === 1) {
-          let tax = _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order._taxM, '0.tax', {});
-          if (tax.name && tax.percentage) taxname = `(${tax.name} ${Math.round(tax.percentage || 0) / 100}%)`;
-        }
-        $tax = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "d-flex align-items-center justify-content-between"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label no_margin"
-        }, this.props.t('tax'), " ", taxname), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          style: ""
-        }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.total_tax)));
-      }
-      let $discount = null;
-      if (order.discount_type === 'percentage' && order.discount_percentage) {
-        $discount = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "d-flex align-items-center justify-content-between"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label no_margin"
-        }, this.props.t('discount_after_tax'), " (", Math.round(order.discount_percentage / 100), "%)"), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          style: ""
-        }, "-", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._computed_discount)));
-      }
-      if (order.discount_type === 'amount' && order.discount_amount) {
-        $discount = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "d-flex align-items-center justify-content-between"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label no_margin"
-        }, this.props.t('discount_after_tax')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "no-shrink"
-        }, "-", _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order._computed_discount)));
-      }
-      let $shipping = null;
-      if (_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'shipping.nominal_fee')) {
-        $shipping = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "d-flex align-items-center justify-content-between"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label no_margin"
-        }, this.props.t('shipping_fee')), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          style: ""
-        }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(_util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.get(order, 'shipping.nominal_fee', 0))));
-      }
-      let $adjustment = null;
-      if (order.adjustment) {
-        $adjustment = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "d-flex align-items-center justify-content-between"
-        }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "order_attachment__label no_margin"
-        }, order.adjustment_description), ' ', (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-          class: "no-shrink"
-        }, _util_index_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.formatCurrency(order.adjustment)));
-      }
-      $subtotal = (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        class: "order_attachment__footer"
-      }, $subtotal, $tax, $shipping, $discount, $adjustment);
-      if (!$shipping && !$adjustment && !$discount && !$tax) {
-        $subtotal = null;
-      }
-      return (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        class: `order_attachment order_attachment__${byType}`
-      }, (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("div", {
-        class: "order_attachment__header"
-      }, this.props.t('order'), (0,preact__WEBPACK_IMPORTED_MODULE_2__.h)("span", {
-        class: "order_attachment__text_muted order_attachment__text_sm"
-      }, getOrderDisplayName(order))), $products, $shipto, $note, $beforeTax, $subtotal, $total);
-    });
-    return $orders;
-  }
-}
-function getProductPropName(product, seperator = ' - ') {
-  let options = op.get(product, 'options', []);
-  let props = op.get(product, 'props', []);
-  let multiPropsOptions = op.filter(options, option => op.size(option.values) > 1);
-  let names = [];
-  op.each(multiPropsOptions, option => {
-    let prop = op.find(props, prop => prop.key === option.key) || {};
-    if (prop.value) names.push(prop.value);
-  });
-  return names.join(seperator);
-}
-function getOrderDisplayName(order = {}) {
-  return order.number || order.id || '';
-}
-function displayOrderShippingAddress(order, isShorten) {
-  let addr = op.get(order, 'shipping.address', {});
-  let fulladdr = [addr.address, addr.ward, addr.district, addr.province].filter(a => a).join(', ').trim();
-  if (isShorten) fulladdr = shortenAddr(fulladdr);
-  return fulladdr;
-}
-function shortenAddr(str) {
-  str = str || '';
-  str = str.replace(/Hà Nội/gi, 'HN');
-  str = str.replace(/Hồ Chí Minh/gi, 'HCM');
-  str = str.replace(/Thành Phố/gi, 'TP');
-  return str;
-}
-function calcOrderTotal(order) {
-  let subtotal = 0;
-  let beforeTaxDiscount = 0;
-  let ordervalue = 0;
-  op.map(order.items, item => {
-    if (!item.product) return 0;
-    let price = op.get(item, 'product.price', 0) * (item.quantity || 0);
-    ordervalue += price;
-    if (item.discount_type == 'percentage') {
-      if (item.discount_percentage > 0) {
-        beforeTaxDiscount += price * item.discount_percentage / 10000;
-        price = price * (1 - (item.discount_percentage || 0) / 10000);
-      }
-    } else if (item.discount_type == 'amount') {
-      if (item.discount_amount > 0) {
-        beforeTaxDiscount += item.discount_amount;
-        price = price - (item.discount_amount || 0);
-        if (price <= 0) price = 0;
-      }
-    }
-    item.total = price;
-    subtotal += price;
-  });
-  let taxM = {};
-  op.map(order.items, (item, i) => {
-    if (!item.product) return;
-    let tax = item.product.tax;
-    if (!tax) return;
-    if (!tax.id) return;
-    let taxprice = item.total * tax.percentage / 10000;
-    item.total_tax = taxprice;
-    taxM[i] = {
-      tax: tax,
-      taxprice: taxprice
-    };
-  });
-  let totaltax = 0;
-  op.map(taxM, t => totaltax += t.taxprice);
-  let computed_discount = 0;
-  if (order.discount_type == 'percentage' && order.discount_percentage > 0) {
-    computed_discount = (subtotal + totaltax) * order.discount_percentage / 10000;
-  } else if (order.discount_type == 'amount') {
-    computed_discount = order.discount_amount || 0;
-  }
-  let shippingfee = op.get(order, 'shipping.nominal_fee', 0);
-  if (shippingfee > 0) {
-    if (op.get(order, 'shipping.tax.id')) {
-      let tax = order.shipping.tax;
-      let taxprice = shippingfee * (tax.percentage / 10000);
-      taxM['ship'] = {
-        tax: tax,
-        taxprice: taxprice
-      };
-      order.shipping.total_tax = taxprice;
-    }
-  }
-  totaltax = 0;
-  op.map(taxM, t => totaltax += t.taxprice);
-  let total = subtotal + totaltax - computed_discount + shippingfee;
-  total += order.adjustment || 0;
-  if (total < 0) total = 0;
-  order.subtotal = subtotal;
-  order._computed_discount = computed_discount;
-  order._taxM = taxM;
-  order.total = total;
-  order.total_tax = totaltax;
-  order._discount_before_tax = beforeTaxDiscount;
-  order._order_value = ordervalue;
-}
-
-/***/ })
-
-}]);