From 6292b62315d70a19ace5b56bd2d5b6f3e476f357 Mon Sep 17 00:00:00 2001 From: marcoitaloesp-ai Date: Thu, 18 Dec 2025 00:44:37 +0000 Subject: [PATCH] feat: complete email system redesign with corporate templates - Redesigned all email templates with professional corporate style - Created base layout with dark header, status cards, and footer - Updated: subscription-cancelled, account-activation, welcome, welcome-new-user, due-payments-alert - Removed emojis and gradients for cleaner look - Added multi-language support (ES, PT-BR, EN) - Fixed email delivery (sync instead of queue) - Fixed PayPal already-cancelled subscription handling - Cleaned orphan subscriptions from deleted users --- .../app/Console/Commands/SetupPayPalPlans.php | 6 +- .../Http/Controllers/Api/AuthController.php | 230 ++++- .../Controllers/Api/CategoryController.php | 30 + .../Http/Controllers/Api/PlanController.php | 17 +- .../Api/SubscriptionController.php | 410 ++++++++- .../app/Http/Middleware/CheckPlanLimits.php | 5 +- backend/app/Mail/AccountActivationMail.php | 35 + .../app/Mail/SubscriptionCancelledMail.php | 122 +++ backend/app/Models/EmailVerificationToken.php | 72 ++ backend/app/Models/Subscription.php | 1 + backend/app/Services/PayPalService.php | 128 ++- ...create_email_verification_tokens_table.php | 27 + ...00_add_pending_status_to_subscriptions.php | 27 + .../views/emails/account-activation.blade.php | 166 ++++ .../views/emails/due-payments-alert.blade.php | 813 ++++++++++-------- .../views/emails/layouts/base.blade.php | 412 +++++++++ .../subscription-cancelled-text.blade.php | 96 +++ .../emails/subscription-cancelled.blade.php | 164 ++++ .../views/emails/welcome-new-user.blade.php | 451 ++++------ .../resources/views/emails/welcome.blade.php | 235 ++--- backend/routes/api.php | 11 + frontend/src/App.jsx | 4 + frontend/src/components/ProtectedRoute.jsx | 5 +- frontend/src/context/AuthContext.jsx | 5 +- frontend/src/i18n/locales/en.json | 160 +++- frontend/src/i18n/locales/es.json | 160 +++- frontend/src/i18n/locales/pt-BR.json | 160 +++- frontend/src/pages/ActivateAccount.jsx | 125 +++ frontend/src/pages/Billing.jsx | 80 +- frontend/src/pages/Landing.css | 41 + frontend/src/pages/Landing.jsx | 58 +- frontend/src/pages/Login.jsx | 99 ++- frontend/src/pages/PaymentSuccess.jsx | 160 ++++ frontend/src/pages/Register.jsx | 184 +++- frontend/src/services/api.js | 17 + 35 files changed, 3741 insertions(+), 975 deletions(-) create mode 100644 backend/app/Mail/AccountActivationMail.php create mode 100644 backend/app/Mail/SubscriptionCancelledMail.php create mode 100644 backend/app/Models/EmailVerificationToken.php create mode 100644 backend/database/migrations/2025_12_17_230000_create_email_verification_tokens_table.php create mode 100644 backend/database/migrations/2025_12_17_232000_add_pending_status_to_subscriptions.php create mode 100644 backend/resources/views/emails/account-activation.blade.php create mode 100644 backend/resources/views/emails/layouts/base.blade.php create mode 100644 backend/resources/views/emails/subscription-cancelled-text.blade.php create mode 100644 backend/resources/views/emails/subscription-cancelled.blade.php create mode 100644 frontend/src/pages/ActivateAccount.jsx create mode 100644 frontend/src/pages/PaymentSuccess.jsx diff --git a/backend/app/Console/Commands/SetupPayPalPlans.php b/backend/app/Console/Commands/SetupPayPalPlans.php index cfc168a..870db87 100644 --- a/backend/app/Console/Commands/SetupPayPalPlans.php +++ b/backend/app/Console/Commands/SetupPayPalPlans.php @@ -102,7 +102,11 @@ private function createProduct(PayPalService $paypal, Plan $plan): array ? 'https://api-m.sandbox.paypal.com' : 'https://api-m.paypal.com'; - $response = \Illuminate\Support\Facades\Http::withToken($paypal->getAccessToken()) + // Get fresh token for this request + \Illuminate\Support\Facades\Cache::forget('paypal_access_token'); + $token = $paypal->getAccessToken(); + + $response = \Illuminate\Support\Facades\Http::withToken($token) ->post("{$baseUrl}/v1/catalogs/products", [ 'name' => "WEBMoney - {$plan->name}", 'description' => $plan->description ?? "Subscription plan for WEBMoney", diff --git a/backend/app/Http/Controllers/Api/AuthController.php b/backend/app/Http/Controllers/Api/AuthController.php index 917ff80..e7fc6b6 100644 --- a/backend/app/Http/Controllers/Api/AuthController.php +++ b/backend/app/Http/Controllers/Api/AuthController.php @@ -4,17 +4,21 @@ use App\Http\Controllers\Controller; use App\Models\User; +use App\Models\EmailVerificationToken; use App\Services\UserSetupService; +use App\Mail\AccountActivationMail; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Facades\Mail; +use Illuminate\Support\Facades\Log; class AuthController extends Controller { /** - * Register a new user + * Register a new user (without auto-login - requires PayPal payment and email activation) */ public function register(Request $request): JsonResponse { @@ -23,6 +27,7 @@ public function register(Request $request): JsonResponse 'name' => 'required|string|max:255', 'email' => 'required|string|email|max:255|unique:users', 'password' => 'required|string|min:8|confirmed', + 'plan_id' => 'nullable|exists:plans,id', ], [ 'name.required' => 'El nombre es obligatorio', 'email.required' => 'El email es obligatorio', @@ -41,32 +46,40 @@ public function register(Request $request): JsonResponse ], 422); } + // Create user WITHOUT email verification (will be verified after PayPal payment) $user = User::create([ 'name' => $request->name, 'email' => $request->email, 'password' => Hash::make($request->password), + 'email_verified_at' => null, // NOT verified yet ]); - // Criar categorias e dados padrão para o novo usuário - $setupService = new UserSetupService(); - $setupService->setupNewUser($user->id); + // DISABLED: Create default categories and data for the new user + // TODO: Re-enable when category templates are ready + // $setupService = new UserSetupService(); + // $setupService->setupNewUser($user->id); - $token = $user->createToken('auth-token')->plainTextToken; + // Create a temporary token for PayPal flow (expires in 1 hour) + $tempToken = $user->createToken('registration-flow', ['registration'])->plainTextToken; return response()->json([ 'success' => true, - 'message' => 'Usuario registrado exitosamente', + 'message' => 'Usuario registrado. Procede al pago para activar tu cuenta.', 'data' => [ 'user' => [ 'id' => $user->id, 'name' => $user->name, 'email' => $user->email, + 'email_verified' => false, ], - 'token' => $token, + 'token' => $tempToken, + 'requires_payment' => true, + 'requires_activation' => true, ] ], 201); } catch (\Exception $e) { + Log::error('Registration error: ' . $e->getMessage()); return response()->json([ 'success' => false, 'message' => 'Error al registrar usuario', @@ -98,14 +111,42 @@ public function login(Request $request): JsonResponse ], 422); } - if (!Auth::attempt($request->only('email', 'password'))) { + $user = User::where('email', $request->email)->first(); + + if (!$user || !Hash::check($request->password, $user->password)) { return response()->json([ 'success' => false, 'message' => 'Credenciales incorrectas' ], 401); } - $user = User::where('email', $request->email)->first(); + // Check if email is verified (account activated) + if (!$user->email_verified_at) { + return response()->json([ + 'success' => false, + 'message' => 'Tu cuenta aún no está activada. Revisa tu email para activarla.', + 'error' => 'email_not_verified', + 'data' => [ + 'email_verified' => false, + 'can_resend' => true, + ] + ], 403); + } + + // Check if user has an active subscription + $hasActiveSubscription = $user->subscriptions()->active()->exists(); + if (!$hasActiveSubscription) { + return response()->json([ + 'success' => false, + 'message' => 'No tienes una suscripción activa. Por favor, completa el pago.', + 'error' => 'no_subscription', + 'data' => [ + 'email_verified' => true, + 'has_subscription' => false, + ] + ], 403); + } + $token = $user->createToken('auth-token')->plainTextToken; return response()->json([ @@ -116,12 +157,14 @@ public function login(Request $request): JsonResponse 'id' => $user->id, 'name' => $user->name, 'email' => $user->email, + 'email_verified' => true, ], 'token' => $token, ] ], 200); } catch (\Exception $e) { + Log::error('Login error: ' . $e->getMessage()); return response()->json([ 'success' => false, 'message' => 'Error al iniciar sesión', @@ -130,6 +173,175 @@ public function login(Request $request): JsonResponse } } + /** + * Activate account via email token + */ + public function activateAccount(Request $request): JsonResponse + { + try { + $validator = Validator::make($request->all(), [ + 'token' => 'required|string|size:64', + ]); + + if ($validator->fails()) { + return response()->json([ + 'success' => false, + 'message' => 'Token inválido', + ], 422); + } + + $verificationToken = EmailVerificationToken::findValid($request->token); + + if (!$verificationToken) { + return response()->json([ + 'success' => false, + 'message' => 'El enlace de activación es inválido o ha expirado.', + 'error' => 'invalid_token', + ], 400); + } + + $user = $verificationToken->user; + + // Activate the user + $user->update(['email_verified_at' => now()]); + $verificationToken->markAsUsed(); + + // Create auth token for immediate login + $authToken = $user->createToken('auth-token')->plainTextToken; + + return response()->json([ + 'success' => true, + 'message' => '¡Tu cuenta ha sido activada! Ya puedes acceder al sistema.', + 'data' => [ + 'user' => [ + 'id' => $user->id, + 'name' => $user->name, + 'email' => $user->email, + 'email_verified' => true, + ], + 'token' => $authToken, + ] + ]); + + } catch (\Exception $e) { + Log::error('Activation error: ' . $e->getMessage()); + return response()->json([ + 'success' => false, + 'message' => 'Error al activar la cuenta', + ], 500); + } + } + + /** + * Resend activation email + */ + public function resendActivation(Request $request): JsonResponse + { + try { + $validator = Validator::make($request->all(), [ + 'email' => 'required|email|exists:users,email', + ]); + + if ($validator->fails()) { + return response()->json([ + 'success' => false, + 'message' => 'Email no encontrado', + ], 404); + } + + $user = User::where('email', $request->email)->first(); + + if ($user->email_verified_at) { + return response()->json([ + 'success' => false, + 'message' => 'Esta cuenta ya está activada', + ], 400); + } + + // Check if user has completed payment + $subscription = $user->subscriptions()->active()->first(); + if (!$subscription) { + return response()->json([ + 'success' => false, + 'message' => 'Primero debes completar el pago de tu suscripción', + ], 400); + } + + // Create new verification token and send email + $verificationToken = EmailVerificationToken::createForUser($user); + $frontendUrl = config('app.frontend_url', 'https://webmoney.cnxifly.com'); + $activationUrl = "{$frontendUrl}/activate?token={$verificationToken->token}"; + + Mail::to($user->email)->send(new AccountActivationMail( + $user, + $activationUrl, + $subscription->plan->name + )); + + return response()->json([ + 'success' => true, + 'message' => 'Email de activación reenviado. Revisa tu bandeja de entrada.', + ]); + + } catch (\Exception $e) { + Log::error('Resend activation error: ' . $e->getMessage()); + return response()->json([ + 'success' => false, + 'message' => 'Error al reenviar el email', + ], 500); + } + } + + /** + * Cancel registration - delete unactivated user account + * Used when PayPal payment is canceled or fails + */ + public function cancelRegistration(Request $request): JsonResponse + { + try { + $validator = Validator::make($request->all(), [ + 'email' => 'required|email|exists:users,email', + ]); + + if ($validator->fails()) { + return response()->json([ + 'success' => false, + 'message' => 'Usuario no encontrado', + ], 404); + } + + $user = User::where('email', $request->email)->first(); + + // Only allow deletion if account is NOT activated + if ($user->email_verified_at) { + return response()->json([ + 'success' => false, + 'message' => 'Esta cuenta ya está activada y no puede ser eliminada', + ], 400); + } + + // Delete associated data + $user->tokens()->delete(); // Delete all tokens + EmailVerificationToken::where('user_id', $user->id)->delete(); + $user->subscriptions()->delete(); + $user->delete(); + + Log::info("Unactivated user account deleted: {$request->email}"); + + return response()->json([ + 'success' => true, + 'message' => 'Registro cancelado. Puedes intentar nuevamente.', + ]); + + } catch (\Exception $e) { + Log::error('Cancel registration error: ' . $e->getMessage()); + return response()->json([ + 'success' => false, + 'message' => 'Error al cancelar el registro', + ], 500); + } + } + /** * Logout user (revoke token) */ diff --git a/backend/app/Http/Controllers/Api/CategoryController.php b/backend/app/Http/Controllers/Api/CategoryController.php index efad76e..f3c9dd6 100644 --- a/backend/app/Http/Controllers/Api/CategoryController.php +++ b/backend/app/Http/Controllers/Api/CategoryController.php @@ -62,6 +62,36 @@ public function store(Request $request): JsonResponse 'keywords.*' => 'string|max:100', ]); + $user = Auth::user(); + $plan = $user->currentPlan(); + + // Check subcategory limit if parent_id is provided + if (!empty($validated['parent_id']) && $plan) { + $limits = $plan->limits ?? []; + $subcategoryLimit = $limits['subcategories'] ?? null; + + if ($subcategoryLimit !== null) { + $currentSubcategories = Category::where('user_id', $user->id) + ->whereNotNull('parent_id') + ->count(); + + if ($currentSubcategories >= $subcategoryLimit) { + return response()->json([ + 'success' => false, + 'message' => "Has alcanzado el límite de {$subcategoryLimit} subcategorías de tu plan. Actualiza a Pro para subcategorías ilimitadas.", + 'error' => 'plan_limit_exceeded', + 'data' => [ + 'resource' => 'subcategories', + 'current' => $currentSubcategories, + 'limit' => $subcategoryLimit, + 'plan' => $plan->name, + 'upgrade_url' => '/pricing', + ], + ], 403); + } + } + } + // Verificar se parent_id pertence ao usuário if (!empty($validated['parent_id'])) { $parent = Category::where('user_id', Auth::id()) diff --git a/backend/app/Http/Controllers/Api/PlanController.php b/backend/app/Http/Controllers/Api/PlanController.php index 5a1276f..bd45d3a 100644 --- a/backend/app/Http/Controllers/Api/PlanController.php +++ b/backend/app/Http/Controllers/Api/PlanController.php @@ -10,16 +10,25 @@ class PlanController extends Controller { /** - * List all active plans for pricing page + * List all plans for pricing page (including coming soon) */ public function index(): JsonResponse { - $plans = Plan::active()->ordered()->get(); + // Get active plans + $activePlans = Plan::active()->ordered()->get(); + + // Get coming soon plans (inactive but should be displayed) + $comingSoonPlans = Plan::where('is_active', false) + ->whereIn('slug', ['business']) + ->ordered() + ->get(); + + $allPlans = $activePlans->merge($comingSoonPlans); return response()->json([ 'success' => true, 'data' => [ - 'plans' => $plans->map(function ($plan) { + 'plans' => $allPlans->map(function ($plan) { return [ 'id' => $plan->id, 'slug' => $plan->slug, @@ -35,6 +44,8 @@ public function index(): JsonResponse 'limits' => $plan->limits, 'is_free' => $plan->is_free, 'is_featured' => $plan->is_featured, + 'is_active' => $plan->is_active, + 'coming_soon' => !$plan->is_active, 'has_trial' => $plan->has_trial, 'savings_percent' => $plan->savings_percent, ]; diff --git a/backend/app/Http/Controllers/Api/SubscriptionController.php b/backend/app/Http/Controllers/Api/SubscriptionController.php index be825a9..b99d025 100644 --- a/backend/app/Http/Controllers/Api/SubscriptionController.php +++ b/backend/app/Http/Controllers/Api/SubscriptionController.php @@ -9,6 +9,10 @@ use App\Services\PayPalService; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; +use App\Models\EmailVerificationToken; +use App\Mail\AccountActivationMail; +use App\Mail\SubscriptionCancelledMail; +use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Log; use Carbon\Carbon; @@ -50,18 +54,46 @@ public function status(Request $request): JsonResponse } } + // Calculate guarantee period info (7 days from subscription creation) + $withinGuaranteePeriod = false; + $guaranteeDaysRemaining = 0; + $guaranteeEndsAt = null; + + if ($subscription && $subscription->created_at) { + $guaranteeEndsAt = $subscription->created_at->copy()->addDays(7); + $withinGuaranteePeriod = now()->lt($guaranteeEndsAt); + $guaranteeDaysRemaining = $withinGuaranteePeriod + ? (int) ceil(now()->diffInHours($guaranteeEndsAt) / 24) + : 0; + } + return response()->json([ 'success' => true, 'data' => [ 'has_subscription' => $subscription !== null, + 'subscription' => $subscription ? [ + 'id' => $subscription->id, + 'status' => $subscription->status, + 'trial_ends_at' => $subscription->trial_ends_at, + 'current_period_start' => $subscription->current_period_start, + 'current_period_end' => $subscription->current_period_end, + 'canceled_at' => $subscription->canceled_at, + 'ends_at' => $subscription->ends_at, + 'on_trial' => $subscription->isOnTrial(), + 'on_grace_period' => $subscription->onGracePeriod(), + ] : null, 'on_trial' => $subscription?->isOnTrial() ?? false, 'trial_ends_at' => $subscription?->trial_ends_at, 'days_until_trial_ends' => $subscription?->days_until_trial_ends, + 'current_period_start' => $subscription?->current_period_start, 'current_period_end' => $subscription?->current_period_end, 'status' => $subscription?->status, 'status_label' => $subscription?->status_label, 'canceled_at' => $subscription?->canceled_at, 'on_grace_period' => $subscription?->onGracePeriod() ?? false, + 'within_guarantee_period' => $withinGuaranteePeriod, + 'guarantee_days_remaining' => $guaranteeDaysRemaining, + 'guarantee_ends_at' => $guaranteeEndsAt?->toIso8601String(), 'plan' => $currentPlan ? [ 'id' => $currentPlan->id, 'slug' => $currentPlan->slug, @@ -166,6 +198,116 @@ public function subscribe(Request $request): JsonResponse ]); } + /** + * Start subscription for newly registered user (public - no auth required) + * Used immediately after registration, before user is logged in + */ + public function startSubscription(Request $request): JsonResponse + { + $request->validate([ + 'plan_id' => 'required|integer|exists:plans,id', + 'user_email' => 'required|email|exists:users,email', + ]); + + $user = \App\Models\User::where('email', $request->user_email)->first(); + + if (!$user) { + return response()->json([ + 'success' => false, + 'message' => 'User not found', + ], 404); + } + + // Verify user hasn't already verified email (prevent abuse) + if ($user->email_verified_at) { + return response()->json([ + 'success' => false, + 'message' => 'User already activated. Please login.', + ], 400); + } + + $plan = Plan::where('id', $request->plan_id)->where('is_active', true)->first(); + + if (!$plan) { + return response()->json([ + 'success' => false, + 'message' => 'Plan not found or inactive', + ], 404); + } + + // All plans are paid now - no free subscriptions during registration + if ($plan->is_free || $plan->price <= 0) { + return response()->json([ + 'success' => false, + 'message' => 'All plans require payment', + ], 400); + } + + // Check if PayPal is configured + if (!$this->paypal->isConfigured()) { + return response()->json([ + 'success' => false, + 'message' => 'Payment gateway not configured', + ], 500); + } + + // Check if plan has PayPal plan ID + if (!$plan->paypal_plan_id) { + return response()->json([ + 'success' => false, + 'message' => 'Plan not configured for payments yet', + ], 500); + } + + // Create PayPal subscription + $frontendUrl = config('app.frontend_url', 'https://webmoney.cnxifly.com'); + $returnUrl = "{$frontendUrl}/payment-success?user_email={$user->email}&plan={$plan->slug}"; + $cancelUrl = "{$frontendUrl}/register?payment_canceled=true"; + + $paypalSubscription = $this->paypal->createSubscription($plan, $returnUrl, $cancelUrl); + + if (!$paypalSubscription) { + return response()->json([ + 'success' => false, + 'message' => 'Failed to create subscription', + ], 500); + } + + // Find approve link + $approveUrl = collect($paypalSubscription['links'] ?? []) + ->firstWhere('rel', 'approve')['href'] ?? null; + + if (!$approveUrl) { + return response()->json([ + 'success' => false, + 'message' => 'No approval URL received', + ], 500); + } + + // Create pending subscription in our DB + $subscription = Subscription::create([ + 'user_id' => $user->id, + 'plan_id' => $plan->id, + 'status' => Subscription::STATUS_PENDING, + 'paypal_subscription_id' => $paypalSubscription['id'], + 'paypal_status' => $paypalSubscription['status'], + 'paypal_data' => $paypalSubscription, + 'price_paid' => $plan->price, + 'currency' => $plan->currency, + ]); + + \Illuminate\Support\Facades\Log::info("Started subscription for user {$user->email}, PayPal ID: {$paypalSubscription['id']}"); + + return response()->json([ + 'success' => true, + 'data' => [ + 'subscription_id' => $subscription->id, + 'paypal_subscription_id' => $paypalSubscription['id'], + 'approve_url' => $approveUrl, + ], + ]); + } + /** * Subscribe to free plan */ @@ -246,13 +388,139 @@ public function confirm(Request $request): JsonResponse )->markAsPaid($paypalData['id'] ?? null); } + // Send activation email if subscription is active and user not verified yet + $activationSent = false; + if ($subscription->isActive() && !$user->email_verified_at) { + try { + $verificationToken = EmailVerificationToken::createForUser($user); + $frontendUrl = config('app.frontend_url', 'https://webmoney.cnxifly.com'); + $activationUrl = "{$frontendUrl}/activate?token={$verificationToken->token}"; + + Mail::to($user->email)->send(new AccountActivationMail( + $user, + $activationUrl, + $subscription->plan->name + )); + + $activationSent = true; + Log::info("Activation email sent to {$user->email}"); + } catch (\Exception $e) { + Log::error("Failed to send activation email: " . $e->getMessage()); + } + } + return response()->json([ 'success' => true, - 'message' => 'Subscription confirmed', + 'message' => $activationSent + ? 'Suscripción confirmada. Revisa tu email para activar tu cuenta.' + : 'Subscription confirmed', 'data' => [ 'status' => $subscription->status, 'status_label' => $subscription->status_label, 'plan' => $subscription->plan->name, + 'activation_email_sent' => $activationSent, + 'email_verified' => $user->email_verified_at !== null, + ], + ]); + } + + /** + * Confirm subscription after PayPal approval (public - no auth required) + * Used for new user registration flow + */ + public function confirmPublic(Request $request): JsonResponse + { + $request->validate([ + 'subscription_id' => 'required|string', + 'user_email' => 'required|email', + ]); + + $user = \App\Models\User::where('email', $request->user_email)->first(); + + if (!$user) { + return response()->json([ + 'success' => false, + 'message' => 'User not found', + ], 404); + } + + $subscription = Subscription::where('paypal_subscription_id', $request->subscription_id) + ->where('user_id', $user->id) + ->first(); + + if (!$subscription) { + return response()->json([ + 'success' => false, + 'message' => 'Subscription not found', + ], 404); + } + + // Get subscription details from PayPal + $paypalData = $this->paypal->getSubscription($request->subscription_id); + + if (!$paypalData) { + return response()->json([ + 'success' => false, + 'message' => 'Failed to verify subscription with PayPal', + ], 500); + } + + \Illuminate\Support\Facades\Log::info("PayPal confirmation for {$user->email}: " . json_encode($paypalData)); + + // Update subscription based on PayPal status + $this->updateSubscriptionFromPayPal($subscription, $paypalData); + + // Cancel other active subscriptions + $user->subscriptions() + ->where('id', '!=', $subscription->id) + ->active() + ->update([ + 'status' => Subscription::STATUS_CANCELED, + 'canceled_at' => now(), + 'ends_at' => now(), + 'cancel_reason' => 'Replaced by new subscription', + ]); + + // Create invoice for the subscription + if ($subscription->isActive() && !$subscription->plan->is_free) { + Invoice::createForSubscription( + $subscription, + Invoice::REASON_SUBSCRIPTION_CREATE, + "{$subscription->plan->name} - Nueva suscripción" + )->markAsPaid($paypalData['id'] ?? null); + } + + // Send activation email if subscription is active and user not verified yet + $activationSent = false; + if ($subscription->isActive() && !$user->email_verified_at) { + try { + $verificationToken = EmailVerificationToken::createForUser($user); + $frontendUrl = config('app.frontend_url', 'https://webmoney.cnxifly.com'); + $activationUrl = "{$frontendUrl}/activate?token={$verificationToken->token}"; + + Mail::to($user->email)->send(new AccountActivationMail( + $user, + $activationUrl, + $subscription->plan->name + )); + + $activationSent = true; + \Illuminate\Support\Facades\Log::info("Activation email sent to {$user->email}"); + } catch (\Exception $e) { + \Illuminate\Support\Facades\Log::error("Failed to send activation email: " . $e->getMessage()); + } + } + + return response()->json([ + 'success' => true, + 'message' => $activationSent + ? 'Pagamento confirmado! Verifique seu email para ativar sua conta.' + : 'Payment confirmed', + 'data' => [ + 'status' => $subscription->status, + 'status_label' => $subscription->status_label, + 'plan' => $subscription->plan->name, + 'activation_email_sent' => $activationSent, ], ]); } @@ -265,6 +533,7 @@ public function cancel(Request $request): JsonResponse $request->validate([ 'reason' => 'nullable|string|max:500', 'immediately' => 'nullable|boolean', + 'request_refund' => 'nullable|boolean', ]); $user = $request->user(); @@ -277,35 +546,108 @@ public function cancel(Request $request): JsonResponse ], 404); } - // If it's a paid plan, cancel on PayPal - if ($subscription->paypal_subscription_id && !$subscription->plan->is_free) { - $canceled = $this->paypal->cancelSubscription( - $subscription->paypal_subscription_id, - $request->reason ?? 'User requested cancellation' - ); + $refundResult = null; + $isWithinGuaranteePeriod = false; + + // Check if within 7-day guarantee period (from subscription creation date) + if ($subscription->created_at) { + $daysSinceCreation = now()->diffInDays($subscription->created_at); + $isWithinGuaranteePeriod = $daysSinceCreation <= 7; + } - if (!$canceled) { - return response()->json([ - 'success' => false, - 'message' => 'Failed to cancel subscription on PayPal', - ], 500); + // If it's a paid plan with PayPal subscription + if ($subscription->paypal_subscription_id && !$subscription->plan->is_free) { + + // If user requests refund and is within guarantee period, cancel and refund + if ($request->boolean('request_refund') && $isWithinGuaranteePeriod) { + $refundResult = $this->paypal->cancelAndRefund( + $subscription->paypal_subscription_id, + $request->reason ?? 'Refund within 7-day guarantee period' + ); + + if (!$refundResult['canceled']) { + return response()->json([ + 'success' => false, + 'message' => 'Failed to cancel subscription on PayPal', + ], 500); + } + + Log::info('Subscription canceled with refund', [ + 'user_id' => $user->id, + 'subscription_id' => $subscription->id, + 'refund_result' => $refundResult, + ]); + } else { + // Just cancel without refund + $canceled = $this->paypal->cancelSubscription( + $subscription->paypal_subscription_id, + $request->reason ?? 'User requested cancellation' + ); + + if (!$canceled) { + return response()->json([ + 'success' => false, + 'message' => 'Failed to cancel subscription on PayPal', + ], 500); + } } } - // Cancel in our DB + // Cancel in our DB - always immediately when refunded + $cancelImmediately = $request->boolean('request_refund') || $request->boolean('immediately', false); $subscription->cancel( $request->reason, - $request->boolean('immediately', false) + $cancelImmediately ); + // Send cancellation confirmation email + try { + $wasRefunded = $refundResult && $refundResult['refunded']; + $refundAmount = $wasRefunded && isset($refundResult['refund_amount']) + ? number_format($refundResult['refund_amount'], 2) . ' ' . ($subscription->plan->currency ?? 'EUR') + : null; + + Mail::to($user->email)->send(new SubscriptionCancelledMail( + $user, + $subscription->plan->name, + $wasRefunded, + $refundAmount + )); + + Log::info('Cancellation email sent', [ + 'user_id' => $user->id, + 'email' => $user->email, + 'refunded' => $wasRefunded, + ]); + } catch (\Exception $e) { + Log::error('Failed to send cancellation email', [ + 'user_id' => $user->id, + 'error' => $e->getMessage(), + ]); + // Don't fail the cancellation just because email failed + } + + // Build response message + $message = 'Subscription canceled'; + if ($refundResult && $refundResult['refunded']) { + $message = 'Subscription canceled and refund processed'; + } elseif ($refundResult && !$refundResult['refunded']) { + $message = 'Subscription canceled. Refund could not be processed automatically - please contact support.'; + } elseif ($cancelImmediately) { + $message = 'Subscription canceled immediately'; + } else { + $message = 'Subscription will be canceled at period end'; + } + return response()->json([ 'success' => true, - 'message' => $request->boolean('immediately') - ? 'Subscription canceled immediately' - : 'Subscription will be canceled at period end', + 'message' => $message, 'data' => [ 'status' => $subscription->status, 'ends_at' => $subscription->ends_at, + 'refunded' => $refundResult['refunded'] ?? false, + 'refund_id' => $refundResult['refund_id'] ?? null, + 'within_guarantee_period' => $isWithinGuaranteePeriod, ], ]); } @@ -547,11 +889,39 @@ private function updateSubscriptionFromPayPal(Subscription $subscription, array switch ($status) { case 'ACTIVE': $subscription->status = Subscription::STATUS_ACTIVE; - if (isset($paypalData['billing_info']['next_billing_time'])) { - $subscription->current_period_end = Carbon::parse($paypalData['billing_info']['next_billing_time']); + + // Always set current_period_start to now() on activation if not set + if (!$subscription->current_period_start) { + $subscription->current_period_start = now(); } + + // Calculate period end based on plan interval + $plan = $subscription->plan; + if ($plan) { + $periodEnd = now(); + if ($plan->interval === 'year') { + $periodEnd = now()->addYear(); + } else { + $periodEnd = now()->addMonth(); + } + $subscription->current_period_end = $periodEnd; + } + + // Only use PayPal dates if they make sense (within reasonable range) if (isset($paypalData['billing_info']['last_payment']['time'])) { - $subscription->current_period_start = Carbon::parse($paypalData['billing_info']['last_payment']['time']); + $lastPayment = Carbon::parse($paypalData['billing_info']['last_payment']['time']); + // Accept if within last 30 days + if ($lastPayment->gte(now()->subDays(30)) && $lastPayment->lte(now()->addDay())) { + $subscription->current_period_start = $lastPayment; + } + } + + if (isset($paypalData['billing_info']['next_billing_time'])) { + $nextBilling = Carbon::parse($paypalData['billing_info']['next_billing_time']); + // Accept if within next 13 months (reasonable for monthly/yearly plans) + if ($nextBilling->gt(now()) && $nextBilling->lt(now()->addMonths(13))) { + $subscription->current_period_end = $nextBilling; + } } break; diff --git a/backend/app/Http/Middleware/CheckPlanLimits.php b/backend/app/Http/Middleware/CheckPlanLimits.php index 2b4daf8..f829a61 100644 --- a/backend/app/Http/Middleware/CheckPlanLimits.php +++ b/backend/app/Http/Middleware/CheckPlanLimits.php @@ -14,6 +14,7 @@ class CheckPlanLimits protected array $resourceLimits = [ 'accounts' => 'accounts', 'categories' => 'categories', + 'subcategories' => 'subcategories', 'budgets' => 'budgets', 'transactions' => 'transactions', 'goals' => 'goals', @@ -80,7 +81,8 @@ protected function getCurrentCount($user, string $resource): int { return match ($resource) { 'accounts' => $user->accounts()->count(), - 'categories' => $user->categories()->count(), + 'categories' => $user->categories()->whereNull('parent_id')->count(), + 'subcategories' => $user->categories()->whereNotNull('parent_id')->count(), 'budgets' => $user->budgets()->count(), 'transactions' => $user->transactions()->count(), 'goals' => $user->goals()->count(), @@ -96,6 +98,7 @@ protected function getLimitMessage(string $resource, int $limit): string $messages = [ 'accounts' => "Has alcanzado el límite de {$limit} cuenta(s) de tu plan. Actualiza a Pro para cuentas ilimitadas.", 'categories' => "Has alcanzado el límite de {$limit} categorías de tu plan. Actualiza a Pro para categorías ilimitadas.", + 'subcategories' => "Has alcanzado el límite de {$limit} subcategorías de tu plan. Actualiza a Pro para subcategorías ilimitadas.", 'budgets' => "Has alcanzado el límite de {$limit} presupuesto(s) de tu plan. Actualiza a Pro para presupuestos ilimitados.", 'transactions' => "Has alcanzado el límite de {$limit} transacciones de tu plan. Actualiza a Pro para transacciones ilimitadas.", 'goals' => "Has alcanzado el límite de {$limit} meta(s) de tu plan. Actualiza a Pro para metas ilimitadas.", diff --git a/backend/app/Mail/AccountActivationMail.php b/backend/app/Mail/AccountActivationMail.php new file mode 100644 index 0000000..4a6b1eb --- /dev/null +++ b/backend/app/Mail/AccountActivationMail.php @@ -0,0 +1,35 @@ +user = $user; + $this->planName = $planName; + $this->wasRefunded = $wasRefunded; + $this->refundAmount = $refundAmount; + $this->userLocale = $user->locale ?? $user->language ?? 'es'; + } + + /** + * Get the message envelope. + */ + public function envelope(): Envelope + { + // Set locale for translations + App::setLocale($this->userLocale); + + $subject = $this->getSubject(); + + return new Envelope( + from: new Address('no-reply@cnxifly.com', 'WEBMoney - ConneXiFly'), + replyTo: [ + new Address('support@cnxifly.com', $this->getSupportName()), + ], + subject: $subject, + tags: ['subscription', 'cancellation', $this->wasRefunded ? 'refund' : 'no-refund'], + metadata: [ + 'user_id' => $this->user->id, + 'user_email' => $this->user->email, + 'plan' => $this->planName, + 'refunded' => $this->wasRefunded, + ], + ); + } + + /** + * Get the message content definition. + */ + public function content(): Content + { + // Set locale for translations + App::setLocale($this->userLocale); + + return new Content( + view: 'emails.subscription-cancelled', + text: 'emails.subscription-cancelled-text', + with: [ + 'userName' => $this->user->name, + 'userEmail' => $this->user->email, + 'planName' => $this->planName, + 'wasRefunded' => $this->wasRefunded, + 'refundAmount' => $this->refundAmount, + 'locale' => $this->userLocale, + ], + ); + } + + /** + * Get the subject based on locale + */ + private function getSubject(): string + { + $subjects = [ + 'es' => $this->wasRefunded + ? 'Confirmación de cancelación y reembolso - WEBMoney' + : 'Confirmación de cancelación de suscripción - WEBMoney', + 'pt-BR' => $this->wasRefunded + ? 'Confirmação de cancelamento e reembolso - WEBMoney' + : 'Confirmação de cancelamento de assinatura - WEBMoney', + 'en' => $this->wasRefunded + ? 'Cancellation and Refund Confirmation - WEBMoney' + : 'Subscription Cancellation Confirmation - WEBMoney', + ]; + + return $subjects[$this->userLocale] ?? $subjects['es']; + } + + /** + * Get support name based on locale + */ + private function getSupportName(): string + { + $names = [ + 'es' => 'Soporte WEBMoney', + 'pt-BR' => 'Suporte WEBMoney', + 'en' => 'WEBMoney Support', + ]; + + return $names[$this->userLocale] ?? $names['es']; + } +} diff --git a/backend/app/Models/EmailVerificationToken.php b/backend/app/Models/EmailVerificationToken.php new file mode 100644 index 0000000..854e03c --- /dev/null +++ b/backend/app/Models/EmailVerificationToken.php @@ -0,0 +1,72 @@ + 'datetime', + 'used_at' => 'datetime', + ]; + + /** + * Relationship: User + */ + public function user(): BelongsTo + { + return $this->belongsTo(User::class); + } + + /** + * Create a new verification token for user + */ + public static function createForUser(User $user, int $expiresInHours = 24): self + { + // Invalidate existing tokens + self::where('user_id', $user->id)->whereNull('used_at')->delete(); + + return self::create([ + 'user_id' => $user->id, + 'token' => Str::random(64), + 'expires_at' => now()->addHours($expiresInHours), + ]); + } + + /** + * Find valid token + */ + public static function findValid(string $token): ?self + { + return self::where('token', $token) + ->where('expires_at', '>', now()) + ->whereNull('used_at') + ->first(); + } + + /** + * Check if token is valid + */ + public function isValid(): bool + { + return $this->expires_at > now() && $this->used_at === null; + } + + /** + * Mark token as used + */ + public function markAsUsed(): void + { + $this->update(['used_at' => now()]); + } +} diff --git a/backend/app/Models/Subscription.php b/backend/app/Models/Subscription.php index 6e1c512..6150436 100644 --- a/backend/app/Models/Subscription.php +++ b/backend/app/Models/Subscription.php @@ -12,6 +12,7 @@ class Subscription extends Model { use HasFactory; + const STATUS_PENDING = 'pending'; const STATUS_TRIALING = 'trialing'; const STATUS_ACTIVE = 'active'; const STATUS_PAST_DUE = 'past_due'; diff --git a/backend/app/Services/PayPalService.php b/backend/app/Services/PayPalService.php index 5e9dc4a..89ebc20 100644 --- a/backend/app/Services/PayPalService.php +++ b/backend/app/Services/PayPalService.php @@ -252,7 +252,15 @@ public function cancelSubscription(string $subscriptionId, string $reason = 'Use return true; } - Log::error('PayPal cancel subscription failed', ['response' => $response->json()]); + // Check if subscription is already cancelled - treat as success + $responseData = $response->json(); + if (isset($responseData['details'][0]['issue']) && + $responseData['details'][0]['issue'] === 'SUBSCRIPTION_STATUS_INVALID') { + Log::info('PayPal subscription already cancelled', ['subscription_id' => $subscriptionId]); + return true; + } + + Log::error('PayPal cancel subscription failed', ['response' => $responseData]); return false; } catch (\Exception $e) { Log::error('PayPal cancel subscription exception', ['error' => $e->getMessage()]); @@ -343,6 +351,124 @@ public function getSubscriptionTransactions(string $subscriptionId, string $star } } + /** + * Refund a capture (payment) + */ + public function refundCapture(string $captureId, ?float $amount = null, ?string $currency = 'EUR', string $note = 'Refund within 7-day guarantee period'): ?array + { + $token = $this->getAccessToken(); + if (!$token) return null; + + try { + $body = [ + 'note_to_payer' => $note, + ]; + + // If amount specified, do partial refund; otherwise full refund + if ($amount !== null) { + $body['amount'] = [ + 'value' => number_format($amount, 2, '.', ''), + 'currency_code' => $currency, + ]; + } + + $response = Http::withToken($token) + ->post("{$this->baseUrl}/v2/payments/captures/{$captureId}/refund", $body); + + if ($response->successful()) { + Log::info('PayPal refund successful', ['capture_id' => $captureId, 'response' => $response->json()]); + return $response->json(); + } + + Log::error('PayPal refund failed', ['capture_id' => $captureId, 'response' => $response->json()]); + return null; + } catch (\Exception $e) { + Log::error('PayPal refund exception', ['error' => $e->getMessage()]); + return null; + } + } + + /** + * Get the last transaction/capture for a subscription to refund + */ + public function getLastSubscriptionCapture(string $subscriptionId): ?string + { + $token = $this->getAccessToken(); + if (!$token) return null; + + try { + // Get transactions from last 30 days + $startTime = now()->subDays(30)->toIso8601String(); + $endTime = now()->toIso8601String(); + + $response = Http::withToken($token) + ->get("{$this->baseUrl}/v1/billing/subscriptions/{$subscriptionId}/transactions", [ + 'start_time' => $startTime, + 'end_time' => $endTime, + ]); + + if ($response->successful()) { + $transactions = $response->json('transactions') ?? []; + + // Find the most recent COMPLETED transaction + foreach ($transactions as $transaction) { + if (($transaction['status'] ?? '') === 'COMPLETED' && !empty($transaction['id'])) { + Log::info('Found capture for refund', ['subscription_id' => $subscriptionId, 'capture_id' => $transaction['id']]); + return $transaction['id']; + } + } + } + + Log::warning('No capture found for subscription', ['subscription_id' => $subscriptionId]); + return null; + } catch (\Exception $e) { + Log::error('PayPal get capture exception', ['error' => $e->getMessage()]); + return null; + } + } + + /** + * Cancel subscription and refund if within guarantee period + */ + public function cancelAndRefund(string $subscriptionId, string $reason = 'Refund within 7-day guarantee'): array + { + $result = [ + 'canceled' => false, + 'refunded' => false, + 'refund_id' => null, + 'refund_amount' => null, + 'error' => null, + ]; + + // First, get capture ID for refund + $captureId = $this->getLastSubscriptionCapture($subscriptionId); + + // Cancel the subscription + $canceled = $this->cancelSubscription($subscriptionId, $reason); + $result['canceled'] = $canceled; + + if (!$canceled) { + $result['error'] = 'Failed to cancel subscription'; + return $result; + } + + // Process refund if we have a capture + if ($captureId) { + $refund = $this->refundCapture($captureId, null, 'EUR', $reason); + if ($refund) { + $result['refunded'] = true; + $result['refund_id'] = $refund['id'] ?? null; + $result['refund_amount'] = $refund['amount']['value'] ?? null; + } else { + $result['error'] = 'Subscription canceled but refund failed'; + } + } else { + $result['error'] = 'Subscription canceled but no payment found to refund'; + } + + return $result; + } + /** * Check if PayPal is configured */ diff --git a/backend/database/migrations/2025_12_17_230000_create_email_verification_tokens_table.php b/backend/database/migrations/2025_12_17_230000_create_email_verification_tokens_table.php new file mode 100644 index 0000000..29d59ed --- /dev/null +++ b/backend/database/migrations/2025_12_17_230000_create_email_verification_tokens_table.php @@ -0,0 +1,27 @@ +id(); + $table->foreignId('user_id')->constrained()->onDelete('cascade'); + $table->string('token', 64)->unique(); + $table->timestamp('expires_at'); + $table->timestamp('used_at')->nullable(); + $table->timestamps(); + + $table->index(['token', 'expires_at']); + }); + } + + public function down(): void + { + Schema::dropIfExists('email_verification_tokens'); + } +}; diff --git a/backend/database/migrations/2025_12_17_232000_add_pending_status_to_subscriptions.php b/backend/database/migrations/2025_12_17_232000_add_pending_status_to_subscriptions.php new file mode 100644 index 0000000..0e11d08 --- /dev/null +++ b/backend/database/migrations/2025_12_17_232000_add_pending_status_to_subscriptions.php @@ -0,0 +1,27 @@ +Olá, {{ $user->name }}

