Commit Graph

782 Commits

Author SHA1 Message Date
Joakim Jäderberg
873183ec2f * move setLang() to a root layout
* fix: findLang only returns acceptable languages
* fix: fallback to use header x-lang if we haven't setLang yet
* fix: languageSchema, allow uppercase

Approved-by: Linus Flood
2025-02-19 09:06:37 +00:00
Linus Flood
7c0f9084b6 Merged in feat/refactor-header-footer-sitewidealert (pull request #1374)
Refactor: removed parallel routes for header, footer and sidewidealert. Langswitcher and sidewidealert now client components

* feat - removed parallel routes and made sidepeek and sitewidealerts as client components

* Langswitcher as client component

* Fixed lang switcher for current header

* Passing lang when fetching siteconfig

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Refactor

* Removed dead code

* Show only languages that has translation

* Refetch sitewidealert every 60 seconds

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Removed sidepeek parallel route from my-stay

* Added missing env.var to env.test

* Removed console.log


Approved-by: Joakim Jäderberg
2025-02-19 08:59:24 +00:00
Erik Tiekstra
2781a41110 Merged in feat/SW-1443-card-gallery-destination-overview (pull request #1362)
feat(SW-1443): added cardGallery block to destination overview page instead of carousel functionality

* feat(SW-1443): added cardGallery block to destination overview page instead of carousel functionality


Approved-by: Fredrik Thorsson
2025-02-18 14:42:36 +00:00
Pontus Dreij
90fee1b0c4 Merged in fix/get-booking-as-user (pull request #1366)
Fix: Use session.token.access_token if session exists in booking confirmation, else use serviceToken

* Fix: Added service token to safeProtectedProcedure

* fix: use of safeProtectedServiceProcedure


Approved-by: Michael Zetterberg
2025-02-18 11:42:18 +00:00
Matilda Landström
102381fdeb Merged in fix/facilities-zod-validation (pull request #1365)
Fix: Facilities zod validation

* fix: zod validation


Approved-by: Pontus Dreij
Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-18 09:36:27 +00:00
Christian Andolf
a192d32f7e feat(LOY-135): change redeem description to be RTE 2025-02-17 15:05:32 +01:00
Anton Gunnarsson
9b61417264 Merged in fix/sw-1664-sas-link-otp-error-handling (pull request #1354)
Update SAS OTP error handling

Approved-by: Joakim Jäderberg
2025-02-17 11:40:00 +00:00
Fredrik Thorsson
22111eb7d2 Merged in feat/SW-1418-destination-page-map-data (pull request #1347)
feat/SW-1418 destination page map data

* feat(SW-1418): implement dynamic map on overview page

* feat(SW-1418): update folder structure

* feat(SW-1418): use getHotelsByHotelIds


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-02-17 08:59:50 +00:00
Joakim Jäderberg
2791f07f67 Merged in fix/mypages-clientside-menu (pull request #1344)
Fix/mypages clientside menu

* feat: move mypages menu to client side

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu

* wip

* wip

* wip

* refactor: reorganize MyPages navigation logic and improve type definitions

* refactor: enhance MyPagesMobileDropdown with loading states and skeletons

* refactor: clean up header component and improve myPagesNavigation query structure

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu


Approved-by: Linus Flood
2025-02-17 07:47:33 +00:00
Simon.Emanuelsson
248473e8bf Merged in chore/refactor-booking-flow (pull request #1333)
chore: cleaning up select-rate

Approved-by: Arvid Norlin
Approved-by: Linus Flood
2025-02-14 13:51:37 +00:00
Simon Emanuelsson
051bc54e6c chore: cleaning up select-rate 2025-02-14 14:20:54 +01:00
Chuma Mcphoy (We Ahead)
b2add701e5 Merged in fix/LOY-143-hide-see-all-link (pull request #1341)
fix(LOY-143): properly hide see all link for carosel cards

* fix(LOY-143): Improve link handling in CarouselCards schema


Approved-by: Christian Andolf
2025-02-14 12:19:46 +00:00
Bianca Widstam
224a41ec74 feat/SW-1546-list-ancillaries-my-stay (pull request #1259)
Feat/SW-1546 list ancillaries my stay

* feat(SW-1546): foundation for listing ancillaries

* feat(SW-1546): foundation for listing ancillaries

* feat(SW-1546): refactor type

* feat(SW-1546): fix date format

* feat(SW-1546): refactor usestate

* feat(SW-1546): refactor typing

* feat(SW-1546): refactor types

* feat(SW-1546): responsive width on modal

* feat(SW-1546): update design

* feat(SW-1546): rebase master

* feat(SW-1546): show points only if logged in

* feat(SW-1546): always show points

* feat(SW-1546): small fix

* feat(SW-1546): remove spread object

* feat(SW-1546): fix import order


Approved-by: Simon.Emanuelsson
2025-02-14 10:37:17 +00:00
Arvid Norlin
f5e0214313 Merged in feat/confirmation-page-initial-multiroom-display (pull request #1334)
feat: initial display of linkedReservations on confirmation page

* feat: initial display of linkedReservations on confirmation page

* refactor: move notFound


Approved-by: Tobias Johansson
2025-02-14 10:05:58 +00:00
Arvid Norlin
d6f32bef7c Merged in fix/confirmation-schema (pull request #1329)
fix(SW-1640): adjust linkedReservationsSchema to align with api response

* fix(SW-1640): adjust linkedReservationsSchema to align with api response


Approved-by: Michael Zetterberg
Approved-by: Simon.Emanuelsson
2025-02-13 11:49:38 +00:00
Christian Andolf
409ba5bf4c Merged in feat/LOY-134-add-informative-reward-modal (pull request #1307)
feat(LOY-134): display informative rewards and modal

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-13 10:13:35 +00:00
Joakim Jäderberg
6f51130e48 Merged in feature/hardcoded-mypages-links (pull request #1325)
Feature/hardcoded mypages links

* feat: wip use hardcoded links

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

* feat: use hardcoded links for my pages to support dynamic links

* cleanup

* code fixes

* refactor: restructure MyPagesMobileDropdown component for improved readability

* use util timeout function


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-02-13 09:28:30 +00:00
Hrishikesh Vaipurkar
eabe45b73c Merged in feat/SW-1557-implement-booking-code-select (pull request #1304)
feat: SW-1577 Implemented booking code city search

* feat: SW-1577 Implemented booking code city search

* feat: SW-1557 Strict comparison

* feat: SW-1557 Review comments fix


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij
2025-02-13 09:24:47 +00:00
Christian Andolf
509c83868d feat(LOY-134): display informative rewards and modal 2025-02-13 10:16:02 +01:00
Matilda Landström
c0e4553d9f Merged in feat/SW-1065-meetings-page (pull request #1287)
Feat(SW-1065): Meetings hotel subpage

Approved-by: Erik Tiekstra
2025-02-12 15:13:17 +00:00
Erik Tiekstra
1532898c23 Merged in feat/SW-1457-city-dynamic-map (pull request #1320)
feat(SW-1457): Added map and fetching hotels by cityIdentifier

* feat(SW-1457): Added map and fetching hotels by cityIdentifier


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-12 13:02:19 +00:00
Linus Flood
019a5db549 Merged in fix/unify-gethotel-input (pull request #1319)
feat: getHotel - unify input to make sure we can use the same cache response

* feat: getHotel - unify input to make sure we can use the same cache response


Approved-by: Simon.Emanuelsson
2025-02-12 11:35:39 +00:00
Erik Tiekstra
bcfa84324f Merged in feat/SW-1456-country-dynamic-map (pull request #1310)
feat(SW-1456): Added map and fetching hotels by country

* feat(SW-1456): Added map and fetching hotels by country


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-12 09:15:33 +00:00
Pontus Dreij
3901c3ac77 Merged in fix/SW-1551-TRPCError (pull request #1313)
fix/SW-1551-TRPCError

* fix(SW-1551): Fixed error in schema


Approved-by: Hrishikesh Vaipurkar
Approved-by: Linus Flood
2025-02-12 09:01:27 +00:00
Simon.Emanuelsson
4a06162f79 Merged in fix/rateCodes (pull request #1315)
fix: taking care of missing rateDefinitions

* fix: taking care of missing rateDefinitions


Approved-by: Linus Flood
2025-02-12 08:52:08 +00:00
Pontus Dreij
3ad5b9e73d Merged in feat/SW-1540-Fetch-correct-data-from-the-API (pull request #1309)
feat(SW-1551): Update schema for booking

* feat(SW-1551): Update schema for booking

* feat(SW-1551): Non breaking changes


Approved-by: Michael Zetterberg
2025-02-11 15:37:28 +00:00
Matilda Landström
f43ee4a0e6 Merged in feat/SW-1430-cta-button (pull request #1290)
Feat(SW-1430): Add header button on static pages

Approved-by: Erik Tiekstra
2025-02-11 14:10:13 +00:00
Joakim Jäderberg
3d11cfb50a Merged in feature/sas-mypages (pull request #1302)
Feature/sas mypages

* feat: Add SAS partner page under my pages
* fix: feature toggle SAS Partner page in my pages
* add translations for SAS account page
* use 'flex-start' instead of 'start'
* fix: flatten css
* fix: don't use <SectionContainer /> on linkedAccounts page
2025-02-11 12:55:00 +00:00
Christian Andolf
98e3afe9db Merged in fix/LOY-119-hide-redeemed-rewards (pull request #1292)
fix(LOY-119): hiding redeemed rewards

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-11 12:09:44 +00:00
Fredrik Thorsson
e0996b3464 Merged in feat/SW-1064-restaurant-and-bar-subpage (pull request #1299)
feat/SW-1064 restaurant and bar subpage

* feat(SW-1064): add appendToPath to buttonlink

* feat(SW-1064): add sidebar template

* feat(SW-1064): render pages from nameInUrl

* feat(SW-1064): add content to restaurant sidebar

* feat(SW-1064): change icon size

* feat(SW-1064): move opening hours component

* feat(SW-1064): update switch statement

* feat(SW-1064): fix typo

* feat(SW-1064): rebase

* feat(SW-1064): remove accidentally added file

* feat(SW-1064): undefined check for restaurant subpage


Approved-by: Erik Tiekstra
2025-02-11 12:05:49 +00:00
Erik Tiekstra
ff820d1f31 Merged in feat/SW-1454-listing-skeletons (pull request #1301)
Feat/SW-1454 listing skeletons

* feat(SW-1453): added skeleton for city listning

* feat(SW-1454): added skeleton for hotel listning


Approved-by: Fredrik Thorsson
2025-02-11 12:05:44 +00:00
Christian Andolf
4459d5762c fix(LOY-119): hiding redeemed rewards
some smaller cleanup on coupon property to avoid optional checks
2025-02-11 13:02:29 +01:00
Chuma Mcphoy (We Ahead)
3c4d08a894 Merged in feat/1525-info-card-themes (pull request #1300)
feat(SW-1525): Add theme support for InfoCard component

* feat(1525): Add theme support for InfoCard component

* refactor(1525): Update InfoCard theme typing


Approved-by: Christian Andolf
2025-02-11 10:40:23 +00:00
Anton Gunnarsson
6eb01750e8 Merged in fix/move-sas-comparison-to-dynamic-content (pull request #1279)
Move SASTierComparison block to DynamicContent

Approved-by: Erik Tiekstra
2025-02-11 09:36:41 +00:00
Matilda Landström
ad7402f2e2 Merged in feat/SW-1573-subpage-url (pull request #1297)
Feat(SW-1573): Use pageInUrl for hotel subpages

* feat(SW-1573): use pageInUrl for hotel subpages


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-11 08:27:09 +00:00
Erik Tiekstra
f021c60c2a Merged in feat/SW-1443-carousel-destination-overview-page (pull request #1289)
feat(SW-1443): added carousel block on hotel overview page

* feat(SW-1443): added carousel block on hotel overview page


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-02-11 06:56:38 +00:00
Erik Tiekstra
eb0b88f8ea Merged in feat/SW-1584-destination-content-blocks (pull request #1278)
Feat/SW-1584 destination content blocks

* feat(SW-1584): Added accordion and content blocks to destination city pages

* feat(SW-1584): Added accordion and content blocks to destination country pages


Approved-by: Matilda Landström
2025-02-10 09:28:32 +00:00
Erik Tiekstra
413c197ca0 Merged in feat/SW-1495-hide-alerts-on-hotel-pages (pull request #1268)
feat(SW-1495): removed alerts on hotel pages when displayInBookingFlow is true

* feat(SW-1495): removed alerts on hotel pages when displayInBookingFlow is true


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-10 07:40:38 +00:00
Erik Tiekstra
ce445e3f0b Merged in feat/SW-327-pdf-support (pull request #1276)
feat(SW-327): added support to link to pdf files from CS

* feat(SW-327): added support to link to pdf files from CS


Approved-by: Matilda Landström
2025-02-10 07:26:56 +00:00
Christian Andolf
69d57b73a2 feat(SW-1543): move auth check within component to be suspended 2025-02-07 15:43:51 +01:00
Christian Andolf
ced8dd5d99 fix: startpage blocks now default to an array 2025-02-07 15:43:51 +01:00
Christian Andolf
c622a65a8a feat(SW-1543): join scandic friends block is now hidden for logged in users 2025-02-07 15:43:51 +01:00
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
e00cea4646 feat(SW-717) use of AvailabilityEnum instead of strings 2025-02-07 08:38:47 +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
Christian Andolf
9fafb33d26 Merged in feat/SW-1391-join-scandic-friends-startpage (pull request #1260)
feat(SW-1391): add join scandic friends block

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-06 15:05:06 +00:00
Chuma Mcphoy (We Ahead)
7c8d6cbc2e Merged in feat/SW-1384-filter-functionality (pull request #1262)
feat(SW-1384): Implement filtering for CarouselCards component

* feat(SW-1384): Implement filtering for CarouselCards component

* fix(SW-1384): Simplify CarouselCards filters scrolling styles

* refactor(SW-1384): Simplify CarouselCards filtering logic


Approved-by: Christian Andolf
2025-02-06 14:32:55 +00:00
Christian Andolf
4d63cc57c5 feat(SW-1391): add join scandic friends block 2025-02-06 14:33:37 +01:00