dimorder-orderapp-lib 1.0.0 → 1.0.1
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.
- package/dist/libs/calculateLocalBatchItem.d.ts.map +1 -1
- package/dist/libs/calculateLocalBatchItem.js +3 -5
- package/dist/libs/calculateLocalBatchItem.js.map +1 -1
- package/dist/libs/calculateLocalOrder.d.ts.map +1 -1
- package/dist/libs/calculateLocalOrder.js +25 -17
- package/dist/libs/calculateLocalOrder.js.map +1 -1
- package/dist/libs/sortOrderModifiers.js +1 -1
- package/package.json +1 -1
|
@@ -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,
|
|
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"}
|
|
@@ -33,14 +33,12 @@ function calculateLocalBatchItem(item, order) {
|
|
|
33
33
|
const totalAfterModifier = Math.max(0, total * (100 + Number(modifier.percent)) / 100 + Number(modifier.amount));
|
|
34
34
|
// 計算折了多少錢 (計算結果不可 > 可折扣金額)
|
|
35
35
|
const discountValue = Math.min(total, total - totalAfterModifier);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
totalDiscount += discountValue;
|
|
39
|
-
}
|
|
36
|
+
// 折扣記入總折扣
|
|
37
|
+
totalDiscount += discountValue;
|
|
40
38
|
// 從可折扣金額中扣除
|
|
41
39
|
total -= discountValue;
|
|
42
40
|
// 寫入 modifier 中
|
|
43
|
-
return Object.assign(Object.assign({}, modifier), { calculatedAmount: discountValue });
|
|
41
|
+
return Object.assign(Object.assign({}, modifier), { calculatedAmount: -discountValue });
|
|
44
42
|
});
|
|
45
43
|
// MR 打印時根據 setTotalIncludeItems 可能會需要不包含 setItems 的 total
|
|
46
44
|
let totalWithoutSetItems = total;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,kEAAyC;AACzC,6DAAyD;AAGzD,SAAwB,uBAAuB,CAC7C,IAAmB,EACnB,KAAgB;;IAEhB,wBAAwB;IACxB,IAAI,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAA;IAErC,OAAO;IACP,MAAM,YAAY,GAAG,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IAEpF,kCAAkC;IAClC,MAAM,mBAAmB,GAAG,MAAA,IAAI,CAAC,mBAAmB,mCAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;IACpF,wBAAwB;IACxB,IAAI,aAAa,GAAG,mBAAmB,GAAG,YAAY,CAAA;IAEtD,eAAe;IACf,IAAI,aAAa,GAAG,CAAC,CAAA,CAAC,oBAAoB;IAC1C,IAAI,KAAK,GAAG,aAAa,CAAA,CAAC,mCAAmC;IAE7D,kCAAkC;IAClC,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,IAAI,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,CAAA;IAEvH,MAAM,SAAS,GAAG,IAAA,uCAAkB,EAAC,IAAI,CAAC,SAAS,CAAC;SACjD,GAAG,CAAC,QAAQ,CAAC,EAAE;QACd,IAAI,QAAQ,CAAC,SAAS,IAAI,IAAI,EAAE;YAC9B,uCACK,QAAQ,KACX,gBAAgB,EAAE,CAAC,IACpB;SACF;QAED,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,IAAI,mBAAmB,EAAE;YACxD,uCACK,QAAQ,KACX,gBAAgB,EAAE,CAAC,IACpB;SACF;QAED,4BAA4B;QAC5B,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAEhH,2BAA2B;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,kBAAkB,CAAC,CAAA;QAEjE,
|
|
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,
|
|
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"}
|
|
@@ -22,14 +22,28 @@ function calculateLocalOrder(appOrder) {
|
|
|
22
22
|
let productsSubtotal = 0;
|
|
23
23
|
// 餐點總價 (經過折扣) = itemSubtotal - itemDiscount
|
|
24
24
|
let productsTotal = 0;
|
|
25
|
-
// 項目折扣 (
|
|
25
|
+
// 項目折扣 (只包含 COMBORULE 撞餐和 MERCHANT 改價)
|
|
26
|
+
let productFixDiscount = 0;
|
|
27
|
+
// 項目折扣 (只包含 modifier 的 DISCOUNT 折扣，不含撞餐規則和改價)
|
|
26
28
|
let productsDiscount = 0;
|
|
27
29
|
order.batches = lodash_1.default.map(order.batches, batch => {
|
|
28
30
|
const calculatedItems = batch.items.map(item => (0, calculateLocalBatchItem_1.default)(item, order));
|
|
29
31
|
if (['submitted', 'confirmed'].includes(batch.status)) {
|
|
30
32
|
// 只計算 submitted, confirmed 的 batch
|
|
31
33
|
productsOriginalTotal += lodash_1.default.sumBy(calculatedItems, 'originalTotal');
|
|
32
|
-
|
|
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;
|
|
40
|
+
}
|
|
41
|
+
if (['COMBORULE', 'MERCHANT'].includes(modifier.type)) {
|
|
42
|
+
productFixDiscount += -modifier.calculatedAmount;
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
});
|
|
33
47
|
productsSubtotal += lodash_1.default.sumBy(calculatedItems, 'total') + productsDiscount;
|
|
34
48
|
productsTotal += lodash_1.default.sumBy(calculatedItems, 'total');
|
|
35
49
|
}
|
|
@@ -68,13 +82,9 @@ function calculateLocalOrder(appOrder) {
|
|
|
68
82
|
// * 被刪除的 modifier 不做計算
|
|
69
83
|
return Object.assign(Object.assign({}, modifier), { calculatedAmount: 0 });
|
|
70
84
|
}
|
|
71
|
-
if (modifier.type === 'RICECOIN') {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return Object.assign(Object.assign({}, modifier), { calculatedAmount: 0 });
|
|
75
|
-
}
|
|
76
|
-
// * Ricecoin 可用，但前端不做計算
|
|
77
|
-
return modifier;
|
|
85
|
+
if (modifier.type === 'RICECOIN' && order.deliveryType === 'table') {
|
|
86
|
+
// * 堂食不可用 RiceCoin
|
|
87
|
+
return Object.assign(Object.assign({}, modifier), { calculatedAmount: 0 });
|
|
78
88
|
}
|
|
79
89
|
if (modifier.type !== 'SURCHARGE' && (modifier.percent > 0 || modifier.amount > 0)) {
|
|
80
90
|
// * 服務費以外不可加價
|
|
@@ -178,11 +188,9 @@ function calculateLocalOrder(appOrder) {
|
|
|
178
188
|
// 運費原價 = 運費 + 小額服務費
|
|
179
189
|
const originalShippingFee = shippingFeeBaseTotal + smallOrderFee;
|
|
180
190
|
// 運費折扣總計 = 運費原價 - 運費折扣後總計
|
|
181
|
-
const discountShippingFee = originalShippingFee -
|
|
182
|
-
//
|
|
183
|
-
const
|
|
184
|
-
// 餐點折扣總計 = 餐點總計 - 餐點折扣後總計
|
|
185
|
-
const modifiersProductsDiscountTotal = productsTotal - productsTotalAfterModifiers;
|
|
191
|
+
const discountShippingFee = originalShippingFee - shippingFee;
|
|
192
|
+
// 全部折扣總計 = 全部 calculatedAmount 扣掉服務費
|
|
193
|
+
const modifiersAmountTotal = lodash_1.default.sumBy(order.modifiers, 'calculatedAmount') - surcharge;
|
|
186
194
|
// total = 折扣後 allAcc
|
|
187
195
|
const total = allAcc;
|
|
188
196
|
// 服務費
|
|
@@ -192,11 +200,11 @@ function calculateLocalOrder(appOrder) {
|
|
|
192
200
|
order.originalShippingFee = (0, fixPrecision_1.default)(originalShippingFee);
|
|
193
201
|
order.discountShippingFee = (0, fixPrecision_1.default)(discountShippingFee);
|
|
194
202
|
// 餐點原價總計
|
|
195
|
-
order.originalTotal = (0, fixPrecision_1.default)(productsOriginalTotal);
|
|
203
|
+
order.originalTotal = (0, fixPrecision_1.default)(productsOriginalTotal - productFixDiscount);
|
|
196
204
|
// 餐點小計 (餐點原價加總不含折扣)
|
|
197
205
|
order.subtotal = (0, fixPrecision_1.default)(productsSubtotal);
|
|
198
|
-
//
|
|
199
|
-
order.calculatedDiscountTotal = (0, fixPrecision_1.default)(
|
|
206
|
+
// 折扣總計
|
|
207
|
+
order.calculatedDiscountTotal = (0, fixPrecision_1.default)(modifiersAmountTotal - productsDiscount);
|
|
200
208
|
// 訂單總計
|
|
201
209
|
order.total = (0, fixPrecision_1.default)(total);
|
|
202
210
|
// 顯示用的訂單總計
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,iCAA+B;AAC/B,wFAA+D;AAC/D,kEAAyC;AACzC,sEAA6C;AAC7C,4DAAmC;AACnC,6DAAyD;AACzD,oFAA2D;AAC3D,gFAAuD;AAGvD,SAAwB,mBAAmB,CAAE,QAAmB;IAC9D,OAAO,IAAA,eAAO,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;;QAC/B,kEAAkE;QAClE,OAAO;QACP,IAAI,qBAAqB,GAAG,CAAC,CAAA;QAC7B,+CAA+C;QAC/C,IAAI,gBAAgB,GAAG,CAAC,CAAA;QACxB,4CAA4C;QAC5C,IAAI,aAAa,GAAG,CAAC,CAAA;QACrB,
|
|
1
|
+
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ function sortOrderModifiers(modifiers = []) {
|
|
|
20
20
|
var _a, _b, _c, _d;
|
|
21
21
|
const iScore = ((_a = APPLY_TO_SCORE_MAP[a.applyTo]) !== null && _a !== void 0 ? _a : 0) + ((_b = TYPE_SCORE_MAP[a.type]) !== null && _b !== void 0 ? _b : 0);
|
|
22
22
|
const jScore = ((_c = APPLY_TO_SCORE_MAP[b.applyTo]) !== null && _c !== void 0 ? _c : 0) + ((_d = TYPE_SCORE_MAP[b.type]) !== null && _d !== void 0 ? _d : 0);
|
|
23
|
-
return iScore
|
|
23
|
+
return iScore > jScore ? 1 : -1;
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
exports.sortOrderModifiers = sortOrderModifiers;
|