+ +
+

O seu pagamento foi processado com sucesso e a sua subscrição do plano {{ $planName }} está ativa.

+ +
+ + + + + +
+
✓
+ 		+

Pagamento Confirmado

+
+

A sua subscrição está pronta para ser ativada.

+
+ +
+

Detalhes da Subscrição

+
    +
  • Plano: {{ $planName }}
    • +
  • Email: {{ $user->email }}
    • +
+
+ +

Para começar a utilizar o WEBMoney, ative a sua conta clicando no botão abaixo:

+ +
+ ATIVAR CONTA +
+ +
+ + + + + +
+
!
+ 		+

Validade do Link

+
+

Este link é válido por 24 horas. Após este período, será necessário solicitar um novo link de ativação.

+
+
+ + @elseif($locale === 'en') + {{-- English --}} +

Hello, {{ $user->name }}

+ +
+

Your payment has been successfully processed and your {{ $planName }} subscription is active.

+ +
+ + + + + +
+
✓
+ 		+

Payment Confirmed

+
+

Your subscription is ready to be activated.

+
+ +
+

Subscription Details

+
    +
  • Plan: {{ $planName }}
    • +
  • Email: {{ $user->email }}
    • +
+
+ +

To start using WEBMoney, activate your account by clicking the button below:

+ +
+ ACTIVATE ACCOUNT +
+ +
+ + + + + +
+
!
+ 		+

