Commit Graph

5828 Commits

Author SHA1 Message Date
Hrishikesh Vaipurkar
f23652b929 Merged in feat/BOOK-434-users-should-redirect-to- (pull request #3154)
* feat(BOOK-434): Moved redirect to middleware layer
* feat(BOOK-434): Updated to handle no filters available scenario

Approved-by: Erik Tiekstra
2025-11-14 09:51:44 +00:00
Linus Flood
3d121be74a Merged in feat/book-570-select-rate-scroll (pull request #3160)
feat(BOOK-570): fix scroll issue when selecting a rate for the first time

* feat(BOOK-570): fix scroll issue when selecting a rate for the first time


Approved-by: Joakim Jäderberg
2025-11-14 09:51:29 +00:00
Anton Gunnarsson
289adfe98b Merged in fix/sw-3606-move-heart-icon-to-shared (pull request #3155)
fix(SW-3606): Move heart icon to shared

* Move heart icon to shared


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-11-14 08:32:45 +00:00
Linus Flood
966429313b Merged in feat/lokalise-sync-131125 (pull request #3157)
feat(lokalise): sync 13/11-25

* feat(lokalise): sync 13/11-25


Approved-by: Matilda Landström
2025-11-13 15:38:31 +00:00
Erik Tiekstra
b0f2276b0b fix(BOOK-559): Using same ContactInformation component on hotel pages and booking flow inside the hotel details sidepeek
Approved-by: Bianca Widstam
2025-11-13 14:32:17 +00:00
Bianca Widstam
f52d210240 Merged in fix/design-system-remove-preamble (pull request #3153)
remove deprecated preamble, replace with typography

* remove deprecated preamble, replace with typography


Approved-by: Linus Flood
2025-11-13 13:56:22 +00:00
Linus Flood
0a513fce9c Merged in feat/book-566-select-rate-design (pull request #3156)
feat(BOOK-566): align rates if room title breaks on two rows

* feat(BOOK-566): align rates if room title breaks on two rows


Approved-by: Anton Gunnarsson
2025-11-13 13:53:36 +00:00
Anton Gunnarsson
6ed5dd1394 Merged in feat/add-config-flag-for-saved-credit-cards (pull request #3151)
feat(SW-3611): Add config flag for saved credit cards

* Add config flag for saved credit cards


Approved-by: Linus Flood
2025-11-13 13:20:05 +00:00
Chuma Mcphoy (We Ahead)
0b28893e71 Merged in feat/LOY-422-new-upcoming-stays (pull request #3121)
feat(LOY-422): Upcoming Stays Redesign

* feat(LOY-422): Upcoming Stays Redesign

* feat(LOY-422): Carousel next/previous arrows

* chore(LOY-422): add new material icon

* refactor(LOY-422): restructure new and old upcoming stays

* fix(LOY-422): handle less than 1 case

* chore(LOY-422): remove uneeded id

* chore(LOY-422): remove intl label for date edge case


Approved-by: Matilda Landström
2025-11-13 13:05:24 +00:00
Bianca Widstam
66fd7696f7 Merged in fix/BOOK-562-update-disabled-color-fields (pull request #3150)
fix(BOOK-562): update disable color

* fix(BOOK-562): update disable color


Approved-by: Matilda Landström
2025-11-13 13:02:51 +00:00
Linus Flood
0830338734 Merged in feat/book-325-reconnect (pull request #3152)
feat(BOOK-325): refetch on re-connect

* feat(BOOK-325): refetch on re-connect


Approved-by: Anton Gunnarsson
2025-11-13 13:01:52 +00:00
Joakim Jäderberg
aca2c1d60c Merged in feature/simple-sas-book-url (pull request #3082)
feature(SAS): add simple url for entering the booking flow /[lang]/book-hotel/[city]

* Merged in fix/book-115-hidden-focus-indicators (pull request #2925)

Fix/book 115 hidden focus indicators

* added focus ring to "how it works" text and close button in modal

* fix(BOOK-115): added focus ring to Hotel Sidepeek close button

* fix(BOOK-115): enabled selecting ancillaries with keyboard nav

* fix(BOOK-115): added focus indicator to "View and print receipt" in Manage Stay

* fix(BOOK-105 & BOOK-115): combined the two radio groups in payment selection to one, fixes focus indicator issue

* fix(BOOK-115): added focus indicator to shortcut links

* fix(BOOK-115): updated ancillaries keyboard selection

* fix(BOOK-115): removed tabIndex from Link component

* fix(BOOK-115): fixed single payment radio button not focusable

* fix(BOOK-115): updated  to onKeyDown

* added id to "credit card"

* removed toUpperCase() on lables

* removed brackets

* moved the focus indicator to the DS Button component

* removed !important from ButtonLink css

* changed <label> to <fieldset> and <legend> and added aria…
* Merged in feat/sw-3596-console (pull request #3100)

feat(SW-3596): added lint rule for no console.log. Use logger instead.

* feat(SW-3596): added lint rule for no console.log. Use logger instead.


Approved-by: Joakim Jäderberg

* Merged in fix/BOOK-457-select-rate-lowestroomprice- (pull request #3061)

* Fix(BOOK-457): Reduced lowestRoomPrice tracking call from multiple times to one

* fix(BOOK-457): feat(SW-3590): Included RoomsLoadedEvent on select-rate page

Approved-by: Linus Flood

* Merged in feature/SW-3506-refresh-tokens (pull request #3064)

feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3506-refresh-tokens


Approved-by: Anton Gunnarsson

* Merged in feat/BOOK-434-users-should-redirect-to- (pull request #3087)

* feat(BOOK-434): Redirect user to city/country page if wrong filter url
* feat(BOOK-434): Handled map view

Approved-by: Erik Tiekstra

* Merged in fix/SW-3553-logged-in-details- (pull request #3073)

* fix(SW-3553): Fixed screen scolled & locked on click of menu

Approved-by: Joakim Jäderberg

* Merged in feat/book-522-align (pull request #3101)

feat(BOOK-522): align items in topmenu, header and booking widget

* feat(BOOK-522): align items in topmenu, header and booking widget

* Delete old css variable and use new

* Fixed underline on icons


Approved-by: Erik Tiekstra

* Merged in fix/LOY-444-points-to-keep-left-text (pull request #3086)

fix(LOY-444): fix markerLabel text when left aligned

* fix(LOY-444): fix markerLabel text when left aligned


Approved-by: Matilda Landström

* Merged in chore/replace-graphql-tag/loader (pull request #3096)

Use turbopack for dev builds.
Remove graphql-tag/loader, replaced by gql`` tag literals instead.



Approved-by: Linus Flood

* Merged in fix/system-fragment (pull request #3102)

fix: faulty system fragment

* fix: faulty system fragment


Approved-by: Linus Flood

* fix(BOOK-498): removed and changed z-index values to have booking widget overlapping correctly on mobile.

Approved-by: Bianca Widstam
Approved-by: Hrishikesh Vaipurkar

* Merged in revert-gql (pull request #3104)

Revert gql

* Revert "Merged in fix/system-fragment (pull request #3102)"

This reverts commit 0d479eb337.

* Revert "Merged in chore/replace-graphql-tag/loader (pull request #3096)"

This reverts commit e9bd159e98.

* Merged in fix/BOOK-438-breadcrumbs-seo-filter (pull request #3103)

feat(BOOK-438): add breadcrumbs on seofilter pages

* feat(BOOK-438): add breadcrumbs on seofilter pages

* feat(BOOK-438): remove unused function


Approved-by: Hrishikesh Vaipurkar

* Merged in chore/regular-price-tests (pull request #3075)

chore: Add tests for regular price calculations

* Add tests for calculateRegularPrice

* Add tests for getRegularPrice

* Add multiroom test


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood

* Merged in fix/wrap-webviews-with-sessionprovider (pull request #3111)

Wrap webviews with SessionProvider

* wrap webviews with sessionprovider


Approved-by: Linus Flood

* feat(BOOK-488): Trimming booking code before validating

Approved-by: Bianca Widstam

* feat(BOOK-472): Different placement of no availability alert on mobile viewports

Approved-by: Bianca Widstam

* Merged in feat/sw-3601-hookfix (pull request #3113)

Feat(SW-3601): useIsUserLoggedIn needs to check webview token 

* fix(SW-3601): useIsUserLoggedIn needs to check webview token

* Check if we have webview token as well

* .


Approved-by: Joakim Jäderberg

* Merged in fix/add-missing-partner-data (pull request #3116)

fix: Add param to getScandicUser for extended data

* Add param to getScandicUser for extended data


Approved-by: Linus Flood

* Merged in feat/sw-3596-cache (pull request #3106)

feat(SW-3598): Don't call redis api if cachetime=0

* feat(SW-3596): no cache if ttl=0

* Fixed on set as well

* No cache if redemption

* Revert no cache if redemption


Approved-by: Joakim Jäderberg

* feat(BOOK-212): Refactored LoginButton and added successful tracking functionality

Approved-by: Linus Flood

* Merged in fix/document-undefined (pull request #3118)

Fix/document undefined

* fix: check if document is undefined

* fix: check if document is undefined


Approved-by: Linus Flood

* Merged in feat/sw-3604-webviews (pull request #3123)

feat(SW-3604): wrap mystay with bookingflowconfig

* feat(SW-3604): wrap mystay with bookingflowconfig


Approved-by: Joakim Jäderberg

* Merged in feature/turbopack (pull request #3117)

Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/simple-sas-book-url
2025-11-13 13:01:26 +00:00
Erik Tiekstra
5eca2e5d20 feat(BOOK-433): Added heading to SeoFilters block on destination pages
Approved-by: Bianca Widstam
2025-11-13 12:39:19 +00:00
Bianca Widstam
c1cae0db40 Merged in fix/height-input-select-fields (pull request #3146)
fix height value for input and select fields

* fix height value for input and select fields


Approved-by: Joakim Jäderberg
2025-11-13 10:26:58 +00:00
Joakim Jäderberg
f6b06556f6 Merged in chore/typegen-nextjs-routes (pull request #3147)
Make check-types dependent on next typegen

* add typegen as a prestep


Approved-by: Anton Gunnarsson
2025-11-13 09:28:07 +00:00
Erik Tiekstra
3d628a3757 fix(BOOK-325): Fixed issue where padding was removed inside the mega menu
Approved-by: Bianca Widstam
2025-11-13 08:59:55 +00:00
Linus Flood
4b3dbadf24 Merged in feat/sw-3610-basicProfile (pull request #3144)
Feat(SW-3610): basic profile endpoint on protected layouts

* Basic profile in protected layouts

* .


Approved-by: Anton Gunnarsson
2025-11-13 07:35:16 +00:00
Joakim Jäderberg
dc53ab9245 Merged in chore/upgrade-next (pull request #3124)
Upgrade next@15.5.6

* chore: upgrade next@15.5.6

* chore: upgrade turborepo@2.6.1

* fix typings for scandic-web

* fix: set correct type for pages

* cleanup

* fix more route.ts typing issues

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next

* explicitly import the types


Approved-by: Linus Flood
2025-11-13 07:33:56 +00:00
Erik Tiekstra
ce469bc4b4 Feat/BOOK-117 svg accessibility
* feat(BOOK-117): Added aria-label to Scandic Friends levels
* feat(BOOK-117): Added aria-label to hotel logos
* feat(BOOK-117): Added alt text to app download images
* feat(BOOK-117): Added same logo component to footer as the one in the header
* feat(BOOK-117): Added aria attributes to icons similar to how we handled MaterialIcon aria attributes

Approved-by: Bianca Widstam
Approved-by: Matilda Landström
2025-11-13 06:34:18 +00:00
Erik Tiekstra
c4b564998c fix(BOOK-325): Added refetch options to user.name query and refactored header
Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-11-13 06:33:47 +00:00
Linus Flood
3a45e6cfe3 Merged in feat/cleanup-logs (pull request #3141)
feat(logs): cleanup of token expired logs

* feat(logs): cleanup of token expired logs


Approved-by: Matilda Landström
2025-11-12 14:52:56 +00:00
Bianca Widstam
f04fc46ba0 Merged in fix/BOOK-485-campaign (pull request #3140)
fix/BOOK-485-campaign-rate-select-rate

* fix/BOOK-485-campaign-rate-select-rate


Approved-by: Linus Flood
2025-11-12 14:33:32 +00:00
Linus Flood
2b2894749d Merged in feat/sw-3551-robots (pull request #3139)
feat(SW-3551): added a robots.txt file

* feat(SW-3551): added a robots.txt file

* Added to sas page as well


Approved-by: Bianca Widstam
2025-11-12 14:18:21 +00:00
Linus Flood
19495eed28 Merged in feat/basic-user (pull request #3135)
feat(SW-3610): Get basic user from api

* feat(SW-3610): Get basic user from api

* .

* Optional profileid


Approved-by: Anton Gunnarsson
2025-11-12 14:00:56 +00:00
Erik Tiekstra
88644597df chore: Replaced deprecated Spacing variables with current values
Approved-by: Matilda Landström
2025-11-12 12:56:22 +00:00
Christel Westerberg
8dce04b931 Merged in fix/STAY-22-GLA-check (pull request #3134)
fix: Let API handle logic for if a booking is guaranteeable or not

* fix: Let API handle logic for if a booking is guaranteeable or not


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
2025-11-12 12:40:23 +00:00
Joakim Jäderberg
593cb04a5a Merged in fix/SW-3608-make-user-properties-optional (pull request #3133)
fix(SW-3608): make user properties, that are based on audience, optional

* fix(SW-3608): make user properties, that are based on audience, optional

* fix(SW-3608): make user properties, that are based on audience, optional

* .


Approved-by: Anton Gunnarsson
2025-11-12 12:20:47 +00:00
Linus Flood
f8577dd09a Merged in fix/env-cleanup (pull request #3132)
fix(env): remove SHOW_SITEWIDE_ALERT and USE_NEW_REWARD_MODEL

* fix(env): remove SHOW_SITEWIDE_ALERT and USE_NEW_REWARD_MODEL


Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-11-12 09:04:59 +00:00
Anton Gunnarsson
9fbbd3a91b Merged in chore/add-tests-for-getCorporateChequePrice (pull request #3114)
chore: Add tests for getCorporateChequePrice

* Add tests for getRequestedAdditionalPrice

* simplify types

* Add tests for getCorporateChequePrice


Approved-by: Joakim Jäderberg
2025-11-12 08:33:14 +00:00
Christel Westerberg
c3b71a05d9 Merged in fix/STAY-2-GLA-cancelled (pull request #3109)
Fix/STAY-2 GLA cancelled

* fix: show toast on cancelling GLA flow

* fix: show the ancillary GLA errors as inline alerts


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
2025-11-12 08:29:05 +00:00
Bianca Widstam
2c044de187 Merged in feat/BOOK-485-campaign-rate-my-stay (pull request #3120)
feat(BOOK-485): add campaign tag on my stay and update design

* feat(BOOK-485): add campaign tag on my stay and update design

* feat(BOOK-485): update rightAligned


Approved-by: Erik Tiekstra
2025-11-12 08:19:24 +00:00
Linus Flood
c8cc4138b5 Merged in feat/env-cleanup (pull request #3076)
feat(SW-3594): webviews - remove unused "Back to overview" link

* feat(SW-3594): remove unused component


Approved-by: Bianca Widstam
2025-11-12 07:53:44 +00:00
Erik Tiekstra
a96497f7c9 feat(BOOK-512): Added default heading from CS to destination pages
Approved-by: Bianca Widstam
2025-11-12 07:06:14 +00:00
Anton Gunnarsson
94ac475d5e Merged in fix/update-build-ignore-script (pull request #3129)
fix: Add missing package to ignore script

* Add missing package to ignore script
2025-11-11 14:58:09 +00:00
Linus Flood
78ac93d836 Merged in feat/book-530-selectrate-tracking (pull request #3128)
feat(BOOK-530): fixed noAvailableRooms tracking on select rate page

* feat(BOOK-530): fixed noAvailableRooms tracking on select rate page


Approved-by: Bianca Widstam
2025-11-11 14:17:02 +00:00
Bianca Widstam
9175331e4d Merged in fix/BOOK-499-striketrough-price-total (pull request #3122)
fix(BOOK-499): fix total price strikethrough rate

* fix(BOOK-499): fix total price strikethrough rate


Approved-by: Erik Tiekstra
2025-11-11 14:05:25 +00:00
Joakim Jäderberg
de9b5d7686 Merged in fix/social-login-scopes (pull request #3126)
Set profile_read scope for social login

* set profile_read scope


Approved-by: Anton Gunnarsson
2025-11-11 12:35:27 +00:00
Joakim Jäderberg
bc5a606289 Merged in feature/turbopack (pull request #3117)
Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood
2025-11-11 09:51:40 +00:00
Linus Flood
ecb25cf6cd Merged in feat/sw-3604-webviews (pull request #3123)
feat(SW-3604): wrap mystay with bookingflowconfig

* feat(SW-3604): wrap mystay with bookingflowconfig


Approved-by: Joakim Jäderberg
2025-11-11 09:37:54 +00:00
Joakim Jäderberg
0490badbb1 Merged in fix/document-undefined (pull request #3118)
Fix/document undefined

* fix: check if document is undefined

* fix: check if document is undefined


Approved-by: Linus Flood
2025-11-11 07:21:29 +00:00
Erik Tiekstra
c93e2b6f0b feat(BOOK-212): Refactored LoginButton and added successful tracking functionality
Approved-by: Linus Flood
2025-11-11 06:57:49 +00:00
Linus Flood
1b35618eb2 Merged in feat/sw-3596-cache (pull request #3106)
feat(SW-3598): Don't call redis api if cachetime=0

* feat(SW-3596): no cache if ttl=0

* Fixed on set as well

* No cache if redemption

* Revert no cache if redemption


Approved-by: Joakim Jäderberg
2025-11-11 06:52:47 +00:00
Anton Gunnarsson
0b569e28ce Merged in fix/add-missing-partner-data (pull request #3116)
fix: Add param to getScandicUser for extended data

* Add param to getScandicUser for extended data


Approved-by: Linus Flood
2025-11-10 15:23:07 +00:00
Linus Flood
ce3412b29f Merged in feat/sw-3601-hookfix (pull request #3113)
Feat(SW-3601): useIsUserLoggedIn needs to check webview token 

* fix(SW-3601): useIsUserLoggedIn needs to check webview token

* Check if we have webview token as well

* .


Approved-by: Joakim Jäderberg
2025-11-10 13:06:51 +00:00
Erik Tiekstra
69f852a2d3 feat(BOOK-472): Different placement of no availability alert on mobile viewports
Approved-by: Bianca Widstam
2025-11-10 12:38:42 +00:00
Erik Tiekstra
89262ffb82 feat(BOOK-488): Trimming booking code before validating
Approved-by: Bianca Widstam
2025-11-10 12:38:25 +00:00
Joakim Jäderberg
0e2ed17e3b Merged in fix/wrap-webviews-with-sessionprovider (pull request #3111)
Wrap webviews with SessionProvider

* wrap webviews with sessionprovider


Approved-by: Linus Flood
2025-11-10 12:23:36 +00:00
Anton Gunnarsson
ba58ae6245 Merged in chore/regular-price-tests (pull request #3075)
chore: Add tests for regular price calculations

* Add tests for calculateRegularPrice

* Add tests for getRegularPrice

* Add multiroom test


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-11-10 08:04:52 +00:00
Bianca Widstam
e08d24cc75 Merged in fix/BOOK-438-breadcrumbs-seo-filter (pull request #3103)
feat(BOOK-438): add breadcrumbs on seofilter pages

* feat(BOOK-438): add breadcrumbs on seofilter pages

* feat(BOOK-438): remove unused function


Approved-by: Hrishikesh Vaipurkar
2025-11-07 13:58:09 +00:00
Linus Flood
5770dcdd9c Merged in revert-gql (pull request #3104)
Revert gql

* Revert "Merged in fix/system-fragment (pull request #3102)"

This reverts commit 0d479eb337.

* Revert "Merged in chore/replace-graphql-tag/loader (pull request #3096)"

This reverts commit e9bd159e98.
2025-11-07 13:13:28 +00:00