dimorder-orderapp-lib 0.1.306 → 0.1.308

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE5D,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GACf,aAAa,CAyFf"}
1
+ {"version":3,"file":"calculateLocalBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE5D,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GACf,aAAa,CA6Ff"}
@@ -15,7 +15,8 @@ function calculateLocalBatchItem(item, order) {
15
15
  let baseTotal = priceDeductDiscount + optionsTotal;
16
16
  let totalMenuDiscount = item.discount; // 統計全部 menu 減價 (menu.discount)
17
17
  // 計算 modifiers
18
- let totalDiscount = 0; // 統計全部折扣
18
+ let totalDisplayDiscount = 0; // 統計全部折扣 (不包含改價及撞餐,用於顯示)
19
+ let totalRealDiscount = 0; // 統計全部折扣 (包含改價及撞餐)
19
20
  let discountBaseTotalForModifier = baseTotal; // 剩餘可折扣金額
20
21
  // 尋找是否有改價 (MERCHANT modifier 為改價)
21
22
  const hasMerchantModifier = item.modifiers.some(modifier => modifier.type === 'MERCHANT' && modifier.deletedAt == null);
@@ -32,38 +33,40 @@ function calculateLocalBatchItem(item, order) {
32
33
  const totalAfterModifier = Math.max(0, baseTotal * (100 + Number(modifier.percent)) / 100 + Number(modifier.amount));
33
34
  // 本次折了多少錢 (計算結果不可 > 可折扣金額)
34
35
  const discountValue = Math.min(discountBaseTotalForModifier, baseTotal - totalAfterModifier);
36
+ totalRealDiscount += discountValue;
35
37
  if (modifier.type !== 'MERCHANT' && modifier.type !== 'COMBORULE') {
36
38
  // 計入折扣總計
37
- totalDiscount += discountValue;
39
+ totalDisplayDiscount += discountValue;
38
40
  }
39
41
  // 從可折扣金額扣除
40
42
  discountBaseTotalForModifier -= discountValue;
41
43
  // 寫入 modifier 中
42
44
  return Object.assign(Object.assign({}, modifier), { calculatedAmount: -discountValue });
43
45
  });
44
- let total = baseTotal - totalDiscount;
46
+ let total = baseTotal - totalRealDiscount;
45
47
  let originalPrice = total + totalMenuDiscount;
46
48
  const setItems = item.setItems.map((setItem) => calculateLocalBatchItem(setItem, order));
47
49
  const setItemsMenuDiscount = lodash_1.default.sumBy(setItems, 'totalMenuDiscount');
48
50
  const setItemsDiscountTotal = lodash_1.default.sumBy(setItems, 'totalDiscount');
49
51
  const setItemsTotal = lodash_1.default.sumBy(setItems, 'total');
50
52
  totalMenuDiscount += setItemsMenuDiscount;
51
- totalDiscount += setItemsDiscountTotal;
53
+ totalDisplayDiscount += setItemsDiscountTotal;
52
54
  total += setItemsTotal;
53
55
  baseTotal += setItemsTotal;
54
56
  const prices = lodash_1.default.fill(Array(item.quantity), total);
55
57
  const totals = lodash_1.default.fill(Array(item.quantity), total);
56
58
  // 計算 quantity
57
59
  totalMenuDiscount *= item.quantity;
58
- totalDiscount *= item.quantity;
60
+ totalDisplayDiscount *= item.quantity;
59
61
  total *= item.quantity;
60
62
  baseTotal *= item.quantity;
61
63
  originalPrice *= item.quantity;
62
64
  const isDeleted = (item.deletedAt != null && item.deletedAt !== '') || item.cancelled;
63
- return Object.assign(Object.assign({}, item), { modifiers: modifiers, totalMenuDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalMenuDiscount), totalDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalDiscount), total: isDeleted ? 0 : (0, fixPrecision_1.default)(total), originalTotal: isDeleted ? 0 : (0, fixPrecision_1.default)(baseTotal), setItems,
65
+ const resultItem = Object.assign(Object.assign({}, item), { modifiers: modifiers, totalMenuDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalMenuDiscount), totalDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalDisplayDiscount), total: isDeleted ? 0 : (0, fixPrecision_1.default)(total), originalTotal: isDeleted ? 0 : (0, fixPrecision_1.default)(baseTotal), setItems,
64
66
  prices,
65
67
  totals,
66
68
  originalPrice });
69
+ return resultItem;
67
70
  }
68
71
  exports.default = calculateLocalBatchItem;
69
72
  //# sourceMappingURL=calculateLocalBatchItem.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateLocalBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,CAuN1H"}
