Commit Graph

148 Commits

Author SHA1 Message Date
Simon Emanuelsson
051bc54e6c chore: cleaning up select-rate 2025-02-14 14:20:54 +01:00
Tobias Johansson
53b6628b25 Merged in feat/SW-965-select-rate-modify-room (pull request #1326)
Feat/SW-965 select rate modify room

* feat(SW-965): added new state for modify room and smaller fixes

* feat(SW-965): update state handling of modifyRateIndex

* fix: adjust scroll animation to handle modifyRateIndex

* fix: room state logic and removed unused css class


Approved-by: Pontus Dreij
Approved-by: Arvid Norlin
2025-02-14 07:48:30 +00:00
Tobias Johansson
b394d54c3f Merged in feat/enter-details-multiroom (pull request #1280)
feat(SW-1259): Enter details multiroom

* refactor: remove per-step URLs

* WIP: map multiroom data

* fix: lint errors in details page

* fix: made useEnterDetailsStore tests pass

* fix: WIP refactor enter details store

* fix: WIP enter details store update

* fix: added room index to select correct room

* fix: added logic for navigating between steps and rooms

* fix: update summary to work with store changes

* fix: added room and total price calculation

* fix: removed unused code and added test for breakfast included

* refactor: move store selectors into helpers

* refactor: session storage state for multiroom booking

* feat: update enter details accordion navigation

* fix: added room index to each form component so they select correct room

* fix: added unique id to input to handle case when multiple inputs have same name

* fix: update payment step with store changes

* fix: rebase issues

* fix: now you should only be able to go to a step if previous room is completed

* refactor: cleanup

* fix: if no availability just skip that room for now

* fix: add select-rate Summary and adjust typings


Approved-by: Arvid Norlin
2025-02-11 14:24:24 +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
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
Michael Zetterberg
1d822dad5a Merged in fix/labels-english (pull request #1249)
fix(i18n): validated English messages

Approved-by: Bianca Widstam
Approved-by: Christian Andolf
2025-02-06 20:54:25 +00:00
Tobias Johansson
d0e2bd5c8d Merged in fix/booking-status-retry-and-timeout (pull request #1258)
fix: increase retry for getting booking status and dont show spinner if timeout occurs

* fix: increase retry for getting booking status and dont show spinner if timeout occurrs


Approved-by: Arvid Norlin
2025-02-06 08:09:15 +00:00
Joakim Jäderberg
46ebbbba8f Merged in feature/sas-login (pull request #1256)
First steps towards the SAS partnership

* otp flow now pretends to do the linking

* Update LinkAccountForm header

* Update redirect times

* Clean up comments

* Set maxAge on sas cookies

* make all SAS routes protected

* Merge remote-tracking branch 'refs/remotes/origin/feature/sas-login' into feature/sas-login

* Require auth for sas link flow

* Fix resend otp

* Add error support to OneTimePasswordForm

* Add Sentry to SAS error boundary

* Move SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME

* Add missing translations

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/sas-login

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* Add TooManyCodesError component

* Refactor GenericError to support new errors

* Add FailedAttemptsError

* remove removed component <VWOScript/>

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* remove local cookie-bot reference

* Fix sas campaign logo scaling

* feature toggle the SAS stuff

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* fix: use env vars for SAS endpoints


Approved-by: Linus Flood
2025-02-05 14:43:14 +00:00
Tobias Johansson
f82de5aad7 Merged in feat/price-details-modal-multiroom (pull request #1232)
feat: adjust price detail modal to handle multi room and removed dependency of enter details store

* feat: adjust price detail modal to handle multi room and removed dependency of enter details store

* fix: remove div from table

* fix: added room translation


Approved-by: Pontus Dreij
2025-01-31 09:13:21 +00:00
Simon Emanuelsson
1deab000bd fix: cache hotel response 2025-01-30 13:51:47 +01:00
Simon Emanuelsson
13a164242f fix: clean up hotel and its typings 2025-01-30 13:50:02 +01:00
Tobias Johansson
a7468cd958 Merged in feat/SW-1379-multiroom-summary (pull request #1198)
Feat/SW-1379 multiroom summary

* fix: added early return in hotel query and added missing type annotations

* feat(SW-1379): update summary to support multiple rooms and add tests

* fix: added check for room number when using isMember for member prices

* fix: remove mocked array

* fix: minor bug fixes in rate details popup

* fix: translation key


Approved-by: Pontus Dreij
Approved-by: Arvid Norlin
2025-01-29 09:25:43 +00:00
Linus Flood
cea4e3f3fe Merged in fix/tracking-requests (pull request #1208)
Added siteversion to all events and fixed payment status

* Added siteversion to all events and fixed payment status

* Fixed bug


Approved-by: Erik Tiekstra
2025-01-24 07:49:00 +00:00
Arvid Norlin
cb0dfcecad fix (SW-1352): update PriceDetailsTable with avarage price per night 2025-01-14 14:24:06 +01:00
Michael Zetterberg
dd71ff8fa7 fix(i18n): prepare for Lokalise 2025-01-14 13:11:06 +01:00
Christel Westerberg
bcae63e3fc fix: rename children to childrenInRoom 2025-01-14 12:25:17 +01:00
Christel Westerberg
b2935114e3 refactor: url management in hotel reservation flow 2025-01-14 11:09:42 +01:00
Arvid Norlin
39ebfe50c9 fix: adjust modal padding-bottom 2025-01-13 14:53:48 +00:00
Michael Zetterberg
d2ce9c0d7c fix(i18n): prepare for Lokalise 2025-01-13 13:35:03 +01:00
Linus Flood
c6c8df87ec Fixed hotelId in payment error events 2025-01-10 12:00:21 +01:00
Linus Flood
7099115d40 Merge branch 'master' into feat/tracking-payment 2025-01-10 11:37:22 +01:00
Linus Flood
08d5405cf1 PR Fixes 2025-01-10 11:36:23 +01:00
Tobias Johansson
999aa376fb BREAKING CHANGE(booking API schema changes): Merged in feat/SW-1342-booking-api-updates (pull request #1160)
fix: update booking status schema and affected code

* fix: update booking api schema and affected code

* fix: update meta prop in booking response schema


Approved-by: Arvid Norlin
2025-01-10 08:36:00 +00:00
Linus Flood
d57e3db34b Merge remote-tracking branch 'origin' into feat/tracking-payment 2025-01-10 09:13:04 +01:00
Hrishikesh Vaipurkar
7baae05655 feat: SW-1182 Moved modal to components folder 2025-01-09 12:28:15 +01:00
Hrishikesh Vaipurkar
9a25b3569d feat: SW-1182 Implntd rate terms modal in confirmation page and Updated styles 2025-01-09 12:28:15 +01:00
Hrishikesh Vaipurkar
61bd3a2c3e SW-1182 Updated popover to modal 2025-01-09 12:28:15 +01:00
Linus Flood
5889bdd79d Handle payment fail and cancel events 2025-01-08 15:02:03 +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
Tobias Johansson
18dd08f10e Merged in feat/SW-619-signup-non-happy (pull request #1083)
Feat/SW-619 signup non happy

* feat(SW-619): Added tests for Date input

* feat(SW-619): Updated date input to not allow date below 18 years old, also added form validation and tests to cover this change

* fix

* feat(SW-619): add info banner if membership verification fails

* fix(SW-619): update test description


Approved-by: Christel Westerberg
Approved-by: Arvid Norlin
2025-01-08 12:31:30 +00:00
Linus Flood
20714d0c3b Tracking payment start event 2025-01-08 10:48:43 +01:00
Christel Westerberg
5901cab440 fix: refactor breadcrumbs to take page type variants to better match margins 2025-01-07 11:41:39 +01:00
Christel Westerberg
139accb8ed fix: align price formatting 2025-01-02 13:46:51 +01:00
Arvid Norlin
0c7c6ea21a feat: add Price details modal 2024-12-20 09:28:06 +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
Christian Andolf
42bb71cf2f feat(SW-1063): add member price modal 2024-12-17 10:58:44 +01:00
Christel Westerberg
a1a36e80d5 fix: make special requests block togglable 2024-12-17 09:44:58 +00:00
Christel Westerberg
4872847ecb fix: add special requests to store 2024-12-17 09:44:58 +00:00
Christel Westerberg
241e354fc5 fix: special requests 2024-12-17 09:44:58 +00:00
Linus Flood
f91d74294e Merge remote-tracking branch 'origin' into feature/tracking 2024-12-16 09:11:28 +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
Christian Andolf
e08e960209 chore: add consistent type imports 2024-12-12 11:47:44 +01:00
Christel Westerberg
4210218852 fix: persist selection of bed and breakfast if same room 2024-12-10 15:42:44 +01:00
Tobias Johansson
b341c96838 Merged in fix/revert-breakfast-price-change (pull request #1064)
fix: revert price removal of "no breakfast" option


Approved-by: Simon.Emanuelsson
2024-12-10 13:24:29 +00:00
Arvid Norlin
e885b76a12 fix: add regex validation of membership no 2024-12-10 11:51:33 +00:00
Arvid Norlin
d67a2919bf fix: limit first/lastname inputs to 30 characters 2024-12-10 10:30:55 +01:00
Arvid Norlin
a5a99c1432 fix: replace enter details first-/lastname regex 2024-12-10 10:30:55 +01:00
Tobias Johansson
9b1d70b3be Merged in feat/SW-1026-breakfast-for-kids (pull request #1038)
feat(SW-1026): added info regarding children breakfast

* feat(SW-1026): added info regarding children breakfast

* fix: remove hardcoded currency

* fix(SW-1026): remove price for no breakfast

* fix: missing translation


Approved-by: Christian Andolf
Approved-by: Arvid Norlin
2024-12-09 14:58:54 +00:00