Commit Graph

56 Commits

Author SHA1 Message Date
Linus Flood
ad5ec80645 Merged in feat/sw-2855-urls (pull request #2177)
feat: sw-2855 urls

* feat: sw-2855 urls


Approved-by: Joakim Jäderberg
2025-05-21 09:11:02 +00:00
Michael Zetterberg
f3936f41d8 Merged in fix/label-sync (pull request #2163)
fix: english label sync

* fix: english label sync

* fix: sync from Lokalise


Approved-by: Linus Flood
2025-05-21 04:11:22 +00:00
Erik Tiekstra
7fe25f7eca fix(SW-2376): Vertically centered previous/next buttons inside carousel cards
Approved-by: Matilda Landström
2025-05-19 09:13:23 +00:00
Hrishikesh Vaipurkar
fa7d94093e Merged in feat/SW-2612-mystay-breakfast-buffet-u (pull request #2059)
Feat: SW-2612 Updated breakfast ancillary UI and Optimised code

* Feat: SW-2612 Updated breakfast ancillary UI and Optimised code

* feat: SW-2612 Updated UI as per figma

* feat: SW-2612 Optimised code

* feat: SW-2612 Optimised code


Approved-by: Tobias Johansson
2025-05-16 08:32:54 +00:00
Simon Emanuelsson
0b960200b9 fix: make sure ancillaries also listen to invalidate requests 2025-05-15 07:49:28 +00:00
Simon Emanuelsson
e082bf2e50 feat: make sure correct data is sent to tracking 2025-05-14 15:10:18 +00:00
Bianca Widstam
32618ad318 Merged in fix/add-breakfast-wrong-quantity (pull request #2086)
fix: check if breakfast and refill modal with correct confirmation if cancelled/error payment

* fix: check if breakfast and refill modal with correct confirmation if cancelled/error payment

* fix: only include packages with quantity


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-05-14 08:12:45 +00:00
Bianca Widstam
0146dd1118 Merged in fix/SW-2738-show-quantity-ancillaries--mobile (pull request #2084)
fix(SW-2738): add quantity to title for mobile and desktop

* fix(SW-2738): add quantity to title for mobile and desktop


Approved-by: Niclas Edenvin
Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
2025-05-14 06:49:33 +00:00
Simon Emanuelsson
b7c78a53b5 feat: add support for bought children breakfast package 2025-05-13 10:01:26 +00:00
Bianca Widstam
19166ec5c7 Merged in fix/SW-2720-rounded-price (pull request #2068)
fix(SW-2720): formatPrice

* fix(SW-2720): formatPrice

* fix(SW-2720): refactor formatPrice


Approved-by: Niclas Edenvin
2025-05-13 09:12:04 +00:00
Bianca Widstam
45f61bd81e Merged in fix/SW-2716-wrong-package-for-breakfast (pull request #2063)
fix: add correct package for callback

* fix: add correct package for callback


Approved-by: Niclas Edenvin
Approved-by: Linus Flood
2025-05-13 06:51:31 +00:00
Hrishikesh Vaipurkar
f4c31449c3 Merged in feat/SW-2612-mystay-breakfast-buffet-u (pull request #2034)
feat: SW-2612 Display value of breakfast multiplied with adults and children

* feat: SW-2612 Display value of breakfast multiplied with adults and children


Approved-by: Niclas Edenvin
2025-05-12 07:05:31 +00:00
Linus Flood
06bfc5e252 Merged in hotfix/img-url (pull request #2043)
hotfix/ancillaries-breakfast-img-url

* hotfix/ancillaries-breakfast-img-url


Approved-by: Joakim Jäderberg
2025-05-12 06:51:50 +00:00
Bianca Widstam
0fd18590c5 Merged in fix/SW-2648-remove-ancillary-update-price (pull request #2002)
fix(SW-2648): refresh mystay after removing ancillary

* fix(SW-2648): refresh mystay after removing ancillary


Approved-by: Niclas Edenvin
2025-05-08 06:48:01 +00:00
Bianca Widstam
868c4aefec Merged in fix/SW-2608-add-per-night-child-breakfast (pull request #1993)
fix(SW-2608): add per night for children breakfast

* fix(SW-2608): add per night for children breakfast

* fix(SW-2608): capitalized according to figma


Approved-by: Michael Zetterberg
2025-05-07 13:58:06 +00:00
Bianca Widstam
1438007d89 fix(SW-2608): add night on breakfast modal 2025-05-06 04:01:38 +00:00
Michael Zetterberg
b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +00:00
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Simon Emanuelsson
db289b80b1 feat: refactor NewDates, clean up legacy code
This reverts commit 0c7836fa59.
2025-05-03 21:45:45 +02:00
Linus Flood
6979ac0c3b Merged in revert-pr-1925 (pull request #1927)
Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
2025-05-02 13:05:42 +00:00
Arvid Norlin
74d37dad93 feat(SW-2116): RefId instead of confirmationNumber 2025-05-02 12:44:07 +02:00
Bianca Widstam
7070770581 Merged in fix/SW-2406-update-modal-ancillaries (pull request #1911)
fix(SW-2406): update modal for ancillaries

* fix(SW-2406): update modal for ancillaries

* fix(SW-2406): revert translations


Approved-by: Niclas Edenvin
Approved-by: Erik Tiekstra
2025-04-30 08:20:57 +00:00
Joakim Jäderberg
c1505ce50e Merged in feature/warmup (pull request #1887)
* unified warmup function

Approved-by: Linus Flood
2025-04-29 06:18:14 +00:00
Bianca Widstam
bfc25453c7 Merged in fix/SW-1415-my-stay-tracking-hotelId (pull request #1880)
fix(SW-1415): add hotelId in tracking for my stay

* fix(SW-1415): add hotelId in tracking for my stay

* fix: remove toast if cancel guarantee

* fix(SW-1415): rebase master

* fix(SW-1415): fix comment shorthand hotelId


Approved-by: Christian Andolf
2025-04-28 13:20:18 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Chuma Mcphoy (We Ahead)
169094fc37 Merged in refactor/SW-2476-use-react-aria-radio-group-for-payment-options (pull request #1849)
Refactor(SW-2177): Use react aria RadioGroup & Radio for payment options

* fix(SW-SW-2177): enhance accessibility for payment options

* Added keyboard navigation support to payment options.
* Updated CSS to improve focus styles for payment option labels.

* refactor: use RadioGroup & Radio from react aria for payment options

* refactor(SW-2177): replace setValue and watch with useController for payment method handling

* fix(SW-2177): remove comment and use cx for styles on PaymentOption

* fix(SW-2177): Add keyboard focus indicator to payment option


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-04-24 11:22:36 +00:00
Niclas Edenvin
8d1312c0fa Merged in fix/sw-2444-view-all-on-mobile (pull request #1834)
fix(sw-2444): view all ancillaries mobile

* fix(sw-2444): view all ancillaries mobile

On mobile the view all button to show all ancillaries shouldn't be
shown. It's already a carousel showing all available ancillaries.


Approved-by: Bianca Widstam
Approved-by: Matilda Landström
2025-04-22 09:07:24 +00:00
Michael Zetterberg
af65fbf7f4 fix: rename trpc route for get booking 2025-04-15 05:20:24 +00:00
Michael Zetterberg
440e1f92df feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass 2025-04-14 11:30:06 +00:00
Bianca Widstam
77c03905e4 Merged in fix/hide-payment-if-only-points (pull request #1741)
Feat(SW-1943): add new design for pay ancillaries with points

* fix: hide card and payment info if only quantity with points is selected

* feat(SW-1943): add new design for pay ancillaries with points

* feat(SW-1943): add missing translation

* feat(SW-1943): fix rebase

* feat(SW-1943): remove console log


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-04-10 06:18:02 +00:00
Matilda Landström
1239f0c662 Merged in feat/SW-1711-SW-2077-icons (pull request #1709)
Fix(SW-1711)/(SW-2077): Export icons individually

* fix(SW-1711): export icons individually


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-04-07 07:25:25 +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
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
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
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
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
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
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
Niclas Edenvin
198927e6aa Merged in fix/sw-2092-ancillary-fixes (pull request #1690)
Don't show added ancillaries section if no ancillaries

* Don't show added ancillaries section if no ancillaries


Approved-by: Bianca Widstam
2025-04-01 08:02:43 +00:00
Niclas Edenvin
dff67ea568 Merged in feat/sw-1839-show-added-breakfast (pull request #1673)
Feat/sw-1839 show added breakfast

* Fix wrong space character

* Change to correct CSS variable

* Show added breakfast ancillary in the "My add-ons" section

* Show breakfast info in room card

* Show breakfast in price details table

* Format price


Approved-by: Pontus Dreij
2025-03-31 13:43:39 +00:00
Niclas Edenvin
e8148fdf21 Merged in fix/remove-modify-button (pull request #1674)
Ancillaries shouldn't be modifiable

* Ancillaries shouldn't be modifiable


Approved-by: Pontus Dreij
2025-03-31 07:41:36 +00:00
Simon Emanuelsson
ebaea78fb3 feat(SW-1717): rewrite select-rate to show all variants of rate-cards 2025-03-28 17:07:54 +00:00
Niclas Edenvin
8eec465afa Merged in feat/sw-1681-add-breakfast (pull request #1635)
Feat/sw-1681 add breakfast
This implements the add breakfast flow

Approved-by: Pontus Dreij
2025-03-27 12:40:54 +00:00
Matilda Landström
5de2a993a7 Merged in feat/SW-1711-switch-icons (pull request #1558)
Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons.

Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-03-27 09:42:52 +00:00
Niclas Edenvin
fef3a785d0 Merged in feat/sw-1688-list-breakfast (pull request #1615)
Feat/sw-1688 list breakfast

Approved-by: Pontus Dreij
2025-03-25 09:56:05 +00:00
Pontus Dreij
74c5b47319 Merged in feat/SW-1737-design-mystay-multiroom (pull request #1565)
Feat/SW-1737 design mystay multiroom

* feat(SW-1737) Fixed member view of guest details

* feat(SW-1737) fix merge issues

* feat(SW-1737) Fixed price details

* feat(SW-1737) removed unused imports

* feat(SW-1737) removed true as statement

* feat(SW-1737) updated store handling

* feat(SW-1737) fixed bug showing double numbers

* feat(SW-1737) small design fixed

* feat(SW-1737) fixed rebase errors

* feat(SW-1737) fixed create booking error with dates

* feat(SW-1737) fixed view multiroom as singleroom

* feat(SW-1737) fixes for multiroom

* feat(SW-1737) fixed bookingsummary

* feat(SW-1737) dont hide modify dates

* feat(SW-1737) updated breakfast to handle number

* feat(SW-1737) Added red color if member rate

* feat(SW-1737) fix PR comments

* feat(SW-1737) updated member tiers svg

* feat(SW-1737) updated how to handle paymentMethodDescription

* feat(SW-1737) fixes after testing mystay

* feat(SW-1737) updated Room type to just use whats used

* feat(SW-1737) fixed access

* feat(SW-1737) refactor my stay after PR comments

* feat(SW-1737) fix roomNumber translation

* feat(SW-1737) removed log


Approved-by: Arvid Norlin
2025-03-24 09:30:10 +00:00
Bianca Widstam
272c492b76 Merged in feat/SW-1943-ancillaries-with-points (pull request #1598)
feat(SW-1943): fix design to pay with points

* feat(SW-1943): fix design to pay with points


Approved-by: Niclas Edenvin
2025-03-21 13:44:14 +00:00
Bianca Widstam
3c1eee88b1 Merged in feat/SW-1370/Guarantee-my-stay-ancillaries (pull request #1545)
Feat/SW-1370/Guarantee my stay ancillaries

* feat(SW-1370): guarantee for ancillaries

* feat(SW-1370): remove console log

* feat(SW-1370): add translations

* feat(SW-1370): small fix

* feat(SW-1370): fix must be guaranteed

* feat(SW-1370): fix logic and comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): add translation

* feat(SW-1370): add translation and fix pr comment

* feat(SW-1370): fix pr comment

* feat(SW-1370): fix encoding path refId issue

* feat(SW-1370): refactor AddAncillaryStore usage and introduce context provider

* feat(SW-1370): refactor

* feat(SW-1370): refactor ancillaries

* feat(SW-1370): fix merge


Approved-by: Simon.Emanuelsson
2025-03-21 07:29:04 +00:00