Commit Graph

505 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Erik Tiekstra
cab85f3ffd 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
2025-11-07 13:03:25 +00:00
Joakim Jäderberg
0d479eb337 Merged in fix/system-fragment (pull request #3102)
fix: faulty system fragment

* fix: faulty system fragment


Approved-by: Linus Flood
2025-11-07 12:45:36 +00:00
Joakim Jäderberg
e9bd159e98 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
2025-11-07 12:33:17 +00:00
Linus Flood
7fb95f436b 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
2025-11-07 11:06:56 +00:00
Hrishikesh Vaipurkar
fd92afc015 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
2025-11-07 10:30:45 +00:00
Hrishikesh Vaipurkar
d91d6abd6d 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
2025-11-07 08:32:37 +00:00
Linus Flood
1a24eb68c7 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
2025-11-07 08:14:16 +00:00
Matilda Haneling
2d237b8d14 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-label to PaymentOptionGroup

* removed css class from sidepeek that was previously removed

* reverted changes and synced Guarantee radiogroup with Payment radiogroup to use same semantics

* removed duplicate label

* removed old sub heading


Approved-by: Erik Tiekstra
2025-11-07 07:58:14 +00:00
Linus Flood
fdf124bd0c Merged in feat/book-504-at-pageview (pull request #3099)
Feat(BOOK-504): basic pageview event

* fix

* Cleanup


Approved-by: Joakim Jäderberg
2025-11-07 07:57:19 +00:00
Erik Tiekstra
78ac3b29c3 fix(BOOK-471): Only setting hover state on devices supporting hover inside Button and IconButton components
Approved-by: Bianca Widstam
2025-11-06 14:33:55 +00:00
Christel Westerberg
20bf89d206 Merged in fix/STAY-72-resend-booking-confirmation (pull request #3067)
feat(STAY-72): add resend confirmation button and endpoint

* feat(STAY-72): add resend confirmation button and endpoint

* fix: replace modify buttons with design system button


Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Erik Tiekstra
2025-11-06 13:40:15 +00:00
Joakim Jäderberg
ec511e2c8b Merged in feature/tsgo (pull request #3069)
Use tsgo for typechecking

* switch to tsgo for type-checking

* Merged in chore/remove-cypress (pull request #3066)

chore: remove unused dependencies

* chore: remove cypress

* remove unused deps

* update yarn.lock after removing unused deps


Approved-by: Anton Gunnarsson

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

* fix(BOOK-496): Slowed down the MarqueeText component animation

Approved-by: Matilda Landström

* switch to tsgo for type-checking

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

* Merge branch 'feature/tsgo' of bitbucket.org:scandic-swap/web into feature/tsgo

* switch to use yarn check-types in lint-staged

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/tsgo


Approved-by: Linus Flood
2025-11-06 12:34:23 +00:00
Bianca Widstam
873174dcc3 Merged in feat/BOOK-119-accessibility-replace-radiogroup (pull request #3081)
feat(BOOK-119): replace radio group on select rate with buttons and make them accessible

* feat(BOOK-119): replace radio group on select rate with buttons and make them accessible

* feat(BOOK-119): update roomNR

* feat(BOOK-119): update onpress and buttonOverlay name change


Approved-by: Erik Tiekstra
2025-11-06 11:46:59 +00:00
Matilda Haneling
f502621576 Merged in fix/book-425-update-tokens (pull request #3063)
fix(BOOK-425): updated to the new color tokens (again)

* fix(BOOK-425): updated to the new color tokens (again)


Approved-by: Erik Tiekstra
2025-11-06 09:54:57 +00:00
Joakim Jäderberg
645a99a844 Merged in feature/LOY-415-sj-widget (pull request #3074)
feat(LOY-415): Add SJ widget

* feat(LOY-415): Add SJ widget
can be added as dynamic content to Content Pages

* feat(LOY-415): init SJ widget with a useEffect instead due to onLoad only being called the first time

* make sure to only initialize the SJ widget once and handle navigation


Approved-by: Erik Tiekstra
2025-11-05 13:05:15 +00:00
Erik Tiekstra
0e11a772f1 feat(BOOK-450): Adjust Scandic logo in header when on a themed hotel page
Approved-by: Chuma Mcphoy (We Ahead)
2025-11-05 10:29:24 +00:00
Chuma Mcphoy (We Ahead)
94f6af563d Merged in feat/LOY-421-Next-Stay (pull request #3026)
Feat(LOY-421): Next Stay

* feat(LOY-421): Next stay WIP

* fix(LOY-421): clean upp css and jsx

* chore(LOY-421): css cleanup

* fix(LOY-421): fix test

* only show button if isWebAppOrigin is true

* chore(LOY-421): update section header component

* chore(LOY-421): remove redundant test case


Approved-by: Matilda Landström
2025-11-05 09:09:57 +00:00
Erik Tiekstra
3a38e99a71 Feat/BOOK-63 hotel subpages branding
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on subpages
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on hotel page map view

Approved-by: Christel Westerberg
Approved-by: Matilda Landström
2025-11-05 08:30:55 +00:00
Anton Gunnarsson
7fc49428c7 Merged in chore/price-calculation-tests (pull request #3072)
chore: Add more price calculation tests

* Add tests and refactor types for getVoucherPrice

* Add tests for sumPackagesRequestedPrice

* Add tests for calculateVat


Approved-by: Joakim Jäderberg
2025-11-04 12:50:51 +00:00
Anton Gunnarsson
dc42a22513 Merged in chore/add-tests-to-getAdditionalPrice (pull request #3065)
chore: Refactor types and add tests to parts of price calcuations

* Add tests to sumPackages

* Refactor types and add tests to getAdditionalPrice

* Don't always generate coverage

* Add tests and refactor types of getRedemptionPrice


Approved-by: Joakim Jäderberg
2025-11-04 12:09:04 +00:00
Matilda Landström
4970dfa2ed Merged in fix/LOY-439-boosted-by-sas-bug (pull request #3047)
fix(LOY-439): fix "boosted by sas" issue

* fix(LOY-439): fix "boosted by sas" issue


Approved-by: Chuma Mcphoy (We Ahead)
2025-11-04 09:09:30 +00:00
Anton Gunnarsson
20d1ba305a Merged in chore/remove-unused-css-variables (pull request #3059)
chore: Remove unused css variables from deprecated theme

* Remove unused variables


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-11-04 08:19:47 +00:00
Linus Flood
ffb88cf454 Merged in fix/sw-3591-pageview (pull request #3062)
Fix(SW-3591): fixed (?) race condition when tracking pageview on hard reload

* Added logging

* Fix


Approved-by: Hrishikesh Vaipurkar
2025-11-04 08:13:35 +00:00
Erik Tiekstra
4491d1de8e feat(BOOK-62): Added new InfoCard component and using that on hotel pages
Approved-by: Bianca Widstam
2025-11-04 07:39:33 +00:00
Erik Tiekstra
10bf4d08d9 chore: generated design system css variables from updated json file
Approved-by: Matilda Landström
2025-11-04 07:20:34 +00:00
Christel Westerberg
a2e0f7244a fix: Hide opt-out option for ancillary email 2025-11-03 16:05:54 +01:00
Anton Gunnarsson
83822fbc76 Merged in fix/sw-3581-incorrect-price-colors (pull request #3057)
feat(SW-3581): Set price colors to scandic red

* Set price colors to scandic red

* Remove comment


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg
2025-11-03 13:14:57 +00:00
Hrishikesh Vaipurkar
1c7f72e95d Merged in fix/SW-3578-user-is-forced-to-login- (pull request #3044)
fix(SW-3578): Fixed session issue when sas session expires

* fix(SW-3578): Fixed session issue when sas session expires

* base socialLogin auto-features on validSession and being linked

* remove unused object

* remove 'import server-only' for isValidSession() since it's only using passed data

* remove isValidClientSession()


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
2025-11-03 12:50:25 +00:00
Joakim Jäderberg
15a2da333d Merged in feature/SW-3572-hotel-data-endpoint (pull request #3051)
SW-3572 API route for listing hotels per city or country

* wip hotel data endpoint

* Correct route params type

* wip

* skip static paths call

* timeout when getting destinations take too long

* call noStore when we get a timeout

* add cache-control headers

* .

* .

* .

* wip

* wip

* wip

* wip

* add route for getting hotels per country

* include city when listing by country

* fix distance SI unit

* fix sorting

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3572-hotel-data-endpoint

* packages/tracking passWithNoTests

* revalidate must be static value

* remove oxc reference

* cleanup

* cleanup hotel api route

* feat(SW-3572): cleanup error handling


Approved-by: Anton Gunnarsson
2025-11-03 12:10:22 +00:00
Matilda Haneling
c3a82598af Merged in fix/book-425-color-fix (pull request #3056)
Fix/book 425 color fix

* fix(BOOK-425): fixed color on campaign banner and pprice alignment issue

* fix(BOOK-425): fixed release branch colors on booking code chip

* removed new css class which wasn't needed


Approved-by: Joakim Jäderberg
2025-11-03 08:56:34 +00:00
Anton Gunnarsson
1eb70766b4 Merged in feat/sw-3580-redemption-feature-flag (pull request #3045)
feat(SW-3580): Add feature toggle enableRedemption to BookingFlowConfig

* Add feature toggle enableRedemption to BookingFlowConfig

* Update error message


Approved-by: Joakim Jäderberg
2025-11-03 07:57:39 +00:00
Anton Gunnarsson
b2398dba4a Merged in feat/sw-3587-add-partner-copy-for-member-price (pull request #3053)
feat(SW-3587): Add new member price copy to partner variants

* Add new member price copy to partner variants


Approved-by: Joakim Jäderberg
2025-11-03 07:57:23 +00:00