scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,531 Commits 2 Branches 0 Tags
26a0bda6db371df89891482d731daef6ee2e2815
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Pontus Dreij 26a0bda6db Merged in fix/breakfast-card (pull request #1352) 
fix: showing "undefined" if ancillary.price.text was undefined

* fix: showing "undefined" if ancillary.price.text was undefined


Approved-by: Tobias Johansson
 2025-02-18 08:55:37 +00:00
Pontus Dreij e360f9b926 Merged in fix/SW-1329-fix-height-select-rate-card (pull request #1351) 
Fix (SW-1329): Height on room card title

* Fix (SW-1329): Height on room card title


Approved-by: Bianca Widstam
 2025-02-17 14:41:16 +00:00
Pontus Dreij ed9dbded5d Merged in feat/SW-1504-UI-update-breakfast-component (pull request #1284) 
feat(SW-1504): Used AncillaryCard and added to breakfast choice

* feat(SW-1504): Craeted AncillaryCard and added to breakfast choice

* feat(SW-1504): Using of AncillaryCard

* feat(SW-1504) Removed unused imports

* feat(SW-1504): Added price text

* feat(SW-1504): added /night per adult

* feat(SW-1504) Removed type prop


Approved-by: Arvid Norlin
 2025-02-14 15:43:14 +00:00
Pontus Dreij ea9d68a191 Merged in feat/SW-1540-fetch-updated-data-booking (pull request #1316) 
feat(SW-1540): Fetch data from API for MyStay

* feat(SW-1540): Fetch data from API for MyStay

* feat(SW-1540): Moved myStaySkeleton

* feat(SW-1540) used memoized getBookingConfirmation instead


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
 2025-02-12 10:22:54 +00:00
Pontus DreijandLinus Flood 3901c3ac77 Merged in fix/SW-1551-TRPCError (pull request #1313) 
fix/SW-1551-TRPCError

* fix(SW-1551): Fixed error in schema


Approved-by: Hrishikesh Vaipurkar
Approved-by: Linus Flood
 2025-02-12 09:01:27 +00:00
Pontus Dreij 3ad5b9e73d Merged in feat/SW-1540-Fetch-correct-data-from-the-API (pull request #1309) 
feat(SW-1551): Update schema for booking

* feat(SW-1551): Update schema for booking

* feat(SW-1551): Non breaking changes


Approved-by: Michael Zetterberg
 2025-02-11 15:37:28 +00:00
Pontus Dreij c863294919 Merged in feat/SW-1055-Accordion-for-summary-bar-in-mobile-on-Select-Rate (pull request #1283) 
Feat/SW-1055 Accordion for summary bar in mobile on Select Rate

* feat(SW-1055) created mobile summary for select rate

* feat(SW-1055) Added summary for mobile (accordion)


Approved-by: Tobias Johansson
 2025-02-10 15:11:31 +00:00
Pontus Dreij ec8db51c47 Merged in feat/ancillery-card (pull request #1293) 
Created AncillaryCard for SW-1504 and SW-1546

* Created AncillaryCard for SW-1504 and SW-1546

* updated divider

* added dangerouslySetInnerHTML

* Added color="uiTextHighContrast"


Approved-by: Bianca Widstam
 2025-02-10 14:01:49 +00:00
Pontus Dreij e51950c8b2 Merged in feat/SW-1497-hide-special-needs (pull request #1285) 
feat(SW-1497): Temporary hide Special requests dropdowns

* feat(SW-1497): Temporary hide Special requests dropdowns


Approved-by: Tobias Johansson
 2025-02-10 08:31:43 +00:00
Pontus Dreij 8b47749508 Merged in fix/remove-composes (pull request #1286) 
fix: Removed composes

Approved-by: Michael Zetterberg
 2025-02-08 15:32:57 +00:00
Pontus Dreij cb7d7efc86 fix: Removed composes so it's easier to change from css modules if we want 2025-02-08 13:58:23 +01:00
Pontus Dreij fbe05eb456 Merged in feat/SW-717-multiroom-select-hotel-api (pull request #1225) 
Feat/SW-717 multiroom select hotel api
 2025-02-07 13:15:07 +00:00
Pontus Dreij 575420ca0a feat(SW-717) use of combineRoomAvailabilities in RoomsContainer 2025-02-07 08:48:45 +01:00
Pontus Dreij 08ce2bc338 feat(SW-717) fixed type error after rebase 2025-02-07 08:44:01 +01:00
Pontus Dreij dcd45ee31d feat(SW-717) make reduce more understandable 2025-02-07 08:38:49 +01:00
Pontus Dreij e00cea4646 feat(SW-717) use of AvailabilityEnum instead of strings 2025-02-07 08:38:47 +01:00
Pontus Dreij 7424ecf2bf feat(SW-717) fixed issues after rebase 2025-02-07 08:37:57 +01:00
Pontus Dreij 7a9bfd447b feat(SW-717) Fixed bug where available rooms didn't show if there where also unavaible dublicates. 2025-02-07 08:37:57 +01:00
Pontus Dreij d5bc2b3c57 feat(SW-717) Multiple requests if adult differ between rooms 2025-02-07 08:37:53 +01:00
Pontus Dreij b6d8431e82 Merged in feat/SW-964-Sticky-summary-multiroom (pull request #1231) 
Feat/SW-964 Sticky summary multiroom (UX)

* feat(SW-964) Multiroom support for summary in select-rate

* feat(SW-964) added utils for calculateTotalPrice

* feat(SW-964) Removed duplicated code


Approved-by: Tobias Johansson
 2025-01-31 11:09:46 +00:00
Pontus Dreij 4da3934768 feat(SW-718) Removed unused import 2025-01-30 11:19:22 +01:00
Pontus Dreij eef7c222aa feat(SW-718) refactor: optimize rate selection and room scrolling 2025-01-30 11:19:22 +01:00
Pontus Dreij ab7b826cd2 feat(SW-718) created useRoomFilteringStore 2025-01-30 11:19:22 +01:00
Pontus Dreij ba20ce2696 feat(SW-718) refactor filter submit 2025-01-30 11:19:22 +01:00
Pontus Dreij b42f92b121 feat(SW-718) Updated css naming 2025-01-30 11:19:22 +01:00
Pontus Dreij f1ca27ebd6 feat(SW-718) moved RoomCardSkeleton 2025-01-30 11:19:22 +01:00
Pontus Dreij 790c485120 feat(SW-718) Don't show image if no src 2025-01-30 11:19:22 +01:00
Pontus Dreij 3f43d35448 feat(SW-718) Removed unused 2025-01-30 11:19:22 +01:00
Pontus Dreij b7cf3296cf feat(SW-718) Fix import error 2025-01-30 11:19:22 +01:00
Pontus Dreij 68d7e869db feat(SW-718) updates after PR comments 2025-01-30 11:19:22 +01:00
Pontus Dreij bfdc62d263 feat(SW-718): fix comments 2025-01-30 11:19:22 +01:00
Pontus Dreij 22fe34d5c0 feat(SW-718): removed log 2025-01-30 11:19:22 +01:00
Pontus Dreij 1f3d7cf446 feat(SW-718): Fixed bug where children was not displayd in selected room panel 2025-01-30 11:19:22 +01:00
Pontus Dreij 2c7f6006c5 feat(sW-718) use convertSearchParamsToObj instead of new util 2025-01-30 11:19:22 +01:00
Pontus Dreij c8ed172f0e feat(SW-718) Added type FilterValues 2025-01-30 11:19:22 +01:00
Pontus Dreij 6561bb5d57 feat(SW-718): Updated type in props 2025-01-30 11:19:22 +01:00
Pontus Dreij 2a6c88d897 feat(SW-718): Created store for selectRate 2025-01-30 11:19:22 +01:00
Pontus Dreij 98793c58e3 feat(SW-718): Animation on selection of multiple room 2025-01-30 11:19:22 +01:00
Pontus Dreij 328cbbe0e1 feat(SW-718) Fixed filtering with multirooms 2025-01-30 11:19:22 +01:00
Pontus Dreij edcf146ce1 feat(SW-718) Refactor select rate to support multiroom 2025-01-30 11:19:22 +01:00
Pontus Dreij 7d716dcf4a feat(SW-718): parse room from searchParams 2025-01-30 11:19:22 +01:00
Pontus Dreij 3b68d3471e fix: Removed double check 2025-01-27 10:24:00 +01:00
Pontus Dreij 4bc459f0a4 fix: Update getRoomsAvailability 2025-01-27 10:22:29 +01:00
Pontus Dreij 7343d873c2 Merged in fix/SW-1103-page-loading (pull request #1181) 
Fix/SW-1103 page loading

* feat(SW-1103): Move backend req behinde suspense

* fix/SW-1103 fix merge conflicts


Approved-by: Joakim Jäderberg
 2025-01-24 10:16:30 +00:00
Pontus Dreij 33f0696c47 Merged in fix/SW-1111-r2 (pull request #1169) 
fix(SW-1111) Fix issues with map

Approved-by: Niclas Edenvin
 2025-01-17 06:15:55 +00:00
Pontus Dreij 185dc3e8cc fix(SW-1111) Fix issues with map 2025-01-10 14:52:59 +01:00
Pontus Dreij b4060d720b Merged in feat/SW-716-multiroom-guest-picker (pull request #1084) 
feat(SW-716) Added UI to add more rooms in guest/room picker

* feat(SW-716) Added UI to add more rooms in guest/room picker

* feat(SW-716) Renamed GuestRoom Type and updated html structure

* Feat(SW-716): Created a BookingFlowIteration1 folder

* feat(SW-716) Moved forms/bookingwidget to new flow

* feat(SW-716) Added new ENABLE_BOOKING_FLOW_ITERATION_1 and ENABLE_BOOKING_FLOW_ITERATION_2

* feat(SW-716) Re added booking widget into interaction1 of how it looks now in prod

* Revert "feat(SW-716) Re added booking widget into interaction1 of how it looks now in prod"

This reverts commit 9a5514e8e71b1487e610bf64986ca77a538c0023.

* Revert "feat(SW-716) Added new ENABLE_BOOKING_FLOW_ITERATION_1 and ENABLE_BOOKING_FLOW_ITERATION_2"

This reverts commit b00bfc08cb7878d91483220ba3e8322671c145e4.

* Revert "feat(SW-716) Moved forms/bookingwidget to new flow"

This reverts commit 6c81635fe929a71fb3a42d8f174706787d8578ed.

* Revert "Feat(SW-716): Created a BookingFlowIteration1 folder"

This reverts commit db41f1c7fcd8e3adf15713d5d36f0da11e03e3a4.

* feat(SW-716): Added NEXT_PUBLIC_HIDE_FOR_NEXT_RELEASE

* feat(SW-716) Readded Tooltip if NEXT_PUBLIC_HIDE_FOR_NEXT_RELEASE is true

* feat(SW-716) remove log


Approved-by: Niclas Edenvin
Approved-by: Christian Andolf
 2025-01-08 15:09:29 +00:00
Pontus Dreij df1e4da001 Merged in fix/schema-error-included (pull request #1107) 
fix: schema error included

Approved-by: Niclas Edenvin
 2024-12-19 15:13:28 +00:00
Pontus Dreij 54086c40fc fix: Changed to default 2024-12-19 15:33:23 +01:00
Pontus Dreij 70d9533b13 fix: schema error included 2024-12-18 16:48:10 +01:00
Pontus Dreij 13717118c6 Merged in fix/SW-952-map-hotel-cards-design-mobile (pull request #1099) 
Fix/SW-952 map hotel cards design mobile

Approved-by: Bianca Widstam
 2024-12-17 16:01:59 +00:00
Pontus Dreij c6b6db024d fix(SW-952) re added address mobile 2024-12-17 16:57:59 +01:00
Pontus Dreij a3fd54636e fix(SW-952): check for valid hotels 2024-12-17 16:41:38 +01:00
Pontus Dreij 7fc68d3a0b Fix(SW-952) added translations 2024-12-17 16:33:00 +01:00
Pontus Dreij 1cef92d0cf Fix(SW-952) Fixed shimmer width 2024-12-17 16:33:00 +01:00
Pontus Dreij 54ad8fe62c fix(SW-952) fix hydration error in map 2024-12-17 16:33:00 +01:00
Pontus Dreij 71b11f33ac fix(SW-952): New HotelCard for Map in mobile 2024-12-17 16:33:00 +01:00
Pontus Dreij c468669776 fix(SW-952) Show skeleton correct in mobile 2024-12-17 16:33:00 +01:00
Pontus Dreij 0c62cb6d96 Merged in feat/SW-977-update-bookingwidget-with-hotel-name (pull request #1071) 
Feat/SW-977 update bookingwidget with hotel name

Approved-by: Fredrik Thorsson
 2024-12-17 14:47:43 +00:00
Pontus Dreij 24ef1e98e0 feat(SW-977): Add more controls if Json is valid 2024-12-17 15:29:20 +01:00
Pontus Dreij 3cd893e088 fix: build error 2024-12-17 14:30:25 +01:00
Pontus Dreij 237147825c feat(SW-977) check if json is valid 2024-12-17 14:21:48 +01:00
Pontus Dreij c635a8b072 feat(SW-977): Scenario 2 & 4 2024-12-17 14:07:26 +01:00
Pontus Dreij 4f92d1da08 feat(SW-977): Scenario 1 2024-12-17 14:07:26 +01:00
Pontus Dreij 2e2b651e15 Merged in fix/hotel-listing-improvements (pull request #1079) 
fix/hotel-listing-improvements

Approved-by: Niclas Edenvin
 2024-12-13 13:56:09 +00:00
Pontus Dreij 07a7dc9366 Reveret merchantInformationData fix 2024-12-13 14:36:13 +01:00
Pontus Dreij be33837b55 fix: update merchantInformationData query 2024-12-13 14:11:33 +01:00
Pontus Dreij eb2a0a4cb9 Fix: Added optional merchantInformationData 2024-12-13 14:03:13 +01:00
Pontus Dreij 78bf7ef387 fixed issue where city and hotel is undefined or null 2024-12-13 13:57:44 +01:00
Pontus Dreij 20cbb4b0a0 Fix: Merging issues 2024-12-13 12:19:47 +01:00
Pontus Dreij c2b4d8abcf Fix: created hook for useScrollToTop to reuse functionallity and util for getSortedHotels 2024-12-13 12:19:47 +01:00
Pontus Dreij 50fc8a183c Fix: created util to handle searchParams for hotelreservation 2024-12-13 12:19:47 +01:00
Pontus Dreij 3dae3e69cc Merged in fix/SW-1168-list-correct-hotels-for-map (pull request #1076) 
fix(SW-1168) Show only hotel cards that are visible on map

Approved-by: Michael Zetterberg
 2024-12-13 07:13:33 +00:00
Pontus Dreij e1bc7c25e0 fix(SW-1168) Fixed comments for map 2024-12-12 20:30:41 +01:00
Pontus Dreij f9b8c00b00 Merged in fix/SW-1143-loading-select-hotel (pull request #1081) 
Fix/SW-1143 loading select hotel

Approved-by: Michael Zetterberg
 2024-12-12 17:14:21 +00:00
Pontus Dreij b0969bcc9f fix(SW-1143) trigger Suspense 2024-12-12 15:13:59 +01:00
Pontus Dreij 197c65d618 fix(SW-1143) Trigger Suspense on more params 2024-12-12 15:12:59 +01:00
Pontus Dreij e05372f4d8 fix(SW-1168) Fixed typing 2024-12-12 14:51:54 +01:00
Pontus Dreij c3e56d5b49 fix(SW-1168) Show only hotel cards that are visible on map 2024-12-12 14:51:54 +01:00
Pontus Dreij 9867a56cc8 Merged in fix/SW-1116-remove-border (pull request #1068) 
fix(SW-1116) Removed border on click but kept it on tab

Approved-by: Bianca Widstam
Approved-by: Niclas Edenvin
 2024-12-12 09:31:31 +00:00
Pontus Dreij 38f872a1f3 Merged in fix/SW-1115-use-enter-to-search (pull request #1067) 
fix(SW-1115) trigger search

Approved-by: Niclas Edenvin
 2024-12-11 12:02:45 +00:00
Pontus Dreij df6333fa22 fix(SW-1115) merge to one if 2024-12-11 13:02:12 +01:00
Pontus Dreij 3c9aaa3dd3 fix(SW-1115) trigger search 2024-12-11 13:02:12 +01:00
Pontus Dreij e913d949bb fix(SW-1116) Removed border on click but kept it on tab 2024-12-11 12:47:04 +01:00
Pontus Dreij 8ca7c44d10 Merged in fix/SW-1143-loading-select-hotel (pull request #1059) 
fix(SW-1143): Added loading/skeleton to select hotel

Approved-by: Bianca Widstam
 2024-12-10 14:15:08 +00:00
Pontus Dreij a7b193c96d fix(SW-1143) removed async from fallback 2024-12-10 15:02:14 +01:00
Pontus Dreij f9e50b7ea7 fix(SW-1143) fix breadcrumbs skeleton 2024-12-10 13:40:55 +01:00
Pontus Dreij 153ed086cb fix(SW-1143) Set with on breadcrumbs shimmer 2024-12-10 13:40:55 +01:00
Pontus Dreij 71685c24f4 fix(SW-1143) improvements on Skeleton 2024-12-10 13:40:55 +01:00
Pontus Dreij 22a5edc2d7 fix(SW-1143): added safeTry 2024-12-10 13:40:55 +01:00
Pontus Dreij d4e4c4a0d0 fix(SW-1143): Added loading/skeleton to select hotel 2024-12-10 13:40:55 +01:00
Pontus Dreij 463354f10b Merged in fix/SW-1111-issues-with-map-select-hotel (pull request #1057) 
Fix/SW-1111 issues with map select hotel

Approved-by: Bianca Widstam
 2024-12-10 12:40:13 +00:00
Pontus Dreij ad0a6cea7b fix(SW-1111) import type 2024-12-10 13:20:46 +01:00
Pontus Dreij f3a9bf05eb fix(SW-1111) removed log 2024-12-10 11:40:25 +01:00
Pontus Dreij 79e1dc3e0f fix(SW-1111) Use Link 2024-12-10 11:39:32 +01:00
Pontus Dreij f8d10d7b8c fix(SW-1111) fix filter button and filter flimmer in mobile 2024-12-10 09:30:58 +01:00
Pontus Dreij 15c5afc43a fix(SW-1111) refactor state of active hotel card and hotel pin 2024-12-09 16:50:02 +01:00
Pontus Dreij 7f50d34431 fix(SW-1111) Added Loading instead of Suspense 2024-12-09 16:50:02 +01:00
Pontus Dreij 05cd62e339 fix(SW-1111) moved MapContainer 2024-12-09 16:50:02 +01:00
Pontus Dreij b14a1a7097 feat(SW-1111) Added Suspense on map 2024-12-09 16:50:02 +01:00