@darkpos/pricing 1.0.27 → 1.0.28
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/lib/order/pickEndDate.js +20 -15
- package/package.json +2 -2
package/lib/order/pickEndDate.js
CHANGED
|
@@ -8,12 +8,11 @@ module.exports = ({ settings, _, moment }) => {
|
|
|
8
8
|
if (!Array.isArray(close)) return [];
|
|
9
9
|
return close.map(closedDate => ({
|
|
10
10
|
isoWeekDay: moment(closedDate.date).tz(timezone).isoWeekday(),
|
|
11
|
-
date: moment(closedDate.date).tz(timezone)
|
|
11
|
+
date: moment(closedDate.date).tz(timezone),
|
|
12
12
|
}));
|
|
13
|
-
}
|
|
13
|
+
};
|
|
14
14
|
|
|
15
15
|
return function pickEndDate(schedule = {}) {
|
|
16
|
-
|
|
17
16
|
const {
|
|
18
17
|
addDays = 1,
|
|
19
18
|
hour,
|
|
@@ -28,25 +27,31 @@ module.exports = ({ settings, _, moment }) => {
|
|
|
28
27
|
|
|
29
28
|
const closedDays = getClosedDays();
|
|
30
29
|
|
|
31
|
-
if (
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
30
|
+
if (cutHour && todayTZ.get('hours') > cutHour.hour ||
|
|
31
|
+
(
|
|
32
|
+
todayTZ.get('hours') >= cutHour.hour &&
|
|
33
|
+
todayTZ.get('minutes') > cutHour.minute
|
|
34
|
+
)
|
|
35
|
+
) {
|
|
36
|
+
endDateTZ = endDateTZ.add(cutDay, 'days');
|
|
36
37
|
}
|
|
37
38
|
|
|
38
39
|
let addDaysCounter = 0;
|
|
39
40
|
|
|
40
41
|
while (addDaysCounter < addDays) {
|
|
41
42
|
endDateTZ = endDateTZ.add(1, 'days');
|
|
42
|
-
const endDateISOWeekday = endDateTZ.isoWeekday()
|
|
43
|
+
const endDateISOWeekday = endDateTZ.isoWeekday();
|
|
43
44
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
addDaysCounter++;
|
|
48
|
-
}
|
|
45
|
+
const shouldSkip =
|
|
46
|
+
skipDays.includes(endDateISOWeekday) ||
|
|
47
|
+
(endDateISOWeekday === 7 && skipDays === 0);
|
|
49
48
|
|
|
49
|
+
if (
|
|
50
|
+
!shouldSkip &&
|
|
51
|
+
!closedDays.some(closedDay => closedDay.date.isSame(endDateTZ, 'day'))
|
|
52
|
+
) {
|
|
53
|
+
addDaysCounter++;
|
|
54
|
+
}
|
|
50
55
|
}
|
|
51
56
|
|
|
52
57
|
if (hour !== undefined) endDateTZ.set('hour', hour);
|
|
@@ -55,4 +60,4 @@ module.exports = ({ settings, _, moment }) => {
|
|
|
55
60
|
|
|
56
61
|
return moment.utc(endDateTZ).format();
|
|
57
62
|
};
|
|
58
|
-
};
|
|
63
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darkpos/pricing",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.28",
|
|
4
4
|
"description": "Pricing calculator",
|
|
5
5
|
"author": "Dark POS",
|
|
6
6
|
"license": "ISC",
|
|
@@ -36,5 +36,5 @@
|
|
|
36
36
|
"supertest": "^6.2.3",
|
|
37
37
|
"supervisor": "^0.12.0"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "b6e37fe06bd25e18c66d7b2f1a06fb1c50bd0db6"
|
|
40
40
|
}
|