Commit Graph

48 Commits

Author SHA1 Message Date
Tobias Johansson
59eefb877e Merged in feat/SW-1077-enter-details-edit-room (pull request #1360)
Feat/SW-1077 enter details edit room

* feat(SW-1077): persist state when changing rooms

* fix: issue with step state when closing accordion and transition to correct room when modifying step


Approved-by: Pontus Dreij
2025-02-19 10:03:11 +00:00
Simon Emanuelsson
051bc54e6c chore: cleaning up select-rate 2025-02-14 14:20:54 +01: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
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
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
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
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
5889bdd79d Handle payment fail and cancel events 2025-01-08 15:02:03 +01:00
Linus Flood
20714d0c3b Tracking payment start event 2025-01-08 10:48:43 +01: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
d9f1f6f1ab fix(SW-1043): complete booking button styling 2024-12-06 09:13:36 +01:00
Linus Flood
6a4364e1c4 Merge remote-tracking branch 'origin' into feature/tracking 2024-12-05 15:12:09 +01:00
Linus Flood
9db02488d8 Payment method update 2024-12-03 11:29:16 +01:00
Christel Westerberg
4288e643c6 fix: pass lang to create booking 2024-12-03 09:32:43 +00: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
Linus Flood
267a47c61a Merge branch 'master' into feat/sw-929-release-preps 2024-11-27 19:13:21 +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
Christel Westerberg
3a6cfcfe5c fix: avoid sending query params to planet 2024-11-21 10:18:36 +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
Simon Emanuelsson
c6fc500d9e feat: make steps of enter details flow dynamic depending on data 2024-11-19 08:05:14 +01:00
Tobias Johansson
293800f024 Merged in feat/SW-618-payment-non-happy-path (pull request #874)
Feat/SW-618 payment non happy path

* feat(SW-618): filter out expired saved cards

* feat(SW-618): Added payment error codes and way of showing messages based on code

* feat(SW-618): show error message if max retries has been reached and remove search param after showing toast

* fix(SW-618): move fallback error codes

* fix(SW-618): remove ref from stopping useEffect to run twice

* fix(SW-618): refactored logic for toast message and minor fixes

* fix(SW-618): remove error message enum due to static analysis problems


Approved-by: Christian Andolf
Approved-by: Arvid Norlin
2024-11-19 08:05:14 +01:00
Christel Westerberg
d67affd677 fix: update booking service schemas 2024-11-19 08:05:13 +01:00
Simon Emanuelsson
94f693c4f0 feat: make steps of enter details flow dynamic depending on data 2024-11-18 16:30:09 +01:00
Tobias Johansson
a70f8a3b97 Merged in feat/SW-618-payment-non-happy-path (pull request #874)
Feat/SW-618 payment non happy path

* feat(SW-618): filter out expired saved cards

* feat(SW-618): Added payment error codes and way of showing messages based on code

* feat(SW-618): show error message if max retries has been reached and remove search param after showing toast

* fix(SW-618): move fallback error codes

* fix(SW-618): remove ref from stopping useEffect to run twice

* fix(SW-618): refactored logic for toast message and minor fixes

* fix(SW-618): remove error message enum due to static analysis problems


Approved-by: Christian Andolf
Approved-by: Arvid Norlin
2024-11-18 14:10:11 +00:00
Christel Westerberg
f0c7aa349c fix: update booking service schemas 2024-11-18 10:54:57 +01:00
Tobias Johansson
ce453d8b1d feat(SW-817): hide apple pay if not supported 2024-11-18 08:52:12 +00:00
Christel Westerberg
dc3516f4e1 feat: add packages info to summary 2024-11-15 16:32:08 +01:00
Christel Westerberg
daed74481e fix: handle submit from summary bottom sheet 2024-11-12 08:58:02 +01:00
Christel Westerberg
560fb25aee fix: send totalPrice to create booking 2024-11-07 13:53:24 +01:00
Christel Westerberg
6d051629d3 fix: send correct values to create booking 2024-11-07 13:53:24 +01:00
Christel Westerberg
7954c704d9 feat: consume serach params in summary and step page 2024-10-30 15:50:08 +01:00
Tobias Johansson
b6bec433fb fix(SW-614): use height prop on icon 2024-10-30 09:44:49 +00:00
Tobias Johansson
7819db2bb2 fix(SW-614): update enter details strings 2024-10-30 09:44:49 +00:00
Tobias Johansson
a690750c36 feat(SW-614): Add mustBeGuaranteed flag and update content based on this 2024-10-30 09:44:49 +00:00
Pontus Dreij
7b36139684 feat(sw-453): implemented filter from packages 2024-10-29 11:10:27 +01:00
Tobias Johansson
025c5c8291 Merged in feat/SW-659-payment-send-query-params (pull request #727)
feat(SW-659): Receive query params from Planet callbacks

* feat(SW-659): read confirmation number from url and update callback url if dev

* fix(SW-659): moved callback url into env variable


Approved-by: Simon.Emanuelsson
2024-10-23 11:51:44 +00:00
Simon Emanuelsson
2d23f9bbf3 feat: booking confirmation page with hardcoded data 2024-10-23 11:56:02 +02:00
Tobias Johansson
b33381d1b4 Merged in feat/SW-588-payment-saved-card (pull request #697)
feat(SW-588): Added saved card to payment step

* feat(SW-588): Added saved card to payment step

* feat(SW-588): Add proper label for saved card

* feat(SW-588): fix from PR feedback

* feat(SW-588): Add preloading of data

* feat(SW-588): remove onChange logic for PaymentOption

* feat(SW-588): moved payment files to correct folder

* feat(SW-588): moved preload to layout

* fix: remove unused prop


Approved-by: Simon.Emanuelsson
2024-10-21 10:39:19 +00:00