Commit Graph

860 Commits

Author SHA1 Message Date
Anton Gunnarsson
18288cb849 Merged in feat/sas-otp-error-handling (pull request #1272)
Feat/sas otp error handling

* Improve error handling for SAS OTP
* Remove failing and deprecated test

Approved-by: Joakim Jäderberg
2025-02-07 14:18:00 +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
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
Linus Flood
c0f5c0278b Merged in feat/skeletons-and-cache (pull request #1273)
feat: skeleton key bullet proof. 10 min cache on city search response

* feat: skeleton key bullet proof. 10 min cache on city search response

* Refactor server.ts


Approved-by: Michael Zetterberg
2025-02-07 07:02:53 +00: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
Linus Flood
da31897835 Merged in fix/hotelreservation-skeletons (pull request #1271)
Fix/hotelreservation skeletons

* fix: skeletons in hotelreservation key includes all search params

* fix: skeletons in hotelreservation key includes all search params

* fix: skeletons in hotelreservation key includes all search params
2025-02-06 13:39:54 +00:00
Linus Flood
9ad8d39712 Merged in fix/hotelreservation-skeletons (pull request #1270)
fix: skeletons in hotelreservation key includes all search params

* fix: skeletons in hotelreservation key includes all search params


Approved-by: Joakim Jäderberg
2025-02-06 13:30:18 +00:00
Joakim Jäderberg
c21d7bec62 fix: netlify doesn't seem to handle redirects in a server action therefor we do the redirect on the client instead 2025-02-06 09:54:52 +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
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
Erik Tiekstra
dd4a2d8120 Merged in feat/SW-1296-hotel-subpages (pull request #1233)
feat(SW-1296): added Subpage for hotel pages and its routing

* feat(SW-1296): added Subpage for hotel pages and its routing


Approved-by: Fredrik Thorsson
2025-02-03 10:58:53 +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
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
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
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
Linus Flood
4247e37667 Merged in fix/sentry-error (pull request #1224)
fix: validate function before executing

* fix: validate function before executing
2025-01-28 11:45:34 +00:00
Linus Flood
dc105992c5 Merged in feat/sentry-errors-fixes (pull request #1216)
Removed VWO and cookie-bot

* Removed VWO and cookie-bot

* Merged master into feat/sentry-errors-fixes


Approved-by: Joakim Jäderberg
2025-01-27 12:32:36 +00:00
Erik Tiekstra
a88a033e30 Merged in feat/SW-1450-destination-page-cs-components (pull request #1204)
feat(SW-1450): added components in destination pages from cs

* feat(SW-1450): added components in destination pages from cs

* feat(SW-1450): added correct refs and removed classNames


Approved-by: Fredrik Thorsson
2025-01-24 12:06:43 +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
Linus Flood
cea4e3f3fe Merged in fix/tracking-requests (pull request #1208)
Added siteversion to all events and fixed payment status

* Added siteversion to all events and fixed payment status

* Fixed bug


Approved-by: Erik Tiekstra
2025-01-24 07:49:00 +00:00
Christian Andolf
127bb6a0a7 Merged in feat/SW-1381-new-startpage-page (pull request #1197)
feat(SW-1381): add initial start page

* feat(SW-1381): add initial start page

* fix: remove unused startpage template

remove translation key for middleware error page

* fix(SW-1381): add tracking SDK and feature flag to hide start page


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-01-23 10:18:21 +00:00
Erik Tiekstra
f962400474 Merged in feat/SW-1449-destination-page (pull request #1195)
Feat/SW-1449 destination page

* feat(SW-1449): Added destination country page

* feat(SW-1449): added destination city page


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-01-21 13:57:19 +00:00
Erik Tiekstra
c98c7a2d6b Merged in feat/SW-1339-mobile-navigation (pull request #1178)
feat(SW-1339): Now supporting sitewide alert height to decide the position of the navigation menus

* feat(SW-1339): Now supporting sitewide alert height to decide the position of the navigation menus


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-01-21 10:52:39 +00:00
Erik Tiekstra
7ac200bd7c Merged in feat/SW-1442-destination-overview-page (pull request #1188)
feat(SW-1442): added destination overview page

* feat(SW-1442): added destination overview page


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-01-20 12:21:04 +00:00
Linus Flood
814b010569 Merged in feat/curity-changes (pull request #1190)
Feat/curity changes

* Changed curity stuff

* Use env.var

* Merge branch 'master' into feat/curity-changes

* Merged master into feat/curity-changes
2025-01-20 11:44:58 +00:00
Linus Flood
69b69af03c Merged in feat/enter-details-tracking (pull request #1185)
Feat/enter details tracking

* feat: fixed bug in enter details tracking

* Sidepeek events, lowestroomPrice and analyticsRateCode

* Cleanup and fixed bug

* Fixed analyticsratecode

* Merge master

* merge master

* Removed console logs

* Added ancillaries tracking to enter details

* Added ancillary on confirmation page

* Removed console log

* Merge branch 'master' into feat/enter-details-tracking

* Refactor searchparams

* Hard code values for breakfast ancillary


Approved-by: Joakim Jäderberg
2025-01-17 07:42:44 +00:00
Michael Zetterberg
dd71ff8fa7 fix(i18n): prepare for Lokalise 2025-01-14 13:11:06 +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
Linus Flood
3bbd99ba5c Merged in fix/hotelinfo-tracking-off (pull request #1167)
feat(tracking) turn off hotelinfo tracking in booking flow

* feat(tracking) turn off hotelinfo tracking in booking flow

* Turn off hotelInfo on enter details

* Merge master


Approved-by: Joakim Jäderberg
2025-01-10 12:49:14 +00:00
Linus Flood
c6c8df87ec Fixed hotelId in payment error events 2025-01-10 12:00:21 +01:00
Linus Flood
7099115d40 Merge branch 'master' into feat/tracking-payment 2025-01-10 11:37:22 +01:00
Linus Flood
08d5405cf1 PR Fixes 2025-01-10 11:36:23 +01: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
Linus Flood
d57e3db34b Merge remote-tracking branch 'origin' into feat/tracking-payment 2025-01-10 09:13:04 +01:00
Linus Flood
014eea054f Fixed same string value for childBedPreference on confirmation page 2025-01-10 08:40:26 +01:00
Linus Flood
7ca2fd78f0 Remove console logs 2025-01-09 13:02:03 +01:00
Linus Flood
29d1721a8a hotfix: hide booking widget on public pages 2025-01-09 08:39:15 +01:00
Christel Westerberg
a8763ca80c Merged in fix/margins-loyalty-layout (pull request #1152)
fix: add correct negative margins on profile page

* fix: add correct  negative margins on profile page


Approved-by: Linus Flood
2025-01-08 15:13:32 +00:00
Pontus Dreij
b4060d720b Merged in feat/SW-716-multiroom-guest-picker (pull request #1084)
feat(SW-716) Added UI to add more rooms in guest/room picker

* feat(SW-716) Added UI to add more rooms in guest/room picker

* feat(SW-716) Renamed GuestRoom Type and updated html structure

* Feat(SW-716): Created a BookingFlowIteration1 folder

* feat(SW-716) Moved forms/bookingwidget to new flow

* feat(SW-716) Added new ENABLE_BOOKING_FLOW_ITERATION_1 and ENABLE_BOOKING_FLOW_ITERATION_2

* feat(SW-716) Re added booking widget into interaction1 of how it looks now in prod

* Revert "feat(SW-716) Re added booking widget into interaction1 of how it looks now in prod"

This reverts commit 9a5514e8e71b1487e610bf64986ca77a538c0023.

* Revert "feat(SW-716) Added new ENABLE_BOOKING_FLOW_ITERATION_1 and ENABLE_BOOKING_FLOW_ITERATION_2"

This reverts commit b00bfc08cb7878d91483220ba3e8322671c145e4.

* Revert "feat(SW-716) Moved forms/bookingwidget to new flow"

This reverts commit 6c81635fe929a71fb3a42d8f174706787d8578ed.

* Revert "Feat(SW-716): Created a BookingFlowIteration1 folder"

This reverts commit db41f1c7fcd8e3adf15713d5d36f0da11e03e3a4.

* feat(SW-716): Added NEXT_PUBLIC_HIDE_FOR_NEXT_RELEASE

* feat(SW-716) Readded Tooltip if NEXT_PUBLIC_HIDE_FOR_NEXT_RELEASE is true

* feat(SW-716) remove log


Approved-by: Niclas Edenvin
Approved-by: Christian Andolf
2025-01-08 15:09:29 +00:00
Linus Flood
5889bdd79d Handle payment fail and cancel events 2025-01-08 15:02:03 +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
Linus Flood
519795acac feat: tracking - added discount property and some basics for paymentInfo 2025-01-08 08:50:50 +01:00
Christel Westerberg
5901cab440 fix: refactor breadcrumbs to take page type variants to better match margins 2025-01-07 11:41:39 +01:00
Niclas Edenvin
dca02b90f0 Merged in fix/sw-1127-image-fixes (pull request #1123)
Fix/sw-1127 image fixes for lightbox

* fix(SW-1127): move back to top button behind lightbox

* fix(SW-1127): don't loop lightbox thumbnails

* fix(SW-1127): nicer animation in the gallery

This both fixes a bug in the gallery where the animation in the carousel
didn't work so good and also animates the images different directions
depending on if the user go left or right.


Approved-by: Matilda Landström
2025-01-07 07:56:17 +00:00
Chuma McPhoy
ea27bb01e2 refactor(LOY-48): add signup specific content page tracking 2024-12-20 10:10:55 +00:00