Commit Graph

56 Commits

Author SHA1 Message Date
Simon.Emanuelsson
c204532acc Merged in feat/SW-1261 (pull request #1263)
feat: only show member price when logged in

* feat: only show member price when logged in


Approved-by: Michael Zetterberg
2025-02-07 08:51:50 +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
Anton Gunnarsson
fc866c0e4d Merged in feat/sw-1493-revised-comparison-block (pull request #1236)
feat(SW-1493): Revised SAS comparison block

* Base of new TierDetails for SAS tier comparison

* Add backgrounds and content to TierDetails

* Implement new cms schema for SasTierComparison

* Override gap in jsontohtml styling to 0

* Add animations to comparison details

* Redesign again

* Update content model to new design

* Add border to bottom item in tier match list

* Wrap interpolate-size in @supports to be safe

* Merge branch 'master' into feat/sw-1493-revised-comparison-block


Approved-by: Joakim Jäderberg
2025-02-03 08:42:16 +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
13a164242f fix: clean up hotel and its typings 2025-01-30 13:50:02 +01: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
Linus Flood
69b69af03c Merged in feat/enter-details-tracking (pull request #1185)
Feat/enter details tracking

* feat: fixed bug in enter details tracking

* Sidepeek events, lowestroomPrice and analyticsRateCode

* Cleanup and fixed bug

* Fixed analyticsratecode

* Merge master

* merge master

* Removed console logs

* Added ancillaries tracking to enter details

* Added ancillary on confirmation page

* Removed console log

* Merge branch 'master' into feat/enter-details-tracking

* Refactor searchparams

* Hard code values for breakfast ancillary


Approved-by: Joakim Jäderberg
2025-01-17 07:42:44 +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
Linus Flood
3bbd99ba5c Merged in fix/hotelinfo-tracking-off (pull request #1167)
feat(tracking) turn off hotelinfo tracking in booking flow

* feat(tracking) turn off hotelinfo tracking in booking flow

* Turn off hotelInfo on enter details

* Merge master


Approved-by: Joakim Jäderberg
2025-01-10 12:49:14 +00:00
Linus Flood
08d5405cf1 PR Fixes 2025-01-10 11:36:23 +01:00
Linus Flood
d57e3db34b Merge remote-tracking branch 'origin' into feat/tracking-payment 2025-01-10 09:13:04 +01:00
Linus Flood
014eea054f Fixed same string value for childBedPreference on confirmation page 2025-01-10 08:40:26 +01:00
Linus Flood
7ca2fd78f0 Remove console logs 2025-01-09 13:02:03 +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
Linus Flood
519795acac feat: tracking - added discount property and some basics for paymentInfo 2025-01-08 08:50:50 +01:00
Arvid Norlin
0c7c6ea21a feat: add Price details modal 2024-12-20 09:28:06 +01:00
Linus Flood
5f8a13d478 Fixed type imports 2024-12-13 09:48:53 +01:00
Linus Flood
6f1d5129e9 Removed type from enum 2024-12-13 09:23:43 +01:00
Linus Flood
742a2820d1 Merge remote-tracking branch 'origin' into feature/tracking 2024-12-13 09:02:37 +01:00
Christian Andolf
e08e960209 chore: add consistent type imports 2024-12-12 11:47:44 +01:00
Linus Flood
115d1f0a10 Suspense on <TrackingSDK> 2024-12-06 15:47:34 +01:00
Tobias Johansson
af3c68e464 fixes 2024-12-06 09:13:36 +01:00
Tobias Johansson
f7cf1e9a2b fix(SW-1043): styling fixes 2024-12-06 09:12:13 +01:00
Linus Flood
66ee5e7cbc Added hotelId 2024-12-04 13:36:40 +01:00
Linus Flood
c3429e2860 Added basic tracking on booking confirmation 2024-12-04 13:22:12 +01:00
Linus Flood
b9111511b7 Track sessionId 2024-12-03 11:46:43 +01:00
Linus Flood
9db02488d8 Payment method update 2024-12-03 11:29:16 +01:00
Linus Flood
098581acd4 Fixed correct rates 2024-12-03 08:47:07 +01:00
Linus Flood
26d44a2c29 Fixed bugs 2024-12-03 08:19:47 +01:00
Linus Flood
4487c25d47 Merge branch 'master' into feature/tracking 2024-12-03 07:48:59 +01:00
Christel Westerberg
f896f8df76 fix: translations and double currencies 2024-12-02 16:23:57 +01:00
Simon Emanuelsson
ed1574838a feat: new booking confirmation page 2024-11-29 15:55:30 +01:00
Christel Westerberg
329d762917 fix: normalize page width 2024-11-29 14:58:27 +01:00
Christel Westerberg
bdccce1d70 fix: header width and clamping 2024-11-29 14:58:27 +01:00
Linus Flood
6433f136b4 Fixed new tracking requirements 2024-11-29 13:01:03 +01:00
Linus Flood
0958c626c6 Age and bed for children 2024-11-29 08:48:39 +01:00
Linus Flood
1fb90ba9bd More props to track in enter details 2024-11-29 08:36:21 +01:00
Linus Flood
43b38bf894 Merge master 2024-11-28 13:37:45 +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
Christel Westerberg
f5990998db fix: add hotel header to enter details flow 2024-11-27 15:59:12 +01:00
Simon Emanuelsson
ccb15593ea feat: merge stores, fix auto navigation, split summary 2024-11-27 10:20:14 +01:00
Linus Flood
8b2bd5bcd6 Refactor 2024-11-27 09:15:45 +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
Hrishikesh Vaipurkar
21f9719050 fix: SW-981 Rounded to single decimal as current web 2024-11-25 11:52:43 +01:00
Hrishikesh Vaipurkar
bd6fd62d5c fix: SW-981 Fixed distance to center value 2024-11-25 11:52:43 +01:00
Linus Flood
2f39b53f32 Enter details tracking WIP 2024-11-25 10:52:01 +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
Joakim Jäderberg
90184b8662 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/syncblocking-parallel-routes 2024-11-20 12:43:41 +01:00
Simon Emanuelsson
744af22b08 fix: make sure all searchparams are used in redirect 2024-11-19 11:19:44 +00:00