Merged in feat/SW-1370/Guarantee-my-stay-ancillaries (pull request #1545)

Feat/SW-1370/Guarantee my stay ancillaries

* feat(SW-1370): guarantee for ancillaries

* feat(SW-1370): remove console log

* feat(SW-1370): add translations

* feat(SW-1370): small fix

* feat(SW-1370): fix must be guaranteed

* feat(SW-1370): fix logic and comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): add translation

* feat(SW-1370): add translation and fix pr comment

* feat(SW-1370): fix pr comment

* feat(SW-1370): fix encoding path refId issue

* feat(SW-1370): refactor AddAncillaryStore usage and introduce context provider

* feat(SW-1370): refactor

* feat(SW-1370): refactor ancillaries

* feat(SW-1370): fix merge


Approved-by: Simon.Emanuelsson

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -58,9 +58,7 @@ export const formId = "submit-booking"
 export default function PaymentClient({
   otherPaymentOptions,
   savedCreditCards,
-  mustBeGuaranteed,
-  memberMustBeGuaranteed,
-  isFlexRate,
+  isUserLoggedIn,
 }: PaymentClientProps) {
   const router = useRouter()
   const lang = useLang()
@@ -77,13 +75,20 @@ export default function PaymentClient({
       totalPrice: state.totalPrice,
     }))
 
