Commit Graph

114 Commits

Author SHA1 Message Date
Hrishikesh Vaipurkar
eabe45b73c Merged in feat/SW-1557-implement-booking-code-select (pull request #1304)
feat: SW-1577 Implemented booking code city search

* feat: SW-1577 Implemented booking code city search

* feat: SW-1557 Strict comparison

* feat: SW-1557 Review comments fix


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij
2025-02-13 09:24:47 +00:00
Arvid Norlin
d46a85a529 Merged in fix/handle-bed-reselect-navigation (pull request #1321)
fix: adjust allowed step navigation condition

* fix: adjust allowed step navigation condition


Approved-by: Tobias Johansson
2025-02-13 08:39:43 +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
Pontus Dreij
c863294919 Merged in feat/SW-1055-Accordion-for-summary-bar-in-mobile-on-Select-Rate (pull request #1283)
Feat/SW-1055 Accordion for summary bar in mobile on Select Rate

* feat(SW-1055) created mobile summary for select rate

* feat(SW-1055) Added summary for mobile (accordion)


Approved-by: Tobias Johansson
2025-02-10 15:11:31 +00:00
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
Simon Emanuelsson
1deab000bd fix: cache hotel response 2025-01-30 13:51:47 +01:00
Pontus Dreij
eef7c222aa feat(SW-718) refactor: optimize rate selection and room scrolling 2025-01-30 11:19:22 +01:00
Pontus Dreij
ab7b826cd2 feat(SW-718) created useRoomFilteringStore 2025-01-30 11:19:22 +01:00
Pontus Dreij
b7cf3296cf feat(SW-718) Fix import error 2025-01-30 11:19:22 +01:00
Pontus Dreij
68d7e869db feat(SW-718) updates after PR comments 2025-01-30 11:19:22 +01:00
Pontus Dreij
bfdc62d263 feat(SW-718): fix comments 2025-01-30 11:19:22 +01:00
Pontus Dreij
2a6c88d897 feat(SW-718): Created store for selectRate 2025-01-30 11:19:22 +01:00
Tobias Johansson
a7468cd958 Merged in feat/SW-1379-multiroom-summary (pull request #1198)
Feat/SW-1379 multiroom summary

* fix: added early return in hotel query and added missing type annotations

* feat(SW-1379): update summary to support multiple rooms and add tests

* fix: added check for room number when using isMember for member prices

* fix: remove mocked array

* fix: minor bug fixes in rate details popup

* fix: translation key


Approved-by: Pontus Dreij
Approved-by: Arvid Norlin
2025-01-29 09:25:43 +00:00
Erik Tiekstra
a88a033e30 Merged in feat/SW-1450-destination-page-cs-components (pull request #1204)
feat(SW-1450): added components in destination pages from cs

* feat(SW-1450): added components in destination pages from cs

* feat(SW-1450): added correct refs and removed classNames


Approved-by: Fredrik Thorsson
2025-01-24 12:06:43 +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
a3331850a2 fix: avoid localizing currencies and default missing value to N/A 2025-01-14 16:20:08 +01:00
Christel Westerberg
b2935114e3 refactor: url management in hotel reservation flow 2025-01-14 11:09:42 +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
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
Arvid Norlin
0c7c6ea21a feat: add Price details modal 2024-12-20 09:28:06 +01:00
Christian Andolf
42bb71cf2f feat(SW-1063): add member price modal 2024-12-17 10:58:44 +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
8534405358 fix: reset searchparams after errorcode from planet 2024-12-13 08:20:36 +01:00
Christel Westerberg
4210218852 fix: persist selection of bed and breakfast if same room 2024-12-10 15:42:44 +01:00
Pontus Dreij
15c5afc43a fix(SW-1111) refactor state of active hotel card and hotel pin 2024-12-09 16:50:02 +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
Linus Flood
6a4364e1c4 Merge remote-tracking branch 'origin' into feature/tracking 2024-12-05 15:12:09 +01:00
Christel Westerberg
528107e0ef fix: change euro price to user's currency + merge state correctly 2024-12-03 15:17:01 +01:00
Linus Flood
4487c25d47 Merge branch 'master' into feature/tracking 2024-12-03 07:48:59 +01:00
Simon Emanuelsson
ed1574838a feat: new booking confirmation page 2024-11-29 15:55:30 +01:00
Linus Flood
43b38bf894 Merge master 2024-11-28 13:37:45 +01:00
Bianca Widstam
8f3d203b70 Merged in fix/SW-1041-design-feedback-select-hotel (pull request #986)
fix(SW-1041): fix UI design feedback

* fix(SW-1041): fix UI design feedback

* fix(SW-1041): small fix

* fix(SW-1041): add filter and sort badge

* fix(SW-1041): update activefilter when entering map view

* fix(SW-1041): create hook with activefilters

* fix(SW-1041): hook only sets filter

* fix(SW-1041): fix padding breadcrumbs

* fix(SW-1041): rename hook

* fix(SW-1041): fix double scroll


Approved-by: Pontus Dreij
Approved-by: Niclas Edenvin
2024-11-28 07:42:52 +00:00
Christel Westerberg
439bc13e65 fix: close summary sheet 2024-11-27 13:39:09 +01:00
Simon Emanuelsson
ccb15593ea feat: merge stores, fix auto navigation, split summary 2024-11-27 10:20:14 +01:00
Linus Flood
6f7a4d263b Merge branch 'master' into feature/tracking 2024-11-25 10:14:12 +01:00
Joakim Jäderberg
74b634021a Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-22 10:30:53 +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
Joakim Jäderberg
10bd915217 merge 2024-11-21 12:43:25 +01:00
Christel Westerberg
92b0ec9c84 fix: hydrate store with updated values 2024-11-21 11:14:28 +01: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
Linus Flood
0f939d1a19 Merge branch 'master' into feature/tracking 2024-11-21 07:53:58 +01:00
Joakim Jäderberg
dbb08960a5 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-20 14:33:05 +01:00
Joakim Jäderberg
dfdbdb7621 feat: break apart loading of room availability and hotel card
feat: add skeletons
2024-11-20 10:17:55 +01:00
Simon Emanuelsson
744af22b08 fix: make sure all searchparams are used in redirect 2024-11-19 11:19:44 +00:00
Christel Westerberg
d5c6b6809c fix: responsivity of fields and order of signup form 2024-11-19 08:49:26 +01:00
Simon Emanuelsson
94f693c4f0 feat: make steps of enter details flow dynamic depending on data 2024-11-18 16:30:09 +01:00