Joakim Jäderberg
3b3e7308cc
Merged in feat/SW-3549-pass-scandic-token (pull request #2989 )
...
Feat/SW-3549 pass scandic token
* WIP pass scandic token
* pass scandic token when booking
* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token
* pass user token when doing availability search
* undo changes
* merge
* Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988 )
fix(SW-3551): Fix issue with BookingConfigProvider in RSC
* wip move config to pages
* Move config providing to pages
* Merged in fix/update-promo-error-modal-text (pull request #2990 )
fix: update promo error modal text
* fix: update promo error modal text
Approved-by: Emma Zettervall
* Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991 )
fix(SW-3514): Show join Scandic Friends card for SAS multiroom
* Show join card for room 2+
Approved-by: Hrishikesh Vaipurkar
* Merged in feat/lokalise-rebuild (pull request #2993 )
Feat/lokalise rebuild
* chore(lokalise): update translation ids
* chore(lokalise): easier to switch between projects
* chore(lokalise): update translation ids
* .
* .
* .
* .
* .
* .
* chore(lokalise): update translation ids
* chore(lokalise): update translation ids
* .
* .
* .
* chore(lokalise): update translation ids
* chore(lokalise): update translation ids
* .
* .
* chore(lokalise): update translation ids
* chore(lokalise): update translation ids
* chore(lokalise): new translations
* merge
* switch to errors for missing id's
* merge
* sync translations
Approved-by: Linus Flood
* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994 )
feat(SW-3552): Removed scandic session on logout
Approved-by: Joakim Jäderberg
* merge
* replace getRedemptionTokenSafely() with context based instead
* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls
* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls
* merge
* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token
* add booking scope
remove unused getMembershipNumber()
Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
2025-10-24 13:17:02 +00:00
Hrishikesh Vaipurkar
2a28681259
Merged in fix/SW-3526-show-sas-eb-points-unlinked- (pull request #2987 )
...
fix(SW-3256): Fixed Users with 0 points throws error
Approved-by: Anton Gunnarsson
2025-10-21 13:01:08 +00:00
Bianca Widstam
6c65951fa7
Merged in BOOK-448-select-rate-reload-bookingcode (pull request #2974 )
...
(BOOK-448): prevent refetching select rate availability when adding room bookingcode
* (BOOK-448): prevent refetching select rate availability when adding room bookingcode
Approved-by: Linus Flood
2025-10-16 06:16:35 +00:00
Hrishikesh Vaipurkar
78ede453a2
Merged in feat/SW-3526-show-sas-eb-points-rate-in- (pull request #2933 )
...
feat(SW-3526): Show EB points rate and label in booking flow
* feat(SW-3526): Show EB points rate and label in booking flow
* feat(SW-3526) Optimized points currency code
* feat(SW-3526) Removed extra multiplication for token expiry after rebase
* feat(SW-3526): Updated to exhaustive check and thow if type error
Approved-by: Anton Gunnarsson
2025-10-15 06:54:44 +00:00
Erik Tiekstra
50aaa095eb
fix(BOOK-412): Using internalCategoryName to map ancillaries and show translated categoryName only
...
Approved-by: Linus Flood
2025-10-10 09:10:51 +00:00
Joakim Jäderberg
8498026189
Merged in chore/refactor-hotel-trpc-routes (pull request #2891 )
...
Chore/refactor hotel trpc routes
* chore(SW-3519): refactor trpc hotel routers
* chore(SW-3519): refactor trpc hotel routers
* refactor
* merge
* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/refactor-hotel-trpc-routes
Approved-by: Linus Flood
2025-10-01 12:55:45 +00:00
Bianca Widstam
34020dad78
Merged in fix/BOOK-136-ancillary-image-without-metadata (pull request #2841 )
...
fix(BOOK-136): ancillary image validation without metadata
* fix(BOOK-136): ancillary image validation without metadata
* fix(BOOK-136): ancillary image
Approved-by: Erik Tiekstra
2025-09-22 12:17:12 +00:00
Erik Tiekstra
ce71fc421c
fix: Trimming hotel ids from contentstack to avoid 404 errors when fetching hotel data
...
Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-09-12 09:18:50 +00:00
Joakim Jäderberg
7dee6d5083
Merged in chore/move-enter-details (pull request #2778 )
...
Chore/move enter details
Approved-by: Anton Gunnarsson
2025-09-11 07:16:24 +00:00
Erik Tiekstra
f04fe467da
feat(SW-3151): Added original to imageSchema and added transform to a more generic image type
...
Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-09-10 08:29:05 +00:00
Matilda Landström
8f813eb9e7
Merged in feat/SW-3163-remove-openinghours-name (pull request #2735 )
...
feat(SW-3163): update opening hours schema name/nameEnglish
* feat(SW-3163): remove name
* fix(SW-3163): update schemas
Approved-by: Erik Tiekstra
2025-09-04 14:18:57 +00:00
Anton Gunnarsson
f7ef58eafa
Merged in feat/sw-2874-move-select-rate (pull request #2750 )
...
Approved-by: Joakim Jäderberg
2025-09-03 08:30:05 +00:00
Anton Gunnarsson
87402a2092
Merged in feat/sw-2873-move-selecthotel-to-booking-flow (pull request #2727 )
...
feat(SW-2873): Move select-hotel to booking flow
* crude setup of select-hotel in partner-sas
* wip
* Fix linting
* restructure tracking files
* Remove dependency on trpc in tracking hooks
* Move pageview tracking to common
* Fix some lint and import issues
* Add AlternativeHotelsPage
* Add SelectHotelMapPage
* Add AlternativeHotelsMapPage
* remove next dependency in tracking store
* Remove dependency on react in tracking hooks
* move isSameBooking to booking-flow
* Inject searchParamsComparator into tracking store
* Move useTrackHardNavigation to common
* Move useTrackSoftNavigation to common
* Add TrackingSDK to partner-sas
* call serverclient in layout
* Remove unused css
* Update types
* Move HotelPin type
* Fix todos
* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow
* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow
* Fix component
Approved-by: Joakim Jäderberg
2025-09-01 08:37:00 +00:00
Erik Tiekstra
19063da08a
feat(SW-3040): Sorting hotel listing when all hotels from a city/country are chosen
...
Approved-by: Matilda Landström
2025-09-01 07:52:53 +00:00
Erik Tiekstra
92cb3f3663
fix(SW-3307): Filtered out duplicate facilities from hotel response
...
Approved-by: Matilda Landström
2025-08-29 13:00:25 +00:00
Erik Tiekstra
2e655619d1
feat(SW-3121): Added support for campaign text inside the hero of campaign pages
...
* fix: making sure the cacheKey for getHotelsByHotelIds is not sorting the original array
Approved-by: Matilda Landström
2025-08-28 13:46:48 +00:00
Anton Gunnarsson
c53e6ef187
Merged in chore/move-use-scroll-to-top (pull request #2705 )
...
chore: Move useScrollToTop to common package
* Move useScrollToTop to common package
Approved-by: Joakim Jäderberg
2025-08-26 11:48:54 +00:00
Hrishikesh Vaipurkar
44fce176e9
Merged in chore/SW-3246-move-alert-to-design-system (pull request #2698 )
...
chore(SW-3246): Moved Alert component into design system
* chore(SW-3246): Moved Alert component into design system
* chore(SW-3246): Optimsed code and imports
* chore(SW-3246): Moved type AlertTypeEnum and other to common package
Approved-by: Anton Gunnarsson
2025-08-26 11:22:38 +00:00
Matilda Landström
4c9605ef3f
Merged in fix/SW-2528 (pull request #2688 )
...
fix(SW-2528): get correct restaurant type
* fix(SW-2528): get correct type
Approved-by: Erik Tiekstra
2025-08-26 06:38:40 +00:00
Erik Tiekstra
8180271b0f
fix(SW-3203): Added property id to pointOfInterestSchema to handle identical names
...
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-08-26 05:58:25 +00:00
Joakim Jäderberg
c54c1ec540
Merged in SW-3270-move-interactive-map-to-design-system-or-booking-flow (pull request #2681 )
...
SW-3270 move interactive map to design system or booking flow
* wip
* wip
* merge
* wip
* add support for locales in design-system
* add story for HotelCard
* setup alias
* .
* remove tracking from design-system for hotelcard
* pass isUserLoggedIn
* export design-system-new-deprecated.css from design-system
* Add HotelMarkerByType to Storybook
* Add interactive map to Storybook
* fix reactintl in vitest
* rename env variables
* .
* fix background colors
* add storybook stories for <Link />
* merge
* fix tracking for when clicking 'See rooms' in InteractiveMap
* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3270-move-interactive-map-to-design-system-or-booking-flow
* remove deprecated comment
Approved-by: Anton Gunnarsson
2025-08-25 11:26:16 +00:00
Matilda Landström
7891ae3ae6
Merged in feat/SW-3232-site-config-alerts (pull request #2671 )
...
feat(SW-3232): update alert schema
* feat(SW-3232): update alert schema
Approved-by: Erik Tiekstra
2025-08-20 09:18:00 +00:00
Matilda Landström
789818eefd
Merged in feat/SW-3127-meeting-room-sort-order (pull request #2634 )
...
feat(SW-3127): use new sort order attribute
* feat(SW-3127): use new sort order attribute
Approved-by: Erik Tiekstra
2025-08-20 08:46:16 +00:00
Joakim Jäderberg
68cd061c6d
Merged in feature/select-rate-vertical-data-flow (pull request #2535 )
...
Feature/select rate vertical data flow
* add fix from SW-2666
* use translations for room packages
* move types to it's own file
* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow
* merge
* feature/select-rate: double rate for campaing rates
* revert NODE_ENV check in Cookiebot script
* revert testing values
* fix(SW-3171): fix all filter selected in price details
* fix(SW-3166): multiroom anchoring when changing filter
* fix(SW-3172): check hotelType, show correct breakfast message
* Merge branch 'feature/select-rate-vertical-data-flow' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow
* fix: show special needs icons for subsequent roomTypes SW-3167
* fix: Display strike through text when logged in SW-3168
* fix: Reinstate the scrollToView behaviour when selecting a rate SW-3169
* merge
* .
* PR fixes
* fix: don't return notFound()
* .
* always include defaults for room packages
* merge
* merge
* merge
* Remove floating h1 for new select-rate
Approved-by: Anton Gunnarsson
2025-08-13 12:45:40 +00:00
Matilda Landström
37c311d826
Merged in feat/SW-2528-restaurant-icons-sidepeek (pull request #2610 )
...
feat(SW-2528): add restaurant type icon to sidepeek
* feat(SW-2528): add restaurant type icon to sidepeek
Approved-by: Anton Gunnarsson
2025-08-11 11:45:20 +00:00
Hrishikesh Vaipurkar
271d5ec32c
Merged in fix/SW-3199-prod-users-are-displayed-with- (pull request #2592 )
...
fix(SW-3199): Fixed redemption search for alternative hotels
* fix(SW-3199): Fixed redemption search for alternative hotels
* fix(SW-3199): User points validation included
Approved-by: Anton Gunnarsson
2025-08-07 07:29:32 +00:00
Hrishikesh Vaipurkar
33c274bce1
Merged in fix/SW-2926-hotel-special-alerts- (pull request #2580 )
...
fix(SW-2926): Display alerts in booking flow if date range matches search dates and in hotel page if current date is in date range
* fix(SW-2926): Display alerts in booking flow if date range matches search dates and in hotel page if current date is in date range
* fix(SW-2926) Updated hotel alerts with respect to booking dates
* fix(SW-2926): Optimized code
Approved-by: Matilda Landström
2025-08-01 08:26:32 +00:00
Matilda Landström
9679212864
Merged in feat/SW-1956-add-English-caption-fallback (pull request #2574 )
...
Feat/SW-1956 add English caption fallback
* feat(SW-1956): add English fallback to gallery caption
* feat(SW-1956): add English fallback to gallery caption
Approved-by: Anton Gunnarsson
2025-07-29 06:12:57 +00:00
Matilda Landström
19b58be654
Merged in feat/SW-1468 (pull request #2529 )
...
feat(SW-1468): add restaurant name mapping
* feat(SW-1468): add restaurant name mapping
Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
2025-07-08 12:20:18 +00:00
Erik Tiekstra
fa7214cb58
Feat/SW-2271 hotel list filtering
...
* feat(SW-2271): Changes to hotel data types in preperation for filtering
* feat(SW-2271): Added filter and sort functionality
Approved-by: Matilda Landström
2025-07-04 09:27:20 +00:00
Joakim Jäderberg
daf765f3d5
Merged in feature/wrap-logging (pull request #2511 )
...
Feature/wrap logging
* feat: change all logging to go through our own logger function so that we can control log levels
* move packages/trpc to using our own logger
* merge
Approved-by: Linus Flood
2025-07-03 12:37:04 +00:00
Anton Gunnarsson
4e1cb01b84
Merged in chore/cleanup-after-trpc-migration (pull request #2457 )
...
Chore/cleanup after trpc migration
* Clean up TODOs
* Rename REDEMPTION constant to SEARCH_TYPE_REDEMPTION
* Update dependencies
Remove unused deps from scandic-web
Add missing deps to trpc package
* Update self-referencing imports
* Remove unused variables from scandic-web env
* Fix missing graphql-tag package
* Actually fix
* Remove unused env var
Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-06-30 12:08:19 +00:00
Anton Gunnarsson
e572d9e7e9
Merged in feat/sw-2862-move-booking-router-to-trpc-package (pull request #2421 )
...
feat(SW-2861): Move booking router to trpc package
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Move partners router to trpc package
* Move autocomplete router to trpc package
* Move booking router to trpc package
* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 13:21:16 +00:00
Anton Gunnarsson
5f8ac8cdeb
Merged in feat/sw-2861-move-autocomplete-router-to-trpc-package (pull request #2417 )
...
feat(SW-2861): Move autocomplete router to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Move partners router to trpc package
* Move autocomplete router to trpc package
* Merge branch 'master' into feat/sw-2861-move-autocomplete-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 12:40:45 +00:00
Anton Gunnarsson
f9c719ff4b
Merged in feat/sw-2866-move-partners-router-to-trpc-package (pull request #2414 )
...
feat(sw-2866): Move partners router to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Move partners router to trpc package
* Merge branch 'master' into feat/sw-2866-move-partners-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 09:44:13 +00:00
Anton Gunnarsson
bbcabfa0ba
Merged in feat/sw-2864-move-hotels-router-to-trpc-package (pull request #2410 )
...
feat (SW-2864): Move booking router to trpc package
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Merge branch 'master' into feat/sw-2864-move-hotels-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 09:02:59 +00:00
Anton Gunnarsson
002d093af4
Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389 )
...
feat(SW-2863): Move contentstack router to trpc package
* Add exports to packages and lint rule to prevent relative imports
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 07:53:01 +00:00
