Commit Graph

5049 Commits

Author SHA1 Message Date
Linus Flood
b2148cd12e Merged in fix/branch-sync-4 (pull request #2650)
Fix/branch sync 4

* Test ignore script

* Test

* Fixed ignore script
2025-08-14 05:53:32 +00:00
Linus Flood
dbc9473cb5 Merged in fix/branch-sync-4 (pull request #2649)
Fix/branch sync 4

* Test ignore script

* Test
2025-08-14 05:46:38 +00:00
Bianca Widstam
9d15da5290 Merged in fix/SW-2357-destination-text-booking-widget (pull request #2648)
fix(SW-2357): change destination text font for mobile

* fix(SW-2357): change destination text font for mobile


Approved-by: Matilda Landström
2025-08-14 05:43:12 +00:00
Anton Gunnarsson
d10fc5ed74 Merged in feat/sw-3247-move-table-to-design-system (pull request #2636)
feat(SW-3247): Move Table component to design-system

* Move Table component to design-system


Approved-by: Bianca Widstam
2025-08-13 14:52:56 +00:00
Anton Gunnarsson
cd29e54098 Merged in feat/sw-3244-move-imagecontainer-to-design-system (pull request #2637)
feat(SW-3244): Move ImageContainer component to design-system

* Move ImageContainer component to design-system

* Fix imports


Approved-by: Bianca Widstam
2025-08-13 14:37:29 +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
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
Linus Flood
ba27030d60 Merged in fix/branch-sync-3 (pull request #2645)
Test

* Test
2025-08-13 12:48:31 +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
Linus Flood
ddaa2a0e20 Merged in fix/branch-sync-2 (pull request #2643)
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master

* Merge branch 'master' into fix/branch-sync-2

* Revert branch sync

* Ignore ignore script

* Merge branch 'master' into fix/branch-sync-2
2025-08-13 12:31:28 +00:00
Linus Flood
2bf1d8e22b Merged in fix/branch-sync-2 (pull request #2642)
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master

* Merge branch 'master' into fix/branch-sync-2

* Revert branch sync
2025-08-13 12:19:56 +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
Linus Flood
83256695db Merged in fix/branch-sync-2 (pull request #2640)
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master
2025-08-13 11:59:28 +00:00
Linus Flood
cf4a9bfa84 Merged in fix/branch-sync-2 (pull request #2639)
feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script
2025-08-13 11:42:54 +00:00
Anton Gunnarsson
29292fd157 Merged in feat/sw-3231-move-lightbox-to-design-system (pull request #2619)
feat(SW-3231): Move Lightbox to design-system

* Move Lightbox to design-system

* Fix self-referencing imports

* Fix broken import


Approved-by: Matilda Landström
2025-08-13 11:02:59 +00:00
Matilda Landström
5397437628 Merged in feat/SW-2041-map-zoom-buttons (pull request #2550)
Feat(SW-661): Hotel page map zoom restrictions

* fix(SW-2041): update tokens

* chore(SW-2041): restrict zooming

* fix(SW-2041): remove ref

* fix(SW-2041): create map zoom hook


Approved-by: Erik Tiekstra
Approved-by: Hrishikesh Vaipurkar
2025-08-13 07:50:39 +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
Chuma Mcphoy (We Ahead)
be752059ee Merged in fix/LOY-307-button-link-external-link-support (pull request #2630)
fix(LOY-307): disable prefetch on DTMC Link employment button

* fix(LOY-307): Add external link support to ButtonLink component

* fix(LOY-307): set prefetch to false in dtmc link btn cta


Approved-by: Anton Gunnarsson
2025-08-13 07:12:54 +00:00
Anton Gunnarsson
e92c0465cc Merged in feat/sw-3242-move-opening-hours-to-design-system (pull request #2629)
feat(SW-32429: Move OpeningHours to design-system

* Move OpeningHours to design-system


Approved-by: Joakim Jäderberg
2025-08-13 07:05:23 +00:00
Anton Gunnarsson
124f743df7 Merged in fix/sw-3227-add-language-param-to-point-exchange-endpoint (pull request #2627)
fix: Add language param to point exchange endpoint

* Add language param to point exchange endpoint


Approved-by: Bianca Widstam
2025-08-12 14:08:01 +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
Linus Flood
9362d09730 Merged in fix/branch-sync (pull request #2625)
fix(branch sync): check if cached commit ref exists before ignoring builds

* fix(branch sync): check if cached commit ref exists before ignoring builds


Approved-by: Joakim Jäderberg
2025-08-12 11:56:17 +00:00
Anton Gunnarsson
683481a527 Merged in fix/add-use-client-to-buttonlink-usage (pull request #2624)
fix: Add RestaurantBarItemLinks component with 'use client'

* Add RestaurantBarItemLinks component with 'use client'


Approved-by: Joakim Jäderberg
2025-08-12 11:55:16 +00:00
Joakim Jäderberg
855f795d50 Merged in feature/transpile-design-system (pull request #2621)
Feature/transpile design system

* remove example, we should use storybook instead

* remove example, we should use storybook instead

* css-modules cannot have :root, moved affected css-variables to globals.css

* .

* scandic-web no longer depends on design-system#build

* * Update readme
* Remove test code


Approved-by: Anton Gunnarsson
2025-08-12 09:07:33 +00:00
Linus Flood
011f191c65 Merged in feat/lokalise-sync-120825 (pull request #2620)
Lokalise sync 12-08-25

* Lokalise sync 12-08-25


Approved-by: Anton Gunnarsson
2025-08-12 08:37:42 +00:00
Matilda Landström
5ae69a297e Merged in fix/SW-3002-bug (pull request #2615)
fix(SW-3002): fix bug causing hotel page not found

* fix(SW-3002): fix bug causing hotel page not found


Approved-by: Anton Gunnarsson
Approved-by: Linus Flood
2025-08-12 06:18:49 +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
Matilda Landström
37c311d826 Merged in feat/SW-2528-restaurant-icons-sidepeek (pull request #2610)
feat(SW-2528): add restaurant type icon to sidepeek

* feat(SW-2528): add restaurant type icon to sidepeek


Approved-by: Anton Gunnarsson
2025-08-11 11:45:20 +00:00
Anton Gunnarsson
00b124d15a Merged in feat/sw-3226-move-buttonlink-to-design-system (pull request #2613)
feat(SW-3226): Move ButtonLink to design-system

* Move ButtonLink to design-system

* Fix Button import


Approved-by: Linus Flood
2025-08-11 10:53:00 +00:00
Chuma Mcphoy (We Ahead)
3cca4ff394 Merged in chore/LOY-293-table-header-updates (pull request #2611)
chore(LOY-293): earn and burn table header update

* chore(LOY-293): earn and burn table header update


Approved-by: Anton Gunnarsson
2025-08-11 09:40:15 +00:00
Anton Gunnarsson
e8abcdf58b Merged in chore/hardcode-lang-in-sas (pull request #2612)
temp: Hardcode lang param

* Hardcode lang param


Approved-by: Linus Flood
2025-08-11 09:02:26 +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
Matilda Landström
bcb28b6337 Merged in fix/SW-3138-stackable-info-cards (pull request #2594)
fix(SW-3138): make cards stackable in mobile

* fix(SW-3138): make cards stackable in mobile


Approved-by: Bianca Widstam
Approved-by: Anton Gunnarsson
2025-08-09 17:41:37 +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
Hrishikesh Vaipurkar
58cd2876d0 Merged in fix/SW-3222-scandic-friends-faq-links-update- (pull request #2605)
fix(SW-3222): Updated FAQ page Urls

* fix(SW-3222): Updated FAQ page Urls


Approved-by: Bianca Widstam
2025-08-08 08:18:26 +00:00
Bianca Widstam
b5a8ef6588 Merged in fix/SW-3187-dot-fi-date (pull request #2606)
fix(SW-3187): add dot to fi date

* fix(SW-3187): add dot to fi date


Approved-by: Anton Gunnarsson
2025-08-08 05:37:51 +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
Hrishikesh Vaipurkar
271d5ec32c Merged in fix/SW-3199-prod-users-are-displayed-with- (pull request #2592)
fix(SW-3199): Fixed redemption search for alternative hotels

* fix(SW-3199): Fixed redemption search for alternative hotels

* fix(SW-3199): User points validation included


Approved-by: Anton Gunnarsson
2025-08-07 07:29:32 +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
Hrishikesh Vaipurkar
1a03b44ea8 Merged in feat/SW-3042-tracking-hotel-page-btn-prices- (pull request #2590)
feat(SW-3042): Added tracking for prices and availability button

* feat(SW-3042): Added tracking for prices and availability button


Approved-by: Anton Gunnarsson
2025-08-06 09:38:29 +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