@hyper.software/common-helpers 1.12.3 → 1.12.5
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/services/bookingService/bookingServicesService.js +4 -4
- package/lib/services/bookingService/bookingServicesService.js.map +1 -1
- package/lib/services/dateService/dateService.d.ts +1 -2
- package/lib/services/dateService/dateService.js +1 -24
- package/lib/services/dateService/dateService.js.map +1 -1
- package/package.json +1 -1
|
@@ -25,10 +25,10 @@ var getBookingServiceTotalCost = function (booking, rbbs) {
|
|
|
25
25
|
if (!roomBooking) {
|
|
26
26
|
return (0, bookingsService_1.getSeasonalNights)(rbbs, service.startDate, service.endDate);
|
|
27
27
|
}
|
|
28
|
-
var originalCurrentDay = (0, dateService_1.
|
|
29
|
-
var bookingEndDate_1 = (0, dateService_1.
|
|
30
|
-
var serviceStartDate = (0, dateService_1.
|
|
31
|
-
var serviceEndDate = (0, dateService_1.
|
|
28
|
+
var originalCurrentDay = (0, moment_1.default)((0, dateService_1.normalizeDate)(roomBooking.checkinDate)).utc().startOf('day');
|
|
29
|
+
var bookingEndDate_1 = (0, moment_1.default)((0, dateService_1.normalizeDate)(roomBooking.checkoutDate)).utc().startOf('day');
|
|
30
|
+
var serviceStartDate = (0, moment_1.default)((0, dateService_1.normalizeDate)(service.startDate)).utc().startOf('day');
|
|
31
|
+
var serviceEndDate = (0, moment_1.default)((0, dateService_1.normalizeDate)(service.endDate)).utc().startOf('day');
|
|
32
32
|
var seasonalNights = 0;
|
|
33
33
|
if (!originalCurrentDay || !bookingEndDate_1 || !serviceStartDate || !serviceEndDate) {
|
|
34
34
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bookingServicesService.js","sourceRoot":"","sources":["../../../src/services/bookingService/bookingServicesService.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA6F;AAC7F,qDAAyE;AACzE,kDAA2B;AAC3B,yCAA4C;AAC5C,8DAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"bookingServicesService.js","sourceRoot":"","sources":["../../../src/services/bookingService/bookingServicesService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Moment } from 'moment';
|
|
2
2
|
import { DateOrString } from '../../interfaces';
|
|
3
3
|
export declare const getDays: (startDate: DateOrString, endDate: DateOrString) => any[];
|
|
4
4
|
export declare const normalizeDate: (date: Date | Moment | string | null) => Moment | null;
|
|
5
|
-
export declare const normalizeDateTimezone: (date: Date | moment.Moment | string | null, timezone: string) => moment.Moment | null;
|
|
@@ -3,16 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.normalizeDate = exports.getDays = void 0;
|
|
7
7
|
var moment_1 = __importDefault(require("moment"));
|
|
8
|
-
var moment_timezone_1 = __importDefault(require("moment-timezone"));
|
|
9
8
|
var helpers_1 = require("../../helpers");
|
|
10
|
-
function getDate(date) {
|
|
11
|
-
if (Object.prototype.toString.call(date) === '[object Date]') {
|
|
12
|
-
return date;
|
|
13
|
-
}
|
|
14
|
-
return new Date(date);
|
|
15
|
-
}
|
|
16
9
|
var getDays = function (startDate, endDate) {
|
|
17
10
|
var days = [];
|
|
18
11
|
var dateStart = (0, moment_1.default)(startDate);
|
|
@@ -35,20 +28,4 @@ var normalizeDate = function (date) {
|
|
|
35
28
|
});
|
|
36
29
|
};
|
|
37
30
|
exports.normalizeDate = normalizeDate;
|
|
38
|
-
var normalizeDateTimezone = function (date, timezone) {
|
|
39
|
-
if (!date) {
|
|
40
|
-
return null;
|
|
41
|
-
}
|
|
42
|
-
if (!timezone) {
|
|
43
|
-
return null;
|
|
44
|
-
}
|
|
45
|
-
var dt = getDate(date);
|
|
46
|
-
var momentDate = (0, moment_timezone_1.default)(dt);
|
|
47
|
-
return momentDate.tz(timezone).set({
|
|
48
|
-
hour: 15,
|
|
49
|
-
minute: 0,
|
|
50
|
-
second: 0,
|
|
51
|
-
});
|
|
52
|
-
};
|
|
53
|
-
exports.normalizeDateTimezone = normalizeDateTimezone;
|
|
54
31
|
//# sourceMappingURL=dateService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateService.js","sourceRoot":"","sources":["../../../src/services/dateService/dateService.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"dateService.js","sourceRoot":"","sources":["../../../src/services/dateService/dateService.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuC;AACvC,yCAA4C;AAGrC,IAAM,OAAO,GAAG,UAAC,SAAuB,EAAE,OAAqB;IACpE,IAAM,IAAI,GAAG,EAAE,CAAA;IACf,IAAM,SAAS,GAAG,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAA;IACnC,IAAM,OAAO,GAAG,IAAA,gBAAM,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IAEnD,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,sBAAY,CAAC,UAAU,CAAC,CAAC,CAAA;QACpD,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IAC1B,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAXY,QAAA,OAAO,WAWnB;AAEM,IAAM,aAAa,GAAG,UAAC,IAAmC;IAC/D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,IAAA,gBAAM,EAAC,IAAI,CAAC,CAAC,GAAG,CAAC;QACtB,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;KACV,CAAC,CAAA;AACJ,CAAC,CAAA;AAVY,QAAA,aAAa,iBAUzB"}
|