Commit Graph

104 Commits

Author SHA1 Message Date
Linus Flood
d27163a915 Merged in feat/auth-refresh-token-time (pull request #1345)
feat: auth - changed the time left before we trying to refresh the token

* feat: auth - changed the time left before we trying to refresh the token


Approved-by: Joakim Jäderberg
2025-02-19 09:00:30 +00:00
Joakim Jäderberg
6f51130e48 Merged in feature/hardcoded-mypages-links (pull request #1325)
Feature/hardcoded mypages links

* feat: wip use hardcoded links

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/hardcoded-mypages-links

* feat: use hardcoded links for my pages to support dynamic links

* cleanup

* code fixes

* refactor: restructure MyPagesMobileDropdown component for improved readability

* use util timeout function


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-02-13 09:28: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
Christian Andolf
72049ed88b fix(LOY-89): add a more user friendly error message for when unwrapping surprises 2025-02-11 10:08:40 +01:00
Matilda Landström
ad7402f2e2 Merged in feat/SW-1573-subpage-url (pull request #1297)
Feat(SW-1573): Use pageInUrl for hotel subpages

* feat(SW-1573): use pageInUrl for hotel subpages


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-11 08:27:09 +00:00
Fredrik Thorsson
a389fba8ce Merged in feat/SW-1067-special-needs-accessibility-page (pull request #1253)
feat/SW-1067 special needs accessibility page

* feat(SW-1067): update types

* feat(SW-1067): add sidebar

* feat(SW-1067): add additional content component

* feat(SW-1067): add special needs list

* feat(SW-1067): update type

* feat(SW-1067): update import

* feat(SW-1067): remove component

* feat(SW-1067): re add component

* feat(SW-1067): update folder structure


Approved-by: Erik Tiekstra
2025-02-05 10:27:26 +00:00
Erik Tiekstra
c25963a3b7 Merged in feat/SW-1066-wellness-subpage (pull request #1239)
Feat/SW-1066 wellness subpage

* feat(SW-1066): added wellness subpage


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-03 13:35:48 +00:00
Erik Tiekstra
dd4a2d8120 Merged in feat/SW-1296-hotel-subpages (pull request #1233)
feat(SW-1296): added Subpage for hotel pages and its routing

* feat(SW-1296): added Subpage for hotel pages and its routing


Approved-by: Fredrik Thorsson
2025-02-03 10:58:53 +00:00
Niclas Edenvin
ef22fc4627 This creates the alternative hotels page. It is mostly a copy of the select hotel page, and most of the contents of the pages lives under the same component in /components.
Merged in feat/sw-397-alternative-hotels (pull request #1211)

Feat/sw 397 alternative hotels

* fix(SW-397): create alternative hotels page

* update types

* Adapt to new changes for fetching data

* Make bookingcode optional

* Code review fixes


Approved-by: Simon.Emanuelsson
2025-01-28 12:08:40 +00:00
Chuma McPhoy
655103a0b5 refactor(LOY-62): revert to switch case for ScriptedRewardText label text 2025-01-14 10:17:22 +01:00
Chuma McPhoy
da31539610 refactor(LOY-62): implement code review feedback 2025-01-14 10:17:22 +01:00
Chuma McPhoy
0edd615925 feat(LOY-62): Add ScriptedRewardText component 2025-01-14 10:17:22 +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
Christel Westerberg
0579fa205f fix: point to test subdomain instead of test2 2025-01-02 11:29:09 +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
Chuma McPhoy
c33f125332 chore(LOY-64): better organisation of reward types and data 2024-12-13 14:57:16 +01:00
Chuma McPhoy
ca0bac2fee fix(SW-360): update signup routes based on requst from content team 2024-12-03 07:16:27 +01:00
Simon Emanuelsson
1aeed2e9ca fix: make sure session storage is cleaner whenever user is no longer in the booking flow 2024-11-21 14:54:08 +01:00
Pontus Dreij
cc15dc2dc2 fix(SW-917): fix correct link to map 2024-11-19 09:17:58 +01:00
Simon Emanuelsson
94f693c4f0 feat: make steps of enter details flow dynamic depending on data 2024-11-18 16:30:09 +01:00
Pontus Dreij
f6b14ced8f Merged in feat/SW-705-urls (pull request #918)
feat(SW-705): Updated URLs for hotelreservation

Approved-by: Niclas Edenvin
2024-11-18 14:24:04 +00: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
Pontus Dreij
24124209d9 feat(SW-705): Updated URLs for hotelreservation 2024-11-18 14:05:07 +01:00
Chuma McPhoy
5fef56cc97 fix(SW-890): better feature flag handling 2024-11-15 12:22:40 +01:00
Chuma McPhoy
fd6c15ed78 feat: add env var for signup flow 2024-11-15 12:22:40 +01:00
Christel Westerberg
f4f771ec70 fix: rename BedTypeEnums 2024-11-07 13:53:24 +01:00
Simon Emanuelsson
62f549e85d feat: get breakfast package from API 2024-10-29 15:39:21 +01:00
Chuma McPhoy
2fddc503c5 feat(SW-667): read more section to join loyalty sidebar 2024-10-29 10:39:07 +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
Chuma McPhoy
e0121e7a17 fix: reuse currentWebHrefs for signup 2024-10-11 14:50:53 +02:00
Pontus Dreij
7c3ff7f94e Merge remote-tracking branch 'origin/develop' into feat/SW-415-select-room-card 2024-10-10 14:45:35 +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
Chuma McPhoy
967a7a8935 fix(SW-360): terms and conditions URL's 2024-10-10 10:47:09 +02:00
Chuma McPhoy
c21a0cd18b fix(SW-360): redirect verify step when authed as well 2024-10-10 10:47:09 +02:00
Chuma McPhoy
540ce58446 feat: setup signup routes and redirect on success 2024-10-10 10:47:09 +02:00
Chuma McPhoy
cae0648b2f fix(SW-360): terms and conditions URL's 2024-10-10 08:59:33 +02:00
Chuma McPhoy
01b1d195ee fix(SW-360): redirect verify step when authed as well 2024-10-10 08:59:33 +02:00
Chuma McPhoy
f356d91f99 feat: setup signup routes and redirect on success 2024-10-10 08:59:33 +02:00
Pontus Dreij
94a1aa625a feat/SW-415: Added select-rate to hotelReservation 2024-10-08 15:51:07 +02:00
Christel Westerberg
1bb2d3f687 feat(SW-467): add routing for details steps 2024-10-08 11:42:06 +02:00
Matilda Landström
40c6ed0f20 fix(SW-302): small translation typo 2024-10-08 08:53:41 +02:00
Matilda Landström
2438d04f43 refactor(SW-302): cleanup 2024-10-08 08:53:41 +02:00
Matilda Landström
6c88d3431a chore(SW-302): add dynamic restaurant title 2024-10-08 08:53:41 +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
Niclas Edenvin
03fa798670 Use the interactive map on the map page 2024-09-27 14:23:49 +02:00
Erik Tiekstra
e79f413003 feat(SW-325): added pois to the list and dynamic map 2024-09-18 15:22:31 +02:00
Matilda Landström
93e54b4ca1 feat(SW-93): add mocked facility cards 2024-08-29 16:51:19 +02:00