dimorder-orderapp-lib 0.1.183 → 0.1.187

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.
@@ -17,9 +17,9 @@ function toApiPayment(appPayments) {
17
17
  gateway: appPayment.gateway,
18
18
  ref: appPayment.ref,
19
19
  payload: appPayment.payload,
20
- amount: appPayment.amount,
21
- paidAmount: appPayment.paidAmount,
22
- paymentTips: appPayment.paymentTips,
20
+ amount: Number(appPayment.amount),
21
+ paidAmount: Number(appPayment.paidAmount),
22
+ paymentTips: Number(appPayment.paymentTips),
23
23
  change: appPayment.change,
24
24
  remark: appPayment.remark,
25
25
  createdAt: appPayment.createdAt,
@@ -47,16 +47,16 @@ function toApiBatchItems(appBatchItems) {
47
47
  const items = [];
48
48
  lodash_1.default.forEach(appBatchItems, appBatchItem => {
49
49
  if (appBatchItem.isSet) {
50
- items.push(Object.assign(Object.assign({}, appBatchItem), { id: appBatchItem.id, options: toApiOption(appBatchItem.options), tags: appBatchItem.tags, remarks: appBatchItem.remarks, excludeOrderDiscount: appBatchItem.excludedDiscount, excludedOrderSurcharge: appBatchItem.excludedSurcharge, quantity: 1, category: { id: appBatchItem.categoryId }, menu: { id: appBatchItem.menuId }, setId: appBatchItem.setId, setMenuId: appBatchItem.setId }));
50
+ items.push(Object.assign(Object.assign({}, appBatchItem), { id: appBatchItem.id, price: appBatchItem.price + appBatchItem.discount, options: toApiOption(appBatchItem.options), tags: appBatchItem.tags, remarks: appBatchItem.remarks, excludeOrderDiscount: appBatchItem.excludedDiscount, excludedOrderSurcharge: appBatchItem.excludedSurcharge, quantity: 1, category: { id: appBatchItem.categoryId }, menu: { id: appBatchItem.menuId }, setId: appBatchItem.setId, setMenuId: appBatchItem.setId }));
51
51
  lodash_1.default.forEach(appBatchItem.setItems, (setItem) => {
52
52
  lodash_1.default.forEach(setItem.itemIds, (itemId) => {
53
- items.push(Object.assign(Object.assign({}, setItem), { id: itemId, options: toApiOption(setItem.options), tags: setItem.tags, remarks: setItem.remarks, excludeOrderDiscount: setItem.excludedDiscount, excludedOrderSurcharge: setItem.excludedSurcharge, quantity: 1, category: { id: setItem.categoryId }, menu: { id: setItem.menuId }, setMenuId: appBatchItem.setId }));
53
+ items.push(Object.assign(Object.assign({}, setItem), { id: itemId, price: setItem.price + setItem.discount, options: toApiOption(setItem.options), tags: setItem.tags, remarks: setItem.remarks, excludeOrderDiscount: setItem.excludedDiscount, excludedOrderSurcharge: setItem.excludedSurcharge, quantity: 1, category: { id: setItem.categoryId }, menu: { id: setItem.menuId }, setMenuId: appBatchItem.setId }));
54
54
  });
55
55
  });
56
56
  }
57
57
  else {
58
58
  lodash_1.default.forEach(appBatchItem.itemIds, (itemId) => {
59
- items.push(Object.assign(Object.assign({}, appBatchItem), { id: itemId, options: toApiOption(appBatchItem.options), tags: appBatchItem.tags, remarks: appBatchItem.remarks, excludeOrderDiscount: appBatchItem.excludedDiscount, excludedOrderSurcharge: appBatchItem.excludedSurcharge, quantity: 1, category: { id: appBatchItem.categoryId }, menu: { id: appBatchItem.menuId }, setId: '', setMenuId: null }));
59
+ items.push(Object.assign(Object.assign({}, appBatchItem), { id: itemId, price: appBatchItem.price + appBatchItem.discount, options: toApiOption(appBatchItem.options), tags: appBatchItem.tags, remarks: appBatchItem.remarks, excludeOrderDiscount: appBatchItem.excludedDiscount, excludedOrderSurcharge: appBatchItem.excludedSurcharge, quantity: 1, category: { id: appBatchItem.categoryId }, menu: { id: appBatchItem.menuId }, setId: '', setMenuId: null }));
60
60
  });
61
61
  }
62
62
  });
@@ -1 +1 @@
1
- {"version":3,"file":"appOrderToapiOrder.js","sourceRoot":"","sources":["../../src/libs/appOrderToapiOrder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appOrderToapiOrder.js","sourceRoot":"","sources":["../../src/libs/appOrderToapiOrder.ts"],"names":[],"mappings":"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"}
@@ -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,CAuLhL"}
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,CAyLhL"}
@@ -92,20 +92,23 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
92
92
  // 計算折價後總計運費
93
93
  if (modifier.type === 'SURCHARGE') {
94
94
  // 找出預設不打服務費的items
95
- const excludedSurchargeItemsTotal = lodash_1.default.sumBy(lodash_1.default.flatMapDeep(lodash_1.default.map(order.batches, batch => batch.items.filter(item => item.excludedSurcharge))), 'total');
96
- const surchargeBaseTotal = total - excludedSurchargeItemsTotal;
95
+ const excludedSurchargeItems = lodash_1.default.map(order.batches, batch => batch.items.filter(item => item.excludedSurcharge));
96
+ const excludedSurchargeItemsTotal = lodash_1.default.sumBy(lodash_1.default.flatMapDeep(excludedSurchargeItems), 'total') + lodash_1.default.sumBy(lodash_1.default.flatMapDeep(excludedSurchargeItems), 'totalDiscount');
97
+ const surchargeBaseTotal = subtotal - excludedSurchargeItemsTotal;
97
98
  const surcharge = surchargeBaseTotal * (100 + modifier.percent) / 100 + modifier.amount;
98
99
  surchargeTotal += Math.abs(surchargeBaseTotal - surcharge);
99
100
  calculatedAmount = surchargeTotal;
101
+ newTotal = total + surchargeTotal;
100
102
  }
101
103
  else if (modifier.type === 'DISCOUNT') {
102
104
  // 找出預設不打折扣的items
103
- const excludedDiscountItemsTotal = lodash_1.default.sumBy(lodash_1.default.flatMapDeep(lodash_1.default.map(order.batches, batch => batch.items.filter(item => item.excludedDiscount))), 'total');
104
- const discountBaseTotal = subtotal - excludedDiscountItemsTotal - itemtotalDiscount;
105
+ const excludedDiscountItems = lodash_1.default.map(order.batches, batch => batch.items.filter(item => item.excludedDiscount));
106
+ const excludedDiscountItemsTotal = lodash_1.default.sumBy(lodash_1.default.flatMapDeep(excludedDiscountItems), 'total');
107
+ const discountBaseTotal = subtotal - excludedDiscountItemsTotal + itemtotalDiscount;
105
108
  const discount = (discountBaseTotal - (discountBaseTotal * (100 + modifier.percent) / 100 + modifier.amount));
106
109
  calculatedDiscountTotal += discount;
107
110
  calculatedAmount = Math.abs(discount) * -1;
108
- newTotal = subtotal - calculatedDiscountTotal;
111
+ newTotal = total - calculatedDiscountTotal;
109
112
  }
110
113
  else {
111
114
  newTotal = (subtotal * (100 + modifier.percent) / 100 + modifier.amount);
@@ -162,7 +165,6 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
162
165
  total = 0;
163
166
  }
164
167
  calculatedDiscountTotal += itemtotalDiscount;
165
- total = total + surchargeTotal - itemtotalDiscount;
166
168
  order.originalTotal = fixPrecision_1.default(originalTotal);
167
169
  order.subtotal = fixPrecision_1.default(subtotal);
168
170
  order.calculatedDiscountTotal = Math.abs(fixPrecision_1.default(calculatedDiscountTotal)) * -1;
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
@@ -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,CA4CtI"}
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,CAiDtI"}
@@ -15,17 +15,18 @@ function groupBatchItem(orderBatchItems, name = '', setMenuIndex = 0) {
15
15
  lodash_1.default.forEach(groupitemsByMenuId, (items, key) => {
16
16
  const updateValue = {};
17
17
  const ids = [];
18
+ updateValue.itemIds = [];
19
+ updateValue.ids = [];
18
20
  items.forEach(item => {
19
21
  var _a;
20
22
  updateValue.setMenuIndex = null;
21
23
  if (name !== '') {
22
24
  updateValue.setMenuIndex = setMenuIndex;
23
25
  updateValue.setName = name;
24
- updateValue.id = uuid_1.v4();
25
26
  }
26
27
  if (lodash_1.default.isEmpty(item.itemIds)) {
27
28
  ids.push(String((_a = item.id) !== null && _a !== void 0 ? _a : updateValue.id));
28
- if (item.quantity >= 1) {
29
+ if (item.quantity > 1) {
29
30
  for (let i = 1; i < item.quantity; i++) {
30
31
  ids.push(String(uuid_1.v4()));
31
32
  }
@@ -33,6 +34,10 @@ function groupBatchItem(orderBatchItems, name = '', setMenuIndex = 0) {
33
34
  updateValue.ids = ids;
34
35
  updateValue.itemIds = ids;
35
36
  }
37
+ else {
38
+ updateValue.itemIds = updateValue.itemIds.concat(item.itemIds);
39
+ updateValue.ids = updateValue.ids.concat(item.itemIds);
40
+ }
36
41
  if (item.isSet) {
37
42
  const setItems = groupBatchItem(item.setItems, item.name, setMenuIndex);
38
43
  updateValue.setItems = setItems;
@@ -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;IACnH,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,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,WAAW,CAAC,YAAY,GAAG,IAAI,CAAA;YAC/B,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,EAAE,YAAY,CAAC,CAAA;gBACvE,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"}
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;IACnH,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,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,WAAW,CAAC,OAAO,GAAG,EAAE,CAAA;QACxB,WAAW,CAAC,GAAG,GAAG,EAAE,CAAA;QACpB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;;YACnB,WAAW,CAAC,YAAY,GAAG,IAAI,CAAA;YAE/B,IAAI,IAAI,KAAK,EAAE,EAAE;gBACf,WAAW,CAAC,YAAY,GAAG,YAAY,CAAA;gBACvC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAA;aAC3B;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,GAAG,CAAC,EAAE;oBACrB,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;iBAAM;gBACL,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC9D,WAAW,CAAC,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aACvD;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;gBACvE,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;AAjDD,iCAiDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dimorder-orderapp-lib",
3
- "version": "0.1.183",
3
+ "version": "0.1.187",
4
4
  "main": "dist",
5
5
  "license": "UNLICENSED",
6
6
  "scripts": {