@roomstay/frontend 2.6.55 → 2.6.57
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/dist/370.bundle.js +1 -1
- package/dist/978.bundle.js +1 -1
- package/dist/main.bundle.js +1 -1
- package/dist/src/api/AvailabilityAPI.js +5 -0
- package/dist/src/api/AvailabilityAPI.js.map +1 -1
- package/dist/src/components/navigation/Header.js +21 -12
- package/dist/src/components/navigation/Header.js.map +1 -1
- package/dist/src/components/steps/addons/AddonCard.js +2 -1
- package/dist/src/components/steps/addons/AddonCard.js.map +1 -1
- package/dist/src/components/steps/common/CommonAddonSummary/CommonAddonSummary.js +2 -2
- package/dist/src/components/steps/common/CommonAddonSummary/CommonAddonSummary.js.map +1 -1
- package/dist/src/components/steps/common/ItemisedFeesListing/ItemisedFeesListing.d.ts +6 -0
- package/dist/src/components/steps/common/ItemisedFeesListing/ItemisedFeesListing.js +47 -0
- package/dist/src/components/steps/common/ItemisedFeesListing/ItemisedFeesListing.js.map +1 -0
- package/dist/src/components/steps/common/ItemisedFeesSummary/ItemisedFeesSummary.d.ts +6 -0
- package/dist/src/components/steps/common/ItemisedFeesSummary/ItemisedFeesSummary.js +44 -0
- package/dist/src/components/steps/common/ItemisedFeesSummary/ItemisedFeesSummary.js.map +1 -0
- package/dist/src/components/steps/room/roomDetails/roomRates/PriceBreakdownBlock.js +13 -2
- package/dist/src/components/steps/room/roomDetails/roomRates/PriceBreakdownBlock.js.map +1 -1
- package/dist/src/components/summary/BEMobileSummaryModal.js +6 -2
- package/dist/src/components/summary/BEMobileSummaryModal.js.map +1 -1
- package/dist/src/components/summary/BESummary.js +19 -3
- package/dist/src/components/summary/BESummary.js.map +1 -1
- package/dist/src/components/summary/BESummaryAddonRow.js +14 -5
- package/dist/src/components/summary/BESummaryAddonRow.js.map +1 -1
- package/dist/src/components/summary/BESummaryRoomRow.js +7 -3
- package/dist/src/components/summary/BESummaryRoomRow.js.map +1 -1
- package/dist/src/contexts/BasketContext/BasketContextType.d.ts +5 -0
- package/dist/src/contexts/BasketContext/BasketContextType.js.map +1 -1
- package/dist/src/contexts/BasketContext/BasketContextWrapper.js +179 -1
- package/dist/src/contexts/BasketContext/BasketContextWrapper.js.map +1 -1
- package/dist/src/contexts/CompanyContext/CompanyContextWrapper.js +2 -0
- package/dist/src/contexts/CompanyContext/CompanyContextWrapper.js.map +1 -1
- package/dist/src/contexts/Members/AuthenticationContext/AuthenticationContextProvider.js +5 -2
- package/dist/src/contexts/Members/AuthenticationContext/AuthenticationContextProvider.js.map +1 -1
- package/dist/src/contexts/Members/RoomstayMemberContext/RoomstayMemberContextProvider.js +45 -5
- package/dist/src/contexts/Members/RoomstayMemberContext/RoomstayMemberContextProvider.js.map +1 -1
- package/dist/src/hooks/UpdateQueryParameters.d.ts +1 -1
- package/dist/src/hooks/UpdateQueryParameters.js +8 -3
- package/dist/src/hooks/UpdateQueryParameters.js.map +1 -1
- package/dist/src/models/Addon/Addon.d.ts +11 -1
- package/dist/src/models/Addon/Addon.js.map +1 -1
- package/dist/src/models/Api/HotelDTO.d.ts +2 -1
- package/dist/src/models/Api/HotelDTO.js.map +1 -1
- package/dist/src/models/Api/ReservationsDTO.d.ts +7 -0
- package/dist/src/models/Api/ReservationsDTO.js.map +1 -1
- package/dist/src/models/BasketAddonRow.d.ts +2 -0
- package/dist/src/models/BasketAddonRow.js +25 -1
- package/dist/src/models/BasketAddonRow.js.map +1 -1
- package/dist/src/models/BasketRow.d.ts +1 -1
- package/dist/src/models/BasketRow.js +21 -10
- package/dist/src/models/BasketRow.js.map +1 -1
- package/dist/src/models/Client/Hotel/Hotel.d.ts +4 -0
- package/dist/src/models/Client/Hotel/Hotel.js.map +1 -1
- package/dist/src/models/Fee.d.ts +32 -0
- package/dist/src/models/Fee.js +50 -0
- package/dist/src/models/Fee.js.map +1 -0
- package/dist/src/models/Room/RoomRate.d.ts +2 -0
- package/dist/src/models/Room/RoomRate.js +11 -0
- package/dist/src/models/Room/RoomRate.js.map +1 -1
- package/dist/src/models/Room/RoomRateNight.d.ts +3 -0
- package/dist/src/models/Room/RoomRateNight.js +3 -0
- package/dist/src/models/Room/RoomRateNight.js.map +1 -1
- package/dist/src/pages/findReservation/FindReservationResults.js +8 -0
- package/dist/src/pages/findReservation/FindReservationResults.js.map +1 -1
- package/dist/src/pages/findReservation/ReservationRow.js +3 -3
- package/dist/src/pages/findReservation/ReservationRow.js.map +1 -1
- package/dist/src/pages/steps/StepThanks/StepThanksComponent.js +6 -0
- package/dist/src/pages/steps/StepThanks/StepThanksComponent.js.map +1 -1
- package/dist/src/providers/RoomstayThemeEngine.d.ts +1 -1
- package/dist/src/providers/RoomstayThemeEngine.js +17 -9
- package/dist/src/providers/RoomstayThemeEngine.js.map +1 -1
- package/dist/src/util/DerbysoftPixel.js +1 -1
- package/dist/src/util/DerbysoftPixel.js.map +1 -1
- package/dist/src/util/TotalCalculator.d.ts +1 -0
- package/dist/src/util/TotalCalculator.js +47 -9
- package/dist/src/util/TotalCalculator.js.map +1 -1
- package/dist/test.bundle.js +1 -1
- package/dist/vendors.bundle.js +1 -1
- package/package.json +2 -2
|
@@ -46,21 +46,47 @@ const calculateBasketAddonTotal = (addons, dismissAddonNightCount = false) => {
|
|
|
46
46
|
if (!Array.isArray(addons)) {
|
|
47
47
|
addons = [addons];
|
|
48
48
|
}
|
|
49
|
+
// TODO: This function is chaos! It will be slightly better when we remove the old fee fields.
|
|
49
50
|
const result = addons.reduce((acc, addon) => {
|
|
51
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
50
52
|
const base = calculateBaseAddonTotal(addon, dismissAddonNightCount);
|
|
51
53
|
let addonFees = 0;
|
|
52
54
|
// Calculate fees specific to BasketAddonDTO
|
|
53
|
-
if (addon.fee && addon.quantity) {
|
|
54
|
-
// There
|
|
55
|
-
|
|
55
|
+
if ((addon.fee || ((_a = addon.fees) === null || _a === void 0 ? void 0 : _a.length)) && addon.quantity) {
|
|
56
|
+
// There are no separate adult/child fees
|
|
57
|
+
if ((_b = addon.fees) === null || _b === void 0 ? void 0 : _b.length) {
|
|
58
|
+
// New Itemised fees
|
|
59
|
+
addon.fees.forEach((fee) => {
|
|
60
|
+
addonFees += addon.quantity * fee.amount;
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
// Old fees (to be removed/deprecated)
|
|
65
|
+
addonFees = addon.quantity * Number(addon.fee);
|
|
66
|
+
}
|
|
56
67
|
}
|
|
57
68
|
else {
|
|
58
69
|
// There are separate adult/child fees, so we need to calculate them separately.
|
|
59
|
-
if (addon.adultFee && addon.adultQuantity) {
|
|
60
|
-
|
|
70
|
+
if ((addon.adultFee || ((_c = addon.adultFees) === null || _c === void 0 ? void 0 : _c.length)) && addon.adultQuantity) {
|
|
71
|
+
if ((_d = addon.adultFees) === null || _d === void 0 ? void 0 : _d.length) {
|
|
72
|
+
addon.adultFees.forEach((fee) => {
|
|
73
|
+
addonFees += addon.adultQuantity * fee.amount;
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
addonFees += (_e = addon.adultQuantity) !== null && _e !== void 0 ? _e : 1 * Number(addon.adultFee);
|
|
78
|
+
}
|
|
61
79
|
}
|
|
62
|
-
if (addon.childFee && addon.childQuantity) {
|
|
63
|
-
|
|
80
|
+
if ((addon.childFee || ((_f = addon.childFees) === null || _f === void 0 ? void 0 : _f.length)) && addon.childQuantity) {
|
|
81
|
+
if ((_g = addon.childFees) === null || _g === void 0 ? void 0 : _g.length) {
|
|
82
|
+
addon.childFees.forEach((fee) => {
|
|
83
|
+
var _a;
|
|
84
|
+
addonFees += (_a = addon.childQuantity) !== null && _a !== void 0 ? _a : 1 * fee.amount;
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
addonFees += addon.childQuantity * Number(addon.childFee);
|
|
89
|
+
}
|
|
64
90
|
}
|
|
65
91
|
}
|
|
66
92
|
// Multiply the fees by the number of nights if it's a per-night addon.
|
|
@@ -86,22 +112,34 @@ const calculateReservationAddonTotal = (addons, dismissAddonNightCount = false)
|
|
|
86
112
|
addons = [addons];
|
|
87
113
|
}
|
|
88
114
|
const result = addons.reduce((acc, addon) => {
|
|
115
|
+
var _a, _b;
|
|
89
116
|
const base = calculateBaseAddonTotal(addon, dismissAddonNightCount);
|
|
90
117
|
// For a ReservationAddonDTO, the fees have already been calculated as a part of the booking process.
|
|
91
|
-
|
|
118
|
+
let addonFees = addon.fees || 0;
|
|
119
|
+
// But they might be superceded by itemised fees.
|
|
120
|
+
if ((_a = addon.itemisedFees) === null || _a === void 0 ? void 0 : _a.length) {
|
|
121
|
+
addonFees = addon.itemisedFees.reduce((acc, fee) => acc + fee.amount, 0);
|
|
122
|
+
}
|
|
123
|
+
// If we have Itemised Fees, the display price will be excluding fees.
|
|
124
|
+
const displayPrice = ((_b = addon.itemisedFees) === null || _b === void 0 ? void 0 : _b.length) ? base.addonTotal : base.addonTotal + addonFees;
|
|
92
125
|
return {
|
|
93
126
|
price: acc.price + base.indPrice,
|
|
94
127
|
adultPrice: acc.adultPrice + base.indAdultPrice,
|
|
95
128
|
childPrice: acc.childPrice + base.indChildPrice,
|
|
96
129
|
totalFees: acc.totalFees + addonFees,
|
|
97
130
|
total: acc.total + base.addonTotal + addonFees,
|
|
131
|
+
displayPrice: acc.displayPrice + displayPrice,
|
|
98
132
|
};
|
|
99
|
-
}, { price: 0, adultPrice: 0, childPrice: 0, totalFees: 0, total: 0 });
|
|
133
|
+
}, { price: 0, adultPrice: 0, childPrice: 0, totalFees: 0, total: 0, displayPrice: 0 });
|
|
100
134
|
return result;
|
|
101
135
|
};
|
|
102
136
|
exports.calculateReservationAddonTotal = calculateReservationAddonTotal;
|
|
103
137
|
const calculateTotalForReservation = (reservation, dismissAddonNightCount = false) => {
|
|
138
|
+
var _a;
|
|
104
139
|
let total = 0;
|
|
140
|
+
(_a = reservation.itemisedFees) === null || _a === void 0 ? void 0 : _a.forEach((fee) => {
|
|
141
|
+
total += fee.amount;
|
|
142
|
+
});
|
|
105
143
|
reservation.reservations.forEach((individualRes) => {
|
|
106
144
|
var _a, _b, _c, _d, _e;
|
|
107
145
|
total += individualRes.total.afterTax;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TotalCalculator.js","sourceRoot":"/","sources":["src/util/TotalCalculator.ts"],"names":[],"mappings":"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","sourcesContent":["import { roundMoney } from '@roomstay/core';\n\nimport { ADDON_PER_NIGHT_TYPES, AddonPricingType, BasketAddonDTO } from '@/models/Addon/Addon';\nimport ReservationsDTO, { ReservationAddonDTO } from '@/models/Api/ReservationsDTO';\n\n/**\n * Calculate the addon total for a single addon.\n *\n * This does not account for fees. Fees need to be calculated separately, because we calculate them differently\n * based on whether they are a booked addon, or an addon in the basket.\n */\nconst calculateBaseAddonTotal = (addon: BasketAddonDTO | ReservationAddonDTO, dismissAddonNightCount: boolean) => {\n let indPrice = 0;\n let indAdultPrice = 0;\n let indChildPrice = 0;\n\n if (addon.price && addon.quantity) {\n indPrice = addon.quantity * Number(addon.price);\n }\n\n if (addon.pricingType === AddonPricingType.PER_ADULT_OCCUPANCY_PER_NIGHT && addon.adultQuantity) {\n indPrice *= addon.adultQuantity;\n } else if (addon.pricingType === AddonPricingType.PER_CHILD_OCCUPANCY_PER_NIGHT && addon.childQuantity) {\n indPrice *= addon.childQuantity;\n }\n\n if (addon.adultPrice && addon.adultQuantity) {\n indAdultPrice = addon.adultQuantity * Number(addon.adultPrice);\n }\n\n if (addon.childPrice && addon.childQuantity) {\n indChildPrice = addon.childQuantity * Number(addon.childPrice);\n }\n\n let addonTotal = indPrice + indAdultPrice + indChildPrice;\n if (ADDON_PER_NIGHT_TYPES.includes(addon.pricingType as AddonPricingType) && addon.nights && !dismissAddonNightCount) {\n addonTotal *= addon.nights;\n }\n\n return {\n indPrice,\n indAdultPrice,\n indChildPrice,\n addonTotal,\n };\n};\n\n/**\n * Calculate totals for a Basket Addon.\n */\nexport const calculateBasketAddonTotal = (addons: BasketAddonDTO | BasketAddonDTO[], dismissAddonNightCount = false) => {\n if (!Array.isArray(addons)) {\n addons = [addons];\n }\n\n const result = addons.reduce(\n (acc, addon) => {\n const base = calculateBaseAddonTotal(addon, dismissAddonNightCount);\n let addonFees = 0;\n\n // Calculate fees specific to BasketAddonDTO\n if (addon.fee && addon.quantity) {\n // There is no separate adult/child fees\n addonFees = addon.quantity * Number(addon.fee);\n } else {\n // There are separate adult/child fees, so we need to calculate them separately.\n if (addon.adultFee && addon.adultQuantity) {\n addonFees += addon.adultQuantity * Number(addon.adultFee);\n }\n\n if (addon.childFee && addon.childQuantity) {\n addonFees += addon.childQuantity * Number(addon.childFee);\n }\n }\n\n // Multiply the fees by the number of nights if it's a per-night addon.\n if (ADDON_PER_NIGHT_TYPES.includes(addon.pricingType as AddonPricingType) && addon.nights && !dismissAddonNightCount) {\n addonFees *= addon.nights;\n }\n\n return {\n price: acc.price + base.indPrice,\n adultPrice: acc.adultPrice + base.indAdultPrice,\n childPrice: acc.childPrice + base.indChildPrice,\n totalFees: acc.totalFees + addonFees,\n total: acc.total + base.addonTotal + addonFees,\n };\n },\n { price: 0, adultPrice: 0, childPrice: 0, totalFees: 0, total: 0 }\n );\n\n return result;\n};\n\n/**\n * Calculate totals for a Reservation Addon.\n */\nexport const calculateReservationAddonTotal = (addons: ReservationAddonDTO | ReservationAddonDTO[], dismissAddonNightCount = false) => {\n if (!Array.isArray(addons)) {\n addons = [addons];\n }\n\n const result = addons.reduce(\n (acc, addon) => {\n const base = calculateBaseAddonTotal(addon, dismissAddonNightCount);\n\n // For a ReservationAddonDTO, the fees have already been calculated as a part of the booking process.\n const addonFees = addon.fees || 0;\n\n return {\n price: acc.price + base.indPrice,\n adultPrice: acc.adultPrice + base.indAdultPrice,\n childPrice: acc.childPrice + base.indChildPrice,\n totalFees: acc.totalFees + addonFees,\n total: acc.total + base.addonTotal + addonFees,\n };\n },\n { price: 0, adultPrice: 0, childPrice: 0, totalFees: 0, total: 0 }\n );\n\n return result;\n};\n\nexport const calculateTotalForReservation = (reservation: ReservationsDTO, dismissAddonNightCount = false) => {\n let total = 0;\n\n reservation.reservations.forEach((individualRes) => {\n total += individualRes.total.afterTax;\n const resNights = Object.keys(individualRes.nights)?.length ?? 0;\n\n if (individualRes.addons?.length) {\n const addons = (individualRes.addons ?? []).map((addon) => {\n return { ...addon, nights: resNights };\n });\n\n total += calculateReservationAddonTotal(addons, dismissAddonNightCount)?.total;\n }\n });\n\n return roundMoney(total);\n};\n"]}
|
|
1
|
+
{"version":3,"file":"TotalCalculator.js","sourceRoot":"/","sources":["src/util/TotalCalculator.ts"],"names":[],"mappings":"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","sourcesContent":["import { roundMoney } from '@roomstay/core';\n\nimport { ADDON_PER_NIGHT_TYPES, AddonPricingType, BasketAddonDTO } from '@/models/Addon/Addon';\nimport ReservationsDTO, { ReservationAddonDTO } from '@/models/Api/ReservationsDTO';\n\n/**\n * Calculate the addon total for a single addon.\n *\n * This does not account for fees. Fees need to be calculated separately, because we calculate them differently\n * based on whether they are a booked addon, or an addon in the basket.\n */\nconst calculateBaseAddonTotal = (addon: BasketAddonDTO | ReservationAddonDTO, dismissAddonNightCount: boolean) => {\n let indPrice = 0;\n let indAdultPrice = 0;\n let indChildPrice = 0;\n\n if (addon.price && addon.quantity) {\n indPrice = addon.quantity * Number(addon.price);\n }\n\n if (addon.pricingType === AddonPricingType.PER_ADULT_OCCUPANCY_PER_NIGHT && addon.adultQuantity) {\n indPrice *= addon.adultQuantity;\n } else if (addon.pricingType === AddonPricingType.PER_CHILD_OCCUPANCY_PER_NIGHT && addon.childQuantity) {\n indPrice *= addon.childQuantity;\n }\n\n if (addon.adultPrice && addon.adultQuantity) {\n indAdultPrice = addon.adultQuantity * Number(addon.adultPrice);\n }\n\n if (addon.childPrice && addon.childQuantity) {\n indChildPrice = addon.childQuantity * Number(addon.childPrice);\n }\n\n let addonTotal = indPrice + indAdultPrice + indChildPrice;\n if (ADDON_PER_NIGHT_TYPES.includes(addon.pricingType as AddonPricingType) && addon.nights && !dismissAddonNightCount) {\n addonTotal *= addon.nights;\n }\n\n return {\n indPrice,\n indAdultPrice,\n indChildPrice,\n addonTotal,\n };\n};\n\n/**\n * Calculate totals for a Basket Addon.\n */\nexport const calculateBasketAddonTotal = (addons: BasketAddonDTO | BasketAddonDTO[], dismissAddonNightCount = false) => {\n if (!Array.isArray(addons)) {\n addons = [addons];\n }\n\n // TODO: This function is chaos! It will be slightly better when we remove the old fee fields.\n\n const result = addons.reduce(\n (acc, addon) => {\n const base = calculateBaseAddonTotal(addon, dismissAddonNightCount);\n let addonFees = 0;\n\n // Calculate fees specific to BasketAddonDTO\n if ((addon.fee || addon.fees?.length) && addon.quantity) {\n // There are no separate adult/child fees\n if (addon.fees?.length) {\n // New Itemised fees\n addon.fees.forEach((fee) => {\n addonFees += addon.quantity * fee.amount;\n });\n } else {\n // Old fees (to be removed/deprecated)\n addonFees = addon.quantity * Number(addon.fee);\n }\n } else {\n // There are separate adult/child fees, so we need to calculate them separately.\n if ((addon.adultFee || addon.adultFees?.length) && addon.adultQuantity) {\n if (addon.adultFees?.length) {\n addon.adultFees.forEach((fee) => {\n addonFees += addon.adultQuantity * fee.amount;\n });\n } else {\n addonFees += addon.adultQuantity ?? 1 * Number(addon.adultFee);\n }\n }\n\n if ((addon.childFee || addon.childFees?.length) && addon.childQuantity) {\n if (addon.childFees?.length) {\n addon.childFees.forEach((fee) => {\n addonFees += addon.childQuantity ?? 1 * fee.amount;\n });\n } else {\n addonFees += addon.childQuantity * Number(addon.childFee);\n }\n }\n }\n\n // Multiply the fees by the number of nights if it's a per-night addon.\n if (ADDON_PER_NIGHT_TYPES.includes(addon.pricingType as AddonPricingType) && addon.nights && !dismissAddonNightCount) {\n addonFees *= addon.nights;\n }\n\n return {\n price: acc.price + base.indPrice,\n adultPrice: acc.adultPrice + base.indAdultPrice,\n childPrice: acc.childPrice + base.indChildPrice,\n totalFees: acc.totalFees + addonFees,\n total: acc.total + base.addonTotal + addonFees,\n };\n },\n { price: 0, adultPrice: 0, childPrice: 0, totalFees: 0, total: 0 }\n );\n\n return result;\n};\n\n/**\n * Calculate totals for a Reservation Addon.\n */\nexport const calculateReservationAddonTotal = (addons: ReservationAddonDTO | ReservationAddonDTO[], dismissAddonNightCount = false) => {\n if (!Array.isArray(addons)) {\n addons = [addons];\n }\n\n const result = addons.reduce(\n (acc, addon) => {\n const base = calculateBaseAddonTotal(addon, dismissAddonNightCount);\n\n // For a ReservationAddonDTO, the fees have already been calculated as a part of the booking process.\n let addonFees = addon.fees || 0;\n\n // But they might be superceded by itemised fees.\n if (addon.itemisedFees?.length) {\n addonFees = addon.itemisedFees.reduce((acc, fee) => acc + fee.amount, 0);\n }\n\n // If we have Itemised Fees, the display price will be excluding fees.\n const displayPrice = addon.itemisedFees?.length ? base.addonTotal : base.addonTotal + addonFees;\n\n return {\n price: acc.price + base.indPrice,\n adultPrice: acc.adultPrice + base.indAdultPrice,\n childPrice: acc.childPrice + base.indChildPrice,\n totalFees: acc.totalFees + addonFees,\n total: acc.total + base.addonTotal + addonFees,\n displayPrice: acc.displayPrice + displayPrice,\n };\n },\n { price: 0, adultPrice: 0, childPrice: 0, totalFees: 0, total: 0, displayPrice: 0 }\n );\n\n return result;\n};\n\nexport const calculateTotalForReservation = (reservation: ReservationsDTO, dismissAddonNightCount = false) => {\n let total = 0;\n\n reservation.itemisedFees?.forEach((fee) => {\n total += fee.amount;\n });\n\n reservation.reservations.forEach((individualRes) => {\n total += individualRes.total.afterTax;\n const resNights = Object.keys(individualRes.nights)?.length ?? 0;\n\n if (individualRes.addons?.length) {\n const addons = (individualRes.addons ?? []).map((addon) => {\n return { ...addon, nights: resNights };\n });\n\n total += calculateReservationAddonTotal(addons, dismissAddonNightCount)?.total;\n }\n });\n\n return roundMoney(total);\n};\n"]}
|