Merged in fix/SW-3198-prices-select-rate (pull request #2763)

fix(SW-3198): fix striketrhough/regular prices, the same in enter details as select rate

* fix(SW-3198): fix striketrhough/regular prices, the same in enter details as select rate

* fix(SW-3198): remove additonalcost if calculating cost per room

* fix(SW-3198): include bookingcode in specialrate

* fix(SW-3198): remove console log

* fix(SW-3198): add or operator

* fix(SW-3198): capture total return value

* fix(SW-3198): rename and move function


Approved-by: Joakim Jäderberg
Approved-by: Hrishikesh Vaipurkar

apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/index.tsx

@@ -32,7 +32,7 @@ export default function SummaryUI({
   booking,
   rooms,
   totalPrice,
-  isMember,
+  isUserLoggedIn,
   vat,
   toggleSummaryOpen,
   defaultCurrency,
@@ -59,7 +59,7 @@ export default function SummaryUI({
   const roomOneGuest = rooms[0].room.guest
   const showSignupPromo =
     rooms.length === 1 &&
-    !isMember &&
+    !isUserLoggedIn &&
     !roomOneGuest.membershipNo &&
     !roomOneGuest.join
 
@@ -67,13 +67,8 @@ export default function SummaryUI({
 
   const roomOneRoomRate = rooms[0].room.roomRate
   const isVoucherRate = "voucher" in roomOneRoomRate
-  // In case of Redemption, voucher and Corporate cheque do not show approx price
-  const isSpecialRate =
-    "corporateCheque" in roomOneRoomRate ||
-    "redemption" in roomOneRoomRate ||
-    isVoucherRate
 
-  const priceDetailsRooms = mapToPrice(rooms, isMember)
+  const priceDetailsRooms = mapToPrice(rooms, isUserLoggedIn)
   const isAllCampaignRate = rooms.every(
     (room) => room.room.roomRate.rateDefinition.isCampaignRate
   )
@@ -83,7 +78,7 @@ export default function SummaryUI({
   const containsBookingCodeRate = rooms.find(
     (r) => r && isBookingCodeRate(r.room.roomRate)
   )
-  const showDiscounted = containsBookingCodeRate || isMember
+  const showDiscounted = containsBookingCodeRate || isUserLoggedIn
 
   const totalCurrency = isVoucherRate
     ? CurrencyEnum.Voucher
@@ -127,8 +122,7 @@ export default function SummaryUI({
           room={room}
           roomNumber={idx + 1}
           roomCount={rooms.length}
-          isMember={isMember}
-          isSpecialRate={isSpecialRate}
+          isUserLoggedIn={isUserLoggedIn}
           nightsCount={nights}
         />
       ))}
@@ -192,13 +186,15 @@ export default function SummaryUI({
             </Typography>
             {showDiscounted && totalPrice.local.regularPrice ? (
               <Typography variant="Body/Paragraph/mdRegular">
-                <s className={styles.strikeThroughRate}>
-                  {formatPrice(
-                    intl,
-                    totalPrice.local.regularPrice,
-                    totalPrice.local.currency
-                  )}
-                </s>
+                <p>
+                  <s className={styles.strikeThroughRate}>
+                    {formatPrice(
+                      intl,
+                      totalPrice.local.regularPrice,
+                      totalPrice.local.currency
+                    )}
+                  </s>
+                </p>
               </Typography>
             ) : null}
           </div>
@@ -223,7 +219,7 @@ export default function SummaryUI({
         alignCenter
       />
       <Divider className={styles.bottomDivider} color="Border/Divider/Subtle" />
-      {showSignupPromo && roomOneMemberPrice && !isMember ? (
+      {showSignupPromo && roomOneMemberPrice && !isUserLoggedIn ? (
         <SignupPromoDesktop
           memberPrice={roomOneMemberPrice}
           badgeContent={"✌️"}