dimorder-orderapp-lib 1.1.1 → 1.1.4

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":"AAGA,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,CA4Ff"}
1
+ {"version":3,"file":"calculateLocalBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"AAGA,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,CA0Gf"}
@@ -17,7 +17,9 @@ function calculateLocalBatchItem(item, order) {
17
17
  // 餐點的基本價格 = 餐點價格 + 選項價格
18
18
  let originalTotal = priceDeductDiscount + optionsTotal;
19
19
  // 計算 modifiers
20
- let totalDiscount = 0; // 統計全部折扣 (不包含改價及撞餐)
20
+ let totalModifiersDiscount = 0; // 統計全部折扣 (包含 MERCHANT, COMBORULE, DISCOUNT)
21
+ let totalDiscountModifiersDiscount = 0; // 統計全部折扣 (只包含 DISCOUNT)
22
+ let totalMerchantModifiersDiscount = 0; // 統計全部折扣 (只包含 MERCHANT, COMBORULE)
21
23
  let total = originalTotal; // 折扣後的金額 (計算 modifiers 時也是剩餘可折扣金額)
22
24
  // 尋找是否有改價 (MERCHANT modifier 為改價)
23
25
  const hasMerchantModifier = item.modifiers.some(modifier => modifier.type === 'MERCHANT' && modifier.deletedAt == null);
@@ -34,7 +36,13 @@ function calculateLocalBatchItem(item, order) {
34
36
  // 計算折了多少錢 (計算結果不可 > 可折扣金額)
35
37
  const discountValue = Math.min(total, total - totalAfterModifier);
36
38
  // 折扣記入總折扣
37
- totalDiscount += discountValue;
39
+ totalModifiersDiscount += discountValue;
40
+ if (modifier.type === 'DISCOUNT') {
41
+ totalDiscountModifiersDiscount += discountValue;
42
+ }
43
+ else {
44
+ totalMerchantModifiersDiscount += discountValue;
45
+ }
38
46
  // 從可折扣金額中扣除
39
47
  total -= discountValue;
40
48
  // 寫入 modifier 中
@@ -47,7 +55,9 @@ function calculateLocalBatchItem(item, order) {
47
55
  // 計入 setItems 價格
48
56
  originalTotal += lodash_1.default.sumBy(setItems, 'originalTotal');
49
57
  totalMenuDiscount += lodash_1.default.sumBy(setItems, 'totalMenuDiscount');
50
- totalDiscount += lodash_1.default.sumBy(setItems, 'totalDiscount');
58
+ totalModifiersDiscount += lodash_1.default.sumBy(setItems, 'totalDiscount');
59
+ totalDiscountModifiersDiscount += lodash_1.default.sumBy(setItems, 'totalDiscountModifiersDiscount');
60
+ totalMerchantModifiersDiscount += lodash_1.default.sumBy(setItems, 'totalMerchantModifiersDiscount');
51
61
  total += lodash_1.default.sumBy(setItems, 'total');
52
62
  // 補欄位
53
63
  const prices = lodash_1.default.fill(Array(item.quantity), total);
@@ -56,14 +66,16 @@ function calculateLocalBatchItem(item, order) {
56
66
  originalTotal *= item.quantity;
57
67
  totalWithoutSetItems *= item.quantity;
58
68
  totalMenuDiscount *= item.quantity;
59
- totalDiscount *= item.quantity;
69
+ totalModifiersDiscount *= item.quantity;
70
+ totalDiscountModifiersDiscount *= item.quantity;
71
+ totalMerchantModifiersDiscount *= item.quantity;
60
72
  total *= item.quantity;
61
73
  const isDeleted = (item.deletedAt != null && item.deletedAt !== '') || item.cancelled;
62
74
  return Object.assign(Object.assign({}, item), { setItems,
63
75
  modifiers,
64
76
  prices,
65
77
  totals,
66
- priceDeductDiscount, originalTotal: isDeleted ? 0 : (0, fixPrecision_1.default)(originalTotal), totalMenuDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalMenuDiscount), totalDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalDiscount), total: isDeleted ? 0 : (0, fixPrecision_1.default)(total), totalWithoutSetItems: isDeleted ? 0 : (0, fixPrecision_1.default)(totalWithoutSetItems) });
78
+ priceDeductDiscount, originalTotal: isDeleted ? 0 : (0, fixPrecision_1.default)(originalTotal), totalMenuDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalMenuDiscount), totalDiscountModifiersDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalDiscountModifiersDiscount), totalMerchantModifiersDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalMerchantModifiersDiscount), totalDiscount: isDeleted ? 0 : (0, fixPrecision_1.default)(totalModifiersDiscount), total: isDeleted ? 0 : (0, fixPrecision_1.default)(total), totalWithoutSetItems: isDeleted ? 0 : (0, fixPrecision_1.default)(totalWithoutSetItems), totalWithoutDiscountModifiers: isDeleted ? 0 : (0, fixPrecision_1.default)(total + totalDiscountModifiersDiscount) });
67
79
  }