1
+ {"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,CAmN1H"}
@@ -14,7 +14,7 @@ const addNumberWithRounding_1 = __importDefault(require("./addNumberWithRounding
14
14
  const getDisplayStatusKey_1 = __importDefault(require("./getDisplayStatusKey"));
15
15
  function calculateLocalOrder(appOrder, rounding = libConfig_1.default.rounding) {
16
16
  return (0, immer_1.produce)(appOrder, order => {
17
- var _a, _b, _c, _d;
17
+ var _a, _b, _c, _d, _e;
18
18
  // ======================== 計算 item level ========================
19
19
  // 餐點原價
20
20
  let itemOriginalTotal = 0;
@@ -35,12 +35,6 @@ function calculateLocalOrder(appOrder, rounding = libConfig_1.default.rounding)
35
35
  itemTotal += lodash_1.default.sumBy(calculatedItems, 'total');
36
36
  return Object.assign(Object.assign({}, batch), { items: calculatedItems });
37
37
  });
38
- console.log('item level', {
39
- itemOriginalTotal,
40
- itemTotal,
41
- itemSubtotal,
42
- itemDiscount,
43
- });
44
38
  // ======================== 計算 order level ========================
45
39
  // order level 餐點折扣總計
46
40
  let orderProductDiscountTotal = 0;
@@ -60,19 +54,15 @@ function calculateLocalOrder(appOrder, rounding = libConfig_1.default.rounding)
60
54
  (item.excludedOrderSurcharge == null || !item.excludedOrderSurcharge)));
61
55
  return lodash_1.default.sumBy(validItems, 'total');
62
56
  });
63
- console.log('order level', {
64
- surchargeBaseTotal,
65
- discountBaseTotal,
66
- });
67
57
  let shippingFeeBaseTotal = 0; // 可用來計算 shipping modifier 的運費 (不含小額服務費)
68
58
  let smallOrderFee = 0; // 小額服務費
69
59
  if (order.shipping != null && order.deliveryType === 'storeDelivery') {
70
- shippingFeeBaseTotal = (_b = (_a = order.shipping.baseShippingFee) !== null && _a !== void 0 ? _a : 0 + order.shipping.tunnelFee) !== null && _b !== void 0 ? _b : 0;
71
- smallOrderFee = (_c = order.shipping.smallOrderFee) !== null && _c !== void 0 ? _c : 0;
60
+ shippingFeeBaseTotal = (_c = (_b = (_a = order.shipping.baseShippingFee) !== null && _a !== void 0 ? _a : 0 + order.shipping.tunnelFee) !== null && _b !== void 0 ? _b : 0 + order.shipping.longDistanceFee) !== null && _c !== void 0 ? _c : 0;
61
+ smallOrderFee = (_d = order.shipping.smallOrderFee) !== null && _d !== void 0 ? _d : 0;
72
62
  }
73
63
  let discountBaseTotalForModifier = discountBaseTotal; // 剩餘可折扣餐點金額:用於計算 modifier,會隨著計算漸漸被扣除,可被 applyTo: 'PRODUCT', 'ALL' 扣除
74
64
  let shippingFeeTotalForModifier = shippingFeeBaseTotal; // 剩餘可折扣運費:用於計算 modifier,會隨著計算漸漸被扣除,可被 applyTo: 'SHIPPING', 'ALL' 扣除
75
- const modifiers = (0, sortOrderModifiers_1.sortOrderModifiers)((_d = order.modifiers) !== null && _d !== void 0 ? _d : [])
65
+ const modifiers = (0, sortOrderModifiers_1.sortOrderModifiers)((_e = order.modifiers) !== null && _e !== void 0 ? _e : [])
76
66
  .map(modifier => {
77
67
  if (modifier.deletedAt != null) {
78
68
  // * 被刪除的 modifier 不做計算
@@ -86,7 +76,11 @@ function calculateLocalOrder(appOrder, rounding = libConfig_1.default.rounding)
86
76
  // * Ricecoin 可用,但前端不做計算
87
77
  return modifier;
88
78
  }
89
- if (modifier.type === 'SURCHARGE' || modifier.percent > 0 || modifier.amount > 0) {
79
+ if (modifier.type !== 'SURCHARGE' && (modifier.percent > 0 || modifier.amount > 0)) {
80
+ // * 服務費以外不可加價
81
+ return Object.assign(Object.assign({}, modifier), { calculatedAmount: 0 });
82
+ }
83
+ if (modifier.type === 'SURCHARGE') {
90
84
  // * 計算服務費或其他加價 (DISCOUNT 但 percent, amount 為正的應計入服務費中)
91
85
  const surcharge = surchargeBaseTotal * (100 + modifier.percent) / 100 + modifier.amount;
92
86
  // 將服務費加入總服務費
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dimorder-orderapp-lib",
3
- "version": "0.1.306",
3
+ "version": "0.1.308",
4
4
  "main": "dist",
5
5
  "license": "UNLICENSED",
6
6
  "scripts": {