mirror of
https://github.com/Motion-Games/MotionWebStudio.git
synced 2026-04-21 09:00:53 +02:00
stripe full
This commit is contained in:
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
import { Button } from '../components/Button';
|
||||
import { LogOut, User, Settings as SettingsIcon, CreditCard, Layout, Cake, ShieldAlert, Clock, Activity, CheckCircle, XCircle, MessageSquare, ArrowRight, Edit2, Download, FileText, ExternalLink, History, RefreshCw, FileDown, ShieldCheck, Calendar } from 'lucide-react';
|
||||
import { Link, useNavigate } from 'react-router-dom';
|
||||
import { Link, useNavigate, useSearchParams } from 'react-router-dom';
|
||||
import { supabase, isSupabaseConfigured } from '../lib/supabaseClient';
|
||||
import { SettingsModal } from '../components/SettingsModal';
|
||||
import { FeedbackModal } from '../components/FeedbackModal';
|
||||
@@ -47,6 +47,7 @@ interface UserOrder {
|
||||
export const Dashboard: React.FC = () => {
|
||||
const { user, signOut, isAdmin } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
const [searchParams] = useSearchParams();
|
||||
const [profile, setProfile] = useState<UserProfile | null>(null);
|
||||
const [orders, setOrders] = useState<UserOrder[]>([]);
|
||||
const [invoices, setInvoices] = useState<Invoice[]>([]);
|
||||
@@ -57,6 +58,22 @@ export const Dashboard: React.FC = () => {
|
||||
const [selectedOrderId, setSelectedOrderId] = useState<string | null>(null);
|
||||
const [feedbackLoading, setFeedbackLoading] = useState(false);
|
||||
|
||||
// Check for payment success/cancel query params
|
||||
useEffect(() => {
|
||||
const paymentSuccess = searchParams.get('payment_success');
|
||||
const orderIdParam = searchParams.get('order_id');
|
||||
|
||||
if (paymentSuccess === 'true' && orderIdParam) {
|
||||
// Opcionális: Itt lehetne egy sikeres fizetés modált megjeleníteni vagy toast üzenetet
|
||||
// A státusz frissítést (pl. 'pending_feedback' -> 'in_progress') a webhook végezné ideális esetben,
|
||||
// de kliens oldalon is jelezhetjük a sikert.
|
||||
// Mivel a redirect után újratölt az oldal, a fetchData friss adatokat hoz.
|
||||
// Töröljük a query paramokat, hogy ne maradjanak ott
|
||||
window.history.replaceState({}, '', '#/dashboard');
|
||||
alert("Sikeres fizetés! Köszönjük.");
|
||||
}
|
||||
}, [searchParams]);
|
||||
|
||||
const fetchOrderHistory = async (orderId: string) => {
|
||||
if (!isSupabaseConfigured) return [];
|
||||
try {
|
||||
@@ -188,22 +205,82 @@ export const Dashboard: React.FC = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
const { data: currentOrder } = await supabase.from('orders').select('details').eq('id', selectedOrderId).single();
|
||||
const updatedDetails = { ...(currentOrder?.details || {}), latestFeedback: feedbackData, feedbackDate: new Date().toISOString() };
|
||||
// 1. Fetch fresh order data to get payment details
|
||||
const { data: currentOrder } = await supabase.from('orders').select('*').eq('id', selectedOrderId).single();
|
||||
if (!currentOrder) throw new Error("Rendelés nem található");
|
||||
|
||||
const isApproved = feedbackData.decision === 'approved';
|
||||
const paymentSummary = currentOrder.details?.payment_summary;
|
||||
const isStandardPackage = ['Landing Page', 'Pro Web'].includes(currentOrder.package);
|
||||
|
||||
// Check if payment is needed: Approved + Standard Package + Not Custom Price + Has Remaining Balance
|
||||
// Note: paymentSummary.remaining > 0 check is implicitly handled by Logic in FeedbackModal (it shows payment button only if true)
|
||||
// But we double check here for security.
|
||||
const needsPayment = isApproved && isStandardPackage && !paymentSummary?.is_custom && (paymentSummary?.remaining > 0);
|
||||
|
||||
if (needsPayment) {
|
||||
// Initiate Stripe Checkout for Final Payment
|
||||
const { data: checkoutData, error: checkoutError } = await supabase.functions.invoke('create-checkout-session', {
|
||||
body: {
|
||||
order_id: selectedOrderId,
|
||||
package_name: currentOrder.package,
|
||||
payment_type: 'final',
|
||||
customer_email: user?.email
|
||||
}
|
||||
});
|
||||
|
||||
if (checkoutError) {
|
||||
console.error("Supabase Invoke Error:", checkoutError);
|
||||
let msg = "Ismeretlen hiba";
|
||||
if (checkoutError && typeof checkoutError === 'object' && 'message' in checkoutError) {
|
||||
msg = checkoutError.message;
|
||||
}
|
||||
throw new Error(`Fizetési rendszer hiba: ${msg}`);
|
||||
}
|
||||
|
||||
if (checkoutData?.url) {
|
||||
// Update details with feedback content BEFORE redirecting
|
||||
// This ensures we save the "Approval" state even if they drop off payment (status remains pending_feedback though)
|
||||
const updatedDetails = {
|
||||
...(currentOrder.details || {}),
|
||||
latestFeedback: feedbackData,
|
||||
feedbackDate: new Date().toISOString()
|
||||
};
|
||||
await supabase.from('orders').update({ details: updatedDetails }).eq('id', selectedOrderId);
|
||||
|
||||
// Redirect to Stripe
|
||||
window.location.href = checkoutData.url;
|
||||
return; // Stop execution to allow redirect
|
||||
} else {
|
||||
throw new Error("Nem sikerült létrehozni a fizetési linket.");
|
||||
}
|
||||
}
|
||||
|
||||
// If no payment needed (e.g. revision request, or custom price, or enterprise), update status directly
|
||||
const updatedDetails = {
|
||||
...(currentOrder.details || {}),
|
||||
latestFeedback: feedbackData,
|
||||
feedbackDate: new Date().toISOString()
|
||||
};
|
||||
|
||||
const newStatus = 'in_progress'; // Send back to dev in both cases (to finalize or revise)
|
||||
|
||||
const { error: updateError } = await supabase.from('orders').update({
|
||||
status: 'in_progress',
|
||||
status: newStatus,
|
||||
details: updatedDetails
|
||||
}).eq('id', selectedOrderId);
|
||||
|
||||
if (updateError) throw updateError;
|
||||
|
||||
await supabase.from('order_status_history').insert({ order_id: selectedOrderId, status: 'in_progress' });
|
||||
await supabase.from('order_status_history').insert({ order_id: selectedOrderId, status: newStatus });
|
||||
|
||||
await fetchData();
|
||||
setFeedbackModalOpen(false);
|
||||
alert("Visszajelzés sikeresen elküldve!");
|
||||
|
||||
} catch (err: any) {
|
||||
alert("Hiba: " + err.message);
|
||||
console.error("Feedback submit error:", err);
|
||||
alert("Hiba: " + (err.message || "Ismeretlen hiba történt."));
|
||||
} finally {
|
||||
setFeedbackLoading(false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user