Commit Graph

573 Commits

Author SHA1 Message Date
Simon.Emanuelsson
248473e8bf Merged in chore/refactor-booking-flow (pull request #1333)
chore: cleaning up select-rate

Approved-by: Arvid Norlin
Approved-by: Linus Flood
2025-02-14 13:51:37 +00:00
Simon Emanuelsson
051bc54e6c chore: cleaning up select-rate 2025-02-14 14:20:54 +01:00
Bianca Widstam
224a41ec74 feat/SW-1546-list-ancillaries-my-stay (pull request #1259)
Feat/SW-1546 list ancillaries my stay

* feat(SW-1546): foundation for listing ancillaries

* feat(SW-1546): foundation for listing ancillaries

* feat(SW-1546): refactor type

* feat(SW-1546): fix date format

* feat(SW-1546): refactor usestate

* feat(SW-1546): refactor typing

* feat(SW-1546): refactor types

* feat(SW-1546): responsive width on modal

* feat(SW-1546): update design

* feat(SW-1546): rebase master

* feat(SW-1546): show points only if logged in

* feat(SW-1546): always show points

* feat(SW-1546): small fix

* feat(SW-1546): remove spread object

* feat(SW-1546): fix import order


Approved-by: Simon.Emanuelsson
2025-02-14 10:37:17 +00:00
Arvid Norlin
f5e0214313 Merged in feat/confirmation-page-initial-multiroom-display (pull request #1334)
feat: initial display of linkedReservations on confirmation page

* feat: initial display of linkedReservations on confirmation page

* refactor: move notFound


Approved-by: Tobias Johansson
2025-02-14 10:05:58 +00:00
Tobias Johansson
53b6628b25 Merged in feat/SW-965-select-rate-modify-room (pull request #1326)
Feat/SW-965 select rate modify room

* feat(SW-965): added new state for modify room and smaller fixes

* feat(SW-965): update state handling of modifyRateIndex

* fix: adjust scroll animation to handle modifyRateIndex

* fix: room state logic and removed unused css class


Approved-by: Pontus Dreij
Approved-by: Arvid Norlin
2025-02-14 07:48:30 +00:00
Hrishikesh Vaipurkar
eabe45b73c Merged in feat/SW-1557-implement-booking-code-select (pull request #1304)
feat: SW-1577 Implemented booking code city search

* feat: SW-1577 Implemented booking code city search

* feat: SW-1557 Strict comparison

* feat: SW-1557 Review comments fix


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij
2025-02-13 09:24:47 +00:00
Linus Flood
019a5db549 Merged in fix/unify-gethotel-input (pull request #1319)
feat: getHotel - unify input to make sure we can use the same cache response

* feat: getHotel - unify input to make sure we can use the same cache response


Approved-by: Simon.Emanuelsson
2025-02-12 11:35:39 +00:00
Pontus Dreij
ea9d68a191 Merged in feat/SW-1540-fetch-updated-data-booking (pull request #1316)
feat(SW-1540): Fetch data from API for MyStay

* feat(SW-1540): Fetch data from API for MyStay

* feat(SW-1540): Moved myStaySkeleton

* feat(SW-1540) used memoized getBookingConfirmation instead


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
2025-02-12 10:22:54 +00:00
Simon.Emanuelsson
4a06162f79 Merged in fix/rateCodes (pull request #1315)
fix: taking care of missing rateDefinitions

* fix: taking care of missing rateDefinitions


Approved-by: Linus Flood
2025-02-12 08:52:08 +00:00
Bianca Widstam
8d6f4b82f3 Merged in feat/SW-1522-select-rate-alternative-hotels (pull request #1312)
feat(SW-1522): add alternative hotel link on select rate if no availability and move alert

* feat(SW-1522): add alternative hotel link on select rate and move alert


Approved-by: Linus Flood
2025-02-12 08:46:15 +00:00
Linus Flood
a8ec845273 Merged in fix/ratecodetype-tracking-2 (pull request #1314)
fix/ratecode-tracking-fix

* fix/ratecode-tracking-fix
2025-02-12 08:38:26 +00:00
Tobias Johansson
b394d54c3f Merged in feat/enter-details-multiroom (pull request #1280)
feat(SW-1259): Enter details multiroom

* refactor: remove per-step URLs

* WIP: map multiroom data

* fix: lint errors in details page

* fix: made useEnterDetailsStore tests pass

* fix: WIP refactor enter details store

* fix: WIP enter details store update

* fix: added room index to select correct room

* fix: added logic for navigating between steps and rooms

* fix: update summary to work with store changes

* fix: added room and total price calculation

* fix: removed unused code and added test for breakfast included

* refactor: move store selectors into helpers

* refactor: session storage state for multiroom booking

* feat: update enter details accordion navigation

* fix: added room index to each form component so they select correct room

* fix: added unique id to input to handle case when multiple inputs have same name

* fix: update payment step with store changes

* fix: rebase issues

* fix: now you should only be able to go to a step if previous room is completed

* refactor: cleanup

* fix: if no availability just skip that room for now

* fix: add select-rate Summary and adjust typings


Approved-by: Arvid Norlin
2025-02-11 14:24:24 +00:00
Linus Flood
a86f0f3993 Merged in fix/nullcheck-gethotelpins (pull request #1296)
fix: getHotelPins - null check on hotelData

* fix: getHotelPins - null check on hotelData


Approved-by: Pontus Dreij
2025-02-10 15:11:39 +00:00
Pontus Dreij
c863294919 Merged in feat/SW-1055-Accordion-for-summary-bar-in-mobile-on-Select-Rate (pull request #1283)
Feat/SW-1055 Accordion for summary bar in mobile on Select Rate

* feat(SW-1055) created mobile summary for select rate

* feat(SW-1055) Added summary for mobile (accordion)


Approved-by: Tobias Johansson
2025-02-10 15:11:31 +00:00
Linus Flood
5a0edc9187 Merged in fix/hoteinfocard-pass-hotel (pull request #1295)
feat:hotel info card - pass hoteldata since we already fetching it on page level

* feat:hotel info card - pass hoteldata since we already fetching it on page level
2025-02-10 14:31:41 +00:00
Linus Flood
2522cd7752 Merged in feat/hotelinfocard-skeleton (pull request #1291)
feat: added skeleton to hotelinfo card

* feat: added skeleton to hotelinfo card


Approved-by: Simon.Emanuelsson
2025-02-10 12:49:27 +00:00
Pontus Dreij
e51950c8b2 Merged in feat/SW-1497-hide-special-needs (pull request #1285)
feat(SW-1497): Temporary hide Special requests dropdowns

* feat(SW-1497): Temporary hide Special requests dropdowns


Approved-by: Tobias Johansson
2025-02-10 08:31:43 +00:00
Pontus Dreij
cb7d7efc86 fix: Removed composes so it's easier to change from css modules if we want 2025-02-08 13:58:23 +01:00
Linus Flood
ebb007b7f0 Merged in feat/booking-flow-performance (pull request #1282)
feat: booking flow performance

* feat: booking flow performance

* Cleanup


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij
2025-02-08 10:40:42 +00:00
Pontus Dreij
fbe05eb456 Merged in feat/SW-717-multiroom-select-hotel-api (pull request #1225)
Feat/SW-717 multiroom select hotel api
2025-02-07 13:15:07 +00:00
Simon.Emanuelsson
c204532acc Merged in feat/SW-1261 (pull request #1263)
feat: only show member price when logged in

* feat: only show member price when logged in


Approved-by: Michael Zetterberg
2025-02-07 08:51:50 +00:00
Pontus Dreij
575420ca0a feat(SW-717) use of combineRoomAvailabilities in RoomsContainer 2025-02-07 08:48:45 +01:00
Pontus Dreij
08ce2bc338 feat(SW-717) fixed type error after rebase 2025-02-07 08:44:01 +01:00
Pontus Dreij
dcd45ee31d feat(SW-717) make reduce more understandable 2025-02-07 08:38:49 +01:00
Pontus Dreij
e00cea4646 feat(SW-717) use of AvailabilityEnum instead of strings 2025-02-07 08:38:47 +01:00
Pontus Dreij
7a9bfd447b feat(SW-717) Fixed bug where available rooms didn't show if there where also unavaible dublicates. 2025-02-07 08:37:57 +01:00
Pontus Dreij
d5bc2b3c57 feat(SW-717) Multiple requests if adult differ between rooms 2025-02-07 08:37:53 +01:00
Michael Zetterberg
1d822dad5a Merged in fix/labels-english (pull request #1249)
fix(i18n): validated English messages

Approved-by: Bianca Widstam
Approved-by: Christian Andolf
2025-02-06 20:54:25 +00:00
Tobias Johansson
d0e2bd5c8d Merged in fix/booking-status-retry-and-timeout (pull request #1258)
fix: increase retry for getting booking status and dont show spinner if timeout occurs

* fix: increase retry for getting booking status and dont show spinner if timeout occurrs


Approved-by: Arvid Norlin
2025-02-06 08:09:15 +00:00
Joakim Jäderberg
46ebbbba8f Merged in feature/sas-login (pull request #1256)
First steps towards the SAS partnership

* otp flow now pretends to do the linking

* Update LinkAccountForm header

* Update redirect times

* Clean up comments

* Set maxAge on sas cookies

* make all SAS routes protected

* Merge remote-tracking branch 'refs/remotes/origin/feature/sas-login' into feature/sas-login

* Require auth for sas link flow

* Fix resend otp

* Add error support to OneTimePasswordForm

* Add Sentry to SAS error boundary

* Move SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME

* Add missing translations

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/sas-login

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* Add TooManyCodesError component

* Refactor GenericError to support new errors

* Add FailedAttemptsError

* remove removed component <VWOScript/>

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* remove local cookie-bot reference

* Fix sas campaign logo scaling

* feature toggle the SAS stuff

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* fix: use env vars for SAS endpoints


Approved-by: Linus Flood
2025-02-05 14:43:14 +00:00
Erik Tiekstra
e3b1bfc414 Merged in feat/SW-1454-hotel-listing-city-page (pull request #1250)
feat(SW-1454): added hotel listing

* feat(SW-1454): added hotel listing


Approved-by: Fredrik Thorsson
2025-02-05 13:10:28 +00:00
Niclas Edenvin
86a7650813 Merged in feat/sw-1523-my-stay-page (pull request #1227)
feat(SW-1523): foundation for my stay page

* feat(SW-1523): foundation for my stay page

This is the base page for the my stay page. It is very much hard coded
and all components need to get a design update afterwards. But this is
to get the page going!

* fix(i18n): messages


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-02-05 10:16:32 +00:00
Anton Gunnarsson
fc866c0e4d Merged in feat/sw-1493-revised-comparison-block (pull request #1236)
feat(SW-1493): Revised SAS comparison block

* Base of new TierDetails for SAS tier comparison

* Add backgrounds and content to TierDetails

* Implement new cms schema for SasTierComparison

* Override gap in jsontohtml styling to 0

* Add animations to comparison details

* Redesign again

* Update content model to new design

* Add border to bottom item in tier match list

* Wrap interpolate-size in @supports to be safe

* Merge branch 'master' into feat/sw-1493-revised-comparison-block


Approved-by: Joakim Jäderberg
2025-02-03 08:42:16 +00:00
Pontus Dreij
b6d8431e82 Merged in feat/SW-964-Sticky-summary-multiroom (pull request #1231)
Feat/SW-964 Sticky summary multiroom (UX)

* feat(SW-964) Multiroom support for summary in select-rate

* feat(SW-964) added utils for calculateTotalPrice

* feat(SW-964) Removed duplicated code


Approved-by: Tobias Johansson
2025-01-31 11:09:46 +00:00
Tobias Johansson
f82de5aad7 Merged in feat/price-details-modal-multiroom (pull request #1232)
feat: adjust price detail modal to handle multi room and removed dependency of enter details store

* feat: adjust price detail modal to handle multi room and removed dependency of enter details store

* fix: remove div from table

* fix: added room translation


Approved-by: Pontus Dreij
2025-01-31 09:13:21 +00:00
Erik Tiekstra
b9a3e697be Merged in feat/SW-1521-image-gallery-lightbox (pull request #1226)
Feat/SW-1521 image gallery lightbox

* feat(SW-1453): added city listing component

* feat(SW-1521): added more generic types to ImageGallery and Lightbox components

* feat(SW-1521): added lightbox functionality for top images

* feat(SW-1521): added support for setting activeIndex on open inside Lightbox


Approved-by: Fredrik Thorsson
Approved-by: Chuma Mcphoy (We Ahead)
2025-01-30 13:30:58 +00:00
Simon Emanuelsson
1deab000bd fix: cache hotel response 2025-01-30 13:51:47 +01:00
Simon Emanuelsson
13a164242f fix: clean up hotel and its typings 2025-01-30 13:50:02 +01:00
Pontus Dreij
4da3934768 feat(SW-718) Removed unused import 2025-01-30 11:19:22 +01:00
Pontus Dreij
eef7c222aa feat(SW-718) refactor: optimize rate selection and room scrolling 2025-01-30 11:19:22 +01:00
Pontus Dreij
ab7b826cd2 feat(SW-718) created useRoomFilteringStore 2025-01-30 11:19:22 +01:00
Pontus Dreij
ba20ce2696 feat(SW-718) refactor filter submit 2025-01-30 11:19:22 +01:00
Pontus Dreij
b42f92b121 feat(SW-718) Updated css naming 2025-01-30 11:19:22 +01:00
Pontus Dreij
f1ca27ebd6 feat(SW-718) moved RoomCardSkeleton 2025-01-30 11:19:22 +01:00
Pontus Dreij
790c485120 feat(SW-718) Don't show image if no src 2025-01-30 11:19:22 +01:00
Pontus Dreij
3f43d35448 feat(SW-718) Removed unused 2025-01-30 11:19:22 +01:00
Pontus Dreij
68d7e869db feat(SW-718) updates after PR comments 2025-01-30 11:19:22 +01:00
Pontus Dreij
bfdc62d263 feat(SW-718): fix comments 2025-01-30 11:19:22 +01:00
Pontus Dreij
22fe34d5c0 feat(SW-718): removed log 2025-01-30 11:19:22 +01:00
Pontus Dreij
1f3d7cf446 feat(SW-718): Fixed bug where children was not displayd in selected room panel 2025-01-30 11:19:22 +01:00