switched to paddle inline checkout, removed paypal and most of stripe. added product sync between app and paddle.
This commit is contained in:
@@ -7,22 +7,16 @@ use App\Models\AbandonedCheckout;
|
||||
use App\Models\Package;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Http\Controllers\Auth\AuthenticatedSessionController;
|
||||
use App\Support\Concerns\PresentsPackages;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\Rules\Password;
|
||||
use Inertia\Inertia;
|
||||
use Illuminate\Support\Str;
|
||||
use Stripe\PaymentIntent;
|
||||
use Stripe\Stripe;
|
||||
|
||||
use App\Http\Controllers\PayPalController;
|
||||
use App\Support\Concerns\PresentsPackages;
|
||||
|
||||
class CheckoutController extends Controller
|
||||
{
|
||||
@@ -32,6 +26,7 @@ class CheckoutController extends Controller
|
||||
{
|
||||
$googleStatus = session()->pull('checkout_google_status');
|
||||
$googleError = session()->pull('checkout_google_error');
|
||||
$googleProfile = session()->pull('checkout_google_profile');
|
||||
|
||||
$packageOptions = Package::orderBy('price')->get()
|
||||
->map(fn (Package $pkg) => $this->presentPackage($pkg))
|
||||
@@ -41,8 +36,6 @@ class CheckoutController extends Controller
|
||||
return Inertia::render('marketing/CheckoutWizardPage', [
|
||||
'package' => $this->presentPackage($package),
|
||||
'packageOptions' => $packageOptions,
|
||||
'stripePublishableKey' => config('services.stripe.key'),
|
||||
'paypalClientId' => config('services.paypal.client_id'),
|
||||
'privacyHtml' => view('legal.datenschutz-partial')->render(),
|
||||
'auth' => [
|
||||
'user' => Auth::user(),
|
||||
@@ -50,6 +43,11 @@ class CheckoutController extends Controller
|
||||
'googleAuth' => [
|
||||
'status' => $googleStatus,
|
||||
'error' => $googleError,
|
||||
'profile' => $googleProfile,
|
||||
],
|
||||
'paddle' => [
|
||||
'environment' => config('paddle.environment'),
|
||||
'client_token' => config('paddle.client_token'),
|
||||
],
|
||||
]);
|
||||
}
|
||||
@@ -58,9 +56,16 @@ class CheckoutController extends Controller
|
||||
{
|
||||
$validator = Validator::make($request->all(), [
|
||||
'email' => 'required|email|unique:users,email',
|
||||
'username' => 'required|string|max:255|unique:users,username',
|
||||
'password' => ['required', 'confirmed', Password::defaults()],
|
||||
'first_name' => 'required|string|max:255',
|
||||
'last_name' => 'required|string|max:255',
|
||||
'address' => 'required|string|max:500',
|
||||
'phone' => 'required|string|max:255',
|
||||
'package_id' => 'required|exists:packages,id',
|
||||
'terms' => 'required|accepted',
|
||||
'privacy_consent' => 'required|accepted',
|
||||
'locale' => 'nullable|string|max:10',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
@@ -72,43 +77,50 @@ class CheckoutController extends Controller
|
||||
$package = Package::findOrFail($request->package_id);
|
||||
$validated = $validator->validated();
|
||||
DB::transaction(function () use ($request, $package, $validated) {
|
||||
|
||||
|
||||
// User erstellen
|
||||
$user = User::create([
|
||||
'email' => $request->email,
|
||||
'username' => $validated['username'],
|
||||
'first_name' => $validated['first_name'],
|
||||
'last_name' => $validated['last_name'],
|
||||
'name' => trim($validated['first_name'].' '.$validated['last_name']),
|
||||
'address' => $validated['address'],
|
||||
'phone' => $validated['phone'],
|
||||
'preferred_locale' => $validated['locale'] ?? null,
|
||||
'password' => Hash::make($request->password),
|
||||
'pending_purchase' => true,
|
||||
]);
|
||||
|
||||
// Tenant erstellen
|
||||
$tenant = Tenant::create([
|
||||
'user_id' => $user->id,
|
||||
'name' => $validated['first_name'] . ' ' . $validated['last_name'],
|
||||
'slug' => Str::slug($validated['first_name'] . ' ' . $validated['last_name'] . '-' . now()->timestamp),
|
||||
'email' => $validated['email'],
|
||||
'is_active' => true,
|
||||
'is_suspended' => false,
|
||||
'event_credits_balance' => 0,
|
||||
'subscription_tier' => 'free',
|
||||
'subscription_expires_at' => null,
|
||||
'settings' => json_encode([
|
||||
'branding' => [
|
||||
'logo_url' => null,
|
||||
'primary_color' => '#3B82F6',
|
||||
'secondary_color' => '#1F2937',
|
||||
'font_family' => 'Inter, sans-serif',
|
||||
],
|
||||
'features' => [
|
||||
'photo_likes_enabled' => false,
|
||||
'event_checklist' => false,
|
||||
'custom_domain' => false,
|
||||
'advanced_analytics' => false,
|
||||
],
|
||||
'custom_domain' => null,
|
||||
'contact_email' => $validated['email'],
|
||||
'event_default_type' => 'general',
|
||||
]),
|
||||
]);
|
||||
'user_id' => $user->id,
|
||||
'name' => $validated['first_name'].' '.$validated['last_name'],
|
||||
'slug' => Str::slug($validated['first_name'].' '.$validated['last_name'].'-'.now()->timestamp),
|
||||
'email' => $validated['email'],
|
||||
'is_active' => true,
|
||||
'is_suspended' => false,
|
||||
'event_credits_balance' => 0,
|
||||
'subscription_tier' => 'free',
|
||||
'subscription_expires_at' => null,
|
||||
'settings' => json_encode([
|
||||
'branding' => [
|
||||
'logo_url' => null,
|
||||
'primary_color' => '#3B82F6',
|
||||
'secondary_color' => '#1F2937',
|
||||
'font_family' => 'Inter, sans-serif',
|
||||
],
|
||||
'features' => [
|
||||
'photo_likes_enabled' => false,
|
||||
'event_checklist' => false,
|
||||
'custom_domain' => false,
|
||||
'advanced_analytics' => false,
|
||||
],
|
||||
'custom_domain' => null,
|
||||
'contact_email' => $validated['email'],
|
||||
'event_default_type' => 'general',
|
||||
]),
|
||||
]);
|
||||
|
||||
$user->forceFill(['tenant_id' => $tenant->id])->save();
|
||||
// Package zuweisen
|
||||
@@ -151,12 +163,12 @@ class CheckoutController extends Controller
|
||||
// Custom Auth für Identifier (E-Mail oder Username)
|
||||
$identifier = $request->identifier;
|
||||
$user = User::where('email', $identifier)
|
||||
->orWhere('username', $identifier)
|
||||
->first();
|
||||
->orWhere('username', $identifier)
|
||||
->first();
|
||||
|
||||
if (!$user || !Hash::check($request->password, $user->password)) {
|
||||
if (! $user || ! Hash::check($request->password, $user->password)) {
|
||||
return response()->json([
|
||||
'errors' => ['identifier' => ['Ungültige Anmeldedaten.']]
|
||||
'errors' => ['identifier' => ['Ungültige Anmeldedaten.']],
|
||||
], 422);
|
||||
}
|
||||
|
||||
@@ -165,7 +177,7 @@ class CheckoutController extends Controller
|
||||
|
||||
// Checkout-spezifische Logik
|
||||
DB::transaction(function () use ($request, $user, $packageId) {
|
||||
if ($packageId && !$user->pending_purchase) {
|
||||
if ($packageId && ! $user->pending_purchase) {
|
||||
$user->update(['pending_purchase' => true]);
|
||||
$request->session()->put('pending_package_id', $packageId);
|
||||
}
|
||||
@@ -242,165 +254,6 @@ class CheckoutController extends Controller
|
||||
return response()->json(['status' => 'tracked']);
|
||||
}
|
||||
|
||||
public function createPaymentIntent(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'package_id' => 'required|exists:packages,id',
|
||||
]);
|
||||
|
||||
$package = Package::findOrFail($request->package_id);
|
||||
|
||||
\Log::info('Create Payment Intent', [
|
||||
'package_id' => $package->id,
|
||||
'package_name' => $package->name,
|
||||
'price' => $package->price,
|
||||
'is_free' => $package->is_free,
|
||||
'user_id' => Auth::id(),
|
||||
]);
|
||||
|
||||
$isFreePackage = $this->packageIsFree($package);
|
||||
|
||||
if ($isFreePackage) {
|
||||
\Log::info('Free package detected, returning null client_secret');
|
||||
return response()->json([
|
||||
'client_secret' => null,
|
||||
'free_package' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
// Stripe API Key setzen
|
||||
Stripe::setApiKey(config('services.stripe.secret'));
|
||||
|
||||
try {
|
||||
$paymentIntent = PaymentIntent::create([
|
||||
'amount' => $package->price * 100, // Stripe erwartet Cent
|
||||
'currency' => 'eur',
|
||||
'metadata' => [
|
||||
'package_id' => $package->id,
|
||||
'user_id' => Auth::id(),
|
||||
],
|
||||
]);
|
||||
|
||||
\Log::info('PaymentIntent created successfully', [
|
||||
'payment_intent_id' => $paymentIntent->id,
|
||||
'client_secret' => substr($paymentIntent->client_secret, 0, 50) . '...',
|
||||
]);
|
||||
|
||||
return response()->json([
|
||||
'client_secret' => $paymentIntent->client_secret,
|
||||
]);
|
||||
} catch (\Exception $e) {
|
||||
\Log::error('Stripe PaymentIntent creation failed', [
|
||||
'error' => $e->getMessage(),
|
||||
'package_id' => $package->id,
|
||||
]);
|
||||
|
||||
return response()->json([
|
||||
'error' => 'Fehler beim Erstellen der Zahlungsdaten: ' . $e->getMessage(),
|
||||
], 500);
|
||||
}
|
||||
}
|
||||
|
||||
public function confirmPayment(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'payment_intent_id' => 'required|string',
|
||||
'package_id' => 'required|exists:packages,id',
|
||||
]);
|
||||
|
||||
// Stripe API Key setzen
|
||||
Stripe::setApiKey(config('services.stripe.secret'));
|
||||
|
||||
$paymentIntent = PaymentIntent::retrieve($request->payment_intent_id);
|
||||
|
||||
if ($paymentIntent->status !== 'succeeded') {
|
||||
return response()->json([
|
||||
'error' => 'Zahlung nicht erfolgreich.',
|
||||
], 400);
|
||||
}
|
||||
|
||||
$package = Package::findOrFail($request->package_id);
|
||||
$user = Auth::user();
|
||||
|
||||
// Package dem Tenant zuweisen
|
||||
$user->tenant->packages()->attach($package->id, [
|
||||
'price' => $package->price,
|
||||
'purchased_at' => now(),
|
||||
'expires_at' => now()->addYear(),
|
||||
'active' => true,
|
||||
]);
|
||||
|
||||
// pending_purchase zurücksetzen
|
||||
$user->update(['pending_purchase' => false]);
|
||||
|
||||
return response()->json([
|
||||
'message' => 'Zahlung erfolgreich bestätigt.',
|
||||
]);
|
||||
}
|
||||
|
||||
public function handlePayPalReturn(Request $request)
|
||||
{
|
||||
$orderId = $request->query('orderID');
|
||||
|
||||
if (!$orderId) {
|
||||
return redirect('/checkout')->with('error', 'Ungültige PayPal-Rückkehr.');
|
||||
}
|
||||
|
||||
$user = Auth::user();
|
||||
|
||||
if (!$user) {
|
||||
return redirect('/login')->with('error', 'Bitte melden Sie sich an.');
|
||||
}
|
||||
|
||||
try {
|
||||
// Capture aufrufen
|
||||
$paypalController = new PayPalController();
|
||||
$captureRequest = new Request(['order_id' => $orderId]);
|
||||
$captureResponse = $paypalController->captureOrder($captureRequest);
|
||||
|
||||
if ($captureResponse->getStatusCode() !== 200 || !isset($captureResponse->getData(true)['status']) || $captureResponse->getData(true)['status'] !== 'captured') {
|
||||
Log::error('PayPal capture failed in return handler', ['order_id' => $orderId, 'response' => $captureResponse->getData(true)]);
|
||||
return redirect('/checkout')->with('error', 'Zahlung konnte nicht abgeschlossen werden.');
|
||||
}
|
||||
|
||||
// PackagePurchase finden (erzeugt durch captureOrder)
|
||||
$purchase = \App\Models\PackagePurchase::where('provider_id', $orderId)
|
||||
->where('tenant_id', $user->tenant_id)
|
||||
->latest()
|
||||
->first();
|
||||
|
||||
if (!$purchase) {
|
||||
Log::error('No PackagePurchase found after PayPal capture', ['order_id' => $orderId, 'tenant_id' => $user->tenant_id]);
|
||||
return redirect('/checkout')->with('error', 'Kauf konnte nicht verifiziert werden.');
|
||||
}
|
||||
|
||||
$package = \App\Models\Package::find($purchase->package_id);
|
||||
|
||||
if (!$package) {
|
||||
return redirect('/checkout')->with('error', 'Paket nicht gefunden.');
|
||||
}
|
||||
|
||||
// TenantPackage zuweisen (ähnlich Stripe)
|
||||
$user->tenant->packages()->attach($package->id, [
|
||||
'price' => $package->price,
|
||||
'purchased_at' => now(),
|
||||
'expires_at' => now()->addYear(),
|
||||
'active' => true,
|
||||
]);
|
||||
|
||||
// pending_purchase zurücksetzen
|
||||
$user->update(['pending_purchase' => false]);
|
||||
|
||||
Log::info('PayPal payment completed and package assigned', ['order_id' => $orderId, 'package_id' => $package->id, 'tenant_id' => $user->tenant_id]);
|
||||
|
||||
return redirect('/success/' . $package->id)->with('success', 'Zahlung erfolgreich! Ihr Paket wurde aktiviert.');
|
||||
|
||||
} catch (\Exception $e) {
|
||||
Log::error('Error in PayPal return handler', ['order_id' => $orderId, 'error' => $e->getMessage()]);
|
||||
return redirect('/checkout')->with('error', 'Fehler beim Abschließen der Zahlung: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private function packageIsFree(Package $package): bool
|
||||
{
|
||||
if (isset($package->is_free)) {
|
||||
|
||||
Reference in New Issue
Block a user