@subiz/widget-v4 4.1.92 → 4.1.94

package/compiled_src/bot.js

@@ -10,6 +10,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _default(store) {
+  if (!store.matchAutoStartBot()) return;
   let botM = store.matchBot();
   if (Object.keys(botM).length === 0) return;
   _index.default.each(botM, bot => {

package/compiled_src/chatbox/ChatButton.js

@@ -167,7 +167,9 @@ class ChatButton extends _common.Com {
     let account = this.props.store.matchAccount();
     let accountSetting = this.props.plugin.chatbox;
     let byid = _index.default.get(this.state.previewEvent, 'by.display_id', _index.default.get(this.state.previewEvent, 'by.id'));
-    let agent = _index.default.cloneDeep(this.props.store.matchAgent(byid)) || {};
+    let agent = this.props.store.matchAgent(byid);
+    if (!agent) agent = this.props.store.matchAgent('*')[byid] || {};
+    agent = _index.default.cloneDeep(agent);
     agent.fullname = agent.fullname || _index.default.get(account, 'name') || this.props.t('agent');
     agent.avatar_url = agent.avatar_url || defaultAvatar;
     let position = _index.default.get(accountSetting, 'desktop_button.position') || 'right';

package/compiled_src/chatbox/Rating.js

@@ -15,6 +15,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 const POPUP_MAX_HEIGHT = 400;
 const POPUP_HARD_MAX_HEIGHT = 500;
 const POPUP_MIN_HEIGHT = 0;
+const RATING_EXPIRED_TIME = 15 * 60_000;
 class Rating extends _common.Com {
   constructor(props) {
     super(props);
@@ -138,14 +139,18 @@ class Rating extends _common.Com {
   }
   shoudDisplay() {
     if (!this.props.cid) return false;
-    var requested;
-    var rated;
-    var ended;
+    let requested;
+    let rated;
+    let ended;
+    let lastMessageSentAt = 0;
     let user = this.props.store.matchUser();
     let foundUser = false;
     _index.default.map(this.props.store.listEvents(this.props.cid), ev => {
       if (!ev || !ev.by) return;
-      if (ev.by.type == 'user' && ev.type == 'message_sent') foundUser = true;
+      if (ev.type === 'message_sent') {
+        if (_index.default.get(ev, 'by.type') === 'user') foundUser = true;
+        if (ev.created > lastMessageSentAt) lastMessageSentAt = ev.created;
+      }
       if (ev.type === 'conversation_state_updated' && _index.default.get(ev, 'data.conversation.state') === 'ended') {
         ended = ev;
       }
@@ -155,7 +160,14 @@ class Rating extends _common.Com {
     if (!foundUser) return false;
     if (rated) return false;
     let accountSetting = this.props.plugin.chatbox;
-    var auto = accountSetting.auto_request_rating && ended;
+    let auto = accountSetting.auto_request_rating && ended;
+    if (auto) {
+      if (lastMessageSentAt) {
+        auto = auto && Date.now() - lastMessageSentAt < RATING_EXPIRED_TIME;
+      } else {
+        auto = false;
+      }
+    }
     return requested || auto;
   }
   onCloseRating() {

package/compiled_src/chatbox/Widget.js

@@ -655,7 +655,7 @@ class Widget extends _common.Com {
     convos = _index.default.orderByF(convos, convo => _index.default.get(convo, 'last_message_sent.created', convo.actived), 'desc');
     var $convos = _index.default.map(convos, convo => {
       let ags = _index.default.filter(convo.members, m => {
-        return (m.type === 'agent' || m.type === 'bot') && m.membership === 'active';
+        return m.type === 'agent' || m.type === 'bot';
       });
       let agentids = _index.default.map(ags, m => m.id);
       agentids = agentids || _index.default.agentsOfConvo(convo)[0];
@@ -861,7 +861,7 @@ class Widget extends _common.Com {
     let accountSetting = this.props.plugin.chatbox || {};
     let agentM = this.props.store.matchAgent('*');
     let ags = _index.default.filter(convo.members, m => {
-      return (m.type === 'agent' || m.type === 'bot') && m.membership === 'active';
+      return m.type === 'agent' || m.type === 'bot';
     });
     let agentids = _index.default.map(ags, m => m.id);
     agentids = agentids || _index.default.agentsOfConvo(convo)[0];

package/compiled_src/lib.js

@@ -285,6 +285,9 @@ class Widget {
       this.pluginMgr.showCurrentGreeting();
     }
   }
+  stopAutobot() {
+    this.store.doNotStartBot();
+  }
 }
 window.__sbz_WIDGET = Widget;
 var _default = exports.default = Widget;

package/compiled_src/store/api.js

@@ -33,14 +33,14 @@ class _default {
       });
       return this.apireq.post(`/accounts/${this.accid}/conversations`, data);
     });
-    _defineProperty(this, "sendConvoEvent", (cid, ev) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/events`, ev));
+    _defineProperty(this, "sendConvoEvent", (cid, ev) => this.apireq.addQuery('x-referer', _index.default.get(location, 'origin', '')).post(`/accounts/${this.accid}/conversations/${cid}/events`, ev));
     _defineProperty(this, "createPostback", (cid, p) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/postbacks`, p));
     _defineProperty(this, "markAsReceived", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/receive`));
     _defineProperty(this, "markAsSeen", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/seen`));
     _defineProperty(this, "getConversation", cid => this.apireq.get(`/accounts/${this.accid}/conversations/${cid}`));
     _defineProperty(this, "getLocaleContent", locale => this.apireq.get(`/accounts/${this.accid}/locales/${locale}`));
-    _defineProperty(this, "sendEvent", data => this.apireq.addQuery('shorten', true).post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
-    _defineProperty(this, "submitForm", (form_id, page_url, device, data, user) => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}/events`, {
+    _defineProperty(this, "sendEvent", data => this.apireq.addQuery('shorten', true).addQuery('x-referer', _index.default.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
+    _defineProperty(this, "submitForm", (form_id, page_url, device, data, user) => this.apireq.addQuery('x-referer', _index.default.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, {
       by: {
         id: this.uid,
         device: device

package/compiled_src/store/store.js

@@ -217,6 +217,13 @@ class Store {
       this.sendPresence();
     });
     window.addEventListener('beforeunload', () => this.api.sendLostFocus());
+    this.doNotStartBot = () => {
+      this._donotstartbot = true;
+    };
+    this.autoStartBot = () => {
+      this._donotstartbot = false;
+    };
+    this.matchAutoStartBot = () => !this._donotstartbot;
     this._presenceInterval1 = _index.default.setInterval(() => {
       if (this._die) return _index.default.clearInterval(this._presenceInterval1);
       if (this.browserVisibility === 'visible' && document.hasFocus()) this.sendPresence();

package/dist/127.js

@@ -0,0 +1,273 @@
+"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__(8150);
+/* 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;
+}
+
+/***/ })
+
+}]);