Commit Graph
100 Commits
Author SHA1 Message Date
Tobias JohanssonandBianca Widstam d272cd03ce Merged in fix/SW-3115-form-tracking-changes (pull request #2470)
fix(SW-3115): add form complete tracking and removed input error tracking

* fix(SW-3115): add form complete tracking and removed input error tracking


Approved-by: Bianca Widstam
2025-07-01 06:44:08 +00:00
Tobias JohanssonandLinus Flood f0701d6e20 Merged in fix/SW-3111-mismatch-password-rules (pull request #2482)
fix(SW-3111): Added test for passwordValidator and updated pw validation

* fix(SW-3111): Added test for passwordValidator and updated pw validation

* fix: make sure regex is matching Curity

* Added error message to input field and changed message

* Fixed text


Approved-by: Christian Andolf
2025-07-01 05:51:31 +00:00
Tobias Johansson 57433c0395 Merged in fix/SW-2679-form-tracking (pull request #2455)
fix(SW-2679): dont track form abandonment if form is valid

* fix(SW-2679): dont track form abandonment if form is valid


Approved-by: Linus Flood
2025-06-27 06:26:43 +00:00
Tobias Johansson 2cce2a95b7 Merged in fix/SW-2845-hotel-pins-map-screen (pull request #2437)
fix(SW-2845): remove hover state when clicking hotel card address

* fix(SW-2845): remove hover state when clicking hotel card address


Approved-by: Michael Zetterberg
2025-06-26 06:49:59 +00:00
Tobias Johansson 1e89fd4fe7 Merged in fix/SW-1702-new-search-map-view (pull request #2423)
fix(SW-1702): Check if map view in Booking widget

* fix(SW-1702): Check if map view in Booking widget

* fix: change includes to endsWith


Approved-by: Arvid Norlin
2025-06-25 12:05:48 +00:00
Tobias Johansson 15adca9eb1 Merged in fix/SW-2707-no-availability-message (pull request #2420)
fix(SW-2707): Added new error code and set alert again when errorCode is changed

* fix(SW-2707): Added new error code and set alert again when errorCode is changed


Approved-by: Michael Zetterberg
2025-06-25 11:13:47 +00:00
Tobias Johansson 8272327993 Merged in fix/SW-2801-correct-date-formats (pull request #2400)
fix(SW-2801): Added lang specific date formats

* fix(SW-2801): Added lang specific date formats

* fix: wrong type import


Approved-by: Michael Zetterberg
2025-06-25 11:12:28 +00:00
Tobias Johansson 8c4715dd24 Merged in feat/SW-2680-tracking-fixes (pull request #2373)
fix(SW-2680): Added new properties used for tracking

* fix(SW-2680): Added new properties used for tracking


Approved-by: Michael Zetterberg
2025-06-25 08:56:37 +00:00
Tobias Johansson 401c4ba6d1 Merged in fix/SW-3087-price-details-error (pull request #2402)
fix(SW-3087): Added missing property that caused error in PriceDetailsModal

* fix(SW-3087): Added missing property that caused error in PriceDetailsModal


Approved-by: Arvid Norlin
Approved-by: Matilda Landström
2025-06-23 08:45:01 +00:00
Tobias Johansson 002d5f9c68 Merged in fix/SW-3078-wrong-dates-time-zones (pull request #2388)
fix(SW-3078): change to string instead of Date in Zod schema

* fix(SW-3078): change to string instead of Date in Zod schema


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
2025-06-18 10:55:05 +00:00
Tobias JohanssonandLinus Flood db94a12634 Merged in fix/SW-3068-return-cleanup (pull request #2382)
fix(SW-3068): return cleanup function

* fix(SW-3068): return cleanup..


Approved-by: Linus Flood
2025-06-17 13:17:24 +00:00
Tobias Johansson d80e92a646 Merged in fix/SW-3068-sitewide-alert-fix (pull request #2381)
fix(SW-3068): fix race condition that cause alert height not to be set correctly

* fix(SW-3068): fix race condition that cause alert height not to be set correctly


Approved-by: Linus Flood
2025-06-17 12:46:22 +00:00
Tobias Johansson e645b15c6e Merged in fix/SW-2841-filter-popup-closing-on-select (pull request #2289)
Fix/SW-2841 filter popup closing on select

* fix(SW-2841): refactored so that filter modal is not closed when selecting filters

* fix(SW-2841): rename component

* fix: review feedback

* fix: move font-family

* fix: change init value of filteredHotelIds

* fix

* fix: add Typography tag


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-06-13 07:41:31 +00:00
Tobias Johansson 65e2ee47a5 Merged in feat/SW-1684-wrong-font-countrycode-dropdown (pull request #2331)
fix(SW-1684): set font family phone input dropdown

* fix: set font family phone input dropdown

* fix: phone input styling


Approved-by: Christian Andolf
2025-06-12 10:51:32 +00:00
Tobias JohanssonandLinus Flood 98983cb44a Merged in fix/SW-3018-payment-cancel-error (pull request #2339)
Fix/SW-3018 payment cancel error

* fix(SW-3018): cancel payment error when get booking in callback

* fix: wrong status code


Approved-by: Linus Flood
2025-06-11 15:22:39 +00:00
Tobias Johansson ead822fa62 Merged in fix/SW-2679-tracking-signup-details-forms (pull request #2236)
feat(SW-2679): Added form tracking for checkout and signup

* feat(SW-2679): Added form tracking for checkout and signup

* fix(SW-2679): fixes from review


Approved-by: Michael Zetterberg
2025-06-10 06:35:13 +00:00
Tobias Johansson 97f81cd35b Merged in fix/SW-2972-hotel-card-prices-width (pull request #2304)
fix(SW-2972): hotel card prices didnt take full width

* fix(SW-2972): hotel card prices didnt take full width


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-06-05 12:05:38 +00:00
Tobias Johansson f77202f58b Merged in fix/SW-2249-missing-currency (pull request #2159)
fix(SW-2249): Added default currency to summary and price details modal

* fix(SW-2249): Added default currency to summary and price details modal


Approved-by: Hrishikesh Vaipurkar
2025-05-26 06:51:57 +00:00
Tobias Johansson fe1f4b063d Merged in fix/paymentFail-event-fix (pull request #2189)
fix: infinite loop when bookingStatus isTimeout occurs

* fix: infinite loop when bookingStatus isTimeout occurs


Approved-by: Linus Flood
2025-05-22 07:33:13 +00:00
Tobias Johansson f4ef5a342f Merged in fix/SW-2428-room-preferences-pageview (pull request #2095)
fix(SW-2428): read room packages from search param in select rate tracking

* fix(SW-2428): read room packages from search param in select rate tracking


Approved-by: Bianca Widstam
2025-05-20 07:15:53 +00:00
Tobias Johansson b641f8387e Merged in fix/SW-2534-booking-widget-fixes (pull request #2129)
fix(SW-2534): Added validation error and fixed initial month in date picker for BW

* Merged in revert-version (pull request #2128)

revert including version in layouts and api responses

* revert including version in layouts and api responses


Approved-by: Linus Flood

* feat: prevent users from selecting the same room when there is no vacancy for it

* Merged in fix/no-my-stay-for-external-bookings (pull request #2126)

fix: Only link web and app bookings to my stay

Approved-by: Joakim Jäderberg

* Merged in fix/bookingwidget-fixes (pull request #2135)

Fix: (#SW-2663) bookingwidget mobile - Space around, border-radius and correct color on date field

* fix: booking widget mobile - padding around booking widget and date color

* Fixed rounded corners

* Reduced minimum size of column


Approved-by: Joakim Jäderberg

* Merged in fix/LOY-105-signupform-error-messages (pull request #2121)

feat(LOY-105): update signup form validation messages

* feat(LOY-105): improve signup form validation messages


Approved-by: Erik Tiekstra

* fix(LOY-199): add missing benefits link

* Merged in feat/SW-2340-aa-tracking-my-stay-pageview- (pull request #2133)

feat: SW-2340 Implemented tracking on my-stay, webview my-stay and receipt page

* feat: SW-2340 Implemented tracking on my-stay, webview my-stay and receipt page

* feat: SW-2340 Updated webview tracking

* feat: SW-2340 Updated receipt tracking


Approved-by: Linus Flood

* Merged in fix/SW-2804-missing-meeting-rooms (pull request #2138)

fix: return [] when we get a 404 for meeting rooms for a hotel

* fix: return [] when we get a 404 for meeting rooms for a hotel


Approved-by: Linus Flood

* feat(auth): limit output in session endpoint

* fix(SW-2376): Vertically centered previous/next buttons inside carousel cards

Approved-by: Matilda Landström

* fix(SW-2055): Surrounded ul inside JsonToHtml with a typography component

Approved-by: Matilda Landström

* fix(SW-2621): Breaking too long words on heading inside destination city pages

Approved-by: Matilda Landström

* Merged in fix/sw-2763-external-scripts (pull request #2104)

fix: try/catch external scripts to avoid them breaking our page #sw-2763

* fix: try/catch external scripts to avoid them breaking our page #sw-2763


Approved-by: Joakim Jäderberg

* fix: handle non loaded surprises in case they're returned as null from server

* feat(SW-2806): booking widget should not be blocked by sitewide alert

* Merged in fix/remove-on-error (pull request #2142)

fix: revert onError on the Script component

* fix: revert onError on the Script component

* Merged in fix/alert-icon (pull request #2139)

fix(SW-2807): alert icons

* fix(SW-2807): fix incorrect icon color on sitewide alert

* fix(SW-2807): change error icon


Approved-by: Erik Tiekstra
Approved-by: Linus Flood

* Merged in feat/SW-2760-SW-552-wellness-openinghours (pull request #2112)

fix(SW-2760, SW-2552): fix opening hours wellness sidepeek

* fix(SW-2760, SW-2552): fix opening hours wellness sidepeek


Approved-by: Erik Tiekstra

* Merged in feat/SW-1749-sidepeek-hotel-cta (pull request #2123)

feat(SW-1749): add link to hotel page in sidepeek

* feat(SW-1749): add link to hotel page in sidepeek


Approved-by: Matilda Landström

* fix(SW-2811): suggest list should follow where-to-field

* fix(SW-2451): placement of suggest list

* Merged in fix/SW-2684-booking-widget-text-overflow (pull request #2048)

fix(SW-2684): truncate overflowing text in booking widget

* fix: truncate overflowing text in booking widget

* fix: change Body to Typography and css selector fix


Approved-by: Hrishikesh Vaipurkar

* Merged in feat/SW-2800-lightbox-history-state (pull request #2147)

feat(SW-2800): closing image gallery and lightbox on using browser navigation

* feat(SW-2800): closing image gallery and lightbox on using browser navigation


Approved-by: Linus Flood

* Merged in fix/enter-details-footer-margin (pull request #2150)

fix: margin to footer on enter details

* fix: margin to footer on enter details

* Merged in fix/SW-2822-missing-meetingroom-images (pull request #2151)

fix: meeting rooms with missing images

* fix: meeting rooms with missing images


Approved-by: Linus Flood


Approved-by: Bianca Widstam
2025-05-20 06:49:27 +00:00
Tobias Johansson 93a155f1e4 Merged in fix/SW-2684-booking-widget-text-overflow (pull request #2048)
fix(SW-2684): truncate overflowing text in booking widget

* fix: truncate overflowing text in booking widget

* fix: change Body to Typography and css selector fix


Approved-by: Hrishikesh Vaipurkar
2025-05-19 13:45:24 +00:00
Tobias Johansson 59a9c72724 Merged in fix/SW-2748-menu-hidden-behind-summary (pull request #2097)
fix(SW-2748 and SW-2747): z-index issue with overlapping summary on desktop viewport

* fix: z-index issue with overlapping summary on desktop viewport

* fix: unset z-index on desktop


Approved-by: Niclas Edenvin
2025-05-14 14:49:48 +00:00
Tobias Johansson 13261d425c Merged in feat/SW-2703-mobile-summary-improvements (pull request #2060)
Feat/SW-2703 mobile price summary improvements

* feat(SW-2703): fixes to select rate price summary

* feat(SW-2703): fixes enter details summary mobile

* fix: z-index issue related to booking widget popover

* fix

* fix: added accessibility props to overlay div

* fix: added button inside header

* fix: rename aria button


Approved-by: Michael Zetterberg
2025-05-13 09:22:34 +00:00
Tobias Johansson 02b26e7965 Merged in fix/SW-2668-tracking-room-details-missing (pull request #2015)
fix(SW-2668): added search term and room details to tracking

* fix(SW-2668): added search term and room details to tracking

* fix: change to optional type


Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-05-08 14:13:51 +00:00
Tobias Johansson 4d16f66605 Merged in fix/SW-2662-select-rate-pageview-bookingcode (pull request #2009)
fix(SW-2662): remove bookingCode from booking comparison

* fix: remove bookingCode from booking comparison


Approved-by: Michael Zetterberg
2025-05-08 10:57:12 +00:00
Tobias Johansson 194a401a56 Merged in fix/SW-2631-check-session-expiry (pull request #2004)
fix(SW-2631): check if session is valid otherwise use service token

* fix: check if session is valid otherwise use service token

* fix: only use service token for queries and updated mutations to check for valid user token


Approved-by: Michael Zetterberg
2025-05-08 09:20:48 +00:00
Tobias Johansson 25ae368210 Merged in fix/SW-1353-and-SW-2497-tracking-fixes (pull request #1977)
fix: tracking fixes SW-1353 and SW-2497

* fix: tracking fixes

* fix: remove console log and rename variable


Approved-by: Michael Zetterberg
Approved-by: Arvid Norlin
2025-05-06 11:15:52 +00:00
Tobias Johansson b6c066ea8d Merged in fix/SW-2497-tracking-remove-ancilleries-data (pull request #1949)
fix: remove ancilleries data when reloading booking confirmation

* fix: remove ancilleries data when reloading booking confirmation


Approved-by: Arvid Norlin
Approved-by: Christian Andolf
2025-05-05 12:40:47 +00:00
Tobias Johansson 88a1333ed1 Merged in fix/SW-2601-incorrect-availability-alert (pull request #1940)
fix: update condition when to display NoAvailabilityAlert when using booking code

* fix: update condition when to display NoAvailabilityAlert when using booking code


Approved-by: Michael Zetterberg
Approved-by: Arvid Norlin
2025-05-05 08:44:47 +00:00
Tobias JohanssonandSimon Emanuelsson 29abc3cba6 fix: added progress bar wrapper and handling of loading type according to button props 2025-05-03 22:19:36 +02:00
Tobias JohanssonandSimon Emanuelsson 32ce7d819b fix: renamed Spinner -> Loading 2025-05-03 22:19:00 +02:00
Tobias JohanssonandSimon Emanuelsson d0c6d1d875 fix: update spinner to use svg instead 2025-05-03 22:19:00 +02:00
Tobias JohanssonandSimon Emanuelsson f56a1ece0f feat(SW-1255): Added loading state to submit button in enter details 2025-05-03 22:18:50 +02:00
Tobias JohanssonandSimon Emanuelsson 89468bc37f feat(SW-1255): Add loading state to button component 2025-05-03 22:10:00 +02:00
Tobias JohanssonandSimon Emanuelsson 80ccdc0e44 fix: benefits banner broke layout on mobile 2025-05-03 22:01:10 +02:00
Tobias Johansson ffb29ddaad Merged in fix/tracking-issue-pageview (pull request #1931)
fix: tracking issues

* fix: tracking issues


Approved-by: Hrishikesh Vaipurkar
2025-05-03 09:21:14 +00:00
Tobias Johansson 71f1e9fe2c Merged in fix/tracking-fixes (pull request #1930)
Fix/tracking fixes

* fix: remove hotelInfo and paymentInfo when user reloads page on confirmation page

* fix: clean session storage item on unmount

* fix: commented out hard navigation hook

* fix: update price calculation on room ancillary in tracking

* fix: update discount calculation

* fix: add space between fns

* fix: allow useSoftNavigation to fire pageview again on same pathname

* fix: prevent bedSelection and breakfastSelection from tracking twice


Approved-by: Hrishikesh Vaipurkar
2025-05-03 07:27:54 +00:00
Tobias Johansson bf79168216 Merged in fix/SW-2462-room-availability-error (pull request #1920)
Fix/SW-2462 room availability error

* fix: added toast error when availability fails and you get redirect to select-rate

* fix: added support for showing alert when availability error happens

* fix: rename PaymentAlert -> BookingAlert


Approved-by: Erik Tiekstra
2025-05-02 08:35:29 +00:00
Tobias Johansson 70095043f8 Merged in fix/SW-1353-multiroom-tracking (pull request #1870)
fix(SW-1353): enter details tracking fixes

* fix(SW-1353): tracking fixes

* refactor: move code

* fix: use hasPublicPrice

* fix: update calculation for roomPrice and totalPrice

* fix: only include bedtype if it is "preselected"


Approved-by: Michael Zetterberg
2025-04-29 06:29:57 +00:00
Tobias Johansson 12cebd9c1c Merged in fix/add-route-for-app-callback (pull request #1810)
fix: add route for app payment callback

* fix: add route for app payment callback


Approved-by: Michael Zetterberg
2025-04-16 07:34:27 +00:00
Tobias Johansson 9a9789e736 Merged in feat/SW-1549-map-improvements (pull request #1783)
Feat/SW-1549 map improvements

* fix: imported new icon

* refactor: rename component and set map handling to 'greedy'

* fix: show cards for 3s after hover

* refactor: update styles and added HotelPin component

* fix: change from close to back icon

* refactor: update to only use 1 state value for active pin and card

* fix: add click handler when dialog is opened

* fix: performance fixes for the dialog carousel

* fix: added border

* fix: clear timeout on mouseenter

* fix: changed to absolute import

* fix: moved hover state into the store

* fix: renamed store actions


Approved-by: Michael Zetterberg
2025-04-15 13:23:23 +00:00
Tobias Johansson 0b1625b678 Merged in feat/SW-1526-select-room-rate-focus (pull request #1732)
fix(SW-1526): adjusted scroll position when selecting a rate

* fix: adjusted scroll position when selecting a rate

* fix


Approved-by: Michael Zetterberg
2025-04-11 10:45:07 +00:00
Tobias Johansson e6ae6ff650 Merged in feat/SW-2113-allow-feature-combinations (pull request #1719)
Feat/SW-2113 allow feature combinations

* feat(SW-2113): Refactor features data to be fetched on filter room filter change

* feat(SW-2113): added loading state

* fix: now clear room selection when applying filter and room doesnt exists. And added room features to mobile summary

* fix

* fix: add package to price details

* feat(SW-2113): added buttons to room filter

* fix: active room

* fix: remove console log

* fix: added form and close handler to room package filter

* fix: add restriction so you cannot select pet room with allergy room and vice versa

* fix: fixes from review feedback

* fix

* fix: hide modify button if on nextcoming rooms if no selection is made, and adjust filter logic in togglePackage

* fix: forgot to use roomFeatureCodes from input..

* fix: naming


Approved-by: Simon.Emanuelsson
2025-04-07 11:36:34 +00:00
Tobias Johansson 7434f30c20 Merged in feat/SW-2033-implement-new-room-feature-request (pull request #1665)
feat(SW-2033): Added new route for fetching room features, and merged the data with existing availability data

* feat(SW-2033): Added new route for fetching room features, and merged the data with existing availability data

* fix: issue with total price not including room features

* fix: add return null

* fix

* fix

* fixes from PR feedback


Approved-by: Arvid Norlin
2025-03-31 11:20:49 +00:00
Tobias JohanssonandSimon.Emanuelsson adf81bf5c9 Merged in fix/ratecard-fixes (pull request #1633)
RateCard fixes

Approved-by: Simon.Emanuelsson
2025-03-25 19:38:30 +00:00
Tobias JohanssonandSimon Emanuelsson 310a5a7a68 fixes 2025-03-25 20:35:57 +01:00
Tobias Johansson 0e2192be0f Merged in feat/new-rate-cards (pull request #1600)
feat(SW-1435): Added RateCard component to design system

* feat(SW-1435): Added new component: RateCard to design system

* feat: added reward night points rate card

* fix: set svg icon color to "currentColor" to make them more reusable

* fix: added click handler for info icon

* fix: added selectedRate


Approved-by: Arvid Norlin
2025-03-25 10:41:43 +00:00
Tobias Johansson ac493fe325 Merged in feat/SW-1149-handle-status-polling (pull request #1562)
Feat/SW-1149 handle status polling

* feat(SW-1149): move terms and conditions sections to separate component and added copy

* feat(SW-1149): Added client component to handle success callback for payment flow

* fix: check for bookingCompleted status as well

* feat(SW-1587): use alert instead of toast for showing payment errors

* fix: added enum for payment callback status

* fix: proper way of checking for multiple statuses

* fix: update schema type

* fix: use localised link to customer service

* fix: update to use enum for status strings


Approved-by: Arvid Norlin
2025-03-20 07:38:29 +00:00
Tobias Johansson c0b543f18d Merged in feat/SW-1437-price-change-scenario (pull request #1532)
Feat/SW-1437 price change scenario

* wip price change scenario

* feat(SW-1437): added updated room prices to summary

* fix: spinner not centered on page

* fix: feedback fixes


Approved-by: Arvid Norlin
Approved-by: Simon.Emanuelsson
2025-03-14 12:39:50 +00:00
Tobias Johansson ad05f792fb Merged in feat/SW-1078-rate-terms-scenarios (pull request #1500)
feat(SW-1078): mixed rate scenario

* feat(SW-1078): mixed rate scenario

* fix: change from css string modification to array join

* refactor: split out big reduce function into smaller parts

* fix: minor fixes and improvments

* fix: added room index map to localization string


Approved-by: Christian Andolf
2025-03-12 10:34:35 +00:00
Tobias Johansson 7c233ab846 Merged in feat/SW-1076-no-room-availability (pull request #1467)
Feat/SW-1076 no room availability

* fix: update booking error codes

* feat(SW-1076): handle no room availabilty on enter-details

* fix: parse to json in api mutation instead of expecting json

* fix: remove 'isComplete' state from sectionAccordion because it was not needed


Approved-by: Simon.Emanuelsson
2025-03-10 12:13:15 +00:00
Tobias Johansson 1009ea87c9 Merged in fix/SW-1686-show-correct-room-availabilty-number (pull request #1491)
fix: filter to only show available rooms in roomFilter

* fix: filter to only show available rooms in roomFilter


Approved-by: Niclas Edenvin
2025-03-10 08:32:14 +00:00
Tobias Johansson 95917e5e4f Merged in fix/SW-1760-room-details-button-wrong-color (pull request #1440)
fix: added prop to ToggleSidePeek to fix color regression

* fix: added prop to ToggleSidePeek to fix color regression


Approved-by: Arvid Norlin
2025-02-28 08:23:15 +00:00
Tobias Johansson 832b6c27e0 Merged in fix/SW-1715-price-details-with-many-rooms (pull request #1421)
Fix/SW-1715 price details with many rooms

* fix: added useMemo to stop combineRoomAvailabilities from rerunning

* fix: add max height and scroll to modal content

* fix: return new array in combineRoomAvailabilities instead of pushing


Approved-by: Christian Andolf
2025-02-27 12:55:07 +00:00
Tobias Johansson b3cd907584 Merged in fix/SW-1645-price-details-popup-missing-data (pull request #1413)
fix(SW-1645): added room features to price detail popup

* fix(SW-1645): added room features to price detail popup


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-02-27 09:06:59 +00:00
Tobias Johansson 895dce2f72 Merged in fix/SW-1686-show-correct-room-number (pull request #1417)
fix(SW-1686): display total rooms and available rooms when filtering

* fix(SW-1686): display total rooms and available rooms when filtering


Approved-by: Arvid Norlin
Approved-by: Simon.Emanuelsson
2025-02-27 09:06:22 +00:00
Tobias Johansson 27d587965a Merged in fix/SW-1604-member-price-popup (pull request #1400)
fix: dont show member price modal if user is logged in

* fix: dont show member price modal if user is logged in


Approved-by: Michael Zetterberg
2025-02-25 12:23:05 +00:00
Tobias Johansson 3b63223778 Merged in fix/SW-546-dob-cut-off (pull request #1403)
fix: overflow problem with dob inputs in enter details

* fix: overflow problem with dob inputs in enter details


Approved-by: Simon.Emanuelsson
2025-02-25 08:41:00 +00:00
Tobias Johansson 59eefb877e Merged in feat/SW-1077-enter-details-edit-room (pull request #1360)
Feat/SW-1077 enter details edit room

* feat(SW-1077): persist state when changing rooms

* fix: issue with step state when closing accordion and transition to correct room when modifying step


Approved-by: Pontus Dreij
2025-02-19 10:03:11 +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
Tobias JohanssonandArvid Norlin 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
Tobias Johansson 450a1d4adc Merged in fix/reverse-date-input-fix (pull request #1294)
Revert "Merged in fix/remove-test-warnings (pull request #1267)"

* Revert "Merged in fix/remove-test-warnings (pull request #1267)"

This reverts commit c62ebb83bb.


Approved-by: Michael Zetterberg
2025-02-10 13:30:03 +00:00
Tobias Johansson c62ebb83bb Merged in fix/remove-test-warnings (pull request #1267)
fix: change from undefined to empty string to get rid of uncontrolled input warnings in tests

* fix: change from undefined to empty string to get rid of uncontrolled input warnings in tests


Approved-by: Michael Zetterberg
2025-02-06 12:39:32 +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
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
Tobias Johansson a7468cd958 Merged in feat/SW-1379-multiroom-summary (pull request #1198)
Feat/SW-1379 multiroom summary

* fix: added early return in hotel query and added missing type annotations

* feat(SW-1379): update summary to support multiple rooms and add tests

* fix: added check for room number when using isMember for member prices

* fix: remove mocked array

* fix: minor bug fixes in rate details popup

* fix: translation key


Approved-by: Pontus Dreij
Approved-by: Arvid Norlin
2025-01-29 09:25:43 +00:00
Tobias Johansson 8a3314b6d5 fix(SW-1342)!: Merged in fix/SW-1342-get-booking-schema-fix (pull request #1170)
BREAKING CHANGE: should be released to prod together with commit: 999aa376fb and requires Booking API to be released 

fix(SW-1342)!: update booking schema to allow nullable and optional fields for confirmationNumber and description

* fix!: update booking schema to allow nullable and optional fields for confirmationNumber and description


Approved-by: Arvid Norlin
2025-01-20 09:24:36 +00:00
Tobias Johansson 999aa376fb BREAKING CHANGE(booking API schema changes): Merged in feat/SW-1342-booking-api-updates (pull request #1160)
fix: update booking status schema and affected code

* fix: update booking api schema and affected code

* fix: update meta prop in booking response schema


Approved-by: Arvid Norlin
2025-01-10 08:36:00 +00:00
Tobias Johansson 1018b3ebcd Merged in feat/SW-1169-map-bedtype-icons (pull request #1113)
Feat/SW-1169 map bedtype icons

* feat(SW-1169): Added bed icons

* fix(SW-1169): update fill rule property

* fix(SW-1169): update clip rule prop

* feat(SW-1169): Added way of rendering bed type icons with extra beds

* feat(SW-1169): update room schema to map mainBed to enum

* feat(SW-1169): update bedtype icon color

* feat(SW-1169): transform unknown bed types to BedTypeEnum.Other

* test: update mock data with new schema


Approved-by: Christel Westerberg
2025-01-08 13:26:56 +00:00
Tobias Johansson 6fabfe2367 fix: lint error in test 2025-01-08 14:14:38 +01:00
Tobias Johansson 6ca56f3138 Merged in feat/SW-822-handle-breakfast-included (pull request #1138)
Feat/SW-822 handle breakfast included

* feat(SW-822): Added flag for breakfast included and hide breakfast step if included

* fix: check if window is defined to avoid error during SSR

* fix: remove return if rate definition is not found because its expected if input is undefined


Approved-by: Christel Westerberg
Approved-by: Arvid Norlin
2025-01-08 12:34:20 +00:00
Tobias Johansson 18dd08f10e Merged in feat/SW-619-signup-non-happy (pull request #1083)
Feat/SW-619 signup non happy

* feat(SW-619): Added tests for Date input

* feat(SW-619): Updated date input to not allow date below 18 years old, also added form validation and tests to cover this change

* fix

* feat(SW-619): add info banner if membership verification fails

* fix(SW-619): update test description


Approved-by: Christel Westerberg
Approved-by: Arvid Norlin
2025-01-08 12:31:30 +00:00
Tobias Johansson c7e38af5c9 Merged in feat/enter-details-store-tests (pull request #1134)
Feat/enter details store tests

* test: add unit tests for useEnterDetailsStore and update Jest environment

* test: added more useEnterDetailsStore tests


Approved-by: Christel Westerberg
2025-01-08 07:47:51 +00:00
Tobias Johansson 118f1afafa Merged in feat/SW-1023-bed-type-information (pull request #1056)
Feat/SW-1023 bed type information

* feat(SW-1023): add bed type info

* fix: formatting of bed type string

* fix(SW-1023): refactored bed type info and added default value to children beds

* fix(SW-1023): fixes from PR


Approved-by: Christel Westerberg
Approved-by: Simon.Emanuelsson
2024-12-18 09:47:06 +00:00
Tobias Johansson aa8cfe86c4 fix: added placeholder meta data 2024-12-13 10:02:28 +01:00
Tobias Johansson 6dc807d0b2 fix: added default image for hotel images 2024-12-13 09:58:09 +01:00
Tobias Johansson b341c96838 Merged in fix/revert-breakfast-price-change (pull request #1064)
fix: revert price removal of "no breakfast" option


Approved-by: Simon.Emanuelsson
2024-12-10 13:24:29 +00:00
Tobias Johansson 9b1d70b3be Merged in feat/SW-1026-breakfast-for-kids (pull request #1038)
feat(SW-1026): added info regarding children breakfast

* feat(SW-1026): added info regarding children breakfast

* fix: remove hardcoded currency

* fix(SW-1026): remove price for no breakfast

* fix: missing translation


Approved-by: Christian Andolf
Approved-by: Arvid Norlin
2024-12-09 14:58:54 +00:00
Tobias Johansson af3c68e464 fixes 2024-12-06 09:13:36 +01:00
Tobias Johansson 6cb4c63b2e fix: reduce transition duration 2024-12-06 09:13:36 +01:00
Tobias Johansson eb92beacaf fix(SW-1043): set overflow when active section to enable dropdowns to overflow 2024-12-06 09:13:36 +01:00
Tobias Johansson d9f1f6f1ab fix(SW-1043): complete booking button styling 2024-12-06 09:13:36 +01:00
Tobias Johansson 15552a4cb6 fix(SW-1043): added input required messages 2024-12-06 09:13:36 +01:00
Tobias Johansson b58c1adb46 fix(SW-1043): updated country input so whole field is clickable 2024-12-06 09:12:13 +01:00
Tobias Johansson 930f666d07 fix(SW-1043): prevent scrolling while bottom sheet is open 2024-12-06 09:12:13 +01:00
Tobias Johansson f7cf1e9a2b fix(SW-1043): styling fixes 2024-12-06 09:12:13 +01:00
Tobias Johansson 6f9fb4b620 fix(SW-1043): wrong font size/styling on prices in summary 2024-12-06 09:12:13 +01:00
Tobias Johansson c354fbe434 fix(SW-1043): added hook with the scroll logic 2024-12-06 09:12:13 +01:00
Tobias Johansson 92db90502c fix: added event listener to scroll when transition ends 2024-12-06 09:12:13 +01:00
Tobias Johansson d3dad4c73d wip 2024-12-06 09:12:13 +01:00
Tobias Johansson 9b90e99adf Merged in feat/SW-1007-saved-cards-filtering (pull request #980)
Feat/SW-1007 saved payment cards now shown based on supported cards by hotel

* fix(SW-1007): refactored savedCards to only show supported payment cards

* fix(SW-1007): show error message even if metadata is null

* fix: merge changes that were missed

* fix: remove use server


Approved-by: Christel Westerberg
2024-11-28 08:08:39 +00:00
Tobias Johansson 70000afe1f Merged in feat/SW-755-price-change-non-happy (pull request #957)
Feat/SW-755 price change non happy

* fix(SW-755): dont show field error if checkbox has no children

* feat(SW-755): Price change route + dialog WIP

* fix(SW-755): minor refactoring

* fix(SW-755): added logging to price change route

* fix(SW-755): remove redundant search param logic

* fix(SW-755): moved enum cast to zod instead

* fix(SW-755): move prop type to types folder

* fix(SW-755): Added suspense to Payment and refactored payment options hook

* fix(SW-755): seperated terms and conditions copy from the checkbox label

* fix(SW-755): add currency format and fixed wrong translation

* fix(SW-755): change from undefined to null

* fix(SW-755): added extra type safety to payment options


Approved-by: Christian Andolf
Approved-by: Simon.Emanuelsson
2024-11-26 09:06:41 +00:00
Tobias Johansson d6cff63c5e Merged in feat/SW-999-visual-fixes (pull request #976)
Feat/SW-999 visual fixes in enter details

* fix(SW-999): accordion title font sizes fix and alignment of change room button

* fix(SW-999): added scroll if content cannot fit inside popover


Approved-by: Christel Westerberg
2024-11-26 08:11:50 +00:00
Tobias Johansson 7221e77fa0 Merged in fix/SW-933-incorrect-ratecode (pull request #947)
Fix/SW-933 incorrect ratecode when creating booking as a member

* fix(SW-933): Added check if member to select correct rate code in create booking

* fix(SW-933): set member price in summary when "join" is true

* fix(SW-933): change "price" -> "amount" and fix bool expression

* fix(SW-933): added check for membership number in summary


Approved-by: Christel Westerberg
2024-11-21 09:00:06 +00:00
Tobias JohanssonandJoakim Jäderberg 293800f024 Merged in feat/SW-618-payment-non-happy-path (pull request #874)
Feat/SW-618 payment non happy path

* feat(SW-618): filter out expired saved cards

* feat(SW-618): Added payment error codes and way of showing messages based on code

* feat(SW-618): show error message if max retries has been reached and remove search param after showing toast

* fix(SW-618): move fallback error codes

* fix(SW-618): remove ref from stopping useEffect to run twice

* fix(SW-618): refactored logic for toast message and minor fixes

* fix(SW-618): remove error message enum due to static analysis problems


Approved-by: Christian Andolf
Approved-by: Arvid Norlin
2024-11-19 08:05:14 +01:00
Tobias Johansson a70f8a3b97 Merged in feat/SW-618-payment-non-happy-path (pull request #874)
Feat/SW-618 payment non happy path

* feat(SW-618): filter out expired saved cards

* feat(SW-618): Added payment error codes and way of showing messages based on code

* feat(SW-618): show error message if max retries has been reached and remove search param after showing toast

* fix(SW-618): move fallback error codes

* fix(SW-618): remove ref from stopping useEffect to run twice

* fix(SW-618): refactored logic for toast message and minor fixes

* fix(SW-618): remove error message enum due to static analysis problems


Approved-by: Christian Andolf
Approved-by: Arvid Norlin
2024-11-18 14:10:11 +00:00
Tobias Johansson ce453d8b1d feat(SW-817): hide apple pay if not supported 2024-11-18 08:52:12 +00:00
Tobias Johansson 169751c5a6 Merged in fix/SW-878-alternate-payment-options (pull request #878)
fix(SW-878): fix issue with alternate pay options showing when flex rate is selected

* fix(SW-878): fix issue with alternate pay options showing when flex rate is selected


Approved-by: Christel Westerberg
Approved-by: Simon.Emanuelsson
2024-11-12 09:37:17 +00:00
Tobias Johansson 0cbffc7904 Merged in feat/SW-613-refactor-hotelreservation-sidepeek (pull request #805)
Feat/SW-613 refactor hotelreservation sidepeek

* feat(SW-613): move sidepeek paralell route to apply for all of hotelreservation

* feat(SW-613): refactor sidepeek logic to a unified approach for hotelreservation flow

* feat(SW-613): fix issue where room was not selected properly in sidepeek

* fix(SW-613): move back preload to layout

* fix(SW-613): move preload to dedicated file

* fix(SW-613): refactor sidepeek to work with hotel page

* feat(SW-613): added sidepeek button for room card


Approved-by: Simon.Emanuelsson
2024-11-06 12:09:27 +00:00