Commit Graph
82 Commits
Author SHA1 Message Date
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
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
Tobias Johansson af3c68e464 fixes 2024-12-06 09:13:36 +01:00
Tobias Johansson 6cb4c63b2e fix: reduce transition duration 2024-12-06 09:13:36 +01:00
Tobias Johansson eb92beacaf fix(SW-1043): set overflow when active section to enable dropdowns to overflow 2024-12-06 09:13:36 +01:00
Tobias Johansson d9f1f6f1ab fix(SW-1043): complete booking button styling 2024-12-06 09:13:36 +01:00
Tobias Johansson 15552a4cb6 fix(SW-1043): added input required messages 2024-12-06 09:13:36 +01:00
Tobias Johansson b58c1adb46 fix(SW-1043): updated country input so whole field is clickable 2024-12-06 09:12:13 +01:00
Tobias Johansson 930f666d07 fix(SW-1043): prevent scrolling while bottom sheet is open 2024-12-06 09:12:13 +01:00
Tobias Johansson f7cf1e9a2b fix(SW-1043): styling fixes 2024-12-06 09:12:13 +01:00
Tobias Johansson 6f9fb4b620 fix(SW-1043): wrong font size/styling on prices in summary 2024-12-06 09:12:13 +01:00
Tobias Johansson c354fbe434 fix(SW-1043): added hook with the scroll logic 2024-12-06 09:12:13 +01:00
Tobias Johansson 92db90502c fix: added event listener to scroll when transition ends 2024-12-06 09:12:13 +01:00
Tobias Johansson d3dad4c73d wip 2024-12-06 09:12:13 +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
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
Tobias Johansson d6cff63c5e Merged in feat/SW-999-visual-fixes (pull request #976)
Feat/SW-999 visual fixes in enter details

* fix(SW-999): accordion title font sizes fix and alignment of change room button

* fix(SW-999): added scroll if content cannot fit inside popover


Approved-by: Christel Westerberg
2024-11-26 08:11:50 +00: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
Tobias JohanssonandJoakim Jäderberg 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
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
Tobias Johansson ce453d8b1d feat(SW-817): hide apple pay if not supported 2024-11-18 08:52:12 +00:00
Tobias Johansson 169751c5a6 Merged in fix/SW-878-alternate-payment-options (pull request #878)
fix(SW-878): fix issue with alternate pay options showing when flex rate is selected

* fix(SW-878): fix issue with alternate pay options showing when flex rate is selected


Approved-by: Christel Westerberg
Approved-by: Simon.Emanuelsson
2024-11-12 09:37:17 +00:00
Tobias Johansson 0cbffc7904 Merged in feat/SW-613-refactor-hotelreservation-sidepeek (pull request #805)
Feat/SW-613 refactor hotelreservation sidepeek

* feat(SW-613): move sidepeek paralell route to apply for all of hotelreservation

* feat(SW-613): refactor sidepeek logic to a unified approach for hotelreservation flow

* feat(SW-613): fix issue where room was not selected properly in sidepeek

* fix(SW-613): move back preload to layout

* fix(SW-613): move preload to dedicated file

* fix(SW-613): refactor sidepeek to work with hotel page

* feat(SW-613): added sidepeek button for room card


Approved-by: Simon.Emanuelsson
2024-11-06 12:09:27 +00:00
Tobias Johansson 795eae89bc fix: type issue 2024-10-30 11:36:54 +01:00
Tobias Johansson a5fad308ef fix(SW-614): remove room availabiltiy from preload 2024-10-30 09:44:49 +00:00
Tobias Johansson b6bec433fb fix(SW-614): use height prop on icon 2024-10-30 09:44:49 +00:00
Tobias Johansson 60ceeaf9c3 fix(SW-614): move filtering logic to routes 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
Tobias Johansson 6523e2329b feat(SW-614): added i18n strings 2024-10-30 09:44:49 +00: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
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
Tobias Johansson 926d864413 fix: add pre commit hook to sort dictionaries 2024-10-16 13:49:37 +02:00
Tobias Johansson 1bce311666 fix: race condition with booking confirmation being set in session storage 2024-10-10 15:55:51 +02:00
Tobias Johansson 740419bad2 Merged in feat/SW-459-payment-flow-ui-ux (pull request #657)
Feat/SW-459 payment flow ui ux

* feat(SW-431): List payment methods and handle booking status and redirection

* feat(SW-431): small fix

* fix(SW-431): Added intl string and sorted dictionaries

* fix(SW-431): add todo comments

* feat(SW-459): Added payment method icons

* feat(SW-459): refactored into new component and added form

* feat(SW-459): Localized strings

* feat(SW-459): added checkbox

* feat(SW-459): Refactored payment options and updated payment form

* feat(SW-459): update input bg color

* feat(SW-459): add current web links and style fixes

* fix(SW-459): fix issue with booking confirmation not being accessible

* feat(SW-459): style changes

* feat(SW-459): update max width of payment container

* feat(SW-459): update create booking schema

* feat(SW-459): fixes from PR


Approved-by: Arvid Norlin
2024-10-10 12:20:41 +00:00
Tobias JohanssonandPontus Dreij 367cab27ab fix(SW-360): Added test for edit profile form 2024-10-10 10:46:51 +02:00
Tobias JohanssonandPontus Dreij 3872664d1d feat(SW-360): Added test for register user form 2024-10-10 10:46:51 +02:00
Tobias JohanssonandPontus Dreij 88c343691d fix(SW-360): Added test ids to form fields 2024-10-10 10:46:51 +02:00
Tobias JohanssonandPontus Dreij aa9475ce12 feat(SW-360): Added register form with server action 2024-10-10 10:46:47 +02:00
Tobias JohanssonandPontus Dreij 87e208b548 fix(SW-360): Changed how DateSelect sets date, because it was working properly 2024-10-10 10:46:31 +02:00
Tobias JohanssonandPontus Dreij ccef7e2666 fix(SW-360): Solved issue with date field not using placeholder values 2024-10-10 10:46:31 +02:00
Tobias JohanssonandPontus Dreij c5c4f8e7e7 feat(SW-360): Refactored NewPassword input 2024-10-10 10:46:31 +02:00
Tobias JohanssonandPontus Dreij a4483b7d71 feat(SW-360): Added checkbox component 2024-10-10 10:46:31 +02:00
Tobias JohanssonandChuma McPhoy 4c1dca0ce8 fix(SW-360): Added test for edit profile form 2024-10-10 08:59:33 +02:00
Tobias JohanssonandChuma McPhoy 661effeefa feat(SW-360): Added test for register user form 2024-10-10 08:59:33 +02:00
Tobias JohanssonandChuma McPhoy c22fa9fa8c fix(SW-360): Added test ids to form fields 2024-10-10 08:59:33 +02:00
Tobias JohanssonandChuma McPhoy e086857072 feat(SW-360): Added register form with server action 2024-10-10 08:59:33 +02:00
Tobias JohanssonandChuma McPhoy c69e4b4b29 fix(SW-360): Changed how DateSelect sets date, because it was working properly 2024-10-10 08:59:33 +02:00
Tobias JohanssonandChuma McPhoy da95c32a0d fix(SW-360): Solved issue with date field not using placeholder values 2024-10-10 08:59:33 +02:00
Tobias JohanssonandChuma McPhoy 9435059097 feat(SW-360): Refactored NewPassword input 2024-10-10 08:59:33 +02:00
Tobias JohanssonandChuma McPhoy 9caa560b8d feat(SW-360): Added checkbox component 2024-10-10 08:59:33 +02:00
Tobias JohanssonandPontus Dreij 9ff4e84ed6 Merged in feat/SW-431-payment-flow (pull request #635)
Feat/SW-431 payment flow

* feat(SW-431): Update mock hotel data

* feat(SW-431): Added route handler and trpc routes

* feat(SW-431): List payment methods and handle booking status and redirection

* feat(SW-431): Updated booking page to poll for booking status

* feat(SW-431): Updated create booking contract

* feat(SW-431): small fix

* fix(SW-431): Added intl string and sorted dictionaries

* fix(SW-431): Changes from PR

* fix(SW-431): fixes from PR

* fix(SW-431): add todo comments

* fix(SW-431): update schema prop

Approved-by: Simon.Emanuelsson
2024-10-07 13:45:31 +02:00
Tobias JohanssonandPontus Dreij 184aa29142 Merged in feat/SW-475-enter-details-header (pull request #630)
Feat/SW-475 enter details header

* feat(SW-475): updated hotel mock data to reflect api

* feat(SW-475): Added hotel selection header with sidepeek buttons

* fix(SW-475): fixes from PR

* fix(SW-475): changed intl string

Approved-by: Arvid Norlin
2024-10-07 13:44:28 +02:00
Tobias JohanssonandPontus Dreij 9b160c2222 Merged in feat/SW-431-payment-flow (pull request #635)
Feat/SW-431 payment flow

* feat(SW-431): Update mock hotel data

* feat(SW-431): Added route handler and trpc routes

* feat(SW-431): List payment methods and handle booking status and redirection

* feat(SW-431): Updated booking page to poll for booking status

* feat(SW-431): Updated create booking contract

* feat(SW-431): small fix

* fix(SW-431): Added intl string and sorted dictionaries

* fix(SW-431): Changes from PR

* fix(SW-431): fixes from PR

* fix(SW-431): add todo comments

* fix(SW-431): update schema prop

Approved-by: Simon.Emanuelsson
2024-10-04 12:38:49 +02:00
Tobias JohanssonandPontus Dreij 2ddc735ab5 Merged in feat/SW-431-payment-flow (pull request #635)
Feat/SW-431 payment flow

* feat(SW-431): Update mock hotel data

* feat(SW-431): Added route handler and trpc routes

* feat(SW-431): List payment methods and handle booking status and redirection

* feat(SW-431): Updated booking page to poll for booking status

* feat(SW-431): Updated create booking contract

* feat(SW-431): small fix

* fix(SW-431): Added intl string and sorted dictionaries

* fix(SW-431): Changes from PR

* fix(SW-431): fixes from PR

* fix(SW-431): add todo comments

* fix(SW-431): update schema prop

Approved-by: Simon.Emanuelsson
2024-10-04 12:38:49 +02:00
Tobias JohanssonandPontus Dreij d44451d2dc Merged in feat/SW-431-payment-flow (pull request #635)
Feat/SW-431 payment flow

* feat(SW-431): Update mock hotel data

* feat(SW-431): Added route handler and trpc routes

* feat(SW-431): List payment methods and handle booking status and redirection

* feat(SW-431): Updated booking page to poll for booking status

* feat(SW-431): Updated create booking contract

* feat(SW-431): small fix

* fix(SW-431): Added intl string and sorted dictionaries

* fix(SW-431): Changes from PR

* fix(SW-431): fixes from PR

* fix(SW-431): add todo comments

* fix(SW-431): update schema prop

Approved-by: Simon.Emanuelsson
2024-10-04 12:23:31 +02:00
Tobias JohanssonandPontus Dreij 18a1649bdf Merged in feat/SW-475-enter-details-header (pull request #630)
Feat/SW-475 enter details header

* feat(SW-475): updated hotel mock data to reflect api

* feat(SW-475): Added hotel selection header with sidepeek buttons

* fix(SW-475): fixes from PR

* fix(SW-475): changed intl string


Approved-by: Arvid Norlin
2024-10-04 12:20:48 +02:00
Tobias Johansson 4103e3fb37 Merged in feat/SW-431-payment-flow (pull request #635)
Feat/SW-431 payment flow

* feat(SW-431): Update mock hotel data

* feat(SW-431): Added route handler and trpc routes

* feat(SW-431): List payment methods and handle booking status and redirection

* feat(SW-431): Updated booking page to poll for booking status

* feat(SW-431): Updated create booking contract

* feat(SW-431): small fix

* fix(SW-431): Added intl string and sorted dictionaries

* fix(SW-431): Changes from PR

* fix(SW-431): fixes from PR

* fix(SW-431): add todo comments

* fix(SW-431): update schema prop


Approved-by: Simon.Emanuelsson
2024-10-04 09:37:09 +00:00
Tobias Johansson 869c9b67b8 Merged in feat/SW-475-enter-details-header (pull request #630)
Feat/SW-475 enter details header

* feat(SW-475): updated hotel mock data to reflect api

* feat(SW-475): Added hotel selection header with sidepeek buttons

* fix(SW-475): fixes from PR

* fix(SW-475): changed intl string


Approved-by: Arvid Norlin
2024-10-03 07:42:26 +00:00
Tobias Johansson 5cfbd8e70d fix: change procedure for booking widget toggle call to not require cms uid 2024-09-16 15:15:55 +02:00
Tobias JohanssonandErik Tiekstra 4cc325f54c fix: wrong prop name 2024-09-12 10:12:43 +02:00
Tobias Johansson fd9d6d5a1c fix: wrong prop name 2024-09-05 11:38:13 +02:00
Tobias Johansson 238de4cd3a Merged in feat/CJ-17-points-expiration-table (pull request #527)
Feat/CJ-17 points expiration table

* feat(CJ-17): Added point expiration table and refactored to use Table component

* feat(CJ-17): Use Table component inside Row

* fix(CJ-117): Added missing css class and update date formatting

* fix(CJ-117): Added copy of membershipLevel route with a protectedProcedure


Approved-by: Christel Westerberg
2024-09-05 09:28:25 +00:00
Tobias Johansson bc3233ff64 Merged in feat/SW-196-design-fixes (pull request #547)
Feat/SW-196 design fixes

* feat(SW-196): Updated copy My credit cards -> My payment cards

* fix: update design system version

* feat(SW-196): Update Header component to use Preamble instead of Subtitle

* feat(SW-196): Minor design fixes


Approved-by: Christel Westerberg
2024-09-03 08:43:13 +00:00
Tobias Johansson c0b16e8dee Merged in feat/SW-212-copy-to-clipboard-feedback (pull request #548)
Feat/SW-212 copy to clipboard feedback

* feat(SW-212): Added toast to give feedback when copying member id

* feat(SW-212): Update copy

* feat(SW-212): Changed to use success toast and updated copy

* fix: update copy in toast for copying membership ID


Approved-by: Christel Westerberg
Approved-by: Matilda Landström
2024-09-02 13:49:10 +00:00
Tobias JohanssonandMichael Zetterberg d3b21b8e9c Merged in fix/wrong-firstname-link (pull request #517)
fix: wrong link in top menu when clicking first name

Approved-by: Michael Zetterberg
2024-08-27 10:20:00 +00:00
Tobias JohanssonandMichael Zetterberg 0c795694a4 Merged in fix/name-alignment (pull request #519)
fix: issue with name not being center aligned

Approved-by: Michael Zetterberg
2024-08-27 10:19:06 +00:00
Tobias Johansson e092631c4d fix: issue with name not being center aligned 2024-08-27 11:40:51 +02:00
Tobias Johansson cd3d805bf0 fix: wrong link in top menu when clicking first name 2024-08-27 11:09:21 +02:00
Tobias JohanssonandMichael Zetterberg e733ce283a Merged in fix/revert-filtering-of-rewardnights (pull request #477)
fix: revert back filtering of reward nights with operaId ORS

Approved-by: Michael Zetterberg
2024-08-23 11:01:57 +00:00
Tobias Johansson b3ba4edd69 fix: revert back filtering of reward nights with operaId ORS 2024-08-23 12:49:59 +02:00
Tobias JohanssonandMichael Zetterberg 68be3275cf Merged in fix/hide-booking-link-in-webview (pull request #474)
fix: hide clickable booking url in webview

Approved-by: Michael Zetterberg
2024-08-23 10:45:20 +00:00
Tobias JohanssonandMichael Zetterberg 76663cc2f8 Merged in fix/toast-triggering (pull request #475)
fix: issue with toasts not triggering on page load and fix padding issue

Approved-by: Michael Zetterberg
2024-08-23 10:44:35 +00:00
Tobias Johansson fb581ad489 fix: hide clickable booking url in webview 2024-08-23 11:01:07 +02:00
Tobias Johansson 8c26d0c238 fix: issue with toasts not triggering on page load and fix padding issue 2024-08-23 10:59:35 +02:00
Tobias JohanssonandMichael Zetterberg dbb55c3d33 Merged in feat/SW-165-fix (pull request #467)
fix(SW-165): fix issue with pagination now showing

Approved-by: Michael Zetterberg
2024-08-23 07:35:30 +00:00
Tobias Johansson 88a23c590d fix(SW-165): fix issue with pagination now showing 2024-08-23 09:07:10 +02:00
Tobias Johansson 159114a082 Merged in feat/SW-165-fixes (pull request #460)
Feat/SW-165 fixes

* fix(SW-165): update translations for reward labels

* fix(SW-165): Fix sorting and filtering of transactions and hide fields when BALFWD

* fix(SW-165): update condition


Approved-by: Michael Zetterberg
2024-08-22 14:34:55 +00:00
Tobias JohanssonandMichael Zetterberg e0459eb2a8 Merged in feat/SW-245-delete-card (pull request #407)
Feat/SW-245 delete card

Approved-by: Michael Zetterberg
Approved-by: Christel Westerberg
2024-08-21 14:26:11 +00:00
Tobias JohanssonandMichael Zetterberg e9a6499086 feat(SW-245): Delete credit card 2024-08-21 16:24:39 +02:00
Tobias Johansson 1ec1033267 Merged in feat/SW-165-correct-labels (pull request #427)
Feat/SW-165 correct labels

* feat(SW-165): sort friend transactions and return additional properties

* feat(SW-165): Added points being calculated label

* feat(SW-165): added transactionDate for transactions without checkinDate

* feat(SW-165): Updated description copy for various reward types

* feat(SW-165): filter out expired transactions

* feat(SW-165): removed Mobile table and unified them into Table instead

* feat(SW-165): Added bookingUrl to friend transactions

* fix(SW-165): style fixes

* fix(SW-165): fix issues from merge

* fix(SW-165): remove comment

* fix(SW-165): fixed booking urls not being set and smaller fixes

* fix(SW-165): added comment regarding 'BALFWD'


Approved-by: Michael Zetterberg
Approved-by: Christel Westerberg
2024-08-21 13:54:55 +00:00
Tobias Johansson 84f5e74f00 Merged in feat/SW-104-add-card (pull request #410)
Feat/SW-104 add card

* feat: add api endpoints for adding and removing credit card

* feat(SW-104): Added Sonner toast lib

* feat(SW-104): Add route handlers for add card flow

* feat(SW-104): Added link to route handler and trigger toast when query params from callback is set

* feat(SW-104): Added translations for add card success toast

* feat(SW-104): Refactored to use client request for initiate save card

* fix(SW-104): Return proper status codes when initiating save card fails

* fix(SW-104): remove delete card endpoint because it was added in SW-245

* fix(SW-104): remove console.log

* fix(SW-104): Use api.post for save card request

* fix(SW-104): move function declaration above export

* fix(SW-104): handle response of save card and use Lang enum

* fix(SW-104): added comment for why setTimeout is needed for toast and also removed lang prop

* fix(SW-104): added type for AddCreditCardButton props

* feat: add toasts

* fix(SW-104): start using toasts from ToastHandler and fix problem with duplicate toasts

* fix(SW-104): remove unnecessary wrapping div


Approved-by: Michael Zetterberg
2024-08-20 15:04:02 +00:00