Commit Graph

370 Commits

Author SHA1 Message Date
Joakim Jäderberg
275a2b48a6 Merged in feature/node22 (pull request #1734)
Upgrade to node@22

* Upgrade to node@22

* Upgrade to node@22

* update required node engine in scandic-web


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
2025-04-04 09:58:44 +00:00
Hrishikesh Vaipurkar
ae1010bfce Merged in feat/SW-2079-update-booking-page-to-show-points- (pull request #1683)
feat: SW-2079 Show points in confirmation page

* feat: SW-2079 Show points in confirmation page

* feat: SW-2079 Optimized code

* feat: SW-2079 Updated Body to Typography

* feat: SW-2079 Multi-room total cost display

* feat: SW-2079 Add reward nights condition rate title

* feat: SW-2079 Removed extra checks

* feat: SW-2079 Optimmized formatPrice function

* feat: SW-2079 Typo fix


Approved-by: Christian Andolf
2025-04-04 09:39:55 +00:00
Bianca Widstam
e30b8a0be3 Merged in fix/SW-2150-modify-guest-redirect (pull request #1736)
fix(SW-2150): include refId query param to redirect

* fix(SW-2150): include refId query param to redirect


Approved-by: Niclas Edenvin
2025-04-04 08:57:37 +00:00
Simon Emanuelsson
2abd4c5c12 fix: display modify dates for already guaranteed changeable rates 2025-04-04 08:46:47 +00:00
Arvid Norlin
b8a976db22 Merged in fix/bookingwidget-children-array (pull request #1738)
fix: add default childrenInRoom [] to fix Booking Widget

* fix: add default childrenInRoom [] to fix Booking Widget


Approved-by: Simon.Emanuelsson
2025-04-04 08:32:59 +00:00
Chuma Mcphoy (We Ahead)
780ed6c525 Merged in fix/Scandic-friends-logo (pull request #1722)
fix: Fix SVG placement of DoubleRow and SingleRow ScandicFriends icons

* fix: Fix SVG placement of DoubleRow and SingleRow ScandicFriends components


Approved-by: Christian Andolf
2025-04-04 07:37:01 +00:00
Christian Andolf
7b66533dba chore: rename html element for context 2025-04-04 09:06:42 +02:00
Christian Andolf
d4f5aea31c chore: add missing type to watch 2025-04-04 09:06:42 +02:00
Christian Andolf
2a07fcf7be chore: remove locations type to opt for location in array instead, this highlights array objects 2025-04-04 09:06:42 +02:00
Christian Andolf
14f9b68365 chore: Cleanup booking widget with types and other minor issues 2025-04-04 09:06:42 +02:00
Joakim Jäderberg
3c810d67a2 Merged in feature/SW-1736-foating-booking-widget (pull request #1696)
Feature/SW-1736 floating booking widget

* feature: Add floating booking widget on start page SW-1736

* fix: Make sure we don't try to use IntersectionObserver on the server

* fix: make sure that we disconnect the intersectionobserver when dismounting

* fix: pass searchparams to floating bookingwidget


Approved-by: Michael Zetterberg
2025-04-04 06:52:37 +00:00
Bianca Widstam
7b1760ca17 Merged in fix/SW-2011-modify-contact-confirm-step-second-time (pull request #1730)
fix(SW-2011): restore step if successful submit

* fix(SW-2011): restore step if successful submit


Approved-by: Niclas Edenvin
2025-04-04 06:22:56 +00:00
Arvid Norlin
5621797690 Merged in fix/handling-brf0 (pull request #1728)
fix: disabling handling of BRF0 (Free breakfast for L6 and L7 members) since out of scope for the release

* fix: disabling handling of BRF0 (Free breakfast for L6 and L7 members) since out of scope for the release


Approved-by: Simon.Emanuelsson
2025-04-03 14:07:30 +00:00
Arvid Norlin
350748cbbb Merged in fix/hide-breakfastprice-for-breakfastincluded (pull request #1727)
fix: Hide the breakfast package unitprice for bookings with breakfastIncluded

* fix: Hide the breakfast package unitprice for bookings with breakfastIncluded


Approved-by: Niclas Edenvin
2025-04-03 12:52:46 +00:00
Niclas Edenvin
07ab3fc29e Merged in fix/sw-2125-scandic-go-breakfast (pull request #1726)
fix(sw-2125): breakfast validation was wrong on Scandic Go

Approved-by: Bianca Widstam
2025-04-03 12:51:15 +00:00
Bianca Widstam
9129e2f468 Merged in fix/SW-2072-ancillary-price-details-ui (pull request #1723)
fix(SW-2072): fix price details on ancillaries

* fix(SW-2072): fix price details on ancillaries


Approved-by: Niclas Edenvin
2025-04-03 12:18:49 +00:00
Bianca Widstam
128c1e3462 Merged in fix/display-added-ancillaries-only-if-nonmodifiable (pull request #1718)
fix: fix logic for showing ancillaries and add/remove ancillaries

* fix: fix logic for showing ancillaries and add/remove ancillaries

* fix: move canModifyAncillary check


Approved-by: Niclas Edenvin
2025-04-03 11:15:49 +00:00
Arvid Norlin
2272bb4403 Merged in fix/SW-2136 (pull request #1720)
fix(SW-2136): correct booking confirmation breakfast logic

* fix(SW-2136): correct booking confirmation breakfast logic


Approved-by: Simon.Emanuelsson
2025-04-03 10:15:19 +00:00
Erik Tiekstra
8c2047e847 feat(SW-1884): Always render sidepeek contents, not just during SSR
Approved-by: Michael Zetterberg
2025-04-03 09:36:22 +00:00
Erik Tiekstra
b70d933c73 fix(SW-2122): Added correct credit card icon
Approved-by: Michael Zetterberg
2025-04-03 09:28:27 +00:00
Michael Zetterberg
7bf75fd2e7 fix: all env vars are strings, coerce to numbers 2025-04-03 09:18:44 +00:00
Simon Emanuelsson
8a7c55edff fix: apply logic for full prices filter 2025-04-03 08:56:42 +00:00
Bianca Widstam
3942ab1ff4 Merged in fix/ancillary-payed-with-points-name (pull request #1716)
fix: added ancillary with points show correct name

* fix: added ancillary with points show correct name


Approved-by: Niclas Edenvin
2025-04-03 08:11:06 +00:00
Simon Emanuelsson
6d869ceba7 fix: unbreak toApiLang call that failed everytime 2025-04-03 07:51:25 +00:00
Bianca Widstam
30c7eb07fa Merged in fix/SW-2137-points-enum (pull request #1715)
fix(SW-2137): fix points enum

* fix(SW-2137): fix points enum


Approved-by: Michael Zetterberg
2025-04-03 07:50:57 +00:00
Bianca Widstam
83aedd7dbb Merged in fix/SW-1491-SW-1500-link-in-hotel-card-to-map (pull request #1707)
fix(SW-1491-SW-1500): address on hotel card should go to map, remove link on maplisting view

* fix(SW-1491-SW-1500): address on hotel card should go to map, remove link on maplisting view

* fix(SW-1491-SW-1500): fix comment

* fix(SW-1491-SW-1500): add underscore


Approved-by: Niclas Edenvin
2025-04-03 06:56:23 +00:00
Erik Tiekstra
0215c8428f fix: Fixed issue with duplicate filter_identifiers inside tabFilters
Approved-by: Chuma Mcphoy (We Ahead)
2025-04-03 05:50:35 +00:00
Simon Emanuelsson
4e36fecd6e fix: initial fix of modify dates 2025-04-03 04:25:05 +00:00
Niclas Edenvin
a34951e075 Merged in fix/add-multinight-breakfast (pull request #1705)
The number of breakfasts and total sums weren’t correctly calculated. This fixes that.

Also changes display logic of when the ancillaries sections are shown

Approved-by: Bianca Widstam
2025-04-02 16:03:50 +00:00
Simon Emanuelsson
a222ecfc5c fix: make sure calculations in booking flow are correct 2025-04-02 15:00:39 +00:00
Simon Emanuelsson
3e0f503314 feat: add block to ARB rate when trying multiroom booking 2025-04-02 14:30:49 +00:00
Arvid Norlin
01e160db41 Merged in fix/saved-card-length (pull request #1711)
fix: remove rendering of savedCard.length if 0

* fix: remove rendering of savedCard.length if 0


Approved-by: Simon.Emanuelsson
2025-04-02 14:01:15 +00:00
Chuma Mcphoy (We Ahead)
56d5ad77d1 Merged in fix/SW-2068-correct-public-url-from-my-stays-overview-page (pull request #1694)
feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

* feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

- Added language parameter to previous and upcoming stays queries.
- Updated Client components to utilize the new language hook.
- Refactored EmptyUpcomingStays component to dynamically generate links based on the current language.
- Adjusted user input validation to include optional language parameter.

* refactor(SW-2068): Update EmptyUpcomingStays components to use PUBLIC_URL + add utility to handle TLD based on language

* chore(SW-2068): Clarify TLD

* feat(SW-2068): documentation for getTldForLanguage

* refactor(SW-2068): Simplify booking URL construction in updateStaysBookingUrl

* refactor(SW-2068): Remove incorrect TLD update logic from booking URL construction

* refactor(SW-2068): Centralize booking URL paths using myBookingPath constant

* refactor(SW-2068): Streamline search params in booking URL construction logic in updateStaysBookingUrl


Approved-by: Christian Andolf
2025-04-02 12:44:02 +00:00
Anton Gunnarsson
67905198c6 Merged in fix/sas-english-copy (pull request #1695)
Update english copy for SAS related flows

* Update english copy for SAS related flows

* Add new copy to all languages

* Add use client directive to loading to use translations


Approved-by: Joakim Jäderberg
2025-04-02 11:49:12 +00:00
Linus Flood
e4907d4b47 Merged in fix/destinations-speed-test (pull request #1704)
Feat(destination pages): Performance improvements

* fix/destinations: try cache full response

* Added more caching

* Removed unsed env car

* wip

* merge master

* wip

* wip

* wip

* Renaming


Approved-by: Michael Zetterberg
2025-04-02 11:37:22 +00:00
Arvid Norlin
961e8aea91 Merged in fix/SW-1631-rate-terms-modal (pull request #1699)
fix(SW-1631): add rate terms modal

* fix(SW-1631): add rate terms modal


Approved-by: Simon.Emanuelsson
2025-04-02 09:36:53 +00:00
Michael Zetterberg
be04600863 Revert "fix(SW-2101): do not apply underline to Material icons inside Link and Button"
This reverts commit 35f9c3aab5.
2025-04-02 10:29:43 +02:00
Erik Tiekstra
b6db9757d8 fix(SW-2073): Links for terms & conditions and privacy policy are moved out of the label for ancillaries and gla
Approved-by: Matilda Landström
2025-04-02 07:53:41 +00:00
Matilda Landström
1cad7af147 Merged in fix/icon-color (pull request #1700)
fix: change icon color

* fix: change icon color


Approved-by: Erik Tiekstra
2025-04-02 07:42:41 +00:00
Linus Flood
34e398d377 Merged in hotfix/mystays-show-more (pull request #1698)
hotfix: my stays - pass language to trpc

* hotfix: my stays - pass language to trpc


Approved-by: Joakim Jäderberg
2025-04-01 18:18:47 +00:00
Niclas Edenvin
d9c2ac12a1 Merged in fix/sw-2091-remove-breakfast (pull request #1689)
fix(SW-2091): remove breakfast ancillaries

* fix(SW-2091): remove breakfast ancillaries

* Send array in correct format

* Break out function


Approved-by: Bianca Widstam
2025-04-01 14:34:51 +00:00
Michael Zetterberg
35f9c3aab5 fix(SW-2101): do not apply underline to Material icons inside Link and Button 2025-04-01 13:10:32 +00:00
Simon Emanuelsson
d513184be4 fix: there can only ever be one root layout, and it should always contains html and body tags 2025-04-01 14:38:30 +02:00
Chuma Mcphoy (We Ahead)
e45fea6de4 Merged in feat/SW-1890-New-Breakfast-Component (pull request #1666)
Feat/SW-1890 New Breakfast Component Design

* refactor(SW-1890): Replace BreakfastChoiceCard with RadioCard component and update styles

- Removed BreakfastChoiceCard component and its associated styles.
- extemded RadioCard component to additional UI.
- Updated breakfast.module.css to adjust container width.
- Added new properties for subtitleSecondary and description in RadioCard.
- Updated translations for breakfast-related messages in en.json.

* feat(SW-1890): Add hover state to RadioCard

* chore(SW1890): Update translation for breakfast cost message to clarify age range

* chore(SW-1890): Updated breakfast cost display to use formatPrice utility

* fix(SW-1890): Set fixed size for CoffeeIcon component

* fix(SW-1890): Add missing translations for breakfast-related messages

* feat(SW-1890): Introduce new breakfast icons and update Breakfast component

- Replaced CoffeeIcon with BreakfastBuffetIcon and NoBreakfastBuffetIcon in the Breakfast component.
- Added new BreakfastBuffetIcon and NoBreakfastBuffetIcon components to the design system.
- Updated imports in the Breakfast component to reflect the new icons.


Approved-by: Christian Andolf
2025-04-01 10:03:18 +00:00
Erik Tiekstra
df32c08350 feat(SW-2043): Added new room packages filter
* feat(SW-2043): Added new room packages filter

* fix(SW-2043): Fixed issue with not updating price when selecting pet room

Approved-by: Tobias Johansson
Approved-by: Matilda Landström
2025-04-01 09:54:09 +00:00
Bianca Widstam
35c1724afb Merged in feat/SW-1997-tracking-gla-my-stay-ancillaries (pull request #1657)
Feat/SW-1997 tracking gla my stay ancillaries

* feat(SW-1996): tracking gla my stay

* feat(SW-1996): update gla tracking

* feat(SW-1996): fix comment

* feat(SW-1997): add tracking for gla my stay and ancillaries

* feat(SW-1997): rebase master

* feat(SW-1997): fix duplicate import

* feat(SW-1997): add hotelId and category for ancillaries, and add more tracking

* feat(SW-1997): remove commments and fix spelling mistake

* feat(SW-1997): if addAncillary failed, but guarantee is successful, default to card in booking


Approved-by: Niclas Edenvin
2025-04-01 09:38:36 +00:00
Bianca Widstam
e6c9e25222 Merged in fix/my-stay-ancillaries (pull request #1663)
fix: small design fix, fix bug that redirects to planet, add translations

* fix: small design fix, fix bug that redirects to planet, add translations

* fix: if user does not have enough points, default quantitywithcard to 1

* fix: fix pr comment


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-04-01 09:05:42 +00:00
Hrishikesh Vaipurkar
221f842552 feat: SW-2028 Removed session passing 2025-04-01 08:18:22 +00:00
Hrishikesh Vaipurkar
96fd0b73e4 feat: SW-2028 Fixed review comments 2025-04-01 08:18:22 +00:00
Hrishikesh Vaipurkar
4e9ee82efa feat: SW-2028 Fix after rebase 2025-04-01 08:18:22 +00:00