Link Validity

+
+

This link is valid for 24 hours. After this period, you will need to request a new activation link.

+
+
+ + @else + {{-- Spanish (default) --}} +

Hola, {{ $user->name }}

+ +
+

Tu pago ha sido procesado con éxito y tu suscripción al plan {{ $planName }} está activa.

+ +
+ + + + + +
+
✓
+ 		+

Pago Confirmado

+
+

Tu suscripción está lista para ser activada.

+
+ +
+

Detalles de la Suscripción

+
    +
  • Plan: {{ $planName }}
    • +
  • Email: {{ $user->email }}
    • +
+
+ +

Para comenzar a usar WEBMoney, activa tu cuenta haciendo clic en el botón:

+ +
+ ACTIVAR CUENTA +
+ +
+ + + + + +
+
!
+ 		+

Validez del Enlace

+
+

Este enlace es válido por 24 horas. Después de este período, deberás solicitar un nuevo enlace de activación.

+
+
+ @endif +@endsection diff --git a/backend/resources/views/emails/due-payments-alert.blade.php b/backend/resources/views/emails/due-payments-alert.blade.php index e0dc2a9..a3f66f2 100644 --- a/backend/resources/views/emails/due-payments-alert.blade.php +++ b/backend/resources/views/emails/due-payments-alert.blade.php @@ -1,388 +1,461 @@ - - - - - - - - WEBMoney - Alerta de Pagamentos - - - - -
-
-

💰 WEBMoney - Alerta de Pagamentos

-

Olá, {{ $userName }}!

-
+@extends('emails.layouts.base') - -
-
- 💳 Saldo Total Disponível - {{ number_format($totalAvailable, 2, ',', '.') }} {{ $currency }} -
-
- 📋 Total a Pagar - {{ number_format($totalDue, 2, ',', '.') }} {{ $currency }} +@php $locale = $locale ?? 'pt-BR'; @endphp + +@section('title') + @if($locale === 'pt-BR') + Alerta de Pagamentos + @elseif($locale === 'en') + Payment Alert + @else + Alerta de Pagos + @endif +@endsection + +@section('content') + @if($locale === 'pt-BR') + {{-- Portuguese (Brazil) --}} +

Olá, {{ $user->name }}

+ +
+

Este é o seu resumo de pagamentos para os próximos dias.

+ + {{-- Summary Box --}} +
+

Resumo Financeiro

+ + + + + + + + + + + + + +
+ Saldo Disponível + + {{ $currency }} {{ number_format($totalBalance, 2, ',', '.') }} +
+ Total a Pagar + + {{ $currency }} {{ number_format($totalDue, 2, ',', '.') }} +
+ Pagamentos Pendentes + + {{ $totalPayments }} +
+ + {{-- Shortage Alert --}} @if($shortage > 0) -
- ⚠️ Falta - {{ number_format($shortage, 2, ',', '.') }} {{ $currency }} -
- @else -
- ✅ Situação - Saldo suficiente! -
+
+ + + + + +
+
!
+ 		+

Saldo Insuficiente

+
+

+ {{ $currency }} {{ number_format($shortage, 2, ',', '.') }} + em falta para cobrir todos os pagamentos +

+
@endif -
- - @if($shortage > 0) -
-

⚠️ SALDO INSUFICIENTE

