@darkpos/pricing 1.0.172 → 1.0.174
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/README.md +2 -5
- package/__TEST__/invoice.test.js +5 -1
- package/__TEST__/item/getModifierTags.test.js +1 -1
- package/__TEST__/item/unpick.item.test.js +2 -0
- package/__TEST__/item.test.js +2 -0
- package/__TEST__/mocks/storeSettings.js +427 -0
- package/__TEST__/mocks/stores.js +0 -429
- package/__TEST__/modifier/addItemModifier.test.js +2 -0
- package/__TEST__/modifier/hasModifier.test.js +2 -0
- package/__TEST__/modifier/overrideModifiers.test.js +2 -0
- package/__TEST__/modifier.test.js +2 -0
- package/__TEST__/order/addItem.test.js +2 -0
- package/__TEST__/order/addItemsToSubOrder.js +9 -3
- package/__TEST__/order/applyRefund.test.js +2 -0
- package/__TEST__/order/conditionsNotMet.test.js +2 -0
- package/__TEST__/order/createSubOrder.test.js +10 -2
- package/__TEST__/order/getGiftModifierSources.test.js +8 -2
- package/__TEST__/order/getPaidGiftModifiers.test.js +3 -3
- package/__TEST__/order/getParentTotals.test.js +2 -0
- package/__TEST__/order/getSameItems.test.js +2 -0
- package/__TEST__/order/hasSerial.test.js +2 -0
- package/__TEST__/order/hold.test.js +51 -0
- package/__TEST__/order/manualSplit.test.js +2 -0
- package/__TEST__/order/normalizeEndDate.test.js +11 -13
- package/__TEST__/order/order-payment-modifier.test.js +2 -0
- package/__TEST__/order/order.test.js +8 -6
- package/__TEST__/order/pickEndDate.test.js +48 -54
- package/__TEST__/order/setPieces.test.js +2 -0
- package/__TEST__/order/split.test.js +14 -16
- package/__TEST__/order/unpick.order.test.js +2 -0
- package/__TEST__/payment/getPaymentItemIds.test.js +33 -9
- package/__TEST__/payment/getPaymentOrderIds.test.js +24 -8
- package/__TEST__/payment.test.js +3 -9
- package/lib/index.js +7 -2
- package/lib/order/calculate.js +4 -1
- package/lib/payment/getMethodLabel.js +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
const usePricing = require('../../index');
|
|
2
|
+
const mockStores = require('../mocks/stores');
|
|
3
|
+
const mockStoreSettings = require('../mocks/storeSettings');
|
|
4
|
+
|
|
5
|
+
const pricingService = usePricing({
|
|
6
|
+
store: mockStores[0],
|
|
7
|
+
settings: mockStoreSettings,
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
const item = {
|
|
11
|
+
_id: 'item-1',
|
|
12
|
+
itemId: 'item-1',
|
|
13
|
+
name: 'Shirt',
|
|
14
|
+
price: 10,
|
|
15
|
+
quantity: 1,
|
|
16
|
+
modifiers: [],
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
describe('calculate order status', () => {
|
|
20
|
+
test('keeps a held order on hold', () => {
|
|
21
|
+
const order = pricingService.order.holdOrder({ status: {}, items: [item] });
|
|
22
|
+
const result = pricingService.order.calculate(order);
|
|
23
|
+
expect(result.status.order).toBe('hold');
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
test('closes a held order once it is paid and picked', () => {
|
|
27
|
+
const order = pricingService.order.holdOrder({
|
|
28
|
+
status: {},
|
|
29
|
+
totalPaid: 10,
|
|
30
|
+
items: [
|
|
31
|
+
{
|
|
32
|
+
...item,
|
|
33
|
+
totalPaid: 10,
|
|
34
|
+
status: { picked: { value: true }, paid: { value: true } },
|
|
35
|
+
},
|
|
36
|
+
],
|
|
37
|
+
});
|
|
38
|
+
const result = pricingService.order.calculate(order);
|
|
39
|
+
expect(result.status.paid).toBe(true);
|
|
40
|
+
expect(result.status.picked).toBe(true);
|
|
41
|
+
expect(result.status.order).toBe('closed');
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
test('reopens a closed order that is no longer paid and picked', () => {
|
|
45
|
+
const result = pricingService.order.calculate({
|
|
46
|
+
status: { order: 'closed' },
|
|
47
|
+
items: [item],
|
|
48
|
+
});
|
|
49
|
+
expect(result.status.order).toBe('open');
|
|
50
|
+
});
|
|
51
|
+
});
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
const usePricing = require('../../index');
|
|
2
2
|
const mockStores = require('../mocks/stores');
|
|
3
|
+
const mockStoreSettings = require('../mocks/storeSettings');
|
|
3
4
|
|
|
4
5
|
const session = {
|
|
5
6
|
store: mockStores[0],
|
|
7
|
+
settings: mockStoreSettings,
|
|
6
8
|
};
|
|
7
9
|
|
|
8
10
|
const pricingService = usePricing(session);
|
|
@@ -3,19 +3,17 @@ const usePricing = require('../../index');
|
|
|
3
3
|
|
|
4
4
|
const getPricingService = () =>
|
|
5
5
|
usePricing({
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
],
|
|
18
|
-
},
|
|
6
|
+
settings: {
|
|
7
|
+
order: {
|
|
8
|
+
schedules: [
|
|
9
|
+
{
|
|
10
|
+
addDays: 0,
|
|
11
|
+
readyHour: { hour: 17, minute: 0 },
|
|
12
|
+
skipDays: [],
|
|
13
|
+
cutHour: { hour: 16, minute: 0 },
|
|
14
|
+
cutDay: 1,
|
|
15
|
+
},
|
|
16
|
+
],
|
|
19
17
|
},
|
|
20
18
|
},
|
|
21
19
|
});
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
const usePricing = require('../../index');
|
|
2
2
|
const mockStores = require('../mocks/stores');
|
|
3
|
+
const mockStoreSettings = require('../mocks/storeSettings');
|
|
3
4
|
|
|
4
5
|
const session = {
|
|
5
6
|
store: mockStores[0],
|
|
7
|
+
settings: mockStoreSettings,
|
|
6
8
|
};
|
|
7
9
|
|
|
8
10
|
const pricingService = usePricing(session);
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
const usePricing = require('../../index');
|
|
2
2
|
const mockStores = require('../mocks/stores');
|
|
3
|
+
const mockStoreSettings = require('../mocks/storeSettings');
|
|
3
4
|
|
|
4
5
|
const orderCredit = require('../mocks/order-credit.json');
|
|
5
6
|
const { Types } = require('../../lib/constants/Modifier/Compute');
|
|
6
7
|
|
|
7
8
|
const session = {
|
|
8
9
|
store: mockStores[0],
|
|
10
|
+
settings: mockStoreSettings,
|
|
9
11
|
};
|
|
10
12
|
|
|
11
13
|
const pricingService = usePricing(session);
|
|
@@ -2448,7 +2450,7 @@ describe('Order actions', () => {
|
|
|
2448
2450
|
|
|
2449
2451
|
test('Get calculated Order, multiple items and indirect modifiers #2 toNeareastMultiple', () => {
|
|
2450
2452
|
const pricingService2 = usePricing({
|
|
2451
|
-
|
|
2453
|
+
settings: { localization: { nearestMultiple: '0.5' } },
|
|
2452
2454
|
});
|
|
2453
2455
|
|
|
2454
2456
|
const item1 = {
|
|
@@ -2502,7 +2504,7 @@ describe('Order actions', () => {
|
|
|
2502
2504
|
|
|
2503
2505
|
test('CU-86dvd3dbp Get calculated Order, multiple items and indirect modifiers #2 toNeareastMultiple (No Order Modifiers)', () => {
|
|
2504
2506
|
const pricingService2 = usePricing({
|
|
2505
|
-
|
|
2507
|
+
settings: { localization: { nearestMultiple: '0.5' } },
|
|
2506
2508
|
});
|
|
2507
2509
|
|
|
2508
2510
|
const item1 = {
|
|
@@ -3746,7 +3748,7 @@ describe('Order actions', () => {
|
|
|
3746
3748
|
};
|
|
3747
3749
|
const order = { items: [orderItem] };
|
|
3748
3750
|
const pricing = usePricing({
|
|
3749
|
-
|
|
3751
|
+
settings: { order: { autoMarkAsPaid: true } },
|
|
3750
3752
|
});
|
|
3751
3753
|
const newOrder = pricing.order.calculate(order);
|
|
3752
3754
|
|
|
@@ -3784,7 +3786,7 @@ describe('Order actions', () => {
|
|
|
3784
3786
|
},
|
|
3785
3787
|
};
|
|
3786
3788
|
const pricing = usePricing({
|
|
3787
|
-
|
|
3789
|
+
settings: { order: { autoMarkAsPaid: true } },
|
|
3788
3790
|
});
|
|
3789
3791
|
const order = { items: [orderItem], status: { paid: true } };
|
|
3790
3792
|
const newOrder = pricing.order.calculate(order);
|
|
@@ -3816,7 +3818,7 @@ describe('Order actions', () => {
|
|
|
3816
3818
|
totalPaid: 30,
|
|
3817
3819
|
};
|
|
3818
3820
|
const pricing = usePricing({
|
|
3819
|
-
|
|
3821
|
+
settings: { order: { autoMarkAsPaid: false } },
|
|
3820
3822
|
});
|
|
3821
3823
|
const order = { items: [orderItem], status: {}, totalPaid: 30 };
|
|
3822
3824
|
const newOrder = pricing.order.calculate(order);
|
|
@@ -3835,7 +3837,7 @@ describe('Order actions', () => {
|
|
|
3835
3837
|
quantity: 1,
|
|
3836
3838
|
};
|
|
3837
3839
|
const pricing = usePricing({
|
|
3838
|
-
|
|
3840
|
+
settings: { order: { autoMarkAsPaid: true } },
|
|
3839
3841
|
});
|
|
3840
3842
|
const order = { items: [orderItem] };
|
|
3841
3843
|
const newOrder = pricing.order.calculate(order);
|
|
@@ -2,31 +2,29 @@ const moment = require('moment-timezone');
|
|
|
2
2
|
const usePricing = require('../../lib/index');
|
|
3
3
|
|
|
4
4
|
const getDefaultSettings = (schedules, readyDateCapacityDays = []) => ({
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
cutHour: null,
|
|
25
|
-
},
|
|
26
|
-
],
|
|
27
|
-
readyDateCapacity: {
|
|
28
|
-
days: readyDateCapacityDays,
|
|
5
|
+
settings: {
|
|
6
|
+
schedule: {
|
|
7
|
+
closed: [
|
|
8
|
+
{
|
|
9
|
+
date: '2024-09-03',
|
|
10
|
+
},
|
|
11
|
+
],
|
|
12
|
+
},
|
|
13
|
+
order: {
|
|
14
|
+
schedules: schedules || [
|
|
15
|
+
{
|
|
16
|
+
_id: '682373ef8256034ae1f2c195',
|
|
17
|
+
dayOfWeek: [2],
|
|
18
|
+
recommended: 'auto_recommended',
|
|
19
|
+
addDays: 1,
|
|
20
|
+
cutDay: 1,
|
|
21
|
+
skipDays: undefined,
|
|
22
|
+
readyHour: null,
|
|
23
|
+
cutHour: null,
|
|
29
24
|
},
|
|
25
|
+
],
|
|
26
|
+
readyDateCapacity: {
|
|
27
|
+
days: readyDateCapacityDays,
|
|
30
28
|
},
|
|
31
29
|
},
|
|
32
30
|
},
|
|
@@ -191,23 +189,21 @@ describe('pickEndDate function', () => {
|
|
|
191
189
|
|
|
192
190
|
test('pickEndDate - getRecommendedEndDate, skipDays with dayOfWeek undefined', () => {
|
|
193
191
|
const pricingServiceSkipDays2 = usePricing({
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
],
|
|
210
|
-
},
|
|
192
|
+
settings: {
|
|
193
|
+
order: {
|
|
194
|
+
endDate: {
|
|
195
|
+
readySchedule: [
|
|
196
|
+
{
|
|
197
|
+
_id: '682373ef8256034ae1f2c195',
|
|
198
|
+
dayOfWeek: null,
|
|
199
|
+
recommended: 'auto_recommended',
|
|
200
|
+
addDays: 1,
|
|
201
|
+
cutDay: 1,
|
|
202
|
+
skipDays: [1],
|
|
203
|
+
readyHour: null,
|
|
204
|
+
cutHour: null,
|
|
205
|
+
},
|
|
206
|
+
],
|
|
211
207
|
},
|
|
212
208
|
},
|
|
213
209
|
},
|
|
@@ -421,19 +417,17 @@ describe('pickEndDate function', () => {
|
|
|
421
417
|
};
|
|
422
418
|
|
|
423
419
|
const pricingService = usePricing({
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
],
|
|
436
|
-
},
|
|
420
|
+
settings: {
|
|
421
|
+
schedule: {
|
|
422
|
+
closed: [{ date: '2026-03-01' }],
|
|
423
|
+
},
|
|
424
|
+
order: {
|
|
425
|
+
schedules: [schedule],
|
|
426
|
+
readyDateCapacity: {
|
|
427
|
+
days: [
|
|
428
|
+
{ day: 6, maxOrders: 2, maxItems: 10 },
|
|
429
|
+
{ day: 1, maxOrders: 10, maxItems: 10 },
|
|
430
|
+
],
|
|
437
431
|
},
|
|
438
432
|
},
|
|
439
433
|
},
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
const utils = require('@darkpos/utils');
|
|
2
2
|
const usePricing = require('../../index');
|
|
3
3
|
const mockStores = require('../mocks/stores');
|
|
4
|
+
const mockStoreSettings = require('../mocks/storeSettings');
|
|
4
5
|
const orders = require('../mocks/setPieces/ordersMock');
|
|
5
6
|
|
|
6
7
|
const session = {
|
|
7
8
|
store: mockStores[0],
|
|
9
|
+
settings: mockStoreSettings,
|
|
8
10
|
};
|
|
9
11
|
|
|
10
12
|
const pricingService = usePricing(session);
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
const moment = require('moment-timezone');
|
|
2
2
|
const usePricing = require('../../index');
|
|
3
3
|
const mockStores = require('../mocks/stores');
|
|
4
|
+
const mockStoreSettings = require('../mocks/storeSettings');
|
|
4
5
|
const orderSplit1 = require('../mocks/order/split-1.json');
|
|
5
6
|
|
|
6
7
|
const session = {
|
|
7
8
|
store: mockStores[0],
|
|
9
|
+
settings: mockStoreSettings,
|
|
8
10
|
};
|
|
9
11
|
|
|
10
12
|
const pricingService = usePricing(session);
|
|
@@ -98,14 +100,12 @@ describe('Auto Split', () => {
|
|
|
98
100
|
departments: [{ _id: 'laundry-department-id' }],
|
|
99
101
|
};
|
|
100
102
|
const pricingServiceWithSchedules = usePricing({
|
|
101
|
-
store:
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
order
|
|
106
|
-
|
|
107
|
-
schedules: [defaultSchedule, departmentSchedule],
|
|
108
|
-
},
|
|
103
|
+
store: mockStores[0],
|
|
104
|
+
settings: {
|
|
105
|
+
...mockStoreSettings,
|
|
106
|
+
order: {
|
|
107
|
+
...mockStoreSettings.order,
|
|
108
|
+
schedules: [defaultSchedule, departmentSchedule],
|
|
109
109
|
},
|
|
110
110
|
},
|
|
111
111
|
});
|
|
@@ -165,14 +165,12 @@ describe('Auto Split', () => {
|
|
|
165
165
|
departments: [{ _id: 'laundry-department-id' }],
|
|
166
166
|
};
|
|
167
167
|
const pricingServiceWithSchedules = usePricing({
|
|
168
|
-
store:
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
order
|
|
173
|
-
|
|
174
|
-
schedules: [defaultSchedule, departmentSchedule],
|
|
175
|
-
},
|
|
168
|
+
store: mockStores[0],
|
|
169
|
+
settings: {
|
|
170
|
+
...mockStoreSettings,
|
|
171
|
+
order: {
|
|
172
|
+
...mockStoreSettings.order,
|
|
173
|
+
schedules: [defaultSchedule, departmentSchedule],
|
|
176
174
|
},
|
|
177
175
|
},
|
|
178
176
|
});
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
const usePricing = require('../../index');
|
|
2
2
|
const mockStores = require('../mocks/stores');
|
|
3
|
+
const mockStoreSettings = require('../mocks/storeSettings');
|
|
3
4
|
|
|
4
5
|
const session = {
|
|
5
6
|
store: mockStores[0],
|
|
7
|
+
settings: mockStoreSettings,
|
|
6
8
|
};
|
|
7
9
|
|
|
8
10
|
const pricingService = usePricing(session);
|
|
@@ -2,9 +2,9 @@ const usePricing = require('../../index');
|
|
|
2
2
|
|
|
3
3
|
const pricingService = usePricing();
|
|
4
4
|
|
|
5
|
-
const makePayment =
|
|
5
|
+
const makePayment = invoices => ({ paymentInvoices: invoices });
|
|
6
6
|
|
|
7
|
-
const makeInvoice =
|
|
7
|
+
const makeInvoice = itemIds => ({
|
|
8
8
|
paymentOrderItems: itemIds.map(orderItemId => ({ orderItemId })),
|
|
9
9
|
});
|
|
10
10
|
|
|
@@ -18,26 +18,50 @@ describe('getPaymentItemIds', () => {
|
|
|
18
18
|
});
|
|
19
19
|
|
|
20
20
|
test('returns empty array when paymentInvoices is empty', () => {
|
|
21
|
-
expect(pricingService.payment.getPaymentItemIds(makePayment([]))).toEqual(
|
|
21
|
+
expect(pricingService.payment.getPaymentItemIds(makePayment([]))).toEqual(
|
|
22
|
+
[]
|
|
23
|
+
);
|
|
22
24
|
});
|
|
23
25
|
|
|
24
26
|
test('extracts itemIds from single invoice', () => {
|
|
25
27
|
const payment = makePayment([makeInvoice(['item1', 'item2'])]);
|
|
26
|
-
expect(pricingService.payment.getPaymentItemIds(payment)).toEqual([
|
|
28
|
+
expect(pricingService.payment.getPaymentItemIds(payment)).toEqual([
|
|
29
|
+
'item1',
|
|
30
|
+
'item2',
|
|
31
|
+
]);
|
|
27
32
|
});
|
|
28
33
|
|
|
29
34
|
test('extracts itemIds from multiple invoices', () => {
|
|
30
|
-
const payment = makePayment([
|
|
31
|
-
|
|
35
|
+
const payment = makePayment([
|
|
36
|
+
makeInvoice(['item1']),
|
|
37
|
+
makeInvoice(['item2', 'item3']),
|
|
38
|
+
]);
|
|
39
|
+
expect(pricingService.payment.getPaymentItemIds(payment)).toEqual([
|
|
40
|
+
'item1',
|
|
41
|
+
'item2',
|
|
42
|
+
'item3',
|
|
43
|
+
]);
|
|
32
44
|
});
|
|
33
45
|
|
|
34
46
|
test('filters out null/undefined itemIds', () => {
|
|
35
|
-
const payment = makePayment([
|
|
36
|
-
|
|
47
|
+
const payment = makePayment([
|
|
48
|
+
{
|
|
49
|
+
paymentOrderItems: [
|
|
50
|
+
{ orderItemId: 'item1' },
|
|
51
|
+
{ orderItemId: null },
|
|
52
|
+
{},
|
|
53
|
+
],
|
|
54
|
+
},
|
|
55
|
+
]);
|
|
56
|
+
expect(pricingService.payment.getPaymentItemIds(payment)).toEqual([
|
|
57
|
+
'item1',
|
|
58
|
+
]);
|
|
37
59
|
});
|
|
38
60
|
|
|
39
61
|
test('coerces itemIds to strings', () => {
|
|
40
|
-
const payment = makePayment([
|
|
62
|
+
const payment = makePayment([
|
|
63
|
+
{ paymentOrderItems: [{ orderItemId: 123 }] },
|
|
64
|
+
]);
|
|
41
65
|
expect(pricingService.payment.getPaymentItemIds(payment)).toEqual(['123']);
|
|
42
66
|
});
|
|
43
67
|
|
|
@@ -2,9 +2,9 @@ const usePricing = require('../../index');
|
|
|
2
2
|
|
|
3
3
|
const pricingService = usePricing();
|
|
4
4
|
|
|
5
|
-
const makePayment =
|
|
5
|
+
const makePayment = invoices => ({ paymentInvoices: invoices });
|
|
6
6
|
|
|
7
|
-
const makeInvoice =
|
|
7
|
+
const makeInvoice = orderIds => ({
|
|
8
8
|
paymentOrderItems: orderIds.map(orderId => ({ orderId })),
|
|
9
9
|
});
|
|
10
10
|
|
|
@@ -18,22 +18,38 @@ describe('getPaymentOrderIds', () => {
|
|
|
18
18
|
});
|
|
19
19
|
|
|
20
20
|
test('returns empty array when paymentInvoices is empty', () => {
|
|
21
|
-
expect(pricingService.payment.getPaymentOrderIds(makePayment([]))).toEqual(
|
|
21
|
+
expect(pricingService.payment.getPaymentOrderIds(makePayment([]))).toEqual(
|
|
22
|
+
[]
|
|
23
|
+
);
|
|
22
24
|
});
|
|
23
25
|
|
|
24
26
|
test('extracts orderIds from single invoice', () => {
|
|
25
27
|
const payment = makePayment([makeInvoice(['order1', 'order2'])]);
|
|
26
|
-
expect(pricingService.payment.getPaymentOrderIds(payment)).toEqual([
|
|
28
|
+
expect(pricingService.payment.getPaymentOrderIds(payment)).toEqual([
|
|
29
|
+
'order1',
|
|
30
|
+
'order2',
|
|
31
|
+
]);
|
|
27
32
|
});
|
|
28
33
|
|
|
29
34
|
test('extracts orderIds from multiple invoices', () => {
|
|
30
|
-
const payment = makePayment([
|
|
31
|
-
|
|
35
|
+
const payment = makePayment([
|
|
36
|
+
makeInvoice(['order1']),
|
|
37
|
+
makeInvoice(['order2', 'order3']),
|
|
38
|
+
]);
|
|
39
|
+
expect(pricingService.payment.getPaymentOrderIds(payment)).toEqual([
|
|
40
|
+
'order1',
|
|
41
|
+
'order2',
|
|
42
|
+
'order3',
|
|
43
|
+
]);
|
|
32
44
|
});
|
|
33
45
|
|
|
34
46
|
test('filters out null/undefined orderIds', () => {
|
|
35
|
-
const payment = makePayment([
|
|
36
|
-
|
|
47
|
+
const payment = makePayment([
|
|
48
|
+
{ paymentOrderItems: [{ orderId: 'order1' }, { orderId: null }, {}] },
|
|
49
|
+
]);
|
|
50
|
+
expect(pricingService.payment.getPaymentOrderIds(payment)).toEqual([
|
|
51
|
+
'order1',
|
|
52
|
+
]);
|
|
37
53
|
});
|
|
38
54
|
|
|
39
55
|
test('coerces orderIds to strings', () => {
|
package/__TEST__/payment.test.js
CHANGED
|
@@ -1,21 +1,15 @@
|
|
|
1
1
|
const usePricing = require('../index');
|
|
2
2
|
const mockStores = require('./mocks/stores');
|
|
3
|
+
const mockStoreSettings = require('./mocks/storeSettings');
|
|
3
4
|
|
|
4
5
|
const session = {
|
|
5
6
|
store: mockStores[0],
|
|
7
|
+
settings: mockStoreSettings,
|
|
6
8
|
};
|
|
7
9
|
|
|
8
10
|
const pricingService = usePricing(session);
|
|
9
11
|
const pricingServiceMethodLabel = usePricing({
|
|
10
|
-
|
|
11
|
-
_settings: {
|
|
12
|
-
_settings: {
|
|
13
|
-
payment: {
|
|
14
|
-
methods: mockStores[0]._settings.payment.methods,
|
|
15
|
-
},
|
|
16
|
-
},
|
|
17
|
-
},
|
|
18
|
-
},
|
|
12
|
+
settings: { payment: { methods: mockStoreSettings.payment.methods } },
|
|
19
13
|
});
|
|
20
14
|
|
|
21
15
|
describe('getMaxAmountsToRefund tests', () => {
|
package/lib/index.js
CHANGED
|
@@ -14,12 +14,17 @@ const makeStatementActions = require('./statement');
|
|
|
14
14
|
|
|
15
15
|
const constants = require('./constants');
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
/**
|
|
18
|
+
* The pricing actions of a store:
|
|
19
|
+
* store: the store itself, its entity information
|
|
20
|
+
* settings: its settings by group, e.g. { localization: {...}, order: {...}, payment: {...} }
|
|
21
|
+
*/
|
|
22
|
+
module.exports = ({ store, settings = {} } = {}) => {
|
|
18
23
|
const { useLocalization } = utils;
|
|
19
|
-
const settings = _.get(session, 'store._settings', {});
|
|
20
24
|
const localization = useLocalization(settings.localization);
|
|
21
25
|
|
|
22
26
|
const deps = {
|
|
27
|
+
store,
|
|
23
28
|
settings,
|
|
24
29
|
utils,
|
|
25
30
|
localization,
|
package/lib/order/calculate.js
CHANGED
|
@@ -191,6 +191,9 @@ module.exports = ({
|
|
|
191
191
|
totalPaid,
|
|
192
192
|
});
|
|
193
193
|
|
|
194
|
+
let orderStatus = actions.isHold(order) ? 'hold' : 'open';
|
|
195
|
+
if (picked && paid) orderStatus = 'closed';
|
|
196
|
+
|
|
194
197
|
return {
|
|
195
198
|
...order,
|
|
196
199
|
subTotals,
|
|
@@ -201,7 +204,7 @@ module.exports = ({
|
|
|
201
204
|
...(order.status || {}),
|
|
202
205
|
picked,
|
|
203
206
|
paid,
|
|
204
|
-
order:
|
|
207
|
+
order: orderStatus,
|
|
205
208
|
},
|
|
206
209
|
properties: {
|
|
207
210
|
...(order.properties || {}),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
module.exports = ({ settings, _ }) =>
|
|
2
2
|
function getMethodLabel({ paymentProvider }) {
|
|
3
|
-
const methods = _.get(settings, '
|
|
3
|
+
const methods = _.get(settings, 'payment.methods', {});
|
|
4
4
|
|
|
5
5
|
if (!paymentProvider || !methods[paymentProvider]) return '';
|
|
6
6
|
return methods[paymentProvider].label || '';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darkpos/pricing",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.174",
|
|
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": "
|
|
57
|
+
"gitHead": "0552fcb5d20916710172a621da480ce751503c5b"
|
|
58
58
|
}
|