Commit Graph

3242 Commits

Author SHA1 Message Date
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
Chuma McPhoy
1cd400a977 fix: add "Member-voucher" to rewardType enum in CouponReward schema 2025-01-10 09:19:42 +01:00
Linus Flood
d57e3db34b Merge remote-tracking branch 'origin' into feat/tracking-payment 2025-01-10 09:13:04 +01:00
Linus Flood
919fc62069 Fixed paymentInfo 2025-01-10 09:10:53 +01:00
Fredrik Thorsson
bf3328396f feat(SW-495): add return statement 2025-01-10 08:54:45 +01:00
Fredrik Thorsson
d4d9e540f1 feat(SW-495): set scripted top title as optional 2025-01-10 08:54:45 +01:00
Fredrik Thorsson
8a0c1244ae feat(SW-495): move healthfacilities enum 2025-01-10 08:54:45 +01:00
Fredrik Thorsson
50d6929b4a feat(SW-495): remove fallback value 2025-01-10 08:54:45 +01:00
Fredrik Thorsson
cc00aab7ee feat(SW-495): update heading on facility cards 2025-01-10 08:54:45 +01:00
Linus Flood
014eea054f Fixed same string value for childBedPreference on confirmation page 2025-01-10 08:40:26 +01:00
Erik Tiekstra
d11b9e8aee feat(SW-395): Added tracking to header and footer 2025-01-10 08:15:14 +01:00
Christian Andolf
9c2d9ec528 Merged in fix/redeem-translations (pull request #1161)
fix: added some missing redeem flow translations and fixed copy on button

Approved-by: Fredrik Thorsson
Approved-by: Chuma Mcphoy (We Ahead)
2025-01-09 16:01:29 +00:00
Christian Andolf
56276a6f19 fix: added some missing redeem flow translations and fixed copy on button 2025-01-09 16:54:29 +01:00
Christian Andolf
6d58114d5a Merged in fix/toast-close-button-padding (pull request #1151)
fix: corrected intent for button to fix broken padding

Approved-by: Chuma Mcphoy (We Ahead)
2025-01-09 15:53:43 +00:00
Linus Flood
7ca2fd78f0 Remove console logs 2025-01-09 13:02:03 +01:00
Hrishikesh Vaipurkar
5d5de0de31 feat: SW-1182 Removed outline and typeOf 2025-01-09 12:28:15 +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
b973882c5c fix: downgrade next-auth to v19 2025-01-09 10:17:48 +01:00
Christian Andolf
ca50079a4a Merged in feat/LOY-63-redeem-campaign (pull request #1122)
feat(LOY-63): redeem campaign

Approved-by: Chuma Mcphoy (We Ahead)
2025-01-09 08:51:56 +00:00
Christian Andolf
9452f24df9 feat(LOY-63): add promo code badge to campaign redeem 2025-01-09 09:47:26 +01:00
Christian Andolf
6941c1d006 fix(LOY-63): move redeem flows to separate folder
add use client directive
2025-01-09 09:47:26 +01:00
Christian Andolf
9584478b34 feat(LOY-63): redeem campaign 2025-01-09 09:47:26 +01:00
Linus Flood
29d1721a8a hotfix: hide booking widget on public pages 2025-01-09 08:39:15 +01:00
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
Christel Westerberg
a8763ca80c Merged in fix/margins-loyalty-layout (pull request #1152)
fix: add correct negative margins on profile page

* fix: add correct  negative margins on profile page


Approved-by: Linus Flood
2025-01-08 15:13:32 +00:00
Linus Flood
dfa7395aa4 Merged in fix/null-check-valid-session (pull request #1153)
fix: added null check on session

* fix: added null check on session

* fix: added null check on session
2025-01-08 15:11:01 +00:00
Pontus Dreij
b4060d720b Merged in feat/SW-716-multiroom-guest-picker (pull request #1084)
feat(SW-716) Added UI to add more rooms in guest/room picker

* feat(SW-716) Added UI to add more rooms in guest/room picker

* feat(SW-716) Renamed GuestRoom Type and updated html structure

* Feat(SW-716): Created a BookingFlowIteration1 folder

* feat(SW-716) Moved forms/bookingwidget to new flow

* feat(SW-716) Added new ENABLE_BOOKING_FLOW_ITERATION_1 and ENABLE_BOOKING_FLOW_ITERATION_2

* feat(SW-716) Re added booking widget into interaction1 of how it looks now in prod

* Revert "feat(SW-716) Re added booking widget into interaction1 of how it looks now in prod"

This reverts commit 9a5514e8e71b1487e610bf64986ca77a538c0023.

* Revert "feat(SW-716) Added new ENABLE_BOOKING_FLOW_ITERATION_1 and ENABLE_BOOKING_FLOW_ITERATION_2"

This reverts commit b00bfc08cb7878d91483220ba3e8322671c145e4.

* Revert "feat(SW-716) Moved forms/bookingwidget to new flow"

This reverts commit 6c81635fe929a71fb3a42d8f174706787d8578ed.

* Revert "Feat(SW-716): Created a BookingFlowIteration1 folder"

This reverts commit db41f1c7fcd8e3adf15713d5d36f0da11e03e3a4.

* feat(SW-716): Added NEXT_PUBLIC_HIDE_FOR_NEXT_RELEASE

* feat(SW-716) Readded Tooltip if NEXT_PUBLIC_HIDE_FOR_NEXT_RELEASE is true

* feat(SW-716) remove log


Approved-by: Niclas Edenvin
Approved-by: Christian Andolf
2025-01-08 15:09:29 +00:00
Matilda Landström
85c9ec5b3b Merged in feat/SW-1084-spa-page (pull request #1117)
Feat/SW-1084 Spa page option on Hotel page

* chore(SW-1084): add separate spa page from CS for hotel page

* fix(SW-1084): Cleanup


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-01-08 15:08:24 +00:00
Linus Flood
894e607c5e Merged master into feat/check-session-fix 2025-01-08 14:44:05 +00:00
Christian Andolf
5c6f357c01 fix: corrected intent for button to fix broken padding 2025-01-08 15:26:42 +01:00
Linus Flood
8308d00464 fix: valid session check in rooms container 2025-01-08 15:24:20 +01:00
Bianca Widstam
a620be9331 Merged in fix/SW-1145-occupancy-room-api-change (pull request #1148)
Fix/SW-1145 occupancy room api change

* fix(SW-1145): change occupancy to min and max

* fix(SW-1145): small edit

* fix(SW-1145): refactor to transform total room occupancy

* fix(SW-1145): remove space

* fix(SW-1145): small fix

* fix(SW-1145): change to max for readability


Approved-by: Erik Tiekstra
Approved-by: Linus Flood
2025-01-08 14:22:01 +00: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
6fabfe2367 fix: lint error in test 2025-01-08 14:14:38 +01: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
Bianca Widstam
a056b36443 Merged in fix/SW-1330-filter-tooltip-mobile (pull request #1146)
fix(SW-1330): add space and fix touchable tooltip for ipad

* fix(SW-1330): add space and fix touchable tooltip for ipad


Approved-by: Pontus Dreij
Approved-by: Niclas Edenvin
2025-01-08 12:05:15 +00:00
Linus Flood
20714d0c3b Tracking payment start event 2025-01-08 10:48:43 +01:00
Linus Flood
519795acac feat: tracking - added discount property and some basics for paymentInfo 2025-01-08 08:50:50 +01:00
Tobias Johansson
c7e38af5c9 Merged in feat/enter-details-store-tests (pull request #1134)
Feat/enter details store tests

* test: add unit tests for useEnterDetailsStore and update Jest environment

* test: added more useEnterDetailsStore tests


Approved-by: Christel Westerberg
2025-01-08 07:47:51 +00:00
Bianca Widstam
93e1c740a1 Merged in fix/SW-1334-filter-option-navigation (pull request #1144)
fix(SW-1334): filter option saved when navigation back

* fix(SW-1334): filter option saved when navigation back


Approved-by: Niclas Edenvin
2025-01-08 07:47:06 +00:00
Chuma McPhoy
cc7461bf3c fix: update breadcrumbs styling for full width variants 2025-01-07 16:33:11 +01:00
Chuma McPhoy
07fc8357c1 fix: update breadcrumbs max width for loyalty pages 2025-01-07 15:56:15 +01:00
Niclas Edenvin
501c6be22a Merged in fix/sw-1242-tripadvisor-not-clickable (pull request #1139)
fix(SW-1242): increase touch target of trip advisor icon

* fix(SW-1242): increase touch target of trip advisor icon


Approved-by: Pontus Dreij
2025-01-07 12:52:23 +00:00