-
-{{ number_format($shortage, 2, ',', '.') }} {{ $currency }}
-

Você não tem saldo suficiente para cobrir todos os pagamentos.

-
- @endif - - -
-

💳 Saldo das Contas

- @foreach($accountBalances as $account) - - - @if(count($overdueItems) > 0) -
-

🔴 Pagamentos Vencidos ({{ count($overdueItems) }})

- @foreach($overdueItems as $item) -
-
- {{ $item['description'] }} - {{ number_format($item['amount'], 2, ',', '.') }} {{ $item['currency'] }} -
-
- {{ $item['days_overdue'] }} dias de atraso - • Venceu em {{ \Carbon\Carbon::parse($item['due_date'])->format('d/m/Y') }} - @if($item['account_name']) - • Conta: {{ $item['account_name'] }} - @endif -
+ @elseif($locale === 'en') + {{-- English --}} +

Hello, {{ $user->name }}

+ +
+

Here is your payment summary for the coming days.

+ + {{-- Summary Box --}} +
+

Financial Summary

+ + + + + + + + + + + + + +
+ Available Balance + + {{ $currency }} {{ number_format($totalBalance, 2, '.', ',') }} +
+ Total Due + + {{ $currency }} {{ number_format($totalDue, 2, '.', ',') }} +
+ Pending Payments + + {{ $totalPayments }} +
- @endforeach -
- @endif - - - @if(count($tomorrowItems) > 0) -
-

🟡 Vencem Amanhã ({{ count($tomorrowItems) }})

- @foreach($tomorrowItems as $item) -
-
- {{ $item['description'] }} - {{ number_format($item['amount'], 2, ',', '.') }} {{ $item['currency'] }} + + @if($shortage > 0) +
+ + + + + +
+
!
+ 		+

Insufficient Balance

+
+

+ {{ $currency }} {{ number_format($shortage, 2, '.', ',') }} + short to cover all payments +

-
- Amanhã - • {{ \Carbon\Carbon::parse($item['due_date'])->format('d/m/Y') }} - @if($item['account_name']) - • Conta: {{ $item['account_name'] }} - @endif + @endif + + @if(count($overduePayments) > 0) +
+

+ Overdue Payments +

+ @foreach($overduePayments as $payment) +
+ + + + + + + + +
+ {{ $payment['description'] }} + + {{ $currency }} {{ number_format($payment['amount'], 2, '.', ',') }} +
+ Due {{ \Carbon\Carbon::parse($payment['due_date'])->format('M d, Y') }} + OVERDUE +
+
+ @endforeach
+ @endif + + @if(count($tomorrowPayments) > 0) +
+

+ Due Tomorrow +

+ @foreach($tomorrowPayments as $payment) +
+ + + + + + + + +
+ {{ $payment['description'] }} + + {{ $currency }} {{ number_format($payment['amount'], 2, '.', ',') }} +
+ {{ \Carbon\Carbon::parse($payment['due_date'])->format('M d, Y') }} + TOMORROW +
+
+ @endforeach +
+ @endif + + @if(count($upcomingPayments) > 0) +
+

+ Upcoming Payments +

+ @foreach($upcomingPayments as $payment) +
+ + + + + + + + +
+ {{ $payment['description'] }} + + {{ $currency }} {{ number_format($payment['amount'], 2, '.', ',') }} +
+ {{ \Carbon\Carbon::parse($payment['due_date'])->format('M d, Y') }} +
+
+ @endforeach +
+ @endif + +
+ +
+ VIEW DASHBOARD
- @endforeach
- @endif - - @if(count($payableItems) > 0) -
-

✅ Pagamentos Possíveis ({{ count($payableItems) }})

-

Com base no saldo atual, você consegue pagar:

- @foreach($payableItems as $item) -
-
- {{ $item['description'] }} - {{ number_format($item['amount'], 2, ',', '.') }} {{ $item['currency'] }} -
-
- ✓ Pode pagar - @if($item['account_name']) - • Conta: {{ $item['account_name'] }} - @endif -
+ @else + {{-- Spanish (default) --}} +

Hola, {{ $user->name }}

+ +
+

Este es tu resumen de pagos para los próximos días.

+ + {{-- Summary Box --}} +
+

Resumen Financiero

+ + + + + + + + + + + + + +
+ Saldo Disponible + + {{ $currency }} {{ number_format($totalBalance, 2, ',', '.') }} +
+ Total a Pagar + + {{ $currency }} {{ number_format($totalDue, 2, ',', '.') }} +
+ Pagos Pendientes + + {{ $totalPayments }} +
- @endforeach -
- @endif - - - @if(count($unpayableItems) > 0) -
-

❌ Sem Saldo Suficiente ({{ count($unpayableItems) }})

-

Não há saldo disponível para estes pagamentos:

- @foreach($unpayableItems as $item) -
-
- {{ $item['description'] }} - {{ number_format($item['amount'], 2, ',', '.') }} {{ $item['currency'] }} + + @if($shortage > 0) +
+ + + + + +
+
!
+ 		+

Saldo Insuficiente

+
+

+ {{ $currency }} {{ number_format($shortage, 2, ',', '.') }} + faltan para cubrir todos los pagos +

-
- ✗ Sem saldo - @if($item['account_name']) - • Conta: {{ $item['account_name'] }} - @endif + @endif + + @if(count($overduePayments) > 0) +
+

+ Pagos Vencidos +

+ @foreach($overduePayments as $payment) +
+ + + + + + + + +
+ {{ $payment['description'] }} + + {{ $currency }} {{ number_format($payment['amount'], 2, ',', '.') }} +
+ Venció el {{ \Carbon\Carbon::parse($payment['due_date'])->format('d/m/Y') }} + VENCIDO +
+
+ @endforeach
+ @endif + + @if(count($tomorrowPayments) > 0) +
+

+ Vencen Mañana +

+ @foreach($tomorrowPayments as $payment) +
+ + + + + + + + +
+ {{ $payment['description'] }} + + {{ $currency }} {{ number_format($payment['amount'], 2, ',', '.') }} +
+ {{ \Carbon\Carbon::parse($payment['due_date'])->format('d/m/Y') }} + MAÑANA +
+
+ @endforeach +
+ @endif + + @if(count($upcomingPayments) > 0) +
+

+ Próximos Pagos +

+ @foreach($upcomingPayments as $payment) +
+ + + + + + + + +
+ {{ $payment['description'] }} + + {{ $currency }} {{ number_format($payment['amount'], 2, ',', '.') }} +
+ {{ \Carbon\Carbon::parse($payment['due_date'])->format('d/m/Y') }} +
+
+ @endforeach +
+ @endif + +
+ +
+ VER DASHBOARD
- @endforeach
- @endif - - - @if(count($transferSuggestions) > 0) -
-

💱 Sugestões de Transferência

-

Para cobrir os pagamentos, considere transferir entre suas contas:

- @foreach($transferSuggestions as $transfer) -
-
-
- {{ $transfer['from_account'] }} -
Origem
-
-
→
-
- {{ $transfer['to_account'] }} -
Destino
-
-
-
- {{ number_format($transfer['amount'], 2, ',', '.') }} {{ $currency }} -
-
{{ $transfer['reason'] }}
-
- @endforeach -
- @endif - - - -
-

Este email foi enviado automaticamente pelo sistema WEBMoney para {{ $userName }}.

-

Você recebe esta mensagem porque ativou as notificações de pagamentos.

-

Para desativar estas notificações, acesse Preferências.

-

- WEBMoney - ConneXiFly
- Serviço de gestão financeira pessoal
- Madrid, Espanha -

-

© {{ date('Y') }} WEBMoney - Todos os direitos reservados

-
-
- - + @endif +@endsection diff --git a/backend/resources/views/emails/layouts/base.blade.php b/backend/resources/views/emails/layouts/base.blade.php new file mode 100644 index 0000000..8fbcf67 --- /dev/null +++ b/backend/resources/views/emails/layouts/base.blade.php @@ -0,0 +1,412 @@ + + + + + + + @yield('title') - WEBMoney + + + + + + + diff --git a/backend/resources/views/emails/subscription-cancelled-text.blade.php b/backend/resources/views/emails/subscription-cancelled-text.blade.php new file mode 100644 index 0000000..9589217 --- /dev/null +++ b/backend/resources/views/emails/subscription-cancelled-text.blade.php @@ -0,0 +1,96 @@ +@if($locale === 'pt-BR') +CANCELAMENTO DE ASSINATURA - WEBMONEY +===================================== + +Olá, {{ $userName }}! + +Confirmamos o cancelamento da sua assinatura do plano {{ $planName }}. + +@if($wasRefunded) +✅ REEMBOLSO PROCESSADO +----------------------- +Processamos um reembolso total no valor de: {{ $refundAmount }} + +O reembolso será creditado na sua forma de pagamento original em até 5-10 dias úteis, dependendo do seu banco. +@endif + +O QUE ACONTECE AGORA? +--------------------- +• Seu acesso premium foi encerrado imediatamente +• Você ainda pode acessar sua conta com funcionalidades básicas +• Seus dados foram preservados caso queira voltar + +Sentimos muito vê-lo partir! Se tiver qualquer dúvida ou feedback, não hesite em nos contatar. + +Se mudar de ideia, você sempre pode assinar novamente: +{{ config('app.frontend_url', 'https://webmoney.cnxifly.com') }}/pricing + +--- +Este email foi enviado para {{ $userEmail }} +© {{ date('Y') }} WEBMoney - ConneXiFly +Precisa de ajuda? Responda este email. + +@elseif($locale === 'en') +SUBSCRIPTION CANCELLATION - WEBMONEY +==================================== + +Hello, {{ $userName }}! + +We confirm the cancellation of your {{ $planName }} subscription. + +@if($wasRefunded) +✅ REFUND PROCESSED +------------------- +We have processed a full refund of: {{ $refundAmount }} + +The refund will be credited to your original payment method within 5-10 business days, depending on your bank. +@endif + +WHAT HAPPENS NOW? +----------------- +• Your premium access has ended immediately +• You can still access your account with basic features +• Your data has been preserved in case you want to return + +We're sorry to see you go! If you have any questions or feedback, please don't hesitate to contact us. + +If you change your mind, you can always subscribe again: +{{ config('app.frontend_url', 'https://webmoney.cnxifly.com') }}/pricing + +--- +This email was sent to {{ $userEmail }} +© {{ date('Y') }} WEBMoney - ConneXiFly +Need help? Reply to this email. + +@else +CANCELACIÓN DE SUSCRIPCIÓN - WEBMONEY +===================================== + +¡Hola, {{ $userName }}! + +Confirmamos la cancelación de tu suscripción al plan {{ $planName }}. + +@if($wasRefunded) +✅ REEMBOLSO PROCESADO +---------------------- +Hemos procesado un reembolso total por el valor de: {{ $refundAmount }} + +El reembolso se acreditará en tu método de pago original en un plazo de 5-10 días hábiles, dependiendo de tu banco. +@endif + +¿QUÉ SUCEDE AHORA? +------------------ +• Tu acceso premium ha finalizado inmediatamente +• Puedes seguir accediendo a tu cuenta con funciones básicas +• Tus datos han sido preservados por si deseas volver + +¡Sentimos mucho verte partir! Si tienes alguna pregunta o comentario, no dudes en contactarnos. + +Si cambias de opinión, siempre puedes volver a suscribirte: +{{ config('app.frontend_url', 'https://webmoney.cnxifly.com') }}/pricing + +--- +Este correo fue enviado a {{ $userEmail }} +© {{ date('Y') }} WEBMoney - ConneXiFly +¿Necesitas ayuda? Responde a este correo. +@endif diff --git a/backend/resources/views/emails/subscription-cancelled.blade.php b/backend/resources/views/emails/subscription-cancelled.blade.php new file mode 100644 index 0000000..11d2001 --- /dev/null +++ b/backend/resources/views/emails/subscription-cancelled.blade.php @@ -0,0 +1,164 @@ +@extends('emails.layouts.base') + +@section('title') + @if($locale === 'pt-BR') + Cancelamento de Assinatura + @elseif($locale === 'en') + Subscription Cancellation + @else + Cancelación de Suscripción + @endif +@endsection + +@section('content') + @if($locale === 'pt-BR') + {{-- Portuguese (Brazil) --}} +

Olá, {{ $userName }}

+ +
+

Confirmamos o cancelamento da sua assinatura do plano {{ $planName }}.

+ + @if($wasRefunded) +
+ + + + + +
+
✓
+ 		+

Reembolso Processado

+
+

Valor reembolsado conforme garantia de 7 dias:

+ {{ $refundAmount }} +

+ Prazo: 5-10 dias úteis para crédito na forma de pagamento original. +

+
+ @endif + +
+

Informações Importantes

+
    +
  • Acesso premium encerrado
    • +
  • Conta disponível com funcionalidades básicas
    • +
  • Seus dados foram preservados
    • +
  • Reativação disponível a qualquer momento
    • +
+
+ +
+ +

+ Agradecemos por ter sido nosso cliente. +

+ +
+ + VER PLANOS + +
+
+ + @elseif($locale === 'en') + {{-- English --}} +

Hello, {{ $userName }}

+ +
+

We confirm the cancellation of your {{ $planName }} subscription.

+ + @if($wasRefunded) +
+ + + + + +
+
✓
+ 		+

Refund Processed

+
+

Amount refunded per our 7-day guarantee:

+ {{ $refundAmount }} +

+ Timeline: 5-10 business days to credit your original payment method. +

+
+ @endif + +
+

Important Information

+
    +
  • Premium access ended
    • +
  • Account available with basic features
    • +
  • Your data has been preserved
    • +
  • Reactivation available anytime
    • +
+
+ +
+ +

+ Thank you for being our customer. +

+ +
+ + VIEW PLANS + +
+
+ + @else + {{-- Spanish (default) --}} +

Hola, {{ $userName }}

+ +
+

Confirmamos la cancelación de tu suscripción al plan {{ $planName }}.

+ + @if($wasRefunded) +
+ + + + + +
+
✓
+ 		+

Reembolso Procesado

+
+

Monto reembolsado según garantía de 7 días:

+ {{ $refundAmount }} +

+ Plazo: 5-10 días hábiles para acreditar en tu método de pago original. +

+
+ @endif + +
+

Información Importante

+
    +
  • Acceso premium finalizado
    • +
  • Cuenta disponible con funciones básicas
    • +
  • Tus datos han sido preservados
    • +
  • Reactivación disponible en cualquier momento
    • +
+
+ +
+ +

+ Gracias por haber sido nuestro cliente. +

+ +
+ + VER PLANES + +
+
+ @endif +@endsection diff --git a/backend/resources/views/emails/welcome-new-user.blade.php b/backend/resources/views/emails/welcome-new-user.blade.php index ea5a855..8ea65c5 100644 --- a/backend/resources/views/emails/welcome-new-user.blade.php +++ b/backend/resources/views/emails/welcome-new-user.blade.php @@ -1,294 +1,181 @@ - - - - - - - @if($language === 'pt-BR') - Bem-vindo ao WebMoney - @elseif($language === 'en') - Welcome to WebMoney - @else - Bienvenido a WebMoney - @endif - - - - -
-
- +@extends('emails.layouts.base') + +@php $locale = $language ?? 'es'; @endphp + +@section('title') + @if($locale === 'pt-BR') + Bem-vindo ao WEBMoney + @elseif($locale === 'en') + Welcome to WEBMoney + @else + Bienvenido a WEBMoney + @endif +@endsection + +@section('content') + @if($locale === 'pt-BR') + {{-- Portuguese (Brazil) --}} +

Olá, {{ $user->name }}

+ +
+

Bem-vindo ao WEBMoney! A sua conta foi criada com sucesso.

+ +
+

Credenciais de Acesso

+ + + + + + + + +
+ Email
+ {{ $user->email }} +
+ Palavra-passe
+ {{ $password }} +
+
+ +
+ + + + + +
+
!
+ 		+

Segurança

+
+

Recomendamos que altere a sua palavra-passe após o primeiro login. Guarde estas credenciais em local seguro.

+
+ +
+

O que pode fazer

+
    +
  • Registar receitas e despesas
    • +
  • Visualizar relatórios e gráficos
    • +
  • Gerir o seu orçamento mensal
    • +
  • Exportar dados em múltiplos formatos
    • +
