Commit Graph

5681 Commits

Author SHA1 Message Date
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
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
Chuma Mcphoy (We Ahead)
ae3537e008 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
2025-11-07 11:21: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
28ae796b8c 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
2025-11-07 10:30:00 +00:00
Joakim Jäderberg
61af689853 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
2025-11-07 09:59:41 +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
Christel Westerberg
a9789a8a7c Merged in fix/STAY-38 (pull request #3097)
fix: handle text overflow on room title in My Stay reference card

* fix: handle text overflow on room title in My Stay reference card


Approved-by: Erik Tiekstra
2025-11-07 07:52:24 +00:00
Christel Westerberg
468ed74221 Merged in fix/STAY-70 (pull request #3098)
fix: make sure bookings with code can be changed

* fix: make sure bookings with code can be changed


Approved-by: Bianca Widstam
2025-11-07 07:28:09 +00:00
Christel Westerberg
6083eea5cc Merged in fix/STAY-65-manage-stay (pull request #3089)
Fix/STAY-65 manage stay

* fix: Disable manage stay for past bookings

* fix: handle past and cancelled stay the same

* fix: indentify past booking

* fix: refactor to use design system components


Approved-by: Erik Tiekstra
2025-11-07 06:43:13 +00:00
Erik Tiekstra
9a07dee05b feat(BOOK-64): Added themed Hero component on hotel pages
Approved-by: Chuma Mcphoy (We Ahead)
2025-11-07 06:32:15 +00:00
Christel Westerberg
57300e588e Merged in fix/STAY-97 (pull request #3092)
fix: Change copy of Total price in price summary ancillaries

* fix: Change copy of Total price in price summary ancillaries


Approved-by: Erik Tiekstra
2025-11-06 15:13:59 +00:00
Erik Tiekstra
11d53d0b15 fix(BOOK-506): Hiding campaign banner on more hotel-reservation routes and make whole banner clickable
Approved-by: Bianca Widstam
2025-11-06 14:48:13 +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
Joakim Jäderberg
07ef6d96d6 Merged in chore/remove-jsonsort-dictionaries (pull request #3084)
chore: No need to sort dictionary files anymore now that we have man-made IDs

* No need to sort dictionary files anymore now that we have man-made IDs


Approved-by: Erik Tiekstra
Approved-by: Linus Flood
2025-11-06 14:18:50 +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
Linus Flood
0a5d3ef7c3 Merged in fix/book-516 (pull request #3093)
feat(BOOK-516): check valid token

* feat(BOOK-516): check valid token


Approved-by: Joakim Jäderberg
2025-11-06 10:08:49 +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
Matilda Landström
ae5f99eab1 Merged in fix/LOY-454-shortcuts-border-radius (pull request #3085)
fix(LOY-454): add border-radius to last link item

* fix(LOY-454): add border-radius to last link item


Approved-by: Emma Zettervall
Approved-by: Chuma Mcphoy (We Ahead)
2025-11-05 14:38:36 +00:00
Linus Flood
ad85c5900b Merged in feat/lokalise-pull-051125 (pull request #3083)
feat(lokalise): downloaded latest translations

* feat(lokalise): downloaded latest translations


Approved-by: Joakim Jäderberg
2025-11-05 13:28:01 +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
6e91d538c2 feat(BOOK-509): Added correct hover styles on breadcrumbs
Approved-by: Bianca Widstam
2025-11-05 12:55:14 +00:00
Matilda Haneling
42c060966d Merged in fix/book-439-add-suffix-to-seo-metatitle (pull request #3078)
fix(BOOK-439): added suffix to SEO filter pages meta title

* fix(BOOK-439): added suffix to SEO filter pages meta title


Approved-by: Erik Tiekstra
2025-11-05 11:37:14 +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
Joakim Jäderberg
392db172c4 Merged in chore/remove-svgr/webpack (pull request #3071)
remove unused @svgr/webpack

* remove unused @svgr/webpack

* merge


Approved-by: Linus Flood
2025-11-05 09:31:09 +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
Erik Tiekstra
fa10abbe78 fix(BOOK-496): Slowed down the MarqueeText component animation
Approved-by: Matilda Landström
2025-11-04 10:29:20 +00:00
Joakim Jäderberg
59143b4023 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
2025-11-04 10:20:06 +00:00
Matilda Landström
0131b5f731 Merged in chore/cleanup-my-pages-overview (pull request #3049)
chore(LOY-447): remove flag and unused code on my pages overview

* chore: remove flag and unused code


Approved-by: Chuma Mcphoy (We Ahead)
2025-11-04 09:15:43 +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
Joakim Jäderberg
b8d887f82d Merged in chore/move-destinations-api-endpoint (pull request #3058)
chore: move /api/destinations/[country]/[?city] -> /api/web/destinations/[country]/[?city]

* chore: move /api/destinations/[country]/[?city] -> /api/web/destinations/[country]/[?city]
2025-11-03 13:33:45 +00: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