dimorder-orderapp-lib 0.1.156 → 0.1.160
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/calculateLocalOrder.d.ts.map +1 -1
- package/dist/libs/calculateLocalOrder.js +25 -8
- package/dist/libs/calculateLocalOrder.js.map +1 -1
- package/dist/libs/formatSummary.d.ts.map +1 -1
- package/dist/libs/formatSummary.js +5 -4
- package/dist/libs/formatSummary.js.map +1 -1
- package/dist/libs/groupBatchItem.d.ts +1 -1
- package/dist/libs/groupBatchItem.d.ts.map +1 -1
- package/dist/libs/groupBatchItem.js +16 -3
- package/dist/libs/groupBatchItem.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,CA4KhL"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const lodash_1 = __importDefault(require("lodash"));
|
|
7
|
-
const
|
|
7
|
+
const calculateLocalBatchItem_1 = __importDefault(require("./calculateLocalBatchItem"));
|
|
8
8
|
const fixPrecision_1 = __importDefault(require("./fixPrecision"));
|
|
9
9
|
const getRoundNumber_1 = __importDefault(require("./getRoundNumber"));
|
|
10
10
|
const libConfig_1 = __importDefault(require("./libConfig"));
|
|
@@ -20,9 +20,9 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
20
20
|
// * 小計
|
|
21
21
|
let subtotal = 0;
|
|
22
22
|
order.batches.forEach(batch => {
|
|
23
|
-
const calculatedItems = batch.items.map(item =>
|
|
23
|
+
const calculatedItems = batch.items.map(item => calculateLocalBatchItem_1.default(item, order));
|
|
24
24
|
originalTotal += lodash_1.default.sumBy(calculatedItems, 'originalTotal');
|
|
25
|
-
calculatedDiscountTotal += lodash_1.default.sumBy(calculatedItems, 'totalDiscount');
|
|
25
|
+
calculatedDiscountTotal += lodash_1.default.sumBy(calculatedItems.filter(item => !item.excludedDiscount), 'totalDiscount');
|
|
26
26
|
surchargeTotal += lodash_1.default.sumBy(calculatedItems.filter(item => !item.excludedSurcharge), 'surcharge');
|
|
27
27
|
subtotal += lodash_1.default.sumBy(calculatedItems, 'total') + lodash_1.default.sumBy(calculatedItems, 'totalDiscount');
|
|
28
28
|
total += lodash_1.default.sumBy(calculatedItems, 'total');
|
|
@@ -57,10 +57,12 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
57
57
|
// 更新 total
|
|
58
58
|
total = newTotal;
|
|
59
59
|
}
|
|
60
|
+
let modifiers = [];
|
|
60
61
|
// calculate order level modifiers
|
|
61
|
-
order.modifiers.
|
|
62
|
+
modifiers = order.modifiers.map(modifier => {
|
|
62
63
|
let newTotal = total;
|
|
63
64
|
let newShippingFeeTotal = shippingFeeTotal;
|
|
65
|
+
let calculatedAmount = 0;
|
|
64
66
|
// 全單折扣或 RiceCoin
|
|
65
67
|
if (modifier.applyTo === 'ALL' || modifier.type === 'RICECOIN') {
|
|
66
68
|
// 將 total 及 shippingFeeTotal 計算 percent 折扣
|
|
@@ -81,16 +83,25 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
81
83
|
if (modifier.applyTo === 'PRODUCT' || modifier.type === 'PROMOCODE' || modifier.type === 'DISCOUNT') {
|
|
82
84
|
// 計算折價後總計運費
|
|
83
85
|
if (modifier.type === 'SURCHARGE') {
|
|
84
|
-
//
|
|
86
|
+
// 找出預設不打服務費的items
|
|
85
87
|
const excludedSurchargeItemsTotal = lodash_1.default.sumBy(lodash_1.default.flatMapDeep(lodash_1.default.map(order.batches, batch => batch.items.filter(item => item.excludedSurcharge))), 'total');
|
|
86
88
|
const surchargeBaseTotal = total - excludedSurchargeItemsTotal;
|
|
87
89
|
const surcharge = surchargeBaseTotal * (100 + modifier.percent) / 100 + modifier.amount;
|
|
88
90
|
surchargeTotal += Math.abs(surchargeBaseTotal - surcharge);
|
|
89
|
-
|
|
91
|
+
calculatedAmount = surchargeTotal;
|
|
92
|
+
}
|
|
93
|
+
else if (modifier.type === 'DISCOUNT') {
|
|
94
|
+
// 找出預設不打折扣的items
|
|
95
|
+
const excludedDiscountItemsTotal = lodash_1.default.sumBy(lodash_1.default.flatMapDeep(lodash_1.default.map(order.batches, batch => batch.items.filter(item => item.excludedDiscount))), 'total');
|
|
96
|
+
const discountBaseTotal = subtotal - excludedDiscountItemsTotal;
|
|
97
|
+
const discount = discountBaseTotal - (discountBaseTotal * (100 + modifier.percent) / 100 + modifier.amount);
|
|
98
|
+
calculatedDiscountTotal += discount;
|
|
99
|
+
calculatedAmount = Math.abs(discount) * -1;
|
|
100
|
+
newTotal = subtotal - calculatedDiscountTotal;
|
|
90
101
|
}
|
|
91
102
|
else {
|
|
92
|
-
newTotal =
|
|
93
|
-
calculatedDiscountTotal +=
|
|
103
|
+
newTotal = (subtotal * (100 + modifier.percent) / 100 + modifier.amount);
|
|
104
|
+
calculatedDiscountTotal += subtotal - newTotal;
|
|
94
105
|
}
|
|
95
106
|
}
|
|
96
107
|
// 運費折扣
|
|
@@ -113,6 +124,7 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
113
124
|
// 更新總計金額
|
|
114
125
|
total = newTotal;
|
|
115
126
|
shippingFeeTotal = newShippingFeeTotal;
|
|
127
|
+
return Object.assign(Object.assign({}, modifier), { calculatedAmount });
|
|
116
128
|
});
|
|
117
129
|
// RiceCoin
|
|
118
130
|
if (riceCoinDiscount > 0) {
|
|
@@ -138,6 +150,10 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
138
150
|
total = newTotal;
|
|
139
151
|
shippingFeeTotal = newShippingFeeTotal;
|
|
140
152
|
}
|
|
153
|
+
if (total < 0) {
|
|
154
|
+
total = 0;
|
|
155
|
+
}
|
|
156
|
+
total = total + surchargeTotal;
|
|
141
157
|
order.originalTotal = fixPrecision_1.default(originalTotal);
|
|
142
158
|
order.subtotal = fixPrecision_1.default(subtotal);
|
|
143
159
|
order.calculatedDiscountTotal = Math.abs(fixPrecision_1.default(calculatedDiscountTotal)) * -1;
|
|
@@ -148,6 +164,7 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
148
164
|
order.discountShippingFee = fixPrecision_1.default(calculatedShippingFeeDiscount);
|
|
149
165
|
order.shippingFee = fixPrecision_1.default(shippingFeeTotal);
|
|
150
166
|
order.roundedAmount = getRoundNumber_1.default(order.roundedTotal - order.total);
|
|
167
|
+
order.modifiers = modifiers;
|
|
151
168
|
return order;
|
|
152
169
|
}
|
|
153
170
|
exports.default = calculateLocalOrder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,
|
|
1
|
+
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatSummary.d.ts","sourceRoot":"","sources":["../../src/libs/formatSummary.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAE,QAAQ,EAAE,SAAS,GAAG,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"formatSummary.d.ts","sourceRoot":"","sources":["../../src/libs/formatSummary.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAE,QAAQ,EAAE,SAAS,GAAG,oBAAoB,EAAE,CA0BlF"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
7
|
const groupBatchItem_1 = __importDefault(require("./groupBatchItem"));
|
|
8
|
-
const
|
|
8
|
+
const calculateLocalBatchItem_1 = __importDefault(require("./calculateLocalBatchItem"));
|
|
9
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
10
|
function formatSummary(appOrder) {
|
|
11
11
|
const items = [];
|
|
@@ -17,13 +17,14 @@ function formatSummary(appOrder) {
|
|
|
17
17
|
const orderByCategoryId = lodash_1.default.orderBy(items, ['categoryId', 'menuId'], ['asc', 'asc']);
|
|
18
18
|
const groupBatchItems = groupBatchItem_1.default(orderByCategoryId);
|
|
19
19
|
const summary = groupBatchItems.map(groupBatchItem => {
|
|
20
|
-
const calculateItem =
|
|
20
|
+
const calculateItem = calculateLocalBatchItem_1.default(groupBatchItem, appOrder);
|
|
21
|
+
const total = calculateItem.total + calculateItem.totalDiscount;
|
|
21
22
|
return {
|
|
22
23
|
id: uuid_1.v4(),
|
|
23
24
|
name: calculateItem.name,
|
|
24
25
|
quantity: calculateItem.quantity,
|
|
25
|
-
unitPrice:
|
|
26
|
-
price:
|
|
26
|
+
unitPrice: total / groupBatchItem.quantity,
|
|
27
|
+
price: total,
|
|
27
28
|
items: calculateItem.setItems,
|
|
28
29
|
options: calculateItem.options,
|
|
29
30
|
remarks: calculateItem.remarks,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatSummary.js","sourceRoot":"","sources":["../../src/libs/formatSummary.ts"],"names":[],"mappings":";;;;;AAAA,+BAAiC;AACjC,sEAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"formatSummary.js","sourceRoot":"","sources":["../../src/libs/formatSummary.ts"],"names":[],"mappings":";;;;;AAAA,+BAAiC;AACjC,sEAA6C;AAC7C,wFAA+D;AAC/D,oDAAsB;AACtB,SAAwB,aAAa,CAAE,QAAmB;IACxD,MAAM,KAAK,GAAoB,EAAE,CAAA;IACjC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACjC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,MAAM,iBAAiB,GAAG,gBAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;IACpF,MAAM,eAAe,GAAG,wBAAc,CAAC,iBAAiB,CAAC,CAAA;IACzD,MAAM,OAAO,GAA2B,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QAC3E,MAAM,aAAa,GAAG,iCAAuB,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QACvE,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,GAAG,aAAa,CAAC,aAAa,CAAA;QAE/D,OAAO;YACL,EAAE,EAAE,SAAI,EAAE;YACV,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,SAAS,EAAE,KAAK,GAAG,cAAc,CAAC,QAAQ;YAC1C,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,aAAa,CAAC,QAAQ;YAC7B,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,OAAO,CAAA;AAChB,CAAC;AA1BD,gCA0BC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export default function groupBatchItem(orderBatchItems: IAppBatchItem[]): IAppBatchItem[];
|
|
1
|
+
export default function groupBatchItem(orderBatchItems: IAppBatchItem[], name?: string): IAppBatchItem[];
|
|
2
2
|
//# sourceMappingURL=groupBatchItem.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groupBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/groupBatchItem.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAE,eAAe,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"groupBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/groupBatchItem.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAE,eAAe,EAAE,aAAa,EAAE,EAAE,IAAI,GAAE,MAAW,GAAG,aAAa,EAAE,CA4C5G"}
|
|
@@ -6,18 +6,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const lodash_1 = __importDefault(require("lodash"));
|
|
7
7
|
const getFormatBatchItemStatus_1 = __importDefault(require("./getFormatBatchItemStatus"));
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
|
-
function groupBatchItem(orderBatchItems) {
|
|
9
|
+
function groupBatchItem(orderBatchItems, name = '') {
|
|
10
10
|
const groupitemsByMenuId = lodash_1.default.groupBy(orderBatchItems, (item) => {
|
|
11
11
|
const submitBatchItem = Object.assign(Object.assign({}, item), { options: lodash_1.default.orderBy(item.options, 'optionItemId') });
|
|
12
|
-
return [item.menuId, getFormatBatchItemStatus_1.default(submitBatchItem)];
|
|
12
|
+
return [item.menuId, getFormatBatchItemStatus_1.default(submitBatchItem), item.isSet ? item.id : '', item.excludedSurcharge, item.excludedDiscount];
|
|
13
13
|
});
|
|
14
14
|
const currentItems = [];
|
|
15
|
+
let setMenuIndex = 0;
|
|
15
16
|
lodash_1.default.forEach(groupitemsByMenuId, (items, key) => {
|
|
16
17
|
const updateValue = {};
|
|
17
18
|
const ids = [];
|
|
18
19
|
items.forEach(item => {
|
|
20
|
+
var _a;
|
|
21
|
+
if (name !== '') {
|
|
22
|
+
updateValue.setMenuIndex = setMenuIndex;
|
|
23
|
+
updateValue.setName = name;
|
|
24
|
+
updateValue.id = uuid_1.v4();
|
|
25
|
+
}
|
|
19
26
|
if (lodash_1.default.isEmpty(item.itemIds)) {
|
|
20
|
-
ids.push(String(item.id));
|
|
27
|
+
ids.push(String((_a = item.id) !== null && _a !== void 0 ? _a : updateValue.id));
|
|
21
28
|
if (item.quantity >= 1) {
|
|
22
29
|
for (let i = 1; i < item.quantity; i++) {
|
|
23
30
|
ids.push(String(uuid_1.v4()));
|
|
@@ -26,6 +33,12 @@ function groupBatchItem(orderBatchItems) {
|
|
|
26
33
|
updateValue.ids = ids;
|
|
27
34
|
updateValue.itemIds = ids;
|
|
28
35
|
}
|
|
36
|
+
if (item.isSet) {
|
|
37
|
+
const setItems = groupBatchItem(item.setItems, item.name);
|
|
38
|
+
updateValue.setItems = setItems;
|
|
39
|
+
updateValue.setMenuIndex = setMenuIndex;
|
|
40
|
+
setMenuIndex += 1;
|
|
41
|
+
}
|
|
29
42
|
});
|
|
30
43
|
const item = Object.assign(Object.assign(Object.assign({}, items[0]), { quantity: lodash_1.default.sumBy(items, 'quantity') }), updateValue);
|
|
31
44
|
currentItems.push(item);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groupBatchItem.js","sourceRoot":"","sources":["../../src/libs/groupBatchItem.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,0FAAiE;AACjE,+BAAiC;AAEjC,SAAwB,cAAc,CAAE,eAAgC;
|
|
1
|
+
{"version":3,"file":"groupBatchItem.js","sourceRoot":"","sources":["../../src/libs/groupBatchItem.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,0FAAiE;AACjE,+BAAiC;AAEjC,SAAwB,cAAc,CAAE,eAAgC,EAAE,OAAe,EAAE;IACzF,MAAM,kBAAkB,GAAG,gBAAC,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;QAC7D,MAAM,eAAe,mCAChB,IAAI,KACP,OAAO,EAAE,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,GACjD,CAAA;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,kCAAwB,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC3I,CAAC,CAAC,CAAA;IACF,MAAM,YAAY,GAAoB,EAAE,CAAA;IACxC,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,gBAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAC3C,MAAM,WAAW,GAAQ,EAAE,CAAA;QAC3B,MAAM,GAAG,GAAa,EAAE,CAAA;QACxB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;;YACnB,IAAI,IAAI,KAAK,EAAE,EAAE;gBACf,WAAW,CAAC,YAAY,GAAG,YAAY,CAAA;gBACvC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAA;gBAC1B,WAAW,CAAC,EAAE,GAAG,SAAI,EAAE,CAAA;aACxB;YACD,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC3B,GAAG,CAAC,IAAI,CAAC,MAAM,OAAC,IAAI,CAAC,EAAE,mCAAI,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;gBAC3C,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,EAAE;oBACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;wBACtC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAI,EAAE,CAAC,CAAC,CAAA;qBACzB;iBACF;gBACD,WAAW,CAAC,GAAG,GAAG,GAAG,CAAA;gBACrB,WAAW,CAAC,OAAO,GAAG,GAAG,CAAA;aAC1B;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;gBACzD,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAA;gBAC/B,WAAW,CAAC,YAAY,GAAG,YAAY,CAAA;gBACvC,YAAY,IAAI,CAAC,CAAA;aAClB;QACH,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,iDACL,KAAK,CAAC,CAAC,CAAC,KACX,QAAQ,EAAE,gBAAC,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAC,KACjC,WAAW,CACf,CAAA;QACD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC,CAAC,CAAA;IACF,OAAO,YAAY,CAAA;AACrB,CAAC;AA5CD,iCA4CC"}
|