@@ -551,11 +556,10 @@ export function PaymentDetailsPage({
{bookingDetails?.cardMode}
diff --git a/src/pages/PaymentSuccessPage.tsx b/src/pages/PaymentSuccessPage.tsx
index bf1967f..97acade 100644
--- a/src/pages/PaymentSuccessPage.tsx
+++ b/src/pages/PaymentSuccessPage.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
-import { CheckCircle, XCircle, Loader2 } from 'lucide-react';
+import { CheckCircle, XCircle, Loader2, AlertCircle } from 'lucide-react';
import { useConfirmCardPaymentMutation } from '../Redux/services/cards.service';
import { toast } from 'sonner';
import Navbar from '../components/Navbar';
@@ -15,6 +15,14 @@ interface PaymentSuccessPageProps {
user?: { email: string; name: string } | null;
}
+// Helper to get cookie value
+const getCookie = (name: string): string | null => {
+ const value = `; ${document.cookie}`;
+ const parts = value.split(`; ${name}=`);
+ if (parts.length === 2) return parts.pop()?.split(';').shift() || null;
+ return null;
+};
+
export function PaymentSuccessPage({
onHomeClick,
onPassesClick,
@@ -25,34 +33,38 @@ export function PaymentSuccessPage({
}: PaymentSuccessPageProps) {
const [searchParams] = useSearchParams();
const [confirmPayment, { isLoading }] = useConfirmCardPaymentMutation();
- const [status, setStatus] = useState<'loading' | 'success' | 'error'>('loading');
+ const [status, setStatus] = useState<'loading' | 'success' | 'error' | 'manual'>('loading');
const [errorMsg, setErrorMsg] = useState('');
+ const [manualBookingId, setManualBookingId] = useState('');
const navigate = useNavigate();
useEffect(() => {
- const confirm = async () => {
- // Try multiple sources to get bookingId
- let bookingId = localStorage.getItem('pendingBookingId');
+ const retrieveBookingId = async () => {
+ // Try all possible sources
+ let bookingId = getCookie('pendingBookingId');
+ if (!bookingId) bookingId = localStorage.getItem('pendingBookingId');
if (!bookingId) bookingId = sessionStorage.getItem('pendingBookingId');
- if (!bookingId) bookingId = searchParams.get('bookingId'); // URL query param
-
- console.log('Retrieved bookingId:', bookingId);
+ if (!bookingId) bookingId = searchParams.get('bookingId');
+
+ console.log('Retrieved bookingId from sources:', {
+ cookie: getCookie('pendingBookingId'),
+ localStorage: localStorage.getItem('pendingBookingId'),
+ sessionStorage: sessionStorage.getItem('pendingBookingId'),
+ queryParam: searchParams.get('bookingId'),
+ final: bookingId,
+ });
if (!bookingId) {
- setStatus('error');
- setErrorMsg(
- 'Booking ID not found. Please contact support with your order details. ' +
- 'If you just completed payment, your order may still be processing.'
- );
+ setStatus('manual'); // show manual entry form
return;
}
try {
- // ✅ Call confirm API with only bookingId
await confirmPayment(bookingId).unwrap();
setStatus('success');
toast.success('Payment confirmed! Your order is complete.');
- // Clean up storage
+ // Clean up
+ document.cookie = 'pendingBookingId=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
localStorage.removeItem('pendingBookingId');
sessionStorage.removeItem('pendingBookingId');
} catch (err: any) {
@@ -60,15 +72,34 @@ export function PaymentSuccessPage({
setStatus('error');
setErrorMsg(err?.data?.message || 'Failed to confirm payment. Please contact support.');
toast.error('Confirmation failed');
- // Clean up to avoid retry loops
- localStorage.removeItem('pendingBookingId');
- sessionStorage.removeItem('pendingBookingId');
}
};
- confirm();
+ retrieveBookingId();
}, [confirmPayment, searchParams]);
+ const handleManualConfirm = async () => {
+ if (!manualBookingId.trim()) {
+ toast.error('Please enter your Booking ID');
+ return;
+ }
+ setStatus('loading');
+ try {
+ await confirmPayment(manualBookingId).unwrap();
+ setStatus('success');
+ toast.success('Payment confirmed! Your order is complete.');
+ // Clean up
+ document.cookie = 'pendingBookingId=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+ localStorage.removeItem('pendingBookingId');
+ sessionStorage.removeItem('pendingBookingId');
+ } catch (err: any) {
+ console.error('Manual confirmation error:', err);
+ setStatus('error');
+ setErrorMsg(err?.data?.message || 'Failed to confirm payment. Please contact support.');
+ toast.error('Confirmation failed');
+ }
+ };
+
return (
)}
+
+ {status === 'manual' && (
+ <>
+
+
Booking ID Not Found
+
+ We couldn't automatically retrieve your booking ID. Please enter it below to confirm your payment.
+
+ (Check your email or order history for the Booking ID)
+