+
+ +
+ INICIAR SESSÃO +
- @if($language === 'pt-BR') - {{-- PORTUGUÊS --}} -

Olá, {{ $user->name }}! 👋

+ @elseif($locale === 'en') + {{-- English --}} +

Hello, {{ $user->name }}

+ +
+

Welcome to WEBMoney! Your account has been successfully created.

-

Sua conta WebMoney foi criada com sucesso. Estamos muito felizes em tê-lo conosco!

- -

Abaixo estão suas credenciais de acesso:

- -
-

🔐 Suas Credenciais

-
-
Email
-
{{ $user->email }}
-
-
-
Senha Temporária
-
{{ $temporaryPassword }}
-
+
+

Access Credentials

+ + + + + + + + +
+ Email
+ {{ $user->email }} +
+ Password
+ {{ $password }} +
-
-

⚠️ Importante: Recomendamos que você altere sua senha após o primeiro login por motivos de segurança.

+
+ + + + + +
+
!
+ 		+

Security

+
+

We recommend changing your password after your first login. Keep these credentials in a safe place.

- - -
-

🚀 O que você pode fazer com o WebMoney:

-
    -
  • Gerenciar todas suas contas bancárias em um só lugar
    • -
  • Categorizar receitas e despesas automaticamente
    • -
  • Criar orçamentos e acompanhar seus gastos
    • -
  • Visualizar relatórios e gráficos detalhados
    • -
  • Definir metas financeiras e alcançá-las
    • +
    +

    What you can do

    +
      +
    • Record income and expenses
      • +
    • View reports and charts
      • +
    • Manage your monthly budget
      • +
    • Export data in multiple formats
    -

    Se você tiver alguma dúvida ou precisar de ajuda, não hesite em nos contatar.

    - -

    Atenciosamente,
    Equipe WebMoney

    - - @elseif($language === 'en') - {{-- ENGLISH --}} -

    Hello, {{ $user->name }}! 👋

    - -

    Your WebMoney account has been successfully created. We're thrilled to have you with us!

    - -

    Below are your login credentials:

    - -
    -

    🔐 Your Credentials

    -
    -
    Email
    -
    {{ $user->email }}
    -
    -
    -
    Temporary Password
    -
    {{ $temporaryPassword }}
    -
    +
    + SIGN IN
    - -
    -

    ⚠️ Important: We recommend changing your password after your first login for security purposes.

    -
    - - - -
    -

    🚀 What you can do with WebMoney:

    -
      -
    • Manage all your bank accounts in one place
      • -
    • Automatically categorize income and expenses
      • -
    • Create budgets and track your spending
      • -
    • View detailed reports and charts
      • -
    • Set financial goals and achieve them
      • -
    -
    - -

    If you have any questions or need help, don't hesitate to contact us.

    - -

    Best regards,
    The WebMoney Team

    - - @else - {{-- ESPAÑOL (default) --}} -

    ¡Hola, {{ $user->name }}! 👋

    - -

    Tu cuenta de WebMoney ha sido creada exitosamente. ¡Estamos muy contentos de tenerte con nosotros!

    - -

    A continuación encontrarás tus credenciales de acceso:

    - -
    -

    🔐 Tus Credenciales

    -
    -
    Email
    -
    {{ $user->email }}
    -
    -
    -
    Contraseña Temporal
    -
    {{ $temporaryPassword }}
    -
    -
    - -
    -

    ⚠️ Importante: Te recomendamos cambiar tu contraseña después de tu primer inicio de sesión por motivos de seguridad.

    -
    - - - -
    -

    🚀 Lo que puedes hacer con WebMoney:

    -
      -
    • Gestionar todas tus cuentas bancarias en un solo lugar
      • -
    • Categorizar ingresos y gastos automáticamente
      • -
    • Crear presupuestos y hacer seguimiento de tus gastos
      • -
    • Ver informes y gráficos detallados
      • -
    • Establecer metas financieras y alcanzarlas
      • -
    -
    - -

    Si tienes alguna pregunta o necesitas ayuda, no dudes en contactarnos.

    - -

    Saludos cordiales,
    El Equipo de WebMoney

    - @endif - -
    -

    © {{ date('Y') }} WebMoney. - @if($language === 'pt-BR') - Todos os direitos reservados. - @elseif($language === 'en') - All rights reserved. - @else - Todos los derechos reservados. - @endif -

    -

    - {{ $loginUrl }} -

    -
    - - + + @else + {{-- Spanish (default) --}} +

    Hola, {{ $user->name }}

    + +
    +

    Bienvenido a WEBMoney. Tu cuenta ha sido creada exitosamente.

    + +
    +

    Credenciales de Acceso

    + + + + + + + + +
    + Email
    + {{ $user->email }} +
    + Contraseña
    + {{ $password }} +
    +
    + +
    + + + + + +
    +
    !
    +     		+

    Seguridad

    +
    +

    Recomendamos cambiar tu contraseña después del primer inicio de sesión. Guarda estas credenciales en un lugar seguro.

    +
    + +
    +

    Qué puedes hacer

    +
      +
    • Registrar ingresos y gastos
      • +
    • Visualizar reportes y gráficos
      • +
    • Gestionar tu presupuesto mensual
      • +
    • Exportar datos en múltiples formatos
      • +
    +
    + +
    + INICIAR SESIÓN +
    +
    + @endif +@endsection diff --git a/backend/resources/views/emails/welcome.blade.php b/backend/resources/views/emails/welcome.blade.php index b2154b6..6e5a27d 100644 --- a/backend/resources/views/emails/welcome.blade.php +++ b/backend/resources/views/emails/welcome.blade.php @@ -1,113 +1,142 @@ - - - - - - - Bienvenido a WEBMoney - - - - - - - -
    - - +@extends('emails.layouts.base') + +@php $locale = $locale ?? 'es'; @endphp + +@section('title') + @if($locale === 'pt-BR') + Bem-vindo ao WEBMoney + @elseif($locale === 'en') + Welcome to WEBMoney + @else + Bienvenido a WEBMoney + @endif +@endsection + +@section('content') + @if($locale === 'pt-BR') + {{-- Portuguese (Brazil) --}} +

    Olá, {{ $userName }}

    + +
    +

    A sua conta no WEBMoney foi criada com sucesso. Já pode começar a gerir as suas finanças pessoais de forma fácil e segura.

    + +
    +
    - - - - - - - - - - -
    -

    - 🎉 ¡Bienvenido a WEBMoney! -

    +     		+
    ✓
    -

    - Hola {{ $userName }}, -

    - -

    - ¡Gracias por registrarte en WEBMoney! Tu cuenta ha sido creada exitosamente y ya puedes comenzar a gestionar tus finanzas personales de manera fácil y segura. -

    - -
    -

    - 📧 Cuenta registrada: -

    -

    - {{ $userEmail }} -

    -
    - -

    - ¿Qué puedes hacer ahora? -

    - -
      -
    • 📊 Registrar tus ingresos y gastos
      • -
    • 📈 Visualizar reportes y gráficos
      • -
    • 💰 Gestionar tu presupuesto mensual
      • -
    • 📄 Exportar datos en múltiples formatos
      • -
    - - - - - -
    - - Iniciar Sesión Ahora - -
    - -

    - Si tienes alguna pregunta o necesitas ayuda, no dudes en contactarnos respondiendo a este email. -

    - -

    - ¡Gracias por confiar en nosotros! -

    -
    -

    - WEBMoney - Tu gestor financiero personal -

    -

    - ConneXiFly · webmoney.cnxifly.com -

    -

    - Este es un correo automático. Por favor, no respondas directamente a este mensaje. -
    - Para soporte, escríbenos a: support@cnxifly.com -

    +     		+

    Conta Registada
    +

    Email: {{ $userEmail }}

    + + +
    +

    Funcionalidades Disponíveis

    +
      +
    • Registar receitas e despesas
      • +
    • Visualizar relatórios e gráficos
      • +
    • Gerir o seu orçamento mensal
      • +
    • Exportar dados em múltiplos formatos
      • +
    +
    + +
    + INICIAR SESSÃO +
    + +
    + +

    + Obrigado por confiar em nós. +

    + - - + @elseif($locale === 'en') + {{-- English --}} +

    Hello, {{ $userName }}

    + +
    +

    Your WEBMoney account has been successfully created. You can now start managing your personal finances easily and securely.

    + +
    +
    - +
    -

    - © 2025 ConneXiFly. Todos los derechos reservados. -
    - Si no solicitaste esta cuenta, ignora este correo. -

    +     		+
    ✓
    +     		+

    Account Registered
    -
    - - +

    Email: {{ $userEmail }}

    +
+ +
+

Available Features

+
    +
  • Record income and expenses
    • +
  • View reports and charts
    • +
  • Manage your monthly budget
    • +
  • Export data in multiple formats
    • +
+
+ +
+ SIGN IN +
+ +
+ +

+ Thank you for trusting us. +

+
+ + @else + {{-- Spanish (default) --}} +

Hola, {{ $userName }}

+ +
+

Tu cuenta en WEBMoney ha sido creada exitosamente. Ya puedes comenzar a gestionar tus finanzas personales de manera fácil y segura.

+ +
+ + + + + +
+
✓
+ 		+

Cuenta Registrada

+
+

Email: {{ $userEmail }}

+
+ +
+

Funcionalidades Disponibles

+
    +
  • Registrar ingresos y gastos
    • +
  • Visualizar reportes y gráficos
    • +
  • Gestionar tu presupuesto mensual
    • +
  • Exportar datos en múltiples formatos
    • +
+
+ +
+ INICIAR SESIÓN +
+ +
+ +

+ Gracias por confiar en nosotros. +

