Merge remote-tracking branch 'origin' into feat/tracking-payment

app/[lang]/(live)/(protected)/my-pages/profile/profileLayout.css

@@ -9,10 +9,18 @@
   display: grid;
   gap: var(--Spacing-x4);
   padding: var(--Spacing-x2) var(--Spacing-x2) var(--Spacing-x4);
+  margin: 0 calc(var(--Layout-Mobile-Margin-Margin-min) * -1);
 }
 
 @media screen and (min-width: 768px) {
   .profile-layout {
     padding: var(--Spacing-x3) var(--Spacing-x3) var(--Spacing-x4);
+    margin: 0 calc(var(--Layout-Tablet-Margin-Margin-min) * -1);
+  }
+}
+
+@media screen and (min-width: 1367px) {
+  .profile-layout {
+    margin: 0;
   }
 }

app/[lang]/(live)/(public)/hotelreservation/(standard)/step/page.tsx

@@ -126,7 +126,7 @@ export default async function StepPage({
     return notFound()
   }
 
-  const mustBeGuaranteed = roomAvailability?.mustBeGuaranteed ?? false
+  const { mustBeGuaranteed, breakfastIncluded } = roomAvailability
 
   const paymentGuarantee = intl.formatMessage({
     id: "Payment Guarantee",
@@ -190,13 +190,18 @@ export default async function StepPage({
     isMember: !!user,
     rateDetails: roomAvailability.rateDetails,
     roomType: roomAvailability.selectedRoom.roomType,
+    breakfastIncluded,
   }
 
+  const showBreakfastStep = Boolean(
+    breakfastPackages?.length && !breakfastIncluded
+  )
+
   return (
     <EnterDetailsProvider
       bedTypes={roomAvailability.bedTypes}
       booking={booking}
-      breakfastPackages={breakfastPackages}
+      showBreakfastStep={showBreakfastStep}
       packages={packages}
       roomRate={{
         memberRate: roomAvailability.memberRate,
@@ -230,13 +235,13 @@ export default async function StepPage({
                 </SectionAccordion>
               ) : null}
 
-              {breakfastPackages?.length ? (
+              {showBreakfastStep ? (
                 <SectionAccordion
                   header={intl.formatMessage({ id: "Food options" })}
                   label={intl.formatMessage({ id: "Select breakfast options" })}
                   step={StepEnum.breakfast}
                 >
-                  <Breakfast packages={breakfastPackages} />
+                  <Breakfast packages={breakfastPackages!} />
                 </SectionAccordion>
               ) : null}
 

app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx

@@ -11,7 +11,9 @@ export default async function BookingWidgetPage({
   params,
   searchParams,
 }: PageArgs<ContentTypeParams, URLSearchParams>) {
-  if (!env.ENABLE_BOOKING_WIDGET_HOTELRESERVATION_PATH) return null
+  if (!env.ENABLE_BOOKING_WIDGET) {
+    return null
+  }
 
   preload()
 

app/[lang]/(live-current)/layout.tsx

@@ -4,6 +4,7 @@ import "@scandic-hotels/design-system/style.css"
 import Script from "next/script"
 
 import TokenRefresher from "@/components/Auth/TokenRefresher"
+import BookingWidget from "@/components/BookingWidget"
 import CookieBotConsent from "@/components/CookieBot"
 import AdobeScript from "@/components/Current/AdobeScript"
 import Footer from "@/components/Current/Footer"