dimorder-orderapp-lib 0.1.194 → 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/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/package.json +1 -1
|
@@ -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, item.setMenuIndex];
|
|
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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"}
|