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

4196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Zetterberg
efb7219b6d fix: copy fixes for English labels 2025-04-30 09:37:54 +00:00
Niclas Edenvin
341be43a53 Merged in fix/sw-2501-remove-continue-button-light (pull request #1892) 
fix(sw-2501): remove the continue buttons on enter details

This removes the continue buttons on the enter details page.

This is only that, not the refactoring of the whole enter details page with changing to one form etc. Since I just didn’t complete that refactor today I decided to do this light variant for now.

A quick explanation is that the continue buttons are removed and instead the form is submitted (meaning saving the form data to the store) on blur on the input elements IF the form is valid. If it’s invalid we change the isComplete flag in the store to false. This will hopefully also fix a bug where you were able to submit old data if the new data is invalid.

When clicking the submit button and a room is incomplete/invalid the browser scrolls to the first invalid room.

Approved-by: Erik Tiekstra
 2025-04-30 08:56:16 +00:00
Bianca Widstam
7070770581 Merged in fix/SW-2406-update-modal-ancillaries (pull request #1911) 
fix(SW-2406): update modal for ancillaries

* fix(SW-2406): update modal for ancillaries

* fix(SW-2406): revert translations


Approved-by: Niclas Edenvin
Approved-by: Erik Tiekstra
 2025-04-30 08:20:57 +00:00
Anton Gunnarsson
f4fe2e3a4a Merged in fix/sw-2548-invalid-tier-expiry-for-sas-eb-basic (pull request #1908) 
Handle invalid tier expiry 1900-01-01 from SAS

* Handle invalid tier expiry 1900-01-01 from SAS

* Set correct sasTierExpirationDate


Approved-by: Linus Flood
 2025-04-30 08:11:35 +00:00
Anton Gunnarsson
b9bf5e6510 Merged in fix/sw-2556-eb-basic-to-eb-member (pull request #1914) 
Rename EuroBonus Basic to Member

* Rename EuroBonus Basic to Member


Approved-by: Linus Flood
 2025-04-30 07:42:51 +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
Erik Tiekstra
bbec6a659a feat(SW-2492): Hiding meta hreflang tags when HIDE_FOR_NEXT_RELEASE flag is true 
Approved-by: Linus Flood
 2025-04-30 06:29:13 +00:00
Hrishikesh Vaipurkar
05c8be489f Merged in feat/SW-1355-reward-night-booking-track-3 (pull request #1913) 
feat: SW-1355 Updated tracking to localPrice instead of requestedPrice


Approved-by: Michael Zetterberg
 2025-04-29 20:53:49 +00:00
Arvid Norlin
96c1912d63 Merged in fix/SW-2177 (pull request #1907) 
fix: combine radiogroups on payment step

* fix: combine radiogroups on payment step


Approved-by: Christian Andolf
 2025-04-29 14:08:40 +00:00
Anton Gunnarsson
a04817277e Merged in fix/sync-from-lokalise (pull request #1905) 
Sync from Lokalise

* Sync from lokalise 2025-04-29


Approved-by: Joakim Jäderberg
 2025-04-29 13:59:08 +00:00
Arvid Norlin
59b0ab3d49 Merged in fix/redirect-public-url (pull request #1902) 
fix: add getPublicNextURL for redirect url

* fix(SW-2540): add getPublicNextURL for redirect url


Approved-by: Michael Zetterberg
 2025-04-29 11:12:56 +00:00
Matilda Landström
bdffd985e8 Merged in feat/SW-2440-ancillary-tracking (pull request #1890) 
fix(SW-2440): Fix ancillaries tracking issues in booking flow confirmation page

* fix(SW-2240): fix ancillaries issues


Approved-by: Bianca Widstam
Approved-by: Christian Andolf
 2025-04-29 11:04:25 +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
6520bc5bc5 Merged in fix/SW-1879-aa-track-bed-breakfast-pay-3 (pull request #1900) 
fix: SW-1879 Updated values in tracking

* fix: SW-1879 Updated bed type value in tracking

* fix: SW-1879 Updated breakfast price to indicate total price


Approved-by: Michael Zetterberg
 2025-04-29 10:00:58 +00:00
Chuma Mcphoy (We Ahead)
d2e99d2c45 Merged in feat/LOY-201-Employee-benefits-auth-card-sidebar (pull request #1891) 
Feat(LOY-201): Employee benefits auth card sidebar

* feat(LOY-201): WIP - add EmployeeBenefitsAuthCard component to Sidebar and update dynamic content enum

* feat(LOY-201): reorganize EmployeeBenefitsAuthCard

* chore: remove debug console logs from DynamicContent handling


Approved-by: Christian Andolf
 2025-04-29 09:56:56 +00:00
Linus Flood
af2a3f42c8 Merged in fix/rte-null-check (pull request #1901) 
fix: null check on nodeChildrenToHtml to avoid rendering empty objects

* fix: null check on nodeChildrenToHtml to avoid rendering empty objects


Approved-by: Michael Zetterberg
Approved-by: Anton Gunnarsson
 2025-04-29 09:38:05 +00:00
Michael Zetterberg
fcf1cc8fbb fix: sync from Lokalise 2025-04-29 11:09:14 +02:00
Bianca Widstam
972d530be8 Merged in fix/SW-1997-tracking-ancillaries-adjust-total (pull request #1893) 
fix(SW-1997): productPoints and productPrice should be the total

* fix(SW-1997): productPoints and productPrice should be the total


Approved-by: Matilda Landström
 2025-04-29 09:01:02 +00:00
Anton Gunnarsson
dcd2dba950 Merged in fix/remove-translation-from-global-error (pull request #1896) 
Remove translation from global-error

* Remove translation from global-error


Approved-by: Michael Zetterberg
Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
 2025-04-29 08:51:16 +00:00
Joakim Jäderberg
4ab58cf330 Merged in feature/SW-2531-redis-api-scaling (pull request #1895) 
Redis-Api: increase max replica count and cpu/memory

Approved-by: Linus Flood
 2025-04-29 08:36:51 +00:00
Michael Zetterberg
515ae05528 fix: add NODE_OPTIONS=--openssl-legacy-provider to dev script target 2025-04-29 08:08:21 +00:00
Michael Zetterberg
e5afdb3986 feat(SW-2470): render static rate titles 2025-04-29 08:08:21 +00:00
Michael Zetterberg
9aa70f0b37 feat(SW-2470): render correct terms on Enter details 2025-04-29 08:08:21 +00:00
Michael Zetterberg
2366b4e785 feat(SW-2470): render correct terms on Select rate 2025-04-29 08:08:21 +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
Christian Andolf
5f836b0c82 Merged in fix/prevent-jump-when-hover-card (pull request #1889) 
fix: prevent jumping layout when hovering card

Approved-by: Erik Tiekstra
 2025-04-29 07:42:45 +00:00
Hrishikesh Vaipurkar
e34d75969a Merged in fix/SW-1879-aa-bed-breakfastpayment- (pull request #1888) 
fix: SW-1879 Updated breakfast price to 0 and removed paymentSectionOpen tracking

* fix: SW-1879 Updated breakfast price to 0 and removed paymentSectionOpen tracking


Approved-by: Michael Zetterberg
 2025-04-29 07:07:40 +00:00
Christian Andolf
ffafdd24d1 Merged in fix/reduce-amount-of-section-elements (pull request #1883) 
fix: reduce the amount of section elements being used since most have no headers connected to them

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-29 07:03:37 +00:00
Christian Andolf
2bdc49b32d Merged in fix/invalid-svg-values-jsx (pull request #1885) 
fix: update incorrect attributes on svg in jsx

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-29 07:02:59 +00:00
Christian Andolf
49feab6c89 Merged in fix/cleanup-ts-stays-components (pull request #1884) 
fix: make proper use of type predicates and minor cleanup to avoid double ternary and reduce computation

Approved-by: Erik Tiekstra
 2025-04-29 07:02:31 +00:00
Erik Tiekstra
4ae5da8a04 Feat/SW-2152 seo descriptions 
* feat(SW-2152): Added improved meta descriptions for hotel pages
* feat(SW-2152): Added improved meta descriptions for destination pages
* feat(SW-2152): Refactoring metadata description functionality
* feat(SW-2152): Improved truncate function and added cities check to country page description

Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
 2025-04-29 06:52:04 +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
Joakim Jäderberg
52c99e8767 Merged in fix/SW-2457-destination-page-search-for-countries (pull request #1873) 
* fix: able to search for countries on destinationpage
* fix: filter out only desired types when using autocomplete

Approved-by: Linus Flood
 2025-04-29 06:19:25 +00:00
Joakim Jäderberg
c1505ce50e Merged in feature/warmup (pull request #1887) 
* unified warmup function

Approved-by: Linus Flood
 2025-04-29 06:18:14 +00:00
Christian Andolf
8501a12f8f fix: prevent jumping layout when hovering card 2025-04-28 16:41:50 +02:00
Anton Gunnarsson
bbbd665a32 Merged in fix/sw-2527-incorrect-toast-when-tier-matching (pull request #1879) 
SW-2527 - Fix boosted toast when tier matching

* Compare levels to ensure toast is only displayed when actually boosted

* Fix 200 name

* Update naming


Approved-by: Linus Flood
 2025-04-28 13:41:14 +00:00
Bianca Widstam
bfc25453c7 Merged in fix/SW-1415-my-stay-tracking-hotelId (pull request #1880) 
fix(SW-1415): add hotelId in tracking for my stay

* fix(SW-1415): add hotelId in tracking for my stay

* fix: remove toast if cancel guarantee

* fix(SW-1415): rebase master

* fix(SW-1415): fix comment shorthand hotelId


Approved-by: Christian Andolf
 2025-04-28 13:20:18 +00:00
Christian Andolf
95e09968ca fix: update incorrect attributes on svg in jsx 2025-04-28 15:07:55 +02:00
Christian Andolf
8ed74f08a4 fix: make proper use of type predicates and minor cleanup to avoid double ternary and reduce computation 2025-04-28 15:00:38 +02:00
Christian Andolf
32e95fcbbd fix: reduce the amount of section elements being used since most have no headers connected to them 2025-04-28 14:56:02 +02:00
Christian Andolf
265cecc22a Merged in fix/points-color-bug (pull request #1881) 
fix: text color on points is now correct when revisiting the page

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-28 12:49:02 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Simon Emanuelsson
b5deb84b33 fix: always use totalPrice to display roomCharge 2025-04-28 12:40:52 +00:00
Christian Andolf
05fab4d2f6 fix: text color on points is now correct when revisiting the page 2025-04-28 14:33:03 +02:00
Christian Andolf
edc4f0c016 Merged in fix/email-type-input (pull request #1878) 
fix: change input type to email

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-28 12:26:53 +00:00
Christian Andolf
e5f1342e77 fix: change input type to email 2025-04-28 12:56:08 +02:00
Matilda Landström
8e78dec6c2 Merged in feat/SW-1477-external-gym (pull request #1875) 
feat/SW-1477-handle-external-gym

* feat/SW-1477-handle-external-gym


Approved-by: Erik Tiekstra
 2025-04-28 09:27:36 +00:00
Erik Tiekstra
5beffe4968 feat(SW-1780): Hotel address now leads to map view with hotel active 
Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
 2025-04-28 09:12:17 +00:00
Bianca Widstam
416a95d592 Merged in fix/SW-1997-tracking-correct-price-or-points (pull request #1869) 
fix(SW-1997): only add points or card if payed with

* fix(SW-1997): only add points or card if payed with

* fix(SW-1997): use buildAncillaries function


Approved-by: Michael Zetterberg
 2025-04-28 09:05:55 +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