Commit Graph

208 Commits

Author SHA1 Message Date
Pontus Dreij
a0286603db Merged in feat(SW-1275)-cancel-booking-my-stay (pull request #1376)
Feat(SW-1275) cancel booking my stay

* feat(SW-1276) UI implementation Desktop part 1 for MyStay

* feat(SW-1276) UI implementation Desktop part 2 for MyStay

* feat(SW-1276) UI implementation Mobile part 1 for MyStay

* refactor: move files from MyStay/MyStay to MyStay

* feat(SW-1276) Sidepeek implementation

* feat(SW-1276): Refactoring

* feat(SW-1276) UI implementation Mobile part 2 for MyStay

* feat(SW-1276): translations

* feat(SW-1276) fixed skeleton

* feat(SW-1276): Added missing translations

* feat(SW-1276) fixed translations

* feat(SW-1275) cancel modal

* feat(SW-1275): Mutate cancel booking

* feat(SW-1275) added translations

* feat(SW-1275) match current cancellationReason

* feat(SW-1275) Added modal for manage stay

* feat(SW-1275) Added missing icon

* feat(SW-1275) New Dont cancel button

* feat(SW-1275) Added preperation for Cancellation number

* feat(SW-1275): added --modal-box-shadow

* feat(SW-1718) Add to calendar

* feat(SW-1718) general add to calendar


Approved-by: Niclas Edenvin
2025-02-21 09:06:15 +00:00
Linus Flood
7c0f9084b6 Merged in feat/refactor-header-footer-sitewidealert (pull request #1374)
Refactor: removed parallel routes for header, footer and sidewidealert. Langswitcher and sidewidealert now client components

* feat - removed parallel routes and made sidepeek and sitewidealerts as client components

* Langswitcher as client component

* Fixed lang switcher for current header

* Passing lang when fetching siteconfig

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Refactor

* Removed dead code

* Show only languages that has translation

* Refetch sitewidealert every 60 seconds

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Removed sidepeek parallel route from my-stay

* Added missing env.var to env.test

* Removed console.log


Approved-by: Joakim Jäderberg
2025-02-19 08:59:24 +00:00
Pontus Dreij
8616e4ab76 Merged in feat/SW-1276-implement-design (pull request #1348)
Feat/SW-1276 implement design

* feat(SW-1276) UI implementation Desktop part 1 for MyStay

* feat(SW-1276) UI implementation Desktop part 2 for MyStay

* feat(SW-1276) UI implementation Mobile part 1 for MyStay

* refactor: move files from MyStay/MyStay to MyStay

* feat(SW-1276) Sidepeek implementation

* feat(SW-1276): Refactoring

* feat(SW-1276) UI implementation Mobile part 2 for MyStay

* feat(SW-1276): translations

* feat(SW-1276) fixed skeleton

* feat(SW-1276): Added missing translations

* feat(SW-1276): Removed console log

* feat(SW-1276) fixed translations

* feat(SW-1276): Added translations

* feat(SW-1276) fix dynamic ID:s

* feat(SW-1276) removed createElement

* feat(SW-1276): Fixed build errors

* feat(SW-1276): Updated label

* feat(SW-1276): Rewrite SummaryCard


Approved-by: Niclas Edenvin
2025-02-18 14:20:54 +00:00
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
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
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
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
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
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
08ce2bc338 feat(SW-717) fixed type error after rebase 2025-02-07 08:44:01 +01:00
Pontus Dreij
7424ecf2bf feat(SW-717) fixed issues after rebase 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
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
Matilda Landström
8b475e0ca8 Merged in feat/SW-159-remove-accessibilityElevatorPitchText (pull request #1245)
fix(SW-1553): remove accessibilityElevatorPitchText

* fix(SW-159): remove accessibilityElevatorPitchText


Approved-by: Bianca Widstam
Approved-by: Christian Andolf
Approved-by: Fredrik Thorsson
2025-02-04 10:51:55 +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
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
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
c8ed172f0e feat(SW-718) Added type FilterValues 2025-01-30 11:19:22 +01:00
Pontus Dreij
2a6c88d897 feat(SW-718): Created store for selectRate 2025-01-30 11:19:22 +01:00
Pontus Dreij
328cbbe0e1 feat(SW-718) Fixed filtering with multirooms 2025-01-30 11:19:22 +01:00
Pontus Dreij
edcf146ce1 feat(SW-718) Refactor select rate to support multiroom 2025-01-30 11:19:22 +01:00
Pontus Dreij
7d716dcf4a feat(SW-718): parse room from searchParams 2025-01-30 11:19:22 +01: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
Niclas Edenvin
ef22fc4627 This creates the alternative hotels page. It is mostly a copy of the select hotel page, and most of the contents of the pages lives under the same component in /components.
Merged in feat/sw-397-alternative-hotels (pull request #1211)

Feat/sw 397 alternative hotels

* fix(SW-397): create alternative hotels page

* update types

* Adapt to new changes for fetching data

* Make bookingcode optional

* Code review fixes


Approved-by: Simon.Emanuelsson
2025-01-28 12:08:40 +00:00
Matilda Landström
577a4ca35e Merged in feat/SW-1333-hotel-endpoint (pull request #1206)
Feat(SW-133): Add additionalData endpoint

Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-01-27 11:39:13 +00:00
Pontus Dreij
7343d873c2 Merged in fix/SW-1103-page-loading (pull request #1181)
Fix/SW-1103 page loading

* feat(SW-1103): Move backend req behinde suspense

* fix/SW-1103 fix merge conflicts


Approved-by: Joakim Jäderberg
2025-01-24 10:16:30 +00:00
Pontus Dreij
33f0696c47 Merged in fix/SW-1111-r2 (pull request #1169)
fix(SW-1111) Fix issues with map

Approved-by: Niclas Edenvin
2025-01-17 06:15:55 +00:00
Christel Westerberg
a3331850a2 fix: avoid localizing currencies and default missing value to N/A 2025-01-14 16:20:08 +01:00
Christel Westerberg
bcae63e3fc fix: rename children to childrenInRoom 2025-01-14 12:25:17 +01:00
Christel Westerberg
b2935114e3 refactor: url management in hotel reservation flow 2025-01-14 11:09:42 +01:00
Michael Zetterberg
d2ce9c0d7c fix(i18n): prepare for Lokalise 2025-01-13 13:35:03 +01:00
Pontus Dreij
185dc3e8cc fix(SW-1111) Fix issues with map 2025-01-10 14:52:59 +01:00
Linus Flood
fa20f128ef Merged in feat/check-session-fix-2 (pull request #1154)
fix: is user logged in fix

* fix: is user logged in fix
2025-01-08 15:38:36 +00:00
Linus Flood
8308d00464 fix: valid session check in rooms container 2025-01-08 15:24:20 +01: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
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
Arvid Norlin
0c7c6ea21a feat: add Price details modal 2024-12-20 09:28:06 +01:00
Simon Emanuelsson
51f422510c feat(SW-865): link to booking without validation 2024-12-19 12:42:21 +01:00