dimorder-orderapp-lib 1.1.5 → 1.1.6

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.
Files changed (3) hide show
  1. package/dist/libs/formatSummary.js +2 -1
  2. package/dist/libs/formatSummary.js.map +1 -1
  3. package/package.json +1 -1
package/dist/libs/formatSummary.js CHANGED
@@ -60,8 +60,9 @@ function formatSummary(appOrder, setting, includeCancelled = false) {
60
60
  const groupByBatch = (setting.receiptGroupBy === 'batch');
61
61
  const groupBatchItems = (0, groupBatchItem_1.default)(orderedItems, undefined, undefined, true, groupByBatch);
62
62
  summary = groupBatchItems.map(groupBatchItem => {
63
+ var _a;
63
64
  const calculateItem = (0, calculateLocalBatchItem_1.default)(groupBatchItem, appOrder);
64
- const total = calculateItem.total + calculateItem.totalDiscount;
65
+ const total = (_a = calculateItem.totalWithoutDiscountModifiers) !== null && _a !== void 0 ? _a : calculateItem.total;
65
66
  return {
66
67
  id: calculateItem.id,
67
68
  batchId: calculateItem.batchId,
package/dist/libs/formatSummary.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"formatSummary.js","sourceRoot":"","sources":["../../src/libs/formatSummary.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"formatSummary.js","sourceRoot":"","sources":["../../src/libs/formatSummary.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dimorder-orderapp-lib",
3
- "version": "1.1.5",
3
+ "version": "1.1.6",
4
4
  "main": "dist",
5
5
  "license": "UNLICENSED",
6
6
  "scripts": {