scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,074 Commits 1 Branch 0 Tags
33065be565d8c2571efa48599bb81bca761607c1
Commit Graph

4074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erik Tiekstra
42593dfe5e fix(SW-2119): Fixed issue where we were redirecting to the parent instead of not found 
Approved-by: Matilda Landström
 2025-04-16 04:52:26 +00:00
Christian Andolf
65a3e3fc58 Merged in feat/SW-1509-new-select-usage-in-forms (pull request #1787) 
feat(SW-1509): simplified date of birth component to work with new select

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-15 14:18:04 +00:00
Tobias Johansson
9a9789e736 Merged in feat/SW-1549-map-improvements (pull request #1783) 
Feat/SW-1549 map improvements

* fix: imported new icon

* refactor: rename component and set map handling to 'greedy'

* fix: show cards for 3s after hover

* refactor: update styles and added HotelPin component

* fix: change from close to back icon

* refactor: update to only use 1 state value for active pin and card

* fix: add click handler when dialog is opened

* fix: performance fixes for the dialog carousel

* fix: added border

* fix: clear timeout on mouseenter

* fix: changed to absolute import

* fix: moved hover state into the store

* fix: renamed store actions


Approved-by: Michael Zetterberg
 2025-04-15 13:23:23 +00:00
Christian Andolf
af918ac442 fix(SW-1509): fix default selected key by using initial parsed user values and not the re-rendered ones 2025-04-15 13:14:33 +02:00
Christian Andolf
e04342110a feat(SW-1509): simplified date of birth component to work with new select 
added animated labels to new select
 2025-04-15 13:14:33 +02:00
Chuma Mcphoy (We Ahead)
57cd2f6a7f Merged in fix/SW-2197-properly-hide-benefits-badge-element (pull request #1798) 
fix(SW-2197): Properly hide benefits message element when isMemberRate is false

* fix(SW-2197): correct hiding of benefit text


Approved-by: Christian Andolf
 2025-04-15 07:56:33 +00:00
Linus Flood
1689039c39 Merged in fix/sitemap-route (pull request #1801) 
Fix: sitemap - now the route works

* Fix: sitemap - now the route works


Approved-by: Joakim Jäderberg
 2025-04-15 07:53:11 +00:00
Michael Zetterberg
b48cd5524e fix: intl lint 2025-04-15 07:37:47 +00:00
Linus Flood
a27d702008 Merged in fix/sitemap-issue (pull request #1788) 
fix/sitemap: default to prod url and added logging. Also added new sitemap function to be able to invoke it on request.

* test

* wip

* wip

* Added error message to log


Approved-by: Joakim Jäderberg
 2025-04-15 05:59:13 +00:00
Michael Zetterberg
af65fbf7f4 fix: rename trpc route for get booking 2025-04-15 05:20:24 +00:00
Christian Andolf
8a0b917824 Merged in fix/find-booking-fixes (pull request #1792) 
fix: add title to find booking page

Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-14 14:21:48 +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
Anton Gunnarsson
3449ccec52 Merged in feat/sw-2232-sas-api-updates (pull request #1786) 
SW-2232 Adapt SAS router to API changes

* Adapt sas procedures to api changes

* Remove debug logs

* Capture performLevelUpgrade error

* More sentry logging

* Merge branch 'master' into feat/sw-2232-sas-api-updates


Approved-by: Joakim Jäderberg
 2025-04-14 13:42:58 +00:00
Anton Gunnarsson
f87ea51b11 Merged in feature/sw-1881-boosted-by-scandic (pull request #1780) 
Show boosted by scandic in SAS Linked Accounts

* Add boostedByScandic property to SAS membership

* Use get profile with extended partner data

* Display correct tier when EB is boosted by SF


Approved-by: Joakim Jäderberg
 2025-04-14 13:14:01 +00:00
Michael Zetterberg
c2f98b85dc fix: add jiti for design system 2025-04-14 12:43:44 +00:00
Simon Emanuelsson
67e094f316 fix: redemptions did not show properly 2025-04-14 13:46:33 +02:00
Michael Zetterberg
37ac9f607c feat(SW-706): load .env.local for download and upload 2025-04-14 11:30:07 +00:00
Michael Zetterberg
7de46cafa8 feat(SW-706): add diff tooling 2025-04-14 11:30:07 +00:00
Michael Zetterberg
35862d03f0 feat(SW-706): fix the build 
The pinned version of @formatjs/swc-plugin-experimental has a bug in it that
doesn't allow it to parse ’. But we can't upgrade to the new version due to
incompatibilities between SWC and Next. We can upgrade once we move to Next 15.
 2025-04-14 11:30:07 +00:00
Michael Zetterberg
5860377774 feat(SW-706): enable lint rules for intl 2025-04-14 11:30:07 +00:00
Michael Zetterberg
65932ddfd3 feat(SW-706): use Lokalise 2025-04-14 11:30:06 +00: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
Michael Zetterberg
e22fc1f3c8 feat(SW-706): add Lokalise tooling and codemod 2025-04-14 11:30:05 +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
Matilda Landström
51a0855fc1 Merged in feat/SW-2181-adapt-map-zooming (pull request #1781) 
fix(SW-2181): use fitted bounds to adapt the zooming of the map

* fix(SW-2181): use fitted bounds to adapt the zooming of the map


Approved-by: Michael Zetterberg
 2025-04-14 07:48:38 +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
Christian Andolf
cc7aa6e317 Merged in fix/nullable-redeem-description (pull request #1777) 
fix: set redeem description nullable in order to handle the transition from string to RTE

Approved-by: Linus Flood
 2025-04-14 07:06:26 +00:00
Christian Andolf
80a738af7b fix: set redeem description nullable in order to handle the transition from string to RTE 2025-04-14 08:57:56 +02: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
Chuma Mcphoy (We Ahead)
31370fe711 Merged in fix/SW-2197-dont-show-benefits-not-applied-text (pull request #1776) 
fix(SW-2197): remove no membership benefits message

* fix(SW-2197): remove no membership benefits message


Approved-by: Christian Andolf
Approved-by: Matilda Landström
 2025-04-14 06:40:40 +00:00
Linus Flood
40f18c915b Merged in fix/hide-bookingwidget-flag (pull request #1764) 
fix: bookingwidget - hide BW if either pageSettings or siteConfig wants to hide it

* fix: bookingwidget - hide BW if either pageSettings or siteConfig wants to hide it

* Refactor


Approved-by: Michael Zetterberg
 2025-04-14 05:37:46 +00:00
Simon Emanuelsson
afb37d0cc5 feat: bedtypes is selectable again 2025-04-12 08:32:42 +00:00
Erik Tiekstra
f62723c6e5 feat(SW-2178): Changed to new buttons for summary inside enter details 
Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
 2025-04-11 15:13:37 +00:00
Hrishikesh Vaipurkar
8961cbd9d5 Merged in feat/SW-2322-update-booking-status-polling- (pull request #1778) 
feat: SW-2322 Added handling of confirmed booking in polling

* feat: SW-2322 Added handling of confirmed booking in polling

* feat: SW-2322 Removed unnecessary startTransition


Approved-by: Michael Zetterberg
 2025-04-11 13:41:19 +00:00
Tobias Johansson
0b1625b678 Merged in feat/SW-1526-select-room-rate-focus (pull request #1732) 
fix(SW-1526): adjusted scroll position when selecting a rate

* fix: adjusted scroll position when selecting a rate

* fix


Approved-by: Michael Zetterberg
 2025-04-11 10:45:07 +00:00
Christian Andolf
d409b4e6fa Merged in feat/SW-1509-new-select-component (pull request #1766) 
Feat/SW-1509 new select component

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-11 10:44:27 +00:00
Bianca Widstam
696197906b Merged in fix/SW-2254-disable-download-invoice-if-flex (pull request #1775) 
fix(SW-2254): disable download invoice if the booking is flex

* fix(SW-2254): disable download invoice if the booking is flex


Approved-by: Simon.Emanuelsson
 2025-04-11 09:17:48 +00:00
Christian Andolf
515885ecbf fix(SW-1509): remove default max width 2025-04-11 09:24:45 +02:00
Christian Andolf
c39a18ab58 fix(SW-1509): fix typing for supporting on selection change prop to be aligned between the two versions 2025-04-11 08:58:01 +02:00
Christian Andolf
a93ed00ee5 fix(SW-1509): removed support for plain array items in order to handle proper props extending 
various fixes for supporting default selected
 2025-04-10 14:37:52 +02:00
Christian Andolf
2b6fe17c32 fix(SW-1509): add support for default selected key 
fixed padding per list item
 2025-04-10 13:30:49 +02:00
Hrishikesh Vaipurkar
2b08f257f5 Merged in fix/SW-2079-update-confirmation-page-summ (pull request #1774) 
fix: SW-2079 Fixed regular room price display confirmation page

* fix: SW-2079 Fixed regular room price display confirmation page


Approved-by: Simon.Emanuelsson
 2025-04-10 11:02:17 +00:00
Christian Andolf
cb344c7bcf fix(SW-1509): additional stories 2025-04-10 10:32:57 +02:00
Christian Andolf
9ef292709b feat(SW-1509): enable support for more react aria props 
fix invalid border

corrected default border
 2025-04-10 10:32:57 +02:00
Christian Andolf
158c2501a5 feat(SW-1509): add select to exports 2025-04-10 10:32:57 +02:00
Christian Andolf
bacd57a735 fix(SW-1509): new select filter props interface 2025-04-10 10:32:56 +02:00
Christian Andolf
bc7cec215c feat(SW-1509): enable filtering select 2025-04-10 10:32:56 +02:00
Christian Andolf
77e4e9d203 feat(SW-1509): new select component in design-system 2025-04-10 10:32:56 +02:00