Commit Graph

5330 Commits

Author SHA1 Message Date
Linus Flood
9c7904c9e0 Merged in fix/webview-auth-fix (pull request #2833)
Fix/webview auth fix

* Test

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/webview-auth-fix

* Setting cookie instead of headers


Approved-by: Anton Gunnarsson
2025-09-19 12:55:53 +00:00
Anton Gunnarsson
7adb9ded46 Merged in feat/sw-3472-booking-flow-parameterization (pull request #2811)
feat(SW-3272): Add BookingFlowConfig

* Add BookingFlowConfig

* Rename "provider" to BookingFlowConfig

* Change bookingCode to boolean

* Fix error


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-09-19 11:56:50 +00:00
Erik Tiekstra
7c92a8fc9a feat(BOOK-53): Added component for SEO filters and support filter switching
Approved-by: Chuma Mcphoy (We Ahead)
2025-09-19 08:26:41 +00:00
Matilda Landström
0e30a2d218 Merged in feat/LOY-361-add-promo-campaign-page-type (pull request #2826)
Feat/LOY-361 add promo campaign page type

* feat(LOY-361): add Pomo Campaign page type

* chore(SW-361): remove campaign page flag

* fix(LOY-361): cleanup

* fix(LOY-361): add promo code


Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
2025-09-19 07:20:17 +00:00
Bianca Widstam
c791fef2c6 Merged in fix/BOOK-121-join-membership-modify-correct-price (pull request #2829)
fix(BOOK-121): clear join only if membership number is valid and calculate correct member price

* fix(BOOK-121): clear join only if membership number is valid and calculate correct member price


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-09-19 06:20:48 +00:00
Anton Gunnarsson
08804e8675 Merged in chore/cleanup-scandic-web (pull request #2831)
chore: Cleanup scandic-web

* Remove unused files

* Remove unused and add missing packages

* Remove unused exports


Approved-by: Linus Flood
2025-09-18 15:33:00 +00:00
Chuma Mcphoy (We Ahead)
cc99f26727 Merged in fix/LOY-358-SAS-expiry-date (pull request #2813)
fix(LOY-358): Proper SAS tier expiration date check

* fix(LOY-358): Proper SAS tier expiration date check


Approved-by: Erik Tiekstra
2025-09-18 13:39:37 +00:00
Erik Tiekstra
948c86479a feat(BOOK-54): Adjusted filter functionality to save filters as query parameters instead of paths
* feat(BOOK-54): Destination filters now matching on id instead of slug in preparation for filters from Contentstack

Approved-by: Chuma Mcphoy (We Ahead)
2025-09-18 13:03:01 +00:00
Matilda Landström
32a817fa72 Merged in fix/BOOK-233-book-a-table-label (pull request #2827)
fix(BOOK-233): flip back logic for label

* fix(BOOK-233): flip back logic for label


Approved-by: Bianca Widstam
2025-09-18 12:44:06 +00:00
Joakim Jäderberg
ae7a62c88f Merged in feature/SW-3149-send-logs-to-sentry (pull request #2802)
Feature/SW-3149 send logs to sentry

* Use sentry for logging

* .

* fix(SW-3149) Send logs to Sentry

* remove experimental flag for logs

* add sentry settings for partner-sas

* feat(SW-3108): Added external link option to top primary button on content/collection page

Approved-by: Matilda Landström

* fix(BOOK-152): Removed old header references inside useStickyPosition hook to fix offset issue for the sitewide alert

Approved-by: Matilda Landström

* Merged in fix/LOY-360-team-member-text-for-retired-employees (pull request #2799)

fix(LOY-360): improve text for retired employees

* fix(LOY-360): improve text for retired employees


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström

* Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795)

fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): add callback page for guarantee on webview


Approved-by: Linus Flood

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(BOOK-144): Make image clickable instead of a button to avoid being able to click outside of the image area

Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)

* Merged in fix/BOOK-127-translate-validation-text (pull request #2800)

fix(BOOK-127): translate terms required message

* fix(BOOK-127): translate terms required message


Approved-by: Erik Tiekstra

* Merged in feat/LOY-354-L7-Progress-Card (pull request #2786)

Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra

* Merged in fix/BOOK-132-tracking-breakfast (pull request #2803)

fix(BOOK-132): add breakfastOption tracking

* fix(BOOK-132): add breakfastOption tracking


Approved-by: Joakim Jäderberg

* Merged in fix/enter-details-errors-missing (pull request #2806)

fix: Add missing messages to BookingFlowInput errors

* Add missing messages to BookingFlowInput errors

* Fix errors

* zippy zip

* phoney


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg

* Merged in feature/copy-static-files-via-build-scripts (pull request #2798)

SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood

* Merged in feat/SW-2999-cleanup (pull request #2810)

feat(SW-2999): cleanup current web

* feat(SW-2999): cleanup current web

* Merge master

* Removed unused fonts


Approved-by: Joakim Jäderberg

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* merge


Approved-by: Linus Flood
2025-09-18 07:59:44 +00:00
Hrishikesh Vaipurkar
c09dc29fee Merged in feat/SW-3250-account-linking-modal-you- (pull request #2819)
feat(SW-3250): Updated UI for already linked account error

* feat(SW-3250): Updated UI for already linked account error


Approved-by: Anton Gunnarsson
2025-09-18 07:39:08 +00:00
Anton Gunnarsson
65e4623b52 Merged in chore/fix-partner-sas-todos (pull request #2823)
chore: Fix partner-sas todos

* Add onError to TrpcProvider

* Add AdobeSDKScript

* Add GTMScript

* Add adobeDataLayer script

* Add ReactQueryDevtools

* Move components to correct folder


Approved-by: Joakim Jäderberg
2025-09-18 07:28:14 +00:00
Anton Gunnarsson
b0f3e4afbd Merged in chore/cleanup-booking-flow (pull request #2824)
chore: Cleanup booking-flow after migration

* Remove unused types

* Clean up exports, types, unused files etc in booking-flow


Approved-by: Joakim Jäderberg
2025-09-18 07:28:05 +00:00
Joakim Jäderberg
9620bfe76d Merged in SW-3476-use-separate-curity-client-for-service-tokens-for-partner-sas (pull request #2809)
feat(SW-3476): add support for using different curity clients when creating service tokens

* fix(SW-3476): add support for using different curity clients when creating service tokens

* remove log statement


Approved-by: Hrishikesh Vaipurkar
2025-09-18 07:04:45 +00:00
Joakim Jäderberg
8661e5c348 Merged in chore/icon-readme-update (pull request #2817)
Update icon generation script and remove unused font file

* Update icon generation script and remove unused font file


Approved-by: Matilda Landström
2025-09-17 12:58:23 +00:00
Matilda Landström
d6addd2398 Merged in fix/update-health-card-script (pull request #2821)
fix: update scripted text on health facility card

* fix: update scripted text on health facility card


Approved-by: Erik Tiekstra
2025-09-17 08:57:49 +00:00
Bianca Widstam
1e566e59f7 Merged in fix/SW-3484-campaign-remove-breakfast-message-chip (pull request #2820)
fix(SW-3484): remove breakfast message in the booking code chip for campaign

* fix(SW-3484): remove breakfast message in the booking code chip for campaign


Approved-by: Matilda Landström
2025-09-17 08:11:10 +00:00
Linus Flood
886f1b2f11 Merged in feat/LOY-367-soft-validation (pull request #2815)
feat(LOY-367)-softer validation for dynamic content enum

* feat(LOY-367)-softer validation for dynamic content enum

* Test


Approved-by: Erik Tiekstra
2025-09-17 08:00:17 +00:00
Bianca Widstam
a144f84566 Merged in fix/SW-3481-map-view-pin-highlighted (pull request #2814)
fix(SW-3481): highlight pin and min width to 900 to avoid duplicate hotelcards

* fix(SW-3481): highlight pin and min width to 900 to avoid duplicate hotelcards


Approved-by: Matilda Landström
2025-09-17 07:59:16 +00:00
Bianca Widstam
34389837ae Merged in fix/SW-3483-labels-month-missing-date-picker (pull request #2816)
fix(SW-3483): add color to label in date picker

* fix(SW-3483): add color to label in date picker


Approved-by: Matilda Landström
2025-09-17 07:58:48 +00:00
Linus Flood
eea2a63835 Merged in feat/book-228-campaign (pull request #2818)
feat(book-228): campaign cache fixes

* feat(book-228): campaign cache fixes


Approved-by: Erik Tiekstra
Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
2025-09-17 07:57:51 +00:00
Anton Gunnarsson
5a86cbaafe Merged in chore/update-eslint-configs (pull request #2812)
chore: Extend eslint configs from @typescript-eslint/recommended

* Change to typescript recommended in scandic-web

* Remove comment

* Change to recommended ts config in partner-sas

* Change to recommended ts lint config in booking-flow


Approved-by: Linus Flood
2025-09-17 07:55:11 +00:00
Matilda Landström
e6d5c45ca7 Merged in fix/Lokalise-update (pull request #2807)
Fix/Lokalise update

* chore: update English keys

* fix: update from Lokalise


Approved-by: Linus Flood
2025-09-16 11:46:31 +00:00
Linus Flood
fd0198f57b Merged in feat/SW-2999-cleanup (pull request #2810)
feat(SW-2999): cleanup current web

* feat(SW-2999): cleanup current web

* Merge master

* Removed unused fonts


Approved-by: Joakim Jäderberg
2025-09-16 11:28:57 +00:00
Joakim Jäderberg
48324ef935 Merged in feature/copy-static-files-via-build-scripts (pull request #2798)
SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood
2025-09-16 10:59:33 +00:00
Anton Gunnarsson
33ce30a1c8 Merged in fix/enter-details-errors-missing (pull request #2806)
fix: Add missing messages to BookingFlowInput errors

* Add missing messages to BookingFlowInput errors

* Fix errors

* zippy zip

* phoney


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg
2025-09-15 14:20:11 +00:00
Bianca Widstam
03cc146eac Merged in fix/BOOK-132-tracking-breakfast (pull request #2803)
fix(BOOK-132): add breakfastOption tracking

* fix(BOOK-132): add breakfastOption tracking


Approved-by: Joakim Jäderberg
2025-09-15 13:45:32 +00:00
Chuma Mcphoy (We Ahead)
0737f4fb78 Merged in feat/LOY-354-L7-Progress-Card (pull request #2786)
Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra
2025-09-15 11:48:18 +00:00
Bianca Widstam
295e98a560 Merged in fix/BOOK-127-translate-validation-text (pull request #2800)
fix(BOOK-127): translate terms required message

* fix(BOOK-127): translate terms required message


Approved-by: Erik Tiekstra
2025-09-15 10:43:57 +00:00
Erik Tiekstra
b437f8b806 feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(BOOK-144): Make image clickable instead of a button to avoid being able to click outside of the image area

Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
2025-09-15 09:02:48 +00:00
Bianca Widstam
800948bb94 Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795)
fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): add callback page for guarantee on webview


Approved-by: Linus Flood
2025-09-15 07:18:58 +00:00
Chuma Mcphoy (We Ahead)
98816b27ce Merged in fix/LOY-360-team-member-text-for-retired-employees (pull request #2799)
fix(LOY-360): improve text for retired employees

* fix(LOY-360): improve text for retired employees


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-09-15 07:18:01 +00:00
Erik Tiekstra
a720138c85 fix(BOOK-152): Removed old header references inside useStickyPosition hook to fix offset issue for the sitewide alert
Approved-by: Matilda Landström
2025-09-15 06:47:30 +00:00
Erik Tiekstra
5654569a11 feat(SW-3108): Added external link option to top primary button on content/collection page
Approved-by: Matilda Landström
2025-09-15 06:47:10 +00:00
Erik Tiekstra
ce71fc421c fix: Trimming hotel ids from contentstack to avoid 404 errors when fetching hotel data
Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-09-12 09:18:50 +00:00
Erik Tiekstra
15a352ea99 feat(BOOK-68): Added kindly chatbot
Approved-by: Linus Flood
2025-09-11 12:44:47 +00:00
Hrishikesh Vaipurkar
def079021b Merged in feat/SW-3441-add-hero-floatingbookingwid (pull request #2789)
feat(SW-3441): Add Hero image to sas landing page

* feat(SW-3441): Add Hero image to sas landing page

* feat(SW-3441): Code Optimise


Approved-by: Joakim Jäderberg
2025-09-11 12:30:13 +00:00
Anton Gunnarsson
c6aebbd0b2 Merged in feat/sw-3415-set-up-cookiebot-in-partner-sas (pull request #2784)
feat(SW-3415): Add CookieBotConsent to partner-sas

* Add CookieBotConsent


Approved-by: Joakim Jäderberg
2025-09-11 12:29:52 +00:00
Joakim Jäderberg
4893eb8b25 Merged in SW-3459-setup-booking-confirmation-page-in-sas (pull request #2794)
Setup booking-confirmation page in SAS

* Setup booking-confirmation page in SAS
move booking-confirmation tracking to booking-flow

* remove unused param

* Add test cards to documentation

* Fix payment callback page to use correct status


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
2025-09-11 12:19:26 +00:00
Linus Flood
6b01dd9a8f Merged in feat/webview-user-issue (pull request #2793)
Feat/webview user issue

* Added logging

* Test

* Cleanup


Approved-by: Joakim Jäderberg
2025-09-11 09:22:13 +00:00
Linus Flood
bacec22a8a Merged in feat/SW-3443-destinations-list (pull request #2781)
feat(destinations list): SW-3443 remove hard coded response and fetch from API instead

* feat(destinations list): SW-3443 remove hard coded response and fetch from API instead


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-09-11 09:14:01 +00:00
Anton Gunnarsson
3e5263bf72 Merged in feat/sw-2877-move-payment-callback (pull request #2755)
feat(SW-2877): Move payment callback page

* WIP move

* Add payment callback page to partner-sas


Approved-by: Joakim Jäderberg
2025-09-11 09:06:11 +00:00
Joakim Jäderberg
c3e78fcadd Merged in feature/SW-3457-enter-details-on-sas (pull request #2792)
Add enter-details page to SAS

* Add enter-details page to SAS


Approved-by: Anton Gunnarsson
2025-09-11 09:05:47 +00:00
Joakim Jäderberg
4b4690a724 Merged in SW-3458-fix-faulty-svg-param-stroke-width (pull request #2791)
fix faulty kebab case properties for svgs

* fix faulty kebab case properties for svgs


Approved-by: Anton Gunnarsson
2025-09-11 09:05:32 +00:00
Erik Tiekstra
136610a51a fix(BOOK-151): Added correct background color to all hotels section on destination overview page
Approved-by: Matilda Landström
2025-09-11 08:41:17 +00:00
Joakim Jäderberg
7dee6d5083 Merged in chore/move-enter-details (pull request #2778)
Chore/move enter details

Approved-by: Anton Gunnarsson
2025-09-11 07:16:24 +00:00
Erik Tiekstra
15711cb3a4 feat(SW-2541): Adjust for ImageVault custom field return types changes
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
2025-09-10 08:57:49 +00:00
Bianca Widstam
ddd4b7c531 Merged in fix/SW-3449-corporatecheque-reward-nights-price (pull request #2782)
fix(SW-3449): corporate cheque and rewards price fixes in select rate

* fix(SW-3449): corporate cheque and rewards price fixes in select rate


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
2025-09-10 08:57:44 +00:00
Bianca Widstam
1ceb1520a6 Merged in fix/SW-3434-skeleton-ui-bug (pull request #2772)
fix(SW-3434): skeleton ui fix for booking widget

* fix(SW-3434): skeleton ui fix for booking widget

* fix(SW-3434): use cx


Approved-by: Anton Gunnarsson
2025-09-10 08:35:14 +00:00
Erik Tiekstra
f04fe467da feat(SW-3151): Added original to imageSchema and added transform to a more generic image type
Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-09-10 08:29:05 +00:00