+
+ @endif +@endsection diff --git a/backend/routes/api.php b/backend/routes/api.php index 6abf342..5620f9b 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -31,6 +31,11 @@ Route::post('/register', [AuthController::class, 'register'])->middleware('throttle:register'); Route::post('/login', [AuthController::class, 'login'])->middleware('throttle:login'); +// Account activation (public) +Route::post('/activate', [AuthController::class, 'activateAccount']); +Route::post('/resend-activation', [AuthController::class, 'resendActivation']); +Route::post('/cancel-registration', [AuthController::class, 'cancelRegistration']); + // Plans (public - for pricing page) Route::get('/plans', [PlanController::class, 'index']); Route::get('/plans/{slug}', [PlanController::class, 'show']); @@ -41,6 +46,12 @@ // PayPal webhook (public - called by PayPal) Route::post('/paypal/webhook', [SubscriptionController::class, 'webhook']); +// Subscription start for new users (public - used after registration) +Route::post('/subscription/start', [SubscriptionController::class, 'startSubscription']); + +// Subscription confirm for new users (public - called after PayPal redirect) +Route::post('/subscription/confirm-public', [SubscriptionController::class, 'confirmPublic']); + // Email testing routes (should be protected in production) Route::post('/email/send-test', [EmailTestController::class, 'sendTest']); Route::get('/email/anti-spam-info', [EmailTestController::class, 'getAntiSpamInfo']); diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index b5cb7fc..6d694d0 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -29,6 +29,8 @@ import Billing from './pages/Billing'; import Users from './pages/Users'; import SiteSettings from './pages/SiteSettings'; import Register from './pages/Register'; +import ActivateAccount from './pages/ActivateAccount'; +import PaymentSuccess from './pages/PaymentSuccess'; function App() { return ( @@ -38,6 +40,8 @@ function App() { } /> } /> + } /> + } /> { const { isAuthenticated, loading } = useAuth(); + + // Verificar também o token no localStorage (para casos de navegação imediata após registro) + const hasToken = !!localStorage.getItem('token'); if (loading) { return ( @@ -15,7 +18,7 @@ const ProtectedRoute = ({ children }) => { ); } - return isAuthenticated ? children : ; + return (isAuthenticated || hasToken) ? children : ; }; export default ProtectedRoute; diff --git a/frontend/src/context/AuthContext.jsx b/frontend/src/context/AuthContext.jsx index 375808a..01d8862 100644 --- a/frontend/src/context/AuthContext.jsx +++ b/frontend/src/context/AuthContext.jsx @@ -25,10 +25,9 @@ export const AuthProvider = ({ children }) => { }; const register = async (userData) => { + // Register but don't set user - user needs PayPal payment + email activation first const response = await authService.register(userData); - if (response.success) { - setUser(response.data.user); - } + // Don't set user here - wait for activation return response; }; diff --git a/frontend/src/i18n/locales/en.json b/frontend/src/i18n/locales/en.json index ff3c7ef..7ec0f47 100644 --- a/frontend/src/i18n/locales/en.json +++ b/frontend/src/i18n/locales/en.json @@ -77,7 +77,56 @@ "loginSuccess": "Successfully logged in", "loginError": "Login error", "logoutSuccess": "Successfully logged out", - "invalidCredentials": "Invalid credentials" + "invalidCredentials": "Invalid credentials", + "createAccount": "Create your account", + "backToLogin": "Back to login", + "goToLogin": "Go to login" + }, + "login": { + "noAccount": "Don't have an account?", + "createAccount": "Create one here", + "noSubscription": "You don't have an active subscription. Please complete the payment." + }, + "errors": { + "connection": "Connection error. Please try again.", + "resendFailed": "Error resending email", + "subscriptionFailed": "Error creating subscription. Please try again." + }, + "register": { + "selectPlan": "Select a plan", + "repeatPassword": "Repeat your password", + "continueToPayment": "Continue to payment", + "createAccount": "Create Account", + "alreadyHaveAccount": "Already have an account?", + "loginHere": "Login here", + "paymentCanceled": "Payment was canceled. You can try again." + }, + "activate": { + "activating": "Activating your account...", + "pleaseWait": "Please wait while we activate your account.", + "successTitle": "Account Activated!", + "success": "Your account has been successfully activated. You can now use WEBMoney!", + "errorTitle": "Activation Error", + "error": "Could not activate your account. The link may have expired.", + "invalidLink": "Invalid activation link.", + "redirecting": "Redirecting in {{seconds}} seconds...", + "goToDashboard": "Go to Dashboard", + "checkEmail": "Check your email", + "checkEmailMessage": "We sent an activation email to {{email}}. Click the link to activate your account.", + "didntReceive": "Didn't receive the email?", + "resend": "Resend email", + "resendSuccess": "Email resent successfully!" + }, + "payment": { + "confirming": "Confirming payment...", + "pleaseWait": "Please wait while we process your payment.", + "successTitle": "Payment Confirmed!", + "successMessage": "Your subscription has been successfully confirmed.", + "checkYourEmail": "Check your email!", + "activationSent": "We sent an activation email to {{email}}. Click the link to activate your account and start using WEBMoney.", + "errorTitle": "Payment Error", + "error": "Error confirming payment", + "noSubscriptionId": "Subscription ID not found" }, "nav": { "dashboard": "Dashboard", @@ -2019,6 +2068,7 @@ "lastNamePlaceholder": "Your last name", "lastNameRequired": "Last name is required", "name": "Name", + "namePlaceholder": "Your name", "email": "Email", "phone": "Phone", "phoneRequired": "Phone number is required", @@ -2053,6 +2103,7 @@ "billedAnnually": "Billed annually €{{price}}", "save": "Save {{percent}}%", "trialDays": "{{days}}-day free trial", + "trial": "trial", "mostPopular": "Most Popular", "currentPlan": "Current Plan", "startFree": "Start Free", @@ -2065,6 +2116,16 @@ "securePayment": "Secure payment", "cancelAnytime": "Cancel anytime", "paypalSecure": "Secure payment with PayPal", + "comingSoon": "Coming Soon", + "forPymes": "Tools for SMEs", + "features": { + "multiUsers": "Multiple users", + "integratedBilling": "Integrated billing", + "advancedReports": "Advanced reports", + "apiAccess": "API access", + "prioritySupport": "Priority support", + "dedicatedManager": "Dedicated account manager" + }, "faq": { "title": "Frequently Asked Questions", "q1": "Can I change plans at any time?", @@ -2102,7 +2163,8 @@ "trialing": "Trial", "canceled": "Canceled", "expired": "Expired", - "past_due": "Past Due" + "past_due": "Past Due", + "pending": "Pending" }, "invoiceStatus": { "paid": "Paid", @@ -2116,13 +2178,20 @@ "subscriptionConfirmed": "Subscription confirmed successfully!", "confirmError": "Error confirming subscription", "subscriptionCanceled": "Subscription canceled", + "subscriptionCanceledRefunded": "Subscription canceled and refund processed", "cancelError": "Error canceling subscription", "cancelConfirmTitle": "Cancel subscription?", "cancelConfirmMessage": "Are you sure you want to cancel your subscription?", "cancelNote1": "You'll keep access until the end of the current period", "cancelNote2": "Your data will not be deleted", "cancelNote3": "You can reactivate your subscription at any time", - "confirmCancel": "Yes, Cancel" + "confirmCancel": "Yes, Cancel", + "guaranteePeriod": "Guarantee Period", + "guaranteeMessage": "You have {{days}} day(s) remaining in the 7-day guarantee period. You can cancel and receive a full refund.", + "guaranteeBadge": "Guarantee: {{days}} days", + "requestRefund": "Request full refund", + "refundNote": "The refund will be processed by PayPal within 5-10 business days.", + "cancelAndRefund": "Cancel and Refund" }, "landing": { "nav": { @@ -2133,41 +2202,38 @@ "register": "Start Now" }, "hero": { - "title": "Take Control of Your", - "titleHighlight": "Finances", + "title": "Take Control of Your Finances", "subtitle": "Intelligent financial management for individuals and businesses. Track income, expenses, and achieve your financial goals.", "cta": "Start Free", - "ctaSecondary": "View Plans", - "previewBalance": "Total Balance", - "previewIncome": "Income", - "previewExpense": "Expenses" + "learnMore": "Learn More", + "secure": "100% Secure" }, "features": { "title": "Everything You Need", "subtitle": "Powerful tools to manage your money", - "item1": { + "accounts": { "title": "Multiple Accounts", "description": "Manage bank accounts, cards, and cash in one place" }, - "item2": { - "title": "Smart Categories", - "description": "Automatic categorization with keywords and subcategories" - }, - "item3": { - "title": "Bank Import", - "description": "Import statements from Excel, CSV, OFX, and PDF" - }, - "item4": { + "analytics": { "title": "Detailed Reports", "description": "Charts and analysis to understand your spending" }, - "item5": { - "title": "Goals & Budgets", - "description": "Define goals and control monthly spending" + "categories": { + "title": "Smart Categories", + "description": "Automatic categorization with keywords and subcategories" }, - "item6": { - "title": "Multi-currency", - "description": "Manage finances in different currencies" + "import": { + "title": "Bank Import", + "description": "Import statements from Excel, CSV, OFX, and PDF" + }, + "recurring": { + "title": "Recurring Transactions", + "description": "Automate bills, subscriptions and recurring income" + }, + "security": { + "title": "Total Security", + "description": "Bank-level encryption to protect your data" } }, "pricing": { @@ -2176,11 +2242,34 @@ "monthly": "Monthly", "annual": "Annual", "popular": "Most Popular", - "perMonth": "/month", - "perYear": "/year", + "month": "month", + "year": "year", + "free": "Free", "startFree": "Start Free", "subscribe": "Subscribe Now", - "billedAnnually": "Billed annually" + "billedAnnually": "Billed annually €{{price}}", + "comingSoon": "Coming Soon", + "forPymes": "Tools for SMEs", + "features": { + "oneAccount": "1 bank account", + "tenCategories": "10 categories", + "hundredSubcategories": "100 subcategories", + "thousandTransactions": "1,000 transactions", + "unlimitedAccounts": "Unlimited accounts", + "unlimitedCategories": "Unlimited categories", + "unlimitedTransactions": "Unlimited transactions", + "multiUsers": "Multiple users", + "integratedBilling": "Integrated billing", + "advancedReports": "Advanced reports", + "cashFlow": "Cash flow management", + "budgetControl": "Budget control by project", + "businessModule": "Business module", + "prioritySupport": "Priority support" + }, + "goldTeaser": { + "title": "GOLD Plan Coming Soon", + "description": "Direct online synchronization with your bank. Connect your accounts and see your transactions automatically updated in real-time." + } }, "faq": { "title": "Frequently Asked Questions", @@ -2190,8 +2279,8 @@ "a2": "Yes, you can cancel your subscription at any time without fees. You'll keep access until the end of the period you already paid.", "q3": "Which banks are compatible?", "a3": "You can import statements from any bank that exports to Excel, CSV, OFX, or PDF. We have predefined mappings for major banks.", - "q4": "How does the free trial work?", - "a4": "You get full access to all features during the trial period. No credit card required to start. At the end, choose the plan that fits your needs." + "q4": "How does the 7-day guarantee work?", + "a4": "You pay via PayPal and get immediate full access to all features. If you're not satisfied, cancel within 7 days and receive a full refund, no questions asked." }, "cta": { "title": "Ready to Transform Your Finances?", @@ -2199,17 +2288,10 @@ "button": "Create Free Account" }, "footer": { - "description": "Smart Financial Management for individuals and businesses.", - "product": "Product", - "company": "Company", - "legal": "Legal", - "features": "Features", - "pricing": "Pricing", - "about": "About Us", - "contact": "Contact", + "rights": "All rights reserved.", "privacy": "Privacy Policy", "terms": "Terms of Use", - "rights": "All rights reserved." + "contact": "Contact" } } } \ No newline at end of file diff --git a/frontend/src/i18n/locales/es.json b/frontend/src/i18n/locales/es.json index 6ab243b..aad0982 100644 --- a/frontend/src/i18n/locales/es.json +++ b/frontend/src/i18n/locales/es.json @@ -78,7 +78,56 @@ "loginSuccess": "Sesión iniciada correctamente", "loginError": "Error al iniciar sesión", "logoutSuccess": "Sesión cerrada correctamente", - "invalidCredentials": "Credenciales inválidas" + "invalidCredentials": "Credenciales inválidas", + "createAccount": "Crea tu cuenta", + "backToLogin": "Volver al login", + "goToLogin": "Ir al login" + }, + "login": { + "noAccount": "¿No tienes cuenta?", + "createAccount": "Crea una aquí", + "noSubscription": "No tienes una suscripción activa. Por favor, completa el pago." + }, + "errors": { + "connection": "Error de conexión. Intenta de nuevo.", + "resendFailed": "Error al reenviar email", + "subscriptionFailed": "Error al crear suscripción. Intenta de nuevo." + }, + "register": { + "selectPlan": "Selecciona un plan", + "repeatPassword": "Repite tu contraseña", + "continueToPayment": "Continuar al pago", + "createAccount": "Crear Cuenta", + "alreadyHaveAccount": "¿Ya tienes cuenta?", + "loginHere": "Inicia sesión aquí", + "paymentCanceled": "El pago fue cancelado. Puedes intentarlo de nuevo." + }, + "activate": { + "activating": "Activando tu cuenta...", + "pleaseWait": "Por favor, espera mientras activamos tu cuenta.", + "successTitle": "¡Cuenta Activada!", + "success": "Tu cuenta ha sido activada exitosamente. ¡Ya puedes usar WEBMoney!", + "errorTitle": "Error de Activación", + "error": "No se pudo activar tu cuenta. El enlace puede haber expirado.", + "invalidLink": "Enlace de activación inválido.", + "redirecting": "Redirigiendo en {{seconds}} segundos...", + "goToDashboard": "Ir al Panel", + "checkEmail": "Revisa tu email", + "checkEmailMessage": "Hemos enviado un email de activación a {{email}}. Haz clic en el enlace para activar tu cuenta.", + "didntReceive": "¿No recibiste el email?", + "resend": "Reenviar email", + "resendSuccess": "¡Email reenviado exitosamente!" + }, + "payment": { + "confirming": "Confirmando pago...", + "pleaseWait": "Por favor, espera mientras procesamos tu pago.", + "successTitle": "¡Pago Confirmado!", + "successMessage": "Tu suscripción ha sido confirmada exitosamente.", + "checkYourEmail": "¡Revisa tu email!", + "activationSent": "Hemos enviado un email de activación a {{email}}. Haz clic en el enlace para activar tu cuenta y comenzar a usar WEBMoney.", + "errorTitle": "Error de Pago", + "error": "Error al confirmar el pago", + "noSubscriptionId": "ID de suscripción no encontrado" }, "nav": { "dashboard": "Panel", @@ -2011,6 +2060,7 @@ "lastNamePlaceholder": "Tus apellidos", "lastNameRequired": "Los apellidos son obligatorios", "name": "Nombre", + "namePlaceholder": "Tu nombre", "email": "Correo electrónico", "phone": "Teléfono", "phoneRequired": "El teléfono es obligatorio", @@ -2045,6 +2095,7 @@ "billedAnnually": "Facturado anualmente €{{price}}", "save": "Ahorra {{percent}}%", "trialDays": "{{days}} días de prueba gratis", + "trial": "de prueba", "mostPopular": "Más Popular", "currentPlan": "Plan Actual", "startFree": "Comenzar Gratis", @@ -2057,6 +2108,16 @@ "securePayment": "Pago seguro", "cancelAnytime": "Cancela cuando quieras", "paypalSecure": "Pago seguro con PayPal", + "comingSoon": "Próximamente", + "forPymes": "Herramientas para PyMEs", + "features": { + "multiUsers": "Múltiples usuarios", + "integratedBilling": "Facturación integrada", + "advancedReports": "Reportes avanzados", + "apiAccess": "Acceso a API", + "prioritySupport": "Soporte prioritario", + "dedicatedManager": "Gestor de cuenta dedicado" + }, "faq": { "title": "Preguntas Frecuentes", "q1": "¿Puedo cambiar de plan en cualquier momento?", @@ -2104,7 +2165,8 @@ "trialing": "En Prueba", "canceled": "Cancelada", "expired": "Expirada", - "past_due": "Pago Pendiente" + "past_due": "Pago Pendiente", + "pending": "Pendiente" }, "invoiceStatus": { "paid": "Pagada", @@ -2118,13 +2180,20 @@ "subscriptionConfirmed": "¡Suscripción confirmada con éxito!", "confirmError": "Error al confirmar la suscripción", "subscriptionCanceled": "Suscripción cancelada", + "subscriptionCanceledRefunded": "Suscripción cancelada y reembolso procesado", "cancelError": "Error al cancelar la suscripción", "cancelConfirmTitle": "¿Cancelar suscripción?", "cancelConfirmMessage": "¿Estás seguro de que deseas cancelar tu suscripción?", "cancelNote1": "Mantendrás acceso hasta el final del período actual", "cancelNote2": "Tus datos no se eliminarán", "cancelNote3": "Puedes reactivar tu suscripción en cualquier momento", - "confirmCancel": "Sí, Cancelar" + "confirmCancel": "Sí, Cancelar", + "guaranteePeriod": "Período de Garantía", + "guaranteeMessage": "Te quedan {{days}} día(s) en el período de garantía de 7 días. Puedes cancelar y recibir un reembolso total.", + "guaranteeBadge": "Garantía: {{days}} días", + "requestRefund": "Solicitar reembolso total", + "refundNote": "El reembolso será procesado por PayPal en 5-10 días hábiles.", + "cancelAndRefund": "Cancelar y Reembolsar" }, "landing": { "nav": { @@ -2135,41 +2204,38 @@ "register": "Empezar Ahora" }, "hero": { - "title": "Toma el Control de tus", - "titleHighlight": "Finanzas", + "title": "Toma el Control de tus Finanzas", "subtitle": "Gestión financiera inteligente para personas y empresas. Controla ingresos, gastos y alcanza tus metas financieras.", "cta": "Comenzar Gratis", - "ctaSecondary": "Ver Planes", - "previewBalance": "Saldo Total", - "previewIncome": "Ingresos", - "previewExpense": "Gastos" + "learnMore": "Saber Más", + "secure": "100% Seguro" }, "features": { "title": "Todo lo que Necesitas", "subtitle": "Herramientas potentes para gestionar tu dinero", - "item1": { + "accounts": { "title": "Múltiples Cuentas", "description": "Gestiona cuentas bancarias, tarjetas y efectivo en un solo lugar" }, - "item2": { - "title": "Categorías Inteligentes", - "description": "Categorización automática con palabras clave y subcategorías" - }, - "item3": { - "title": "Importación Bancaria", - "description": "Importa extractos de Excel, CSV, OFX y PDF" - }, - "item4": { + "analytics": { "title": "Reportes Detallados", "description": "Gráficos y análisis para entender tus gastos" }, - "item5": { - "title": "Metas y Presupuestos", - "description": "Define objetivos y controla gastos mensuales" + "categories": { + "title": "Categorías Inteligentes", + "description": "Categorización automática con palabras clave y subcategorías" }, - "item6": { - "title": "Multi-moneda", - "description": "Gestiona finanzas en diferentes monedas" + "import": { + "title": "Importación Bancaria", + "description": "Importa extractos de Excel, CSV, OFX y PDF" + }, + "recurring": { + "title": "Transacciones Recurrentes", + "description": "Automatiza facturas, suscripciones e ingresos recurrentes" + }, + "security": { + "title": "Seguridad Total", + "description": "Cifrado de nivel bancario para proteger tus datos" } }, "pricing": { @@ -2178,11 +2244,34 @@ "monthly": "Mensual", "annual": "Anual", "popular": "Más Popular", - "perMonth": "/mes", - "perYear": "/año", + "month": "mes", + "year": "año", + "free": "Gratis", "startFree": "Comenzar Gratis", "subscribe": "Suscribirse Ahora", - "billedAnnually": "Facturado anualmente" + "billedAnnually": "Facturado anualmente €{{price}}", + "comingSoon": "Próximamente", + "forPymes": "Herramientas para PyMEs", + "features": { + "oneAccount": "1 cuenta bancaria", + "tenCategories": "10 categorías", + "hundredSubcategories": "100 subcategorías", + "thousandTransactions": "1.000 transacciones", + "unlimitedAccounts": "Cuentas ilimitadas", + "unlimitedCategories": "Categorías ilimitadas", + "unlimitedTransactions": "Transacciones ilimitadas", + "multiUsers": "Múltiples usuarios", + "integratedBilling": "Facturación integrada", + "advancedReports": "Reportes avanzados", + "cashFlow": "Gestión de flujo de caja", + "budgetControl": "Control de presupuesto por proyecto", + "businessModule": "Módulo de negocios", + "prioritySupport": "Soporte prioritario" + }, + "goldTeaser": { + "title": "Plan GOLD Próximamente", + "description": "Sincronización online directa con tu banco. Conecta tus cuentas y mira tus transacciones actualizadas automáticamente en tiempo real." + } }, "faq": { "title": "Preguntas Frecuentes", @@ -2192,8 +2281,8 @@ "a2": "Sí, puedes cancelar tu suscripción en cualquier momento sin cargos. Mantendrás el acceso hasta el final del período que ya pagaste.", "q3": "¿Qué bancos son compatibles?", "a3": "Puedes importar extractos de cualquier banco que exporte a Excel, CSV, OFX o PDF. Tenemos mapeos predefinidos para los principales bancos.", - "q4": "¿Cómo funciona la prueba gratuita?", - "a4": "Tienes acceso completo a todas las funcionalidades durante el período de prueba. No se requiere tarjeta de crédito para empezar. Al final, elige el plan que se adapte a tus necesidades." + "q4": "¿Cómo funciona la garantía de 7 días?", + "a4": "Pagas con PayPal y obtienes acceso completo inmediato a todas las funcionalidades. Si no estás satisfecho, cancela en los primeros 7 días y recibirás un reembolso total, sin preguntas." }, "cta": { "title": "¿Listo para Transformar tus Finanzas?", @@ -2201,17 +2290,10 @@ "button": "Crear Cuenta Gratis" }, "footer": { - "description": "Gestión Financiera Inteligente para personas y empresas.", - "product": "Producto", - "company": "Empresa", - "legal": "Legal", - "features": "Funcionalidades", - "pricing": "Precios", - "about": "Sobre Nosotros", - "contact": "Contacto", + "rights": "Todos los derechos reservados.", "privacy": "Política de Privacidad", "terms": "Términos de Uso", - "rights": "Todos los derechos reservados." + "contact": "Contacto" } } } \ No newline at end of file diff --git a/frontend/src/i18n/locales/pt-BR.json b/frontend/src/i18n/locales/pt-BR.json index 106d55c..f6c4f71 100644 --- a/frontend/src/i18n/locales/pt-BR.json +++ b/frontend/src/i18n/locales/pt-BR.json @@ -79,7 +79,56 @@ "loginSuccess": "Login realizado com sucesso", "loginError": "Erro ao fazer login", "logoutSuccess": "Logout realizado com sucesso", - "invalidCredentials": "Credenciais inválidas" + "invalidCredentials": "Credenciais inválidas", + "createAccount": "Crie sua conta", + "backToLogin": "Voltar para login", + "goToLogin": "Ir para login" + }, + "login": { + "noAccount": "Não tem uma conta?", + "createAccount": "Crie uma aqui", + "noSubscription": "Você não possui uma assinatura ativa. Por favor, complete o pagamento." + }, + "errors": { + "connection": "Erro de conexão. Tente novamente.", + "resendFailed": "Erro ao reenviar email", + "subscriptionFailed": "Erro ao criar assinatura. Tente novamente." + }, + "register": { + "selectPlan": "Selecione um plano", + "repeatPassword": "Repita sua senha", + "continueToPayment": "Continuar para pagamento", + "createAccount": "Criar Conta", + "alreadyHaveAccount": "Já tem uma conta?", + "loginHere": "Entre aqui", + "paymentCanceled": "O pagamento foi cancelado. Você pode tentar novamente." + }, + "activate": { + "activating": "Ativando sua conta...", + "pleaseWait": "Por favor, aguarde enquanto ativamos sua conta.", + "successTitle": "Conta Ativada!", + "success": "Sua conta foi ativada com sucesso. Agora você pode usar o WEBMoney!", + "errorTitle": "Erro na Ativação", + "error": "Não foi possível ativar sua conta. O link pode ter expirado.", + "invalidLink": "Link de ativação inválido.", + "redirecting": "Redirecionando em {{seconds}} segundos...", + "goToDashboard": "Ir para o Painel", + "checkEmail": "Verifique seu email", + "checkEmailMessage": "Enviamos um email de ativação para {{email}}. Clique no link para ativar sua conta.", + "didntReceive": "Não recebeu o email?", + "resend": "Reenviar email", + "resendSuccess": "Email reenviado com sucesso!" + }, + "payment": { + "confirming": "Confirmando pagamento...", + "pleaseWait": "Por favor, aguarde enquanto processamos seu pagamento.", + "successTitle": "Pagamento Confirmado!", + "successMessage": "Sua assinatura foi confirmada com sucesso.", + "checkYourEmail": "Verifique seu email!", + "activationSent": "Enviamos um email de ativação para {{email}}. Clique no link para ativar sua conta e começar a usar o WEBMoney.", + "errorTitle": "Erro no Pagamento", + "error": "Erro ao confirmar pagamento", + "noSubscriptionId": "ID da assinatura não encontrado" }, "nav": { "dashboard": "Painel", @@ -2029,6 +2078,7 @@ "lastNamePlaceholder": "Seu sobrenome", "lastNameRequired": "O sobrenome é obrigatório", "name": "Nome", + "namePlaceholder": "Seu nome", "email": "E-mail", "phone": "Telefone", "phoneRequired": "O telefone é obrigatório", @@ -2063,6 +2113,7 @@ "billedAnnually": "Cobrado anualmente €{{price}}", "save": "Economize {{percent}}%", "trialDays": "{{days}} dias de teste grátis", + "trial": "de teste", "mostPopular": "Mais Popular", "currentPlan": "Plano Atual", "startFree": "Começar Grátis", @@ -2075,6 +2126,16 @@ "securePayment": "Pagamento seguro", "cancelAnytime": "Cancele quando quiser", "paypalSecure": "Pagamento seguro com PayPal", + "comingSoon": "Em Breve", + "forPymes": "Ferramentas para PMEs", + "features": { + "multiUsers": "Múltiplos usuários", + "integratedBilling": "Faturamento integrado", + "advancedReports": "Relatórios avançados", + "apiAccess": "Acesso à API", + "prioritySupport": "Suporte prioritário", + "dedicatedManager": "Gerente de conta dedicado" + }, "faq": { "title": "Perguntas Frequentes", "q1": "Posso mudar de plano a qualquer momento?", @@ -2122,7 +2183,8 @@ "trialing": "Em Teste", "canceled": "Cancelada", "expired": "Expirada", - "past_due": "Pagamento Pendente" + "past_due": "Pagamento Pendente", + "pending": "Pendente" }, "invoiceStatus": { "paid": "Paga", @@ -2136,13 +2198,20 @@ "subscriptionConfirmed": "Assinatura confirmada com sucesso!", "confirmError": "Erro ao confirmar assinatura", "subscriptionCanceled": "Assinatura cancelada", + "subscriptionCanceledRefunded": "Assinatura cancelada e reembolso processado", "cancelError": "Erro ao cancelar assinatura", "cancelConfirmTitle": "Cancelar assinatura?", "cancelConfirmMessage": "Tem certeza que deseja cancelar sua assinatura?", "cancelNote1": "Você manterá acesso até o final do período atual", "cancelNote2": "Seus dados não serão excluídos", "cancelNote3": "Você pode reativar sua assinatura a qualquer momento", - "confirmCancel": "Sim, Cancelar" + "confirmCancel": "Sim, Cancelar", + "guaranteePeriod": "Período de Garantia", + "guaranteeMessage": "Você ainda tem {{days}} dia(s) restantes no período de garantia de 7 dias. Você pode cancelar e receber um reembolso total.", + "guaranteeBadge": "Garantia: {{days}} dias", + "requestRefund": "Solicitar reembolso total", + "refundNote": "O reembolso será processado pelo PayPal em 5-10 dias úteis.", + "cancelAndRefund": "Cancelar e Reembolsar" }, "landing": { "nav": { @@ -2153,41 +2222,38 @@ "register": "Começar Agora" }, "hero": { - "title": "Assuma o Controle das suas", - "titleHighlight": "Finanças", + "title": "Assuma o Controle das suas Finanças", "subtitle": "Gestão financeira inteligente para pessoas e empresas. Acompanhe receitas, despesas e alcance seus objetivos financeiros.", "cta": "Começar Grátis", - "ctaSecondary": "Ver Planos", - "previewBalance": "Saldo Total", - "previewIncome": "Receitas", - "previewExpense": "Despesas" + "learnMore": "Saiba Mais", + "secure": "100% Seguro" }, "features": { "title": "Tudo que Você Precisa", "subtitle": "Ferramentas poderosas para gerenciar seu dinheiro", - "item1": { + "accounts": { "title": "Múltiplas Contas", "description": "Gerencie contas bancárias, cartões e dinheiro em um só lugar" }, - "item2": { - "title": "Categorias Inteligentes", - "description": "Categorização automática com palavras-chave e subcategorias" - }, - "item3": { - "title": "Importação Bancária", - "description": "Importe extratos de Excel, CSV, OFX e PDF" - }, - "item4": { + "analytics": { "title": "Relatórios Detalhados", "description": "Gráficos e análises para entender seus gastos" }, - "item5": { - "title": "Metas e Orçamentos", - "description": "Defina objetivos e controle gastos mensais" + "categories": { + "title": "Categorias Inteligentes", + "description": "Categorização automática com palavras-chave e subcategorias" }, - "item6": { - "title": "Multi-moeda", - "description": "Gerencie finanças em diferentes moedas" + "import": { + "title": "Importação Bancária", + "description": "Importe extratos de Excel, CSV, OFX e PDF" + }, + "recurring": { + "title": "Transações Recorrentes", + "description": "Automatize contas, assinaturas e receitas recorrentes" + }, + "security": { + "title": "Segurança Total", + "description": "Criptografia de nível bancário para proteger seus dados" } }, "pricing": { @@ -2196,11 +2262,34 @@ "monthly": "Mensal", "annual": "Anual", "popular": "Mais Popular", - "perMonth": "/mês", - "perYear": "/ano", + "month": "mês", + "year": "ano", + "free": "Grátis", "startFree": "Começar Grátis", "subscribe": "Assinar Agora", - "billedAnnually": "Cobrado anualmente" + "billedAnnually": "Cobrado anualmente €{{price}}", + "comingSoon": "Em Breve", + "forPymes": "Ferramentas para PMEs", + "features": { + "oneAccount": "1 conta bancária", + "tenCategories": "10 categorias", + "hundredSubcategories": "100 subcategorias", + "thousandTransactions": "1.000 transações", + "unlimitedAccounts": "Contas ilimitadas", + "unlimitedCategories": "Categorias ilimitadas", + "unlimitedTransactions": "Transações ilimitadas", + "multiUsers": "Múltiplos usuários", + "integratedBilling": "Faturamento integrado", + "advancedReports": "Relatórios avançados", + "cashFlow": "Gestão de fluxo de caixa", + "budgetControl": "Controle de orçamento por projeto", + "businessModule": "Módulo de negócios", + "prioritySupport": "Suporte prioritário" + }, + "goldTeaser": { + "title": "Plano GOLD Em Breve", + "description": "Sincronização online direta com seu banco. Conecte suas contas e veja suas transações atualizadas automaticamente em tempo real." + } }, "faq": { "title": "Perguntas Frequentes", @@ -2210,8 +2299,8 @@ "a2": "Sim, você pode cancelar sua assinatura a qualquer momento sem taxas. Você manterá o acesso até o final do período que já pagou.", "q3": "Quais bancos são compatíveis?", "a3": "Você pode importar extratos de qualquer banco que exporte para Excel, CSV, OFX ou PDF. Temos mapeamentos predefinidos para os principais bancos.", - "q4": "Como funciona o período de teste?", - "a4": "Você tem acesso completo a todos os recursos durante o período de teste. Não é necessário cartão de crédito para começar. No final, escolha o plano que atende às suas necessidades." + "q4": "Como funciona a garantia de 7 dias?", + "a4": "Você paga via PayPal e obtém acesso completo imediato a todos os recursos. Se não ficar satisfeito, cancele em até 7 dias e receba reembolso total, sem perguntas." }, "cta": { "title": "Pronto para Transformar suas Finanças?", @@ -2219,17 +2308,10 @@ "button": "Criar Conta Grátis" }, "footer": { - "description": "Gestão Financeira Inteligente para pessoas e empresas.", - "product": "Produto", - "company": "Empresa", - "legal": "Legal", - "features": "Recursos", - "pricing": "Preços", - "about": "Sobre Nós", - "contact": "Contato", + "rights": "Todos os direitos reservados.", "privacy": "Política de Privacidade", "terms": "Termos de Uso", - "rights": "Todos os direitos reservados." + "contact": "Contato" } } } \ No newline at end of file diff --git a/frontend/src/pages/ActivateAccount.jsx b/frontend/src/pages/ActivateAccount.jsx new file mode 100644 index 0000000..9fe584c --- /dev/null +++ b/frontend/src/pages/ActivateAccount.jsx @@ -0,0 +1,125 @@ +import React, { useState, useEffect } from 'react'; +import { useSearchParams, useNavigate, Link } from 'react-router-dom'; +import { useTranslation } from 'react-i18next'; +import api from '../services/api'; +import logo from '../assets/logo-white.png'; + +const ActivateAccount = () => { + const { t } = useTranslation(); + const [searchParams] = useSearchParams(); + const navigate = useNavigate(); + const [status, setStatus] = useState('loading'); // loading, success, error + const [message, setMessage] = useState(''); + const [countdown, setCountdown] = useState(5); + + useEffect(() => { + const token = searchParams.get('token'); + + if (!token) { + setStatus('error'); + setMessage(t('activate.invalidLink')); + return; + } + + activateAccount(token); + }, [searchParams]); + + useEffect(() => { + if (status === 'success' && countdown > 0) { + const timer = setTimeout(() => setCountdown(countdown - 1), 1000); + return () => clearTimeout(timer); + } else if (status === 'success' && countdown === 0) { + navigate('/dashboard'); + } + }, [status, countdown, navigate]); + + const activateAccount = async (token) => { + try { + const response = await api.post('/activate', { token }); + + if (response.data.success) { + // Save token and user to localStorage + localStorage.setItem('token', response.data.data.token); + localStorage.setItem('user', JSON.stringify(response.data.data.user)); + + setStatus('success'); + setMessage(t('activate.success')); + } else { + setStatus('error'); + setMessage(response.data.message || t('activate.error')); + } + } catch (error) { + setStatus('error'); + setMessage(error.response?.data?.message || t('activate.error')); + } + }; + + return ( +
+
+
+
+
+
+ + WEBMoney + + + {status === 'loading' && ( + <> +
+ {t('common.loading')} +
+

{t('activate.activating')}

+

{t('activate.pleaseWait')}

+ + )} + + {status === 'success' && ( + <> +
+ +
+

{t('activate.successTitle')}

+

{message}

+
+ + {t('activate.redirecting', { seconds: countdown })} +
+ + + {t('activate.goToDashboard')} + + + )} + + {status === 'error' && ( + <> +
+ +
+

{t('activate.errorTitle')}

+

{message}

+
+ + + {t('auth.login')} + + + + {t('common.back')} + +
+ + )} +
+
+
+
+
+
+ ); +}; + +export default ActivateAccount; diff --git a/frontend/src/pages/Billing.jsx b/frontend/src/pages/Billing.jsx index e31efea..1cc7bb8 100644 --- a/frontend/src/pages/Billing.jsx +++ b/frontend/src/pages/Billing.jsx @@ -16,6 +16,9 @@ export default function Billing() { const [loading, setLoading] = useState(true); const [canceling, setCanceling] = useState(false); const [showCancelModal, setShowCancelModal] = useState(false); + const [requestRefund, setRequestRefund] = useState(false); + const [withinGuaranteePeriod, setWithinGuaranteePeriod] = useState(false); + const [guaranteeDaysRemaining, setGuaranteeDaysRemaining] = useState(0); useEffect(() => { // Handle subscription confirmation from PayPal return @@ -59,6 +62,8 @@ export default function Billing() { if (statusResponse.data.success) { setSubscription(statusResponse.data.data.subscription); setPlan(statusResponse.data.data.plan); + setWithinGuaranteePeriod(statusResponse.data.data.within_guarantee_period || false); + setGuaranteeDaysRemaining(statusResponse.data.data.guarantee_days_remaining || 0); } // Load invoices @@ -79,11 +84,17 @@ export default function Billing() { const handleCancelSubscription = async () => { try { setCanceling(true); - const response = await api.post('/subscription/cancel'); + const response = await api.post('/subscription/cancel', { + request_refund: requestRefund && withinGuaranteePeriod, + }); if (response.data.success) { - showToast(t('billing.subscriptionCanceled'), 'success'); + const message = response.data.data?.refunded + ? t('billing.subscriptionCanceledRefunded', 'Assinatura cancelada e reembolso processado') + : t('billing.subscriptionCanceled'); + showToast(message, 'success'); setShowCancelModal(false); + setRequestRefund(false); loadData(); } } catch (error) { @@ -162,6 +173,13 @@ export default function Billing() { {t(`billing.status.${subscription.status}`)} + {withinGuaranteePeriod && ( + + + {t('billing.guaranteeBadge', { days: guaranteeDaysRemaining, defaultValue: `Garantia: ${guaranteeDaysRemaining} dias` })} + + )} + {subscription.status === 'trialing' && subscription.trial_ends_at && ( {t('billing.trialEnds', { date: formatDate(subscription.trial_ends_at) })} @@ -242,7 +260,7 @@ export default function Billing() { {plan.features?.slice(0, Math.ceil(plan.features.length / 2)).map((feature, idx) => (
  • - {feature} + {t(feature, feature)}
    • ))} @@ -252,7 +270,7 @@ export default function Billing() { {plan.features?.slice(Math.ceil(plan.features.length / 2)).map((feature, idx) => (
  • - {feature} + {t(feature, feature)}
    • ))} @@ -318,7 +336,7 @@ export default function Billing() { {t('billing.date')} {t('billing.description')} {t('billing.amount')} - {t('billing.status')} + {t('common.status')} @@ -326,12 +344,12 @@ export default function Billing() { {invoices.map((invoice) => ( - {invoice.invoice_number} + {invoice.number || '-'} - {formatDate(invoice.invoice_date)} + {formatDate(invoice.paid_at || invoice.created_at)} {invoice.description || '-'} - {formatCurrency(invoice.total_amount, invoice.currency)} + {invoice.formatted_total || formatCurrency(invoice.total, invoice.currency)} @@ -369,28 +387,60 @@ export default function Billing() {
    -

    {t('billing.cancelConfirmMessage')}

    -
      + {withinGuaranteePeriod ? ( + <> +
      + + {t('billing.guaranteePeriod', 'Período de garantia')} +

      + {t('billing.guaranteeMessage', { + days: guaranteeDaysRemaining, + defaultValue: `Você ainda tem ${guaranteeDaysRemaining} dia(s) restantes no período de garantia de 7 dias. Você pode cancelar e receber um reembolso total.` + })} +

      +
      + +
      + setRequestRefund(e.target.checked)} + /> + +
      + + ) : ( +

      {t('billing.cancelConfirmMessage')}

      + )} + +
      • {t('billing.cancelNote1')}
      • {t('billing.cancelNote2')}
        • -
      • {t('billing.cancelNote3')}
        • + {!requestRefund &&
      • {t('billing.cancelNote3')}
        • }
    + ) : ( + + {plan.is_free ? t('landing.pricing.startFree') : t('landing.pricing.subscribe')} + + )}
    ))}
    )} + + {/* Gold Plan Teaser */} +
    +
    +
    +
    + +

    {t('landing.pricing.goldTeaser.title')}

    + +
    +

    + {t('landing.pricing.goldTeaser.description')} +

    +
    +
    +
    diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx index 71a7b9e..9862e35 100644 --- a/frontend/src/pages/Login.jsx +++ b/frontend/src/pages/Login.jsx @@ -1,10 +1,13 @@ import React, { useState } from 'react'; import { Link, useNavigate } from 'react-router-dom'; +import { useTranslation } from 'react-i18next'; import { useAuth } from '../context/AuthContext'; import Footer from '../components/Footer'; +import api from '../services/api'; import logo from '../assets/logo-white.png'; const Login = () => { + const { t } = useTranslation(); const navigate = useNavigate(); const { login } = useAuth(); const [formData, setFormData] = useState({ @@ -13,6 +16,9 @@ const Login = () => { }); const [errors, setErrors] = useState({}); const [loading, setLoading] = useState(false); + const [needsActivation, setNeedsActivation] = useState(false); + const [resendingEmail, setResendingEmail] = useState(false); + const [resendSuccess, setResendSuccess] = useState(false); const handleChange = (e) => { setFormData({ @@ -23,12 +29,19 @@ const Login = () => { if (errors[e.target.name]) { setErrors({ ...errors, [e.target.name]: null }); } + // Reset activation state when email changes + if (e.target.name === 'email') { + setNeedsActivation(false); + setResendSuccess(false); + } }; const handleSubmit = async (e) => { e.preventDefault(); setLoading(true); setErrors({}); + setNeedsActivation(false); + setResendSuccess(false); try { const response = await login(formData); @@ -36,18 +49,42 @@ const Login = () => { navigate('/dashboard'); } } catch (error) { - if (error.response?.data?.errors) { - setErrors(error.response.data.errors); - } else if (error.response?.data?.message) { - setErrors({ general: error.response.data.message }); + const errorData = error.response?.data; + + // Check if it's an activation error + if (errorData?.error === 'email_not_verified') { + setNeedsActivation(true); + setErrors({ general: errorData.message }); + } else if (errorData?.error === 'no_subscription') { + setErrors({ general: t('login.noSubscription', 'Você não possui uma assinatura ativa. Por favor, complete o pagamento.') }); + } else if (errorData?.errors) { + setErrors(errorData.errors); + } else if (errorData?.message) { + setErrors({ general: errorData.message }); } else { - setErrors({ general: 'Error de conexión. Intenta nuevamente.' }); + setErrors({ general: t('errors.connection', 'Erro de conexão. Tente novamente.') }); } } finally { setLoading(false); } }; + const handleResendActivation = async () => { + setResendingEmail(true); + setResendSuccess(false); + try { + const response = await api.post('/resend-activation', { email: formData.email }); + if (response.data.success) { + setResendSuccess(true); + } + } catch (error) { + const message = error.response?.data?.message || t('errors.resendFailed', 'Erro ao reenviar email'); + setErrors({ general: message }); + } finally { + setResendingEmail(false); + } + }; + return (
    @@ -55,22 +92,49 @@ const Login = () => {
    - WebMoney + + WebMoney +

    WebMoney

    -

    Gestión Financiera Inteligente

    +

    {t('landing.hero.subtitle', 'Gestión Financiera Inteligente')}

    {errors.general && ( -
    - +
    + {errors.general}
    )} + {needsActivation && ( +
    + {resendSuccess ? ( +
    + + {t('activate.resendSuccess', 'Email de ativação reenviado! Verifique sua caixa de entrada.')} +
    + ) : ( + + )} +
    + )} +
    {
    { {loading ? ( <> - Iniciando sesión... + {t('common.processing', 'Procesando...')} ) : ( - 'Iniciar Sesión' + t('auth.login', 'Iniciar Sesión') )} + +
    +

    + {t('login.noAccount', '¿No tienes cuenta?')}{' '} + + {t('login.createAccount', 'Crea una aquí')} + +

    +
    diff --git a/frontend/src/pages/PaymentSuccess.jsx b/frontend/src/pages/PaymentSuccess.jsx new file mode 100644 index 0000000..08cb2fa --- /dev/null +++ b/frontend/src/pages/PaymentSuccess.jsx @@ -0,0 +1,160 @@ +import React, { useState, useEffect } from 'react'; +import { Link, useSearchParams } from 'react-router-dom'; +import { useTranslation } from 'react-i18next'; +import api from '../services/api'; +import logo from '../assets/logo-white.png'; + +const PaymentSuccess = () => { + const { t } = useTranslation(); + const [searchParams] = useSearchParams(); + const [status, setStatus] = useState('loading'); // loading, success, error + const [message, setMessage] = useState(''); + const [userEmail, setUserEmail] = useState(''); + + useEffect(() => { + const confirmPayment = async () => { + const subscriptionId = searchParams.get('subscription_id'); + const email = searchParams.get('user_email') || sessionStorage.getItem('pendingActivationEmail'); + + if (email) { + setUserEmail(email); + } + + if (!subscriptionId) { + setStatus('error'); + setMessage(t('payment.noSubscriptionId', 'ID da assinatura não encontrado')); + return; + } + + try { + // Confirm the subscription with PayPal + const response = await api.post('/subscription/confirm-public', { + subscription_id: subscriptionId, + user_email: email, + }); + + if (response.data.success) { + setStatus('success'); + setMessage(response.data.message || t('payment.success', 'Pagamento confirmado!')); + // Clean up session storage + sessionStorage.removeItem('pendingActivationEmail'); + } else { + setStatus('error'); + setMessage(response.data.message || t('payment.error', 'Erro ao confirmar pagamento')); + } + } catch (error) { + console.error('Payment confirmation error:', error); + setStatus('error'); + setMessage(error.response?.data?.message || t('payment.error', 'Erro ao confirmar pagamento')); + } + }; + + confirmPayment(); + }, [searchParams, t]); + + const renderContent = () => { + switch (status) { + case 'loading': + return ( + <> +
    +
    + Loading... +
    +
    +

    + {t('payment.confirming', 'Confirmando pagamento...')} +

    +

    + {t('payment.pleaseWait', 'Por favor, aguarde enquanto processamos seu pagamento.')} +

    + + ); + + case 'success': + return ( + <> +
    +
    + +
    +
    +

    + {t('payment.successTitle', 'Pagamento Confirmado!')} +

    +

    + {t('payment.successMessage', 'Sua assinatura foi confirmada com sucesso.')} +

    + +
    + + {t('payment.checkYourEmail', 'Verifique seu email!')} +

    + {t('payment.activationSent', 'Enviamos um email de ativação para {{email}}. Clique no link para ativar sua conta e começar a usar o WEBMoney.', { email: userEmail || 'seu email' })} +

    +
    + +
    + + + {t('auth.goToLogin', 'Ir para Login')} + +
    + + ); + + case 'error': + return ( + <> +
    +
    + +
    +
    +

    + {t('payment.errorTitle', 'Erro no Pagamento')} +

    +

    + {message} +

    + +
    + + + {t('common.tryAgain', 'Tentar novamente')} + + + + {t('common.backToHome', 'Voltar ao início')} + +
    + + ); + + default: + return null; + } + }; + + return ( +
    +
    +
    +
    +
    +
    + + WebMoney + +
    + + {renderContent()} +
    +
    +
    +
    +
    + ); +}; + +export default PaymentSuccess; diff --git a/frontend/src/pages/Register.jsx b/frontend/src/pages/Register.jsx index 8cba128..7594cdd 100644 --- a/frontend/src/pages/Register.jsx +++ b/frontend/src/pages/Register.jsx @@ -1,16 +1,13 @@ import React, { useState, useEffect } from 'react'; -import { Link, useNavigate, useSearchParams } from 'react-router-dom'; +import { Link, useSearchParams } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; -import { useAuth } from '../context/AuthContext'; import Footer from '../components/Footer'; -import api from '../services/api'; +import api, { authService } from '../services/api'; import logo from '../assets/logo-white.png'; const Register = () => { const { t } = useTranslation(); - const navigate = useNavigate(); - const [searchParams] = useSearchParams(); - const { register } = useAuth(); + const [searchParams, setSearchParams] = useSearchParams(); const [plans, setPlans] = useState([]); const [selectedPlan, setSelectedPlan] = useState(null); const [formData, setFormData] = useState({ @@ -22,22 +19,56 @@ const Register = () => { const [errors, setErrors] = useState({}); const [loading, setLoading] = useState(false); const [loadingPlans, setLoadingPlans] = useState(true); + const [registrationComplete, setRegistrationComplete] = useState(false); + const [registeredEmail, setRegisteredEmail] = useState(''); + const [resendingEmail, setResendingEmail] = useState(false); + const [resendSuccess, setResendSuccess] = useState(false); + const [paymentCanceled, setPaymentCanceled] = useState(false); + + // Check if payment was canceled + useEffect(() => { + const canceled = searchParams.get('payment_canceled'); + const email = sessionStorage.getItem('pendingActivationEmail'); + + if (canceled === 'true' && email) { + setPaymentCanceled(true); + // Clean up the unactivated account + api.post('/cancel-registration', { email }) + .then(() => { + sessionStorage.removeItem('pendingActivationEmail'); + // Clean URL + setSearchParams({}); + }) + .catch((err) => { + console.error('Error canceling registration:', err); + }); + } + }, [searchParams, setSearchParams]); // Carregar planos useEffect(() => { const fetchPlans = async () => { try { const response = await api.get('/plans'); - setPlans(response.data.data || response.data); + // API returns { success: true, data: { plans: [...] } } + const allPlans = response.data.data?.plans || response.data.plans || response.data.data || []; + // Filtrar apenas planos ativos + const activePlans = Array.isArray(allPlans) ? allPlans.filter(p => p.is_active) : []; + setPlans(activePlans); // Verificar se há plano na URL const planSlug = searchParams.get('plan'); - if (planSlug && response.data.data) { - const plan = response.data.data.find(p => p.slug === planSlug); + if (planSlug && activePlans.length > 0) { + const plan = activePlans.find(p => p.slug === planSlug); if (plan) { setSelectedPlan(plan); } } + + // Se só houver um plano, selecioná-lo automaticamente + if (activePlans.length === 1) { + setSelectedPlan(activePlans[0]); + } } catch (error) { console.error('Error loading plans:', error); } finally { @@ -60,31 +91,43 @@ const Register = () => { const handleSubmit = async (e) => { e.preventDefault(); + + if (!selectedPlan) { + setErrors({ general: t('register.selectPlan', 'Selecione um plano') }); + return; + } + setLoading(true); setErrors({}); try { - const response = await register({ + // Step 1: Register user (won't login - needs activation) + const response = await api.post('/register', { ...formData, - plan_id: selectedPlan?.id, + plan_id: selectedPlan.id, }); - if (response.success) { - // Se for plano pago, redirecionar para pagamento - if (selectedPlan && selectedPlan.price > 0) { - try { - const subscriptionResponse = await api.post('/subscription/subscribe', { - plan_id: selectedPlan.id, - }); - if (subscriptionResponse.data.approve_url) { - window.location.href = subscriptionResponse.data.approve_url; - return; - } - } catch (subError) { - console.error('Subscription error:', subError); - // Continuar para o dashboard mesmo sem subscrição + + if (response.data.success) { + // Step 2: Create PayPal subscription via public endpoint + try { + const subscriptionResponse = await api.post('/subscription/start', { + plan_id: selectedPlan.id, + user_email: formData.email, + }); + + if (subscriptionResponse.data.data?.approve_url) { + // Save email for later reference when user returns + sessionStorage.setItem('pendingActivationEmail', formData.email); + // Redirect to PayPal + window.location.href = subscriptionResponse.data.data.approve_url; + return; } + } catch (subError) { + console.error('Subscription error:', subError); + setErrors({ + general: t('errors.subscriptionFailed', 'Erro ao criar assinatura. Tente novamente.') + }); } - navigate('/dashboard'); } } catch (error) { if (error.response?.data?.errors) { @@ -92,13 +135,93 @@ const Register = () => { } else if (error.response?.data?.message) { setErrors({ general: error.response.data.message }); } else { - setErrors({ general: 'Error de conexión. Intenta nuevamente.' }); + setErrors({ general: t('errors.connection', 'Erro de conexão. Tente novamente.') }); } } finally { setLoading(false); } }; + const handleResendEmail = async () => { + setResendingEmail(true); + setResendSuccess(false); + try { + await authService.resendActivation(registeredEmail); + setResendSuccess(true); + setTimeout(() => setResendSuccess(false), 5000); + } catch (error) { + console.error('Error resending email:', error); + } finally { + setResendingEmail(false); + } + }; + + // Show activation pending screen + if (registrationComplete) { + return ( +
    +
    +
    +
    +
    +
    + + WebMoney + +
    + +
    +
    + +
    +

    + {t('activate.checkEmail', 'Verifique seu email')} +

    +
    + +

    + {t('activate.checkEmailMessage', 'Enviamos um email de ativação para {{email}}. Clique no link para ativar sua conta.', { email: registeredEmail })} +

    + +
    + + {t('activate.didntReceive', 'Não recebeu o email?')} +
    + + + + {resendSuccess && ( +
    + + {t('activate.resendSuccess', 'Email reenviado com sucesso!')} +
    + )} + +
    + + + + {t('auth.backToLogin', 'Voltar para login')} + +
    +
    +
    +
    +
    + ); + } + return (
    @@ -153,6 +276,13 @@ const Register = () => {
    )} + {paymentCanceled && ( +
    + + {t('register.paymentCanceled', 'O pagamento foi cancelado. Você pode tentar novamente.')} +
    + )} + {errors.general && (
    diff --git a/frontend/src/services/api.js b/frontend/src/services/api.js index cdce16b..e5e656b 100644 --- a/frontend/src/services/api.js +++ b/frontend/src/services/api.js @@ -41,6 +41,7 @@ api.interceptors.response.use( // Auth Services export const authService = { register: async (userData) => { + // Register user but DON'T save token - user needs to pay and activate via email first const response = await api.post('/register', userData); return response.data; }, @@ -54,6 +55,22 @@ export const authService = { return response.data; }, + // Activate account from email link + activateAccount: async (token) => { + const response = await api.post('/activate', { token }); + if (response.data.success) { + localStorage.setItem('token', response.data.data.token); + localStorage.setItem('user', JSON.stringify(response.data.data.user)); + } + return response.data; + }, + + // Resend activation email + resendActivation: async (email) => { + const response = await api.post('/resend-activation', { email }); + return response.data; + }, + logout: async () => { try { await api.post('/logout');