dimorder-orderapp-lib 0.1.191 → 0.1.195
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/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/libs/addNumberWithRounding.d.ts +2 -0
- package/dist/libs/addNumberWithRounding.d.ts.map +1 -0
- package/dist/libs/addNumberWithRounding.js +10 -0
- package/dist/libs/addNumberWithRounding.js.map +1 -0
- package/dist/libs/calculateLocalOrder.d.ts.map +1 -1
- package/dist/libs/calculateLocalOrder.js +29 -41
- package/dist/libs/calculateLocalOrder.js.map +1 -1
- package/dist/libs/formatSummary.js +1 -1
- package/dist/libs/formatSummary.js.map +1 -1
- package/dist/libs/getFormatBatchItemStatus.d.ts +1 -1
- package/dist/libs/getFormatBatchItemStatus.d.ts.map +1 -1
- package/dist/libs/getFormatBatchItemStatus.js +6 -2
- package/dist/libs/getFormatBatchItemStatus.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 +2 -2
- package/dist/libs/groupBatchItem.js.map +1 -1
- package/dist/libs/index.d.ts +2 -0
- package/dist/libs/index.d.ts.map +1 -1
- package/dist/libs/index.js +2 -0
- package/dist/libs/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export declare const libs: {
|
|
|
7
7
|
rounding: IOrderRounding;
|
|
8
8
|
};
|
|
9
9
|
wait: typeof import("./libs/wait").default;
|
|
10
|
+
addNumberWithRounding: typeof import("./libs/addNumberWithRounding").default;
|
|
10
11
|
calculateLocalOrder: typeof import("./libs/calculateLocalOrder").default;
|
|
11
12
|
calculateLocalBatchItem: typeof import("./libs/calculateLocalBatchItem").default;
|
|
12
13
|
apiOrderToAppOrder: typeof import("./libs/apiOrderToAppOrder").default;
|
|
@@ -43,6 +44,7 @@ declare const _default: {
|
|
|
43
44
|
rounding: IOrderRounding;
|
|
44
45
|
};
|
|
45
46
|
wait: typeof import("./libs/wait").default;
|
|
47
|
+
addNumberWithRounding: typeof import("./libs/addNumberWithRounding").default;
|
|
46
48
|
calculateLocalOrder: typeof import("./libs/calculateLocalOrder").default;
|
|
47
49
|
calculateLocalBatchItem: typeof import("./libs/calculateLocalBatchItem").default;
|
|
48
50
|
apiOrderToAppOrder: typeof import("./libs/apiOrderToAppOrder").default;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,GAAG;;;CAAO,CAAA;AACvB,eAAO,MAAM,IAAI
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,GAAG;;;CAAO,CAAA;AACvB,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAQ,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,wBAKC;AACD,OAAO,CAAC,MAAM,CAAC;IACb,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,GAAG,OAAO,CAAA;IAC3E,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,aAAa,GAAG,EAAE,CAAA;IACrH,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,KAAK,GAAG,EAAE,CAAA;IAC5F,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,CAAA;IAC3D,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAA;IAC9G,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAA;IAC9F,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;CAC9F"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addNumberWithRounding.d.ts","sourceRoot":"","sources":["../../src/libs/addNumberWithRounding.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAU,GAAG,MAAM,CAKrF"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
function addNumberWithRounding(num1, num2 = 0) {
|
|
4
|
+
const number1 = num1 * 100;
|
|
5
|
+
const number2 = num2 * 100;
|
|
6
|
+
const total = Math.round(number1 + number2) / 100;
|
|
7
|
+
return total;
|
|
8
|
+
}
|
|
9
|
+
exports.default = addNumberWithRounding;
|
|
10
|
+
//# sourceMappingURL=addNumberWithRounding.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addNumberWithRounding.js","sourceRoot":"","sources":["../../src/libs/addNumberWithRounding.ts"],"names":[],"mappings":";;AAAA,SAAwB,qBAAqB,CAAE,IAAY,EAAE,OAAe,CAAC;IAC3E,MAAM,OAAO,GAAG,IAAI,GAAG,GAAG,CAAA;IAC1B,MAAM,OAAO,GAAG,IAAI,GAAG,GAAG,CAAA;IAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,GAAG,CAAA;IACjD,OAAO,KAAK,CAAA;AACd,CAAC;AALD,wCAKC"}
|
|
@@ -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,CA2KhL"}
|
|
@@ -8,6 +8,7 @@ const calculateLocalBatchItem_1 = __importDefault(require("./calculateLocalBatch
|
|
|
8
8
|
const fixPrecision_1 = __importDefault(require("./fixPrecision"));
|
|
9
9
|
const getRoundNumber_1 = __importDefault(require("./getRoundNumber"));
|
|
10
10
|
const libConfig_1 = __importDefault(require("./libConfig"));
|
|
11
|
+
const addNumberWithRounding_1 = __importDefault(require("./addNumberWithRounding"));
|
|
11
12
|
function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rounding = libConfig_1.default.rounding) {
|
|
12
13
|
// * 餐點原價
|
|
13
14
|
let originalTotal = 0;
|
|
@@ -49,12 +50,6 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
49
50
|
let calculatedShippingFeeDiscount = 0;
|
|
50
51
|
// * 運費總價
|
|
51
52
|
let shippingFeeTotal = originalShippingFee;
|
|
52
|
-
// 運費折扣
|
|
53
|
-
if (order.deliveryType === 'storeDelivery' && order.shipping != null && total > order.shipping.minAmount && order.shipping.discounts[0] != null) {
|
|
54
|
-
const shippingDiscount = order.shipping.discounts[0];
|
|
55
|
-
calculatedShippingFeeDiscount += shippingDiscount.amount;
|
|
56
|
-
shippingFeeTotal -= shippingDiscount.amount;
|
|
57
|
-
}
|
|
58
53
|
// 折扣碼
|
|
59
54
|
if (promoDiscount > 0) {
|
|
60
55
|
const newTotal = total -= promoDiscount;
|
|
@@ -71,21 +66,35 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
71
66
|
let newTotal = total;
|
|
72
67
|
let newShippingFeeTotal = shippingFeeTotal;
|
|
73
68
|
let calculatedAmount = 0;
|
|
69
|
+
let discount = 0;
|
|
74
70
|
// 全單折扣或 RiceCoin
|
|
75
71
|
if (modifier.applyTo === 'ALL' || modifier.type === 'RICECOIN') {
|
|
76
72
|
// 將 total 及 shippingFeeTotal 計算 percent 折扣
|
|
77
73
|
newTotal = total * (100 + modifier.percent) / 100;
|
|
78
74
|
newShippingFeeTotal = shippingFeeTotal * (100 + modifier.percent) / 100;
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
newTotal -= (modifier.amount - newShippingFeeTotal);
|
|
75
|
+
if (modifier.type === 'RICECOIN') {
|
|
76
|
+
const maxDiscount = total + shippingFeeTotal;
|
|
77
|
+
const riceRiceDiscount = Math.abs(modifier.amount);
|
|
78
|
+
discount = Math.min(maxDiscount, riceRiceDiscount);
|
|
84
79
|
}
|
|
85
80
|
else {
|
|
86
|
-
|
|
87
|
-
newShippingFeeTotal -= modifier.amount;
|
|
81
|
+
discount = (total - (total * (100 + modifier.percent) / 100 + modifier.amount));
|
|
88
82
|
}
|
|
83
|
+
calculatedDiscountTotal += discount;
|
|
84
|
+
calculatedAmount = Math.abs(discount) * -1;
|
|
85
|
+
newTotal = total - discount;
|
|
86
|
+
// modifier amount 優先折在運費
|
|
87
|
+
// console.log('modifier.amount', modifier.amount)
|
|
88
|
+
// console.log('shippingFeeTotal1', shippingFeeTotal)
|
|
89
|
+
// if (Math.abs(modifier.amount) > shippingFeeTotal) {
|
|
90
|
+
// // 折扣金額大於運費，折完運費繼續折餐點
|
|
91
|
+
// shippingFeeTotal -= Math.abs(modifier.amount)
|
|
92
|
+
// newTotal -= (Math.abs(modifier.amount) - shippingFeeTotal)
|
|
93
|
+
// } else {
|
|
94
|
+
// // 只折在運費
|
|
95
|
+
// newShippingFeeTotal -= Math.abs(modifier.amount)
|
|
96
|
+
// }
|
|
97
|
+
// console.log('shippingFeeTotal2', shippingFeeTotal)
|
|
89
98
|
}
|
|
90
99
|
// 餐點折扣或優惠碼和店家給的折扣
|
|
91
100
|
if (modifier.applyTo === 'PRODUCT' || modifier.type === 'PROMOCODE' || modifier.type === 'DISCOUNT') {
|
|
@@ -108,11 +117,13 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
108
117
|
const discount = (discountBaseTotal - (discountBaseTotal * (100 + modifier.percent) / 100 + modifier.amount));
|
|
109
118
|
calculatedDiscountTotal += discount;
|
|
110
119
|
calculatedAmount = Math.abs(discount) * -1;
|
|
111
|
-
newTotal = total -
|
|
120
|
+
newTotal = total - discount;
|
|
112
121
|
}
|
|
113
122
|
else {
|
|
114
|
-
|
|
115
|
-
|
|
123
|
+
const discount = subtotal - (subtotal * (100 + modifier.percent) / 100 + modifier.amount);
|
|
124
|
+
newTotal = total - discount;
|
|
125
|
+
calculatedAmount = Math.abs(discount) * -1;
|
|
126
|
+
calculatedDiscountTotal += discount;
|
|
116
127
|
}
|
|
117
128
|
}
|
|
118
129
|
// 運費折扣
|
|
@@ -137,30 +148,7 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
137
148
|
shippingFeeTotal = newShippingFeeTotal;
|
|
138
149
|
return Object.assign(Object.assign({}, modifier), { calculatedAmount });
|
|
139
150
|
});
|
|
140
|
-
|
|
141
|
-
if (riceCoinDiscount > 0) {
|
|
142
|
-
let newTotal = total;
|
|
143
|
-
let newShippingFeeTotal = shippingFeeTotal;
|
|
144
|
-
// 優先折在運費
|
|
145
|
-
if (riceCoinDiscount > shippingFeeTotal) {
|
|
146
|
-
// 折扣金額大於運費，折完運費繼續折餐點
|
|
147
|
-
shippingFeeTotal -= riceCoinDiscount;
|
|
148
|
-
newTotal -= (riceCoinDiscount - newShippingFeeTotal);
|
|
149
|
-
}
|
|
150
|
-
else {
|
|
151
|
-
// 只折在運費
|
|
152
|
-
newShippingFeeTotal -= riceCoinDiscount;
|
|
153
|
-
}
|
|
154
|
-
// 計算折了多少
|
|
155
|
-
const diffTotal = total - newTotal;
|
|
156
|
-
const diffShippingFee = shippingFeeTotal - newShippingFeeTotal;
|
|
157
|
-
// 累計折了多少
|
|
158
|
-
calculatedDiscountTotal += diffTotal;
|
|
159
|
-
calculatedShippingFeeDiscount += diffShippingFee;
|
|
160
|
-
// 更新總計金額
|
|
161
|
-
total = newTotal;
|
|
162
|
-
shippingFeeTotal = newShippingFeeTotal;
|
|
163
|
-
}
|
|
151
|
+
total += shippingFeeTotal;
|
|
164
152
|
if (total < 0) {
|
|
165
153
|
total = 0;
|
|
166
154
|
}
|
|
@@ -174,7 +162,7 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
|
|
|
174
162
|
order.originalShippingFee = fixPrecision_1.default(originalShippingFee);
|
|
175
163
|
order.discountShippingFee = fixPrecision_1.default(calculatedShippingFeeDiscount);
|
|
176
164
|
order.shippingFee = fixPrecision_1.default(shippingFeeTotal);
|
|
177
|
-
order.roundedAmount =
|
|
165
|
+
order.roundedAmount = addNumberWithRounding_1.default(order.roundedTotal, order.total * -1);
|
|
178
166
|
order.modifiers = modifiers;
|
|
179
167
|
return order;
|
|
180
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,wFAA+D;AAC/D,kEAAyC;AACzC,sEAA6C;AAC7C,4DAAmC;
|
|
1
|
+
{"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,wFAA+D;AAC/D,kEAAyC;AACzC,sEAA6C;AAC7C,4DAAmC;AACnC,oFAA2D;AAC3D,SAAwB,mBAAmB,CAAE,KAAgB,EAAE,gBAAwB,CAAC,EAAE,mBAA2B,CAAC,EAAE,WAA2B,mBAAS,CAAC,QAAQ;IACnK,SAAS;IACT,IAAI,aAAa,GAAG,CAAC,CAAA;IACrB,SAAS;IACT,IAAI,uBAAuB,GAAG,CAAC,CAAA;IAC/B,UAAU;IACV,IAAI,cAAc,GAAG,CAAC,CAAA;IACtB,SAAS;IACT,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,OAAO;IACP,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,SAAS;IACT,IAAI,iBAAiB,GAAG,CAAC,CAAA;IACzB,QAAQ;IACR,IAAI,YAAY,GAAG,CAAC,CAAA;IAEpB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC5B,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iCAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;QACrF,aAAa,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,CAAC,CAAA;QAC1D,cAAc,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,CAAA;QAC/F,YAAY,GAAG,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,CAAC,CAAA;QACxD,iBAAiB,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACzD,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YACrF,OAAO,CAAC,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,MAAK,CAAC,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,MAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACtG,CAAC,CAAC,EAAE,eAAe,CAAC,CAAA;QACpB,QAAQ,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,YAAY,CAAA;QAC5D,KAAK,IAAI,gBAAC,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;IAEF,SAAS;IACT,IAAI,mBAAmB,GAAG,CAAC,CAAA;IAC3B,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,IAAI,KAAK,CAAC,YAAY,KAAK,eAAe,EAAE;QACpE,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI,EAAE;YACnC,mBAAmB,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAA;SAC9C;QACD,IAAI,KAAK,CAAC,mBAAmB,IAAI,IAAI,EAAE;YACrC,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAA;SAChD;KACF;IACD,SAAS;IACT,IAAI,6BAA6B,GAAG,CAAC,CAAA;IACrC,SAAS;IACT,IAAI,gBAAgB,GAAG,mBAAmB,CAAA;IAE1C,MAAM;IACN,IAAI,aAAa,GAAG,CAAC,EAAE;QACrB,MAAM,QAAQ,GAAG,KAAK,IAAI,aAAa,CAAA;QACvC,SAAS;QACT,MAAM,SAAS,GAAG,KAAK,GAAG,QAAQ,CAAA;QAClC,SAAS;QACT,uBAAuB,IAAI,SAAS,CAAA;QACpC,WAAW;QACX,KAAK,GAAG,QAAQ,CAAA;KACjB;IACD,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,kCAAkC;IAClC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QACzC,IAAI,QAAQ,GAAG,KAAK,CAAA;QACpB,IAAI,mBAAmB,GAAG,gBAAgB,CAAA;QAC1C,IAAI,gBAAgB,GAAG,CAAC,CAAA;QACxB,IAAI,QAAQ,GAAG,CAAC,CAAA;QAChB,iBAAiB;QACjB,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;YAC9D,2CAA2C;YAC3C,QAAQ,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA;YACjD,mBAAmB,GAAG,gBAAgB,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA;YAEvE,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;gBAChC,MAAM,WAAW,GAAG,KAAK,GAAG,gBAAgB,CAAA;gBAC5C,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;gBAClD,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAA;aACnD;iBAAM;gBACL,QAAQ,GAAG,CAAC,KAAK,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;aAChF;YACD,uBAAuB,IAAI,QAAQ,CAAA;YACnC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;YAC1C,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAA;YAE3B,yBAAyB;YACzB,kDAAkD;YAClD,qDAAqD;YAErD,sDAAsD;YACtD,0BAA0B;YAC1B,kDAAkD;YAClD,+DAA+D;YAC/D,WAAW;YACX,aAAa;YACb,qDAAqD;YACrD,IAAI;YACJ,qDAAqD;SACtD;QAED,kBAAkB;QAClB,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;YACnG,YAAY;YAEZ,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE;gBACjC,kBAAkB;gBAClB,MAAM,sBAAsB,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAA;gBAChH,MAAM,2BAA2B,GAAG,gBAAC,CAAC,KAAK,CAAC,gBAAC,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC,GAAG,gBAAC,CAAC,KAAK,CAAC,gBAAC,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,eAAe,CAAC,CAAA;gBAE7J,MAAM,kBAAkB,GAAG,QAAQ,GAAG,2BAA2B,CAAA;gBACjE,MAAM,SAAS,GAAG,kBAAkB,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAA;gBAEvF,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAAA;gBAC1D,gBAAgB,GAAG,cAAc,CAAA;gBACjC,QAAQ,GAAG,KAAK,GAAG,cAAc,CAAA;aAClC;iBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;gBACvC,iBAAiB;gBACjB,MAAM,qBAAqB,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;gBAC9G,MAAM,0BAA0B,GAAG,gBAAC,CAAC,KAAK,CAAC,gBAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC,CAAA;gBACzF,MAAM,iBAAiB,GAAG,QAAQ,GAAG,0BAA0B,GAAG,iBAAiB,CAAA;gBACnF,MAAM,QAAQ,GAAG,CAAC,iBAAiB,GAAG,CAAC,iBAAiB,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC7G,uBAAuB,IAAI,QAAQ,CAAA;gBACnC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;gBAC1C,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAA;aAC5B;iBAAM;gBACL,MAAM,QAAQ,GAAG,QAAQ,GAAG,CAAC,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;gBACzF,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAA;gBAC3B,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;gBAC1C,uBAAuB,IAAI,QAAQ,CAAA;aACpC;SACF;QAED,OAAO;QACP,IAAI,QAAQ,CAAC,OAAO,KAAK,UAAU,IAAI,QAAQ,CAAC,IAAI,KAAK,mBAAmB,EAAE;YAC5E,YAAY;YACZ,mBAAmB,GAAG,gBAAgB,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAA;SAC1F;QAED,SAAS;QACT,qCAAqC;QACrC,MAAM,eAAe,GAAG,gBAAgB,GAAG,mBAAmB,CAAA;QAC9D,SAAS;QACT,uBAAuB;QACvB,UAAU;QACV,yCAAyC;QACzC,WAAW;QACX,UAAU;QACV,0CAA0C;QAC1C,IAAI;QACJ,6BAA6B,IAAI,eAAe,CAAA;QAEhD,SAAS;QACT,KAAK,GAAG,QAAQ,CAAA;QAChB,gBAAgB,GAAG,mBAAmB,CAAA;QACtC,uCACK,QAAQ,KACX,gBAAgB,IACjB;IACH,CAAC,CAAC,CAAA;IAEF,KAAK,IAAI,gBAAgB,CAAA;IAEzB,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,KAAK,GAAG,CAAC,CAAA;KACV;IACD,uBAAuB,IAAI,iBAAiB,CAAA;IAC5C,KAAK,CAAC,aAAa,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IACjD,KAAK,CAAC,QAAQ,GAAG,sBAAY,CAAC,QAAQ,CAAC,CAAA;IACvC,KAAK,CAAC,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,sBAAY,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IACpF,KAAK,CAAC,cAAc,GAAG,sBAAY,CAAC,cAAc,CAAC,CAAA;IACnD,KAAK,CAAC,KAAK,GAAG,sBAAY,CAAC,KAAK,CAAC,CAAA;IACjC,KAAK,CAAC,YAAY,GAAG,sBAAY,CAAC,wBAAc,CAAC,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAA;IACpE,KAAK,CAAC,mBAAmB,GAAG,sBAAY,CAAC,mBAAmB,CAAC,CAAA;IAC7D,KAAK,CAAC,mBAAmB,GAAG,sBAAY,CAAC,6BAA6B,CAAC,CAAA;IACvE,KAAK,CAAC,WAAW,GAAG,sBAAY,CAAC,gBAAgB,CAAC,CAAA;IAClD,KAAK,CAAC,aAAa,GAAG,+BAAqB,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAA;IACjF,KAAK,CAAC,SAAS,GAAG,SAAS,CAAA;IAC3B,OAAO,KAAK,CAAA;AACd,CAAC;AA3KD,sCA2KC"}
|
|
@@ -17,7 +17,7 @@ function formatSummary(appOrder) {
|
|
|
17
17
|
});
|
|
18
18
|
});
|
|
19
19
|
const orderByCategoryId = lodash_1.default.orderBy(items, ['categoryId', 'menuId'], ['asc', 'asc']);
|
|
20
|
-
const groupBatchItems = groupBatchItem_1.default(orderByCategoryId);
|
|
20
|
+
const groupBatchItems = groupBatchItem_1.default(orderByCategoryId, undefined, undefined, true);
|
|
21
21
|
const summary = groupBatchItems.map(groupBatchItem => {
|
|
22
22
|
const calculateItem = calculateLocalBatchItem_1.default(groupBatchItem, appOrder);
|
|
23
23
|
const total = calculateItem.total + calculateItem.totalDiscount;
|
|
@@ -1 +1 @@
|
|
|
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,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aAAE;QAC3C,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;
|
|
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,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aAAE;QAC3C,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,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;IACrF,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 getFormatBatchItemStatus(item: IAppBatchItem): string;
|
|
1
|
+
export default function getFormatBatchItemStatus(item: IAppBatchItem, isSummary?: boolean): string;
|
|
2
2
|
//# sourceMappingURL=getFormatBatchItemStatus.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFormatBatchItemStatus.d.ts","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAE,IAAI,EAAE,aAAa,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"getFormatBatchItemStatus.d.ts","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAE,IAAI,EAAE,aAAa,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM,CAgDzG"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const lodash_1 = __importDefault(require("lodash"));
|
|
7
7
|
const getDisplayRoundNumber_1 = __importDefault(require("./getDisplayRoundNumber"));
|
|
8
8
|
// 會把 setItems 也 format status
|
|
9
|
-
function getFormatBatchItemStatus(item) {
|
|
9
|
+
function getFormatBatchItemStatus(item, isSummary = false) {
|
|
10
10
|
// 後台設定的餐點折扣不加入status
|
|
11
11
|
// const discount = []
|
|
12
12
|
// if (item.discount != null && item.discount !== 0) {
|
|
@@ -15,6 +15,7 @@ function getFormatBatchItemStatus(item) {
|
|
|
15
15
|
// }
|
|
16
16
|
// 組合每一個變價字串
|
|
17
17
|
const modifierDiscounts = [];
|
|
18
|
+
const summaryModifier = [];
|
|
18
19
|
if (item.modifiers != null) {
|
|
19
20
|
item.modifiers.forEach(modifier => {
|
|
20
21
|
let discountText = '';
|
|
@@ -31,6 +32,9 @@ function getFormatBatchItemStatus(item) {
|
|
|
31
32
|
discountText += String(modifier.percent) + '%';
|
|
32
33
|
}
|
|
33
34
|
modifierDiscounts.push(discountText);
|
|
35
|
+
if (modifier.type === 'MERCHANT') {
|
|
36
|
+
summaryModifier.push(discountText);
|
|
37
|
+
}
|
|
34
38
|
});
|
|
35
39
|
}
|
|
36
40
|
const options = lodash_1.default.map(item.options, option => `${option.name}${option.quantity > 1 ? `x${option.quantity}` : ''}`);
|
|
@@ -40,7 +44,7 @@ function getFormatBatchItemStatus(item) {
|
|
|
40
44
|
: item.remarks;
|
|
41
45
|
const status = lodash_1.default.concat(
|
|
42
46
|
// discount,
|
|
43
|
-
options, tags, remarks, modifierDiscounts);
|
|
47
|
+
options, tags, remarks, isSummary ? summaryModifier : modifierDiscounts);
|
|
44
48
|
return item.cancelled ? '已取消' : status.join('/');
|
|
45
49
|
}
|
|
46
50
|
exports.default = getFormatBatchItemStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFormatBatchItemStatus.js","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,oFAA2D;AAE3D,8BAA8B;AAC9B,SAAwB,wBAAwB,CAAE,IAAmB;
|
|
1
|
+
{"version":3,"file":"getFormatBatchItemStatus.js","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,oFAA2D;AAE3D,8BAA8B;AAC9B,SAAwB,wBAAwB,CAAE,IAAmB,EAAE,YAAqB,KAAK;IAC/F,qBAAqB;IACrB,sBAAsB;IACtB,sDAAsD;IACtD,iBAAiB;IACjB,+DAA+D;IAC/D,IAAI;IAEJ,YAAY;IACZ,MAAM,iBAAiB,GAAa,EAAE,CAAA;IACtC,MAAM,eAAe,GAAa,EAAE,CAAA;IACpC,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChC,IAAI,YAAY,GAAG,EAAE,CAAA;YACrB,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,EAAE;gBACzB,WAAW;gBACX,YAAY,IAAI,QAAQ,CAAC,IAAI,CAAA;aAC9B;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzB,SAAS;gBACT,YAAY,IAAI,+BAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,GAAG,CAAA;aAC7D;YACD,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE;gBAC1B,UAAU;gBACV,YAAY,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA;aAC/C;YACD,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACpC,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;gBAChC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;aACnC;QACH,CAAC,CAAC,CAAA;KACH;IAED,MAAM,OAAO,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAClH,MAAM,IAAI,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACrC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QACzC,CAAC,CAAC,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAA;IAEhB,MAAM,MAAM,GAAG,gBAAC,CAAC,MAAM;IACrB,YAAY;IACZ,OAAO,EACP,IAAI,EACJ,OAAO,EACP,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAChD,CAAA;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAClD,CAAC;AAhDD,2CAgDC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export default function groupBatchItem(orderBatchItems: IAppBatchItem[], name?: string, setMenuIndex?: number): IAppBatchItem[];
|
|
1
|
+
export default function groupBatchItem(orderBatchItems: IAppBatchItem[], name?: string, setMenuIndex?: number, isSummary?: boolean): 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,EAAE,IAAI,GAAE,MAAW,EAAE,YAAY,GAAE,MAAU,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,EAAE,YAAY,GAAE,MAAU,EAAE,SAAS,GAAE,OAAe,GAAG,aAAa,EAAE,CAiDlK"}
|
|
@@ -6,10 +6,10 @@ 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, name = '', setMenuIndex = 0) {
|
|
9
|
+
function groupBatchItem(orderBatchItems, name = '', setMenuIndex = 0, isSummary = false) {
|
|
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), item.isSet ? item.id : '', item.excludedSurcharge, item.excludedDiscount];
|
|
12
|
+
return [item.menuId, getFormatBatchItemStatus_1.default(submitBatchItem, isSummary), item.isSet ? item.id : '', item.excludedSurcharge, item.excludedDiscount, item.setMenuIndex];
|
|
13
13
|
});
|
|
14
14
|
const currentItems = [];
|
|
15
15
|
lodash_1.default.forEach(groupitemsByMenuId, (items, key) => {
|
|
@@ -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,EAAE,OAAe,EAAE,EAAE,eAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"groupBatchItem.js","sourceRoot":"","sources":["../../src/libs/groupBatchItem.ts"],"names":[],"mappings":"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"}
|
package/dist/libs/index.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ import getFormatBatchItemStatusWithSet from './getFormatBatchItemStatusWithSet';
|
|
|
14
14
|
import groupBatchItem from './groupBatchItem';
|
|
15
15
|
import formatBatchItemStatus from './formatBatchItemStatus';
|
|
16
16
|
import getRoundNumber from './getRoundNumber';
|
|
17
|
+
import addNumberWithRounding from './addNumberWithRounding';
|
|
17
18
|
import getDisplayRoundNumber from './getDisplayRoundNumber';
|
|
18
19
|
import appOrderToapiOrder from './appOrderToapiOrder';
|
|
19
20
|
import adjustNumber from './adjustNumber';
|
|
@@ -26,6 +27,7 @@ declare const _default: {
|
|
|
26
27
|
rounding: IOrderRounding;
|
|
27
28
|
};
|
|
28
29
|
wait: typeof wait;
|
|
30
|
+
addNumberWithRounding: typeof addNumberWithRounding;
|
|
29
31
|
calculateLocalOrder: typeof calculateLocalOrder;
|
|
30
32
|
calculateLocalBatchItem: typeof calculateLocalBatchItem;
|
|
31
33
|
apiOrderToAppOrder: typeof apiOrderToAppOrder;
|
package/dist/libs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/libs/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,uBAAuB,MAAM,4BAA4B,CAAA;AAChE,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;AACvD,OAAO,uBAAuB,MAAM,2BAA2B,CAAA;AAC/D,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAC3C,OAAO,wBAAwB,MAAM,4BAA4B,CAAA;AACjE,OAAO,+BAA+B,MAAM,mCAAmC,CAAA;AAC/E,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,qBAAqB,MAAM,yBAAyB,CAAA;AAC3D,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,qBAAqB,MAAM,yBAAyB,CAAA;AAC3D,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;AACvD,OAAO,wBAAwB,MAAM,4BAA4B,CAAA;AACjE,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAE3C,OAAO,MAAM,MAAM,UAAU,CAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/libs/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAC7D,OAAO,uBAAuB,MAAM,4BAA4B,CAAA;AAChE,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;AACvD,OAAO,uBAAuB,MAAM,2BAA2B,CAAA;AAC/D,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAC3C,OAAO,wBAAwB,MAAM,4BAA4B,CAAA;AACjE,OAAO,+BAA+B,MAAM,mCAAmC,CAAA;AAC/E,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,qBAAqB,MAAM,yBAAyB,CAAA;AAC3D,OAAO,cAAc,MAAM,kBAAkB,CAAA;AAC7C,OAAO,qBAAqB,MAAM,yBAAyB,CAAA;AAC3D,OAAO,qBAAqB,MAAM,yBAAyB,CAAA;AAC3D,OAAO,kBAAkB,MAAM,sBAAsB,CAAA;AACrD,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;AACvD,OAAO,wBAAwB,MAAM,4BAA4B,CAAA;AACjE,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAE3C,OAAO,MAAM,MAAM,UAAU,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7B,wBA2BC"}
|
package/dist/libs/index.js
CHANGED
|
@@ -20,6 +20,7 @@ const getFormatBatchItemStatusWithSet_1 = __importDefault(require("./getFormatBa
|
|
|
20
20
|
const groupBatchItem_1 = __importDefault(require("./groupBatchItem"));
|
|
21
21
|
const formatBatchItemStatus_1 = __importDefault(require("./formatBatchItemStatus"));
|
|
22
22
|
const getRoundNumber_1 = __importDefault(require("./getRoundNumber"));
|
|
23
|
+
const addNumberWithRounding_1 = __importDefault(require("./addNumberWithRounding"));
|
|
23
24
|
const getDisplayRoundNumber_1 = __importDefault(require("./getDisplayRoundNumber"));
|
|
24
25
|
const appOrderToapiOrder_1 = __importDefault(require("./appOrderToapiOrder"));
|
|
25
26
|
const adjustNumber_1 = __importDefault(require("./adjustNumber"));
|
|
@@ -31,6 +32,7 @@ const Logger_1 = __importDefault(require("./Logger"));
|
|
|
31
32
|
exports.default = {
|
|
32
33
|
libConfig: libConfig_1.default,
|
|
33
34
|
wait: wait_1.default,
|
|
35
|
+
addNumberWithRounding: addNumberWithRounding_1.default,
|
|
34
36
|
calculateLocalOrder: calculateLocalOrder_1.default,
|
|
35
37
|
calculateLocalBatchItem: calculateLocalBatchItem_1.default,
|
|
36
38
|
apiOrderToAppOrder: apiOrderToAppOrder_1.default,
|
package/dist/libs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/libs/index.ts"],"names":[],"mappings":";;;;;AAAA,4DAAmC;AACnC,kDAAyB;AACzB,8EAAqD;AACrD,8EAAqD;AACrD,sFAA6D;AAC7D,0FAAgE;AAChE,kEAAyC;AACzC,sEAA6C;AAC7C,8EAAqD;AACrD,gFAAuD;AACvD,wFAA+D;AAC/D,oEAA2C;AAC3C,0FAAiE;AACjE,wGAA+E;AAC/E,sEAA6C;AAC7C,oFAA2D;AAC3D,sEAA6C;AAC7C,oFAA2D;AAC3D,8EAAqD;AACrD,kEAAyC;AACzC,gFAAuD;AACvD,0FAAiE;AACjE,oEAA2C;AAC3C,4DAAmC;AACnC,sDAA6B;AAE7B,kBAAe;IACb,SAAS,EAAT,mBAAS;IACT,IAAI,EAAJ,cAAI;IACJ,mBAAmB,EAAnB,6BAAmB;IACnB,uBAAuB,EAAvB,iCAAuB;IACvB,kBAAkB,EAAlB,4BAAkB;IAClB,kBAAkB,EAAlB,4BAAkB;IAClB,sBAAsB,EAAtB,gCAAsB;IACtB,uBAAuB,EAAvB,kCAAuB;IACvB,cAAc,EAAd,wBAAc;IACd,YAAY,EAAZ,sBAAY;IACZ,cAAc,EAAd,wBAAc;IACd,aAAa,EAAb,uBAAa;IACb,kBAAkB,EAAlB,4BAAkB;IAClB,wBAAwB,EAAxB,kCAAwB;IACxB,+BAA+B,EAA/B,yCAA+B;IAC/B,qBAAqB,EAArB,+BAAqB;IACrB,aAAa,EAAb,uBAAa;IACb,cAAc,EAAd,wBAAc;IACd,mBAAmB,EAAnB,6BAAmB;IACnB,wBAAwB,EAAxB,kCAAwB;IACxB,qBAAqB,EAArB,+BAAqB;IACrB,kBAAkB,EAAlB,4BAAkB;IAClB,YAAY,EAAZ,sBAAY;IACZ,SAAS,EAAT,mBAAS;IACT,MAAM,EAAN,gBAAM;CACP,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/libs/index.ts"],"names":[],"mappings":";;;;;AAAA,4DAAmC;AACnC,kDAAyB;AACzB,8EAAqD;AACrD,8EAAqD;AACrD,sFAA6D;AAC7D,0FAAgE;AAChE,kEAAyC;AACzC,sEAA6C;AAC7C,8EAAqD;AACrD,gFAAuD;AACvD,wFAA+D;AAC/D,oEAA2C;AAC3C,0FAAiE;AACjE,wGAA+E;AAC/E,sEAA6C;AAC7C,oFAA2D;AAC3D,sEAA6C;AAC7C,oFAA2D;AAC3D,oFAA2D;AAC3D,8EAAqD;AACrD,kEAAyC;AACzC,gFAAuD;AACvD,0FAAiE;AACjE,oEAA2C;AAC3C,4DAAmC;AACnC,sDAA6B;AAE7B,kBAAe;IACb,SAAS,EAAT,mBAAS;IACT,IAAI,EAAJ,cAAI;IACJ,qBAAqB,EAArB,+BAAqB;IACrB,mBAAmB,EAAnB,6BAAmB;IACnB,uBAAuB,EAAvB,iCAAuB;IACvB,kBAAkB,EAAlB,4BAAkB;IAClB,kBAAkB,EAAlB,4BAAkB;IAClB,sBAAsB,EAAtB,gCAAsB;IACtB,uBAAuB,EAAvB,kCAAuB;IACvB,cAAc,EAAd,wBAAc;IACd,YAAY,EAAZ,sBAAY;IACZ,cAAc,EAAd,wBAAc;IACd,aAAa,EAAb,uBAAa;IACb,kBAAkB,EAAlB,4BAAkB;IAClB,wBAAwB,EAAxB,kCAAwB;IACxB,+BAA+B,EAA/B,yCAA+B;IAC/B,qBAAqB,EAArB,+BAAqB;IACrB,aAAa,EAAb,uBAAa;IACb,cAAc,EAAd,wBAAc;IACd,mBAAmB,EAAnB,6BAAmB;IACnB,wBAAwB,EAAxB,kCAAwB;IACxB,qBAAqB,EAArB,+BAAqB;IACrB,kBAAkB,EAAlB,4BAAkB;IAClB,YAAY,EAAZ,sBAAY;IACZ,SAAS,EAAT,mBAAS;IACT,MAAM,EAAN,gBAAM;CACP,CAAA"}
|