scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,334 Commits 2 Branches 0 Tags
2b32a9c1ff3cc0f0297ff06eb474025aa5892ecc
Commit Graph

112 Commits

Author SHA1 Message Date
Tobias Johansson
02b26e7965 Merged in fix/SW-2668-tracking-room-details-missing (pull request #2015) 
fix(SW-2668): added search term and room details to tracking

* fix(SW-2668): added search term and room details to tracking

* fix: change to optional type


Approved-by: Christian Andolf
Approved-by: Matilda Landström
 2025-05-08 14:13:51 +00:00
Simon Emanuelsson
c5d4895b6d feat: trigger loading states immediately upon navigation 2025-05-08 15:10:43 +02:00
Tobias Johansson
194a401a56 Merged in fix/SW-2631-check-session-expiry (pull request #2004) 
fix(SW-2631): check if session is valid otherwise use service token

* fix: check if session is valid otherwise use service token

* fix: only use service token for queries and updated mutations to check for valid user token


Approved-by: Michael Zetterberg
 2025-05-08 09:20:48 +00:00
Michael Zetterberg
c6a0ce86df feat(SW-2605): confirmation page only valid for 1 minute for the session 2025-05-06 11:01:32 +00:00
Anton Gunnarsson
fbeb23c2aa Merged in chore/remove-env-log (pull request #1966) 
Don't log entire process.env

* Don't log entire process.env

* Don't log entire env on logout


Approved-by: Michael Zetterberg
 2025-05-06 09:16:46 +00:00
Michael Zetterberg
4432cdc245 fix: booking widget search type 2025-05-06 07:32:48 +02:00
Arvid Norlin
afda7f851a fix: correct membershipFailedError logic 2025-05-06 04:19:28 +00:00
Arvid Norlin
fa1ace9a2c fix: remove lingering cancel/error message based on sessionStorage 2025-05-06 04:00:32 +00:00
Michael Zetterberg
b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +00:00
Christian Andolf
f681fa7675 Merged in chore/replace-corner-radius-variable-with-new (pull request #1943) 
chore: replace old border-radius variables with new tokens

Approved-by: Erik Tiekstra
 2025-05-05 11:24:48 +00:00
Joakim Jäderberg
5784822a1e Merged in feature/SW-2320-languagebased-hide-for-next-release (pull request #1937) 
Language based alternative to HIDE_FOR_NEXT_RELEASE

Approved-by: Anton Gunnarsson
 2025-05-05 10:53:28 +00:00
Hrishikesh Vaipurkar
d2bbc59f47 Merged in fix/SW-2602-select-hotel-page-booking-code (pull request #1941) 
Fix/SW-2602 select hotel page booking code filtering

* fix: SW-2602 Fixed booking code filtering

* fix: SW-2602 Fixed lint issues


Approved-by: Niclas Edenvin
 2025-05-05 09:17:44 +00:00
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Anton Gunnarsson
aa43d7d059 Merged in fix/sw-2563-pass-lang-to-sas-auth (pull request #1938) 
Set ui_locales on SAS auth link

* Set ui_locales on SAS auth link


Approved-by: Joakim Jäderberg
 2025-05-05 09:00:05 +00:00
Simon Emanuelsson
db289b80b1 feat: refactor NewDates, clean up legacy code 
This reverts commit 0c7836fa59.
 2025-05-03 21:45:45 +02:00
Hrishikesh Vaipurkar
53b630b6d8 Merged in feat/SW-2308-family-friends-booking-rest (pull request #1916) 
feat: SW-2308 FnF code restriction added

* feat: SW-2308 FnF code restriction added

* feat: 2308 Optimized code


Approved-by: Niclas Edenvin
 2025-05-02 14:22:05 +00:00
Linus Flood
d49ecdae1f Merged in feat/sw-2323-find-booking3 (pull request #1928) 
Feat/sw-2323 New Find booking endpoint

* wip

* wip


Approved-by: Anton Gunnarsson
 2025-05-02 13:21:00 +00:00
Linus Flood
6979ac0c3b Merged in revert-pr-1925 (pull request #1927) 
Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
 2025-05-02 13:05:42 +00:00
Linus Flood
f450f2a5db Merge master 2025-05-02 14:01:50 +02:00
Linus Flood
db3e9e6cd9 wip 2025-05-02 13:28:37 +02:00
Arvid Norlin
74d37dad93 feat(SW-2116): RefId instead of confirmationNumber 2025-05-02 12:44:07 +02:00
Linus Flood
7c26e2955e wip 2025-05-02 12:17:18 +02:00
Arvid Norlin
a839d05e09 feat(SW-2116): remove payment-callback rewrite logic 2025-05-02 11:47:14 +02:00
Tobias Johansson
bf79168216 Merged in fix/SW-2462-room-availability-error (pull request #1920) 
Fix/SW-2462 room availability error

* fix: added toast error when availability fails and you get redirect to select-rate

* fix: added support for showing alert when availability error happens

* fix: rename PaymentAlert -> BookingAlert


Approved-by: Erik Tiekstra
 2025-05-02 08:35:29 +00:00
Anton Gunnarsson
284e6bce3a Merged in fix/sw-2550-sas-callback-language (pull request #1910) 
Use dynamic language in SAS callback url

* Use dynamic language in callback url


Approved-by: Linus Flood
 2025-04-30 07:42:30 +00:00
Bianca Widstam
03902da897 Merged in fix/SW-2438-remove-breakfast-tracking (pull request #1872) 
fix(SW-2438): remove breakfast tracking on enter details

* fix(SW-2438): remove breakfast tracking on enter details

* fix(SW-2438): show breakfastOption if already chosen on page load

* fix(SW-2438): if breakfast option does not exists (scandic go) remove breakfastOption from tracking

* fix(SW-2438): fix merge conflicts

* fix(SW-2438): fix comment

* fix(SW-2438): fix comment

* fix(SW-2438): fix merge


Approved-by: Tobias Johansson
Approved-by: Matilda Landström
 2025-04-29 10:46:52 +00:00
Hrishikesh Vaipurkar
6a0f22b166 Merged in feat/SW-1355-reward-night-booking-track-2 (pull request #1877) 
feat: SW-1355 Added points value in details page tracking

* feat: SW-1355 Added points value in details page tracking

* feat: SW-1355 Updated .flatMap to .map

* feat: SW-1355 Optimized for readability


Approved-by: Michael Zetterberg
 2025-04-29 07:52:29 +00:00
Tobias Johansson
70095043f8 Merged in fix/SW-1353-multiroom-tracking (pull request #1870) 
fix(SW-1353): enter details tracking fixes

* fix(SW-1353): tracking fixes

* refactor: move code

* fix: use hasPublicPrice

* fix: update calculation for roomPrice and totalPrice

* fix: only include bedtype if it is "preselected"


Approved-by: Michael Zetterberg
 2025-04-29 06:29:57 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Anton Gunnarsson
7c191aa875 Merged in fix/tiny-translation-fixes (pull request #1874) 
Tiny updates to copy in SAS flow

* Tiny translation fixes


Approved-by: Joakim Jäderberg
 2025-04-28 07:35:34 +00:00
Erik Tiekstra
b75177ad98 Fix/SW-2429 map view 
* feat(SW-2429): Removed [contentType]>[uid] and use app router based structure for content types

* feat(SW-2429): Added breadcrumbs to follow contenttype folder structure

* feat(SW-2429): Removed modal/dialog functionality from map views on hotel and destination pages

* fix(SW-2429): Fixed issue with booking widget on meeting pages. Also used same structure for content types

Approved-by: Arvid Norlin
 2025-04-25 05:36:44 +00:00
Anton Gunnarsson
26d3d1b1d3 Merged in fix/sw-2502-magic-link-signin-sas-tier-match-scope (pull request #1859) 
Add correct scope to magic link sign in for SAS flow

* Add correct scope to magic link sign in


Approved-by: Joakim Jäderberg
 2025-04-24 12:30:42 +00:00
Anton Gunnarsson
b354398c69 Merged in fix/improve-sas-error-logging (pull request #1854) 
Improve SAS flow logging

* Improve logging


Approved-by: Joakim Jäderberg
 2025-04-24 12:30:34 +00:00
Linus Flood
cfa8c166a3 Merged in feat/sw-2403-mystay-webview (pull request #1828) 
Feat/sw-2403 - Adding webview for MyStay

* feat/webview - added for my stay

* wip

* Passing headers so we can get the lang

* Cleanup

* Refactored and some performance improvements


Approved-by: Christian Andolf
 2025-04-17 08:48:52 +00:00
Hrishikesh Vaipurkar
8c0597727b Merged in feat/SW-1879-aa-tracking-bed-breakfastpayment (pull request #1789) 
feat: SW-1879 Tracking enter-details sections

* feat: SW-1879 Tracking enter-details sections

* feat: SW-1879 removed onSelect to trigger in onSubmit

* feat: SW-1879 Removed onSelect and triggered inside onSubmit

* feat: SW-1879 Optimized to remove unnecessary useEffect triggers in every re-render

* feat: SW-1879 Updated breakfast package typings

* feat: SW-1879 Reverted RadioCardProps

* feat: SW-1879 Optimised code


Approved-by: Tobias Johansson
Approved-by: Christian Andolf
 2025-04-16 14:06:15 +00:00
Anton Gunnarsson
009d46ebac Merged in fix/too-many-codes-error (pull request #1814) 
Fix SAS OTP rate limited error

* Fix error for too many codes not showing up


Approved-by: Joakim Jäderberg
 2025-04-16 11:20:20 +00:00
Anton Gunnarsson
0ab5dc1c9d Merged in fix/sw-2132-unlink-error (pull request #1816) 
Add UnlinkError for when SAS account unlinking fails

* Add UnlinkError for when unlinking fails


Approved-by: Joakim Jäderberg
 2025-04-16 11:19:07 +00:00
Linus Flood
2648b17744 Merged in fix/redirect-service-revert (pull request #1818) 
hotfix: uncomment new stuff that broke destination page

* hotfix: uncomment new stuff that broke destination page


Approved-by: Michael Zetterberg
Approved-by: Joakim Jäderberg
 2025-04-16 10:09:54 +00:00
Arvid Norlin
33065be565 Merged in feat/SW-2111 (pull request #1761) 
feat(SW-2111): add initial scandic-redirect

* feat(SW-2111): add initial scandic-redirect

* feat(SW-2112): add scandic-redirect call to middleware

* chore: add redirect jsons per lang

* fix: handle incorrect contentTypes

* fix: handle lang

* refactor: add json streaming

* refactor: wrap redirect call in cacheOrGet

* refactor: review


Approved-by: Michael Zetterberg
 2025-04-16 06:29:32 +00:00
Michael Zetterberg
b48cd5524e fix: intl lint 2025-04-15 07:37:47 +00:00
Christian Andolf
d00e8f09a6 fix: add title to find booking page 
add email type to email field
 2025-04-14 16:14:52 +02:00
Michael Zetterberg
440e1f92df feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass 2025-04-14 11:30:06 +00:00
Hrishikesh Vaipurkar
1c5b116ed8 Merged in feat/SW-1355-reward-night-booking-tracking (pull request #1758) 
feat: SW-1355 Tracking implementation reward night booking

* feat: SW-1355 Tracking implementation reward night booking

* feat: SW-1355 Updated checks and optional params

* feat: SW-1355 Typings updated

* feat: SW-1355 Removed undefined check

* feat: SW-1355 optimized code


Approved-by: Christian Andolf
 2025-04-14 11:10:03 +00:00
Hrishikesh Vaipurkar
e372b91356 Merged in feat/SW-1517-booking-codes-tracking (pull request #1745) 
Feat/SW-1517 booking codes tracking

* feat: SW-1517 Updated tracking to inlcude booking code info

* feat: SW-1517 Tracking booking codes

* feat: SW-1517 booking code multiroom tracking

* feat: SW-1517 booking code tracking select-hotel map view

* feat: SW-1517 Updated to optional param

* feat: SW-1517 Optimized with map

* feat: SW-1517 Typings update

* feat: SW-1517 Replaced reduce with map and join

* feat: SW-1517 Updated typings


Approved-by: Christian Andolf
 2025-04-14 07:17:40 +00:00
Michael Zetterberg
543ea3e5a3 fix(SW-2336): remove text on hotelreservation landing page 2025-04-14 06:55:57 +00:00
Simon Emanuelsson
d72c84d949 feat: filters work together 2025-04-14 06:51:44 +00:00
Simon Emanuelsson
afb37d0cc5 feat: bedtypes is selectable again 2025-04-12 08:32:42 +00:00
Joakim Jäderberg
da07e8a458 Merged in feature/autocomplete-search (pull request #1725) 
Feature/autocomplete search

* wip autocomplete search

* add skeletons to loading

* Using aumlauts/accents when searching will still give results
remove unused reducer
sort autocomplete results

* remove testcode

* Add tests for autocomplete

* cleanup tests

* use node@20

* use node 22

* use node22

* merge
fix: search button outside of viewport

* merge

* remove more unused code

* fix: error message when empty search field in booking widget

* fix: don't display empty white box when search field is empty and no searchHistory is present

* merge

* fix: set height of shimmer for search skeleton

* rename autocomplete trpc -> destinationsAutocomplete

* more accute cache key naming

* fix: able to control wether bookingwidget is visible on startPage
fix: sticky booking widget under alert

* remove unused code

* fix: skeletons
fix: error overlay on search startpage

* remove extra .nvmrc

* merge


Approved-by: Linus Flood
 2025-04-09 10:43:08 +00:00
Anton Gunnarsson
8dee7b0243 Merged in feat/sw-2260-update-sas-toc-links (pull request #1763) 
Update terms and conditions link for sas

* Update terms and conditions link for sas


Approved-by: Joakim Jäderberg
 2025-04-09 07:50:58 +00:00
Erik Tiekstra
701a80b7c1 feat(SW-2240): Added robots no-index and no-follow metadata to hotelreservation pages 
Approved-by: Michael Zetterberg
 2025-04-09 05:31:02 +00:00