Commit Graph

482 Commits

Author SHA1 Message Date
Linus Flood
51f53a717d Merged in fix/build-errrors (pull request #2646)
Fixed build errors due to moved files

* Fixed build errors due to moved files
2025-08-13 13:00:23 +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
Hrishikesh Vaipurkar
706f2d8dfe Merged in fix/SW-3208-webviews-change-dates-on-my- (pull request #2638)
fix(SW-3208): Fixed webview for change date in MyStay

* fix(SW-3208): Fixed webview for change date in MyStay


Approved-by: Linus Flood
2025-08-13 12:37:04 +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
Anton Gunnarsson
8518d018f8 Merged in feat/sw-3230-move-link-to-design-system (pull request #2618)
feat(SW-3230): Move Link to design-system

* Move Link to design-system

* Remove comments


Approved-by: Linus Flood
2025-08-12 12:35:20 +00:00
Hrishikesh Vaipurkar
4c9790b938 Merged in feat/SW-2643-aa-tracking-phone-number-email- (pull request #2617)
feat: SW-2643 Tracking added mobile and email hash in booking cofirmation

* feat: SW-2643 Tracking added mobile and email hash in booking cofirmation


Approved-by: Matilda Landström
2025-08-12 12:19:49 +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
b704aa7936 Merged in fix/SW-3194-cross-validation-enter-details (pull request #2604)
fix(SW-3194): crossvalidation for multiroom enter details

* fix(SW-3194): crossvalidation for multiroom enter details

* fix(SW-3194): use getValues


Approved-by: Hrishikesh Vaipurkar
2025-08-08 11:50:14 +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
Anton Gunnarsson
8824af240b Merged in feat/sw-3219-move-accordion-to-design-system (pull request #2601)
feat(SW-3219): Move accordion to design-system

* Inline types

* Move Accordion to design-system


Approved-by: Bianca Widstam
2025-08-07 14:30:36 +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
Bianca Widstam
9f4e2b3c45 Merged in fix/SW-2425-filter-label-lokalise (pull request #2602)
fix(SW-2425): filter description should be translated with lokalise

* fix(SW-2425): filter description should be translated with lokalise


Approved-by: Anton Gunnarsson
2025-08-06 14:09:32 +00:00
Bianca Widstam
4b3d59f75b Merged in fix/SW-2345-ui-map-close-icon-filter (pull request #2599)
fix(SW-2345): ui fixes for map etc

* fix(SW-2345): ui fixes for map etc


Approved-by: Anton Gunnarsson
2025-08-06 11:26:12 +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
Bianca Widstam
75ffd5d10b Merged in fix/SW-2188-disabled-state (pull request #2597)
fix(SW-2188): readonly for input fields

* fix(SW-2188): readonly for input fields


Approved-by: Anton Gunnarsson
2025-08-06 07:14:28 +00:00
Bianca Widstam
5f2e215508 Merged in fix/SW-2188-disable-fields-logged-in-user-enter-details (pull request #2595)
fix(SW-2188): disable enter details fields when logged in

* fix(SW-2188): disable enter details fields when logged in


Approved-by: Anton Gunnarsson
2025-08-05 11:54:41 +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
03c9244fdf Merged in feat/sw-2873-move-backtotopbutton-to-design-system (pull request #2593)
feat(SW-2873): Move BackToTopButton to design-system

* Remove dependency on i18n in BackToTopButton

* Move BackToTopButton to design-system


Approved-by: Hrishikesh Vaipurkar
2025-08-05 08:41:31 +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
Anton Gunnarsson
7a3ee76206 Merged in feat/sw-3145-move-iconchip-to-design-system (pull request #2588)
feat(SW-3145): Move IconChip to design-system

* Move IconChip to design-system


Approved-by: Hrishikesh Vaipurkar
2025-08-01 14:21:05 +00:00
Hrishikesh Vaipurkar
630cc12215 Merged in fix/SW-3205-mystay-anonymous-booking- (pull request #2584)
fix(SW-3205): Disabled ancillary points and saved cards for anonymous booking

* fix(SW-3205): Disabled ancillary points and saved cards for anonymous booking

* fix(SW-2903 SW-3205): Updated code to be consistent in all scenarios


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-08-01 08:27:27 +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
f5531e8238 Merged in fix/SW-3001-select-hotel-booking-code- (pull request #2576)
Fix/SW-3001 select hotel booking code

* fix(SW-3001): Fixed booking code filter store to reset to default state when new search triggered, Removed state as using useState resets the value on every filter change

* fix: Route tracking parsing error in select-hotel page

* fix(SW-3001): Optimized code


Approved-by: Matilda Landström
2025-07-30 09:39:58 +00:00
Hrishikesh Vaipurkar
c516860466 Merged in fix/SW-2358-find-my-booking-logged-in-user (pull request #2572)
fix(SW-2358): Enabled anonymous booking view for logged in user

* fix(SW-2358): Enabled anonymous booking view for logged in user

* fix(SW-2358): Fixed test case for anonymous booking


Approved-by: Matilda Landström
2025-07-30 08:29:15 +00:00
Matilda Landström
9679212864 Merged in feat/SW-1956-add-English-caption-fallback (pull request #2574)
Feat/SW-1956 add English caption fallback

* feat(SW-1956): add English fallback to gallery caption

* feat(SW-1956): add English fallback to gallery caption


Approved-by: Anton Gunnarsson
2025-07-29 06:12:57 +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
a12dfb4b5b Merged in fix/SW-2342-hotel-side-peek-list-of-ui- (pull request #2566)
fix(SW-2342): Fixed hotel sidepeek UI alignment and color

* fix(SW-2342): Fixed hotel sidepeek UI alignment and color

* fix(SW-2342): Fixed vertical alignment


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-07-28 11:19:29 +00:00
Hrishikesh Vaipurkar
5ff4234552 Merged in chore/SW-3145-move-date-to-design-system (pull request #2556)
feat: SW-3145 Moved date component to design system

* chore: SW-3145 Moved date component to design system


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-07-28 09:05:25 +00:00
Hrishikesh Vaipurkar
36e8ac11d1 Merged in fix/SW-2500-sync-hotel-images-and- (pull request #2569)
fix(SW-2500): Fixed no image gives error on confirmation and booking page

* fix(SW-2500): Fixed no image gives error on confirmation and booking page


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-07-28 08:51:43 +00:00
Hrishikesh Vaipurkar
42ab6e58b3 Merged in chore/SW-3145-move-phone (pull request #2549)
chore/SW-3145 Moved Phone to design system

* chore/SW-3145 Moved Phone to design system

* chore: SW-3145 Moved phone and removed intl direct dependency


Approved-by: Anton Gunnarsson
2025-07-28 08:28:07 +00:00
Hrishikesh Vaipurkar
58af469e22 Merged in fix/SW-2583-prod-stage-users-are- (pull request #2570)
fix(SW-2583): Added check if user tries to open another booking it should work

* fix(SW-2583): Added check if user tries to open another booking it should work


Approved-by: Matilda Landström
2025-07-28 08:13:19 +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
f5e7519104 Merged in feat/SW-3074-enter-details-add-subject- (pull request #2558)
feat: 3074 Added text Subject to availability

* feat: 3074 Added text Subject to availability


Approved-by: Erik Tiekstra
2025-07-16 09:32:52 +00:00
Matilda Landström
2fee29f3f9 Merged in fix/SW-1561-hotelpage-ui (pull request #2542)
Fix(SW-1561): Hotelpage design and token update

* fix(SW-1561): fix sidepeek subtitle

* fix(SW-1561): update mapCard to new tokens and update styling

* fix(SW-1561): correct Typography lowcase titles


Approved-by: Anton Gunnarsson
2025-07-10 14:13:47 +00:00
Hrishikesh Vaipurkar
2f72a0437b Merged in chore/SW-3145-move-country (pull request #2545)
chore: SW-3145 Moved country into design system

* chore: SW-3145 Moved country into design system


Approved-by: Anton Gunnarsson
2025-07-10 12:20:49 +00:00
Bianca Widstam
3615c48853 Merged in fix/SW-1827-map-ipad-breakpoint (pull request #2539)
fix(SW-1827): change breakpoint for ipad to 900 for map view select hotel

* fix(SW-1827): change breakpoint for ipad to 900 for map view select hotel


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-07-09 11:38:51 +00:00
Linus Flood
b35ceafc00 Merged in feat/SW-2903-tokens (pull request #2508)
feat(SW-2358): Use personal token if logged in

* feat(SW-2903): Use personal token if logged in

* Avoid encoding values in cookie

* Fix tests


Approved-by: Anton Gunnarsson
2025-07-08 11:24:31 +00:00
Hrishikesh Vaipurkar
8ae251635d Merged in chore/SW-3145-move-radio-card (pull request #2533)
chore: SW-3145 Moved RadioCard to design system

* chore: SW-3145 Moved RadioCard to design system

* chore: SW-3145 Optimized code

* chore: SW-3145 Optimized code


Approved-by: Anton Gunnarsson
2025-07-08 08:25:00 +00:00
Hrishikesh Vaipurkar
d8f9376cd7 Merged in chore/SW-3145-move-button (pull request #2531)
chore: SW-3145 Moved Button component from TempDS to Design System package

* chore: SW-3145 Moved Button compoenent from TempDS to Design System package


Approved-by: Anton Gunnarsson
2025-07-07 11:13:44 +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
Bianca Widstam
ef40d16a2f Merged in fix/SW-2418-tracking-booking-cancellations (pull request #2500)
fix(SW-2418): add duration and price to booking cancellations tracking

* fix(SW-2418): add duration and price to booking cancellations tracking

* fix(SW-2418): move sessionId and siteVersion inside the pageInfo object


Approved-by: Matilda Landström
2025-07-07 06:02:12 +00:00
Erik Tiekstra
903f419729 fix(SW-3081): Removed color option from hotel logos to avoid wrong colors
Approved-by: Matilda Landström
2025-07-04 11:40:09 +00:00
Anton Gunnarsson
9e1cc66f95 Merged in chore/sw-3145-move-deprecated-select (pull request #2518)
chore(SW-3145): Move DeprecatedSelect to design-system

* Move DeprecatedSelect to design-system


Approved-by: Linus Flood
2025-07-04 06:34:18 +00:00