@darkpos/pricing 1.0.174 → 1.0.175

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.
@@ -41,6 +41,77 @@ describe('calculate order status', () => {
41
41
  expect(result.status.order).toBe('closed');
42
42
  });
43
43
 
44
+ test('holdOrder and openOrder cascade to sub-orders, skipping closed and void ones', () => {
45
+ const parent = {
46
+ status: { order: 'open' },
47
+ orders: [
48
+ { _id: 'a', status: { order: 'open' } },
49
+ { _id: 'b', status: { order: 'closed' } },
50
+ { _id: 'c', status: { order: 'void' } },
51
+ ],
52
+ };
53
+ const held = pricingService.order.holdOrder(parent);
54
+ expect(held.status.order).toBe('hold');
55
+ expect(held.orders.map(o => o.status.order)).toEqual([
56
+ 'hold',
57
+ 'closed',
58
+ 'void',
59
+ ]);
60
+
61
+ const opened = pricingService.order.openOrder(held);
62
+ expect(opened.status.order).toBe('open');
63
+ expect(opened.orders.map(o => o.status.order)).toEqual([
64
+ 'open',
65
+ 'closed',
66
+ 'void',
67
+ ]);
68
+ });
69
+
70
+ test('openOrder on a voided parent reopens its voided sub-orders', () => {
71
+ const opened = pricingService.order.openOrder({
72
+ status: { order: 'void' },
73
+ orders: [
74
+ { _id: 'a', status: { order: 'void' } },
75
+ { _id: 'b', status: { order: 'closed' } },
76
+ ],
77
+ });
78
+ expect(opened.status.order).toBe('open');
79
+ expect(opened.orders.map(o => o.status.order)).toEqual(['open', 'closed']);
80
+ });
81
+
82
+ test('keeps a voided order void, even when paid and picked', () => {
83
+ expect(
84
+ pricingService.order.calculate({
85
+ status: { order: 'void' },
86
+ items: [item],
87
+ }).status.order
88
+ ).toBe('void');
89
+
90
+ const paidPicked = pricingService.order.calculate({
91
+ status: { order: 'void' },
92
+ totalPaid: 10,
93
+ items: [
94
+ {
95
+ ...item,
96
+ totalPaid: 10,
97
+ status: { picked: { value: true }, paid: { value: true } },
98
+ },
99
+ ],
100
+ });
101
+ expect(paidPicked.status.order).toBe('void');
102
+ });
103
+
104
+ test('splitAndCalculate keeps held and voided sub-order statuses', () => {
105
+ const subOrders = pricingService.order.splitAndCalculate({
106
+ parentOrder: { status: { order: 'hold' }, modifiers: [], subTotal: 20 },
107
+ subOrders: [
108
+ { _id: 'a', status: { order: 'hold' }, items: [item] },
109
+ { _id: 'b', status: { order: 'void' }, items: [item] },
110
+ ],
111
+ });
112
+ expect(subOrders.map(o => o.status.order)).toEqual(['hold', 'void']);
113
+ });
114
+
44
115
  test('reopens a closed order that is no longer paid and picked', () => {
45
116
  const result = pricingService.order.calculate({
46
117
  status: { order: 'closed' },
@@ -193,6 +193,7 @@ module.exports = ({
193
193
 
194
194
  let orderStatus = actions.isHold(order) ? 'hold' : 'open';
195
195
  if (picked && paid) orderStatus = 'closed';
196
+ if (actions.isVoid(order)) orderStatus = 'void';
196
197
 
197
198
  return {
198
199
  ...order,
package/lib/order/hold.js CHANGED
@@ -1,12 +1,20 @@
1
1
  module.exports = ({ constants }) =>
2
2
  function holdOrder(order) {
3
3
  if (!order) return order;
4
- return {
5
- ...order,
6
- status: {
7
- ...(order.status || {}),
8
- order: constants.Status.Order.HOLD,
9
- },
10
- // properties: { kitchenOrder: Date.now() },
11
- };
4
+ const { HOLD, CLOSED, VOID } = constants.Status.Order;
5
+ const setHold = each => ({
6
+ ...each,
7
+ status: { ...(each.status || {}), order: HOLD },
8
+ });
9
+
10
+ const held = setHold(order);
11
+ // Sub-orders follow the parent, except closed or voided ones
12
+ if (Array.isArray(order.orders)) {
13
+ held.orders = order.orders.map(each =>
14
+ !each || [CLOSED, VOID].includes(each.status && each.status.order)
15
+ ? each
16
+ : setHold(each)
17
+ );
18
+ }
19
+ return held;
12
20
  };
package/lib/order/open.js CHANGED
@@ -1,11 +1,23 @@
1
1
  module.exports = ({ constants }) =>
2
2
  function openOrder(order) {
3
3
  if (!order) return order;
4
- return {
5
- ...order,
6
- status: {
7
- ...(order.status || {}),
8
- order: constants.Status.Order.OPEN,
9
- },
10
- };
4
+ const { OPEN, CLOSED, VOID } = constants.Status.Order;
5
+ const setOpen = each => ({
6
+ ...each,
7
+ status: { ...(each.status || {}), order: OPEN },
8
+ });
9
+
10
+ // Un-voiding a parent reopens its voided sub-orders too
11
+ const skipped =
12
+ order.status && order.status.order === VOID ? [CLOSED] : [CLOSED, VOID];
13
+
14
+ const opened = setOpen(order);
15
+ if (Array.isArray(order.orders)) {
16
+ opened.orders = order.orders.map(each =>
17
+ !each || skipped.includes(each.status && each.status.order)
18
+ ? each
19
+ : setOpen(each)
20
+ );
21
+ }
22
+ return opened;
11
23
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@darkpos/pricing",
3
- "version": "1.0.174",
3
+ "version": "1.0.175",
4
4
  "description": "Pricing calculator",
5
5
  "author": "Dark POS",
6
6
  "license": "ISC",
@@ -54,5 +54,5 @@
54
54
  "supertest": "^6.2.3",
55
55
  "supervisor": "^0.12.0"
56
56
  },
57
- "gitHead": "0552fcb5d20916710172a621da480ce751503c5b"
57
+ "gitHead": "c369da4b3f572259dcd23762f272093efdbedfa2"
58
58
  }