68
80
  exports.default = calculateLocalBatchItem;
69
81
  //# 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;AAE7C,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,QAAQ,EAAE,SAAS,GAAG,SAAS,CA+P3E"}
1
+ {"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE7C,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,QAAQ,EAAE,SAAS,GAAG,SAAS,CAwP3E"}
@@ -18,33 +18,22 @@ function calculateLocalOrder(appOrder) {
18
18
  // ======================== 計算 item level ========================
19
19
  // 餐點原價
20
20
  let productsOriginalTotal = 0;
21
- // 餐點小計 (餐點原價加總不含折扣) = itemTotal + itemDiscount
21
+ // 餐點小計 (餐點原價加總不含 DISCOUNT 折扣,但會含 COMBORULE, MERCHANT)
22
22
  let productsSubtotal = 0;
23
23
  // 餐點總價 (經過折扣) = itemSubtotal - itemDiscount
24
24
  let productsTotal = 0;
25
+ // 項目折扣 (只包含 DISCOUNT 折扣)
26
+ let productDiscountModifiersDiscount = 0;
25
27
  // 項目折扣 (只包含 COMBORULE 撞餐和 MERCHANT 改價)
26
- let productFixDiscount = 0;
27
- // 項目折扣 (只包含 modifier 的 DISCOUNT 折扣,不含撞餐規則和改價)
28
- let productsDiscount = 0;
28
+ let productMerchantModifiersDiscount = 0;
29
29
  order.batches = lodash_1.default.map(order.batches, batch => {
30
30
  const calculatedItems = batch.items.map(item => (0, calculateLocalBatchItem_1.default)(item, order));
31
31
  if (['submitted', 'confirmed'].includes(batch.status)) {
32
32
  // 只計算 submitted, confirmed 的 batch
33
33
  productsOriginalTotal += lodash_1.default.sumBy(calculatedItems, 'originalTotal');
34
- calculatedItems.forEach(item => {
35
- const isDeleted = (item.deletedAt != null && item.deletedAt !== '') || item.cancelled;
36
- if (!isDeleted) {
37
- item.modifiers.forEach(modifier => {
38
- if (modifier.type === 'DISCOUNT') {
39
- productsDiscount += -modifier.calculatedAmount * item.quantity;
40
- }
41
- if (['COMBORULE', 'MERCHANT'].includes(modifier.type)) {
42
- productFixDiscount += -modifier.calculatedAmount * item.quantity;
43
- }
44
- });
45
- }
46
- });
47
- productsSubtotal += lodash_1.default.sumBy(calculatedItems, 'total') + productsDiscount;
34
+ productDiscountModifiersDiscount += lodash_1.default.sumBy(calculatedItems, 'totalDiscountModifiersDiscount');
35
+ productMerchantModifiersDiscount += lodash_1.default.sumBy(calculatedItems, 'totalMerchantModifiersDiscount');
36
+ productsSubtotal += lodash_1.default.sumBy(calculatedItems, 'totalWithoutDiscountModifiers');
48
37
  productsTotal += lodash_1.default.sumBy(calculatedItems, 'total');
49
38
  }
50
39
  return Object.assign(Object.assign({}, batch), { items: calculatedItems });
@@ -95,10 +84,15 @@ function calculateLocalOrder(appOrder) {
95
84
  let calculatedAmountAcc = 0; // modifier 的 surcharge 總計
96
85
  lodash_1.default.forEach(order.batches, batch => {
97
86
  batch.items.forEach(item => {
87
+ var _a, _b;
98
88
  if (modifier.overrideItem || !item.excludedOrderSurcharge) {
99
- const totalWithSurcharge = item.total * (100 + modifier.percent) / 100 + modifier.amount;
100
- const surcharge = totalWithSurcharge - item.total;
89
+ // 服務費使用 totalWithoutDiscountModifiers (不含 DISCOUNT 的餐點 total) 來計算
90
+ console.log('item.totalWithoutDiscountModifiers', item.totalWithoutDiscountModifiers);
91
+ console.log('surcharge modifier', modifier);
92
+ const totalWithSurcharge = ((_a = item.totalWithoutDiscountModifiers) !== null && _a !== void 0 ? _a : 0) * (100 + modifier.percent) / 100 + modifier.amount;
93
+ const surcharge = totalWithSurcharge - ((_b = item.totalWithoutDiscountModifiers) !== null && _b !== void 0 ? _b : 0);
101
94
  item.surcharge += surcharge; // 加總到 batch item 的 surcharge
95
+ console.log('surcharge', surcharge);
102
96
  calculatedAmountAcc += surcharge; // 加總到 modifier 的 surcharge
103
97
  }
104
98
  });
@@ -200,11 +194,11 @@ function calculateLocalOrder(appOrder) {
200
194
  order.originalShippingFee = (0, fixPrecision_1.default)(originalShippingFee);
201
195
  order.discountShippingFee = (0, fixPrecision_1.default)(discountShippingFee);
202
196
  // 餐點原價總計
203
- order.originalTotal = (0, fixPrecision_1.default)(productsOriginalTotal - productFixDiscount);
197
+ order.originalTotal = (0, fixPrecision_1.default)(productsOriginalTotal - productMerchantModifiersDiscount);
204
198
  // 餐點小計 (餐點原價加總不含折扣)
205
199
  order.subtotal = (0, fixPrecision_1.default)(productsSubtotal);
206
200
  // 折扣總計
207
- order.calculatedDiscountTotal = (0, fixPrecision_1.default)(modifiersAmountTotal - productsDiscount);
201
+ order.calculatedDiscountTotal = (0, fixPrecision_1.default)(modifiersAmountTotal - productDiscountModifiersDiscount);
208
202
  // 訂單總計
209
203
  order.total = (0, fixPrecision_1.default)(total);
210
204
  // 顯示用的訂單總計
@@ -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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"}
@@ -78,6 +78,8 @@ export interface IAppBatchItem extends Omit<IOrderBatchItem, 'id' | 'modifiers'
78
78
  excludeOrderDiscount: boolean;
79
79
  excludedOrderSurcharge: boolean;
80
80
  totalMenuDiscount?: number;
81
+ totalDiscountModifiersDiscount?: number;
82
+ totalMerchantModifiersDiscount?: number;
81
83
  totalDiscount: number;
82
84
  status: string;
83
85
  modifiers: IModifier[];
@@ -97,6 +99,7 @@ export interface IAppBatchItem extends Omit<IOrderBatchItem, 'id' | 'modifiers'
97
99
  image?: string;
98
100
  originalPrice?: number; /** @deprecated 改用 totalWithoutSetItems */
99
101
  totalWithoutSetItems?: number;
102
+ totalWithoutDiscountModifiers?: number;
100
103
  }
101
104
  export interface IFormatedBatchItem extends IAppBatchItem {
102
105
  totalDiscount: number;
@@ -1 +1 @@
1
- {"version":3,"file":"AppOrder.d.ts","sourceRoot":"","sources":["../../src/types/AppOrder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AppOrder.d.ts","sourceRoot":"","sources":["../../src/types/AppOrder.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": "1.1.1",
3
+ "version": "1.1.4",
4
4
  "main": "dist",
5
5
  "license": "UNLICENSED",
6
6
  "scripts": {