-  const bookingMustBeGuaranteed = rooms.some(
-    ({ room }, idx) =>
+  const bookingMustBeGuaranteed = rooms.some(({ room }, idx) => {
+    if (idx === 0 && isUserLoggedIn && room.memberMustBeGuaranteed) {
+      return true
+    }
+
+    if (
       (room.guest.join || room.guest.membershipNo) &&
       booking.rooms[idx].counterRateCode
-  )
-    ? memberMustBeGuaranteed
-    : mustBeGuaranteed
+    ) {
+      return room.memberMustBeGuaranteed
+    }
+
+    return room.mustBeGuaranteed
+  })
 
   const setIsSubmittingDisabled = useEnterDetailsStore(
     (state) => state.actions.setIsSubmittingDisabled
@@ -102,6 +107,7 @@ export default function PaymentClient({
 
   const hasPrepaidRates = rooms.some(hasPrepaidRate)
   const hasFlexRates = rooms.some(hasFlexibleRate)
+  const hasOnlyFlexRates = rooms.every(hasFlexibleRate)
   const hasMixedRates = hasPrepaidRates && hasFlexRates
 
   const methods = useForm<PaymentFormData>({
@@ -221,21 +227,21 @@ export default function PaymentClient({
     setIsSubmittingDisabled,
   ])
 
-  const getPaymentMethod = (
-    isFlexRate: boolean,
-    paymentMethod: string | null | undefined
-  ): PaymentMethodEnum => {
-    if (isFlexRate) {
-      return PaymentMethodEnum.card
-    }
-    return paymentMethod && isPaymentMethodEnum(paymentMethod)
-      ? paymentMethod
-      : PaymentMethodEnum.card
-  }
+  const getPaymentMethod = useCallback(
+    (paymentMethod: string | null | undefined): PaymentMethodEnum => {
+      if (hasFlexRates) {
+        return PaymentMethodEnum.card
+      }
+      return paymentMethod && isPaymentMethodEnum(paymentMethod)
+        ? paymentMethod
+        : PaymentMethodEnum.card
+    },
+    [hasFlexRates]
+  )
 
   const handleSubmit = useCallback(
     (data: PaymentFormData) => {
-      const paymentMethod = getPaymentMethod(isFlexRate, data.paymentMethod)
+      const paymentMethod = getPaymentMethod(data.paymentMethod)
 
       const savedCreditCard = savedCreditCards?.find(
         (card) => card.id === data.paymentMethod
@@ -253,7 +259,8 @@ export default function PaymentClient({
           }
         : {}
 
-      const shouldUsePayment = !isFlexRate || guarantee
+      const shouldUsePayment =
+        guarantee || bookingMustBeGuaranteed || !hasOnlyFlexRates
 
       const payment = shouldUsePayment
         ? {
@@ -264,7 +271,6 @@ export default function PaymentClient({
             cancel: `${paymentRedirectUrl}/cancel`,
           }
         : undefined
-
       trackPaymentEvent({
         event: "paymentAttemptStart",
         hotelId,
@@ -351,7 +357,9 @@ export default function PaymentClient({
       toDate,
       rooms,
       booking,
-      isFlexRate,
+      getPaymentMethod,
+      hasOnlyFlexRates,
+      bookingMustBeGuaranteed,
     ]
   )
 
@@ -380,9 +388,9 @@ export default function PaymentClient({
     >
       <header>
         <Title level="h2" as="h4">
-          {bookingMustBeGuaranteed
+          {hasOnlyFlexRates && bookingMustBeGuaranteed
             ? paymentGuarantee
-            : isFlexRate
+            : hasOnlyFlexRates
               ? confirm
               : payment}
         </Title>
@@ -394,11 +402,11 @@ export default function PaymentClient({
           onSubmit={methods.handleSubmit(handleSubmit)}
           id={formId}
         >
-          {isFlexRate && !bookingMustBeGuaranteed ? (
+          {hasOnlyFlexRates && !bookingMustBeGuaranteed ? (
             <ConfirmBooking savedCreditCards={savedCreditCards} />
           ) : (
             <>
-              {bookingMustBeGuaranteed ? (
+              {hasOnlyFlexRates && bookingMustBeGuaranteed ? (
                 <section className={styles.section}>
                   <Body>
                     {intl.formatMessage({
@@ -435,18 +443,19 @@ export default function PaymentClient({
                     value={PaymentMethodEnum.card}
                     label={intl.formatMessage({ id: "Credit card" })}
                   />
-                  {availablePaymentOptions.map((paymentMethod) => (
-                    <PaymentOption
-                      key={paymentMethod}
-                      name="paymentMethod"
-                      value={paymentMethod}
-                      label={
-                        PAYMENT_METHOD_TITLES[
-                          paymentMethod as PaymentMethodEnum
-                        ]
-                      }
-                    />
-                  ))}
+                  {!hasMixedRates &&
+                    availablePaymentOptions.map((paymentMethod) => (
+                      <PaymentOption
+                        key={paymentMethod}
+                        name="paymentMethod"
+                        value={paymentMethod}
+                        label={
+                          PAYMENT_METHOD_TITLES[
+                            paymentMethod as PaymentMethodEnum
+                          ]
+                        }
+                      />
+                    ))}
                 </div>
                 {hasMixedRates ? (
                   <MixedRatePaymentBreakdown

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/index.tsx

@@ -1,27 +1,27 @@
 import { getSavedPaymentCardsSafely } from "@/lib/trpc/memoizedRequests"
 
+import { auth } from "@/auth"
+import { isValidSession } from "@/utils/session"
+
 import PaymentClient from "./PaymentClient"
 
 import type { PaymentProps } from "@/types/components/hotelReservation/enterDetails/payment"
 
 export default async function Payment({
   otherPaymentOptions,
-  mustBeGuaranteed,
-  memberMustBeGuaranteed,
   supportedCards,
-  isFlexRate,
 }: PaymentProps) {
   const savedCreditCards = await getSavedPaymentCardsSafely({
     supportedCards,
   })
+  const session = await auth()
+  const isUserLoggedIn = isValidSession(session)
 
   return (
     <PaymentClient
       otherPaymentOptions={otherPaymentOptions}
       savedCreditCards={savedCreditCards}
-      mustBeGuaranteed={mustBeGuaranteed}
-      memberMustBeGuaranteed={memberMustBeGuaranteed}
-      isFlexRate={isFlexRate}
+      isUserLoggedIn={isUserLoggedIn}
     />
   )
 }