@hyper.software/common-helpers 1.0.35 → 1.0.37
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/bookingsService.d.ts +1 -1
- package/lib/services/bookingService/bookingsService.js +62 -5
- package/lib/services/bookingService/bookingsService.js.map +1 -1
- package/lib/services/dateService/dateService.d.ts +2 -2
- package/lib/services/dateService/dateService.js +3 -15
- package/lib/services/dateService/dateService.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,7 +9,7 @@ export declare const getTotalCostForRoomBooking: (roomBooking: IRoomBooking & {
|
|
|
9
9
|
price?: number;
|
|
10
10
|
pricingRules?: IRoomTypePricePlanPricingRules;
|
|
11
11
|
pricingInformation?: Partial<IRoomTypePricePlanPricingInformation>;
|
|
12
|
-
}, checkinDate: Moment, checkoutDate: Moment, numberOfAdults:
|
|
12
|
+
}, checkinDate: Moment, checkoutDate: Moment, numberOfAdults: number, booking?: IBooking, company?: ICompany) => number;
|
|
13
13
|
export declare const getTotalCost: (roomBookings: Array<{
|
|
14
14
|
roomId?: string;
|
|
15
15
|
breakfastIncluded?: boolean;
|
|
@@ -47,7 +47,7 @@ var getTotalCostFromBookings = function (bookings, company) {
|
|
|
47
47
|
};
|
|
48
48
|
exports.getTotalCostFromBookings = getTotalCostFromBookings;
|
|
49
49
|
var getLengthOfStayNights = function (booking) {
|
|
50
|
-
return (0, moment_1.default)(dateService.normalizeDate(booking === null || booking === void 0 ? void 0 : booking.checkoutDate
|
|
50
|
+
return (0, moment_1.default)(dateService.normalizeDate(booking === null || booking === void 0 ? void 0 : booking.checkoutDate)).diff((0, moment_1.default)(dateService.normalizeDate(booking === null || booking === void 0 ? void 0 : booking.checkinDate)), 'days');
|
|
51
51
|
};
|
|
52
52
|
exports.getLengthOfStayNights = getLengthOfStayNights;
|
|
53
53
|
var getLengthOfStay = function (booking) {
|
|
@@ -56,7 +56,7 @@ var getLengthOfStay = function (booking) {
|
|
|
56
56
|
return 0;
|
|
57
57
|
}
|
|
58
58
|
return (_b = booking === null || booking === void 0 ? void 0 : booking.roomBookings) === null || _b === void 0 ? void 0 : _b.reduce(function (prevVal, currVal) {
|
|
59
|
-
var lengthOfStay = (0, moment_1.default)(dateService.normalizeDate(currVal.checkoutDate
|
|
59
|
+
var lengthOfStay = (0, moment_1.default)(dateService.normalizeDate(currVal.checkoutDate)).diff((0, moment_1.default)(dateService.normalizeDate(currVal.checkinDate)), 'days');
|
|
60
60
|
return prevVal + lengthOfStay;
|
|
61
61
|
}, 0);
|
|
62
62
|
};
|
|
@@ -76,7 +76,7 @@ var getDefaultRoomTypePricePlan = function (roomTypePricePlans) {
|
|
|
76
76
|
roomTypePricePlans.find(function (roomTypePricePlan) { return roomTypePricePlan.type === interfaces_1.CHANNEL_TYPE.DEFAULT; }));
|
|
77
77
|
};
|
|
78
78
|
exports.getDefaultRoomTypePricePlan = getDefaultRoomTypePricePlan;
|
|
79
|
-
var getTotalCostForRoomBooking = function (roomBooking, checkinDate, checkoutDate, numberOfAdults) {
|
|
79
|
+
var getTotalCostForRoomBooking = function (roomBooking, checkinDate, checkoutDate, numberOfAdults, booking, company) {
|
|
80
80
|
var _a, _b, _c;
|
|
81
81
|
if (!roomBooking) {
|
|
82
82
|
return 0;
|
|
@@ -120,15 +120,72 @@ var getTotalCostForRoomBooking = function (roomBooking, checkinDate, checkoutDat
|
|
|
120
120
|
totalCost += calculation;
|
|
121
121
|
checkinDate.add(1, 'days');
|
|
122
122
|
}
|
|
123
|
+
var breakfastCost = calculateBreakfastCost(roomBooking);
|
|
124
|
+
totalCost += breakfastCost;
|
|
125
|
+
if (booking) {
|
|
126
|
+
var servicesCost = calculateBookingServicesCost(booking);
|
|
127
|
+
totalCost += servicesCost;
|
|
128
|
+
if (company) {
|
|
129
|
+
var tourismTaxCost = calculateTourismTaxCost(booking, company);
|
|
130
|
+
totalCost += tourismTaxCost;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
123
133
|
return totalCost;
|
|
124
134
|
};
|
|
125
135
|
exports.getTotalCostForRoomBooking = getTotalCostForRoomBooking;
|
|
136
|
+
var calculateBreakfastCost = function (roomBooking) {
|
|
137
|
+
var _a, _b;
|
|
138
|
+
var breakfastCost = 0;
|
|
139
|
+
var breakfastInfo = (_b = (_a = roomBooking.room) === null || _a === void 0 ? void 0 : _a.roomType) === null || _b === void 0 ? void 0 : _b.breakfastInformation;
|
|
140
|
+
var breakfastIncluded = roomBooking.breakfastIncluded;
|
|
141
|
+
var personsPayingBreakfast = roomBooking.personsPayingBreakfast || 0;
|
|
142
|
+
if (breakfastIncluded && breakfastInfo) {
|
|
143
|
+
breakfastCost += breakfastInfo.cost * personsPayingBreakfast;
|
|
144
|
+
}
|
|
145
|
+
return breakfastCost;
|
|
146
|
+
};
|
|
147
|
+
var calculateBookingServicesCost = function (booking) {
|
|
148
|
+
var _a;
|
|
149
|
+
var servicesCost = 0;
|
|
150
|
+
var numberOfNights = (0, exports.getLengthOfStay)(booking);
|
|
151
|
+
var numberOfPersons = booking.numberOfAdults + (booking.numberOfChildren || 0);
|
|
152
|
+
(_a = booking.bookingServices) === null || _a === void 0 ? void 0 : _a.forEach(function (bookingService) {
|
|
153
|
+
var service = bookingService.service;
|
|
154
|
+
if (service && service.pricingUnit) {
|
|
155
|
+
switch (service.pricingUnit) {
|
|
156
|
+
case 'PER_NIGHT':
|
|
157
|
+
servicesCost += service.amount * numberOfNights;
|
|
158
|
+
break;
|
|
159
|
+
case 'PER_PERSON':
|
|
160
|
+
servicesCost += service.amount * numberOfPersons;
|
|
161
|
+
break;
|
|
162
|
+
case 'PER_STAY':
|
|
163
|
+
servicesCost += service.amount;
|
|
164
|
+
break;
|
|
165
|
+
case 'PER_PERSON_PER_NIGHT':
|
|
166
|
+
servicesCost += service.amount * numberOfPersons * numberOfNights;
|
|
167
|
+
break;
|
|
168
|
+
default:
|
|
169
|
+
servicesCost += service.amount;
|
|
170
|
+
break;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
return servicesCost;
|
|
175
|
+
};
|
|
176
|
+
var calculateTourismTaxCost = function (booking, company) {
|
|
177
|
+
var _a;
|
|
178
|
+
var tourismTaxRate = ((_a = company === null || company === void 0 ? void 0 : company.receipts) === null || _a === void 0 ? void 0 : _a.tourismTax) || 0;
|
|
179
|
+
var numberOfAdults = booking.numberOfAdults || 0;
|
|
180
|
+
var lengthOfStay = (0, exports.getLengthOfStay)(booking);
|
|
181
|
+
return tourismTaxRate * numberOfAdults * lengthOfStay;
|
|
182
|
+
};
|
|
126
183
|
var getTotalCost = function (roomBookings, _checkinDate, _checkoutDate, numberOfAdults) {
|
|
127
184
|
if (!_checkinDate || !_checkoutDate) {
|
|
128
185
|
return null;
|
|
129
186
|
}
|
|
130
|
-
var checkinDate = (0, moment_1.default)(dateService.normalizeDate(_checkinDate
|
|
131
|
-
var checkoutDate = (0, moment_1.default)(dateService.normalizeDate(_checkoutDate
|
|
187
|
+
var checkinDate = (0, moment_1.default)(dateService.normalizeDate(_checkinDate));
|
|
188
|
+
var checkoutDate = (0, moment_1.default)(dateService.normalizeDate(_checkoutDate));
|
|
132
189
|
var totalCost = 0;
|
|
133
190
|
for (var _i = 0, roomBookings_1 = roomBookings; _i < roomBookings_1.length; _i++) {
|
|
134
191
|
var roomBooking = roomBookings_1[_i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bookingsService.js","sourceRoot":"","sources":["../../../src/services/bookingService/bookingsService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAuC;AACvC,yCAAqD;AACrD,2EAUqD;AACrD,sEAAyD;AAElD,IAAM,wBAAwB,GAAG,UAAC,QAAoB,EAAE,OAAkB;IAC/E,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAC,OAAO,EAAE,OAAO,IAAK,OAAA,CAAC,OAAO,IAAI,IAAA,4BAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAxD,CAAwD,EAAE,CAAC,CAAC,CAAA;AAC3G,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC;AAEM,IAAM,qBAAqB,GAAG,UAAC,OAAiB;IACrD,OAAO,IAAA,gBAAM,EAAC,WAAW,CAAC,aAAa,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"bookingsService.js","sourceRoot":"","sources":["../../../src/services/bookingService/bookingsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { DateOrString } from '@hyper.software/common-models/lib/interfaces';
|
|
2
|
-
import
|
|
2
|
+
import { Moment } from 'moment';
|
|
3
3
|
export declare const getDays: (startDate: DateOrString, endDate: DateOrString) => any[];
|
|
4
|
-
export declare const normalizeDate: (date: Date |
|
|
4
|
+
export declare const normalizeDate: (date: Date | Moment | string | null) => Moment | null;
|
|
@@ -6,13 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.normalizeDate = exports.getDays = void 0;
|
|
7
7
|
var moment_1 = __importDefault(require("moment"));
|
|
8
8
|
var helpers_1 = require("../../helpers");
|
|
9
|
-
var moment_timezone_1 = __importDefault(require("moment-timezone"));
|
|
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);
|
|
@@ -24,17 +17,12 @@ var getDays = function (startDate, endDate) {
|
|
|
24
17
|
return days;
|
|
25
18
|
};
|
|
26
19
|
exports.getDays = getDays;
|
|
27
|
-
var normalizeDate = function (date
|
|
20
|
+
var normalizeDate = function (date) {
|
|
28
21
|
if (!date) {
|
|
29
22
|
return null;
|
|
30
23
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
var dt = getDate(date);
|
|
35
|
-
var momentDate = (0, moment_timezone_1.default)(dt);
|
|
36
|
-
return momentDate.tz(timezone).set({
|
|
37
|
-
hour: 15,
|
|
24
|
+
return (0, moment_1.default)(date).set({
|
|
25
|
+
hour: 18,
|
|
38
26
|
minute: 0,
|
|
39
27
|
second: 0,
|
|
40
28
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateService.js","sourceRoot":"","sources":["../../../src/services/dateService/dateService.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"dateService.js","sourceRoot":"","sources":["../../../src/services/dateService/dateService.ts"],"names":[],"mappings":";;;;;;AACA,kDAAuC;AACvC,yCAA4C;AAErC,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;QAC3C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,sBAAY,CAAC,UAAU,CAAC,CAAC,CAAA;QACpD,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;KACzB;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAXY,QAAA,OAAO,WAWnB;AAEM,IAAM,aAAa,GAAG,UAAC,IAAmC;IAC/D,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAA;KACZ;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"}
|