Merged in fix/SW-933-incorrect-ratecode (pull request #947)

Fix/SW-933 incorrect ratecode when creating booking as a member

* fix(SW-933): Added check if member to select correct rate code in create booking

* fix(SW-933): set member price in summary when "join" is true

* fix(SW-933): change "price" -> "amount" and fix bool expression

* fix(SW-933): added check for membership number in summary


Approved-by: Christel Westerberg

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

@@ -64,32 +64,34 @@ export default async function SummaryPage({
     redirect(selectRate(params.lang))
   }
 
-  const prices =
-    user && availability.memberRate
+  const prices = {
+    public: {
+      local: {
+        amount: availability.publicRate.localPrice.pricePerStay,
+        currency: availability.publicRate.localPrice.currency,
+      },
+      euro: availability.publicRate?.requestedPrice
+        ? {
+            amount: availability.publicRate?.requestedPrice.pricePerStay,
+            currency: availability.publicRate?.requestedPrice.currency,
+          }
+        : undefined,
+    },
+    member: availability.memberRate
       ? {
           local: {
-            price: availability.memberRate.localPrice.pricePerStay,
+            amount: availability.memberRate.localPrice.pricePerStay,
             currency: availability.memberRate.localPrice.currency,
           },
           euro: availability.memberRate.requestedPrice
             ? {
-                price: availability.memberRate.requestedPrice.pricePerStay,
+                amount: availability.memberRate.requestedPrice.pricePerStay,
                 currency: availability.memberRate.requestedPrice.currency,
               }
             : undefined,
         }
-      : {
-          local: {
-            price: availability.publicRate.localPrice.pricePerStay,
-            currency: availability.publicRate.localPrice.currency,
-          },
-          euro: availability.publicRate?.requestedPrice
-            ? {
-                price: availability.publicRate?.requestedPrice.pricePerStay,
-                currency: availability.publicRate?.requestedPrice.currency,
-              }
-            : undefined,
-        }
+      : undefined,
+  }
 
   return (
     <>
@@ -100,8 +102,7 @@ export default async function SummaryPage({
               showMemberPrice={!!(user && availability.memberRate)}
               room={{
                 roomType: availability.selectedRoom.roomType,
-                localPrice: prices.local,
-                euroPrice: prices.euro,
+                prices,
                 adults,
                 children,
                 rateDetails: availability.rateDetails,
@@ -119,8 +120,7 @@ export default async function SummaryPage({
             showMemberPrice={!!(user && availability.memberRate)}
             room={{
               roomType: availability.selectedRoom.roomType,
-              localPrice: prices.local,
-              euroPrice: prices.euro,
+              prices,
               adults,
               children,
               rateDetails: availability.rateDetails,

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

@@ -171,6 +171,7 @@ export default async function StepPage({
           label={mustBeGuaranteed ? guaranteeWithCard : selectPaymentMethod}
         >
           <Payment
+            user={user}
             roomPrice={roomPrice}
             otherPaymentOptions={
               hotelData.data.attributes.merchantInformationData