scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,533 Commits 2 Branches 0 Tags
f46bc8f920c08fca862abe839bb60f96ca1fd067
Commit Graph

128 Commits

Author SHA1 Message Date
Anton Gunnarsson
f46bc8f920 Update @hookform/resolvers 
In v5 the zod resolver will automatically infer the type for `useForm`.
It's not recommended to manually specify types.
See https://github.com/react-hook-form/resolvers/releases/tag/v5.0.0
 2025-05-22 14:00:39 +02:00
Bianca Widstam
c4229c2dd2 Merged in fix/SW-2853-tracking-breakfast-ancillaries (pull request #2188) 
fix(SW-2853): tracking for breakfast ancillaries

* fix(SW-2853): tracking for breakfast ancillaries

* fix(SW-2853): viewAncillary event fix for breakfast

* fix(SW-2853): pr comment spread room facilities


Approved-by: Tobias Johansson
 2025-05-22 10:05:54 +00:00
Linus Flood
2ec309354e Merged in fix/my-stay-webview-2 (pull request #2191) 
fix: webview - mystay - check if we have webviewToken

* fix: webview - mystay - check if we have webviewToken

* Cleanup


Approved-by: Joakim Jäderberg
 2025-05-22 08:38:20 +00:00
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
2cc5574f52 Merged in feat/SW-2340-aa-tracking-my-stay-pageview- (pull request #2133) 
feat: SW-2340 Implemented tracking on my-stay, webview my-stay and receipt page

* feat: SW-2340 Implemented tracking on my-stay, webview my-stay and receipt page

* feat: SW-2340 Updated webview tracking

* feat: SW-2340 Updated receipt tracking


Approved-by: Linus Flood
 2025-05-19 08:05:43 +00:00
Linus Flood
96821c7a6f Merged in feat/my-stay-masking (pull request #2116) 
Mask values on my-stay and receipt pages SW-2788

* Mask values on my-stay and receipt pages


Approved-by: Joakim Jäderberg
 2025-05-16 09:30:04 +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
Simon Emanuelsson
1a28bcdc4c feat: use correct key for searchParams check 2025-05-14 15:10:18 +00:00
Simon Emanuelsson
ca29237f2e feat: add no breakfast message to price details modal and to conf page receipt 2025-05-14 11:12:24 +02: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
Bianca Widstam
4aa069b01c Merged in fix/SW-2728-update-totalpoints-my-stay (pull request #2074) 
fix(SW-2728): update totalpoints in my stay

* fix(SW-2728): update totalpoints in my stay


Approved-by: Simon.Emanuelsson
 2025-05-13 10:37:19 +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
Anton Gunnarsson
60af31762b Merged in fix/make-user-loyalty-optional (pull request #2044) 
fix: Make loyalty optional on user

* Optional user loyalty

* merge


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
 2025-05-12 09:00:11 +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
Simon Emanuelsson
2adb0e92eb fix: re-add tracking my-stay 2025-05-09 14:53:51 +00:00
Michael Zetterberg
55ed8c51fd feat(SW-2686): MFA for modify guest details for authenticated user 2025-05-09 08:40:55 +00:00
Simon Emanuelsson
a99e434d84 feat: move room charge to top in price details modal 2025-05-08 10:38:44 +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
343caed40c Merged in fix/SW-2402-hide-gla-rewardNight (pull request #1983) 
fix(SW-2042): hide guarantee late arrival on my stay for rewardNight

* fix(SW-2042): hide guarantee late arrival on my stay for rewardNight


Approved-by: Niclas Edenvin
 2025-05-06 14:16:34 +00:00
Michael Zetterberg
1679e1d65d feat(SW-2622): pass refId to guarantee booking 2025-05-06 15:13:49 +02:00
Niclas Edenvin
e0fe5ff0d5 fix(SW-2614): send language to API 
We were missing the language param on some endpoints. We are still
missing it on some, but I left those without when we don't need it, e.g.
when only caring about the IDs in the response.
 2025-05-06 10:17:05 +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
f681fa7675 Merged in chore/replace-corner-radius-variable-with-new (pull request #1943) 
chore: replace old border-radius variables with new tokens

Approved-by: Erik Tiekstra
 2025-05-05 11:24:48 +00:00
Christian Andolf
5da16ed10a chore: remove useless color attributes on html elements 2025-05-05 11:40:10 +02: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
Niclas Edenvin
c6a0b4ee30 Merged in fix/terms-and-conditions-link (pull request #1933) 
Don't check checkbox when clicking link inside the label

* Don't check checkbox when clicking link inside the label
 2025-05-03 14:51:06 +00:00
Arvid Norlin
0c7836fa59 Merged in fix/SW-2553-sidepeeks (pull request #1919) 
Fix/SW-2553 sidepeeks

* fix(SW-2553): apply sidepeek display logic

* chore: move convertToChildType and getPriceType utils

* fix: apply PR requested changes

* fix(SW-2553): fix roomNumber for multiroom

* fix(SW-2553): fix sidepeek for my-stay page


Approved-by: Michael Zetterberg
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-05-02 15:10:34 +00:00
Linus Flood
d49ecdae1f Merged in feat/sw-2323-find-booking3 (pull request #1928) 
Feat/sw-2323 New Find booking endpoint

* wip

* wip


Approved-by: Anton Gunnarsson
 2025-05-02 13:21:00 +00: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
Arvid Norlin
7eeb0bbcac feat(SW-2116): avoid passing entire booking object to Room client component 2025-05-02 11:47:14 +02:00
Niclas Edenvin
d7708b682a Merged in fix/sw-2543-toc-text (pull request #1921) 
fix(SW-2543): Change terms and conditions text for flex

* fix(SW-2543): Change terms and conditions text for flex

Approved-by: Michael Zetterberg
 2025-05-02 07:45:37 +00:00
Christian Andolf
43bdd80dff Merged in fix/SW-2508-new-api-cancel-booking-contract (pull request #1906) 
Ending up doing some extra things:

Consolidated booking queries: We had both cancel and cancelMany, but functionally they’re the same, only one accepts an array and the other doesn’t. Didn’t see much point in keeping the single cancel as it wasn’t used anywhere. Thus, I could rename cancelMany to be the one stop method.

remove method for API now properly supports body so we don’t have to hijack the typing in certain places

* fix(SW-2508): now sending additional params to cancel api for new contract


Approved-by: Niclas Edenvin
 2025-05-02 07:37:23 +00:00
Michael Zetterberg
efb7219b6d fix: copy fixes for English labels 2025-04-30 09:37:54 +00: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
Simon Emanuelsson
b5deb84b33 fix: always use totalPrice to display roomCharge 2025-04-28 12:40:52 +00:00