Commit Graph

164 Commits

Author SHA1 Message Date
Linus Flood
fa20f128ef Merged in feat/check-session-fix-2 (pull request #1154)
fix: is user logged in fix

* fix: is user logged in fix
2025-01-08 15:38:36 +00:00
Linus Flood
8308d00464 fix: valid session check in rooms container 2025-01-08 15:24:20 +01:00
Tobias Johansson
1018b3ebcd Merged in feat/SW-1169-map-bedtype-icons (pull request #1113)
Feat/SW-1169 map bedtype icons

* feat(SW-1169): Added bed icons

* fix(SW-1169): update fill rule property

* fix(SW-1169): update clip rule prop

* feat(SW-1169): Added way of rendering bed type icons with extra beds

* feat(SW-1169): update room schema to map mainBed to enum

* feat(SW-1169): update bedtype icon color

* feat(SW-1169): transform unknown bed types to BedTypeEnum.Other

* test: update mock data with new schema


Approved-by: Christel Westerberg
2025-01-08 13:26:56 +00:00
Tobias Johansson
6ca56f3138 Merged in feat/SW-822-handle-breakfast-included (pull request #1138)
Feat/SW-822 handle breakfast included

* feat(SW-822): Added flag for breakfast included and hide breakfast step if included

* fix: check if window is defined to avoid error during SSR

* fix: remove return if rate definition is not found because its expected if input is undefined


Approved-by: Christel Westerberg
Approved-by: Arvid Norlin
2025-01-08 12:34:20 +00:00
Arvid Norlin
0c7c6ea21a feat: add Price details modal 2024-12-20 09:28:06 +01:00
Simon Emanuelsson
51f422510c feat(SW-865): link to booking without validation 2024-12-19 12:42:21 +01:00
Simon Emanuelsson
9d4998c9c5 feat(SW-885): ancillary and book next stay 2024-12-19 12:42:21 +01:00
Linus Flood
3982b1ba56 Merged in feat/sentry (pull request #1089) 2024-12-19 10:35:20 +00:00
Erik Tiekstra
3939bf7cdc feat(SW-664): Hotel listing component and queries for content pages 2024-12-18 12:20:57 +01:00
Tobias Johansson
118f1afafa Merged in feat/SW-1023-bed-type-information (pull request #1056)
Feat/SW-1023 bed type information

* feat(SW-1023): add bed type info

* fix: formatting of bed type string

* fix(SW-1023): refactored bed type info and added default value to children beds

* fix(SW-1023): fixes from PR


Approved-by: Christel Westerberg
Approved-by: Simon.Emanuelsson
2024-12-18 09:47:06 +00:00
Pontus Dreij
71b11f33ac fix(SW-952): New HotelCard for Map in mobile 2024-12-17 16:33:00 +01:00
Christel Westerberg
8328493289 fix: align placeholder handling for all hotel images in zod 2024-12-17 16:13:58 +01:00
Fredrik Thorsson
53c1588e4c feat(SW-1012): remove accidentally added files 2024-12-17 14:12:37 +01:00
Erik Tiekstra
63a77b215d feat(SW-1012): Started implementing restaurant data 2024-12-17 14:12:37 +01:00
Linus Flood
f91d74294e Merge remote-tracking branch 'origin' into feature/tracking 2024-12-16 09:11:28 +01:00
Linus Flood
fd91b96c99 Fixed tracking on Confirmation page 2024-12-16 08:18:21 +01:00
Pontus Dreij
eb2a0a4cb9 Fix: Added optional merchantInformationData 2024-12-13 14:03:13 +01:00
Pontus Dreij
50fc8a183c Fix: created util to handle searchParams for hotelreservation 2024-12-13 12:19:47 +01:00
Linus Flood
742a2820d1 Merge remote-tracking branch 'origin' into feature/tracking 2024-12-13 09:02:37 +01:00
Christel Westerberg
658afd0327 fix: handle cases with counterRateCode missing 2024-12-13 08:20:36 +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
Bianca Widstam
9e42cf0f37 Merged in fix/SW-1153-correct-breakfast-message (pull request #1060)
fix(SW-1153): fix breakfast message for ScandicGo hotels

Approved-by: Pontus Dreij
2024-12-10 08:13:13 +00: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
007b77101b fix(SW-1111) added filter on pins 2024-12-09 16:50:02 +01:00
Arvid Norlin
083ba28f9e feat: add SignupPromo component 2024-12-05 15:33:25 +01:00
Simon Emanuelsson
1d4a838860 feat(SW-866): download invoice 2024-12-05 11:21:20 +01:00
Bianca Widstam
a0c2d0bef7 fix(SW-1042): fix comment 2024-12-04 14:09:16 +01:00
Bianca Widstam
5dec45474d fix(SW-1041): remove unused props 2024-12-04 14:09:16 +01:00
Bianca Widstam
61f9290487 fix(SW-1042)(SW-1114)(SW-1123): fix select room bugs 2024-12-04 14:09:16 +01:00
Simon Emanuelsson
33de623f41 feat(SW-864): add to calendar functionality 2024-12-02 21:56:11 +01:00
Bianca Widstam
4f871a3220 Merged in feat/SW-1051-amenities-in-sidepeek (pull request #1007)
feat(SW-1051): fix sidepeek select hotel page

* feat(SW-1051): fix sidepeek select hotel page


Approved-by: Niclas Edenvin
2024-12-02 13:45:31 +00:00
Pontus Dreij
75ffbf4186 Merged in fix/SW-978-error-page-gdansk (pull request #1002)
Fix/SW-978 error page gdansk

Approved-by: Niclas Edenvin
2024-12-02 11:20:06 +00:00
Simon Emanuelsson
ed1574838a feat: new booking confirmation page 2024-11-29 15:55:30 +01:00
Pontus Dreij
3d78bdd671 fix(SW-978) Checks for null data on hotels 2024-11-29 09:41:24 +01:00
Tobias Johansson
9b90e99adf Merged in feat/SW-1007-saved-cards-filtering (pull request #980)
Feat/SW-1007 saved payment cards now shown based on supported cards by hotel

* fix(SW-1007): refactored savedCards to only show supported payment cards

* fix(SW-1007): show error message even if metadata is null

* fix: merge changes that were missed

* fix: remove use server


Approved-by: Christel Westerberg
2024-11-28 08:08:39 +00:00
Christel Westerberg
f5990998db fix: add hotel header to enter details flow 2024-11-27 15:59:12 +01:00
Simon Emanuelsson
ccb15593ea feat: merge stores, fix auto navigation, split summary 2024-11-27 10:20:14 +01:00
Tobias Johansson
70000afe1f Merged in feat/SW-755-price-change-non-happy (pull request #957)
Feat/SW-755 price change non happy

* fix(SW-755): dont show field error if checkbox has no children

* feat(SW-755): Price change route + dialog WIP

* fix(SW-755): minor refactoring

* fix(SW-755): added logging to price change route

* fix(SW-755): remove redundant search param logic

* fix(SW-755): moved enum cast to zod instead

* fix(SW-755): move prop type to types folder

* fix(SW-755): Added suspense to Payment and refactored payment options hook

* fix(SW-755): seperated terms and conditions copy from the checkbox label

* fix(SW-755): add currency format and fixed wrong translation

* fix(SW-755): change from undefined to null

* fix(SW-755): added extra type safety to payment options


Approved-by: Christian Andolf
Approved-by: Simon.Emanuelsson
2024-11-26 09:06:41 +00:00
Joakim Jäderberg
81c4a91563 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-22 13:16:40 +01:00
Joakim Jäderberg
74b634021a Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-22 10:30:53 +01:00
Pontus Dreij
c71c8af35a feat(SW-938) Added icon to roomFacilitiesSchema and detailedFacilitySchema 2024-11-22 10:17:56 +01:00
Pontus Dreij
08e71a8dc6 fix(946) Center from town name instead of calculate center 2024-11-21 14:15:51 +01:00
Joakim Jäderberg
10bd915217 merge 2024-11-21 12:43:25 +01:00
Tobias Johansson
7221e77fa0 Merged in fix/SW-933-incorrect-ratecode (pull request #947)
Fix/SW-933 incorrect ratecode when creating booking as a member

* fix(SW-933): Added check if member to select correct rate code in create booking

* fix(SW-933): set member price in summary when "join" is true

* fix(SW-933): change "price" -> "amount" and fix bool expression

* fix(SW-933): added check for membership number in summary


Approved-by: Christel Westerberg
2024-11-21 09:00:06 +00:00
Pontus Dreij
37098d23cf fix(SW-925) disable filter if there are no availablePackages 2024-11-20 14:41:48 +01:00
Pontus Dreij
10d2e094e4 fix(SW-925) Fix default packages 2024-11-20 14:41:48 +01:00
Joakim Jäderberg
dbb08960a5 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-20 14:33:05 +01:00
Joakim Jäderberg
d32a595e2e feat: contain logic for selecting price at the top level instead of on individual room card 2024-11-20 11:25:11 +01:00