- ✅

- ✅
- ✅
- ✅

app/(public)/trips/[id]/page.tsx

@@ -17,7 +17,6 @@ import { CancelBookingButton } from "@/features/booking/components/cancel-bookin
 import { OrganizerJoinRequests } from "@/features/trip/components/organizer-join-requests";
 import { OrganizerTrustPanel } from "@/features/trip/components/organizer-trust-panel";
 import { TripProgramBlock } from "@/features/trip/components/trip-program-block";
-import { OrganizerPaymentQueue } from "@/features/booking/components/organizer-payment-queue";
 import { ImageGallery } from "@/features/trip/components/image-gallery";
 import { TripReviewSection } from "@/features/review/components/trip-review-section";
 import { RefundPolicySection } from "@/features/refund/components/refund-policy-section";
@@ -135,13 +134,6 @@ export default async function TripDetailPage({
 
   const tripIsFree = isFreeTrip(trip);
 
-  // Antrian konfirmasi pembayaran: source dari Booking + Payment (B9).
-  // Hanya organizer yang butuh data ini, dan hanya untuk trip berbayar.
-  const paymentPendingBookings =
-    !tripIsFree && isOrganizer
-      ? await bookingService.getAwaitingManualForTrip(trip.id)
-      : [];
-
   // Booking peserta saat ini — dipakai untuk render CancelBookingButton vs
   // tombol "Batal Ikut" biasa. Hanya untuk non-organizer yang ikut trip.
   const myBooking =
@@ -447,6 +439,13 @@ export default async function TripDetailPage({
           <TripProgramBlock
             meetingPoint={trip.meetingPoint}
             itinerary={trip.itinerary}
+            itineraryItems={trip.itineraryItems.map((i) => ({
+              day: i.day,
+              startTime: i.startTime,
+              endTime: i.endTime,
+              activity: i.activity,
+              order: i.order,
+            }))}
             whatsIncluded={trip.whatsIncluded}
             whatsExcluded={trip.whatsExcluded}
           />
@@ -469,18 +468,6 @@ export default async function TripDetailPage({
               pending={pendingParticipants.map((p) => ({
                 id: p.id,
                 user: p.user,
-                markedPaidAt: p.markedPaidAt,
-              }))}
-            />
-          )}
-
-          {isOrganizer && paymentPendingBookings.length > 0 && (
-            <OrganizerPaymentQueue
-              tripId={trip.id}
-              items={paymentPendingBookings.map((b) => ({
-                id: b.participantId,
-                user: { name: b.user.name, image: b.user.image },
-                joinStatus: "CONFIRMED" as const,
               }))}
             />
           )}
@@ -498,15 +485,7 @@ export default async function TripDetailPage({
                 ? currentParticipation.status
                 : null
             }
-            participantPayment={
-              currentParticipation
-                ? {
-                    markedPaidAt: currentParticipation.markedPaidAt,
-                    paymentConfirmedAt:
-                      currentParticipation.paymentConfirmedAt,
-                  }
-                : null
-            }
+            bookingStatus={myBooking?.status ?? null}
             isFull={spotsLeft <= 0}
             tripStatus={trip.status}
             isDeparturePast={isDeparturePast}