Merged in fix/SW-1631-rate-terms-modal (pull request #1699)

fix(SW-1631): add rate terms modal

* fix(SW-1631): add rate terms modal


Approved-by: Simon.Emanuelsson

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/Campaign.tsx

@@ -60,6 +60,24 @@ export default function Campaign({
       )
     }
 
+    const rateTermDetails = product.rateDefinitionMember
+      ? [
+          {
+            title: product.rateDefinition.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+          {
+            title: product.rateDefinitionMember.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+        ]
+      : [
+          {
+            title: product.rateDefinition.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+        ]
+
     const isSelected = isSelectedPriceProduct(
       product,
       selectedRate,
@@ -149,6 +167,7 @@ export default function Campaign({
               }
             : undefined
         }
+        rateTermDetails={rateTermDetails}
         value={product.public.rateCode}
       />
     )

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/Code.tsx

@@ -43,6 +43,23 @@ export default function Code({
     } else {
       bannerText = `${bookingCode} ∙ ${intl.formatMessage({ id: "Breakfast excluded" })}`
     }
+    const rateTermDetails = product.rateDefinitionMember
+      ? [
+          {
+            title: product.rateDefinition.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+          {
+            title: product.rateDefinitionMember.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+        ]
+      : [
+          {
+            title: product.rateDefinition.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+        ]
 
     if ("corporateCheque" in product) {
       const { localPrice, rateCode } = product.corporateCheque
@@ -71,6 +88,7 @@ export default function Code({
             unit: localPrice.currency ?? "",
           }}
           rateTitle={rateTitles[product.rate].title}
+          rateTermDetails={rateTermDetails}
           value={rateCode}
         />
       )
@@ -93,6 +111,7 @@ export default function Code({
             unit: intl.formatMessage({ id: "Voucher" }).toUpperCase(),
           }}
           rateTitle={rateTitles[product.rate].title}
+          rateTermDetails={rateTermDetails}
           value={rateCode}
         />
       )
@@ -151,6 +170,7 @@ export default function Code({
             unit: `${localPrice.currency}/${night}`,
           }}
           rateTitle={rateTitles[product.rate].title}
+          rateTermDetails={rateTermDetails}
           value={rateCode}
         />
       )

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/Redemptions.tsx

@@ -76,6 +76,13 @@ export default function Redemptions({
     ? `${rewardNight} ∙ ${breakfastIncluded}`
     : `${rewardNight} ∙ ${breakfastExcluded}`
 
+  const rateTermDetails = [
+    {
+      title: rateTitles[firstRedemption.rate].title,
+      terms: firstRedemption.rateDefinition.generalTerms,
+    },
+  ]
+
   return (
     <PointsRateCard
       key={firstRedemption.rate}
@@ -84,6 +91,7 @@ export default function Redemptions({
       paymentTerm={rateTitles[firstRedemption.rate].paymentTerm}
       rates={rates}
       rateTitle={rateTitles[firstRedemption.rate].title}
+      rateTermDetails={rateTermDetails}
       selectedRate={selectedRateCode}
       isNotEnoughPoints={notEnoughPoints}
       notEnoughPointsText={intl.formatMessage({ id: "Not enough points" })}

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/Regular.tsx

@@ -145,6 +145,24 @@ export default function Regular({
       roomTypeCode
     )
 
+    const rateTermDetails = product.rateDefinitionMember
+      ? [
+          {
+            title: product.rateDefinition.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+          {
+            title: product.rateDefinitionMember.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+        ]
+      : [
+          {
+            title: product.rateDefinition.title,
+            terms: product.rateDefinition.generalTerms,
+          },
+        ]
+
     return (
       <RegularRateCard
         {...rates}
@@ -157,6 +175,7 @@ export default function Regular({
         paymentTerm={rateTitles[product.rate].paymentTerm}
         rateTitle={rateTitles[product.rate].title}
         value={rateCode}
+        rateTermDetails={rateTermDetails}
       />
     )
   })

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/index.tsx

@@ -57,7 +57,6 @@ export default function Rates({
       petRoomPackageSelected && petRoomPackage ? petRoomPackage : undefined,
     roomTypeCode,
   }
-
   const showAllRates = selectedFilter === BookingCodeFilterEnum.All
   const hasBookingCodeRates = !!(campaign.length || code.length)
   const hasRegularRates = !!regular.length