funktionierender stand, purchasewizard noch nicht optimiert.
This commit is contained in:
Codex Agent
@@ -132,13 +132,17 @@ class MarketingController extends Controller
|
||||
$stripePublishableKey = config('services.stripe.key');
|
||||
$privacyHtml = view('legal.datenschutz-partial', ['locale' => app()->getLocale()])->render();
|
||||
|
||||
return Inertia::render('marketing/PurchaseWizard', [
|
||||
$csp = "default-src 'self'; script-src 'self' 'unsafe-inline' http://localhost:5173 https://js.stripe.com https://js.stripe.network; style-src 'self' 'unsafe-inline' data: https:; img-src 'self' data: https: blob:; font-src 'self' data: https:; connect-src 'self' http://localhost:5173 ws://localhost:5173 https://api.stripe.com https://api.stripe.network wss://*.stripe.network; media-src data: blob: 'self' https: https://js.stripe.com https://*.stripe.com; frame-src 'self' https://js.stripe.com https://*.stripe.com; object-src 'none'; base-uri 'self'; form-action 'self';";
|
||||
|
||||
$response = Inertia::render('marketing/PurchaseWizard', [
|
||||
'package' => $package,
|
||||
'stripePublishableKey' => $stripePublishableKey,
|
||||
'paypalClientId' => config('services.paypal.client_id'),
|
||||
'privacyHtml' => $privacyHtml,
|
||||
]);
|
||||
])->toResponse($request);
|
||||
$response->headers->set('Content-Security-Policy', $csp);
|
||||
return $response;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checkout for Stripe with auth metadata.
|
||||
*/
|
||||
|
||||
@@ -1,465 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Package;
|
||||
use App\Models\PackagePurchase;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\TenantPackage;
|
||||
use App\Models\User;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
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\Str;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use PayPalCheckout\OrdersCaptureRequest;
|
||||
use PayPalCheckout\OrdersCreateRequest;
|
||||
use PayPalHttp\Client;
|
||||
use PayPalHttp\HttpException;
|
||||
use Stripe\PaymentIntent;
|
||||
use Stripe\Stripe;
|
||||
|
||||
class PurchaseWizardController extends Controller
|
||||
{
|
||||
|
||||
|
||||
|
||||
public function login(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'login' => ['required', 'string'],
|
||||
'password' => ['required', 'string'],
|
||||
'remember' => ['nullable', 'boolean'],
|
||||
]);
|
||||
|
||||
$credentials = ['password' => $data['password']];
|
||||
|
||||
if (filter_var($data['login'], FILTER_VALIDATE_EMAIL)) {
|
||||
$credentials['email'] = $data['login'];
|
||||
} else {
|
||||
$credentials['username'] = $data['login'];
|
||||
}
|
||||
|
||||
if (! Auth::attempt($credentials, (bool) ($data['remember'] ?? false))) {
|
||||
throw ValidationException::withMessages([
|
||||
'login' => __('auth.failed'),
|
||||
]);
|
||||
}
|
||||
|
||||
$request->session()->regenerate();
|
||||
|
||||
$user = $request->user();
|
||||
|
||||
return response()->json([
|
||||
'status' => 'authenticated',
|
||||
'user' => $this->transformUser($user),
|
||||
'next_step' => 'payment',
|
||||
'needs_verification' => $user?->email_verified_at === null,
|
||||
]);
|
||||
}
|
||||
|
||||
public function register(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'username' => ['required', 'string', 'max:255', 'unique:users,username'],
|
||||
'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:users,email'],
|
||||
'password' => ['required', 'confirmed', \Illuminate\Validation\Rules\Password::defaults()],
|
||||
'first_name' => ['required', 'string', 'max:255'],
|
||||
'last_name' => ['required', 'string', 'max:255'],
|
||||
'address' => ['required', 'string', 'max:500'],
|
||||
'phone' => ['required', 'string', 'max:20'],
|
||||
'privacy_consent' => ['accepted'],
|
||||
'package_id' => ['nullable', 'exists:packages,id'],
|
||||
]);
|
||||
|
||||
$shouldAutoVerify = app()->environment(['local', 'testing']);
|
||||
$package = $data['package_id'] ? Package::find($data['package_id']) : null;
|
||||
|
||||
DB::beginTransaction();
|
||||
|
||||
try {
|
||||
$user = User::create([
|
||||
'username' => $data['username'],
|
||||
'email' => $data['email'],
|
||||
'first_name' => $data['first_name'],
|
||||
'last_name' => $data['last_name'],
|
||||
'address' => $data['address'],
|
||||
'phone' => $data['phone'],
|
||||
'password' => Hash::make($data['password']),
|
||||
'role' => 'user',
|
||||
'pending_purchase' => $package && (($package->price ?? 0) > 0),
|
||||
]);
|
||||
|
||||
$tenant = Tenant::create([
|
||||
'user_id' => $user->id,
|
||||
'name' => trim($data['first_name'].' '.$data['last_name']),
|
||||
'slug' => Str::slug($data['first_name'].' '.$data['last_name'].'-'.now()->timestamp),
|
||||
'email' => $data['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' => $data['email'],
|
||||
'event_default_type' => 'general',
|
||||
]),
|
||||
]);
|
||||
|
||||
if ($shouldAutoVerify) {
|
||||
$user->forceFill(['email_verified_at' => now()])->save();
|
||||
}
|
||||
|
||||
$assignedPackage = null;
|
||||
|
||||
if ($package && (float) $package->price <= 0.0) {
|
||||
$assignedPackage = $package;
|
||||
|
||||
TenantPackage::updateOrCreate(
|
||||
[
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
],
|
||||
[
|
||||
'price' => 0,
|
||||
'active' => true,
|
||||
'purchased_at' => now(),
|
||||
'expires_at' => now()->addYear(),
|
||||
]
|
||||
);
|
||||
|
||||
PackagePurchase::create([
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
'provider_id' => 'free',
|
||||
'price' => 0,
|
||||
'type' => $package->type === 'endcustomer' ? 'endcustomer_event' : 'reseller_subscription',
|
||||
'purchased_at' => now(),
|
||||
'refunded' => false,
|
||||
]);
|
||||
|
||||
$tenant->update(['subscription_status' => 'active']);
|
||||
$user->forceFill(['pending_purchase' => false, 'role' => 'tenant_admin'])->save();
|
||||
}
|
||||
|
||||
DB::commit();
|
||||
} catch (\Throwable $e) {
|
||||
DB::rollBack();
|
||||
throw $e;
|
||||
}
|
||||
|
||||
event(new Registered($user));
|
||||
|
||||
Auth::login($user);
|
||||
$request->session()->regenerate();
|
||||
|
||||
Mail::to($user)->queue(new \App\Mail\Welcome($user));
|
||||
|
||||
$nextStep = 'payment';
|
||||
|
||||
if ($assignedPackage) {
|
||||
$nextStep = 'success';
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'status' => 'registered',
|
||||
'user' => $this->transformUser($user),
|
||||
'next_step' => $nextStep,
|
||||
'needs_verification' => $user->email_verified_at === null,
|
||||
'package' => $package ? [
|
||||
'id' => $package->id,
|
||||
'name' => $package->name,
|
||||
'price' => $package->price,
|
||||
'type' => $package->type,
|
||||
] : null,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
public function createStripeIntent(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'package_id' => ['required', 'exists:packages,id'],
|
||||
]);
|
||||
|
||||
$user = $request->user();
|
||||
if (! $user) {
|
||||
throw ValidationException::withMessages(['auth' => __('auth.login')]);
|
||||
}
|
||||
|
||||
$tenant = $user->tenant;
|
||||
if (! $tenant) {
|
||||
throw ValidationException::withMessages(['tenant' => 'Tenant not found']);
|
||||
}
|
||||
|
||||
$package = Package::findOrFail($data['package_id']);
|
||||
if ($package->price <= 0) {
|
||||
throw ValidationException::withMessages(['package_id' => 'Stripe payment is not required for this package.']);
|
||||
}
|
||||
|
||||
Stripe::setApiKey(config('services.stripe.secret'));
|
||||
|
||||
$intent = PaymentIntent::create([
|
||||
'amount' => (int) round($package->price * 100),
|
||||
'currency' => 'eur',
|
||||
'metadata' => [
|
||||
'user_id' => $user->id,
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
'package_type' => $package->type,
|
||||
],
|
||||
'automatic_payment_methods' => ['enabled' => true],
|
||||
]);
|
||||
|
||||
return response()->json([
|
||||
'client_secret' => $intent->client_secret,
|
||||
'payment_intent_id' => $intent->id,
|
||||
]);
|
||||
}
|
||||
|
||||
public function completeStripe(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'package_id' => ['required', 'exists:packages,id'],
|
||||
'payment_intent_id' => ['required', 'string'],
|
||||
]);
|
||||
|
||||
$user = $request->user();
|
||||
if (! $user) {
|
||||
throw ValidationException::withMessages(['auth' => __('auth.login')]);
|
||||
}
|
||||
|
||||
$package = Package::findOrFail($data['package_id']);
|
||||
$tenant = $this->resolveTenant($user->id);
|
||||
|
||||
Stripe::setApiKey(config('services.stripe.secret'));
|
||||
$intent = PaymentIntent::retrieve($data['payment_intent_id']);
|
||||
|
||||
if ($intent->status !== 'succeeded') {
|
||||
throw ValidationException::withMessages(['payment' => 'The payment is not completed.']);
|
||||
}
|
||||
|
||||
$this->finalizePurchase($tenant, $package, 'stripe', [
|
||||
'payment_intent' => $intent->id,
|
||||
]);
|
||||
|
||||
return response()->json(['status' => 'completed']);
|
||||
}
|
||||
|
||||
public function createPaypalOrder(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'package_id' => ['required', 'exists:packages,id'],
|
||||
]);
|
||||
|
||||
$user = $request->user();
|
||||
if (! $user) {
|
||||
throw ValidationException::withMessages(['auth' => __('auth.login')]);
|
||||
}
|
||||
|
||||
$tenant = $this->resolveTenant($user->id);
|
||||
$package = Package::findOrFail($data['package_id']);
|
||||
if ($package->price <= 0) {
|
||||
throw ValidationException::withMessages(['package_id' => 'PayPal payment is not required for this package.']);
|
||||
}
|
||||
|
||||
$client = $this->makePaypalClient();
|
||||
$orders = $client->orders();
|
||||
|
||||
$createRequest = new OrdersCreateRequest();
|
||||
$createRequest->prefer('return=representation');
|
||||
$createRequest->body = [
|
||||
'intent' => 'CAPTURE',
|
||||
'purchase_units' => [[
|
||||
'amount' => [
|
||||
'currency_code' => 'EUR',
|
||||
'value' => number_format($package->price, 2, '.', ''),
|
||||
],
|
||||
'description' => 'Package: '.$package->name,
|
||||
'custom_id' => json_encode([
|
||||
'user_id' => $user->id,
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
'package_type' => $package->type,
|
||||
]),
|
||||
]],
|
||||
];
|
||||
|
||||
try {
|
||||
$response = $orders->createOrder($createRequest);
|
||||
$order = $response->result;
|
||||
|
||||
return response()->json([
|
||||
'order_id' => $order->id,
|
||||
'status' => $order->status ?? 'CREATED',
|
||||
]);
|
||||
} catch (HttpException $exception) {
|
||||
Log::error('PayPal order creation failed', [
|
||||
'message' => $exception->getMessage(),
|
||||
'status_code' => $exception->statusCode ?? null,
|
||||
]);
|
||||
|
||||
return response()->json(['error' => 'Unable to create PayPal order.'], 422);
|
||||
}
|
||||
}
|
||||
|
||||
public function capturePaypalOrder(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'order_id' => ['required', 'string'],
|
||||
'package_id' => ['required', 'exists:packages,id'],
|
||||
]);
|
||||
|
||||
$user = $request->user();
|
||||
if (! $user) {
|
||||
throw ValidationException::withMessages(['auth' => __('auth.login')]);
|
||||
}
|
||||
|
||||
$package = Package::findOrFail($data['package_id']);
|
||||
$tenant = $this->resolveTenant($user->id);
|
||||
|
||||
$client = $this->makePaypalClient();
|
||||
$orders = $client->orders();
|
||||
|
||||
$captureRequest = new OrdersCaptureRequest($data['order_id']);
|
||||
$captureRequest->prefer('return=representation');
|
||||
|
||||
try {
|
||||
$response = $orders->captureOrder($captureRequest);
|
||||
$capture = $response->result;
|
||||
|
||||
if (($capture->status ?? null) !== 'COMPLETED') {
|
||||
return response()->json(['error' => 'Capture incomplete.'], 422);
|
||||
}
|
||||
|
||||
$customId = $capture->purchaseUnits[0]->customId ?? null;
|
||||
if ($customId) {
|
||||
$metadata = json_decode($customId, true);
|
||||
|
||||
if (($metadata['package_id'] ?? null) !== $package->id || ($metadata['tenant_id'] ?? null) !== $tenant->id) {
|
||||
return response()->json(['error' => 'Order metadata mismatch.'], 422);
|
||||
}
|
||||
}
|
||||
|
||||
$this->finalizePurchase($tenant, $package, 'paypal', [
|
||||
'order_id' => $data['order_id'],
|
||||
'capture_status' => $capture->status ?? null,
|
||||
]);
|
||||
|
||||
return response()->json([
|
||||
'status' => 'captured',
|
||||
]);
|
||||
} catch (HttpException $exception) {
|
||||
Log::error('PayPal capture failed', [
|
||||
'message' => $exception->getMessage(),
|
||||
'status_code' => $exception->statusCode ?? null,
|
||||
]);
|
||||
|
||||
return response()->json(['error' => 'Unable to capture PayPal order.'], 422);
|
||||
}
|
||||
}
|
||||
|
||||
public function assignFreePackage(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'package_id' => ['required', 'exists:packages,id'],
|
||||
]);
|
||||
|
||||
$user = $request->user();
|
||||
if (! $user) {
|
||||
throw ValidationException::withMessages(['auth' => __('auth.login')]);
|
||||
}
|
||||
|
||||
$package = Package::findOrFail($data['package_id']);
|
||||
if ($package->price > 0) {
|
||||
throw ValidationException::withMessages(['package_id' => 'Package is not free.']);
|
||||
}
|
||||
|
||||
$tenant = $this->resolveTenant($user->id);
|
||||
$this->finalizePurchase($tenant, $package, 'free_wizard');
|
||||
|
||||
return response()->json(['status' => 'assigned']);
|
||||
}
|
||||
|
||||
private function resolveTenant(int $userId): Tenant
|
||||
{
|
||||
$tenant = Tenant::where('user_id', $userId)->first();
|
||||
|
||||
if (! $tenant) {
|
||||
throw ValidationException::withMessages(['tenant' => 'Tenant not found']);
|
||||
}
|
||||
|
||||
return $tenant;
|
||||
}
|
||||
|
||||
private function finalizePurchase(Tenant $tenant, Package $package, string $providerId, array $metadata = []): void
|
||||
{
|
||||
TenantPackage::updateOrCreate(
|
||||
[
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
],
|
||||
[
|
||||
'price' => $package->price,
|
||||
'active' => true,
|
||||
'purchased_at' => now(),
|
||||
'expires_at' => now()->addYear(),
|
||||
]
|
||||
);
|
||||
|
||||
PackagePurchase::create([
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
'provider_id' => $providerId,
|
||||
'price' => $package->price,
|
||||
'type' => $package->type === 'endcustomer' ? 'endcustomer_event' : 'reseller_subscription',
|
||||
'purchased_at' => now(),
|
||||
'metadata' => $metadata ? json_encode($metadata) : null,
|
||||
'refunded' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
private function makePaypalClient(): Client
|
||||
{
|
||||
return Client::create([
|
||||
'clientId' => config('services.paypal.client_id'),
|
||||
'clientSecret' => config('services.paypal.secret'),
|
||||
'environment' => config('services.paypal.sandbox', true) ? 'sandbox' : 'live',
|
||||
]);
|
||||
}
|
||||
|
||||
private function transformUser(?User $user): array
|
||||
{
|
||||
if (! $user) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return [
|
||||
'id' => $user->id,
|
||||
'email' => $user->email,
|
||||
'name' => trim(($user->first_name ?? '').' '.($user->last_name ?? '')) ?: $user->username,
|
||||
'pending_purchase' => (bool) $user->pending_purchase,
|
||||
'email_verified' => (bool) $user->email_verified_at,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,5 @@ class Kernel extends HttpKernel
|
||||
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
||||
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
||||
'locale' => \App\Http\Middleware\SetLocale::class,
|
||||
'stripe.csp' => \App\Http\Middleware\StripeCSP::class,
|
||||
];
|
||||
}
|
||||
@@ -9,151 +9,18 @@ use Symfony\Component\HttpFoundation\Response;
|
||||
class StripeCSP
|
||||
{
|
||||
/**
|
||||
* Apply a CSP that allows Stripe and PayPal assets on the purchase wizard.
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
|
||||
*/
|
||||
public function handle(Request $request, Closure $next): Response
|
||||
{
|
||||
$response = $next($request);
|
||||
|
||||
$isLocal = app()->environment('local');
|
||||
$csp = "default-src 'self'; script-src 'self' 'unsafe-inline' https://js.stripe.com https://js.stripe.network; style-src 'self' 'unsafe-inline' data: https:; img-src 'self' data: https: blob:; font-src 'self' data: https:; connect-src 'self' https://api.stripe.com https://api.stripe.network wss://*.stripe.network; media-src 'self' data: blob:; frame-src 'self' https://js.stripe.com; object-src 'none'; base-uri 'self'; form-action 'self';";
|
||||
|
||||
$scriptSrc = [
|
||||
"'self'",
|
||||
"'unsafe-inline'",
|
||||
'https://js.stripe.com',
|
||||
'https://js.stripe.network',
|
||||
'https://m.stripe.network',
|
||||
'https://*.stripe.com',
|
||||
'https://*.stripe.network',
|
||||
'https://www.paypal.com',
|
||||
'https://*.paypal.com',
|
||||
'https://www.paypalobjects.com',
|
||||
'https://*.paypalobjects.com',
|
||||
];
|
||||
|
||||
$styleSrc = [
|
||||
"'self'",
|
||||
"'unsafe-inline'",
|
||||
'data:',
|
||||
'https:',
|
||||
'https://*.stripe.com',
|
||||
'https://*.stripe.network',
|
||||
'https://www.paypal.com',
|
||||
'https://*.paypal.com',
|
||||
'https://www.paypalobjects.com',
|
||||
'https://*.paypalobjects.com',
|
||||
];
|
||||
|
||||
$imgSrc = [
|
||||
"'self'",
|
||||
'data:',
|
||||
'https:',
|
||||
'blob:',
|
||||
'https://*.stripe.com',
|
||||
'https://*.stripe.network',
|
||||
'https://q.stripe.com',
|
||||
'https://r.stripe.com',
|
||||
'https://www.paypal.com',
|
||||
'https://*.paypal.com',
|
||||
'https://www.paypalobjects.com',
|
||||
'https://*.paypalobjects.com',
|
||||
];
|
||||
|
||||
$fontSrc = [
|
||||
"'self'",
|
||||
'data:',
|
||||
'https:',
|
||||
'https://*.stripe.com',
|
||||
'https://*.stripe.network',
|
||||
'https://www.paypalobjects.com',
|
||||
'https://*.paypalobjects.com',
|
||||
];
|
||||
|
||||
$connectSrc = [
|
||||
"'self'",
|
||||
'https://api.stripe.com',
|
||||
'https://api.stripe.network',
|
||||
'https://js.stripe.com',
|
||||
'https://m.stripe.com',
|
||||
'https://m.stripe.network',
|
||||
'https://connect.stripe.com',
|
||||
'https://*.stripe.com',
|
||||
'https://*.stripe.network',
|
||||
'https://r.stripe.com',
|
||||
'https://q.stripe.com',
|
||||
'https://www.paypal.com',
|
||||
'https://*.paypal.com',
|
||||
'https://www.paypalobjects.com',
|
||||
'https://*.paypalobjects.com',
|
||||
'wss://*.stripe.network',
|
||||
];
|
||||
|
||||
$mediaSrc = [
|
||||
"'self'",
|
||||
'data:',
|
||||
'blob:',
|
||||
'https:',
|
||||
'https://js.stripe.com',
|
||||
'https://*.stripe.com',
|
||||
'https://*.stripe.network',
|
||||
'https://m.stripe.network',
|
||||
'https://www.paypal.com',
|
||||
'https://*.paypal.com',
|
||||
'https://www.paypalobjects.com',
|
||||
'https://*.paypalobjects.com',
|
||||
];
|
||||
|
||||
$frameSrc = [
|
||||
"'self'",
|
||||
'https://js.stripe.com',
|
||||
'https://*.stripe.com',
|
||||
'https://hooks.stripe.com',
|
||||
'https://www.paypal.com',
|
||||
'https://*.paypal.com',
|
||||
];
|
||||
|
||||
$workerSrc = [
|
||||
"'self'",
|
||||
'blob:',
|
||||
'https://js.stripe.com',
|
||||
'https://*.stripe.com',
|
||||
'https://*.stripe.network',
|
||||
'https://m.stripe.network',
|
||||
'https://www.paypal.com',
|
||||
'https://*.paypal.com',
|
||||
];
|
||||
|
||||
if ($isLocal) {
|
||||
$devHost = 'http://localhost:5173';
|
||||
|
||||
$scriptSrc[] = $devHost;
|
||||
$styleSrc[] = $devHost;
|
||||
$imgSrc[] = $devHost;
|
||||
$fontSrc[] = $devHost;
|
||||
$connectSrc[] = $devHost;
|
||||
$connectSrc[] = 'ws://localhost:5173';
|
||||
$mediaSrc[] = $devHost;
|
||||
$frameSrc[] = $devHost;
|
||||
$workerSrc[] = $devHost;
|
||||
}
|
||||
|
||||
$directives = [
|
||||
"default-src 'self'",
|
||||
'script-src ' . implode(' ', $scriptSrc),
|
||||
'style-src ' . implode(' ', $styleSrc),
|
||||
'img-src ' . implode(' ', $imgSrc),
|
||||
'font-src ' . implode(' ', $fontSrc),
|
||||
'connect-src ' . implode(' ', $connectSrc),
|
||||
'media-src ' . implode(' ', $mediaSrc),
|
||||
'frame-src ' . implode(' ', $frameSrc),
|
||||
'worker-src ' . implode(' ', $workerSrc),
|
||||
'child-src ' . implode(' ', $frameSrc),
|
||||
"object-src 'none'",
|
||||
"base-uri 'self'",
|
||||
"form-action 'self'",
|
||||
];
|
||||
|
||||
$response->headers->set('Content-Security-Policy', implode('; ', $directives) . ';');
|
||||
$response->headers->set('Content-Security-Policy', $csp);
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
@@ -28,58 +28,3 @@ Guest Polling (no WebSockets in v1)
|
||||
|
||||
Webhooks
|
||||
- Payment provider events, media pipeline status, and deletion callbacks. All signed with shared secret per provider.
|
||||
|
||||
## Purchase Wizard Endpoints (Marketing Flow)
|
||||
|
||||
These endpoints support the frontend purchase wizard for package selection, authentication, and payment. They are web routes under `/purchase/` (not `/api/v1`), designed for Inertia.js integration with JSON responses for AJAX/fetch calls. No tenant middleware for auth steps (pre-tenant creation); auth required for payment.
|
||||
|
||||
### Flow Overview
|
||||
1. **Package Selection**: User selects package via marketing page; redirects to wizard with package ID.
|
||||
2. **Auth (Login/Register)**: Handle user creation/login; creates tenant if registering. Returns user data and next_step ('payment' or 'success' for free packages).
|
||||
3. **Payment**: Create intent/order, complete via provider callback, finalize purchase (assign package, update tenant).
|
||||
4. **Success**: Redirect to success page; email welcome if new user.
|
||||
|
||||
Error Handling:
|
||||
- 422 Validation: `{ errors: { field: ['message'] }, message: 'Summary' }` – display in forms without reload.
|
||||
- 401/403: `{ error: 'Auth required' }` – show login prompt.
|
||||
- 500/Other: `{ error: 'Server error' }` – generic alert, log trace_id.
|
||||
- Non-JSON (e.g., 404): Frontend catches "unexpected end of data" and shows "Endpoint not found" or retry.
|
||||
|
||||
All responses: JSON only for AJAX; CSRF-protected.
|
||||
|
||||
### Endpoints
|
||||
|
||||
- **POST /purchase/auth/login**
|
||||
- Body: `{ login: string (email/username), password: string, remember?: boolean }`
|
||||
- Response (200): `{ status: 'authenticated', user: { id, email, name, pending_purchase, email_verified }, next_step: 'payment', needs_verification: boolean }`
|
||||
- Errors: 422 `{ errors: { login: ['Invalid credentials'] } }`
|
||||
|
||||
- **POST /purchase/auth/register**
|
||||
- Body: `{ username, email, password, password_confirmation, first_name, last_name, address, phone, privacy_consent: boolean, package_id?: number }`
|
||||
- Response (200): `{ status: 'registered', user: { ... }, next_step: 'payment'|'success', needs_verification: boolean, package?: { id, name, price, type } }`
|
||||
- Errors: 422 `{ errors: { email: ['Taken'], password: ['Too weak'] } }`; creates tenant/user on success.
|
||||
|
||||
- **POST /purchase/stripe/intent** (auth required)
|
||||
- Body: `{ package_id: number }`
|
||||
- Response (200): `{ client_secret: string, payment_intent_id: string }`
|
||||
- Errors: 422 `{ errors: { package_id: ['Invalid'] } }`
|
||||
|
||||
- **POST /purchase/stripe/complete** (auth required)
|
||||
- Body: `{ package_id: number, payment_intent_id: string }`
|
||||
- Response (200): `{ status: 'completed' }`
|
||||
- Errors: 422 `{ errors: { payment: ['Not succeeded'] } }` – finalizes purchase.
|
||||
|
||||
- **POST /purchase/paypal/order** (auth required)
|
||||
- Body: `{ package_id: number }`
|
||||
- Response (200): `{ order_id: string, status: 'CREATED' }`
|
||||
- Errors: 422 `{ error: 'Order creation failed' }`
|
||||
|
||||
- **POST /purchase/paypal/capture** (auth required)
|
||||
- Body: `{ order_id: string, package_id: number }`
|
||||
- Response (200): `{ status: 'captured' }`
|
||||
- Errors: 422 `{ error: 'Capture incomplete' }` – finalizes purchase.
|
||||
|
||||
- **POST /purchase/free** (auth required)
|
||||
- Body: `{ package_id: number }`
|
||||
- Response (200): `{ status: 'assigned' }`
|
||||
- Errors: 422 `{ errors: { package_id: ['Not free'] } }` – assigns for zero-price packages.
|
||||
|
||||
@@ -1,109 +1,41 @@
|
||||
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useForm } from '@inertiajs/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { LoaderCircle } from 'lucide-react';
|
||||
import { LoaderCircle, Mail, Lock } from 'lucide-react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import InputError from '@/components/input-error';
|
||||
import TextLink from '@/components/text-link';
|
||||
import { Alert, AlertDescription } from '@/components/ui/alert';
|
||||
|
||||
interface LoginFormProps {
|
||||
onSuccess?: (payload: any) => void;
|
||||
onSuccess?: (userData: any) => void;
|
||||
canResetPassword?: boolean;
|
||||
}
|
||||
|
||||
const getCsrfToken = () =>
|
||||
(document.querySelector('meta[name="csrf-token"]') as HTMLMetaElement | null)?.content ?? '';
|
||||
|
||||
const parseJson = async (response: Response) => {
|
||||
if (response.headers.get('Content-Type')?.includes('application/json')) {
|
||||
const json = await response.json().catch(() => null);
|
||||
if (json) return json;
|
||||
}
|
||||
|
||||
const text = await response.text();
|
||||
throw new Error(text || 'Invalid server response (unexpected end of data or non-JSON).');
|
||||
};
|
||||
|
||||
export default function LoginForm({ onSuccess, canResetPassword = true }: LoginFormProps) {
|
||||
const [hasTriedSubmit, setHasTriedSubmit] = useState(false);
|
||||
const { t } = useTranslation('auth');
|
||||
const csrfToken = useMemo(getCsrfToken, []);
|
||||
|
||||
const { data, setData, errors, setError, clearErrors, reset } = useForm({
|
||||
login: '',
|
||||
const { data, setData, post, processing, errors, clearErrors, reset } = useForm({
|
||||
email: '',
|
||||
password: '',
|
||||
remember: false,
|
||||
});
|
||||
|
||||
const [hasTriedSubmit, setHasTriedSubmit] = useState(false);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [formError, setFormError] = useState<string | null>(null);
|
||||
|
||||
const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
|
||||
event.preventDefault();
|
||||
const submit = (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setHasTriedSubmit(true);
|
||||
setSubmitting(true);
|
||||
setFormError(null);
|
||||
clearErrors();
|
||||
|
||||
try {
|
||||
const response = await fetch('/purchase/auth/login', {
|
||||
method: 'POST',
|
||||
credentials: 'same-origin',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Accept: 'application/json',
|
||||
'X-CSRF-TOKEN': csrfToken,
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
login: data.login,
|
||||
password: data.password,
|
||||
remember: data.remember,
|
||||
}),
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const payload = await parseJson(response);
|
||||
reset({ login: payload?.user?.email ?? data.login, password: '', remember: false });
|
||||
setHasTriedSubmit(false);
|
||||
post('/login', {
|
||||
preserveScroll: true,
|
||||
onSuccess: () => {
|
||||
if (onSuccess) {
|
||||
onSuccess(payload);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.status === 422) {
|
||||
const body = await parseJson(response);
|
||||
const validationErrors = body.errors ?? {};
|
||||
let fallbackMessage: string | null = body.message ?? null;
|
||||
|
||||
Object.entries(validationErrors as Record<string, string | string[]>).forEach(([key, value]) => {
|
||||
const message = Array.isArray(value) ? value[0] : value;
|
||||
if (typeof message === 'string') {
|
||||
setError(key as keyof typeof data, message);
|
||||
if (!fallbackMessage) {
|
||||
fallbackMessage = message;
|
||||
}
|
||||
onSuccess({ user: { email: data.email } }); // Pass basic user info; full user from props in parent
|
||||
}
|
||||
reset();
|
||||
},
|
||||
});
|
||||
|
||||
if (fallbackMessage) {
|
||||
setFormError(fallbackMessage);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
setFormError(t('login.generic_error', { defaultValue: 'Login failed. Please try again.' }));
|
||||
} catch (error) {
|
||||
setFormError(t('login.generic_error', { defaultValue: 'Login failed. Please try again.' }));
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
@@ -125,27 +57,26 @@ export default function LoginForm({ onSuccess, canResetPassword = true }: LoginF
|
||||
}, [errors, hasTriedSubmit]);
|
||||
|
||||
return (
|
||||
<form className="flex flex-col gap-6" onSubmit={handleSubmit} noValidate>
|
||||
<div className="flex flex-col gap-6">
|
||||
<div className="grid gap-6">
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="login">{t('login.email')}</Label>
|
||||
<Label htmlFor="email">{t('login.email')}</Label>
|
||||
<Input
|
||||
id="login"
|
||||
type="text"
|
||||
name="login"
|
||||
autoComplete="username"
|
||||
id="email"
|
||||
type="email"
|
||||
name="email"
|
||||
required
|
||||
autoFocus
|
||||
placeholder={t('login.email_placeholder')}
|
||||
value={data.login}
|
||||
onChange={(event) => {
|
||||
setData('login', event.target.value);
|
||||
if (errors.login) {
|
||||
clearErrors('login');
|
||||
value={data.email}
|
||||
onChange={(e) => {
|
||||
setData('email', e.target.value);
|
||||
if (errors.email) {
|
||||
clearErrors('email');
|
||||
}
|
||||
}}
|
||||
/>
|
||||
<InputError message={errors.login} />
|
||||
<InputError message={errors.email} />
|
||||
</div>
|
||||
|
||||
<div className="grid gap-2">
|
||||
@@ -161,12 +92,11 @@ export default function LoginForm({ onSuccess, canResetPassword = true }: LoginF
|
||||
id="password"
|
||||
type="password"
|
||||
name="password"
|
||||
autoComplete="current-password"
|
||||
required
|
||||
placeholder={t('login.password_placeholder')}
|
||||
value={data.password}
|
||||
onChange={(event) => {
|
||||
setData('password', event.target.value);
|
||||
onChange={(e) => {
|
||||
setData('password', e.target.value);
|
||||
if (errors.password) {
|
||||
clearErrors('password');
|
||||
}
|
||||
@@ -185,19 +115,19 @@ export default function LoginForm({ onSuccess, canResetPassword = true }: LoginF
|
||||
<Label htmlFor="remember">{t('login.remember')}</Label>
|
||||
</div>
|
||||
|
||||
<Button type="submit" className="w-full" disabled={submitting}>
|
||||
{submitting && <LoaderCircle className="h-4 w-4 animate-spin mr-2" />}
|
||||
<Button type="button" onClick={submit} className="w-full" disabled={processing}>
|
||||
{processing && <LoaderCircle className="h-4 w-4 animate-spin mr-2" />}
|
||||
{t('login.submit')}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{(formError || Object.keys(errors).length > 0) && (
|
||||
<Alert variant="destructive">
|
||||
<AlertDescription>
|
||||
{formError || Object.values(errors).join(' ')}
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
{Object.keys(errors).length > 0 && (
|
||||
<div className="p-4 bg-red-50 border border-red-200 rounded-md">
|
||||
<p className="text-sm text-red-800">
|
||||
{Object.values(errors).join(' ')}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,25 +1,21 @@
|
||||
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useForm } from '@inertiajs/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { LoaderCircle, User, Mail, Phone, Lock, MapPin } from 'lucide-react';
|
||||
import { Dialog, DialogContent, DialogDescription, DialogTitle } from '@/components/ui/dialog';
|
||||
import { Alert, AlertDescription } from '@/components/ui/alert';
|
||||
import { Dialog, DialogContent, DialogTitle, DialogDescription } from '@/components/ui/dialog';
|
||||
|
||||
interface RegisterFormProps {
|
||||
packageId?: number;
|
||||
onSuccess?: (payload: any) => void;
|
||||
onSuccess?: (userData: any) => void;
|
||||
privacyHtml: string;
|
||||
}
|
||||
|
||||
const getCsrfToken = () =>
|
||||
(document.querySelector('meta[name="csrf-token"]') as HTMLMetaElement | null)?.content ?? '';
|
||||
|
||||
export default function RegisterForm({ packageId, onSuccess, privacyHtml }: RegisterFormProps) {
|
||||
const [privacyOpen, setPrivacyOpen] = useState(false);
|
||||
const [hasTriedSubmit, setHasTriedSubmit] = useState(false);
|
||||
const { t } = useTranslation(['auth', 'common']);
|
||||
const csrfToken = useMemo(getCsrfToken, []);
|
||||
|
||||
const { data, setData, errors, setError, clearErrors, reset } = useForm({
|
||||
const { data, setData, post, processing, errors, clearErrors, reset } = useForm({
|
||||
username: '',
|
||||
email: '',
|
||||
password: '',
|
||||
@@ -29,17 +25,22 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
address: '',
|
||||
phone: '',
|
||||
privacy_consent: false,
|
||||
package_id: packageId ?? null,
|
||||
package_id: packageId || null,
|
||||
});
|
||||
|
||||
const [privacyOpen, setPrivacyOpen] = useState(false);
|
||||
const [hasTriedSubmit, setHasTriedSubmit] = useState(false);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [formError, setFormError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
setData('package_id', packageId ?? null);
|
||||
}, [packageId]);
|
||||
const submit = (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setHasTriedSubmit(true);
|
||||
post('/register', {
|
||||
preserveScroll: true,
|
||||
onSuccess: (page) => {
|
||||
if (onSuccess) {
|
||||
onSuccess((page as any).props.auth.user);
|
||||
}
|
||||
reset();
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (!hasTriedSubmit) {
|
||||
@@ -60,91 +61,8 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
}
|
||||
}, [errors, hasTriedSubmit]);
|
||||
|
||||
const parseJson = async (response: Response) => {
|
||||
if (response.headers.get('Content-Type')?.includes('application/json')) {
|
||||
const json = await response.json().catch(() => null);
|
||||
if (json) return json;
|
||||
}
|
||||
|
||||
const text = await response.text();
|
||||
throw new Error(text || 'Invalid server response (unexpected end of data or non-JSON).');
|
||||
};
|
||||
|
||||
const submit = async (event: React.FormEvent<HTMLFormElement>) => {
|
||||
event.preventDefault();
|
||||
setHasTriedSubmit(true);
|
||||
setSubmitting(true);
|
||||
setFormError(null);
|
||||
clearErrors();
|
||||
|
||||
try {
|
||||
const response = await fetch('/purchase/auth/register', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Accept: 'application/json',
|
||||
'X-CSRF-TOKEN': csrfToken,
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
...data,
|
||||
privacy_consent: Boolean(data.privacy_consent),
|
||||
}),
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const payload = await parseJson(response);
|
||||
reset({
|
||||
username: '',
|
||||
email: '',
|
||||
password: '',
|
||||
password_confirmation: '',
|
||||
first_name: '',
|
||||
last_name: '',
|
||||
address: '',
|
||||
phone: '',
|
||||
privacy_consent: false,
|
||||
package_id: packageId ?? null,
|
||||
});
|
||||
setHasTriedSubmit(false);
|
||||
if (onSuccess) {
|
||||
onSuccess(payload);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.status === 422) {
|
||||
const body = await parseJson(response);
|
||||
const validationErrors = body.errors ?? {};
|
||||
let fallbackMessage: string | null = body.message ?? null;
|
||||
|
||||
Object.entries(validationErrors).forEach(([key, value]) => {
|
||||
const message = Array.isArray(value) ? value[0] : value;
|
||||
if (typeof message === 'string') {
|
||||
setError(key, message);
|
||||
if (!fallbackMessage) {
|
||||
fallbackMessage = message;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (fallbackMessage) {
|
||||
setFormError(fallbackMessage);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
setFormError(t('register.generic_error', { defaultValue: 'Registrierung fehlgeschlagen. Bitte versuche es erneut.' }));
|
||||
} catch (error) {
|
||||
const message = (error as Error).message || t('register.generic_error', { defaultValue: 'Registrierung fehlgeschlagen. Bitte versuche es erneut.' });
|
||||
setFormError(message);
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<form className="space-y-6" onSubmit={submit} noValidate>
|
||||
<div className="space-y-6">
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div className="md:col-span-1">
|
||||
<label htmlFor="first_name" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
@@ -158,9 +76,9 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
type="text"
|
||||
required
|
||||
value={data.first_name}
|
||||
onChange={(event) => {
|
||||
setData('first_name', event.target.value);
|
||||
if (errors.first_name) {
|
||||
onChange={(e) => {
|
||||
setData('first_name', e.target.value);
|
||||
if (e.target.value.trim() && errors.first_name) {
|
||||
clearErrors('first_name');
|
||||
}
|
||||
}}
|
||||
@@ -183,9 +101,9 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
type="text"
|
||||
required
|
||||
value={data.last_name}
|
||||
onChange={(event) => {
|
||||
setData('last_name', event.target.value);
|
||||
if (errors.last_name) {
|
||||
onChange={(e) => {
|
||||
setData('last_name', e.target.value);
|
||||
if (e.target.value.trim() && errors.last_name) {
|
||||
clearErrors('last_name');
|
||||
}
|
||||
}}
|
||||
@@ -208,9 +126,9 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
type="email"
|
||||
required
|
||||
value={data.email}
|
||||
onChange={(event) => {
|
||||
setData('email', event.target.value);
|
||||
if (errors.email) {
|
||||
onChange={(e) => {
|
||||
setData('email', e.target.value);
|
||||
if (e.target.value.trim() && errors.email) {
|
||||
clearErrors('email');
|
||||
}
|
||||
}}
|
||||
@@ -221,29 +139,29 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
{errors.email && <p className="text-sm text-red-600 mt-1">{errors.email}</p>}
|
||||
</div>
|
||||
|
||||
<div className="md:col-span-1">
|
||||
<label htmlFor="username" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t('register.username')} {t('common:required')}
|
||||
<div className="md:col-span-2">
|
||||
<label htmlFor="address" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t('register.address')} {t('common:required')}
|
||||
</label>
|
||||
<div className="relative">
|
||||
<User className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
|
||||
<MapPin className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
|
||||
<input
|
||||
id="username"
|
||||
name="username"
|
||||
id="address"
|
||||
name="address"
|
||||
type="text"
|
||||
required
|
||||
value={data.username}
|
||||
onChange={(event) => {
|
||||
setData('username', event.target.value);
|
||||
if (errors.username) {
|
||||
clearErrors('username');
|
||||
value={data.address}
|
||||
onChange={(e) => {
|
||||
setData('address', e.target.value);
|
||||
if (e.target.value.trim() && errors.address) {
|
||||
clearErrors('address');
|
||||
}
|
||||
}}
|
||||
className={`block w-full pl-10 pr-3 py-3 border rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-[#FFB6C1] focus:border-[#FFB6C1] sm:text-sm ${errors.username ? 'border-red-500' : 'border-gray-300'}`}
|
||||
placeholder={t('register.username_placeholder')}
|
||||
className={`block w-full pl-10 pr-3 py-3 border rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-[#FFB6C1] focus:border-[#FFB6C1] sm:text-sm ${errors.address ? 'border-red-500' : 'border-gray-300'}`}
|
||||
placeholder={t('register.address_placeholder')}
|
||||
/>
|
||||
</div>
|
||||
{errors.username && <p className="text-sm text-red-600 mt-1">{errors.username}</p>}
|
||||
{errors.address && <p className="text-sm text-red-600 mt-1">{errors.address}</p>}
|
||||
</div>
|
||||
|
||||
<div className="md:col-span-1">
|
||||
@@ -258,9 +176,9 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
type="tel"
|
||||
required
|
||||
value={data.phone}
|
||||
onChange={(event) => {
|
||||
setData('phone', event.target.value);
|
||||
if (errors.phone) {
|
||||
onChange={(e) => {
|
||||
setData('phone', e.target.value);
|
||||
if (e.target.value.trim() && errors.phone) {
|
||||
clearErrors('phone');
|
||||
}
|
||||
}}
|
||||
@@ -271,28 +189,29 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
{errors.phone && <p className="text-sm text-red-600 mt-1">{errors.phone}</p>}
|
||||
</div>
|
||||
|
||||
<div className="md:col-span-2">
|
||||
<label htmlFor="address" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t('register.address')} {t('common:required')}
|
||||
<div className="md:col-span-1">
|
||||
<label htmlFor="username" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t('register.username')} {t('common:required')}
|
||||
</label>
|
||||
<div className="relative">
|
||||
<MapPin className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
|
||||
<textarea
|
||||
id="address"
|
||||
name="address"
|
||||
<User className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 w-5 h-5" />
|
||||
<input
|
||||
id="username"
|
||||
name="username"
|
||||
type="text"
|
||||
required
|
||||
value={data.address}
|
||||
onChange={(event) => {
|
||||
setData('address', event.target.value);
|
||||
if (errors.address) {
|
||||
clearErrors('address');
|
||||
value={data.username}
|
||||
onChange={(e) => {
|
||||
setData('username', e.target.value);
|
||||
if (e.target.value.trim() && errors.username) {
|
||||
clearErrors('username');
|
||||
}
|
||||
}}
|
||||
className={`block w-full pl-10 pr-3 py-3 border rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-[#FFB6C1] focus:border-[#FFB6C1] sm:text-sm ${errors.address ? 'border-red-500' : 'border-gray-300'}`}
|
||||
placeholder={t('register.address_placeholder')}
|
||||
className={`block w-full pl-10 pr-3 py-3 border rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-[#FFB6C1] focus:border-[#FFB6C1] sm:text-sm ${errors.username ? 'border-red-500' : 'border-gray-300'}`}
|
||||
placeholder={t('register.username_placeholder')}
|
||||
/>
|
||||
</div>
|
||||
{errors.address && <p className="text-sm text-red-600 mt-1">{errors.address}</p>}
|
||||
{errors.username && <p className="text-sm text-red-600 mt-1">{errors.username}</p>}
|
||||
</div>
|
||||
|
||||
<div className="md:col-span-1">
|
||||
@@ -307,12 +226,12 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
type="password"
|
||||
required
|
||||
value={data.password}
|
||||
onChange={(event) => {
|
||||
setData('password', event.target.value);
|
||||
if (errors.password) {
|
||||
onChange={(e) => {
|
||||
setData('password', e.target.value);
|
||||
if (e.target.value.trim() && errors.password) {
|
||||
clearErrors('password');
|
||||
}
|
||||
if (data.password_confirmation && event.target.value === data.password_confirmation) {
|
||||
if (data.password_confirmation && e.target.value === data.password_confirmation) {
|
||||
clearErrors('password_confirmation');
|
||||
}
|
||||
}}
|
||||
@@ -335,12 +254,12 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
type="password"
|
||||
required
|
||||
value={data.password_confirmation}
|
||||
onChange={(event) => {
|
||||
setData('password_confirmation', event.target.value);
|
||||
if (errors.password_confirmation) {
|
||||
onChange={(e) => {
|
||||
setData('password_confirmation', e.target.value);
|
||||
if (e.target.value.trim() && errors.password_confirmation) {
|
||||
clearErrors('password_confirmation');
|
||||
}
|
||||
if (data.password && event.target.value === data.password) {
|
||||
if (data.password && e.target.value === data.password) {
|
||||
clearErrors('password_confirmation');
|
||||
}
|
||||
}}
|
||||
@@ -358,9 +277,9 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
type="checkbox"
|
||||
required
|
||||
checked={data.privacy_consent}
|
||||
onChange={(event) => {
|
||||
setData('privacy_consent', event.target.checked);
|
||||
if (event.target.checked && errors.privacy_consent) {
|
||||
onChange={(e) => {
|
||||
setData('privacy_consent', e.target.checked);
|
||||
if (e.target.checked && errors.privacy_consent) {
|
||||
clearErrors('privacy_consent');
|
||||
}
|
||||
}}
|
||||
@@ -380,33 +299,38 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml }: Regi
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{(formError || Object.keys(errors).length > 0) && (
|
||||
<Alert>
|
||||
{formError && <AlertDescription>{formError}</AlertDescription>}
|
||||
{Object.keys(errors).length > 0 && !formError && (
|
||||
<AlertDescription>{Object.values(errors).join(' ')}</AlertDescription>
|
||||
)}
|
||||
</Alert>
|
||||
{Object.keys(errors).length > 0 && (
|
||||
<div className="p-4 bg-red-50 border border-red-200 rounded-md mb-6">
|
||||
<h4 className="text-sm font-medium text-red-800 mb-2">{t('register.errors_title')}</h4>
|
||||
<ul className="text-sm text-red-800 space-y-1">
|
||||
{Object.entries(errors).map(([key, value]) => (
|
||||
<li key={key} className="flex items-start">
|
||||
<span className="font-medium">{t(`register.errors.${key}`)}:</span> {value}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={submitting}
|
||||
type="button"
|
||||
onClick={submit}
|
||||
disabled={processing}
|
||||
className="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm font-medium rounded-md text-white bg-[#FFB6C1] hover:bg-[#FF69B4] focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[#FFB6C1] transition duration-300 disabled:opacity-50"
|
||||
>
|
||||
{submitting && <LoaderCircle className="h-4 w-4 animate-spin mr-2" />}
|
||||
{processing && <LoaderCircle className="h-4 w-4 animate-spin mr-2" />}
|
||||
{t('register.submit')}
|
||||
</button>
|
||||
|
||||
<Dialog open={privacyOpen} onOpenChange={setPrivacyOpen}>
|
||||
<DialogContent className="max-w-4xl max-h-[80vh] overflow-y-auto p-0">
|
||||
<DialogTitle className="sr-only">Datenschutzerkl<EFBFBD>rung</DialogTitle>
|
||||
<DialogDescription className="sr-only">Lesen Sie unsere Datenschutzerkl<EFBFBD>rung.</DialogDescription>
|
||||
<DialogTitle className="sr-only">Datenschutzerklärung</DialogTitle>
|
||||
<DialogDescription className="sr-only">Lesen Sie unsere Datenschutzerklärung.</DialogDescription>
|
||||
<div className="p-6">
|
||||
<div dangerouslySetInnerHTML={{ __html: privacyHtml }} />
|
||||
</div>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,286 +1,92 @@
|
||||
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Elements, CardElement, useElements, useStripe } from '@stripe/react-stripe-js';
|
||||
import type { Stripe as StripeInstance } from '@stripe/stripe-js';
|
||||
import React from 'react';
|
||||
import { CardElement, useStripe, useElements } from '@stripe/react-stripe-js';
|
||||
import { useForm } from '@inertiajs/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||
import { Alert, AlertDescription } from '@/components/ui/alert';
|
||||
import { Loader2 } from 'lucide-react';
|
||||
|
||||
type StripePromise = Promise<StripeInstance | null>;
|
||||
import { Alert, AlertDescription } from '@/components/ui/alert';
|
||||
|
||||
interface PaymentFormProps {
|
||||
packageId: number;
|
||||
packageName: string;
|
||||
price: number;
|
||||
currency?: string;
|
||||
stripePromise: StripePromise;
|
||||
paypalClientId?: string | null;
|
||||
onSuccess: () => void;
|
||||
onSuccess?: () => void;
|
||||
}
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
paypal?: any;
|
||||
}
|
||||
}
|
||||
|
||||
const formatCurrency = (value: number, currency = 'EUR') =>
|
||||
new Intl.NumberFormat('de-DE', {
|
||||
style: 'currency',
|
||||
currency,
|
||||
}).format(value);
|
||||
|
||||
const getCsrfToken = () =>
|
||||
(document.querySelector('meta[name="csrf-token"]') as HTMLMetaElement | null)?.content ?? '';
|
||||
|
||||
async function postJson<T>(url: string, body: unknown, csrfToken: string): Promise<T> {
|
||||
const response = await fetch(url, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json',
|
||||
'X-CSRF-TOKEN': csrfToken,
|
||||
},
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
|
||||
if (response.status === 204) {
|
||||
return {} as T;
|
||||
}
|
||||
|
||||
const data = await response.json().catch(() => ({}));
|
||||
|
||||
if (!response.ok) {
|
||||
const message = (data as { message?: string; error?: string }).message ?? (data as { message?: string; error?: string }).error ?? 'Request failed.';
|
||||
throw new Error(message);
|
||||
}
|
||||
|
||||
return data as T;
|
||||
}
|
||||
|
||||
export default function PaymentForm({
|
||||
packageId,
|
||||
packageName,
|
||||
price,
|
||||
currency = 'EUR',
|
||||
stripePromise,
|
||||
paypalClientId,
|
||||
onSuccess,
|
||||
}: PaymentFormProps) {
|
||||
const { t } = useTranslation('marketing');
|
||||
const csrfToken = useMemo(getCsrfToken, []);
|
||||
const [provider, setProvider] = useState<'stripe' | 'paypal'>('stripe');
|
||||
const [statusMessage, setStatusMessage] = useState<string | null>(null);
|
||||
const [errorMessage, setErrorMessage] = useState<string | null>(null);
|
||||
const [freeStatus, setFreeStatus] = useState<'idle' | 'loading' | 'done' | 'error'>('idle');
|
||||
|
||||
useEffect(() => {
|
||||
setErrorMessage(null);
|
||||
setStatusMessage(null);
|
||||
}, [provider]);
|
||||
|
||||
useEffect(() => {
|
||||
if (price === 0 && freeStatus === 'idle') {
|
||||
const assignFree = async () => {
|
||||
try {
|
||||
setFreeStatus('loading');
|
||||
await postJson<{ status: string }>('/purchase/free', { package_id: packageId }, csrfToken);
|
||||
setFreeStatus('done');
|
||||
setStatusMessage(
|
||||
t('payment.free_assigned', {
|
||||
defaultValue: 'Kostenloses Paket wurde zugewiesen.',
|
||||
package: packageName,
|
||||
})
|
||||
);
|
||||
onSuccess();
|
||||
} catch (error) {
|
||||
setFreeStatus('error');
|
||||
setErrorMessage((error as Error).message ?? 'Free package assignment failed.');
|
||||
}
|
||||
};
|
||||
|
||||
assignFree();
|
||||
}
|
||||
}, [csrfToken, freeStatus, onSuccess, packageId, packageName, price, t]);
|
||||
|
||||
if (price === 0) {
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>{t('payment.title', { defaultValue: 'Zahlung' })}</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
{freeStatus === 'loading' && (
|
||||
<div className="flex items-center space-x-2 text-sm text-gray-600">
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
<span>{t('payment.processing_free', { defaultValue: 'Paket wird freigeschaltet <20>' })}</span>
|
||||
</div>
|
||||
)}
|
||||
{statusMessage && (
|
||||
<Alert variant="success">
|
||||
<AlertDescription>{statusMessage}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
{errorMessage && (
|
||||
<Alert variant="destructive">
|
||||
<AlertDescription>{errorMessage}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>{t('payment.title', { defaultValue: 'Zahlung' })}</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-6">
|
||||
<div className="flex items-center justify-between flex-wrap gap-3">
|
||||
<div>
|
||||
<p className="text-sm text-gray-500">{t('payment.total_due', { defaultValue: 'Gesamtbetrag' })}</p>
|
||||
<p className="text-lg font-semibold">{formatCurrency(price, currency)}</p>
|
||||
</div>
|
||||
<div className="inline-flex rounded-md shadow-sm" role="group">
|
||||
<Button
|
||||
type="button"
|
||||
variant={provider === 'stripe' ? 'default' : 'outline'}
|
||||
onClick={() => setProvider('stripe')}
|
||||
>
|
||||
Stripe
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant={provider === 'paypal' ? 'default' : 'outline'}
|
||||
onClick={() => setProvider('paypal')}
|
||||
>
|
||||
PayPal
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{provider === 'stripe' ? (
|
||||
<Elements stripe={stripePromise} options={{ appearance: { theme: 'stripe' } }}>
|
||||
<StripeCardForm
|
||||
packageId={packageId}
|
||||
csrfToken={csrfToken}
|
||||
amountLabel={formatCurrency(price, currency)}
|
||||
onSuccess={() => {
|
||||
setStatusMessage(t('payment.success_stripe', { defaultValue: 'Stripe-Zahlung erfolgreich.' }));
|
||||
onSuccess();
|
||||
}}
|
||||
onError={(message) => setErrorMessage(message)}
|
||||
/>
|
||||
</Elements>
|
||||
) : (
|
||||
<PayPalSection
|
||||
packageId={packageId}
|
||||
amount={price}
|
||||
currency={currency}
|
||||
clientId={paypalClientId}
|
||||
csrfToken={csrfToken}
|
||||
onSuccess={() => {
|
||||
setStatusMessage(t('payment.success_paypal', { defaultValue: 'PayPal-Zahlung erfolgreich.' }));
|
||||
onSuccess();
|
||||
}}
|
||||
onError={(message) => setErrorMessage(message)}
|
||||
/>
|
||||
)}
|
||||
|
||||
{statusMessage && (
|
||||
<Alert variant="success">
|
||||
<AlertDescription>{statusMessage}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{errorMessage && (
|
||||
<Alert variant="destructive">
|
||||
<AlertDescription>{errorMessage}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
interface StripeCardFormProps {
|
||||
packageId: number;
|
||||
csrfToken: string;
|
||||
amountLabel: string;
|
||||
onSuccess: () => void;
|
||||
onError: (message: string) => void;
|
||||
}
|
||||
|
||||
const StripeCardForm: React.FC<StripeCardFormProps> = ({ packageId, csrfToken, amountLabel, onSuccess, onError }) => {
|
||||
const { t } = useTranslation('marketing');
|
||||
export default function PaymentForm({ packageId, onSuccess }: PaymentFormProps) {
|
||||
const stripe = useStripe();
|
||||
const elements = useElements();
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const [localError, setLocalError] = useState<string | null>(null);
|
||||
const { t } = useTranslation('marketing');
|
||||
const { data, setData, post, processing, errors, setError } = useForm({
|
||||
package_id: packageId,
|
||||
payment_method_id: '',
|
||||
});
|
||||
|
||||
const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
|
||||
event.preventDefault();
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
if (!stripe || !elements) {
|
||||
return;
|
||||
}
|
||||
|
||||
const cardElement = elements.getElement(CardElement);
|
||||
|
||||
if (!cardElement) {
|
||||
setLocalError('Card element not found.');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
setIsSubmitting(true);
|
||||
setLocalError(null);
|
||||
|
||||
const { client_secret: clientSecret, payment_intent_id: paymentIntentId } = await postJson<{
|
||||
client_secret: string;
|
||||
payment_intent_id: string;
|
||||
}>('/purchase/stripe/intent', { package_id: packageId }, csrfToken);
|
||||
|
||||
const confirmation = await stripe.confirmCardPayment(clientSecret, {
|
||||
payment_method: {
|
||||
const { error, paymentMethod } = await stripe.createPaymentMethod({
|
||||
type: 'card',
|
||||
card: cardElement,
|
||||
},
|
||||
});
|
||||
|
||||
if (confirmation.error) {
|
||||
throw new Error(confirmation.error.message || 'Card confirmation failed.');
|
||||
if (error) {
|
||||
setError('payment', error.message || 'Payment failed');
|
||||
return;
|
||||
}
|
||||
|
||||
if (confirmation.paymentIntent?.status !== 'succeeded') {
|
||||
throw new Error('Stripe did not confirm the payment.');
|
||||
setData('payment_method_id', paymentMethod.id);
|
||||
|
||||
const { error: confirmError } = await stripe.confirmCardPayment('/api/purchase/payment-intent', {
|
||||
payment_method: paymentMethod.id,
|
||||
});
|
||||
|
||||
if (confirmError) {
|
||||
setError('payment', confirmError.message || 'Payment confirmation failed');
|
||||
return;
|
||||
}
|
||||
|
||||
await postJson('/purchase/stripe/complete', {
|
||||
post('/api/purchase/complete', {
|
||||
package_id: packageId,
|
||||
payment_intent_id: confirmation.paymentIntent.id || paymentIntentId,
|
||||
}, csrfToken);
|
||||
|
||||
preserveScroll: true,
|
||||
onSuccess: () => {
|
||||
if (onSuccess) {
|
||||
onSuccess();
|
||||
} catch (error) {
|
||||
const message = (error as Error).message || 'Stripe payment failed.';
|
||||
setLocalError(message);
|
||||
onError(message);
|
||||
} finally {
|
||||
setIsSubmitting(false);
|
||||
}
|
||||
},
|
||||
onError: (err) => {
|
||||
setError('payment', err.payment || 'Payment error');
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
if (!stripe || !elements) {
|
||||
return <div>Loading Stripe...</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>{t('payment.title')}</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
<form onSubmit={handleSubmit} className="space-y-4">
|
||||
<div className="space-y-2">
|
||||
<label htmlFor="card-element" className="text-sm font-medium">
|
||||
{t('payment.card_details', { defaultValue: 'Kartendaten' })}
|
||||
{t('payment.card_details')}
|
||||
</label>
|
||||
<div className="p-3 border border-gray-300 rounded-md">
|
||||
<CardElement
|
||||
options={{
|
||||
hidePostalCode: true,
|
||||
style: {
|
||||
base: {
|
||||
fontSize: '16px',
|
||||
@@ -293,158 +99,14 @@ const StripeCardForm: React.FC<StripeCardFormProps> = ({ packageId, csrfToken, a
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{localError && (
|
||||
<Alert variant="destructive">
|
||||
<AlertDescription>{localError}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
{errors.payment && <Alert variant="destructive"><AlertDescription>{errors.payment}</AlertDescription></Alert>}
|
||||
</div>
|
||||
<Button type="submit" className="w-full" disabled={!stripe || isSubmitting}>
|
||||
{isSubmitting && <Loader2 className="h-4 w-4 animate-spin mr-2" />}
|
||||
{t('payment.submit', {
|
||||
defaultValue: 'Jetzt bezahlen',
|
||||
price: amountLabel,
|
||||
})}
|
||||
<Button type="submit" className="w-full" disabled={!stripe || processing}>
|
||||
{processing ? <Loader2 className="h-4 w-4 animate-spin mr-2" /> : null}
|
||||
{t('payment.submit', { price: 'XX €' })} {/* Replace with actual price */}
|
||||
</Button>
|
||||
</form>
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
};
|
||||
|
||||
interface PayPalSectionProps {
|
||||
packageId: number;
|
||||
amount: number;
|
||||
currency: string;
|
||||
clientId?: string | null;
|
||||
csrfToken: string;
|
||||
onSuccess: () => void;
|
||||
onError: (message: string) => void;
|
||||
}
|
||||
|
||||
const PayPalSection: React.FC<PayPalSectionProps> = ({
|
||||
packageId,
|
||||
amount,
|
||||
currency,
|
||||
clientId,
|
||||
csrfToken,
|
||||
onSuccess,
|
||||
onError,
|
||||
}) => {
|
||||
const { t } = useTranslation('marketing');
|
||||
const containerRef = useRef<HTMLDivElement | null>(null);
|
||||
const [isSdkReady, setIsSdkReady] = useState(false);
|
||||
const [isProcessing, setIsProcessing] = useState(false);
|
||||
const [localError, setLocalError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!clientId) {
|
||||
const message = t('payment.paypal_missing_key', { defaultValue: 'PayPal ist derzeit nicht konfiguriert.' });
|
||||
setLocalError(message);
|
||||
onError(message);
|
||||
return;
|
||||
}
|
||||
|
||||
if (window.paypal) {
|
||||
setIsSdkReady(true);
|
||||
return;
|
||||
}
|
||||
|
||||
const script = document.createElement('script');
|
||||
script.src = `https://www.paypal.com/sdk/js?client-id=${clientId}¤cy=${currency}&intent=capture&components=buttons`;
|
||||
script.async = true;
|
||||
script.onload = () => setIsSdkReady(true);
|
||||
script.onerror = () => {
|
||||
const message = t('payment.paypal_sdk_failed', { defaultValue: 'PayPal-SDK konnte nicht geladen werden.' });
|
||||
setLocalError(message);
|
||||
onError(message);
|
||||
};
|
||||
document.body.appendChild(script);
|
||||
|
||||
return () => {
|
||||
script.remove();
|
||||
};
|
||||
}, [clientId, currency, onError, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!isSdkReady || !window.paypal || !containerRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
const buttons = window.paypal.Buttons({
|
||||
style: {
|
||||
layout: 'vertical',
|
||||
color: 'gold',
|
||||
shape: 'rect',
|
||||
},
|
||||
createOrder: async () => {
|
||||
try {
|
||||
setIsProcessing(true);
|
||||
const { order_id: orderId } = await postJson<{ order_id: string }>('/purchase/paypal/order', {
|
||||
package_id: packageId,
|
||||
}, csrfToken);
|
||||
return orderId;
|
||||
} catch (error) {
|
||||
const message = (error as Error).message || 'PayPal order creation failed.';
|
||||
setLocalError(message);
|
||||
onError(message);
|
||||
setIsProcessing(false);
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
onApprove: async (data: { orderID: string }) => {
|
||||
try {
|
||||
await postJson('/purchase/paypal/capture', {
|
||||
order_id: data.orderID,
|
||||
package_id: packageId,
|
||||
}, csrfToken);
|
||||
setIsProcessing(false);
|
||||
setLocalError(null);
|
||||
onSuccess();
|
||||
} catch (error) {
|
||||
const message = (error as Error).message || 'PayPal capture failed.';
|
||||
setLocalError(message);
|
||||
onError(message);
|
||||
setIsProcessing(false);
|
||||
}
|
||||
},
|
||||
onError: (error: Error) => {
|
||||
const message = error?.message || 'PayPal payment failed.';
|
||||
setLocalError(message);
|
||||
onError(message);
|
||||
setIsProcessing(false);
|
||||
},
|
||||
});
|
||||
|
||||
buttons.render(containerRef.current);
|
||||
|
||||
return () => {
|
||||
try {
|
||||
buttons.close();
|
||||
} catch (error) {
|
||||
// ignore close errors
|
||||
}
|
||||
};
|
||||
}, [csrfToken, isSdkReady, onError, onSuccess, packageId]);
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<div ref={containerRef} />
|
||||
{isProcessing && (
|
||||
<div className="flex items-center space-x-2 text-sm text-gray-600">
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
<span>{t('payment.processing_paypal', { defaultValue: 'PayPal-Zahlung wird verarbeitet <20>' })}</span>
|
||||
</div>
|
||||
)}
|
||||
{localError && (
|
||||
<Alert variant="destructive">
|
||||
<AlertDescription>{localError}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
<p className="text-xs text-gray-500">
|
||||
{t('payment.paypal_hint', {
|
||||
defaultValue: 'Der Betrag von {{amount}} wird bei PayPal angezeigt.',
|
||||
amount: formatCurrency(amount, currency),
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { Head, usePage } from '@inertiajs/react';
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { Head, useForm, usePage, router } from '@inertiajs/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Elements } from '@stripe/react-stripe-js';
|
||||
import { loadStripe } from '@stripe/stripe-js';
|
||||
import { Steps } from '@/components/ui/steps';
|
||||
import { Steps } from '@/components/ui/steps'; // Assume Shadcn Steps component; add if needed via shadcn
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
|
||||
import { Progress } from '@/components/ui/progress';
|
||||
import { Alert, AlertDescription } from '@/components/ui/alert';
|
||||
import { Loader2 } from 'lucide-react';
|
||||
import MarketingLayout from '@/layouts/marketing/MarketingLayout';
|
||||
import RegisterForm from '../auth/RegisterForm';
|
||||
import LoginForm from '../auth/LoginForm';
|
||||
import PaymentForm from './PaymentForm';
|
||||
import SuccessStep from './SuccessStep';
|
||||
import RegisterForm from '../auth/RegisterForm'; // Extract Register form to separate component
|
||||
import LoginForm from '../auth/LoginForm'; // Extract Login form
|
||||
import PaymentForm from './PaymentForm'; // New component for Stripe payment
|
||||
import SuccessStep from './SuccessStep'; // New component for success
|
||||
|
||||
interface Package {
|
||||
id: number;
|
||||
@@ -19,275 +20,140 @@ interface Package {
|
||||
description: string;
|
||||
price: number;
|
||||
features: string[];
|
||||
// Add other fields as needed
|
||||
}
|
||||
|
||||
interface PurchaseWizardProps {
|
||||
package: Package;
|
||||
stripePublishableKey: string;
|
||||
paypalClientId?: string | null;
|
||||
privacyHtml: string;
|
||||
}
|
||||
|
||||
type StepId = 'package' | 'auth' | 'payment' | 'success';
|
||||
|
||||
interface WizardUser {
|
||||
id: number;
|
||||
email: string;
|
||||
name?: string;
|
||||
pending_purchase?: boolean;
|
||||
email_verified?: boolean;
|
||||
}
|
||||
|
||||
interface AuthSuccessPayload {
|
||||
status: 'authenticated' | 'registered';
|
||||
user?: WizardUser;
|
||||
next_step?: StepId | 'verification';
|
||||
needs_verification?: boolean;
|
||||
package?: {
|
||||
id: number;
|
||||
name: string;
|
||||
price: number;
|
||||
type: string;
|
||||
} | null;
|
||||
}
|
||||
|
||||
const steps: Array<{ id: StepId; title: string; description: string }> = [
|
||||
{ id: 'package', title: 'Paket ausw<73>hlen', description: 'Best<73>tigen Sie Ihr gew<65>hltes Paket' },
|
||||
const steps = [
|
||||
{ id: 'package', title: 'Paket auswählen', description: 'Bestätigen Sie Ihr gewähltes Paket' },
|
||||
{ id: 'auth', title: 'Anmelden oder Registrieren', description: 'Erstellen oder melden Sie sich an' },
|
||||
{ id: 'payment', title: 'Zahlung', description: 'Sichern Sie Ihr Paket ab' },
|
||||
{ id: 'success', title: 'Erfolg', description: 'Willkommen!' },
|
||||
];
|
||||
|
||||
export default function PurchaseWizard({
|
||||
package: initialPackage,
|
||||
stripePublishableKey,
|
||||
paypalClientId,
|
||||
privacyHtml,
|
||||
}: PurchaseWizardProps) {
|
||||
export default function PurchaseWizard({ package: initialPackage, stripePublishableKey, privacyHtml }: PurchaseWizardProps) {
|
||||
const [currentStep, setCurrentStep] = useState(0);
|
||||
const [isAuthenticated, setIsAuthenticated] = useState(false);
|
||||
const [authType, setAuthType] = useState<'register' | 'login'>('register'); // Toggle for auth step
|
||||
const [wizardData, setWizardData] = useState({ package: initialPackage, user: null });
|
||||
const { t } = useTranslation(['marketing', 'auth']);
|
||||
const { props } = usePage();
|
||||
const serverUser = (props as any)?.auth?.user ?? null;
|
||||
|
||||
const [currentStepIndex, setCurrentStepIndex] = useState(0);
|
||||
const [authType, setAuthType] = useState<'register' | 'login'>('register');
|
||||
const [wizardUser, setWizardUser] = useState<WizardUser | null>(serverUser);
|
||||
const [authNotice, setAuthNotice] = useState<string | null>(null);
|
||||
|
||||
const isAuthenticated = Boolean(wizardUser);
|
||||
const { auth } = props as any;
|
||||
|
||||
useEffect(() => {
|
||||
if (serverUser) {
|
||||
setWizardUser(serverUser);
|
||||
if (auth.user) {
|
||||
setIsAuthenticated(true);
|
||||
setCurrentStep(2); // Skip to payment if already logged in
|
||||
}
|
||||
}, [serverUser ? serverUser.id : null]);
|
||||
}, [auth]);
|
||||
|
||||
const stripePromise = useMemo(() => loadStripe(stripePublishableKey), [stripePublishableKey]);
|
||||
const stripePromise = loadStripe(stripePublishableKey);
|
||||
|
||||
const goToStep = useCallback((stepId: StepId) => {
|
||||
const idx = steps.findIndex((step) => step.id === stepId);
|
||||
if (idx >= 0) {
|
||||
setCurrentStepIndex(idx);
|
||||
const nextStep = () => {
|
||||
if (currentStep < steps.length - 1) {
|
||||
setCurrentStep((prev) => prev + 1);
|
||||
}
|
||||
}, []);
|
||||
};
|
||||
|
||||
const handleContinue = useCallback(() => {
|
||||
let nextIndex = Math.min(currentStepIndex + 1, steps.length - 1);
|
||||
if (steps[nextIndex]?.id === 'auth' && isAuthenticated) {
|
||||
nextIndex = Math.min(nextIndex + 1, steps.length - 1);
|
||||
const prevStep = () => {
|
||||
if (currentStep > 0) {
|
||||
setCurrentStep((prev) => prev - 1);
|
||||
}
|
||||
setCurrentStepIndex(nextIndex);
|
||||
}, [currentStepIndex, isAuthenticated]);
|
||||
};
|
||||
|
||||
const handleBack = useCallback(() => {
|
||||
let nextIndex = Math.max(currentStepIndex - 1, 0);
|
||||
if (steps[nextIndex]?.id === 'auth' && isAuthenticated) {
|
||||
nextIndex = Math.max(nextIndex - 1, 0);
|
||||
}
|
||||
setCurrentStepIndex(nextIndex);
|
||||
}, [currentStepIndex, isAuthenticated]);
|
||||
const handleAuthSuccess = (userData: any) => {
|
||||
setWizardData((prev) => ({ ...prev, user: userData }));
|
||||
setIsAuthenticated(true);
|
||||
nextStep(); // Proceed to payment or success
|
||||
};
|
||||
|
||||
const handleAuthSuccess = useCallback(
|
||||
(payload: AuthSuccessPayload) => {
|
||||
if (payload?.user) {
|
||||
setWizardUser(payload.user);
|
||||
}
|
||||
const handlePaymentSuccess = () => {
|
||||
// Call API to assign package
|
||||
router.post('/api/purchase/complete', { package_id: initialPackage.id }, {
|
||||
onSuccess: () => nextStep(),
|
||||
});
|
||||
};
|
||||
|
||||
if (payload?.needs_verification) {
|
||||
setAuthNotice(t('auth:verify_notice', { defaultValue: 'Bitte best<73>tige deine E-Mail-Adresse, um fortzufahren.' }));
|
||||
} else {
|
||||
setAuthNotice(null);
|
||||
}
|
||||
|
||||
const next = payload?.next_step;
|
||||
if (next === 'success') {
|
||||
goToStep('success');
|
||||
} else {
|
||||
goToStep('payment');
|
||||
}
|
||||
},
|
||||
[goToStep, t],
|
||||
);
|
||||
|
||||
const handlePaymentSuccess = useCallback(() => {
|
||||
goToStep('success');
|
||||
}, [goToStep]);
|
||||
|
||||
const renderPackageStep = () => (
|
||||
const renderStepContent = () => {
|
||||
switch (steps[currentStep].id) {
|
||||
case 'package':
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>{initialPackage.name}</CardTitle>
|
||||
<CardDescription>{initialPackage.description}</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<p>
|
||||
{t('marketing:payment.price_label', { defaultValue: 'Preis' })}:
|
||||
{' '}
|
||||
{initialPackage.price === 0
|
||||
? t('marketing:payment.free', { defaultValue: 'Kostenlos' })
|
||||
: new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(initialPackage.price)}
|
||||
</p>
|
||||
<ul className="list-disc pl-5 mt-4 space-y-1">
|
||||
<p>Preis: {initialPackage.price === 0 ? 'Kostenlos' : `${initialPackage.price} €`}</p>
|
||||
<ul>
|
||||
{initialPackage.features.map((feature, index) => (
|
||||
<li key={index}>{feature}</li>
|
||||
))}
|
||||
</ul>
|
||||
<Button onClick={handleContinue} className="w-full mt-6">
|
||||
{t('marketing:payment.continue', { defaultValue: 'Weiter' })}
|
||||
</Button>
|
||||
<Button onClick={nextStep} className="w-full mt-4">Weiter</Button>
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
|
||||
const renderAuthStep = () => {
|
||||
if (isAuthenticated) {
|
||||
case 'auth':
|
||||
return (
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>{t('auth:already_authenticated', { defaultValue: 'Bereits angemeldet' })}</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
<Alert>
|
||||
<AlertDescription>
|
||||
{t('auth:logged_in_as', {
|
||||
defaultValue: 'Du bist angemeldet als {{email}}.',
|
||||
email: wizardUser?.email ?? wizardUser?.name ?? t('auth:user', { defaultValue: 'aktueller Nutzer' }),
|
||||
})}
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
{authNotice && (
|
||||
<Alert>
|
||||
<AlertDescription>{authNotice}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
<Button onClick={() => goToStep('payment')} className="w-full">
|
||||
{t('auth:skip_to_payment', { defaultValue: 'Weiter zur Zahlung' })}
|
||||
</Button>
|
||||
</CardContent>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<div className="flex justify-center gap-3">
|
||||
<div>
|
||||
<div className="flex justify-center mb-4">
|
||||
<Button
|
||||
variant={authType === 'register' ? 'default' : 'outline'}
|
||||
onClick={() => {
|
||||
setAuthType('register');
|
||||
setAuthNotice(null);
|
||||
}}
|
||||
onClick={() => setAuthType('register')}
|
||||
>
|
||||
{t('auth:register.title', { defaultValue: 'Registrieren' })}
|
||||
Registrieren
|
||||
</Button>
|
||||
<Button
|
||||
variant={authType === 'login' ? 'default' : 'outline'}
|
||||
onClick={() => {
|
||||
setAuthType('login');
|
||||
setAuthNotice(null);
|
||||
}}
|
||||
onClick={() => setAuthType('login')}
|
||||
className="ml-2"
|
||||
>
|
||||
{t('auth:login.title', { defaultValue: 'Anmelden' })}
|
||||
Anmelden
|
||||
</Button>
|
||||
</div>
|
||||
{authNotice && (
|
||||
<Alert>
|
||||
<AlertDescription>{authNotice}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
{authType === 'register' ? (
|
||||
<RegisterForm
|
||||
packageId={initialPackage.id}
|
||||
privacyHtml={privacyHtml}
|
||||
onSuccess={handleAuthSuccess}
|
||||
/>
|
||||
<RegisterForm onSuccess={handleAuthSuccess} packageId={initialPackage.id} privacyHtml={privacyHtml} />
|
||||
) : (
|
||||
<LoginForm onSuccess={handleAuthSuccess} />
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const renderPaymentStep = () => (
|
||||
<div className="space-y-4">
|
||||
{isAuthenticated && (
|
||||
<Alert>
|
||||
<AlertDescription>
|
||||
{t('marketing:payment.authenticated_notice', {
|
||||
defaultValue: 'Angemeldet als {{email}}. Zahlungsmethode ausw<73>hlen.',
|
||||
email: wizardUser?.email ?? wizardUser?.name ?? t('auth:user', { defaultValue: 'aktueller Nutzer' }),
|
||||
})}
|
||||
</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
{authNotice && (
|
||||
<Alert>
|
||||
<AlertDescription>{authNotice}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
<PaymentForm
|
||||
packageId={initialPackage.id}
|
||||
packageName={initialPackage.name}
|
||||
price={initialPackage.price}
|
||||
currency="EUR"
|
||||
stripePromise={stripePromise}
|
||||
paypalClientId={paypalClientId}
|
||||
onSuccess={handlePaymentSuccess}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
||||
const renderSuccessStep = () => <SuccessStep package={initialPackage} />;
|
||||
|
||||
const currentStep = steps[currentStepIndex];
|
||||
|
||||
const renderStepContent = () => {
|
||||
switch (currentStep.id) {
|
||||
case 'package':
|
||||
return renderPackageStep();
|
||||
case 'auth':
|
||||
return renderAuthStep();
|
||||
case 'payment':
|
||||
return renderPaymentStep();
|
||||
if (initialPackage.price === 0) {
|
||||
// Skip for free, assign directly
|
||||
router.post('/api/purchase/free', { package_id: initialPackage.id });
|
||||
return <div>Free package assigned! Redirecting...</div>;
|
||||
}
|
||||
return (
|
||||
<Elements stripe={stripePromise}>
|
||||
<PaymentForm packageId={initialPackage.id} onSuccess={handlePaymentSuccess} />
|
||||
</Elements>
|
||||
);
|
||||
case 'success':
|
||||
return renderSuccessStep();
|
||||
return <SuccessStep package={initialPackage} />;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<MarketingLayout title={t('marketing:payment.wizard_title', { defaultValue: 'Kauf-Wizard' })}>
|
||||
<Head title={t('marketing:payment.wizard_title', { defaultValue: 'Kauf-Wizard' })} />
|
||||
<MarketingLayout title="Kauf-Wizard">
|
||||
<Head title="Kauf-Wizard" />
|
||||
<div className="min-h-screen bg-gray-50 py-12">
|
||||
<div className="max-w-2xl mx-auto px-4">
|
||||
<Progress value={(currentStepIndex / (steps.length - 1)) * 100} className="mb-6" />
|
||||
<Steps steps={steps} currentStep={currentStepIndex} />
|
||||
<Progress value={(currentStep / (steps.length - 1)) * 100} className="mb-6" />
|
||||
<Steps steps={steps} currentStep={currentStep} />
|
||||
{renderStepContent()}
|
||||
{currentStep.id !== 'success' && currentStep.id !== 'package' && (
|
||||
<div className="mt-6">
|
||||
<Button variant="outline" onClick={handleBack}>
|
||||
{t('marketing:payment.back', { defaultValue: 'Zur<75>ck' })}
|
||||
</Button>
|
||||
{currentStep > 0 && currentStep < 3 && (
|
||||
<div className="flex justify-between mt-6">
|
||||
<Button variant="outline" onClick={prevStep}>Zurück</Button>
|
||||
{currentStep < 3 && <Button onClick={nextStep}>Weiter</Button>}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -11,15 +11,8 @@ return [
|
||||
'password' => 'Passwort',
|
||||
'remember' => 'Angemeldet bleiben',
|
||||
'submit' => 'Anmelden',
|
||||
'generic_error' => 'Anmeldung fehlgeschlagen. Bitte versuche es erneut.',
|
||||
],
|
||||
|
||||
'already_authenticated' => 'Bereits angemeldet',
|
||||
'logged_in_as' => 'Du bist angemeldet als :email.',
|
||||
'skip_to_payment' => 'Weiter zur Zahlung',
|
||||
'verify_notice' => 'Bitte bestätige deine E-Mail-Adresse, um fortzufahren.',
|
||||
'user' => 'aktueller Nutzer',
|
||||
|
||||
'register' => [
|
||||
'title' => 'Registrieren',
|
||||
'name' => 'Vollständiger Name',
|
||||
@@ -33,7 +26,6 @@ return [
|
||||
'phone' => 'Telefonnummer',
|
||||
'privacy_consent' => 'Ich stimme der Datenschutzerklärung zu und akzeptiere die Verarbeitung meiner persönlichen Daten.',
|
||||
'submit' => 'Registrieren',
|
||||
'generic_error' => 'Registrierung fehlgeschlagen. Bitte versuche es erneut.',
|
||||
],
|
||||
|
||||
'verification' => [
|
||||
|
||||
@@ -51,24 +51,6 @@ return [
|
||||
'feature_custom_branding' => 'Benutzerdefiniertes Branding',
|
||||
'feature_advanced_reporting' => 'Erweiterte Berichterstattung',
|
||||
],
|
||||
'payment' => [
|
||||
'wizard_title' => 'Kauf-Wizard',
|
||||
'title' => 'Zahlung',
|
||||
'price_label' => 'Preis',
|
||||
'free' => 'Kostenlos',
|
||||
'continue' => 'Weiter',
|
||||
'back' => 'Zurück',
|
||||
'total_due' => 'Gesamtbetrag',
|
||||
'success_stripe' => 'Stripe-Zahlung erfolgreich.',
|
||||
'success_paypal' => 'PayPal-Zahlung erfolgreich.',
|
||||
'free_assigned' => 'Kostenloses Paket wurde zugewiesen.',
|
||||
'processing_free' => 'Paket wird freigeschaltet ...',
|
||||
'processing_paypal' => 'PayPal-Zahlung wird verarbeitet ...',
|
||||
'paypal_hint' => 'Der Betrag von {{amount}} wird bei PayPal angezeigt.',
|
||||
'paypal_missing_key' => 'PayPal ist derzeit nicht konfiguriert.',
|
||||
'paypal_sdk_failed' => 'PayPal-SDK konnte nicht geladen werden.',
|
||||
'authenticated_notice' => 'Angemeldet als {{email}}. Zahlungsmethode auswählen.',
|
||||
],
|
||||
'nav' => [
|
||||
'home' => 'Startseite',
|
||||
'how_it_works' => 'So funktioniert\'s',
|
||||
@@ -157,10 +139,6 @@ return [
|
||||
'complete_purchase' => 'Kauf abschließen',
|
||||
'login_to_continue' => 'Melden Sie sich an, um fortzufahren.',
|
||||
'loading' => 'Laden...',
|
||||
'message' => 'Danke! Paket :package ist bereit.',
|
||||
'free_assigned' => 'Kostenloses Paket wurde aktiviert.',
|
||||
'paid_assigned' => 'Zahlung erfolgreich verarbeitet.',
|
||||
'go_to_dashboard' => 'Zum Dashboard',
|
||||
],
|
||||
'register' => [
|
||||
'free' => 'Kostenlos',
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'failed' => 'These credentials do not match our records.',
|
||||
'password' => 'The provided password is incorrect.',
|
||||
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
|
||||
|
||||
'login' => [
|
||||
'title' => 'Log in',
|
||||
'username_or_email' => 'Username or email',
|
||||
'password' => 'Password',
|
||||
'remember' => 'Remember me',
|
||||
'submit' => 'Log in',
|
||||
'generic_error' => 'Login failed. Please try again.',
|
||||
],
|
||||
|
||||
'already_authenticated' => 'Already signed in',
|
||||
'logged_in_as' => 'You are signed in as :email.',
|
||||
'skip_to_payment' => 'Continue to payment',
|
||||
'verify_notice' => 'Please verify your email address to continue.',
|
||||
'user' => 'current user',
|
||||
|
||||
'register' => [
|
||||
'title' => 'Register',
|
||||
'name' => 'Full name',
|
||||
'username' => 'Username',
|
||||
'email' => 'Email address',
|
||||
'password' => 'Password',
|
||||
'password_confirmation' => 'Confirm password',
|
||||
'first_name' => 'First name',
|
||||
'last_name' => 'Last name',
|
||||
'address' => 'Address',
|
||||
'phone' => 'Phone number',
|
||||
'privacy_consent' => 'I agree to the privacy policy and consent to the processing of my personal data.',
|
||||
'submit' => 'Sign up',
|
||||
'generic_error' => 'Registration failed. Please try again.',
|
||||
],
|
||||
|
||||
'verification' => [
|
||||
'notice' => 'Please verify your email address.',
|
||||
'resend' => 'Resend email',
|
||||
],
|
||||
];
|
||||
@@ -51,24 +51,6 @@ return [
|
||||
'feature_custom_branding' => 'Custom Branding',
|
||||
'feature_advanced_reporting' => 'Advanced Reporting',
|
||||
],
|
||||
'payment' => [
|
||||
'wizard_title' => 'Purchase Wizard',
|
||||
'title' => 'Payment',
|
||||
'price_label' => 'Price',
|
||||
'free' => 'Free',
|
||||
'continue' => 'Continue',
|
||||
'back' => 'Back',
|
||||
'total_due' => 'Total due',
|
||||
'success_stripe' => 'Stripe payment successful.',
|
||||
'success_paypal' => 'PayPal payment successful.',
|
||||
'free_assigned' => 'Free package has been assigned.',
|
||||
'processing_free' => 'Assigning free package ...',
|
||||
'processing_paypal' => 'Processing PayPal payment ...',
|
||||
'paypal_hint' => 'The amount of {{amount}} will be shown in PayPal.',
|
||||
'paypal_missing_key' => 'PayPal is not configured right now.',
|
||||
'paypal_sdk_failed' => 'Failed to load the PayPal SDK.',
|
||||
'authenticated_notice' => 'Signed in as {{email}}. Choose your payment method.',
|
||||
],
|
||||
'nav' => [
|
||||
'home' => 'Home',
|
||||
'how_it_works' => 'How it works',
|
||||
@@ -151,16 +133,12 @@ return [
|
||||
],
|
||||
'success' => [
|
||||
'title' => 'Success',
|
||||
'verify_email' => 'Verify email',
|
||||
'check_email' => 'Check your inbox for the verification link.',
|
||||
'redirecting' => 'Redirecting to the admin area...',
|
||||
'complete_purchase' => 'Complete purchase',
|
||||
'login_to_continue' => 'Please sign in to continue.',
|
||||
'verify_email' => 'Verify Email',
|
||||
'check_email' => 'Check your email for the verification link.',
|
||||
'redirecting' => 'Redirecting to admin area...',
|
||||
'complete_purchase' => 'Complete Purchase',
|
||||
'login_to_continue' => 'Log in to continue.',
|
||||
'loading' => 'Loading...',
|
||||
'message' => 'Thank you! Package :package is ready.',
|
||||
'free_assigned' => 'Free package has been activated.',
|
||||
'paid_assigned' => 'Payment processed successfully.',
|
||||
'go_to_dashboard' => 'Go to dashboard',
|
||||
],
|
||||
'register' => [
|
||||
'free' => 'Free',
|
||||
|
||||
@@ -143,14 +143,8 @@ Route::get('/super-admin/templates/tasks.csv', function () {
|
||||
return response()->stream($callback, 200, $headers);
|
||||
});
|
||||
|
||||
Route::get('/purchase-wizard/{package_id}', function ($package_id) {
|
||||
return redirect("/de/purchase-wizard/{$package_id}");
|
||||
})->name('purchase.wizard.fallback');
|
||||
|
||||
Route::prefix('{locale?}')->where(['locale' => 'de|en'])->middleware('locale')->group(function () {
|
||||
Route::get('/purchase-wizard/{package_id}', [\App\Http\Controllers\MarketingController::class, 'purchaseWizard'])->middleware(\App\Http\Middleware\StripeCSP::class)->name('purchase.wizard');
|
||||
Route::get('/purchase-wizard/{package_id}', [\App\Http\Controllers\MarketingController::class, 'purchaseWizard'])->name('purchase.wizard');
|
||||
Route::get('/buy-packages/{package_id}', [\App\Http\Controllers\MarketingController::class, 'buyPackages'])->name('buy.packages');
|
||||
});
|
||||
Route::middleware('auth')->group(function () {
|
||||
Route::get('/profile', [\App\Http\Controllers\ProfileController::class, 'index'])->name('profile');
|
||||
Route::get('/profile/account', [\App\Http\Controllers\ProfileController::class, 'account'])->name('profile.account');
|
||||
@@ -167,17 +161,3 @@ Route::prefix('{locale?}')->where(['locale' => 'de|en'])->middleware('locale')->
|
||||
])
|
||||
->name('anlaesse.type');
|
||||
});
|
||||
|
||||
|
||||
Route::prefix('purchase')->group(function () {
|
||||
Route::post('/auth/login', [\App\Http\Controllers\PurchaseWizardController::class, 'login'])->name('purchase.auth.login');
|
||||
Route::post('/auth/register', [\App\Http\Controllers\PurchaseWizardController::class, 'register'])->name('purchase.auth.register');
|
||||
});
|
||||
|
||||
Route::middleware(['auth', 'verified'])->prefix('purchase')->group(function () {
|
||||
Route::post('/stripe/intent', [\App\Http\Controllers\PurchaseWizardController::class, 'createStripeIntent'])->name('purchase.stripe.intent');
|
||||
Route::post('/stripe/complete', [\App\Http\Controllers\PurchaseWizardController::class, 'completeStripe'])->name('purchase.stripe.complete');
|
||||
Route::post('/paypal/order', [\App\Http\Controllers\PurchaseWizardController::class, 'createPaypalOrder'])->name('purchase.paypal.order');
|
||||
Route::post('/paypal/capture', [\App\Http\Controllers\PurchaseWizardController::class, 'capturePaypalOrder'])->name('purchase.paypal.capture');
|
||||
Route::post('/free', [\App\Http\Controllers\PurchaseWizardController::class, 'assignFreePackage'])->name('purchase.free');
|
||||
});
|
||||
|
||||
@@ -1,153 +1,69 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { execSync } from 'child_process';
|
||||
import { execSync } from 'child_process'; // Für artisan seed
|
||||
|
||||
const BASE_URL = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:8000';
|
||||
|
||||
function seedTestUser() {
|
||||
execSync('php artisan tenant:add-dummy --email=test@example.com --password=password123 --first_name=Test --last_name=User --address="Teststr. 1" --phone="+49123"', { stdio: 'ignore' });
|
||||
execSync('php artisan tinker --execute="App\\Models\\User::where(\'email\', \'test@example.com\')->update([\'email_verified_at\' => now()]);"', { stdio: 'ignore' });
|
||||
}
|
||||
|
||||
test.describe('Marketing Purchase Wizard', () => {
|
||||
test.beforeAll(() => {
|
||||
seedTestUser();
|
||||
test.describe('Marketing Package Flow: Auswahl → Registrierung → Kauf (Free & Paid)', () => {
|
||||
test.beforeAll(async () => {
|
||||
// Seed Test-Tenant (einmalig)
|
||||
execSync('php artisan tenant:add-dummy --email=test@example.com --password=password123 --first_name=Test --last_name=User --address="Teststr. 1" --phone="+49123"');
|
||||
// Mock Verifizierung: Update DB (in Test-Env)
|
||||
execSync('php artisan tinker --execute="App\\Models\\User::where(\'email\', \'test@example.com\')->update([\'email_verified_at\' => now()]);"');
|
||||
});
|
||||
|
||||
test('guest users see registration step after package selection', async ({ page }) => {
|
||||
await page.goto(`${BASE_URL}/purchase-wizard/1`);
|
||||
test('Free-Paket-Flow (ID=1, Starter)', async ({ page }) => {
|
||||
await page.goto('http://localhost:8000/de'); // Lokaler Server (vite dev)
|
||||
await expect(page).toHaveTitle(/Fotospiel/);
|
||||
await page.screenshot({ path: 'free-step1-home.png', fullPage: true });
|
||||
|
||||
await page.getByRole('button', { name: /Weiter/i }).click();
|
||||
// Paketauswahl
|
||||
await page.getByRole('link', { name: 'Alle Packages ansehen' }).click();
|
||||
await expect(page).toHaveURL(/\/de\/packages/);
|
||||
await page.screenshot({ path: 'free-step2-packages.png', fullPage: true });
|
||||
await page.getByRole('button', { name: 'Details anzeigen' }).first().click(); // Erstes Paket (Free)
|
||||
await expect(page.locator('dialog')).toBeVisible();
|
||||
await page.screenshot({ path: 'free-step3-modal.png', fullPage: true });
|
||||
await page.getByRole('tab', { name: 'Kaufen' }).click();
|
||||
await page.getByRole('link', { name: 'Registrieren & Kaufen' }).click();
|
||||
await expect(page).toHaveURL(/\/de\/register\?package_id=1/);
|
||||
await page.screenshot({ path: 'free-step4-register.png', fullPage: true });
|
||||
|
||||
await expect(page.getByText(/Registrieren/i)).toBeVisible();
|
||||
await expect(page.getByText(/Anmelden/i)).toBeVisible();
|
||||
// Registrierung (Test-Daten, aber seedet vorab – hier Login simulieren falls nötig)
|
||||
// Da seeded: Verwende Login statt neuer Registrierung für Test
|
||||
await page.fill('[name="email"]', 'test@example.com');
|
||||
await page.fill('[name="password"]', 'password123');
|
||||
await page.getByRole('button', { name: 'Anmelden' }).click(); // Falls Login-Form nach Redirect
|
||||
await expect(page).toHaveURL(/\/buy-packages\/1/);
|
||||
await page.screenshot({ path: 'free-step5-buy.png', fullPage: true });
|
||||
|
||||
// Kauf (Free: Direkte Success)
|
||||
await expect(page.locator('text=Free package assigned')).toContainText('success'); // API-Response oder Page-Text
|
||||
await page.goto('/marketing/success');
|
||||
await expect(page).toHaveURL(/\/marketing\/success/);
|
||||
await page.screenshot({ path: 'free-step6-success.png', fullPage: true });
|
||||
await expect(page).toHaveURL(/\/admin/); // Redirect
|
||||
await page.screenshot({ path: 'free-step7-admin.png', fullPage: true });
|
||||
await expect(page.locator('text=Remaining Photos')).toContainText('300'); // Limits aus package-flow.test.ts integriert
|
||||
});
|
||||
|
||||
test('authenticated users skip auth and can finish PayPal flow', async ({ page }) => {
|
||||
await page.route('https://js.stripe.com/v3', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/javascript',
|
||||
body: `window.Stripe = function(){
|
||||
return {
|
||||
elements: function(){
|
||||
return {
|
||||
create: function(){
|
||||
return {
|
||||
mount: function(){},
|
||||
destroy: function(){},
|
||||
on: function(){},
|
||||
update: function(){},
|
||||
unmount: function(){},
|
||||
};
|
||||
},
|
||||
getElement: function(){
|
||||
return {
|
||||
clear: function(){},
|
||||
};
|
||||
}
|
||||
};
|
||||
},
|
||||
confirmCardPayment: async function(){
|
||||
return { paymentIntent: { id: 'pi_test', status: 'succeeded' } };
|
||||
}
|
||||
};
|
||||
};`
|
||||
});
|
||||
});
|
||||
|
||||
await page.route('https://www.paypal.com/sdk/js?**', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/javascript',
|
||||
body: `window.paypal = {
|
||||
Buttons: function(options){
|
||||
return {
|
||||
render: function(container){
|
||||
const target = typeof container === 'string' ? document.querySelector(container) : container;
|
||||
if (!target) return;
|
||||
const btn = document.createElement('button');
|
||||
btn.type = 'button';
|
||||
btn.textContent = 'PayPal Test Button';
|
||||
btn.addEventListener('click', async () => {
|
||||
try {
|
||||
const orderId = await options.createOrder();
|
||||
await options.onApprove({ orderID: orderId });
|
||||
} catch (error) {
|
||||
if (options.onError) options.onError(error);
|
||||
}
|
||||
});
|
||||
target.innerHTML = '';
|
||||
target.appendChild(btn);
|
||||
},
|
||||
close: function(){}
|
||||
};
|
||||
}
|
||||
};`
|
||||
});
|
||||
});
|
||||
|
||||
await page.route('**/purchase/auth/login', (route) => route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
status: 'authenticated',
|
||||
user: { id: 1, email: 'test@example.com', name: 'Test User', pending_purchase: false, email_verified: true },
|
||||
next_step: 'payment',
|
||||
needs_verification: false,
|
||||
}),
|
||||
}));
|
||||
|
||||
await page.route('**/purchase/auth/register', (route) => route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
status: 'registered',
|
||||
user: { id: 2, email: 'new@example.com', name: 'New User', pending_purchase: true, email_verified: false },
|
||||
next_step: 'payment',
|
||||
}),
|
||||
}));
|
||||
|
||||
await page.route('**/purchase/stripe/intent', (route) => route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ client_secret: 'pi_secret', payment_intent_id: 'pi_test' }),
|
||||
}));
|
||||
|
||||
await page.route('**/purchase/stripe/complete', (route) => route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ status: 'completed' }),
|
||||
}));
|
||||
|
||||
await page.route('**/purchase/paypal/order', (route) => route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ order_id: 'ORDER-TEST', status: 'CREATED' }),
|
||||
}));
|
||||
|
||||
await page.route('**/purchase/paypal/capture', (route) => route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ status: 'captured' }),
|
||||
}));
|
||||
|
||||
await page.goto(`${BASE_URL}/de/login`);
|
||||
await page.fill('input[name="login"]', 'test@example.com');
|
||||
await page.fill('input[name="password"]', 'password123');
|
||||
await page.getByRole('button', { name: /Anmelden/i }).click();
|
||||
await expect(page).toHaveURL(/dashboard|admin/i, { timeout: 10000 });
|
||||
|
||||
await page.goto(`${BASE_URL}/purchase-wizard/2`);
|
||||
|
||||
await page.getByRole('button', { name: /Weiter/i }).click();
|
||||
|
||||
await expect(page.getByRole('button', { name: 'Stripe' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: 'PayPal' })).toBeVisible();
|
||||
|
||||
await page.getByRole('button', { name: 'PayPal' }).click();
|
||||
await page.getByRole('button', { name: 'PayPal Test Button' }).click();
|
||||
|
||||
await expect(page.getByText(/Willkommen/i)).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /Dashboard/i })).toBeVisible();
|
||||
test('Paid-Paket-Flow (ID=2, Pro mit Stripe-Test)', async ({ page }) => {
|
||||
// Ähnlich wie Free, aber package_id=2
|
||||
await page.goto('http://localhost:8000/de/packages');
|
||||
await page.getByRole('button', { name: 'Details anzeigen' }).nth(1).click(); // Zweites Paket (Paid)
|
||||
// ... (Modal, Register/Login wie oben)
|
||||
await expect(page).toHaveURL(/\/buy-packages\/2/);
|
||||
|
||||
// Mock Stripe
|
||||
await page.route('https://checkout.stripe.com/**', async route => {
|
||||
await route.fulfill({ status: 200, body: '<html>Mock Stripe Success</html>' });
|
||||
});
|
||||
// Simuliere Checkout: Fill Test-Karte
|
||||
await page.fill('[name="cardNumber"]', '4242424242424242');
|
||||
await page.fill('[name="cardExpiry"]', '12/25');
|
||||
await page.fill('[name="cardCvc"]', '123');
|
||||
await page.click('[name="submit"]');
|
||||
await page.waitForURL(/\/marketing\/success/); // Nach Webhook
|
||||
await page.screenshot({ path: 'paid-step6-success.png', fullPage: true });
|
||||
|
||||
// Integration: Limits-Check wie in package-flow.test.ts
|
||||
await expect(page.locator('text=Remaining Photos')).toContainText('Unbegrenzt'); // Pro-Limit
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user