Commit Graph

165 Commits

Author SHA1 Message Date
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
Joakim Jäderberg
2a9313362f Merged in feature/SW-3327-move-hotel-info-card-to-design-system (pull request #2730)
Feature/SW-3327 move hotel info card to design system

* wip

* wip

* wip

* wip moving hotelinfocard

* add controls for HotelInfoCard in storybook

* merge


Approved-by: Anton Gunnarsson
2025-08-29 10:09:48 +00:00
Bianca Widstam
8a53e97e5f Merged in fix/SW-3325-hotelcard-mobile-show-alert-left-align (pull request #2725)
fix(SW-3325): show alert in hotel card mobile and left align text

* fix(SW-3325): show alert in hotel card mobile and left align text


Approved-by: Joakim Jäderberg
2025-08-28 12:04:43 +00:00
Bianca Widstam
0e00e8eaf1 Merged in fix/SW-3021-vouchers (pull request #2719)
fix(SW-3021): add pluralization support for vouchers

* fix(SW-3021): add pluralization support for vouchers


Approved-by: Anton Gunnarsson
2025-08-28 08:27:03 +00:00
Joakim Jäderberg
72f4f72a17 Merged in SW-3317-move-toast-to-design-system (pull request #2716)
SW-3317 move toast to design system

* chore: Move toast to design-system and add interaction tests

* Move toast to design-system and add storybook tests

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3317-move-toast-to-design-system

* merge

* move sonner dependency to @scandic-hotels/design-system


Approved-by: Anton Gunnarsson
2025-08-27 13:03:17 +00:00
Bianca Widstam
4d4c90b800 Merged in fix/SW-3283-select-rate-booking-code (pull request #2699)
fix(SW-3283): add booking code when selecting rate and reset state when removing booking code

* fix(SW-3283): add booking code when selecting rate and reset state when removing booking code

* feat: add removeBookingCode action to SelectRateContext

* fix(SW-3283): add booking code when selecting rate and reset state when removing booking code

* fix(SW-3283): merge


Approved-by: Joakim Jäderberg
2025-08-26 13:03:46 +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
Bianca Widstam
87f597ae1a Merged in fix/SW-3303-campaign-rate-naming (pull request #2702)
fix(SW-3303): campaign rate should have ratedefinition title

* fix(SW-3303): campaign rate should have ratedefinition title


Approved-by: Matilda Landström
2025-08-25 13:23:44 +00:00
Bianca Widstam
42c7fb8510 Merged in fix/SW-3289-sidepeek-cta-hotel (pull request #2697)
fix(SW-3289): add cta to sidepeek hotel

* fix(SW-3289): add cta to sidepeek hotel

* fix(SW-3289): add cta hotel card


Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
2025-08-25 13:05:58 +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
Hrishikesh Vaipurkar
d6b7361a26 Merged in fix/SW-2786-ios-only-mobile-browsers- (pull request #2626)
fix(SW-2786): Added sizes auto to load images of appropriate size instead of largest

* fix(SW-2786): Added sizes auto to load images of appropriate size instead of largest

* fix(SW-2786): Updated to specific size as auto value is not yet supported by major browsers

* fix(SW-2786): Updated to height as min-height doesn't work for child having 100% correctly


Approved-by: Bianca Widstam
2025-08-22 13:11:32 +00:00
Bianca Widstam
d9b858c823 Merged in feat/SW-3289-replace-sidepeek-hotel-reservation (pull request #2686)
feat(SW-3289): replace sidepeek

* fix(SW-3289): replace sidepeek

* fix(SW-3289): add wrapping prop and change prop name to buttonVariant

* fix(SW-3289): replace body with typography

* fix(SW-3289): fix intl message


Approved-by: Joakim Jäderberg
2025-08-22 11:43:39 +00:00
Hrishikesh Vaipurkar
3f19886171 Merged in fix/SW-3254-error-fromdate_cannot_be_ (pull request #2676)
Fix/SW-3254 error fromdate cannot be

* fix(SW-3254): Implemented date valdaton on select-hotel page

* fix(SW-3254): Updated the browser URL to show proper booking dates

* fix(SW-3254): Fixed select-rate when invalid dates searched

* fix(SW-3254): Forced no availability for past dates

* fix(SW-3254) Optimised code

* fix(SW-3254): Optimised code


Approved-by: Linus Flood
2025-08-21 09:48:31 +00:00
Hrishikesh Vaipurkar
e0cc237b5f Merged in fix/SW-2367-rate-details-mobile-ui-correctio (pull request #2678)
fix(SW-2367): Aligned the check icon in rate terms

* fix(SW-2367): Aligned the check icon in rate terms


Approved-by: Erik Tiekstra
2025-08-20 14:04:58 +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
Anton Gunnarsson
deaba8b5c4 Merged in feat/sw-3241-move-readme-to-booking-flow (pull request #2660)
feat(SW-3241): Move ReadMe to booking-flow and rename to OpenSidePeekButton

* Move ReadMe to booking-flow

* Rename ReadMore to OpenSidePeekButton

* Fix self-referencing import


Approved-by: Joakim Jäderberg
2025-08-19 07:20:44 +00:00
Anton Gunnarsson
67a7a0d571 Merged in feat/sw-3271-move-chip-to-design-system (pull request #2659)
feat(SW-3271): Move Chip to design-system

* Move Chip to design-system


Approved-by: Joakim Jäderberg
2025-08-19 07:04:01 +00:00
Anton Gunnarsson
322268595d Merged in feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow (pull request #2600)
feat(SW-2873): Move HotelReservationSidePeek to booking-flow

* Move sidepeek store to booking-flow

* Begin move of HotelReservationSidePeek to booking-flow

* Copy Link

* Update AccessibilityAccordionItem

* Split AccessibilityAccordionItem into two components

* Fix tracking for Accordion

* Duplicate ButtonLink to booking-flow TEMP

* AdditionalAmeneties

* wip

* Move sidepeek accordion items

* Remove temp ButtonLink

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Fix accordion tracking

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Update exports

* Fix self-referencing import

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Add 'use client' to tracking function

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Fix TEMP folder

* Refactor sidepeek tracking

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow


Approved-by: Joakim Jäderberg
2025-08-14 12:25:40 +00:00
Anton Gunnarsson
04aebb372c Merged in feat/sw-3238-move-modal-to-design-system (pull request #2628)
feat(SW-3238): Move modal to design system

* Move Modal to design-system

* Remove temp modal from booking-flow


Approved-by: Joakim Jäderberg
2025-08-14 07:14:51 +00:00
Joakim Jäderberg
e3067331c6 Merged in fix/remove-old-select-rate (pull request #2647)
Fix/remove old select rate

* remove old select-rate

* Fix imports

* renamed SelectRate2 -> SelectRate
2025-08-13 13:43:48 +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
Anton Gunnarsson
08159d326a Merged in feat/sw-3239-move-imagegallery-to-design-system (pull request #2633)
feat(SW-3239): Move imagegallery to design system

* Inline types

* Move ImageGallery to design-system


Approved-by: Matilda Landström
2025-08-13 12:16:59 +00:00
Bianca Widstam
28e9a043b8 Merged in fix/SW-3146-expanded-hotel-info (pull request #2632)
fix(SW-3146): reset expanded state on hotel change

* fix(SW-3146): reset expanded state on hotel change


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-08-13 07:49:23 +00:00
Anton Gunnarsson
a2213d0169 Merged in feat/sw-3228-move-image-to-design-system (pull request #2616)
feat(SW-3228): Move Image to design-system

* Move Image to design-system

* Merge branch 'master' into feat/sw-3228-move-image-to-design-system


Approved-by: Linus Flood
2025-08-12 12:58:05 +00:00
Anton Gunnarsson
800dc5c3c1 Merged in feat/sw-3225-move-parking-information-to-booking-flow (pull request #2614)
feat(SW-3225): Move ParkingInformation to design-system

* Inline ParkingInformation types to remove trpc dependency

* Move ParkingInformation to design-system

* Move numberFormatting to common package

* Add deps to external

* Fix imports and i18n script

* Add common as dependency

* Merge branch 'master' into feat/sw-3225-move-parking-information-to-booking-flow


Approved-by: Linus Flood
2025-08-12 12:36:31 +00:00
Bianca Widstam
3262a71184 Merged in fix/SW-3198-strikethrough-price-mobile (pull request #2622)
fix(SW-3198): show strikethrough price only if price is higher than regular price

* fix(SW-3198): show strikethrough price only if price is higher than regular price

* fix(SW-3198): reverse logic


Approved-by: Hrishikesh Vaipurkar
2025-08-12 12:19:02 +00:00
Hrishikesh Vaipurkar
54e57843d5 Merged in feat/SW-3224-move-bookingcode-filter-to-booking-flow (pull request #2608)
feat(SW-3224): Move bookingcode filter to the booking-flow package

* feat(SW-3224): Moved bookingcode filter to the booking-flow package


Approved-by: Anton Gunnarsson
2025-08-11 12:10:59 +00:00
Bianca Widstam
a80df428cf Merged in fix/SW-2368-change-ui-modify-button (pull request #2609)
fix(SW-2368): change ui for modify button until chip component created

* fix(SW-2368): change ui for modify button until chip component created


Approved-by: Matilda Landström
2025-08-11 06:13:46 +00:00
Bianca Widstam
329debf115 Merged in fix/SW-2523-filter-select-rate-small-screen (pull request #2607)
fix(SW-2523): filter scrollable for desktop with small height

* fix(SW-2523): filter scrollable for desktop with small height


Approved-by: Hrishikesh Vaipurkar
2025-08-08 11:37:46 +00:00
Hrishikesh Vaipurkar
6dd95d4a4a Merged in fix/SW-2367-mobile-ui-correction- (pull request #2603)
Fix/SW-2367 mobile ui correction

* fix(SW-2367): UI updates

* fix(SW-2367): Optimised code


Approved-by: Bianca Widstam
2025-08-07 13:00:11 +00:00
Hrishikesh Vaipurkar
d391076125 Merged in fix/SW-3213-select-rate-page-public-prices (pull request #2596)
fix(SW-3213): Fixed booking code rates shown after removing the booking code via chip close icon

* fix(SW-3213): Fixed booking code rates shown after removing the booking code via chip close icon

* fix(SW-3213): Fixed multiroom room scenario


Approved-by: Anton Gunnarsson
2025-08-06 10:56:12 +00:00
Anton Gunnarsson
41efb3a7b3 Merged in feat/sw-3207-refactor-select-hotel-tracking (pull request #2587)
feat(SW-3207): Refactor select-hotel tracking

* Refactor select-hotel tracking


Approved-by: Bianca Widstam
2025-08-06 08:35:48 +00:00
Anton Gunnarsson
1bd8fe6821 Merged in feat/sw-2879-booking-widget-to-booking-flow-package (pull request #2532)
feat(SW-2879): Move BookingWidget to booking-flow package

* Fix lockfile

* Fix styling

* a tiny little booking widget test

* Tiny fixes

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Remove unused scripts

* lint:fix

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Tiny lint fixes

* update test

* Update Input in booking-flow

* Clean up comments etc

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Setup tracking context for booking-flow

* Add missing use client

* Fix temp tracking function

* Pass booking to booking-widget

* Remove comment

* Add use client to booking widget tracking provider

* Add use client to tracking functions

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Move debug page

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package


Approved-by: Bianca Widstam
2025-08-05 09:20:20 +00:00
Anton Gunnarsson
6b43022c7d Merged in feat/sw-2873-move-tripadvisorchip-to-booking-flow (pull request #2591)
feat(SW-2873): Move TripAdvisorChip to booking-flow

* Move TripAdvisorChip to booking-flow


Approved-by: Hrishikesh Vaipurkar
2025-08-05 08:39:48 +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
Hrishikesh Vaipurkar
eca29fb540 Merged in fix/SW-3091-the-strikethrough-price- (pull request #2567)
fix(SW-3091): Fixed strikethrough price for logged-in user

* fix(SW-3091): Fixed strikethrough price for logged-in user


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-07-28 11:20:49 +00:00
Hrishikesh Vaipurkar
5d77be3f0e Merged in fix/SW-3144-prod-mobile-hotel-card-select-rate- (pull request #2560)
fix(SW-3144): Make hotel alert visible bydefault in mobile view on select-rate page

* fix(SW-3144): Make hotel alert visible bydefault in mobile view on select-rate page

* fix: spacing
fix:  show 'all ameneties' button without expanding text

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/SW-3144-prod-mobile-hotel-card-select-rate-


Approved-by: Joakim Jäderberg
2025-07-23 09:49:56 +00:00
Hrishikesh Vaipurkar
3356523cb2 Merged in fix/SW-3091-the-strikethrough-price- (pull request #2562)
fix(SW-3091): Fixed strike through price shown same as original price

* fix(SW-3091): Fixed strike through price shown same as original price

* fix(SW-3091): Optimized code

* fix(3091): Strikethrough visibility on mobile booking code


Approved-by: Erik Tiekstra
2025-07-18 10:41:14 +00:00
Hrishikesh Vaipurkar
71c6f4cab3 Merged in chore/SW-3145-move-button (pull request #2527)
chore: SW-3145 Moved tempdesign button to design-system

* chore: SW-3145 Moved tempdesign button to design-system


Approved-by: Anton Gunnarsson
2025-07-07 07:11:18 +00:00
Anton Gunnarsson
923206ee4c Merged in chore/sw-3145-move-subtitle (pull request #2516)
chore(SW-3145): Move Title and Subtitle to design-system

* Move Title and Subtitle to design-system

* Fix export


Approved-by: Linus Flood
2025-07-04 06:22:28 +00:00
Anton Gunnarsson
7ff8fee20e Merged in chore/sw-3145-move-skeleton-shimmer (pull request #2509)
chore(SW-3145): Move SkeletonShimmer to design-system

* Move SkeletonShimmer to design-system


Approved-by: Joakim Jäderberg
2025-07-03 13:10:23 +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
0ffb40e94b Merged in chore/sw-3145-move-footnote (pull request #2506)
chore(SW-3145): Move Footnote to design-system

* Move Footnote to design-system


Approved-by: Joakim Jäderberg
2025-07-03 08:14:18 +00:00
Anton Gunnarsson
75a377b59e Merged in chore/sw-3145-move-body (pull request #2505)
chore(SW-3145): Move Body component to design-system

* Move Body component to design-system


Approved-by: Joakim Jäderberg
2025-07-03 08:04:36 +00:00
Anton Gunnarsson
a7ac79e429 Merged in chore/sw-3145-move-caption (pull request #2503)
chore(SW-3145): Move Caption to design-system

* Move Caption to design-system

* Mark Caption as deprecated


Approved-by: Linus Flood
Approved-by: Joakim Jäderberg
2025-07-03 07:48:24 +00:00
Anton Gunnarsson
be25be7bb5 Merged in feat/sw-3125-move-client-trpc-setup (pull request #2493)
feat(SW-3125): Move client trpc setup

* Move client trpc to package

* Client setup in partner-sas

* Add todo


Approved-by: Linus Flood
2025-07-01 12:41:28 +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
Simon Emanuelsson
59f4a27cb1 feat: translate Voucher everywhere during booking flow 2025-06-30 10:57:00 +00:00
Christian Andolf
ff40ef72c4 chore: fix and migrate unit tests to vitest 2025-06-30 09:49:30 +02:00