Merge branch 'master' into feat/tracking-payment

app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/page.tsx

@@ -47,10 +47,14 @@ export default async function PaymentCallbackPage({
       const bookingStatus = await serverClient().booking.status({
         confirmationNumber,
       })
+
+      // TODO: how to handle errors for multiple rooms?
+      const error = bookingStatus.errors.find((e) => e.errorCode)
+
       searchObject.set(
         "errorCode",
-        bookingStatus?.metadata?.errorCode
+        error
-          ? bookingStatus.metadata.errorCode.toString()
+          ? error.errorCode.toString()
           : PaymentErrorCodeEnum.Failed.toString()
       )
       trackPaymentEvent({

components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -76,7 +76,7 @@ export default function PaymentClient({
     (state) => state.actions.setIsSubmittingDisabled
   )
 
-  const [confirmationNumber, setConfirmationNumber] = useState<string>("")
+  const [bookingNumber, setBookingNumber] = useState<string>("")
   const [isPollingForBookingStatus, setIsPollingForBookingStatus] =
     useState(false)
 
@@ -106,13 +106,17 @@ export default function PaymentClient({
 
   const initiateBooking = trpc.booking.create.useMutation({
     onSuccess: (result) => {
-      if (result?.confirmationNumber) {
+      if (result) {
-        setConfirmationNumber(result.confirmationNumber)
+        setBookingNumber(result.id)
 
-        if (result.metadata?.priceChangedMetadata) {
+        const priceChange = result.rooms.find(
+          (r) => r.priceChangedMetadata
+        )?.priceChangedMetadata
+
+        if (priceChange) {
           setPriceChangeData({
             oldPrice: roomPrice.publicPrice,
-            newPrice: result.metadata.priceChangedMetadata.totalPrice,
+            newPrice: priceChange.totalPrice,
           })
         } else {
           setIsPollingForBookingStatus(true)
@@ -129,7 +133,7 @@ export default function PaymentClient({
 
   const priceChange = trpc.booking.priceChange.useMutation({
     onSuccess: (result) => {
-      if (result?.confirmationNumber) {
+      if (result?.id) {
         setIsPollingForBookingStatus(true)
       } else {
         handlePaymentError("No confirmation number")
@@ -145,7 +149,7 @@ export default function PaymentClient({
   })
 
   const bookingStatus = useHandleBookingStatus({
-    confirmationNumber,
+    confirmationNumber: bookingNumber,
     expectedStatus: BookingStatusEnum.BookingCompleted,
     maxRetries,
     retryInterval,
@@ -452,7 +456,9 @@ export default function PaymentClient({
               : ""
             router.push(`${selectRate(lang)}${allSearchParams}`)
           }}
-          onAccept={() => priceChange.mutate({ confirmationNumber })}
+          onAccept={() =>
+            priceChange.mutate({ confirmationNumber: bookingNumber })
+          }
         />
       ) : null}
     </>

server/routers/booking/output.ts

@@ -11,14 +11,13 @@ export const createBookingSchema = z
   .object({
     data: z.object({
       attributes: z.object({
-        confirmationNumber: z.string(),
-        cancellationNumber: z.string().nullable(),
         reservationStatus: z.string(),
         paymentUrl: z.string().nullable(),
-        metadata: z
+        rooms: z
-          .object({
+          .array(
-            errorCode: z.number().nullable().optional(),
+            z.object({
-            errorMessage: z.string().nullable().optional(),
+              confirmationNumber: z.string(),
+              cancellationNumber: z.string().nullable(),
               priceChangedMetadata: z
                 .object({
                   roomPrice: z.number(),
@@ -27,7 +26,21 @@ export const createBookingSchema = z
                 .nullable()
                 .optional(),
             })
-          .nullable(),
+          )
+          .default([]),
+        errors: z
+          .array(
+            z.object({
+              confirmationNumber: z.string(),
+              errorCode: z.string(),
+              description: z.string(),
+              meta: z
+                .record(z.string(), z.union([z.string(), z.number()]))
+                .nullable()
+                .optional(),
+            })
+          )
+          .default([]),
       }),
       type: z.string(),
       id: z.string(),
@@ -45,11 +58,10 @@ export const createBookingSchema = z
     id: d.data.id,
     links: d.data.links,
     type: d.data.type,
-    confirmationNumber: d.data.attributes.confirmationNumber,
-    cancellationNumber: d.data.attributes.cancellationNumber,
     reservationStatus: d.data.attributes.reservationStatus,
     paymentUrl: d.data.attributes.paymentUrl,
-    metadata: d.data.attributes.metadata,
+    rooms: d.data.attributes.rooms,
+    errors: d.data.attributes.errors,
   }))
 
 // QUERY

server/routers/contentstack/reward/output.ts

@@ -199,7 +199,7 @@ const CouponReward = z.object({
   title: z.string().optional(),
   id: z.string().optional(),
   rewardId: z.string().optional(),
-  rewardType: z.enum(["Surprise", "Campaign"]),
+  rewardType: z.enum(["Surprise", "Campaign", "Member-voucher"]),
   redeemLocation: z.string().optional(),
   operaRewardId: z.string().default(""),
   status: z.string().optional(),