dimorder-orderapp-lib 1.1.7 → 1.1.10
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 -1
- package/dist/libs/calculateLocalBatchItem.js.map +1 -1
- package/dist/libs/calculateLocalOrder.d.ts.map +1 -1
- package/dist/libs/calculateLocalOrder.js +47 -24
- package/dist/libs/calculateLocalOrder.js.map +1 -1
- package/dist/types/AppOrder.d.ts +1 -0
- package/dist/types/AppOrder.d.ts.map +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,CA6Gf"}
|
|
@@ -50,6 +50,7 @@ function calculateLocalBatchItem(item, order) {
|
|
|
50
50
|
});
|
|
51
51
|
// MR 打印時根據 setTotalIncludeItems 可能會需要不包含 setItems 的 total
|
|
52
52
|
let totalWithoutSetItems = total;
|
|
53
|
+
let totalWithoutSetItemsWithoutDiscountModifiers = total + totalDiscountModifiersDiscount;
|
|
53
54
|
// 計算 setItems
|
|
54
55
|
const setItems = item.setItems.map((setItem) => calculateLocalBatchItem(setItem, order));
|
|
55
56
|
// 計入 setItems 價格
|
|
@@ -65,6 +66,7 @@ function calculateLocalBatchItem(item, order) {
|
|
|
65
66
|
// 計算 quantity
|
|
66
67
|
originalTotal *= item.quantity;
|
|
67
68
|
totalWithoutSetItems *= item.quantity;
|
|
69
|
+
totalWithoutSetItemsWithoutDiscountModifiers *= item.quantity;
|
|
68
70
|
totalMenuDiscount *= item.quantity;
|
|
69
71
|
totalModifiersDiscount *= item.quantity;
|
|
70
72
|
totalDiscountModifiersDiscount *= item.quantity;
|
|
@@ -75,7 +77,7 @@ function calculateLocalBatchItem(item, order) {
|
|
|
75
77
|
modifiers,
|
|
76
78
|
prices,
|
|
77
79
|
totals,
|
|
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) });
|
|
80
|
+
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), totalWithoutSetItemsWithoutDiscountModifiers: isDeleted ? 0 : (0, fixPrecision_1.default)(totalWithoutSetItemsWithoutDiscountModifiers), totalWithoutDiscountModifiers: isDeleted ? 0 : (0, fixPrecision_1.default)(total + totalDiscountModifiersDiscount) });
|
|
79
81
|
}
|
|
80
82
|
exports.default = calculateLocalBatchItem;
|
|
81
83
|
//# sourceMappingURL=calculateLocalBatchItem.js.map
|
|
@@ -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,sBAAsB,GAAG,CAAC,CAAA,CAAC,4CAA4C;IAC3E,IAAI,8BAA8B,GAAG,CAAC,CAAA,CAAC,wBAAwB;IAC/D,IAAI,8BAA8B,GAAG,CAAC,CAAA,CAAC,mCAAmC;IAC1E,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,UAAU;QACV,sBAAsB,IAAI,aAAa,CAAA;QACvC,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;YAChC,8BAA8B,IAAI,aAAa,CAAA;SAChD;aAAM;YACL,8BAA8B,IAAI,aAAa,CAAA;SAChD;QAED,YAAY;QACZ,KAAK,IAAI,aAAa,CAAA;QAEtB,gBAAgB;QAChB,uCACK,QAAQ,KACX,gBAAgB,EAAE,CAAC,aAAa,IACjC;IACH,CAAC,CAAC,CAAA;IAEJ,0DAA0D;IAC1D,IAAI,oBAAoB,GAAG,KAAK,CAAA;
|
|
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,CAyR3E"}
|
|
@@ -47,25 +47,31 @@ function calculateLocalOrder(appOrder) {
|
|
|
47
47
|
smallOrderFee = (_d = order.shipping.smallOrderFee) !== null && _d !== void 0 ? _d : 0;
|
|
48
48
|
}
|
|
49
49
|
// * 計算 modifiers
|
|
50
|
-
let
|
|
50
|
+
let discountableProductWithoutDiscountTotalAcc = 0; // 可折扣的 itemTotal，用來計算一般的 PRODUCT 折扣
|
|
51
|
+
let discountableProductTotalAcc = 0; // 可折扣的 itemTotal，用來檢查 PRODUCT 折扣不能折超過 item total
|
|
51
52
|
lodash_1.default.forEach(order.batches, (batch) => {
|
|
52
53
|
// 只計算有效的 batch
|
|
53
54
|
if (['submitted', 'confirmed'].includes(batch.status)) {
|
|
54
55
|
lodash_1.default.forEach(batch.items, item => {
|
|
55
|
-
var _a;
|
|
56
|
+
var _a, _b;
|
|
56
57
|
if (!item.excludeOrderDiscount) {
|
|
57
|
-
|
|
58
|
+
discountableProductWithoutDiscountTotalAcc += ((_a = item.totalWithoutSetItemsWithoutDiscountModifiers) !== null && _a !== void 0 ? _a : 0);
|
|
59
|
+
discountableProductTotalAcc += ((_b = item.totalWithoutSetItems) !== null && _b !== void 0 ? _b : 0);
|
|
58
60
|
}
|
|
59
61
|
lodash_1.default.forEach(item.setItems, setItem => {
|
|
60
|
-
var _a;
|
|
62
|
+
var _a, _b;
|
|
61
63
|
if (!setItem.excludeOrderDiscount) {
|
|
62
|
-
|
|
64
|
+
discountableProductWithoutDiscountTotalAcc += ((_a = setItem.totalWithoutDiscountModifiers) !== null && _a !== void 0 ? _a : 0);
|
|
65
|
+
discountableProductTotalAcc += ((_b = setItem.total) !== null && _b !== void 0 ? _b : 0);
|
|
63
66
|
}
|
|
64
67
|
});
|
|
65
68
|
});
|
|
66
69
|
}
|
|
67
70
|
});
|
|
68
|
-
|
|
71
|
+
// 不可折扣的 itemTotal (不含 discount)，計算有 overrideItem 的 PRODUCT 折扣時會用到
|
|
72
|
+
let nonDiscountableProductWithoutDiscountTotalAcc = productsSubtotal - discountableProductWithoutDiscountTotalAcc;
|
|
73
|
+
// 不可折扣的 itemTotal (含 discount)，用來檢查 overrideItem 的 PRODUCT 折扣不能超過 item total
|
|
74
|
+
let nonDiscountableProductTotalAcc = productsTotal - discountableProductTotalAcc;
|
|
69
75
|
// 可以用來算 SHIPPING 折扣的 shippingFee
|
|
70
76
|
let shippingFeeAcc = shippingFeeBaseTotal;
|
|
71
77
|
// 可以用來算 ALL 折扣的 total，計算服務費之後還要再加上服務費
|
|
@@ -93,15 +99,22 @@ function calculateLocalOrder(appOrder) {
|
|
|
93
99
|
batch.items.forEach(item => {
|
|
94
100
|
var _a, _b;
|
|
95
101
|
if (modifier.overrideItem || !item.excludedOrderSurcharge) {
|
|
96
|
-
// 服務費使用
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
const totalWithSurcharge = ((_a = item.totalWithoutDiscountModifiers) !== null && _a !== void 0 ? _a : 0) * (100 + modifier.percent) / 100 + modifier.amount;
|
|
100
|
-
const surcharge = totalWithSurcharge - ((_b = item.totalWithoutDiscountModifiers) !== null && _b !== void 0 ? _b : 0);
|
|
102
|
+
// 服務費使用 totalWithoutSetItemsWithoutDiscountModifiers (算 setItems 前，不含 DISCOUNT 的餐點 total，setItems 下面另外算) 來計算
|
|
103
|
+
const totalWithSurcharge = ((_a = item.totalWithoutSetItemsWithoutDiscountModifiers) !== null && _a !== void 0 ? _a : 0) * (100 + modifier.percent) / 100 + modifier.amount;
|
|
104
|
+
const surcharge = totalWithSurcharge - ((_b = item.totalWithoutSetItemsWithoutDiscountModifiers) !== null && _b !== void 0 ? _b : 0);
|
|
101
105
|
item.surcharge += surcharge; // 加總到 batch item 的 surcharge
|
|
102
|
-
console.log('surcharge', surcharge);
|
|
103
106
|
calculatedAmountAcc += surcharge; // 加總到 modifier 的 surcharge
|
|
104
107
|
}
|
|
108
|
+
lodash_1.default.forEach(item.setItems, setItem => {
|
|
109
|
+
var _a, _b;
|
|
110
|
+
if (modifier.overrideItem || !setItem.excludedOrderSurcharge) {
|
|
111
|
+
// 服務費使用 totalWithoutDiscountModifiers (不含 DISCOUNT 的餐點 total) 來計算
|
|
112
|
+
const totalWithSurcharge = ((_a = setItem.totalWithoutDiscountModifiers) !== null && _a !== void 0 ? _a : 0) * (100 + modifier.percent) / 100 + modifier.amount;
|
|
113
|
+
const surcharge = totalWithSurcharge - ((_b = setItem.totalWithoutDiscountModifiers) !== null && _b !== void 0 ? _b : 0);
|
|
114
|
+
item.surcharge += surcharge; // 加總到 batch item 的 surcharge
|
|
115
|
+
calculatedAmountAcc += surcharge; // 加總到 modifier 的 surcharge
|
|
116
|
+
}
|
|
117
|
+
});
|
|
105
118
|
});
|
|
106
119
|
});
|
|
107
120
|
// 加總到訂單的服務費總計
|
|
@@ -134,32 +147,42 @@ function calculateLocalOrder(appOrder) {
|
|
|
134
147
|
let discountValue = 0;
|
|
135
148
|
if (modifier.overrideItem) {
|
|
136
149
|
// overrideItem 的 modifier 可以對全部 item 折價
|
|
137
|
-
// 因此同時對
|
|
150
|
+
// 因此同時對 discountableProductWithoutDiscoutTotalAcc 和 nonDiscountableProductWithoutDiscountTotalAcc 做折扣
|
|
138
151
|
// 折扣後金額 (不可低於 0)
|
|
139
|
-
const
|
|
140
|
-
let discountableTotalWithModifier = Math.max(0,
|
|
141
|
-
let nonDiscountableTotalWithModifier = Math.max(0,
|
|
142
|
-
if (
|
|
143
|
-
// 將 amount 分給
|
|
144
|
-
discountableTotalWithModifier = Math.max(0, discountableTotalWithModifier + modifier.amount *
|
|
145
|
-
nonDiscountableTotalWithModifier = Math.max(0, nonDiscountableTotalWithModifier + modifier.amount *
|
|
152
|
+
const productWithoutDiscountTotal = discountableProductWithoutDiscountTotalAcc + nonDiscountableProductWithoutDiscountTotalAcc;
|
|
153
|
+
let discountableTotalWithModifier = Math.max(0, discountableProductWithoutDiscountTotalAcc * (100 + modifier.percent) / 100);
|
|
154
|
+
let nonDiscountableTotalWithModifier = Math.max(0, nonDiscountableProductWithoutDiscountTotalAcc * (100 + modifier.percent) / 100);
|
|
155
|
+
if (productWithoutDiscountTotal > 0 && modifier.amount < 0) {
|
|
156
|
+
// 將 amount 分給 discountableProductWithoutDiscoutTotalAcc 和 nonDiscountableProductWithoutDiscountTotalAcc
|
|
157
|
+
discountableTotalWithModifier = Math.max(0, discountableTotalWithModifier + modifier.amount * discountableProductWithoutDiscountTotalAcc / productWithoutDiscountTotal);
|
|
158
|
+
nonDiscountableTotalWithModifier = Math.max(0, nonDiscountableTotalWithModifier + modifier.amount * nonDiscountableProductWithoutDiscountTotalAcc / productWithoutDiscountTotal);
|
|
146
159
|
}
|
|
147
160
|
// 折扣金額
|
|
148
|
-
const discountValueInDiscountableProduct = Math.min(discountableProductTotalAcc,
|
|
149
|
-
|
|
161
|
+
const discountValueInDiscountableProduct = Math.min(discountableProductTotalAcc, // 最大不可超過真正的 item total (算過 item DISCOUNT)
|
|
162
|
+
discountableProductWithoutDiscountTotalAcc, // 最大不可超過 item total (不含 item DISCOUNT)
|
|
163
|
+
discountableProductWithoutDiscountTotalAcc - discountableTotalWithModifier);
|
|
164
|
+
const discountValueInNonDiscountableProduct = Math.min(nonDiscountableProductTotalAcc, // 最大不可超過真正的 item total (算過 item DISCOUNT)
|
|
165
|
+
nonDiscountableProductWithoutDiscountTotalAcc, // 最大不可超過 item total (不含 item DISCOUNT)
|
|
166
|
+
nonDiscountableProductWithoutDiscountTotalAcc - nonDiscountableTotalWithModifier);
|
|
167
|
+
// 從餐點總計扣除
|
|
150
168
|
discountableProductTotalAcc -= discountValueInDiscountableProduct;
|
|
169
|
+
discountableProductWithoutDiscountTotalAcc -= discountValueInDiscountableProduct;
|
|
151
170
|
nonDiscountableProductTotalAcc -= discountValueInNonDiscountableProduct;
|
|
171
|
+
nonDiscountableProductWithoutDiscountTotalAcc -= discountValueInNonDiscountableProduct;
|
|
152
172
|
discountValue = discountValueInDiscountableProduct + discountValueInNonDiscountableProduct;
|
|
153
173
|
}
|
|
154
174
|
else {
|
|
155
175
|
// 非 overrideItem 的 modifier 只對沒有設定 excludeOrderDiscount 的 item 折價
|
|
156
176
|
// 因此是對 discountableProductTotalAcc 做折扣
|
|
157
177
|
// 折扣後金額 (不可低於 0)
|
|
158
|
-
const totalWithModifier = Math.max(0,
|
|
178
|
+
const totalWithModifier = Math.max(0, discountableProductWithoutDiscountTotalAcc * (100 + modifier.percent) / 100 + modifier.amount);
|
|
159
179
|
// 折扣金額 (不可大於 discountableProductTotalAcc)
|
|
160
|
-
discountValue = Math.min(discountableProductTotalAcc,
|
|
180
|
+
discountValue = Math.min(discountableProductTotalAcc, // 最大不可超過真正的 item total (算過 item DISCOUNT)
|
|
181
|
+
discountableProductWithoutDiscountTotalAcc, // 最大不可超過 item total (不含 item DISCOUNT)
|
|
182
|
+
discountableProductWithoutDiscountTotalAcc - totalWithModifier);
|
|
161
183
|
// 從餐點總計扣除
|
|
162
184
|
discountableProductTotalAcc -= discountValue;
|
|
185
|
+
discountableProductWithoutDiscountTotalAcc -= discountValue;
|
|
163
186
|
}
|
|
164
187
|
// 從全單用總計扣除
|
|
165
188
|
allAcc -= discountValue;
|
|
@@ -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,sDAAsD;QACtD,IAAI,gBAAgB,GAAG,CAAC,CAAA;QACxB,4CAA4C;QAC5C,IAAI,aAAa,GAAG,CAAC,CAAA;QACrB,yBAAyB;QACzB,IAAI,gCAAgC,GAAG,CAAC,CAAA;QACxC,uCAAuC;QACvC,IAAI,gCAAgC,GAAG,CAAC,CAAA;QAExC,KAAK,CAAC,OAAO,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC3C,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,iCAAuB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;YACrF,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;gBACrD,mCAAmC;gBACnC,qBAAqB,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,CAAC,CAAA;gBAClE,gCAAgC,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,gCAAgC,CAAC,CAAA;gBAC9F,gCAAgC,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,gCAAgC,CAAC,CAAA;gBAC9F,gBAAgB,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,+BAA+B,CAAC,CAAA;gBAC7E,aAAa,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;aACnD;YACD,uCACK,KAAK,KACR,KAAK,EAAE,eAAe,IACvB;QACH,CAAC,CAAC,CAAA;QAEF,mEAAmE;QAEnE,SAAS;QACT,IAAI,oBAAoB,GAAG,CAAC,CAAA,CAAC,wCAAwC;QACrE,IAAI,aAAa,GAAG,CAAC,CAAA,CAAC,QAAQ;QAC9B,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,IAAI,KAAK,CAAC,YAAY,KAAK,eAAe,EAAE;YACpE,oBAAoB,GAAG,CAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,eAAe,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,SAAS,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,eAAe,mCAAI,CAAC,CAAC,CAAA;YACtI,aAAa,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,aAAa,mCAAI,CAAC,CAAA;SAClD;QAED,iBAAiB;QACjB,IAAI,
|
|
1
|
+
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
|
package/dist/types/AppOrder.d.ts
CHANGED
|
@@ -99,6 +99,7 @@ export interface IAppBatchItem extends Omit<IOrderBatchItem, 'id' | 'modifiers'
|
|
|
99
99
|
image?: string;
|
|
100
100
|
originalPrice?: number; /** @deprecated 改用 totalWithoutSetItems */
|
|
101
101
|
totalWithoutSetItems?: number;
|
|
102
|
+
totalWithoutSetItemsWithoutDiscountModifiers?: number;
|
|
102
103
|
totalWithoutDiscountModifiers?: number;
|
|
103
104
|
}
|
|
104
105
|
export interface IFormatedBatchItem extends IAppBatchItem {
|
|
@@ -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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"}
|