fix(validation): improve uniqueness message for attribute validation

- Added localization support for API responses in English and Spanish.
- Introduced a middleware to set the API locale based on the Accept-Language header.
- Updated various exception messages and validation responses to use localized strings.
- Created new language files for English and Spanish translations.
- Refactored existing code to replace hardcoded messages with localized strings.
- Added tests to verify localization functionality and response correctness.

.env.example

@@ -3,11 +3,15 @@ APP_ENV=production
 APP_KEY=
 APP_DEBUG=false
 APP_URL=http://localhost
-FRONTEND_URL=http://localhost:4200
-INTEGRATION_SECRET=
 
-APP_LOCALE=en
-APP_FALLBACK_LOCALE=en
+PURCHASE_CHECKOUT_EXPIRATION_MINUTES=30
+PURCHASE_QR_EXPIRATION_MINUTES=15
+PURCHASE_TELEPAGOS_EXPIRATION_MINUTES=30
+PURCHASE_TRANSFER_EXPIRATION_MINUTES=1440
+FRONTEND_URLS=http://localhost:4200
+
+APP_LOCALE=es
+APP_FALLBACK_LOCALE=es
 APP_FAKER_LOCALE=en_US
 
 APP_MAINTENANCE_DRIVER=file
@@ -15,6 +19,11 @@ APP_MAINTENANCE_DRIVER=file
 
 # PHP_CLI_SERVER_WORKERS=4
 
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+GOOGLE_REDIRECT_URI=http://localhost/auth/google/callback
+
+
 BCRYPT_ROUNDS=12
 
 LOG_CHANNEL=stack
@@ -22,20 +31,21 @@ LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=sqlite
-# DB_HOST=127.0.0.1
-# DB_PORT=3306
-# DB_DATABASE=laravel
-# DB_USERNAME=root
-# DB_PASSWORD=
-
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
+INTEGRATION_SECRET=change-me
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 SESSION_ENCRYPT=false
 SESSION_PATH=/
 SESSION_DOMAIN=null
-
+SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,*.shopit.com.ar
 SANCTUM_EXPIRATION=720
+SESSION_SECURE_COOKIE=false
 
 BROADCAST_CONNECTION=log
 FILESYSTEM_DISK=local
@@ -52,21 +62,19 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
-MAIL_SCHEME=smtp
-MAIL_HOST=smtp.gmail.com
-MAIL_PORT=587
+MAIL_SCHEME=null
+MAIL_HOST=127.0.0.1
+MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
-
 AWS_ENDPOINT=
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=garage
+AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=
-AWS_HTTP_VERIFY=
-
+AWS_USE_PATH_STYLE_ENDPOINT=false
+AWS_HTTP_VERIFY=true
 VITE_APP_NAME="${APP_NAME}"

app/Domains/Auth/Controllers/CreateResetPasswordAttemptController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Requests\CreateResetPasswordAttemptRequest;
+use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+
+class CreateResetPasswordAttemptController extends Controller
+{
+    public function __construct(
+        private readonly ResetPasswordAttemptService $resetPasswordAttemptService,
+    ) {}
+
+    public function __invoke(CreateResetPasswordAttemptRequest $request): JsonResponse
+    {
+        $data = $request->validated();
+
+        $this->resetPasswordAttemptService->createForEmail(
+            $data['email'],
+            $data['tenant_codigo'],
+        );
+
+        return response()->json([
+            'code' => 'auth.password_reset_requested',
+            'message' => __('api.auth.password_reset_requested'),
+            'status' => ResetPasswordAttempt::STATUS_PENDING,
+        ], 202);
+    }
+}

app/Domains/Auth/Controllers/GoogleAuthController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Services\GoogleAuthService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class GoogleAuthController extends Controller
+{
+    public function __construct(private readonly GoogleAuthService $googleAuthService) {}
+
+    public function redirect(Request $request): RedirectResponse
+    {
+        return $this->googleAuthService->redirect($request);
+    }
+
+    public function callback(Request $request): RedirectResponse
+    {
+        return $this->googleAuthService->callback($request);
+    }
+}

app/Domains/Auth/Controllers/GoogleTokenExchangeController.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Requests\GoogleTokenExchangeRequest;
+use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Auth\Services\GoogleAuthService;
+use App\Domains\Cart\Services\GuestCartMergeService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Cookie;
+
+class GoogleTokenExchangeController extends Controller
+{
+    public function __construct(
+        private readonly GoogleAuthService $googleAuthService,
+        private readonly GuestCartMergeService $guestCartMergeService,
+    ) {}
+
+    public function __invoke(GoogleTokenExchangeRequest $request): JsonResponse
+    {
+        $authentication = $this->googleAuthService->exchange(
+            $request->validated('oauth_code'),
+            $request->validated('tenant_codigo'),
+        );
+
+        $guestTokenCookie = $request->cookie('guest_token');
+        $guestToken = is_string($guestTokenCookie) && $guestTokenCookie !== ''
+            ? $guestTokenCookie
+            : null;
+        $this->guestCartMergeService->merge(
+            $authentication['tenant_codigo'],
+            $authentication['user'],
+            $guestToken,
+        );
+
+        $response = response()->json([
+            'code' => 'auth.login_success',
+            'message' => __('api.auth.login_success'),
+            'token' => $authentication['token'],
+            'token_type' => 'Bearer',
+            'user' => UserResource::make($authentication['user']),
+        ]);
+
+        if ($guestToken !== null) {
+            $response->withCookie(Cookie::forget('guest_token'));
+        }
+
+        return $response;
+    }
+}

app/Domains/Auth/Controllers/LoginController.php

@@ -2,16 +2,22 @@
 
 namespace App\Domains\Auth\Controllers;
 
-use App\Domains\Auth\Requests\LoginUserRequest;
 use App\Domains\Auth\Models\User;
+use App\Domains\Auth\Requests\LoginUserRequest;
 use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Cart\Services\GuestCartMergeService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\ValidationException;
 
 class LoginController extends Controller
 {
+    public function __construct(
+        private readonly GuestCartMergeService $guestCartMergeService,
+    ) {}
+
     /**
      * @throws ValidationException
      */
@@ -22,7 +28,7 @@ class LoginController extends Controller
 
         if (! $user || ! Hash::check($credentials['password'], $user->password)) {
             throw ValidationException::withMessages([
-                'email' => 'Email o Contraseña incorrectos.',
+                'email' => __('api.auth.invalid_credentials'),
             ]);
         }
 
@@ -33,11 +39,28 @@ class LoginController extends Controller
             now()->addMinutes($expirationMinutes),
         )->plainTextToken;
 
-        return response()->json([
-            'message' => 'Sesion iniciada correctamente.',
+        $guestTokenCookie = $request->cookie('guest_token');
+        $guestToken = is_string($guestTokenCookie) && $guestTokenCookie !== ''
+            ? $guestTokenCookie
+            : null;
+        $this->guestCartMergeService->merge(
+            $credentials['tenant_codigo'],
+            $user,
+            $guestToken,
+        );
+
+        $response = response()->json([
+            'code' => 'auth.login_success',
+            'message' => __('api.auth.login_success'),
             'token' => $token,
             'token_type' => 'Bearer',
             'user' => UserResource::make($user),
         ]);
+
+        if ($guestToken !== null) {
+            $response->withCookie(Cookie::forget('guest_token'));
+        }
+
+        return $response;
     }
 }

app/Domains/Auth/Controllers/LogoutController.php

@@ -23,7 +23,8 @@ class LogoutController extends Controller
         }
 
         return response()->json([
-            'message' => 'Sesion cerrada correctamente.',
+            'code' => 'auth.logout_success',
+            'message' => __('api.auth.logout_success'),
         ]);
     }
 }

app/Domains/Auth/Controllers/RegisterController.php

@@ -12,15 +12,17 @@ class RegisterController extends Controller
 {
     public function __construct(
         protected RegisterUserService $registerUserService,
-    ) {
-    }
+    ) {}
 
     public function __invoke(RegisterUserRequest $request): JsonResponse
     {
         $user = $this->registerUserService->register($request->validated());
 
         return UserResource::make($user)
-            ->additional(['message' => 'Usuario registrado correctamente.'])
+            ->additional([
+                'code' => 'auth.register_success',
+                'message' => __('api.auth.register_success'),
+            ])
             ->response()
             ->setStatusCode(201);
     }

app/Domains/Auth/Controllers/ResetPasswordController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Requests\ResetPasswordRequest;
+use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Validation\ValidationException;
+
+class ResetPasswordController extends Controller
+{
+    public function __construct(
+        private readonly ResetPasswordAttemptService $resetPasswordAttemptService,
+    ) {}
+
+    /**
+     * @throws ValidationException
+     */
+    public function __invoke(ResetPasswordRequest $request): JsonResponse
+    {
+        $data = $request->validated();
+
+        if (! $this->resetPasswordAttemptService->resetPassword(
+            $data['email'],
+            $data['codigo'],
+            $data['password'],
+        )) {
+            throw ValidationException::withMessages([
+                'codigo' => __('api.auth.password_reset_invalid'),
+            ]);
+        }
+
+        return response()->json([
+            'code' => 'auth.password_updated',
+            'message' => __('api.auth.password_updated'),
+            'status' => ResetPasswordAttempt::STATUS_USED,
+        ]);
+    }
+}

app/Domains/Auth/Controllers/ValidateResetPasswordAttemptController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Requests\ValidateResetPasswordAttemptRequest;
+use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Validation\ValidationException;
+
+class ValidateResetPasswordAttemptController extends Controller
+{
+    public function __construct(
+        private readonly ResetPasswordAttemptService $resetPasswordAttemptService,
+    ) {}
+
+    /**
+     * @throws ValidationException
+     */
+    public function __invoke(ValidateResetPasswordAttemptRequest $request): JsonResponse
+    {
+        $data = $request->validated();
+
+        if (! $this->resetPasswordAttemptService->validateCode(
+            $data['email'],
+            $data['codigo'],
+        )) {
+            throw ValidationException::withMessages([
+                'codigo' => __('api.auth.reset_code_invalid'),
+            ]);
+        }
+
+        return response()->json([
+            'code' => 'auth.reset_code_valid',
+            'message' => __('api.auth.reset_code_valid'),
+            'status' => ResetPasswordAttempt::STATUS_VALIDATED,
+        ]);
+    }
+}

app/Domains/Auth/Models/ResetPasswordAttempt.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Auth\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Attributes\Hidden;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable(['user_id', 'codigo', 'status'])]
+#[Hidden(['codigo'])]
+class ResetPasswordAttempt extends Model
+{
+    public const STATUS_PENDING = 'pending';
+
+    public const STATUS_VALIDATED = 'validated';
+
+    public const STATUS_USED = 'used';
+
+    public const STATUS_EXPIRED = 'expired';
+
+    public $timestamps = false;
+
+    protected function casts(): array
+    {
+        return [
+            'user_id' => 'integer',
+        ];
+    }
+
+    /** @return BelongsTo<User, $this> */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}

app/Domains/Auth/Models/User.php

@@ -6,11 +6,12 @@ use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
 
-#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono'])]
+#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id'])]
 #[Hidden(['password', 'remember_token'])]
 class User extends Authenticatable
 {
@@ -22,6 +23,12 @@ class User extends Authenticatable
         return UserFactory::new();
     }
 
+    /** @return HasMany<ResetPasswordAttempt, $this> */
+    public function resetPasswordAttempts(): HasMany
+    {
+        return $this->hasMany(ResetPasswordAttempt::class);
+    }
+
     /**
      * @return array<string, string>
      */

app/Domains/Auth/Requests/CreateResetPasswordAttemptRequest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+
+class CreateResetPasswordAttemptRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'tenant_codigo' => ['required', 'string', Rule::exists('tenants', 'codigo')],
+            'email' => ['required', 'string', 'email', 'max:255'],
+        ];
+    }
+}

app/Domains/Auth/Requests/GoogleTokenExchangeRequest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class GoogleTokenExchangeRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, array<int, string>> */
+    public function rules(): array
+    {
+        return [
+            'oauth_code' => ['required', 'uuid'],
+            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
+        ];
+    }
+}

app/Domains/Auth/Requests/LoginUserRequest.php

@@ -19,6 +19,7 @@ class LoginUserRequest extends FormRequest
         return [
             'email' => ['required', 'string', 'email', 'max:255'],
             'password' => ['required', 'string'],
+            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
         ];
     }
 }

app/Domains/Auth/Requests/RegisterUserRequest.php

@@ -4,6 +4,7 @@ namespace App\Domains\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
+use Illuminate\Validation\Rules\Password;
 
 class RegisterUserRequest extends FormRequest
 {
@@ -18,9 +19,10 @@ class RegisterUserRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'tenant_codigo' => ['nullable', 'string', Rule::exists('tenants', 'codigo')],
             'nombre_apellido' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')],
-            'password' => ['required', 'string', 'confirmed', \Illuminate\Validation\Rules\Password::min(8)->mixedCase()->symbols()],
+            'password' => ['required', 'string', 'confirmed', Password::min(8)->mixedCase()->symbols()],
             'dni' => ['nullable', 'string', 'max:255'],
             'telefono' => ['nullable', 'string', 'max:255'],
         ];

app/Domains/Auth/Requests/ResetPasswordRequest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rules\Password;
+
+class ResetPasswordRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => ['required', 'string', 'email', 'max:255'],
+            'codigo' => ['required', 'string', 'regex:/^\d{4}$/'],
+            'password' => [
+                'required',
+                'string',
+                'confirmed',
+                Password::min(8)->mixedCase()->symbols(),
+            ],
+        ];
+    }
+}

app/Domains/Auth/Requests/ValidateResetPasswordAttemptRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+
+class ValidateResetPasswordAttemptRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $email = $this->input('email');
+
+        if (is_string($email)) {
+            $this->merge([
+                'email' => Str::lower(trim($email)),
+            ]);
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => ['required', 'string', 'email', 'max:255'],
+            'codigo' => ['required', 'string', 'regex:/^\d{4}$/'],
+        ];
+    }
+}

app/Domains/Auth/Services/GoogleAuthService.php

@@ -0,0 +1,173 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Models\User;
+use App\Domains\Notification\Events\UserRegistered;
+use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
+use Laravel\Socialite\Contracts\User as SocialiteUser;
+use Laravel\Socialite\Facades\Socialite;
+
+class GoogleAuthService
+{
+    public function redirect(Request $request): RedirectResponse
+    {
+        $tenantCode = $request->string('tenant')->toString();
+        $returnUrl = $request->string('return_url')->toString();
+
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->first();
+
+        if (! $tenant || ! $this->isTenantReturnUrl($returnUrl, $tenant)) {
+            throw ValidationException::withMessages([
+                'tenant' => __('api.auth.invalid_tenant_or_return_url'),
+            ]);
+        }
+
+        $state = (string) Str::uuid();
+        Cache::put("google-oauth-context:{$state}", [
+            'tenant_codigo' => $tenant->codigo,
+            'return_url' => rtrim($returnUrl, '/'),
+        ], now()->addMinutes(10));
+
+        return Socialite::driver('google')
+            ->scopes(['openid', 'profile', 'email'])
+            ->stateless()
+            ->with(['state' => $state])
+            ->redirect();
+    }
+
+    public function callback(Request $request): RedirectResponse
+    {
+        $state = $request->string('state')->toString();
+
+        /** @var array{tenant_codigo?: string, return_url?: string}|null $context */
+        $context = Str::isUuid($state) ? Cache::pull("google-oauth-context:{$state}") : null;
+
+        if (! is_array($context) || ! isset($context['tenant_codigo'], $context['return_url'])) {
+            abort(400, __('api.auth.request_expired'));
+        }
+
+        $tenant = Tenant::query()->where('codigo', $context['tenant_codigo'])->first();
+
+        if (! $tenant || ! $this->isTenantReturnUrl($context['return_url'], $tenant)) {
+            abort(400, __('api.auth.invalid_return_url'));
+        }
+
+        /** @var SocialiteUser $googleUser */
+        $googleUser = Socialite::driver('google')->stateless()->user();
+        $user = $this->resolveUser($googleUser, $tenant);
+        $token = $user->createToken(
+            'google-oauth',
+            ['*'],
+            now()->addMinutes((int) config('sanctum.expiration')),
+        )->plainTextToken;
+
+        $exchangeCode = (string) Str::uuid();
+        Cache::put("google-oauth-exchange:{$exchangeCode}", [
+            'user_id' => $user->id,
+            'token' => $token,
+            'tenant_codigo' => $tenant->codigo,
+        ], now()->addMinutes(5));
+
+        return redirect()->to($context['return_url'].'/login?'.http_build_query([
+            'oauth_code' => $exchangeCode,
+        ]));
+    }
+
+    /** @return array{user: User, token: string, tenant_codigo: string} */
+    public function exchange(string $exchangeCode, string $tenantCodigo): array
+    {
+        /** @var array{user_id: int, token: string, tenant_codigo?: string}|null $authentication */
+        $authentication = Cache::pull("google-oauth-exchange:{$exchangeCode}");
+
+        if (! $authentication) {
+            throw ValidationException::withMessages([
+                'oauth_code' => __('api.auth.oauth_code_expired'),
+            ]);
+        }
+
+        if (($authentication['tenant_codigo'] ?? null) !== $tenantCodigo) {
+            throw ValidationException::withMessages([
+                'tenant_codigo' => __('api.auth.tenant_mismatch'),
+            ]);
+        }
+
+        return [
+            'user' => User::query()->findOrFail($authentication['user_id']),
+            'token' => $authentication['token'],
+            'tenant_codigo' => $tenantCodigo,
+        ];
+    }
+
+    private function resolveUser(SocialiteUser $googleUser, Tenant $tenant): User
+    {
+        $googleId = $googleUser->getId();
+        $email = $googleUser->getEmail();
+
+        if (! is_string($googleId) || $googleId === '' || ! is_string($email) || ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            throw ValidationException::withMessages([
+                'google' => __('api.auth.google_email_required'),
+            ]);
+        }
+
+        $rawUser = $googleUser instanceof \Laravel\Socialite\Two\User ? $googleUser->getRaw() : [];
+        $emailVerified = $rawUser['email_verified'] ?? $rawUser['verified_email'] ?? false;
+        if (! in_array($emailVerified, [true, 'true', 1, '1'], true)) {
+            throw ValidationException::withMessages([
+                'google' => __('api.auth.google_email_unverified'),
+            ]);
+        }
+
+        $user = User::query()->where('google_id', $googleId)->first();
+        if ($user) {
+            return $user;
+        }
+
+        $user = User::query()->where('email', $email)->first();
+        if ($user) {
+            $user->forceFill(['google_id' => $googleId])->save();
+
+            return $user;
+        }
+
+        $name = $googleUser->getName();
+        $user = User::query()->create([
+            'nombre_apellido' => is_string($name) && $name !== '' ? $name : $email,
+            'email' => $email,
+            'email_verified_at' => now(),
+            'google_id' => $googleId,
+            'password' => Str::password(64),
+        ]);
+
+        UserRegistered::dispatch($user, $tenant->codigo);
+
+        return $user;
+    }
+
+    private function isTenantReturnUrl(string $returnUrl, Tenant $tenant): bool
+    {
+        $parts = parse_url($returnUrl);
+        if (! is_array($parts)
+            || ! isset($parts['scheme'], $parts['host'])
+            || isset($parts['user'], $parts['pass'], $parts['query'], $parts['fragment'])
+            || ($parts['path'] ?? '') !== '') {
+            return false;
+        }
+
+        $scheme = strtolower($parts['scheme']);
+        $host = TenantDomainNormalizer::normalize($parts['host']);
+        $tenantDomain = TenantDomainNormalizer::normalize($tenant->dominio);
+
+        if ($host === null || $tenantDomain === null || $host !== $tenantDomain) {
+            return false;
+        }
+
+        return $scheme === 'https' || ($scheme === 'http' && in_array($host, ['localhost', '127.0.0.1'], true));
+    }
+}

app/Domains/Auth/Services/RegisterUserService.php

@@ -3,20 +3,27 @@
 namespace App\Domains\Auth\Services;
 
 use App\Domains\Auth\Models\User;
+use App\Domains\Notification\Events\UserRegistered;
 
 class RegisterUserService
 {
     /**
-     * @param  array{nombre_apellido: string, email: string, password: string, dni?: string|null, telefono?: string|null}  $data
+     * @param  array{tenant_codigo?: string|null, nombre_apellido: string, email: string, password: string, dni?: string|null, telefono?: string|null}  $data
      */
     public function register(array $data): User
     {
-        return User::query()->create([
+        $user = User::query()->create([
             'nombre_apellido' => $data['nombre_apellido'],
             'email' => $data['email'],
             'password' => $data['password'],
             'dni' => $data['dni'] ?? null,
             'telefono' => $data['telefono'] ?? null,
         ]);
+
+        if (! empty($data['tenant_codigo'])) {
+            UserRegistered::dispatch($user, $data['tenant_codigo']);
+        }
+
+        return $user;
     }
 }

app/Domains/Auth/Services/ResetPasswordAttemptService.php

@@ -0,0 +1,177 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Models\User;
+use App\Domains\Notification\Events\PasswordResetRequested;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Throwable;
+
+class ResetPasswordAttemptService
+{
+    public function createForEmail(string $email, string $tenantCode): void
+    {
+        $emailFingerprint = $this->emailFingerprint($email);
+
+        try {
+            $attemptId = DB::transaction(function () use ($email, $emailFingerprint): ?int {
+                $user = User::query()
+                    ->where('email', $email)
+                    ->lockForUpdate()
+                    ->first();
+
+                if ($user === null) {
+                    Log::warning('Password reset attempt was not created because the user was not found.', [
+                        'email_fingerprint' => $emailFingerprint,
+                    ]);
+
+                    return null;
+                }
+
+                $user->resetPasswordAttempts()
+                    ->whereIn('status', [
+                        ResetPasswordAttempt::STATUS_PENDING,
+                        ResetPasswordAttempt::STATUS_VALIDATED,
+                    ])
+                    ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
+
+                $attempt = $user->resetPasswordAttempts()->create([
+                    'codigo' => $this->generateCode(),
+                    'status' => ResetPasswordAttempt::STATUS_PENDING,
+                ]);
+
+                return $attempt->getKey();
+            });
+        } catch (Throwable $exception) {
+            Log::error('Failed to create password reset attempt.', [
+                'email_fingerprint' => $emailFingerprint,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
+
+        if ($attemptId !== null) {
+            try {
+                PasswordResetRequested::dispatch($attemptId, $tenantCode);
+            } catch (Throwable $exception) {
+                Log::error('Failed to dispatch password reset email.', [
+                    'attempt_id' => $attemptId,
+                    'tenant_code' => $tenantCode,
+                    'email_fingerprint' => $emailFingerprint,
+                    'exception' => $exception,
+                ]);
+
+                throw $exception;
+            }
+        }
+    }
+
+    public function validateCode(string $email, string $code): bool
+    {
+        $emailFingerprint = $this->emailFingerprint($email);
+
+        try {
+            return DB::transaction(function () use ($email, $code, $emailFingerprint): bool {
+                $user = User::query()
+                    ->where('email', $email)
+                    ->lockForUpdate()
+                    ->first();
+
+                $attempt = $user?->resetPasswordAttempts()
+                    ->where('codigo', $code)
+                    ->where('status', ResetPasswordAttempt::STATUS_PENDING)
+                    ->latest('id')
+                    ->lockForUpdate()
+                    ->first();
+
+                if ($attempt === null) {
+                    Log::warning('Password reset code validation failed: no matching pending attempt.', [
+                        'email_fingerprint' => $emailFingerprint,
+                    ]);
+
+                    return false;
+                }
+
+                $attempt->update([
+                    'status' => ResetPasswordAttempt::STATUS_VALIDATED,
+                ]);
+
+                return true;
+            });
+        } catch (Throwable $exception) {
+            Log::error('Failed to validate password reset code.', [
+                'email_fingerprint' => $emailFingerprint,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
+    }
+
+    public function resetPassword(string $email, string $code, string $password): bool
+    {
+        $emailFingerprint = $this->emailFingerprint($email);
+
+        try {
+            return DB::transaction(function () use ($email, $code, $password, $emailFingerprint): bool {
+                $user = User::query()
+                    ->where('email', $email)
+                    ->lockForUpdate()
+                    ->first();
+
+                $attempt = $user?->resetPasswordAttempts()
+                    ->where('codigo', $code)
+                    ->where('status', ResetPasswordAttempt::STATUS_VALIDATED)
+                    ->latest('id')
+                    ->lockForUpdate()
+                    ->first();
+
+                if ($user === null || $attempt === null) {
+                    Log::warning('Password reset failed: no matching validated attempt.', [
+                        'email_fingerprint' => $emailFingerprint,
+                    ]);
+
+                    return false;
+                }
+
+                $user->password = $password;
+                $user->save();
+                $user->tokens()->delete();
+
+                $user->resetPasswordAttempts()
+                    ->whereKeyNot($attempt->getKey())
+                    ->whereIn('status', [
+                        ResetPasswordAttempt::STATUS_PENDING,
+                        ResetPasswordAttempt::STATUS_VALIDATED,
+                    ])
+                    ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
+
+                $attempt->update([
+                    'status' => ResetPasswordAttempt::STATUS_USED,
+                ]);
+
+                return true;
+            });
+        } catch (Throwable $exception) {
+            Log::error('Failed to reset user password.', [
+                'email_fingerprint' => $emailFingerprint,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
+    }
+
+    private function generateCode(): string
+    {
+        return str_pad((string) random_int(0, 9999), 4, '0', STR_PAD_LEFT);
+    }
+
+    private function emailFingerprint(string $email): string
+    {
+        return substr(hash('sha256', strtolower(trim($email))), 0, 12);
+    }
+}

app/Domains/Auth/routes/api.php

@@ -1,14 +1,25 @@
 <?php
 
+use App\Domains\Auth\Controllers\CreateResetPasswordAttemptController;
+use App\Domains\Auth\Controllers\GoogleTokenExchangeController;
 use App\Domains\Auth\Controllers\LoginController;
 use App\Domains\Auth\Controllers\LogoutController;
 use App\Domains\Auth\Controllers\MeController;
 use App\Domains\Auth\Controllers\RegisterController;
+use App\Domains\Auth\Controllers\ResetPasswordController;
 use App\Domains\Auth\Controllers\UpdateProfileController;
+use App\Domains\Auth\Controllers\ValidateResetPasswordAttemptController;
 use Illuminate\Support\Facades\Route;
 
 Route::post('/register', RegisterController::class);
 Route::post('/login', LoginController::class);
+Route::post('/password/reset-attempts', CreateResetPasswordAttemptController::class)
+    ->middleware('throttle:5,1');
+Route::post('/password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
+    ->middleware('throttle:10,1');
+Route::post('/password/reset', ResetPasswordController::class)
+    ->middleware('throttle:5,1');
+Route::post('/auth/google/exchange', GoogleTokenExchangeController::class);
 Route::middleware('auth:sanctum')->post('/logout', LogoutController::class);
 Route::middleware('auth:sanctum')->get('/me', MeController::class);
 Route::middleware('auth:sanctum')->put('/me', UpdateProfileController::class);

app/Domains/Cart/Controllers/CartController.php

@@ -36,7 +36,10 @@ class CartController extends Controller
         );
 
         $response = CartResource::make($result['cart'])
-            ->additional(['message' => 'Producto agregado al carrito.'])
+            ->additional([
+                'code' => 'cart.item_added',
+                'message' => __('api.cart.item_added'),
+            ])
             ->response();
 
         if ($result['guest_token'] !== null) {
@@ -58,13 +61,19 @@ class CartController extends Controller
                 $cartItem->getKey(),
                 (int) $request->validated('cantidad'),
             )
-        )->additional(['message' => 'Cantidad de producto actualizada.']);
+        )->additional([
+            'code' => 'cart.quantity_updated',
+            'message' => __('api.cart.quantity_updated'),
+        ]);
     }
 
     public function removeItem(Request $request, Tenant $tenant, CartItem $cartItem): CartResource
     {
         return CartResource::make(
             $this->cartService->removeItem($tenant, $request, $cartItem->getKey())
-        )->additional(['message' => 'Producto eliminado del carrito.']);
+        )->additional([
+            'code' => 'cart.item_removed',
+            'message' => __('api.cart.item_removed'),
+        ]);
     }
 }

app/Domains/Cart/Middleware/MergeGuestCartMiddleware.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Domains\Cart\Middleware;
-
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Tenant\Models\Tenant;
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cookie;
-use Symfony\Component\HttpFoundation\Response;
-
-class MergeGuestCartMiddleware
-{
-    public function handle(Request $request, Closure $next): Response
-    {
-        $guestToken = $request->cookie('guest_token');
-
-        // Resolve authenticated user optionally (from default guard or sanctum guard)
-        $user = $request->user() ?? Auth::guard('sanctum')->user();
-        $userId = $user?->getKey();
-
-        \Illuminate\Support\Facades\Log::info('MergeGuestCartMiddleware processed', [
-            'user_id' => $userId,
-            'guest_token' => $guestToken,
-        ]);
-
-        if ($user !== null && is_string($guestToken) && $guestToken !== '') {
-            $tenantParam = $request->route('tenant');
-            $tenantCodigo = null;
-
-            if ($tenantParam instanceof Tenant) {
-                $tenantCodigo = $tenantParam->codigo;
-            } elseif (is_string($tenantParam)) {
-                $tenantCodigo = $tenantParam;
-            }
-
-            if ($tenantCodigo !== null) {
-                $guestCart = Cart::query()
-                    ->where('tenant_codigo', $tenantCodigo)
-                    ->where('guest_token', $guestToken)
-                    ->first();
-
-                if ($guestCart !== null && $guestCart->items()->exists()) {
-                    $userCart = Cart::query()
-                        ->where('tenant_codigo', $tenantCodigo)
-                        ->where('user_id', $userId)
-                        ->first();
-
-                    if ($userCart !== null) {
-                        $userCart->delete();
-                    }
-
-                    $guestCart->update([
-                        'user_id' => $userId,
-                        'guest_token' => null,
-                    ]);
-                }
-            }
-        }
-
-        $response = $next($request);
-
-        if ($user !== null && is_string($guestToken) && $guestToken !== '') {
-            // Remove the cookie from the response since the user is authenticated.
-            if (method_exists($response, 'withCookie')) {
-                $response->withCookie(Cookie::forget('guest_token'));
-            }
-        }
-
-        return $response;
-    }
-}

app/Domains/Cart/Models/Cart.php

@@ -79,7 +79,7 @@ class Cart extends Model
     {
         if ($quantity <= 0) {
             throw ValidationException::withMessages([
-                'cantidad' => 'La cantidad debe ser mayor a cero.',
+                'cantidad' => __('api.cart.positive_quantity'),
             ]);
         }
 
@@ -91,7 +91,7 @@ class Cart extends Model
 
             if ($availableQuantity !== null && $availableQuantity < $quantity) {
                 throw ValidationException::withMessages([
-                    'cantidad' => "Stock insuficiente para el producto solicitado. Maximo disponible: {$availableQuantity}.",
+                    'cantidad' => __('api.cart.insufficient_stock', ['max' => $availableQuantity]),
                 ]);
             }
 
@@ -123,7 +123,7 @@ class Cart extends Model
     {
         if ($quantity <= 0) {
             throw ValidationException::withMessages([
-                'cantidad' => 'La cantidad debe ser mayor a cero.',
+                'cantidad' => __('api.cart.positive_quantity'),
             ]);
         }
 
@@ -146,7 +146,7 @@ class Cart extends Model
             if ($delta > 0 && $availableQuantity !== null && $availableQuantity < $delta) {
                 $maxAvailable = $availableQuantity + $item->cantidad;
                 throw ValidationException::withMessages([
-                    'cantidad' => "El máximo que se puede agregar es {$maxAvailable}.",
+                    'cantidad' => __('api.cart.max_quantity', ['max' => $maxAvailable]),
                 ]);
             }
 
@@ -209,13 +209,13 @@ class Cart extends Model
         if ($catalogItem->isBundle()) {
             if ($variantId !== null) {
                 throw ValidationException::withMessages([
-                    'variant_id' => 'Un bundle no admite una variante.',
+                    'variant_id' => __('api.cart.bundle_variant_forbidden'),
                 ]);
             }
 
             if (! $catalogItem->bundleComponents()->exists()) {
                 throw ValidationException::withMessages([
-                    'catalog_item_id' => 'El bundle no tiene componentes.',
+                    'catalog_item_id' => __('api.cart.empty_bundle'),
                 ]);
             }
 
@@ -225,7 +225,7 @@ class Cart extends Model
         if ($variantId === null) {
             if ($catalogItem->inventory_id === null) {
                 throw ValidationException::withMessages([
-                    'variant_id' => 'Debe seleccionar una variante para este ítem.',
+                    'variant_id' => __('api.cart.variant_required'),
                 ]);
             }
 

app/Domains/Cart/Services/CartService.php

@@ -172,6 +172,7 @@ class CartService
     {
         return Cart::query()
             ->where('tenant_codigo', $tenant->codigo)
+            ->where('status', 'active')
             ->when(
                 $identity['user_id'] !== null,
                 fn ($query) => $query->where('user_id', $identity['user_id']),
@@ -199,7 +200,10 @@ class CartService
      */
     protected function findOrCreateCart(Tenant $tenant, array $identity): Cart
     {
-        $attributes = ['tenant_codigo' => $tenant->codigo];
+        $attributes = [
+            'tenant_codigo' => $tenant->codigo,
+            'status' => 'active',
+        ];
 
         if ($identity['user_id'] !== null) {
             $attributes['user_id'] = $identity['user_id'];
@@ -207,6 +211,6 @@ class CartService
             $attributes['guest_token'] = $identity['guest_token'];
         }
 
-        return Cart::query()->firstOrCreate($attributes, ['status' => 'active']);
+        return Cart::query()->firstOrCreate($attributes);
     }
 }

app/Domains/Cart/Services/GuestCartMergeService.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Domains\Cart\Services;
+
+use App\Domains\Auth\Models\User;
+use App\Domains\Cart\Models\Cart;
+use Illuminate\Support\Facades\DB;
+
+class GuestCartMergeService
+{
+    public function merge(string $tenantCodigo, User $user, ?string $guestToken): void
+    {
+        if ($guestToken === null || $guestToken === '') {
+            return;
+        }
+
+        DB::transaction(function () use ($tenantCodigo, $user, $guestToken): void {
+            $guestCart = Cart::query()
+                ->where('tenant_codigo', $tenantCodigo)
+                ->where('guest_token', $guestToken)
+                ->where('status', 'active')
+                ->lockForUpdate()
+                ->first();
+
+            if ($guestCart === null || ! $guestCart->items()->exists()) {
+                return;
+            }
+
+            $userCart = Cart::query()
+                ->where('tenant_codigo', $tenantCodigo)
+                ->where('user_id', $user->getKey())
+                ->where('status', 'active')
+                ->lockForUpdate()
+                ->first();
+
+            if ($userCart !== null) {
+                $userCart->update([
+                    'status' => 'converted',
+                ]);
+                $userCart->delete();
+            }
+
+            $guestCart->update([
+                'user_id' => $user->getKey(),
+                'guest_token' => null,
+            ]);
+        });
+    }
+}

app/Domains/Cart/routes/api.php

@@ -4,7 +4,6 @@ use App\Domains\Cart\Controllers\CartController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')
-    ->middleware(\App\Domains\Cart\Middleware\MergeGuestCartMiddleware::class)
     ->group(function (): void {
         Route::get('cart', [CartController::class, 'show']);
         Route::post('cart/items', [CartController::class, 'addItem']);

app/Domains/Catalog/Controllers/CatalogController.php

@@ -2,19 +2,27 @@
 
 namespace App\Domains\Catalog\Controllers;
 
+use App\Domains\Catalog\Enums\GroupLayout;
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\FeaturedGroup;
+use App\Domains\Catalog\Models\FeaturedItem;
 use App\Domains\Catalog\Requests\CatalogItemDetailRequest;
+use App\Domains\Catalog\Requests\CategoryPageRequest;
 use App\Domains\Catalog\Requests\FeaturedGroupPageRequest;
+use App\Domains\Catalog\Requests\SearchCatalogItemsRequest;
 use App\Domains\Catalog\Requests\StoreCatalogItemRequest;
 use App\Domains\Catalog\Resources\CatalogFeaturedGroupResource;
 use App\Domains\Catalog\Resources\CatalogFeaturedItemResource;
 use App\Domains\Catalog\Resources\CatalogItemDetailResource;
 use App\Domains\Catalog\Resources\CatalogItemResource;
+use App\Domains\Catalog\Resources\CatalogSearchItemResource;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Pagination\LengthAwarePaginator;
 
 class CatalogController extends Controller
@@ -36,6 +44,47 @@ class CatalogController extends Controller
         ));
     }
 
+    public function search(
+        SearchCatalogItemsRequest $request,
+        Tenant $tenant,
+        CatalogService $catalogService,
+    ): AnonymousResourceCollection {
+        return CatalogSearchItemResource::collection(
+            $catalogService->search(
+                $tenant,
+                $request->validated('q'),
+                $tenant->search_items_per_page,
+                (int) $request->validated('page', 1),
+            )
+        );
+    }
+
+    public function category(
+        CategoryPageRequest $request,
+        Tenant $tenant,
+        Category $category,
+        CatalogService $catalogService,
+    ): AnonymousResourceCollection {
+        abort_unless($category->tenant_code === $tenant->codigo, 404);
+
+        return CatalogSearchItemResource::collection(
+            $catalogService->categoryItems(
+                $tenant,
+                $category,
+                $tenant->search_items_per_page,
+                (int) $request->validated('page', 1),
+            )
+        )->additional([
+            'category' => [
+                'id' => $category->id,
+                'nombre' => $category->nombre,
+                'categoria_id' => $category->categoria_id,
+            ],
+            'layout' => $tenant->search_product_layout->value,
+            'group_layout' => $tenant->search_group_layout->value,
+        ]);
+    }
+
     public function featuredGroupItems(
         FeaturedGroupPageRequest $request,
         Tenant $tenant,
@@ -81,9 +130,19 @@ class CatalogController extends Controller
             ->setStatusCode(201);
     }
 
-    /** @return array<string, mixed> */
+    /** @return array<array-key, mixed> */
     private function featuredItemsResponse(FeaturedGroup $featuredGroup, int $page): array
     {
+        if ($featuredGroup->group_layout !== GroupLayout::Paginated) {
+            $featuredItems = $this->featuredItemsQuery($featuredGroup)->get();
+
+            $featuredItems->each(
+                fn ($featuredItem) => $featuredItem->setRelation('featuredGroup', $featuredGroup)
+            );
+
+            return CatalogFeaturedItemResource::collection($featuredItems)->resolve();
+        }
+
         $paginator = $this->paginateFeaturedItems($featuredGroup, $page);
 
         $paginator->getCollection()->each(
@@ -99,25 +158,29 @@ class CatalogController extends Controller
         FeaturedGroup $featuredGroup,
         int $page,
     ): LengthAwarePaginator {
-        $paginator = $featuredGroup->featuredItems()
-            ->with([
-                'catalogItem.inventory',
-                'catalogItem.attachments',
-                'catalogItem.variants.inventory',
-                'catalogItem.variants.attachments',
-                'catalogItem.variants.definitions.itemAttribute.attribute',
-                'catalogItem.bundleComponents.catalogItem',
-                'catalogItem.bundleComponents.variant.catalogItem',
-            ])
-            ->paginate(
-                perPage: self::ITEMS_PER_PAGE,
-                pageName: 'page',
-                page: $page,
-            );
+        $paginator = $this->featuredItemsQuery($featuredGroup)->paginate(
+            perPage: self::ITEMS_PER_PAGE,
+            pageName: 'page',
+            page: $page,
+        );
 
         return $paginator->withPath(route('catalog.featured-groups.items.index', [
             'tenant' => $featuredGroup->tenant_code,
             'featuredGroup' => $featuredGroup->id,
         ]));
     }
+
+    /** @return HasMany<FeaturedItem, FeaturedGroup> */
+    private function featuredItemsQuery(FeaturedGroup $featuredGroup): HasMany
+    {
+        return $featuredGroup->featuredItems()->with([
+            'catalogItem.inventory',
+            'catalogItem.attachments',
+            'catalogItem.variants.inventory',
+            'catalogItem.variants.attachments',
+            'catalogItem.variants.definitions.itemAttribute.attribute',
+            'catalogItem.bundleComponents.catalogItem',
+            'catalogItem.bundleComponents.variant.catalogItem',
+        ]);
+    }
 }

app/Domains/Catalog/Enums/GroupLayout.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum GroupLayout: string
+{
+    case Paginated = 'paginated';
+    case Simple = 'simple';
+    case SimpleVertical = 'simple_vertical';
+    case Carousel = 'carousel';
+
+    /**
+     * @return list<string>
+     */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Catalog/Models/CatalogItem.php

@@ -7,6 +7,7 @@ use App\Domains\Catalog\Enums\CatalogItemType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Tenant\Models\Tenant;
+use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -163,6 +164,16 @@ class CatalogItem extends Model
         return $this->nombre;
     }
 
+    public function getMinimumUseDate(): ?CarbonInterface
+    {
+        return $this->minimum_use_date;
+    }
+
+    public function getMaximumUseDate(): ?CarbonInterface
+    {
+        return $this->maximum_use_date;
+    }
+
     public function isBundle(): bool
     {
         return $this->type === CatalogItemType::Bundle;

app/Domains/Catalog/Models/FeaturedGroup.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\Catalog\Models;
 
+use App\Domains\Catalog\Enums\GroupLayout;
 use App\Domains\Catalog\Enums\ProductLayout;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -13,6 +14,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 #[Fillable([
     'tenant_code',
     'product_layout',
+    'group_layout',
     'group_name',
     'group_order',
 ])]
@@ -28,6 +30,7 @@ class FeaturedGroup extends Model
     {
         return [
             'product_layout' => ProductLayout::class,
+            'group_layout' => GroupLayout::class,
             'group_order' => 'integer',
         ];
     }

app/Domains/Catalog/Models/Variant.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Catalog\Models;
 
 use App\Domains\Attachable\Models\Attachment;
+use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -13,6 +14,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 #[Fillable([
     'catalog_item_id',
     'inventory_id',
+    'minimum_use_date',
+    'maximum_use_date',
 ])]
 class Variant extends Model
 {
@@ -27,6 +30,8 @@ class Variant extends Model
         return [
             'catalog_item_id' => 'integer',
             'inventory_id' => 'integer',
+            'minimum_use_date' => 'datetime',
+            'maximum_use_date' => 'datetime',
         ];
     }
 
@@ -89,4 +94,16 @@ class Variant extends Model
 
         return $definitions === '' ? $name : "{$name} ({$definitions})";
     }
+
+    public function getMinimumUseDate(): ?CarbonInterface
+    {
+        return $this->minimum_use_date
+            ?? $this->catalogItem->getMinimumUseDate();
+    }
+
+    public function getMaximumUseDate(): ?CarbonInterface
+    {
+        return $this->maximum_use_date
+            ?? $this->catalogItem->getMaximumUseDate();
+    }
 }

app/Domains/Catalog/Requests/CategoryPageRequest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CategoryPageRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, list<string>> */
+    public function rules(): array
+    {
+        return [
+            'page' => ['sometimes', 'integer', 'min:1'],
+        ];
+    }
+}

app/Domains/Catalog/Requests/SearchCatalogItemsRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SearchCatalogItemsRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, list<string>> */
+    public function rules(): array
+    {
+        return [
+            'q' => ['required', 'string', 'min:2', 'max:100'],
+            'page' => ['sometimes', 'integer', 'min:1'],
+        ];
+    }
+
+    protected function prepareForValidation(): void
+    {
+        if ($this->has('q') && is_string($this->input('q'))) {
+            $this->merge(['q' => trim($this->string('q')->toString())]);
+        }
+    }
+}

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -76,6 +76,13 @@ class StoreCatalogItemRequest extends FormRequest
             'variants.*.inventory_id' => ['prohibited'],
             'variants.*.reserved_stock' => ['prohibited'],
             'variants.*.sold_units' => ['prohibited'],
+            'variants.*.minimum_use_date' => ['sometimes', 'nullable', 'date'],
+            'variants.*.maximum_use_date' => [
+                'sometimes',
+                'nullable',
+                'date',
+                'after_or_equal:variants.*.minimum_use_date',
+            ],
             'variants.*.values' => ['sometimes', 'array'],
             'variants.*.values.*' => ['nullable', 'string'],
             'variants.*.images' => ['sometimes', 'array'],

app/Domains/Catalog/Resources/CatalogFeaturedGroupResource.php

@@ -9,8 +9,8 @@ use Illuminate\Http\Resources\Json\JsonResource;
 /** @mixin FeaturedGroup */
 class CatalogFeaturedGroupResource extends JsonResource
 {
-    /** @param array<string, mixed> $itemsPage */
-    public function __construct($resource, private readonly array $itemsPage)
+    /** @param array<array-key, mixed> $items */
+    public function __construct($resource, private readonly array $items)
     {
         parent::__construct($resource);
     }
@@ -22,8 +22,9 @@ class CatalogFeaturedGroupResource extends JsonResource
             'id' => $this->id,
             'title' => $this->group_name,
             'layout' => $this->product_layout->value,
+            'group_layout' => $this->group_layout->value,
             'group_order' => $this->group_order,
-            'items' => $this->itemsPage,
+            'items' => $this->items,
         ];
     }
 }

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -111,6 +111,12 @@ class CatalogItemDetailResource extends JsonResource
         return [
             'id' => $variant->id,
             'stock_tecnico' => $this->variantStock($variant),
+            'minimum_use_date' => $variant->minimum_use_date,
+            'maximum_use_date' => $variant->maximum_use_date,
+            'effective_minimum_use_date' => $variant->minimum_use_date
+                ?? $this->minimum_use_date,
+            'effective_maximum_use_date' => $variant->maximum_use_date
+                ?? $this->maximum_use_date,
             'values' => $variant->definitions
                 ->mapWithKeys(fn ($definition) => [
                     $definition->itemAttribute?->attribute?->codigo => $definition->value,

app/Domains/Catalog/Resources/CatalogItemResource.php

@@ -33,6 +33,12 @@ class CatalogItemResource extends JsonResource
                 ->map(fn ($variant) => [
                     'id' => $variant->id,
                     'real_stock' => $variant->inventory?->real_stock,
+                    'minimum_use_date' => $variant->minimum_use_date,
+                    'maximum_use_date' => $variant->maximum_use_date,
+                    'effective_minimum_use_date' => $variant->minimum_use_date
+                        ?? $this->minimum_use_date,
+                    'effective_maximum_use_date' => $variant->maximum_use_date
+                        ?? $this->maximum_use_date,
                     'values' => $variant->definitions
                         ->mapWithKeys(fn ($definition) => [
                             $definition->itemAttribute?->attribute?->codigo => $definition->value,

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Variant;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin CatalogItem */
+class CatalogSearchItemResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        $attachment = $this->attachments->first()
+            ?? $this->variants
+                ->flatMap(fn (Variant $variant) => $variant->attachments)
+                ->first();
+
+        return [
+            'id' => $this->id,
+            'type' => $this->type->value,
+            'nombre' => $this->nombre,
+            'descripcion' => $this->descripcion,
+            'precio' => $this->precio,
+            'image' => $attachment?->getTemporaryUrl(1440),
+            'stock_tecnico' => $this->availableStock(),
+            'variants' => $this->variants
+                ->map(fn (Variant $variant): array => [
+                    'id' => $variant->id,
+                    'stock_tecnico' => $this->inventory_policy === InventoryPolicy::Unlimited
+                        ? null
+                        : $variant->inventory?->availableStock(),
+                    'values' => $variant->definitions
+                        ->mapWithKeys(fn ($definition) => [
+                            $definition->itemAttribute?->attribute?->codigo => $definition->value,
+                        ])
+                        ->filter(fn ($value, $key): bool => $key !== null),
+                ])
+                ->values(),
+        ];
+    }
+}

app/Domains/Catalog/Services/CatalogService.php

@@ -7,9 +7,13 @@ use App\Domains\Attachable\Services\AttachmentService;
 use App\Domains\Catalog\Enums\CatalogItemType;
 use App\Domains\Catalog\Models\Attribute;
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\Inventory;
 use App\Domains\Catalog\Models\ItemAttribute;
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
@@ -42,7 +46,7 @@ class CatalogService
             } else {
                 if (array_key_exists('components', $data)) {
                     throw ValidationException::withMessages([
-                        'components' => ['Un item standard no puede tener componentes.'],
+                        'components' => [__('api.catalog.standard_with_components')],
                     ]);
                 }
 
@@ -158,6 +162,78 @@ class CatalogService
         return $catalogItem;
     }
 
+    /** @return LengthAwarePaginator<CatalogItem> */
+    public function search(
+        Tenant $tenant,
+        string $term,
+        int $perPage,
+        int $page,
+    ): LengthAwarePaginator {
+        $normalizedTerm = mb_strtolower($term);
+        $containsPattern = "%{$normalizedTerm}%";
+        $startsWithPattern = "{$normalizedTerm}%";
+
+        $paginator = CatalogItem::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->where(function (Builder $query) use ($containsPattern): void {
+                $query
+                    ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
+                    ->orWhereRaw('LOWER(descripcion) LIKE ?', [$containsPattern])
+                    ->orWhereHas(
+                        'brand',
+                        fn (Builder $brandQuery) => $brandQuery
+                            ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
+                    )
+                    ->orWhereHas(
+                        'category',
+                        fn (Builder $categoryQuery) => $categoryQuery
+                            ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
+                    );
+            })
+            ->with([
+                'attachments',
+                'inventory',
+                'variants.inventory',
+                'variants.attachments',
+                'variants.definitions.itemAttribute.attribute',
+                'bundleComponents.catalogItem',
+                'bundleComponents.variant.catalogItem',
+            ])
+            ->orderByRaw(
+                'CASE WHEN LOWER(nombre) = ? THEN 0 WHEN LOWER(nombre) LIKE ? THEN 1 ELSE 2 END',
+                [$normalizedTerm, $startsWithPattern],
+            )
+            ->orderBy('nombre')
+            ->paginate(perPage: $perPage, pageName: 'page', page: $page);
+
+        return $paginator->withPath(route('catalog-items.index', [
+            'tenant' => $tenant->codigo,
+        ]));
+    }
+
+    /** @return LengthAwarePaginator<CatalogItem> */
+    public function categoryItems(
+        Tenant $tenant,
+        Category $category,
+        int $perPage,
+        int $page,
+    ): LengthAwarePaginator {
+        return CatalogItem::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->where('category_id', $category->id)
+            ->with([
+                'attachments',
+                'inventory',
+                'variants.inventory',
+                'variants.attachments',
+                'variants.definitions.itemAttribute.attribute',
+                'bundleComponents.catalogItem',
+                'bundleComponents.variant.catalogItem',
+            ])
+            ->orderBy('nombre')
+            ->paginate(perPage: $perPage, pageName: 'page', page: $page);
+    }
+
     public function delete(CatalogItem $catalogItem): void
     {
         DB::transaction(function () use ($catalogItem): void {
@@ -213,7 +289,7 @@ class CatalogService
 
             if (isset($seen[$key])) {
                 throw ValidationException::withMessages([
-                    "components.{$index}" => ['El componente esta duplicado.'],
+                    "components.{$index}" => [__('api.catalog.duplicate_component')],
                 ]);
             }
             $seen[$key] = true;
@@ -226,7 +302,7 @@ class CatalogService
             if ($componentItem === null) {
                 throw ValidationException::withMessages([
                     "components.{$index}.catalog_item_id" => [
-                        'El item no pertenece al tenant del bundle.',
+                        __('api.catalog.component_wrong_tenant'),
                     ],
                 ]);
             }
@@ -234,7 +310,7 @@ class CatalogService
             if ($componentItem->is($bundle) || $componentItem->type !== CatalogItemType::Standard) {
                 throw ValidationException::withMessages([
                     "components.{$index}.catalog_item_id" => [
-                        'El componente debe ser un item standard distinto del bundle.',
+                        __('api.catalog.invalid_component'),
                     ],
                 ]);
             }
@@ -243,7 +319,7 @@ class CatalogService
             if ($hasVariants && $variantId === null) {
                 throw ValidationException::withMessages([
                     "components.{$index}.variant_id" => [
-                        'Debe seleccionar una variante para este componente.',
+                        __('api.catalog.component_variant_required'),
                     ],
                 ]);
             }
@@ -251,7 +327,7 @@ class CatalogService
             if (! $hasVariants && $variantId !== null) {
                 throw ValidationException::withMessages([
                     "components.{$index}.variant_id" => [
-                        'El componente con inventario directo no admite una variante.',
+                        __('api.catalog.component_variant_forbidden'),
                     ],
                 ]);
             }
@@ -259,7 +335,7 @@ class CatalogService
             if ($variantId !== null && ! $componentItem->variants()->whereKey($variantId)->exists()) {
                 throw ValidationException::withMessages([
                     "components.{$index}.variant_id" => [
-                        'La variante no pertenece al componente indicado.',
+                        __('api.catalog.component_variant_invalid'),
                     ],
                 ]);
             }
@@ -281,7 +357,7 @@ class CatalogService
     {
         if ($components === []) {
             throw ValidationException::withMessages([
-                'components' => ['Un bundle debe tener al menos un componente.'],
+                'components' => [__('api.catalog.bundle_component_required')],
             ]);
         }
 
@@ -296,7 +372,7 @@ class CatalogService
         ] as $field) {
             if (array_key_exists($field, $data)) {
                 throw ValidationException::withMessages([
-                    $field => ["{$field} no se admite para un bundle."],
+                    $field => [__('api.catalog.bundle_field_forbidden', ['field' => $field])],
                 ]);
             }
         }
@@ -324,7 +400,7 @@ class CatalogService
 
             if ($attachment === null) {
                 throw ValidationException::withMessages([
-                    $validationKey => ['El attachment indicado no existe.'],
+                    $validationKey => [__('api.catalog.attachment_not_found')],
                 ]);
             }
 
@@ -356,7 +432,7 @@ class CatalogService
             if ($attribute === null) {
                 throw ValidationException::withMessages([
                     'attribute_codes' => [
-                        "El atributo {$attributeCode} no existe para el tenant del ítem.",
+                        __('api.catalog.attribute_not_found', ['attribute' => $attributeCode]),
                     ],
                 ]);
             }
@@ -390,7 +466,7 @@ class CatalogService
         ) {
             throw ValidationException::withMessages([
                 "variants.{$index}.inventory" => [
-                    'inventory_id, reserved_stock y sold_units son administrados internamente.',
+                    __('api.catalog.managed_inventory_fields'),
                 ],
             ]);
         }
@@ -398,7 +474,12 @@ class CatalogService
         $inventory = $this->createInventory((int) ($data['real_stock'] ?? 0));
         $variant = $catalogItem->variants()->create([
             'inventory_id' => $inventory->id,
+            'minimum_use_date' => $data['minimum_use_date'] ?? null,
+            'maximum_use_date' => $data['maximum_use_date'] ?? null,
         ]);
+        $variant->setRelation('catalogItem', $catalogItem);
+
+        $this->validateVariantUseDates($variant, $index);
 
         foreach ($data['values'] ?? [] as $attributeCode => $value) {
             $itemAttribute = $itemAttributes[$attributeCode] ?? null;
@@ -406,7 +487,7 @@ class CatalogService
             if ($itemAttribute === null) {
                 throw ValidationException::withMessages([
                     "variants.{$index}.values.{$attributeCode}" => [
-                        'El atributo no pertenece al ítem de catálogo.',
+                        __('api.catalog.attribute_not_on_item'),
                     ],
                 ]);
             }
@@ -420,6 +501,24 @@ class CatalogService
         return $variant;
     }
 
+    private function validateVariantUseDates(Variant $variant, int $index): void
+    {
+        $minimumUseDate = $variant->getMinimumUseDate();
+        $maximumUseDate = $variant->getMaximumUseDate();
+
+        if (
+            $minimumUseDate !== null
+            && $maximumUseDate !== null
+            && $maximumUseDate->lessThan($minimumUseDate)
+        ) {
+            throw ValidationException::withMessages([
+                "variants.{$index}.maximum_use_date" => [
+                    __('api.catalog.invalid_effective_date_range'),
+                ],
+            ]);
+        }
+    }
+
     /**
      * @param  array<string, mixed>  $data
      * @param  array<int, array<string, mixed>>  $variants
@@ -433,7 +532,7 @@ class CatalogService
         if ($hasVariants && $variants === []) {
             throw ValidationException::withMessages([
                 'variants' => [
-                    'Un ítem con attribute_codes debe tener variantes.',
+                    __('api.catalog.variants_required'),
                 ],
             ]);
         }
@@ -441,7 +540,7 @@ class CatalogService
         if (! $hasVariants && $variants !== []) {
             throw ValidationException::withMessages([
                 'variants' => [
-                    'Un ítem sin attribute_codes no puede tener variantes.',
+                    __('api.catalog.variants_forbidden'),
                 ],
             ]);
         }
@@ -449,7 +548,7 @@ class CatalogService
         if ($hasVariants && $hasDirectStock) {
             throw ValidationException::withMessages([
                 'real_stock' => [
-                    'Un ítem con variantes no puede tener inventario directo.',
+                    __('api.catalog.direct_inventory_forbidden'),
                 ],
             ]);
         }
@@ -461,7 +560,7 @@ class CatalogService
         ) {
             throw ValidationException::withMessages([
                 'inventory' => [
-                    'inventory_id, reserved_stock y sold_units son administrados internamente.',
+                    __('api.catalog.managed_inventory_fields'),
                 ],
             ]);
         }

app/Domains/Catalog/routes/api.php

@@ -7,6 +7,10 @@ Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
     Route::get('catalog', [CatalogController::class, 'index']);
     Route::get('catalog/featured-groups/{featuredGroup}/items', [CatalogController::class, 'featuredGroupItems'])
         ->name('catalog.featured-groups.items.index');
+    Route::get('catalog-items', [CatalogController::class, 'search'])
+        ->name('catalog-items.index');
+    Route::get('categories/{category}', [CatalogController::class, 'category'])
+        ->name('categories.show');
     Route::get('catalog-items/{catalogItem}', [CatalogController::class, 'show']);
     Route::post('catalog-items', [CatalogController::class, 'store']);
 });

app/Domains/Integration/Controllers/TelepagosWebhookController.php

@@ -6,28 +6,26 @@ use App\Domains\Integration\Requests\TelepagosWebhookRequest;
 use App\Domains\Integration\Services\TelepagosWebhookService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 
 class TelepagosWebhookController extends Controller
 {
     /**
      * Handle the incoming Telepagos webhook.
-     *
-     * @param TelepagosWebhookRequest $request
-     * @param string $tenantCodigo
-     * @param TelepagosWebhookService $service
-     * @return JsonResponse
      */
     public function handle(TelepagosWebhookRequest $request, string $tenantCodigo, TelepagosWebhookService $service): JsonResponse
     {
         try {
             $cashinId = $request->validated('id');
-            
+
             $service->handleWebhook($tenantCodigo, $cashinId);
-            
+
             return response()->json(['status' => 'success']);
         } catch (\Exception $e) {
-            return response()->json(['status' => 'error', 'message' => $e->getMessage()], 500);
+            return response()->json([
+                'status' => 'error',
+                'code' => 'integration.webhook_failed',
+                'message' => __('api.integration.webhook_failed'),
+            ], 500);
         }
     }
 }

app/Domains/Integration/Controllers/TenantIntegrationController.php

@@ -24,9 +24,12 @@ class TenantIntegrationController extends Controller
     public function show(string $tenantCode, string $integrationCode)
     {
         $integration = $this->tenantIntegrationService->getTenantIntegration($tenantCode, $integrationCode);
-        
-        if (!$integration) {
-            return response()->json(['message' => 'Integration not configured for this tenant'], 404);
+
+        if (! $integration) {
+            return response()->json([
+                'code' => 'integration.not_configured',
+                'message' => __('api.integration.not_configured'),
+            ], 404);
         }
 
         return response()->json($integration);
@@ -35,7 +38,7 @@ class TenantIntegrationController extends Controller
     public function store(StoreTenantIntegrationRequest $request, string $tenantCode, string $integrationCode)
     {
         $integration = Integration::where('integration_code', $integrationCode)->firstOrFail();
-        
+
         try {
             $this->tenantIntegrationService->updateOrCreateIntegration(
                 $tenantCode,
@@ -44,11 +47,13 @@ class TenantIntegrationController extends Controller
             );
 
             return response()->json([
-                'message' => 'integration configured correctly',
+                'code' => 'integration.configured',
+                'message' => __('api.integration.configured'),
             ]);
         } catch (\Exception $e) {
             return response()->json([
-                'message' => 'Error validando la configuración: ' . $e->getMessage()
+                'code' => 'integration.validation_failed',
+                'message' => __('api.integration.validation_failed', ['error' => $e->getMessage()]),
             ], 400);
         }
     }

app/Domains/Integration/Requests/StoreTenantIntegrationRequest.php

@@ -20,9 +20,9 @@ class StoreTenantIntegrationRequest extends FormRequest
         $integrationCode = $this->route('integration_code');
         $this->integrationModel = Integration::where('integration_code', $integrationCode)->first();
 
-        if (!$this->integrationModel) {
+        if (! $this->integrationModel) {
             throw ValidationException::withMessages([
-                'integration_code' => 'Integration not found.'
+                'integration_code' => __('api.integration.not_configured'),
             ]);
         }
     }
@@ -34,7 +34,7 @@ class StoreTenantIntegrationRequest extends FormRequest
         // Dynamic validation rules based on the integration data schema
         if ($this->integrationModel && $this->integrationModel->integration_data_schema) {
             foreach ($this->integrationModel->integration_data_schema as $field => $rule) {
-                $rules['integration_data.' . $field] = $rule;
+                $rules['integration_data.'.$field] = $rule;
             }
         }
 

app/Domains/MailTest/Services/MailTestService.php

@@ -24,7 +24,8 @@ class MailTestService
         );
 
         return [
-            'message' => 'Correo de prueba enviado correctamente.',
+            'code' => 'mail.test_sent',
+            'message' => __('api.mail.test_sent'),
             'recipient' => $recipient,
             'tenant_code' => $tenant->codigo,
             'mailer' => $mailService->mailerName(),

app/Domains/Menu/Controllers/MenuController.php

@@ -4,14 +4,16 @@ namespace App\Domains\Menu\Controllers;
 
 use App\Domains\Menu\Models\Menu;
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
 
 class MenuController extends Controller
 {
     public function index(): JsonResponse
     {
         $menues = Menu::all();
+
         return response()->json($menues);
     }
 
@@ -19,10 +21,23 @@ class MenuController extends Controller
     {
         $validated = $request->validate([
             'code' => 'required|string|unique:menues,code',
+            'label' => 'required|string|max:255',
+            'parent_menu_code' => [
+                'nullable',
+                'string',
+                Rule::exists('menues', 'code'),
+                'different:code',
+            ],
+            'content_type' => [
+                'sometimes',
+                Rule::in([Menu::CONTENT_TYPE_STATIC, Menu::CONTENT_TYPE_DYNAMIC]),
+            ],
+            'static_content_schema' => 'required_if:content_type,static|nullable|array',
             'route' => 'required|string',
         ]);
 
         $menu = Menu::create($validated);
+
         return response()->json($menu, 201);
     }
 
@@ -34,17 +49,31 @@ class MenuController extends Controller
     public function update(Request $request, Menu $menu): JsonResponse
     {
         $validated = $request->validate([
-            'code' => 'sometimes|required|string|unique:menues,code,' . $menu->id,
+            'code' => 'sometimes|required|string|unique:menues,code,'.$menu->id,
+            'label' => 'sometimes|required|string|max:255',
+            'parent_menu_code' => [
+                'nullable',
+                'string',
+                Rule::exists('menues', 'code'),
+                Rule::notIn([$menu->code]),
+            ],
+            'content_type' => [
+                'sometimes',
+                Rule::in([Menu::CONTENT_TYPE_STATIC, Menu::CONTENT_TYPE_DYNAMIC]),
+            ],
+            'static_content_schema' => 'required_if:content_type,static|nullable|array',
             'route' => 'sometimes|required|string',
         ]);
 
         $menu->update($validated);
+
         return response()->json($menu);
     }
 
     public function destroy(Menu $menu): JsonResponse
     {
         $menu->delete();
+
         return response()->json(null, 204);
     }
 }

app/Domains/Menu/Controllers/TenantMenuController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Domains\Menu\Controllers;
+
+use App\Domains\Menu\Models\Menu;
+use App\Domains\Menu\Requests\StoreTenantMenuRequest;
+use App\Domains\Menu\Services\TenantMenuService;
+use App\Domains\Tenant\Models\Tenant;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+
+class TenantMenuController extends Controller
+{
+    public function __construct(private readonly TenantMenuService $tenantMenuService) {}
+
+    public function store(
+        StoreTenantMenuRequest $request,
+        string $tenantCode,
+        string $menuCode,
+    ): JsonResponse {
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
+        $menu = Menu::query()->where('code', $menuCode)->firstOrFail();
+
+        $tenantMenu = $this->tenantMenuService->configure(
+            $tenant,
+            $menu,
+            $request->validated('static_content'),
+        );
+
+        return response()->json($tenantMenu);
+    }
+}

app/Domains/Menu/Models/Menu.php

@@ -5,28 +5,77 @@ namespace App\Domains\Menu\Models;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Validation\ValidationException;
 
 class Menu extends Model
 {
     use HasFactory;
 
+    public const CONTENT_TYPE_DYNAMIC = 'dynamic';
+
+    public const CONTENT_TYPE_STATIC = 'static';
+
     protected $table = 'menues';
 
+    protected $attributes = [
+        'content_type' => self::CONTENT_TYPE_DYNAMIC,
+    ];
+
     protected $fillable = [
         'code',
+        'label',
+        'parent_menu_code',
+        'content_type',
+        'static_content_schema',
         'route',
     ];
 
+    protected function casts(): array
+    {
+        return [
+            'static_content_schema' => 'array',
+        ];
+    }
+
+    protected static function booted(): void
+    {
+        static::saving(function (self $menu): void {
+            if (
+                $menu->content_type === self::CONTENT_TYPE_STATIC
+                && empty($menu->static_content_schema)
+            ) {
+                throw ValidationException::withMessages([
+                    'static_content_schema' => __('api.menu.schema_required'),
+                ]);
+            }
+        });
+    }
+
+    public function parent(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'parent_menu_code', 'code');
+    }
+
+    public function children(): HasMany
+    {
+        return $this->hasMany(self::class, 'parent_menu_code', 'code');
+    }
+
     public function tenants(): BelongsToMany
     {
         return $this->belongsToMany(
             Tenant::class,
-            'tenant_menues',
+            'tenants_menues',
             'menu_code',
-            'tenant_codigo',
+            'tenant_code',
             'code',
             'codigo'
-        )->withTimestamps();
+        )
+            ->using(TenantMenu::class)
+            ->withPivot('static_content')
+            ->withTimestamps();
     }
 }

app/Domains/Menu/Models/TenantMenu.php

@@ -2,9 +2,36 @@
 
 namespace App\Domains\Menu\Models;
 
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
 class TenantMenu extends Pivot
 {
-    protected $table = 'tenant_menues';
+    protected $table = 'tenants_menues';
+
+    public $incrementing = true;
+
+    protected $fillable = [
+        'tenant_code',
+        'menu_code',
+        'static_content',
+    ];
+
+    protected function casts(): array
+    {
+        return [
+            'static_content' => 'array',
+        ];
+    }
+
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
+    }
+
+    public function menu(): BelongsTo
+    {
+        return $this->belongsTo(Menu::class, 'menu_code', 'code');
+    }
 }

app/Domains/Menu/Requests/StoreTenantMenuRequest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Domains\Menu\Requests;
+
+use App\Domains\Menu\Models\Menu;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\ValidationException;
+
+class StoreTenantMenuRequest extends FormRequest
+{
+    private ?Menu $menuModel = null;
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $this->menuModel = Menu::query()
+            ->where('code', $this->route('menu_code'))
+            ->first();
+
+        if (! $this->menuModel) {
+            throw ValidationException::withMessages([
+                'menu_code' => __('api.menu.not_found'),
+            ]);
+        }
+    }
+
+    public function rules(): array
+    {
+        if ($this->menuModel?->content_type !== Menu::CONTENT_TYPE_STATIC) {
+            return [
+                'static_content' => ['nullable', 'array'],
+            ];
+        }
+
+        $rules = [
+            'static_content' => ['required', 'array'],
+        ];
+
+        foreach ($this->menuModel->static_content_schema as $field => $rule) {
+            $rules["static_content.{$field}"] = $rule;
+        }
+
+        return $rules;
+    }
+}

app/Domains/Menu/Services/TenantMenuService.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Menu\Services;
+
+use App\Domains\Menu\Models\Menu;
+use App\Domains\Menu\Models\TenantMenu;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Support\Facades\DB;
+
+class TenantMenuService
+{
+    public function configure(Tenant $tenant, Menu $menu, ?array $staticContent): TenantMenu
+    {
+        return DB::transaction(fn () => TenantMenu::query()->updateOrCreate(
+            [
+                'tenant_code' => $tenant->codigo,
+                'menu_code' => $menu->code,
+            ],
+            [
+                'static_content' => $menu->content_type === Menu::CONTENT_TYPE_STATIC
+                    ? $staticContent
+                    : null,
+            ],
+        ));
+    }
+}

app/Domains/Menu/routes/api.php

@@ -1,6 +1,12 @@
 <?php
 
 use App\Domains\Menu\Controllers\MenuController;
+use App\Domains\Menu\Controllers\TenantMenuController;
 use Illuminate\Support\Facades\Route;
 
 Route::apiResource('menues', MenuController::class);
+
+Route::post(
+    '{tenant_code}/menues/{menu_code}',
+    [TenantMenuController::class, 'store']
+);

app/Domains/Notification/Events/PasswordResetRequested.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Domains\Notification\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class PasswordResetRequested
+{
+    use Dispatchable, SerializesModels;
+
+    public function __construct(
+        public readonly int $attemptId,
+        public readonly string $tenantCode,
+    ) {}
+}

app/Domains/Notification/Events/TicketsAvailable.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Domains\Notification\Events;
+
+use App\Domains\Purchase\Models\Purchase;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class TicketsAvailable
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * @param  array<int, int>  $ticketIds
+     */
+    public function __construct(
+        public readonly Purchase $purchase,
+        public readonly array $ticketIds,
+    ) {}
+}

app/Domains/Notification/Events/UserRegistered.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Domains\Notification\Events;
+
+use App\Domains\Auth\Models\User;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class UserRegistered
+{
+    use Dispatchable, SerializesModels;
+
+    public function __construct(
+        public readonly User $user,
+        public readonly string $tenantCode,
+    ) {}
+}

app/Domains/Notification/Listeners/SendPasswordResetEmail.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Domains\Notification\Listeners;
+
+use App\Domains\Notification\Events\PasswordResetRequested;
+use App\Domains\Notification\Services\NotificationMailService;
+use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
+use Throwable;
+
+class SendPasswordResetEmail implements ShouldQueueAfterCommit
+{
+    use InteractsWithQueue;
+
+    public string $queue = 'emails';
+
+    public int $tries = 3;
+
+    /** @var array<int, int> */
+    public array $backoff = [30, 120, 300];
+
+    public function handle(PasswordResetRequested $event): void
+    {
+        try {
+            app(NotificationMailService::class)->sendPasswordResetCode(
+                $event->attemptId,
+                $event->tenantCode,
+            );
+        } catch (Throwable $exception) {
+            Log::error('Failed to send password reset email.', [
+                'attempt_id' => $event->attemptId,
+                'tenant_code' => $event->tenantCode,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
+    }
+}

app/Domains/Notification/Listeners/SendPurchasePaidEmail.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Domains\Notification\Listeners;
+
+use App\Domains\Notification\Services\NotificationMailService;
+use App\Domains\Purchase\Events\PurchasePaid;
+use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
+use Illuminate\Queue\InteractsWithQueue;
+
+class SendPurchasePaidEmail implements ShouldQueueAfterCommit
+{
+    use InteractsWithQueue;
+
+    public string $queue = 'emails';
+
+    public int $tries = 3;
+
+    /** @var array<int, int> */
+    public array $backoff = [30, 120, 300];
+
+    public function handle(PurchasePaid $event): void
+    {
+        app(NotificationMailService::class)->sendPurchasePaid($event->purchase->getKey());
+    }
+}

app/Domains/Notification/Listeners/SendTicketsAvailableEmail.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Domains\Notification\Listeners;
+
+use App\Domains\Notification\Events\TicketsAvailable;
+use App\Domains\Notification\Services\NotificationMailService;
+use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
+use Illuminate\Queue\InteractsWithQueue;
+
+class SendTicketsAvailableEmail implements ShouldQueueAfterCommit
+{
+    use InteractsWithQueue;
+
+    public string $queue = 'emails';
+
+    public int $tries = 3;
+
+    /** @var array<int, int> */
+    public array $backoff = [30, 120, 300];
+
+    public function handle(TicketsAvailable $event): void
+    {
+        app(NotificationMailService::class)->sendTicketsAvailable($event->purchase->getKey(), $event->ticketIds);
+    }
+}

app/Domains/Notification/Listeners/SendWelcomeEmail.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Domains\Notification\Listeners;
+
+use App\Domains\Notification\Events\UserRegistered;
+use App\Domains\Notification\Services\NotificationMailService;
+use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
+use Illuminate\Queue\InteractsWithQueue;
+
+class SendWelcomeEmail implements ShouldQueueAfterCommit
+{
+    use InteractsWithQueue;
+
+    public string $queue = 'emails';
+
+    public int $tries = 3;
+
+    /** @var array<int, int> */
+    public array $backoff = [30, 120, 300];
+
+    public function handle(UserRegistered $event): void
+    {
+        app(NotificationMailService::class)->sendWelcome($event->user->getKey(), $event->tenantCode);
+    }
+}

app/Domains/Notification/Services/NotificationMailService.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Domains\Notification\Services;
+
+use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Auth\Models\User;
+use App\Domains\Integration\Services\MailService;
+use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Models\Ticket;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+
+class NotificationMailService
+{
+    public function __construct(
+        private readonly MailService $mailService,
+    ) {}
+
+    public function sendWelcome(int $userId, string $tenantCode): void
+    {
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
+        $user = User::query()->findOrFail($userId);
+
+        $this->mailService
+            ->forTenant($tenantCode)
+            ->send(
+                $user->email,
+                "Bienvenido a {$tenant->nombre}",
+                view('mail.notifications.welcome', compact('tenant', 'user'))->render(),
+            );
+    }
+
+    public function sendPasswordResetCode(int $attemptId, string $tenantCode): void
+    {
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
+        $attempt = ResetPasswordAttempt::query()
+            ->with('user')
+            ->findOrFail($attemptId);
+
+        if ($attempt->status !== ResetPasswordAttempt::STATUS_PENDING) {
+            Log::warning('Password reset email was skipped because the attempt is no longer pending.', [
+                'attempt_id' => $attemptId,
+                'tenant_code' => $tenantCode,
+                'attempt_status' => $attempt->status,
+            ]);
+
+            return;
+        }
+
+        $this->mailService
+            ->forTenant($tenantCode)
+            ->send(
+                $attempt->user->email,
+                "Código para recuperar tu contraseña - {$tenant->nombre}",
+                view('mail.notifications.password-reset', compact('tenant', 'attempt'))->render(),
+            );
+    }
+
+    public function sendPurchasePaid(int $purchaseId): void
+    {
+        $purchase = Purchase::query()
+            ->with(['tenant', 'user', 'items'])
+            ->findOrFail($purchaseId);
+
+        $this->mailService
+            ->forTenant($purchase->tenant_codigo)
+            ->send(
+                $this->recipientFor($purchase),
+                "Pago confirmado - Compra #{$purchase->getKey()}",
+                view('mail.notifications.purchase-paid', compact('purchase'))->render(),
+            );
+    }
+
+    /** @param array<int, int> $ticketIds */
+    public function sendTicketsAvailable(int $purchaseId, array $ticketIds): void
+    {
+        $purchase = Purchase::query()->with(['tenant', 'user'])->findOrFail($purchaseId);
+        /** @var Collection<int, Ticket> $tickets */
+        $tickets = Ticket::query()
+            ->where('tenant_code', $purchase->tenant_codigo)
+            ->where('user_id', $purchase->user_id)
+            ->whereKey($ticketIds)
+            ->get();
+
+        if ($tickets->isEmpty()) {
+            return;
+        }
+
+        $this->mailService
+            ->forTenant($purchase->tenant_codigo)
+            ->send(
+                $this->recipientFor($purchase),
+                'Tus tickets ya están disponibles',
+                view('mail.notifications.tickets-available', compact('purchase', 'tickets'))->render(),
+            );
+    }
+
+    private function recipientFor(Purchase $purchase): string
+    {
+        return (string) ($purchase->email ?: $purchase->user?->email);
+    }
+}

app/Domains/Purchase/Controllers/PurchaseController.php

@@ -4,16 +4,19 @@ namespace App\Domains\Purchase\Controllers;
 
 use App\Domains\Integration\Services\TelepagosIntegrationService;
 use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Purchase\Requests\PaymentIntentRequest;
-use App\Domains\Purchase\Requests\StorePurchaseRequest;
+use App\Domains\Purchase\Requests\StartCheckoutRequest;
+use App\Domains\Purchase\Requests\UpdatePurchaseCustomerRequest;
+use App\Domains\Purchase\Requests\UpdatePurchaseItemQuantityRequest;
 use App\Domains\Purchase\Resources\PurchaseResource;
 use App\Domains\Purchase\Services\CheckoutService;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class PurchaseController extends Controller
@@ -32,8 +35,11 @@ class PurchaseController extends Controller
         )->response();
     }
 
-    public function store(StorePurchaseRequest $request, Tenant $tenant, CheckoutService $checkoutService): JsonResponse
-    {
+    public function startCheckout(
+        StartCheckoutRequest $request,
+        Tenant $tenant,
+        CheckoutService $checkoutService,
+    ): JsonResponse {
         $data = $request->validated();
 
         $purchase = $checkoutService->startCheckout(
@@ -49,16 +55,56 @@ class PurchaseController extends Controller
     {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
 
-        $compra->loadMissing(['items', 'cart.items']);
+        $compra->loadMissing('items');
         $compra->items->load('imageAttachment');
 
-        if ($compra->cart !== null) {
-            $this->loadCartCatalogEntries($compra->cart->items);
-        }
-
         return PurchaseResource::make($compra);
     }
 
+    public function updateCustomerData(
+        UpdatePurchaseCustomerRequest $request,
+        Tenant $tenant,
+        Purchase $compra,
+        CheckoutService $checkoutService,
+    ): PurchaseResource {
+        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
+
+        return PurchaseResource::make(
+            $checkoutService->updateCustomerData($compra, $request->validated()),
+        );
+    }
+
+    public function updateItemQuantity(
+        UpdatePurchaseItemQuantityRequest $request,
+        Tenant $tenant,
+        Purchase $compra,
+        PurchaseItem $item,
+        CheckoutService $checkoutService,
+    ): PurchaseResource {
+        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
+
+        return PurchaseResource::make(
+            $checkoutService->updateItemQuantity(
+                $compra,
+                $item,
+                (int) $request->validated('quantity'),
+            ),
+        );
+    }
+
+    public function prepareItemEditing(
+        Request $request,
+        Tenant $tenant,
+        Purchase $compra,
+        CheckoutService $checkoutService,
+    ): PurchaseResource {
+        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
+
+        return PurchaseResource::make(
+            $checkoutService->prepareItemEditing($compra),
+        );
+    }
+
     public function paymentIntent(PaymentIntentRequest $request, Tenant $tenant, Purchase $compra): JsonResponse
     {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
@@ -68,6 +114,9 @@ class PurchaseController extends Controller
         $purchaseUpdate = [
             'payment_method' => $method,
             'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'expires_at' => now()->addMinutes(
+                max(1, (int) config("purchase.payment_expiration_minutes.{$method}", 30))
+            ),
             'total' => $totalAmount,
         ];
 
@@ -75,7 +124,22 @@ class PurchaseController extends Controller
             $purchaseUpdate['transfer_payer_dni'] = preg_replace('/\D+/', '', (string) $request->validated('transfer_payer_dni'));
         }
 
-        $compra->update($purchaseUpdate);
+        $updated = Purchase::query()
+            ->whereKey($compra->getKey())
+            ->whereIn('status', [Purchase::STATUS_CREATED, Purchase::STATUS_PENDING_PAYMENT])
+            ->where(function ($query): void {
+                $query->whereNull('expires_at')
+                    ->orWhere('expires_at', '>', now());
+            })
+            ->update($purchaseUpdate);
+
+        if ($updated === 0) {
+            throw ValidationException::withMessages([
+                'purchase' => __('api.purchase.not_available_for_payment'),
+            ]);
+        }
+
+        $compra->refresh();
 
         if ($method === 'transfer') {
             $telepagosService = new TelepagosIntegrationService;
@@ -95,8 +159,14 @@ class PurchaseController extends Controller
                     ],
                 ]);
             } catch (\Exception $e) {
+                Log::error('Unable to retrieve TelePagos account information.', [
+                    'purchase_id' => $compra->id,
+                    'exception' => $e,
+                ]);
+
                 return response()->json([
-                    'message' => 'Error getting account info: '.$e->getMessage(),
+                    'code' => 'integration.account_info_failed',
+                    'message' => __('api.integration.account_info_failed'),
                 ], 500);
             }
         }
@@ -118,8 +188,14 @@ class PurchaseController extends Controller
                     'qr_code' => $qrResponse['qr_code'] ?? '',
                 ]);
             } catch (\Exception $e) {
+                Log::error('Unable to generate TelePagos QR code.', [
+                    'purchase_id' => $compra->id,
+                    'exception' => $e,
+                ]);
+
                 return response()->json([
-                    'message' => 'Error generating QR: '.$e->getMessage(),
+                    'code' => 'integration.qr_generation_failed',
+                    'message' => __('api.integration.qr_generation_failed'),
                 ], 500);
             }
 
@@ -133,7 +209,8 @@ class PurchaseController extends Controller
         }
 
         return response()->json([
-            'message' => 'Invalid payment method.',
+            'code' => 'integration.invalid_payment_method',
+            'message' => __('api.integration.invalid_payment_method'),
         ], 400);
     }
 
@@ -146,25 +223,21 @@ class PurchaseController extends Controller
         );
     }
 
+    public function cancel(Request $request, Tenant $tenant, Purchase $compra, CheckoutService $checkoutService): PurchaseResource
+    {
+        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
+
+        return PurchaseResource::make(
+            $checkoutService->cancelPurchase($compra)
+        );
+    }
+
     protected function resolveScopedPurchase(Tenant $tenant, int $userId, Purchase $purchase): Purchase
     {
         if ($purchase->tenant_codigo !== $tenant->codigo || $purchase->user_id !== $userId) {
-            throw new NotFoundHttpException('Purchase not found for tenant.');
+            throw new NotFoundHttpException(__('api.errors.not_found'));
         }
 
         return $purchase;
     }
-
-    /**
-     * @return list<string>
-     */
-    protected function loadCartCatalogEntries(Collection $items): void
-    {
-        $items->load([
-            'catalogItem.attachments',
-            'variant.attachments',
-            'variant.catalogItem.attachments',
-            'variant.definitions.itemAttribute.attribute',
-        ]);
-    }
 }

app/Domains/Purchase/Models/Purchase.php

@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\DB;
     'user_id',
     'status',
     'payment_method',
+    'expires_at',
     'total',
     'dni',
     'transfer_payer_dni',
@@ -41,6 +42,8 @@ class Purchase extends Model
 
     public const STATUS_REJECTED = 'rejected';
 
+    public const STATUS_EXPIRED = 'expired';
+
     protected $table = 'compras';
 
     protected function casts(): array
@@ -48,6 +51,7 @@ class Purchase extends Model
         return [
             'cart_id' => 'integer',
             'user_id' => 'integer',
+            'expires_at' => 'datetime',
             'total' => 'decimal:2',
         ];
     }
@@ -111,23 +115,11 @@ class Purchase extends Model
 
     public function calculateCurrentTotalAmount(): float
     {
-        if ($this->relationLoaded('items') && $this->getRelation('items')->isNotEmpty()) {
+        if ($this->relationLoaded('items')) {
             return (float) $this->getRelation('items')->sum('total');
         }
 
-        if ($this->items()->exists()) {
-            return (float) $this->items()->sum('total');
-        }
-
-        $cart = $this->relationLoaded('cart')
-            ? $this->getRelation('cart')
-            : $this->cart()->with(['items.catalogItem', 'items.variant'])->first();
-
-        if (! $cart) {
-            return 0.0;
-        }
-
-        return $cart->getTotalAmount();
+        return (float) $this->items()->sum('total');
     }
 
     public function markAsPendingPayment(): void

app/Domains/Purchase/Models/PurchaseItem.php

@@ -23,11 +23,18 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
     'discount_total',
     'tax_total',
     'total',
+    'reservation_status',
 ])]
 class PurchaseItem extends Model
 {
     use HasFactory;
 
+    public const RESERVATION_ACTIVE = 'active';
+
+    public const RESERVATION_COMMITTED = 'committed';
+
+    public const RESERVATION_RELEASED = 'released';
+
     protected $table = 'compra_items';
 
     protected function casts(): array

app/Domains/Purchase/Requests/StartCheckoutRequest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Domains\Purchase\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class StartCheckoutRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return $this->user() !== null;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'cart_id' => [
+                'required_without:direct_item',
+                Rule::prohibitedIf(fn (): bool => $this->has('direct_item')),
+                'integer',
+                'exists:carritos,id',
+            ],
+            'direct_item' => [
+                'required_without:cart_id',
+                Rule::prohibitedIf(fn (): bool => $this->has('cart_id')),
+                'array',
+            ],
+            'direct_item.catalog_item_id' => [
+                'required_with:direct_item',
+                'integer',
+            ],
+            'direct_item.variant_id' => [
+                'nullable',
+                'integer',
+            ],
+            'direct_item.cantidad' => [
+                'required_with:direct_item',
+                'integer',
+                'min:1',
+            ],
+            'dni' => ['prohibited'],
+            'telefono' => ['prohibited'],
+            'nombre_apellido' => ['prohibited'],
+            'email' => ['prohibited'],
+        ];
+    }
+}

app/Domains/Purchase/Requests/UpdatePurchaseCustomerRequest.php

@@ -4,7 +4,7 @@ namespace App\Domains\Purchase\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class StorePurchaseRequest extends FormRequest
+class UpdatePurchaseCustomerRequest extends FormRequest
 {
     public function authorize(): bool
     {
@@ -17,7 +17,6 @@ class StorePurchaseRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'cart_id' => ['required', 'integer', 'exists:carritos,id'],
             'dni' => ['required', 'string'],
             'telefono' => ['required', 'string'],
             'nombre_apellido' => ['required', 'string'],

app/Domains/Purchase/Requests/UpdatePurchaseItemQuantityRequest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Domains\Purchase\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePurchaseItemQuantityRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return $this->user() !== null;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'quantity' => ['required', 'integer', 'min:1', 'max:100'],
+        ];
+    }
+}

app/Domains/Purchase/Resources/PurchaseResource.php

@@ -2,12 +2,10 @@
 
 namespace App\Domains\Purchase\Resources;
 
-use App\Domains\Cart\Models\CartItem;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Collection;
 
 /**
  * @mixin Purchase
@@ -19,18 +17,20 @@ class PurchaseResource extends JsonResource
      */
     public function toArray(Request $request): array
     {
-        [$items, $itemsSource] = $this->resolveItems();
+        $items = $this->resource->relationLoaded('items')
+            ? $this->resource->getRelation('items')
+            : collect();
 
         $subtotal = $items->isNotEmpty()
             ? $items->reduce(
-                fn (float $carry, PurchaseItem|CartItem $item): float => $carry + $this->resolveItemSubtotal($item),
+                fn (float $carry, PurchaseItem $item): float => $carry + $this->resolveItemSubtotal($item),
                 0.0,
             )
             : (float) ($this->total ?? 0);
 
         $total = $items->isNotEmpty()
             ? $items->reduce(
-                fn (float $carry, PurchaseItem|CartItem $item): float => $carry + $this->resolveItemTotal($item),
+                fn (float $carry, PurchaseItem $item): float => $carry + $this->resolveItemTotal($item),
                 0.0,
             )
             : (float) ($this->total ?? 0);
@@ -43,62 +43,27 @@ class PurchaseResource extends JsonResource
             'created_at' => $this->created_at,
             'status' => $this->status,
             'payment_method' => $this->payment_method,
+            'expires_at' => $this->expires_at,
             'dni' => $this->dni,
             'transfer_payer_dni' => $this->transfer_payer_dni,
             'telefono' => $this->telefono,
             'nombre_apellido' => $this->nombre_apellido,
             'email' => $this->email,
-            'items_source' => $itemsSource,
+            'items_source' => $items->isNotEmpty() ? 'purchase' : null,
             'items' => PurchaseItemResource::collection($items),
             'subtotal' => $this->formatMoney($subtotal),
             'total' => $this->formatMoney($total),
         ];
     }
 
-    /**
-     * @return array{0: Collection<int, PurchaseItem|CartItem>, 1: string|null}
-     */
-    protected function resolveItems(): array
+    protected function resolveItemSubtotal(PurchaseItem $item): float
     {
-        if (! $this->resource->relationLoaded('items')) {
-            return [collect(), null];
-        }
-
-        $purchaseItems = $this->resource->getRelation('items');
-
-        if ($purchaseItems->isNotEmpty()) {
-            return [$purchaseItems, 'purchase'];
-        }
-
-        if (! $this->resource->relationLoaded('cart')) {
-            return [collect(), null];
-        }
-
-        $cart = $this->resource->getRelation('cart');
-
-        if ($cart === null || ! $cart->relationLoaded('items')) {
-            return [collect(), null];
-        }
-
-        return [$cart->getRelation('items'), 'cart'];
+        return (float) $item->precio_unitario * $item->cantidad;
     }
 
-    protected function resolveItemSubtotal(PurchaseItem|CartItem $item): float
+    protected function resolveItemTotal(PurchaseItem $item): float
     {
-        if ($item instanceof PurchaseItem) {
-            return (float) $item->precio_unitario * $item->cantidad;
-        }
-
-        return (float) ($item->selectedItem()?->getPrice() ?? 0) * $item->cantidad;
-    }
-
-    protected function resolveItemTotal(PurchaseItem|CartItem $item): float
-    {
-        if ($item instanceof PurchaseItem) {
-            return (float) ($item->total ?? 0);
-        }
-
-        return $this->resolveItemSubtotal($item);
+        return (float) ($item->total ?? 0);
     }
 
     protected function formatMoney(float|int|string|null $amount): string

app/Domains/Purchase/Services/CheckoutService.php

@@ -3,77 +3,54 @@
 namespace App\Domains\Purchase\Services;
 
 use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
 use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Inventory;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Throwable;
 
 class CheckoutService
 {
     public function __construct(
-        private readonly AttachmentService $attachmentService,
         private readonly CatalogInventoryService $catalogInventoryService,
     ) {}
 
     public function startCheckout(Tenant $tenant, int $userId, array $purchaseData): Purchase
     {
-        $cartId = (int) $purchaseData['cart_id'];
-        unset($purchaseData['cart_id']);
+        return DB::transaction(function () use ($tenant, $userId, $purchaseData): Purchase {
+            $directItem = $purchaseData['direct_item'] ?? null;
+            $cartId = isset($purchaseData['cart_id']) ? (int) $purchaseData['cart_id'] : null;
+            unset($purchaseData['direct_item'], $purchaseData['cart_id']);
 
-        return DB::transaction(function () use ($tenant, $userId, $purchaseData, $cartId): Purchase {
-            $cart = $this->resolveCheckoutCart($tenant, $userId, $cartId);
-            $cartItems = $cart->items()->lockForUpdate()->get();
+            if (is_array($directItem)) {
+                return $this->startDirectCheckout(
+                    $tenant,
+                    $userId,
+                    $purchaseData,
+                    $directItem,
+                );
+            }
 
-            if ($cartItems->isEmpty()) {
+            if ($cartId === null) {
                 throw ValidationException::withMessages([
-                    'cart_id' => 'The selected cart does not contain items.',
+                    'cart_id' => __('api.purchase.source_required'),
                 ]);
             }
 
-            $this->loadCartItems($cartItems);
-            $cart->setRelation('items', $cartItems);
-            $totalAmount = $cart->getTotalAmount();
-
-            /** @var Purchase|null $purchase */
-            $purchase = Purchase::query()
-                ->where('cart_id', $cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $userId)
-                ->whereIn('status', [Purchase::STATUS_CREATED, Purchase::STATUS_PENDING_PAYMENT])
-                ->latest('id')
-                ->first();
-
-            if ($purchase === null) {
-                /** @var Purchase $purchase */
-                $purchase = Purchase::query()->create([
-                    ...$purchaseData,
-                    'cart_id' => $cart->getKey(),
-                    'tenant_codigo' => $tenant->codigo,
-                    'user_id' => $userId,
-                    'status' => Purchase::STATUS_CREATED,
-                    'payment_method' => null,
-                    'total' => $totalAmount,
-                ]);
-            } else {
-                $purchase->fill([
-                    ...$purchaseData,
-                    'status' => Purchase::STATUS_CREATED,
-                    'payment_method' => null,
-                    'total' => $totalAmount,
-                ]);
-                $purchase->save();
-            }
-
-            return $this->loadPurchase($purchase);
+            return $this->startCartCheckout(
+                $tenant,
+                $userId,
+                $purchaseData,
+                $cartId,
+            );
         });
     }
 
@@ -87,11 +64,16 @@ class CheckoutService
 
             if ($purchase->payment_method === null) {
                 throw ValidationException::withMessages([
-                    'payment_method' => 'The purchase payment method must be selected before finalizing.',
+                    'payment_method' => __('api.purchase.payment_method_required'),
                 ]);
             }
 
-            if (in_array($purchase->status, [Purchase::STATUS_PAID, Purchase::STATUS_CANCELLED, Purchase::STATUS_REJECTED], true)) {
+            if (in_array($purchase->status, [
+                Purchase::STATUS_PAID,
+                Purchase::STATUS_CANCELLED,
+                Purchase::STATUS_REJECTED,
+                Purchase::STATUS_EXPIRED,
+            ], true)) {
                 return $this->loadPurchase($purchase);
             }
 
@@ -104,76 +86,531 @@ class CheckoutService
         });
     }
 
-    public function confirmPurchase(Purchase $purchase): void
+    /**
+     * @param  array<string, string>  $customerData
+     */
+    public function updateCustomerData(Purchase $purchase, array $customerData): Purchase
     {
-        $snapshotPaths = [];
+        return DB::transaction(function () use ($purchase, $customerData): Purchase {
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()
+                ->lockForUpdate()
+                ->findOrFail($purchase->getKey());
 
-        try {
-            DB::transaction(function () use ($purchase, &$snapshotPaths): void {
-                /** @var Purchase $purchase */
-                $purchase = Purchase::query()
-                    ->lockForUpdate()
-                    ->findOrFail($purchase->getKey());
-
-                if ($purchase->items()->exists()) {
-                    return;
-                }
-
-                /** @var Cart|null $cart */
-                $cart = $purchase->cart()->lockForUpdate()->first();
-
-                if ($cart === null) {
-                    throw ValidationException::withMessages([
-                        'cart_id' => 'The purchase cart is no longer available.',
-                    ]);
-                }
-
-                $cartItems = $cart->items()->lockForUpdate()->get();
-
-                if ($cartItems->isEmpty()) {
-                    throw ValidationException::withMessages([
-                        'cart_id' => 'The purchase cart does not contain items.',
-                    ]);
-                }
-
-                $this->loadCartItems($cartItems);
-                $this->verifyTenantItems($purchase->tenant, $cartItems);
-                $purchaseItemsPayload = $this->buildPurchaseItemsPayload($purchase, $cartItems, $snapshotPaths);
-
-                $purchase->items()->createMany($purchaseItemsPayload);
-                $this->completeCartConversion($cart, $cartItems);
-            });
-        } catch (Throwable $throwable) {
-            foreach ($snapshotPaths as $snapshotPath) {
-                Storage::disk('s3')->delete($snapshotPath);
+            if (
+                ! in_array($purchase->status, [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                ], true)
+                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
+            ) {
+                throw ValidationException::withMessages([
+                    'purchase' => __('api.purchase.not_editable'),
+                ]);
             }
 
-            throw $throwable;
+            $purchase->update($customerData);
+
+            return $this->loadPurchase($purchase);
+        });
+    }
+
+    public function updateItemQuantity(
+        Purchase $purchase,
+        PurchaseItem $purchaseItem,
+        int $quantity,
+    ): Purchase {
+        return DB::transaction(function () use ($purchase, $purchaseItem, $quantity): Purchase {
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()
+                ->lockForUpdate()
+                ->findOrFail($purchase->getKey());
+
+            if (
+                $purchase->status !== Purchase::STATUS_CREATED
+                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
+            ) {
+                throw ValidationException::withMessages([
+                    'purchase' => __('api.purchase.not_editable'),
+                ]);
+            }
+
+            /** @var PurchaseItem|null $purchaseItem */
+            $purchaseItem = $purchase->items()
+                ->whereKey($purchaseItem->getKey())
+                ->lockForUpdate()
+                ->first();
+
+            if ($purchaseItem === null) {
+                throw new NotFoundHttpException('Purchase item not found.');
+            }
+
+            if ($purchaseItem->reservation_status !== PurchaseItem::RESERVATION_ACTIVE) {
+                throw ValidationException::withMessages([
+                    'item' => __('api.purchase.item_not_editable'),
+                ]);
+            }
+
+            $currentQuantity = (int) $purchaseItem->cantidad;
+            $difference = $quantity - $currentQuantity;
+
+            if ($difference !== 0) {
+                $selection = $this->resolvePurchaseItemSelection($purchase->tenant, $purchaseItem);
+
+                try {
+                    if ($difference > 0) {
+                        $this->catalogInventoryService->reserve($selection, $difference);
+                    } else {
+                        $this->catalogInventoryService->release($selection, abs($difference));
+                    }
+                } catch (\InvalidArgumentException $exception) {
+                    throw ValidationException::withMessages([
+                        'quantity' => __('api.purchase.insufficient_stock'),
+                    ]);
+                }
+
+                $purchaseItem->update([
+                    'cantidad' => $quantity,
+                    'total' => (float) $purchaseItem->precio_unitario * $quantity,
+                ]);
+                $this->syncSourceCartItemQuantity($purchase, $purchaseItem, $quantity);
+            }
+
+            $purchase->update([
+                'total' => $purchase->calculateCurrentTotalAmount(),
+            ]);
+
+            return $this->loadPurchase($purchase);
+        });
+    }
+
+    public function prepareItemEditing(Purchase $purchase): Purchase
+    {
+        return DB::transaction(function () use ($purchase): Purchase {
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()
+                ->lockForUpdate()
+                ->findOrFail($purchase->getKey());
+
+            if (
+                ! in_array($purchase->status, [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                ], true)
+                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
+            ) {
+                throw ValidationException::withMessages([
+                    'purchase' => __('api.purchase.not_editable'),
+                ]);
+            }
+
+            $purchase->telepagosQr()->delete();
+            $purchase->update([
+                'status' => Purchase::STATUS_CREATED,
+                'payment_method' => null,
+                'transfer_payer_dni' => null,
+                'expires_at' => now()->addMinutes(
+                    max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
+                ),
+            ]);
+
+            return $this->loadPurchase($purchase);
+        });
+    }
+
+    public function confirmPurchase(Purchase $purchase): void
+    {
+        DB::transaction(function () use ($purchase): void {
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()
+                ->lockForUpdate()
+                ->findOrFail($purchase->getKey());
+
+            if ($purchase->status === Purchase::STATUS_PAID) {
+                return;
+            }
+
+            if (in_array($purchase->status, [
+                Purchase::STATUS_CANCELLED,
+                Purchase::STATUS_REJECTED,
+                Purchase::STATUS_EXPIRED,
+            ], true)) {
+                throw ValidationException::withMessages([
+                    'purchase' => __('api.purchase.cannot_confirm'),
+                ]);
+            }
+
+            $items = $purchase->items()
+                ->where('reservation_status', PurchaseItem::RESERVATION_ACTIVE)
+                ->lockForUpdate()
+                ->get();
+
+            foreach ($items as $item) {
+                $selection = $this->resolvePurchaseItemSelection($purchase->tenant, $item);
+
+                try {
+                    $this->catalogInventoryService->commit($selection, (int) $item->cantidad);
+                } catch (\InvalidArgumentException $exception) {
+                    throw ValidationException::withMessages([
+                        'items' => __('api.purchase.inconsistent_reservation'),
+                    ]);
+                }
+
+                $item->update([
+                    'reservation_status' => PurchaseItem::RESERVATION_COMMITTED,
+                ]);
+            }
+
+            $this->finalizeSourceCart($purchase);
+        });
+    }
+
+    public function cancelPurchase(Purchase $purchase): Purchase
+    {
+        return $this->releasePurchase($purchase, Purchase::STATUS_CANCELLED);
+    }
+
+    public function expirePurchase(Purchase $purchase): Purchase
+    {
+        return $this->releasePurchase($purchase, Purchase::STATUS_EXPIRED);
+    }
+
+    public function expireOverduePurchases(): int
+    {
+        $expiredCount = 0;
+
+        Purchase::query()
+            ->whereIn('status', [Purchase::STATUS_CREATED, Purchase::STATUS_PENDING_PAYMENT])
+            ->whereNotNull('expires_at')
+            ->where('expires_at', '<=', now())
+            ->orderBy('id')
+            ->eachById(function (Purchase $purchase) use (&$expiredCount): void {
+                $purchase = $this->expirePurchase($purchase);
+
+                if ($purchase->status === Purchase::STATUS_EXPIRED) {
+                    $expiredCount++;
+                }
+            });
+
+        return $expiredCount;
+    }
+
+    private function releasePurchase(Purchase $purchase, string $targetStatus): Purchase
+    {
+        return DB::transaction(function () use ($purchase, $targetStatus): Purchase {
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()
+                ->lockForUpdate()
+                ->findOrFail($purchase->getKey());
+
+            if ($purchase->status === Purchase::STATUS_PAID) {
+                if ($targetStatus === Purchase::STATUS_EXPIRED) {
+                    return $this->loadPurchase($purchase);
+                }
+
+                throw ValidationException::withMessages([
+                    'purchase' => __('api.purchase.paid_cannot_cancel'),
+                ]);
+            }
+
+            if (in_array($purchase->status, [
+                Purchase::STATUS_CANCELLED,
+                Purchase::STATUS_REJECTED,
+                Purchase::STATUS_EXPIRED,
+            ], true)) {
+                return $this->loadPurchase($purchase);
+            }
+
+            if (
+                $targetStatus === Purchase::STATUS_EXPIRED
+                && ($purchase->expires_at === null || $purchase->expires_at->isFuture())
+            ) {
+                return $this->loadPurchase($purchase);
+            }
+
+            $items = $purchase->items()
+                ->where('reservation_status', PurchaseItem::RESERVATION_ACTIVE)
+                ->lockForUpdate()
+                ->get();
+            $reservationReturnedToCart = $this->restoreSourceCart($purchase);
+
+            foreach ($items as $item) {
+                if (! $reservationReturnedToCart) {
+                    $selection = $this->resolvePurchaseItemSelection($purchase->tenant, $item);
+
+                    try {
+                        $this->catalogInventoryService->release($selection, (int) $item->cantidad);
+                    } catch (\InvalidArgumentException $exception) {
+                        throw ValidationException::withMessages([
+                            'items' => __('api.purchase.inconsistent_reservation'),
+                        ]);
+                    }
+                }
+
+                $item->update([
+                    'reservation_status' => PurchaseItem::RESERVATION_RELEASED,
+                ]);
+            }
+
+            $purchase->update([
+                'status' => $targetStatus,
+            ]);
+
+            return $this->loadPurchase($purchase);
+        });
+    }
+
+    /**
+     * @param  array<string, mixed>  $purchaseData
+     * @param  array<string, mixed>  $directItem
+     */
+    private function startDirectCheckout(
+        Tenant $tenant,
+        int $userId,
+        array $purchaseData,
+        array $directItem,
+    ): Purchase {
+        $catalogItemId = (int) $directItem['catalog_item_id'];
+        $variantId = isset($directItem['variant_id']) ? (int) $directItem['variant_id'] : null;
+        $quantity = (int) $directItem['cantidad'];
+        $selection = $this->resolveSelection($tenant, $catalogItemId, $variantId);
+        $availableQuantity = $this->catalogInventoryService->availableQuantity($selection);
+
+        if ($availableQuantity !== null && $availableQuantity < $quantity) {
+            throw ValidationException::withMessages([
+                'direct_item.cantidad' => __('api.purchase.direct_item_max_stock', ['max' => $availableQuantity]),
+            ]);
         }
+
+        try {
+            $this->catalogInventoryService->reserve($selection, $quantity);
+        } catch (\InvalidArgumentException $exception) {
+            throw ValidationException::withMessages([
+                'direct_item.cantidad' => __('api.purchase.insufficient_stock'),
+            ]);
+        }
+
+        $purchase = $this->createPurchase(
+            $tenant,
+            $userId,
+            $purchaseData,
+            $selection->getPrice() * $quantity,
+            null,
+        );
+        $cartItem = $this->makeDirectCartItem($selection, $catalogItemId, $variantId, $quantity);
+        $purchase->items()->createMany(
+            $this->buildPurchaseItemsPayload(collect([$cartItem])),
+        );
+
+        return $this->loadPurchase($purchase);
+    }
+
+    /**
+     * @param  array<string, mixed>  $purchaseData
+     */
+    private function startCartCheckout(
+        Tenant $tenant,
+        int $userId,
+        array $purchaseData,
+        int $cartId,
+    ): Purchase {
+        $cart = $this->resolveCheckoutCart($tenant, $userId, $cartId);
+        $cartItems = $cart->items()->lockForUpdate()->get();
+
+        if ($cartItems->isEmpty()) {
+            throw ValidationException::withMessages([
+                'cart_id' => __('api.purchase.empty_cart'),
+            ]);
+        }
+
+        $this->loadCartItems($cartItems);
+        $this->verifyTenantItems($tenant, $cartItems);
+        $cart->setRelation('items', $cartItems);
+
+        $purchase = $this->createPurchase(
+            $tenant,
+            $userId,
+            $purchaseData,
+            $cart->getTotalAmount(),
+            $cart->getKey(),
+        );
+        $purchase->items()->createMany(
+            $this->buildPurchaseItemsPayload($cartItems),
+        );
+
+        // PurchaseItem owns the reservation during checkout. The source cart is
+        // kept with its owner so it can be restored if the purchase is cancelled
+        // or expires. Only active carts participate in the identity constraint.
+        $cart->update([
+            'status' => 'checkout',
+            'guest_token' => null,
+        ]);
+
+        return $this->loadPurchase($purchase);
+    }
+
+    private function restoreSourceCart(Purchase $purchase): bool
+    {
+        if ($purchase->cart_id === null) {
+            return false;
+        }
+
+        /** @var Cart|null $sourceCart */
+        $sourceCart = Cart::withTrashed()
+            ->whereKey($purchase->cart_id)
+            ->lockForUpdate()
+            ->first();
+
+        if ($sourceCart === null) {
+            return false;
+        }
+
+        /** @var Cart|null $activeCart */
+        $activeCart = Cart::query()
+            ->where('tenant_codigo', $purchase->tenant_codigo)
+            ->where('user_id', $purchase->user_id)
+            ->where('status', 'active')
+            ->where('id', '!=', $sourceCart->getKey())
+            ->lockForUpdate()
+            ->first();
+
+        if ($activeCart !== null) {
+            $sourceItems = $sourceCart->items()->lockForUpdate()->get();
+
+            foreach ($sourceItems as $sourceItem) {
+                /** @var CartItem|null $activeItem */
+                $activeItem = $activeCart->items()
+                    ->where('catalog_item_id', $sourceItem->catalog_item_id)
+                    ->where('variant_id', $sourceItem->variant_id)
+                    ->lockForUpdate()
+                    ->first();
+
+                if ($activeItem === null) {
+                    $activeCart->items()->create([
+                        'catalog_item_id' => $sourceItem->catalog_item_id,
+                        'variant_id' => $sourceItem->variant_id,
+                        'cantidad' => $sourceItem->cantidad,
+                    ]);
+                } else {
+                    $activeItem->increment('cantidad', (int) $sourceItem->cantidad);
+                }
+            }
+
+            $sourceCart->update([
+                'status' => 'converted',
+                'guest_token' => null,
+            ]);
+
+            if (! $sourceCart->trashed()) {
+                $sourceCart->delete();
+            }
+
+            return true;
+        }
+
+        if ($sourceCart->trashed()) {
+            $sourceCart->restore();
+        }
+
+        $sourceCart->update([
+            'status' => 'active',
+            'user_id' => $purchase->user_id,
+            'guest_token' => null,
+        ]);
+
+        return true;
+    }
+
+    private function syncSourceCartItemQuantity(
+        Purchase $purchase,
+        PurchaseItem $purchaseItem,
+        int $quantity,
+    ): void {
+        if ($purchase->cart_id === null) {
+            return;
+        }
+
+        $sourceCart = Cart::withTrashed()
+            ->whereKey($purchase->cart_id)
+            ->lockForUpdate()
+            ->first();
+
+        if ($sourceCart === null) {
+            return;
+        }
+
+        $sourceCart->items()
+            ->where('catalog_item_id', $purchaseItem->source_catalog_item_id)
+            ->where('variant_id', $purchaseItem->source_variant_id)
+            ->update([
+                'cantidad' => $quantity,
+            ]);
+    }
+
+    private function finalizeSourceCart(Purchase $purchase): void
+    {
+        if ($purchase->cart_id === null) {
+            return;
+        }
+
+        /** @var Cart|null $sourceCart */
+        $sourceCart = Cart::withTrashed()
+            ->whereKey($purchase->cart_id)
+            ->lockForUpdate()
+            ->first();
+
+        if ($sourceCart === null || $sourceCart->trashed()) {
+            return;
+        }
+
+        $sourceCart->update([
+            'status' => 'converted',
+            'guest_token' => null,
+        ]);
+        $sourceCart->delete();
+    }
+
+    /**
+     * @param  array<string, mixed>  $purchaseData
+     */
+    private function createPurchase(
+        Tenant $tenant,
+        int $userId,
+        array $purchaseData,
+        float $total,
+        ?int $cartId,
+    ): Purchase {
+        return Purchase::query()->create([
+            ...$purchaseData,
+            'cart_id' => $cartId,
+            'tenant_codigo' => $tenant->codigo,
+            'user_id' => $userId,
+            'status' => Purchase::STATUS_CREATED,
+            'payment_method' => null,
+            'expires_at' => now()->addMinutes(
+                max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
+            ),
+            'total' => $total,
+        ]);
     }
 
     protected function verifyTenantItems(Tenant $tenant, Collection $cartItems): void
     {
         foreach ($cartItems as $item) {
-            $selectedItem = $item->selectedItem();
-            if ($selectedItem === null) {
+            if ($item->selectedItem() === null) {
                 throw ValidationException::withMessages([
-                    'cart_id' => 'One or more catalog items could not be loaded.',
+                    'cart_id' => __('api.purchase.catalog_item_missing'),
                 ]);
             }
 
             if ($item->catalogItem?->tenant_code !== $tenant->codigo) {
                 throw ValidationException::withMessages([
-                    'cart_id' => 'One or more catalog items do not belong to the tenant.',
+                    'cart_id' => __('api.purchase.catalog_item_wrong_tenant'),
                 ]);
             }
         }
     }
 
-    /**
-     * @param  Collection<int, CartItem>  $cartItems
-     * @return Collection<int, CartItem>
-     */
     protected function resolveCheckoutCart(Tenant $tenant, int $userId, int $cartId): Cart
     {
         /** @var Cart|null $cart */
@@ -187,7 +624,7 @@ class CheckoutService
 
         if ($cart->status !== 'active') {
             throw ValidationException::withMessages([
-                'cart_id' => 'The selected cart is no longer active.',
+                'cart_id' => __('api.purchase.inactive_cart'),
             ]);
         }
 
@@ -198,21 +635,14 @@ class CheckoutService
      * @param  Collection<int, CartItem>  $cartItems
      * @return array<int, array<string, mixed>>
      */
-    protected function buildPurchaseItemsPayload(
-        Purchase $purchase,
-        Collection $cartItems,
-        array &$snapshotPaths = [],
-    ): array {
+    protected function buildPurchaseItemsPayload(Collection $cartItems): array
+    {
         return $cartItems
-            ->map(function (CartItem $item) use ($purchase, &$snapshotPaths): array {
+            ->map(function (CartItem $item): array {
                 $selectedItem = $item->selectedItem();
-                $quantity = (int) $item['cantidad'];
+                $quantity = (int) $item->cantidad;
                 $unitPrice = $selectedItem?->getPrice() ?? 0;
-                $imageAttachment = $this->snapshotFirstImage($purchase, $item);
-
-                if ($imageAttachment !== null) {
-                    $snapshotPaths[] = $imageAttachment->path;
-                }
+                $imageAttachment = $this->firstImageAttachment($item);
 
                 return [
                     'source_catalog_item_id' => $item->catalog_item_id,
@@ -230,37 +660,117 @@ class CheckoutService
                     'discount_total' => null,
                     'tax_total' => null,
                     'total' => $unitPrice * $quantity,
+                    'reservation_status' => PurchaseItem::RESERVATION_ACTIVE,
                 ];
             })
             ->all();
     }
 
-    /**
-     * @param  Collection<int, CartItem>  $cartItems
-     */
-    protected function completeCartConversion(Cart $cart, Collection $cartItems): void
-    {
-        foreach ($cartItems as $item) {
-            $selectedItem = $item->selectedItem();
-            $quantity = (int) $item->cantidad;
+    private function resolveSelection(
+        Tenant $tenant,
+        int $catalogItemId,
+        ?int $variantId,
+    ): CatalogItem|Variant {
+        /** @var CatalogItem|null $catalogItem */
+        $catalogItem = CatalogItem::query()
+            ->whereKey($catalogItemId)
+            ->where('tenant_code', $tenant->codigo)
+            ->lockForUpdate()
+            ->first();
 
-            try {
-                $this->catalogInventoryService->commit(
-                    $selectedItem,
-                    $quantity,
-                );
-            } catch (\InvalidArgumentException $exception) {
-                throw ValidationException::withMessages([
-                    'cart_id' => 'The selected cart has inconsistent stock state.',
-                ]);
-            }
+        if ($catalogItem === null) {
+            throw new NotFoundHttpException('Catalog item not found for tenant.');
         }
 
-        $cart->status = 'converted';
-        $cart->user_id = null;
-        $cart->guest_token = null;
-        $cart->save();
-        $cart->delete();
+        if ($catalogItem->isBundle()) {
+            if ($variantId !== null) {
+                throw ValidationException::withMessages([
+                    'direct_item.variant_id' => __('api.cart.bundle_variant_forbidden'),
+                ]);
+            }
+
+            if (! $catalogItem->bundleComponents()->exists()) {
+                throw ValidationException::withMessages([
+                    'direct_item.catalog_item_id' => __('api.cart.empty_bundle'),
+                ]);
+            }
+
+            return $catalogItem;
+        }
+
+        if ($variantId === null) {
+            if ($catalogItem->inventory_id === null) {
+                throw ValidationException::withMessages([
+                    'direct_item.variant_id' => __('api.cart.variant_required'),
+                ]);
+            }
+
+            $catalogItem->setRelation(
+                'inventory',
+                Inventory::query()->whereKey($catalogItem->inventory_id)->lockForUpdate()->firstOrFail(),
+            );
+
+            return $catalogItem;
+        }
+
+        /** @var Variant|null $variant */
+        $variant = Variant::query()
+            ->whereKey($variantId)
+            ->where('catalog_item_id', $catalogItem->id)
+            ->lockForUpdate()
+            ->first();
+
+        if ($variant === null) {
+            throw new NotFoundHttpException('Variant not found for catalog item.');
+        }
+
+        $variant->setRelation('catalogItem', $catalogItem);
+        $variant->setRelation(
+            'inventory',
+            Inventory::query()->whereKey($variant->inventory_id)->lockForUpdate()->firstOrFail(),
+        );
+
+        return $variant;
+    }
+
+    private function resolvePurchaseItemSelection(Tenant $tenant, PurchaseItem $item): CatalogItem|Variant
+    {
+        return $this->resolveSelection(
+            $tenant,
+            (int) $item->source_catalog_item_id,
+            $item->source_variant_id === null ? null : (int) $item->source_variant_id,
+        );
+    }
+
+    private function makeDirectCartItem(
+        CatalogItem|Variant $selection,
+        int $catalogItemId,
+        ?int $variantId,
+        int $quantity,
+    ): CartItem {
+        $catalogItem = $selection instanceof Variant
+            ? $selection->catalogItem
+            : $selection;
+        $catalogItem->loadMissing(['inventory', 'attachments']);
+
+        if ($selection instanceof Variant) {
+            $selection->loadMissing([
+                'inventory',
+                'attachments',
+                'catalogItem',
+                'definitions.itemAttribute.attribute',
+            ]);
+        }
+
+        $item = new CartItem([
+            'catalog_item_id' => $catalogItemId,
+            'variant_id' => $variantId,
+            'cantidad' => $quantity,
+        ]);
+        $item->setRelation('catalogItem', $catalogItem);
+        $item->setRelation('variant', $selection instanceof Variant ? $selection : null);
+
+        return $item;
     }
 
     /** @param Collection<int, CartItem> $cartItems */
@@ -283,19 +793,10 @@ class CheckoutService
         ]);
     }
 
-    private function snapshotFirstImage(Purchase $purchase, CartItem $item): ?Attachment
+    private function firstImageAttachment(CartItem $item): ?Attachment
     {
-        $source = $item->variant?->attachments->first()
+        return $item->variant?->attachments->first()
             ?? $item->catalogItem?->attachments->first();
-
-        if ($source === null) {
-            return null;
-        }
-
-        return $this->attachmentService->copy(
-            $source,
-            "purchase/{$purchase->id}",
-        );
     }
 
     /** @return array<int, array{name: string, value: mixed}> */

app/Domains/Purchase/routes/api.php

@@ -3,8 +3,14 @@
 use App\Domains\Purchase\Controllers\PurchaseController;
 use Illuminate\Support\Facades\Route;
 
-Route::prefix('tenants/{tenant:codigo}')->middleware(['auth:sanctum', \App\Domains\Cart\Middleware\MergeGuestCartMiddleware::class])->group(function (): void {
-    Route::apiResource('compras', PurchaseController::class)->only(['index', 'store', 'show']);
+Route::prefix('tenants/{tenant:codigo}')->middleware('auth:sanctum')->group(function (): void {
+    Route::get('compras', [PurchaseController::class, 'index']);
+    Route::post('compras/start-checkout', [PurchaseController::class, 'startCheckout']);
+    Route::get('compras/{compra}', [PurchaseController::class, 'show']);
+    Route::post('compras/{compra}/edit-items', [PurchaseController::class, 'prepareItemEditing']);
+    Route::patch('compras/{compra}/items/{item}', [PurchaseController::class, 'updateItemQuantity']);
+    Route::patch('compras/{compra}/customer-data', [PurchaseController::class, 'updateCustomerData']);
     Route::post('compras/{compra}/payment-intent', [PurchaseController::class, 'paymentIntent']);
     Route::post('compras/{compra}/complete', [PurchaseController::class, 'complete']);
+    Route::post('compras/{compra}/cancel', [PurchaseController::class, 'cancel']);
 });

app/Domains/Tenant/Controllers/BootstrapTenantController.php

@@ -15,7 +15,17 @@ class BootstrapTenantController extends Controller
         $dominio = $request->validated('dominio');
 
         return TenantResource::make(
-            Tenant::query()->with(['headerLogo', 'footerLogo', 'menues'])->where('dominio', $dominio)->firstOrFail()
+            Tenant::query()
+                ->with([
+                    'headerLogo',
+                    'footerLogo',
+                    'mainCarouselImages',
+                    'menues',
+                    'socialMedia',
+                    'categories' => fn ($query) => $query->orderBy('nombre'),
+                ])
+                ->where('dominio', $dominio)
+                ->firstOrFail()
         );
     }
 }

app/Domains/Tenant/Controllers/TenantController.php

@@ -13,32 +13,41 @@ use Illuminate\Http\Response;
 
 class TenantController extends Controller
 {
-    public function __construct(protected TenantService $tenantService)
-    {
-    }
+    public function __construct(protected TenantService $tenantService) {}
 
     public function index(): JsonResponse
     {
-        return TenantResource::collection(Tenant::query()->with(['headerLogo', 'footerLogo'])->latest()->paginateFromRequest())->response();
+        return TenantResource::collection(
+            Tenant::query()
+                ->with(['headerLogo', 'footerLogo', 'mainCarouselImages', 'socialMedia'])
+                ->latest()
+                ->paginateFromRequest()
+        )->response();
     }
 
     public function store(StoreTenantRequest $request): JsonResponse
     {
         $tenant = $this->tenantService->create($request->validated());
 
-        return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']))->response()->setStatusCode(201);
+        return TenantResource::make(
+            $tenant->loadMissing(['headerLogo', 'footerLogo', 'mainCarouselImages', 'socialMedia'])
+        )->response()->setStatusCode(201);
     }
 
     public function show(Tenant $tenant): TenantResource
     {
-        return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']));
+        return TenantResource::make(
+            $tenant->loadMissing(['headerLogo', 'footerLogo', 'mainCarouselImages', 'socialMedia'])
+        );
     }
 
     public function update(UpdateTenantRequest $request, Tenant $tenant): TenantResource
     {
         $tenant = $this->tenantService->update($tenant, $request->validated());
 
-        return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']));
+        return TenantResource::make(
+            $tenant->loadMissing(['headerLogo', 'footerLogo', 'mainCarouselImages', 'socialMedia'])
+        );
     }
 
     public function destroy(Tenant $tenant): Response

app/Domains/Tenant/Models/SocialMedia.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Domains\Tenant\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class SocialMedia extends Model
+{
+    protected $table = 'social_media';
+
+    protected $fillable = [
+        'code',
+        'icon',
+        'name',
+    ];
+
+    /**
+     * @return BelongsToMany<Tenant, $this>
+     */
+    public function tenants(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Tenant::class,
+            'tenant_social_media',
+            'social_media_code',
+            'tenant_code',
+            'code',
+            'codigo'
+        )
+            ->withPivot(['url', 'orden'])
+            ->withTimestamps()
+            ->orderByPivot('orden');
+    }
+}

app/Domains/Tenant/Models/Tenant.php

@@ -3,8 +3,12 @@
 namespace App\Domains\Tenant\Models;
 
 use App\Domains\Attachable\Models\Attachment;
+use App\Domains\Catalog\Enums\GroupLayout;
+use App\Domains\Catalog\Enums\ProductLayout;
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Category;
 use App\Domains\Menu\Models\Menu;
+use App\Domains\Menu\Models\TenantMenu;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -26,11 +30,20 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
     'footer_logo_id',
     'hero_config',
     'event_config',
+    'search_product_layout',
+    'search_group_layout',
+    'search_items_per_page',
 ])]
 class Tenant extends Model
 {
     use HasFactory;
 
+    protected $attributes = [
+        'search_product_layout' => ProductLayout::ColumnWithImage->value,
+        'search_group_layout' => GroupLayout::Paginated->value,
+        'search_items_per_page' => 12,
+    ];
+
     public function getRouteKeyName(): string
     {
         return 'codigo';
@@ -46,6 +59,9 @@ class Tenant extends Model
         return [
             'hero_config' => 'array',
             'event_config' => 'array',
+            'search_product_layout' => ProductLayout::class,
+            'search_group_layout' => GroupLayout::class,
+            'search_items_per_page' => 'integer',
         ];
     }
 
@@ -73,20 +89,65 @@ class Tenant extends Model
         return $this->belongsTo(Attachment::class, 'hero_bg_image_id');
     }
 
+    /**
+     * @return BelongsToMany<Attachment, $this>
+     */
+    public function mainCarouselImages(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Attachment::class,
+            'tenant_main_carousel_images',
+            'tenant_id',
+            'attachment_id'
+        )
+            ->withPivot('orden')
+            ->withTimestamps()
+            ->orderByPivot('orden');
+    }
+
     public function catalogItems(): HasMany
     {
         return $this->hasMany(CatalogItem::class, 'tenant_code', 'codigo');
     }
 
+    /**
+     * @return HasMany<Category, $this>
+     */
+    public function categories(): HasMany
+    {
+        return $this->hasMany(Category::class, 'tenant_code', 'codigo');
+    }
+
+    /**
+     * @return BelongsToMany<SocialMedia, $this>
+     */
+    public function socialMedia(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            SocialMedia::class,
+            'tenant_social_media',
+            'tenant_code',
+            'social_media_code',
+            'codigo',
+            'code'
+        )
+            ->withPivot(['url', 'orden'])
+            ->withTimestamps()
+            ->orderByPivot('orden');
+    }
+
     public function menues(): BelongsToMany
     {
         return $this->belongsToMany(
             Menu::class,
-            'tenant_menues',
-            'tenant_codigo',
+            'tenants_menues',
+            'tenant_code',
             'menu_code',
             'codigo',
             'code'
-        )->withTimestamps();
+        )
+            ->using(TenantMenu::class)
+            ->withPivot('static_content')
+            ->withTimestamps();
     }
 }

app/Domains/Tenant/Requests/StoreTenantRequest.php

@@ -2,6 +2,8 @@
 
 namespace App\Domains\Tenant\Requests;
 
+use App\Domains\Catalog\Enums\GroupLayout;
+use App\Domains\Catalog\Enums\ProductLayout;
 use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use App\Domains\Tenant\Support\TenantDomainNormalizer;
 use Closure;
@@ -35,8 +37,7 @@ class StoreTenantRequest extends FormRequest
      */
     public function rules(): array
     {
-        $logoRule = ['required', new ImageOrBase64Rule()];
-
+        $logoRule = ['required', new ImageOrBase64Rule];
 
         return [
             'codigo' => ['required', 'string', 'max:255', Rule::unique('tenants', 'codigo')],
@@ -61,7 +62,18 @@ class StoreTenantRequest extends FormRequest
             'footer_bg_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
             'header_logo' => $logoRule,
             'footer_logo' => $logoRule,
-            'hero_bg_image' => ['nullable', new ImageOrBase64Rule()],
+            'hero_bg_image' => ['nullable', new ImageOrBase64Rule],
+            'main_carousel_images' => ['sometimes', 'array'],
+            'main_carousel_images.*' => ['required', 'distinct', new ImageOrBase64Rule],
+            'social_media' => ['sometimes', 'array'],
+            'social_media.*.code' => [
+                'required',
+                'string',
+                'distinct',
+                Rule::exists('social_media', 'code'),
+            ],
+            'social_media.*.url' => ['required', 'url', 'max:2048'],
+            'social_media.*.orden' => ['sometimes', 'integer', 'min:0', 'distinct'],
             'hero_config' => ['nullable', 'array'],
             'hero_config.title_html' => ['nullable', 'string'],
             'hero_config.description_html' => ['nullable', 'string'],
@@ -72,6 +84,9 @@ class StoreTenantRequest extends FormRequest
             'event_config.location' => ['nullable', 'string'],
             'event_config.dates' => ['nullable', 'array'],
             'event_config.dates.*' => ['required', 'string'],
+            'search_product_layout' => ['sometimes', Rule::enum(ProductLayout::class)],
+            'search_group_layout' => ['sometimes', Rule::enum(GroupLayout::class)],
+            'search_items_per_page' => ['sometimes', 'integer', 'min:4', 'max:48'],
         ];
     }
 }

app/Domains/Tenant/Requests/UpdateTenantRequest.php

@@ -2,6 +2,8 @@
 
 namespace App\Domains\Tenant\Requests;
 
+use App\Domains\Catalog\Enums\GroupLayout;
+use App\Domains\Catalog\Enums\ProductLayout;
 use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Support\TenantDomainNormalizer;
@@ -41,8 +43,7 @@ class UpdateTenantRequest extends FormRequest
         /** @var Tenant|null $tenant */
         $tenant = $this->route('tenant');
 
-        $logoRule = ['nullable', new ImageOrBase64Rule()];
-
+        $logoRule = ['nullable', new ImageOrBase64Rule];
 
         return [
             'codigo' => [
@@ -72,7 +73,18 @@ class UpdateTenantRequest extends FormRequest
             'footer_bg_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
             'header_logo' => $logoRule,
             'footer_logo' => $logoRule,
-            'hero_bg_image' => ['nullable', new ImageOrBase64Rule()],
+            'hero_bg_image' => ['nullable', new ImageOrBase64Rule],
+            'main_carousel_images' => ['sometimes', 'array'],
+            'main_carousel_images.*' => ['required', 'distinct', new ImageOrBase64Rule],
+            'social_media' => ['sometimes', 'array'],
+            'social_media.*.code' => [
+                'required',
+                'string',
+                'distinct',
+                Rule::exists('social_media', 'code'),
+            ],
+            'social_media.*.url' => ['required', 'url', 'max:2048'],
+            'social_media.*.orden' => ['sometimes', 'integer', 'min:0', 'distinct'],
             'hero_config' => ['nullable', 'array'],
             'hero_config.title_html' => ['nullable', 'string'],
             'hero_config.description_html' => ['nullable', 'string'],
@@ -83,6 +95,9 @@ class UpdateTenantRequest extends FormRequest
             'event_config.location' => ['nullable', 'string'],
             'event_config.dates' => ['nullable', 'array'],
             'event_config.dates.*' => ['required', 'string'],
+            'search_product_layout' => ['sometimes', Rule::enum(ProductLayout::class)],
+            'search_group_layout' => ['sometimes', Rule::enum(GroupLayout::class)],
+            'search_items_per_page' => ['sometimes', 'integer', 'min:4', 'max:48'],
         ];
     }
 }

app/Domains/Tenant/Resources/TenantResource.php

@@ -2,11 +2,15 @@
 
 namespace App\Domains\Tenant\Resources;
 
+use App\Domains\Catalog\Models\Category;
+use App\Domains\Menu\Models\Menu;
+use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Collection;
 
 /**
- * @mixin \App\Domains\Tenant\Models\Tenant
+ * @mixin Tenant
  */
 class TenantResource extends JsonResource
 {
@@ -34,10 +38,107 @@ class TenantResource extends JsonResource
             'footer_bg_color' => $this->footer_bg_color,
             // 1 day
             'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
-            'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440 ),
+            'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440),
             'hero_config' => $heroConfig,
             'event_config' => $this->event_config,
-            'menues' => $this->whenLoaded('menues'),
+            'search_product_layout' => $this->search_product_layout->value,
+            'search_group_layout' => $this->search_group_layout->value,
+            'search_items_per_page' => $this->search_items_per_page,
+            'main_carousel_images' => $this->whenLoaded(
+                'mainCarouselImages',
+                fn () => $this->mainCarouselImages
+                    ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+                    ->values()
+            ),
+            'social_media' => $this->whenLoaded(
+                'socialMedia',
+                fn () => $this->socialMedia
+                    ->map(fn ($socialMedia) => [
+                        'code' => $socialMedia->code,
+                        'icon' => $socialMedia->icon,
+                        'name' => $socialMedia->name,
+                        'url' => $socialMedia->pivot->url,
+                    ])
+                    ->values()
+            ),
+            'menues' => $this->whenLoaded(
+                'menues',
+                fn () => $this->menuTree($this->menues)
+            ),
+            'categories' => $this->whenLoaded(
+                'categories',
+                fn () => $this->categoryTree($this->categories)
+            ),
         ];
     }
+
+    /**
+     * @param  Collection<int, Category>  $categories
+     * @return Collection<int, array<string, mixed>>
+     */
+    private function categoryTree(Collection $categories): Collection
+    {
+        $categoryIds = $categories->pluck('id')->flip();
+        $childrenByParent = $categories
+            ->filter(fn (Category $category) => $category->categoria_id !== null
+                && $categoryIds->has($category->categoria_id))
+            ->groupBy('categoria_id');
+
+        $formatCategory = function (Category $category) use (&$formatCategory, $childrenByParent): array {
+            return [
+                'id' => $category->id,
+                'nombre' => $category->nombre,
+                'subcategories' => $childrenByParent
+                    ->get($category->id, collect())
+                    ->map($formatCategory)
+                    ->values(),
+            ];
+        };
+
+        return $categories
+            ->filter(fn (Category $category) => $category->categoria_id === null
+                || ! $categoryIds->has($category->categoria_id))
+            ->map($formatCategory)
+            ->values();
+    }
+
+    /**
+     * @param  Collection<int, Menu>  $menus
+     * @return Collection<int, array<string, mixed>>
+     */
+    private function menuTree(Collection $menus): Collection
+    {
+        $menuCodes = $menus->pluck('code')->flip();
+        $childrenByParent = $menus
+            ->filter(fn (Menu $menu) => $menu->parent_menu_code !== null)
+            ->groupBy('parent_menu_code');
+
+        $formatMenu = function (Menu $menu) use (&$formatMenu, $childrenByParent): array {
+            $formatted = [
+                'id' => $menu->id,
+                'code' => $menu->code,
+                'label' => $menu->label,
+                'parent_menu_code' => $menu->parent_menu_code,
+                'content_type' => $menu->content_type,
+                'route' => $menu->route,
+            ];
+
+            if ($menu->pivot?->static_content !== null) {
+                $formatted['static_content'] = $menu->pivot->static_content;
+            }
+
+            $formatted['submenues'] = $childrenByParent
+                ->get($menu->code, collect())
+                ->map($formatMenu)
+                ->values();
+
+            return $formatted;
+        };
+
+        return $menus
+            ->filter(fn (Menu $menu) => $menu->parent_menu_code === null
+                || ! $menuCodes->has($menu->parent_menu_code))
+            ->map($formatMenu)
+            ->values();
+    }
 }

app/Domains/Tenant/Services/TenantService.php

@@ -2,22 +2,22 @@
 
 namespace App\Domains\Tenant\Services;
 
+use App\Domains\Attachable\Enums\AttachmentType;
+use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Attachable\Services\AttachmentService;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
 
 class TenantService
 {
-    public function __construct(protected AttachmentService $attachmentService)
-    {
-    }
+    public function __construct(protected AttachmentService $attachmentService) {}
 
     /**
      * Create a new tenant and store its logos.
      *
      * @param  array<string, mixed>  $data
-     * @return Tenant
      */
     public function create(array $data): Tenant
     {
@@ -25,13 +25,21 @@ class TenantService
             $headerLogo = $data['header_logo'] ?? null;
             $footerLogo = $data['footer_logo'] ?? null;
             $heroBgImage = $data['hero_bg_image'] ?? null;
+            $mainCarouselImages = $data['main_carousel_images'] ?? [];
+            $socialMedia = $data['social_media'] ?? [];
 
-            unset($data['header_logo'], $data['footer_logo'], $data['hero_bg_image']);
+            unset(
+                $data['header_logo'],
+                $data['footer_logo'],
+                $data['hero_bg_image'],
+                $data['main_carousel_images'],
+                $data['social_media']
+            );
 
             $headerAttachmentId = null;
             if ($headerLogo) {
                 $attachment = Str::isUuid($headerLogo)
-                    ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $headerLogo)->first()
+                    ? Attachment::query()->where('key', $headerLogo)->first()
                     : $this->attachmentService->store($headerLogo, 'tenants');
 
                 if ($attachment) {
@@ -42,7 +50,7 @@ class TenantService
             $footerAttachmentId = null;
             if ($footerLogo) {
                 $attachment = Str::isUuid($footerLogo)
-                    ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $footerLogo)->first()
+                    ? Attachment::query()->where('key', $footerLogo)->first()
                     : $this->attachmentService->store($footerLogo, 'tenants');
 
                 if ($attachment) {
@@ -55,7 +63,7 @@ class TenantService
 
             if ($heroBgImage) {
                 $attachment = Str::isUuid($heroBgImage)
-                    ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $heroBgImage)->first()
+                    ? Attachment::query()->where('key', $heroBgImage)->first()
                     : $this->attachmentService->store($heroBgImage, 'tenants');
 
                 if ($attachment) {
@@ -67,6 +75,8 @@ class TenantService
 
             /** @var Tenant $tenant */
             $tenant = Tenant::query()->create($data);
+            $this->syncMainCarouselImages($tenant, $mainCarouselImages);
+            $this->syncSocialMedia($tenant, $socialMedia);
 
             return $tenant;
         });
@@ -75,9 +85,7 @@ class TenantService
     /**
      * Update an existing tenant and store new logos if uploaded.
      *
-     * @param  Tenant  $tenant
      * @param  array<string, mixed>  $data
-     * @return Tenant
      */
     public function update(Tenant $tenant, array $data): Tenant
     {
@@ -85,11 +93,21 @@ class TenantService
             $hasHeaderLogoKey = array_key_exists('header_logo', $data);
             $hasFooterLogoKey = array_key_exists('footer_logo', $data);
             $hasHeroBgImageKey = array_key_exists('hero_bg_image', $data);
+            $hasMainCarouselImagesKey = array_key_exists('main_carousel_images', $data);
+            $hasSocialMediaKey = array_key_exists('social_media', $data);
             $headerLogo = $data['header_logo'] ?? null;
             $footerLogo = $data['footer_logo'] ?? null;
             $heroBgImage = $data['hero_bg_image'] ?? null;
+            $mainCarouselImages = $data['main_carousel_images'] ?? [];
+            $socialMedia = $data['social_media'] ?? [];
 
-            unset($data['header_logo'], $data['footer_logo'], $data['hero_bg_image']);
+            unset(
+                $data['header_logo'],
+                $data['footer_logo'],
+                $data['hero_bg_image'],
+                $data['main_carousel_images'],
+                $data['social_media']
+            );
 
             $oldHeroBgId = $tenant->hero_bg_image_id;
 
@@ -98,7 +116,7 @@ class TenantService
             if ($hasHeaderLogoKey) {
                 if ($headerLogo) {
                     $attachment = Str::isUuid($headerLogo)
-                        ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $headerLogo)->first()
+                        ? Attachment::query()->where('key', $headerLogo)->first()
                         : $this->attachmentService->store($headerLogo, 'tenants');
 
                     if ($attachment) {
@@ -114,7 +132,7 @@ class TenantService
             if ($hasFooterLogoKey) {
                 if ($footerLogo) {
                     $attachment = Str::isUuid($footerLogo)
-                        ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $footerLogo)->first()
+                        ? Attachment::query()->where('key', $footerLogo)->first()
                         : $this->attachmentService->store($footerLogo, 'tenants');
 
                     if ($attachment) {
@@ -131,7 +149,7 @@ class TenantService
             if ($hasHeroBgImageKey) {
                 if ($heroBgImage) {
                     $attachment = Str::isUuid($heroBgImage)
-                        ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $heroBgImage)->first()
+                        ? Attachment::query()->where('key', $heroBgImage)->first()
                         : $this->attachmentService->store($heroBgImage, 'tenants');
 
                     if ($attachment) {
@@ -151,7 +169,70 @@ class TenantService
 
             $tenant->save();
 
+            if ($hasMainCarouselImagesKey) {
+                $this->syncMainCarouselImages($tenant, $mainCarouselImages);
+            }
+
+            if ($hasSocialMediaKey) {
+                $this->syncSocialMedia($tenant, $socialMedia);
+            }
+
             return $tenant;
         });
     }
+
+    /**
+     * @param  array<int, mixed>  $images
+     */
+    private function syncMainCarouselImages(Tenant $tenant, array $images): void
+    {
+        $attachments = [];
+
+        foreach (array_values($images) as $order => $image) {
+            $attachment = $this->resolveMainCarouselImage($image, $order);
+            $attachments[$attachment->id] = ['orden' => $order];
+        }
+
+        $tenant->mainCarouselImages()->sync($attachments);
+    }
+
+    /**
+     * @param  array<int, array{code: string, url: string, orden?: int}>  $socialMedia
+     */
+    private function syncSocialMedia(Tenant $tenant, array $socialMedia): void
+    {
+        $associations = [];
+
+        foreach (array_values($socialMedia) as $index => $item) {
+            $associations[$item['code']] = [
+                'url' => $item['url'],
+                'orden' => $item['orden'] ?? $index,
+            ];
+        }
+
+        $tenant->socialMedia()->sync($associations);
+        $tenant->unsetRelation('socialMedia');
+    }
+
+    private function resolveMainCarouselImage(mixed $image, int $order): Attachment
+    {
+        if (is_string($image) && Str::isUuid($image)) {
+            $attachment = Attachment::query()
+                ->where('key', $image)
+                ->where('type', AttachmentType::Image->value)
+                ->first();
+
+            if ($attachment === null) {
+                throw ValidationException::withMessages([
+                    "main_carousel_images.{$order}" => [
+                        __('api.tenant.invalid_carousel_image'),
+                    ],
+                ]);
+            }
+
+            return $attachment;
+        }
+
+        return $this->attachmentService->store($image, 'tenants/main-carousel');
+    }
 }

app/Domains/Ticket/Controllers/TicketController.php

@@ -3,14 +3,20 @@
 namespace App\Domains\Ticket\Controllers;
 
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Exceptions\TicketNotAvailableException;
 use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticket\Requests\DownloadTicketsPdfRequest;
 use App\Domains\Ticket\Resources\TicketResource;
+use App\Domains\Ticket\Services\TicketPdfService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class TicketController extends Controller
 {
+    public function __construct(private readonly TicketPdfService $ticketPdfService) {}
+
     public function index(Request $request, Tenant $tenant): JsonResponse
     {
         $tickets = Ticket::query()
@@ -21,4 +27,21 @@ class TicketController extends Controller
 
         return TicketResource::collection($tickets)->response();
     }
+
+    public function downloadPdf(DownloadTicketsPdfRequest $request, Tenant $tenant): Response
+    {
+        $ticketIds = $request->validated('ticket_ids');
+        $tickets = Ticket::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->where('user_id', $request->user()->getKey())
+            ->whereIn('id', $ticketIds)
+            ->orderByDesc('id')
+            ->get();
+
+        if ($tickets->count() !== count($ticketIds)) {
+            throw new TicketNotAvailableException(__('api.ticket.not_available'));
+        }
+
+        return $this->ticketPdfService->download($tenant, $tickets);
+    }
 }

app/Domains/Ticket/Exceptions/TicketGenerationException.php

@@ -11,31 +11,43 @@ class TicketGenerationException extends RuntimeException
 {
     public static function invalidQuantity(): self
     {
-        return new self('La cantidad de tickets a generar debe ser mayor a cero.');
+        return new self(__('api.ticket.positive_quantity'));
     }
 
     public static function emptyBundle(CatalogItem $bundle): self
     {
-        return new self("El bundle {$bundle->id} no tiene componentes.");
+        return new self(__('api.ticket.empty_bundle', ['bundle' => $bundle->id]));
     }
 
     public static function ticketsDisabled(CatalogItem $catalogItem): self
     {
-        return new self("El producto {$catalogItem->id} no tiene tickets habilitados.");
+        return new self(__('api.ticket.disabled', ['product' => $catalogItem->id]));
     }
 
     public static function maximumUseDateReached(CatalogItem $catalogItem): self
     {
-        return new self("El producto {$catalogItem->id} alcanzó su fecha máxima de uso.");
+        return new self(__('api.ticket.expired', ['product' => $catalogItem->id]));
+    }
+
+    public static function variantNotFound(
+        CatalogItem $catalogItem,
+        int $variantId,
+    ): self {
+        return new self(
+            __('api.ticket.invalid_variant', [
+                'variant' => $variantId,
+                'product' => $catalogItem->id,
+            ]),
+        );
     }
 
     public static function purchaseWithoutUser(Purchase $purchase): self
     {
-        return new self("La compra {$purchase->id} no tiene un usuario asociado.");
+        return new self(__('api.ticket.purchase_without_user', ['purchase' => $purchase->id]));
     }
 
     public static function catalogItemNotFound(PurchaseItem $purchaseItem): self
     {
-        return new self("No se encontró el producto de la línea de compra {$purchaseItem->id}.");
+        return new self(__('api.ticket.product_not_found', ['purchase_item' => $purchaseItem->id]));
     }
 }

app/Domains/Ticket/Exceptions/TicketNotAvailableException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Domains\Ticket\Exceptions;
+
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class TicketNotAvailableException extends NotFoundHttpException {}

app/Domains/Ticket/Listeners/GenerateTicketsForPaidPurchase.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Ticket\Listeners;
 
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Notification\Events\TicketsAvailable;
 use App\Domains\Purchase\Events\PurchasePaid;
 use App\Domains\Ticket\Exceptions\TicketGenerationException;
 use App\Domains\Ticket\Services\TicketGeneratorService;
@@ -20,6 +21,7 @@ class GenerateTicketsForPaidPurchase
             ->with(['user', 'items'])
             ->findOrFail($event->purchase->getKey());
         $user = $purchase->user;
+        $ticketIds = [];
 
         foreach ($purchase->items as $purchaseItem) {
             $catalogItem = CatalogItem::query()
@@ -38,12 +40,18 @@ class GenerateTicketsForPaidPurchase
                 throw TicketGenerationException::purchaseWithoutUser($purchase);
             }
 
-            $this->ticketGenerator->generate(
+            $generatedTickets = $this->ticketGenerator->generate(
                 $catalogItem,
                 $user,
                 $purchaseItem->cantidad,
                 $purchaseItem->source_variant_id,
             );
+
+            array_push($ticketIds, ...$generatedTickets->pluck('id')->all());
+        }
+
+        if ($ticketIds !== []) {
+            TicketsAvailable::dispatch($purchase, $ticketIds);
         }
     }
 

app/Domains/Ticket/Requests/DownloadTicketsPdfRequest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Ticket\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class DownloadTicketsPdfRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, array<int, string>> */
+    public function rules(): array
+    {
+        return [
+            'ticket_ids' => ['required', 'array', 'min:1', 'max:25'],
+            'ticket_ids.*' => ['required', 'integer', 'distinct'],
+        ];
+    }
+}

app/Domains/Ticket/Services/TicketGeneratorService.php

@@ -4,9 +4,9 @@ namespace App\Domains\Ticket\Services;
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Variant;
 use App\Domains\Ticket\Exceptions\TicketGenerationException;
 use App\Domains\Ticket\Models\Ticket;
-use Carbon\CarbonInterface;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -26,67 +26,119 @@ class TicketGeneratorService
             throw TicketGenerationException::invalidQuantity();
         }
 
-        $now = now();
+        return DB::transaction(function () use ($catalogItem, $user, $quantity, $sourceVariantId): Collection {
+            $targets = $this->resolveTargets(
+                $catalogItem,
+                $quantity,
+                $sourceVariantId,
+            );
 
-        return DB::transaction(function () use ($catalogItem, $user, $quantity, $sourceVariantId, $now): Collection {
-            $catalogItems = $this->resolveCatalogItems($catalogItem, $quantity, $now);
+            return $targets->map(function (array $target) use (
+                $catalogItem,
+                $sourceVariantId,
+                $user,
+            ): Ticket {
+                $item = $target['catalog_item'];
+                $selectedItem = $target['variant'] ?? $item;
 
-            return $catalogItems->map(fn (CatalogItem $item): Ticket => Ticket::query()->create([
-                'tenant_code' => $item->tenant_code,
-                'ticket' => (string) Str::uuid(),
-                'name' => $item->nombre,
-                'description' => (string) ($item->descripcion ?? ''),
-                'source_catalog_item_id' => $catalogItem->getKey(),
-                'source_variant_id' => $sourceVariantId,
-                'starts_at' => $item->minimum_use_date,
-                'expires_at' => $item->maximum_use_date,
-                'used_at' => null,
-                'user_id' => $user->getKey(),
-            ]));
+                return Ticket::query()->create([
+                    'tenant_code' => $item->tenant_code,
+                    'ticket' => (string) Str::uuid(),
+                    'name' => $item->nombre,
+                    'description' => (string) ($item->descripcion ?? ''),
+                    'source_catalog_item_id' => $catalogItem->getKey(),
+                    'source_variant_id' => $sourceVariantId,
+                    'starts_at' => $selectedItem->getMinimumUseDate(),
+                    'expires_at' => $selectedItem->getMaximumUseDate(),
+                    'used_at' => null,
+                    'user_id' => $user->getKey(),
+                ]);
+            });
         });
     }
 
     /**
-     * @return Collection<int, CatalogItem>
+     * @return Collection<int, array{catalog_item: CatalogItem, variant: Variant|null}>
      */
-    private function resolveCatalogItems(
+    private function resolveTargets(
         CatalogItem $catalogItem,
         int $quantity,
-        CarbonInterface $now,
+        ?int $sourceVariantId,
     ): Collection {
         if (! $catalogItem->isBundle()) {
-            $this->validateCatalogItem($catalogItem, $now);
+            $variant = $this->resolveVariant($catalogItem, $sourceVariantId);
+            $this->validateTarget($catalogItem, $variant);
 
-            return Collection::times($quantity, fn (): CatalogItem => $catalogItem);
+            return Collection::times($quantity, fn (): array => [
+                'catalog_item' => $catalogItem,
+                'variant' => $variant,
+            ]);
         }
 
-        $catalogItem->loadMissing('bundleComponents.catalogItem');
+        $catalogItem->loadMissing([
+            'bundleComponents.catalogItem',
+            'bundleComponents.variant.catalogItem',
+        ]);
 
         if ($catalogItem->bundleComponents->isEmpty()) {
             throw TicketGenerationException::emptyBundle($catalogItem);
         }
 
         return $catalogItem->bundleComponents
-            ->flatMap(function ($component) use ($quantity, $now): Collection {
+            ->flatMap(function ($component) use ($quantity): Collection {
                 $componentItem = $component->catalogItem;
-                $this->validateCatalogItem($componentItem, $now);
+                $variant = $component->variant;
+                $this->validateTarget($componentItem, $variant);
 
                 return Collection::times(
                     $quantity * $component->quantity,
-                    fn (): CatalogItem => $componentItem,
+                    fn (): array => [
+                        'catalog_item' => $componentItem,
+                        'variant' => $variant,
+                    ],
                 );
             })
             ->values();
     }
 
-    private function validateCatalogItem(CatalogItem $catalogItem, CarbonInterface $now): void
-    {
+    private function resolveVariant(
+        CatalogItem $catalogItem,
+        ?int $sourceVariantId,
+    ): ?Variant {
+        if ($sourceVariantId === null) {
+            return null;
+        }
+
+        $variant = $catalogItem->variants()
+            ->whereKey($sourceVariantId)
+            ->first();
+
+        if ($variant === null) {
+            throw TicketGenerationException::variantNotFound(
+                $catalogItem,
+                $sourceVariantId,
+            );
+        }
+
+        $variant->setRelation('catalogItem', $catalogItem);
+
+        return $variant;
+    }
+
+    private function validateTarget(
+        CatalogItem $catalogItem,
+        ?Variant $variant,
+    ): void {
         if (! $catalogItem->has_tickets) {
             throw TicketGenerationException::ticketsDisabled($catalogItem);
         }
 
-        if ($catalogItem->maximum_use_date?->lessThanOrEqualTo($now)) {
-            throw TicketGenerationException::maximumUseDateReached($catalogItem);
-        }
+        // TODO: Reactivar esta validación cuando los pagos con productos vencidos
+        // deban rechazarse nuevamente. Se deja deshabilitada temporalmente.
+        // $selectedItem = $variant ?? $catalogItem;
+        //
+        // if ($selectedItem->getMaximumUseDate()?->lessThanOrEqualTo(now())) {
+        //     throw TicketGenerationException::maximumUseDateReached($catalogItem);
+        // }
     }
 }

app/Domains/Ticket/Services/TicketPdfService.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Domains\Ticket\Services;
+
+use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Models\Ticket;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Endroid\QrCode\ErrorCorrectionLevel;
+use Endroid\QrCode\QrCode;
+use Endroid\QrCode\Writer\PngWriter;
+use Illuminate\Http\Response;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Storage;
+use Throwable;
+
+class TicketPdfService
+{
+    /**
+     * @param  Collection<int, Ticket>  $tickets
+     */
+    public function download(Tenant $tenant, Collection $tickets): Response
+    {
+        $tenant->loadMissing('headerLogo');
+        $primaryColor = $this->color($tenant->primary_color, '#009933');
+        $headerBackgroundColor = $this->color($tenant->header_bg_color, $primaryColor);
+
+        $pdf = Pdf::loadView('pdf.tickets', [
+            'tenant' => $tenant,
+            'tickets' => $tickets,
+            'logoDataUri' => $this->logoDataUri($tenant),
+            'primaryColor' => $primaryColor,
+            'headerBackgroundColor' => $headerBackgroundColor,
+            'headerTextColor' => $this->contrastingTextColor($headerBackgroundColor),
+            'qrCodes' => $tickets->mapWithKeys(
+                fn (Ticket $ticket): array => [$ticket->id => $this->qrCodeDataUri($ticket->ticket)]
+            ),
+        ])->setPaper('a4');
+
+        $ticketIds = $tickets->pluck('id')->implode('_');
+
+        return $pdf->download("tickets_{$ticketIds}.pdf");
+    }
+
+    private function qrCodeDataUri(string $value): string
+    {
+        $qrCode = new QrCode(
+            data: $value,
+            errorCorrectionLevel: ErrorCorrectionLevel::Medium,
+            size: 700,
+            margin: 10,
+        );
+
+        return (new PngWriter)->write($qrCode)->getDataUri();
+    }
+
+    private function logoDataUri(Tenant $tenant): ?string
+    {
+        $logo = $tenant->headerLogo;
+        if ($logo === null) {
+            return null;
+        }
+
+        try {
+            $contents = Storage::disk('s3')->get($logo->path);
+        } catch (Throwable) {
+            return null;
+        }
+
+        return 'data:'.($logo->mime_type ?: 'image/png').';base64,'.base64_encode($contents);
+    }
+
+    private function color(?string $color, string $fallback): string
+    {
+        return is_string($color) && preg_match('/^#[0-9A-Fa-f]{6}$/', $color)
+            ? $color
+            : $fallback;
+    }
+
+    private function contrastingTextColor(string $backgroundColor): string
+    {
+        $red = hexdec(substr($backgroundColor, 1, 2));
+        $green = hexdec(substr($backgroundColor, 3, 2));
+        $blue = hexdec(substr($backgroundColor, 5, 2));
+        $luminance = ($red * 299 + $green * 587 + $blue * 114) / 1000;
+
+        return $luminance > 160 ? '#17211b' : '#ffffff';
+    }
+}

app/Domains/Ticket/routes/api.php

@@ -7,4 +7,5 @@ Route::prefix('tenants/{tenant:codigo}')
     ->middleware('auth:sanctum')
     ->group(function (): void {
         Route::get('tickets', [TicketController::class, 'index']);
+        Route::post('tickets/pdf', [TicketController::class, 'downloadPdf']);
     });

app/Http/Middleware/SetApiLocale.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Symfony\Component\HttpFoundation\Response;
+
+class SetApiLocale
+{
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (! $request->is('api/*')) {
+            return $next($request);
+        }
+
+        $supportedLocales = config('app.supported_locales', ['es', 'en']);
+        $acceptLanguage = $request->header('Accept-Language');
+        $locale = is_string($acceptLanguage) && $acceptLanguage !== ''
+            ? $request->getPreferredLanguage($supportedLocales)
+            : null;
+        $locale ??= config('app.locale', 'es');
+
+        App::setLocale($locale);
+
+        $response = $next($request);
+        $response->headers->set('Content-Language', $locale);
+        $response->setVary('Accept-Language', false);
+
+        return $response;
+    }
+}

app/Providers/AppServiceProvider.php

@@ -2,6 +2,13 @@
 
 namespace App\Providers;
 
+use App\Domains\Notification\Events\PasswordResetRequested;
+use App\Domains\Notification\Events\TicketsAvailable;
+use App\Domains\Notification\Events\UserRegistered;
+use App\Domains\Notification\Listeners\SendPasswordResetEmail;
+use App\Domains\Notification\Listeners\SendPurchasePaidEmail;
+use App\Domains\Notification\Listeners\SendTicketsAvailableEmail;
+use App\Domains\Notification\Listeners\SendWelcomeEmail;
 use App\Domains\Purchase\Events\PurchasePaid;
 use App\Domains\Ticket\Listeners\GenerateTicketsForPaidPurchase;
 use Illuminate\Database\Eloquent\Builder;
@@ -23,7 +30,11 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
+        Event::listen(PurchasePaid::class, SendPurchasePaidEmail::class);
         Event::listen(PurchasePaid::class, GenerateTicketsForPaidPurchase::class);
+        Event::listen(TicketsAvailable::class, SendTicketsAvailableEmail::class);
+        Event::listen(UserRegistered::class, SendWelcomeEmail::class);
+        Event::listen(PasswordResetRequested::class, SendPasswordResetEmail::class);
 
         Builder::macro('paginateFromRequest', function (int $defaultPerPage = 15, int $maxPerPage = 100, ?int $page = null) {
             /** @var Builder $this */

bootstrap/app.php

@@ -1,9 +1,16 @@
 <?php
 
+use App\Domains\Ticket\Exceptions\TicketNotAvailableException;
+use App\Http\Middleware\SetApiLocale;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
 use Illuminate\Foundation\Configuration\Middleware;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 return Application::configure(basePath: dirname(__DIR__))
     ->withRouting(
@@ -16,9 +23,70 @@ return Application::configure(basePath: dirname(__DIR__))
         $middleware->encryptCookies(except: [
             'guest_token',
         ]);
+        $middleware->prepend(SetApiLocale::class);
     })
     ->withExceptions(function (Exceptions $exceptions): void {
         $exceptions->shouldRenderJsonWhen(
             fn (Request $request) => $request->is('api/*'),
         );
+        $exceptions->render(function (AuthenticationException $exception, Request $request) {
+            if (! $request->is('api/*')) {
+                return null;
+            }
+
+            return response()->json([
+                'code' => 'auth.unauthenticated',
+                'message' => __('api.auth.unauthenticated'),
+            ], 401);
+        });
+        $exceptions->render(function (AuthorizationException $exception, Request $request) {
+            if (! $request->is('api/*')) {
+                return null;
+            }
+
+            return response()->json([
+                'code' => 'errors.forbidden',
+                'message' => __('api.errors.forbidden'),
+            ], 403);
+        });
+        $exceptions->render(function (ModelNotFoundException $exception, Request $request) {
+            if (! $request->is('api/*')) {
+                return null;
+            }
+
+            return response()->json([
+                'code' => 'errors.not_found',
+                'message' => __('api.errors.not_found'),
+            ], 404);
+        });
+        $exceptions->render(function (TicketNotAvailableException $exception, Request $request) {
+            if (! $request->is('api/*')) {
+                return null;
+            }
+
+            return response()->json([
+                'code' => 'ticket.not_available',
+                'message' => __('api.ticket.not_available'),
+            ], 404);
+        });
+        $exceptions->render(function (NotFoundHttpException $exception, Request $request) {
+            if (! $request->is('api/*')) {
+                return null;
+            }
+
+            return response()->json([
+                'code' => 'errors.not_found',
+                'message' => __('api.errors.not_found'),
+            ], 404);
+        });
+        $exceptions->render(function (MethodNotAllowedHttpException $exception, Request $request) {
+            if (! $request->is('api/*')) {
+                return null;
+            }
+
+            return response()->json([
+                'code' => 'errors.method_not_allowed',
+                'message' => __('api.errors.method_not_allowed'),
+            ], 405, $exception->getHeaders());
+        });
     })->create();

composer.json

@@ -7,10 +7,13 @@
     "license": "MIT",
     "require": {
         "php": "^8.3",
+        "barryvdh/laravel-dompdf": "^3.1",
+        "endroid/qr-code": "^6.1",
         "laravel/framework": "^13.8",
         "laravel/sanctum": "^4.3",
+        "laravel/socialite": "^5.29",
         "laravel/tinker": "^3.0",
-        "league/flysystem-aws-s3-v3":  "^3.0"
+        "league/flysystem-aws-s3-v3": "^3.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",
@@ -44,7 +47,7 @@
         ],
         "dev": [
             "Composer\\Config::disableProcessTimeout",
-            "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1 --timeout=0\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite --kill-others"
+            "npx concurrently -c \"#93c5fd,#c4b5fd,#a7f3d0,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --queue=emails,default --tries=1 --timeout=0\" \"php artisan schedule:work\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,scheduler,logs,vite --kill-others"
         ],
         "test": [
             "@php artisan config:clear --ansi @no_additional_args",

config/app.php

@@ -78,9 +78,11 @@ return [
     |
     */
 
-    'locale' => env('APP_LOCALE', 'en'),
+    'locale' => env('APP_LOCALE', 'es'),
 
-    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'es'),
+
+    'supported_locales' => ['es', 'en'],
 
     'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
 

config/cors.php

@@ -1,5 +1,13 @@
 <?php
 
+$frontendUrls = array_values(array_filter(array_map(
+    'trim',
+    explode(',', (string) env(
+        'FRONTEND_URLS',
+        env('FRONTEND_URL', 'http://localhost:4200')
+    ))
+)));
+
 return [
 
     /*
@@ -19,9 +27,11 @@ return [
 
     'allowed_methods' => ['*'],
 
-    'allowed_origins' => [env('FRONTEND_URL', 'http://localhost:4200')],
+    'allowed_origins' => $frontendUrls,
 
-    'allowed_origins_patterns' => [],
+    'allowed_origins_patterns' => [
+        '#^https://[a-z0-9-]+\.shopit\.com\.ar$#',
+    ],
 
     'allowed_headers' => ['*'],
 

config/purchase.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'checkout_expiration_minutes' => (int) env('PURCHASE_CHECKOUT_EXPIRATION_MINUTES', 30),
+
+    'payment_expiration_minutes' => [
+        'qr' => (int) env('PURCHASE_QR_EXPIRATION_MINUTES', 15),
+        'telepagos' => (int) env('PURCHASE_TELEPAGOS_EXPIRATION_MINUTES', 30),
+        'transfer' => (int) env('PURCHASE_TRANSFER_EXPIRATION_MINUTES', 1440),
+    ],
+];

config/services.php

@@ -39,4 +39,10 @@ return [
         'secret' => env('INTEGRATION_SECRET'),
     ],
 
+    'google' => [
+        'client_id' => env('GOOGLE_CLIENT_ID'),
+        'client_secret' => env('GOOGLE_CLIENT_SECRET'),
+        'redirect' => env('GOOGLE_REDIRECT_URI'),
+    ],
+
 ];

database/migrations/2026_07_22_000000_add_google_id_to_users_table.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table): void {
+            $table->string('google_id')->nullable()->unique()->after('email');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table): void {
+            $table->dropUnique(['google_id']);
+            $table->dropColumn('google_id');
+        });
+    }
+};

database/migrations/2026_07_23_000000_add_group_layout_to_featured_groups_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use App\Domains\Catalog\Enums\GroupLayout;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('featured_groups', function (Blueprint $table): void {
+            $table->enum('group_layout', GroupLayout::values())
+                ->default(GroupLayout::Paginated->value)
+                ->after('product_layout');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('featured_groups', function (Blueprint $table): void {
+            $table->dropColumn('group_layout');
+        });
+    }
+};

database/migrations/2026_07_23_000100_create_tenant_main_carousel_images_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('tenant_main_carousel_images', function (Blueprint $table): void {
+            $table->id();
+            $table->foreignId('tenant_id')
+                ->constrained('tenants')
+                ->cascadeOnDelete();
+            $table->foreignId('attachment_id')
+                ->constrained('attachments')
+                ->cascadeOnDelete();
+            $table->unsignedInteger('orden')->default(0);
+            $table->timestamps();
+
+            $table->unique(['tenant_id', 'attachment_id']);
+            $table->index(['tenant_id', 'orden']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('tenant_main_carousel_images');
+    }
+};

database/migrations/2026_07_23_000200_create_social_media_tables.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('social_media', function (Blueprint $table): void {
+            $table->id();
+            $table->string('code')->unique();
+            $table->string('icon');
+            $table->string('name');
+            $table->timestamps();
+        });
+
+        Schema::create('tenant_social_media', function (Blueprint $table): void {
+            $table->id();
+            $table->string('tenant_code');
+            $table->string('social_media_code');
+            $table->string('url');
+            $table->timestamps();
+
+            $table->foreign('tenant_code')
+                ->references('codigo')
+                ->on('tenants')
+                ->cascadeOnDelete();
+            $table->foreign('social_media_code')
+                ->references('code')
+                ->on('social_media')
+                ->cascadeOnDelete();
+            $table->unique(['tenant_code', 'social_media_code']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('tenant_social_media');
+        Schema::dropIfExists('social_media');
+    }
+};

database/migrations/2026_07_23_000300_add_orden_to_tenant_social_media_table.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('tenant_social_media', function (Blueprint $table): void {
+            $table->unsignedInteger('orden')->default(0)->after('url');
+            $table->index(['tenant_code', 'orden']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('tenant_social_media', function (Blueprint $table): void {
+            $table->dropIndex(['tenant_code', 'orden']);
+            $table->dropColumn('orden');
+        });
+    }
+};

database/migrations/2026_07_23_000400_refactor_menues_content_model.php

@@ -0,0 +1,84 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('tenant_menues', function (Blueprint $table) {
+            $table->dropForeign(['tenant_codigo']);
+            $table->dropForeign(['menu_code']);
+        });
+
+        Schema::rename('tenant_menues', 'tenants_menues');
+
+        Schema::table('tenants_menues', function (Blueprint $table) {
+            $table->renameColumn('tenant_codigo', 'tenant_code');
+            $table->json('static_content')->nullable();
+        });
+
+        Schema::table('menues', function (Blueprint $table) {
+            $table->string('parent_menu_code')->nullable()->after('code');
+            $table->enum('content_type', ['static', 'dynamic'])
+                ->default('dynamic')
+                ->after('parent_menu_code');
+            $table->json('static_content_schema')->nullable()->after('content_type');
+        });
+
+        Schema::table('menues', function (Blueprint $table) {
+            $table->foreign('parent_menu_code')
+                ->references('code')
+                ->on('menues')
+                ->nullOnDelete();
+        });
+
+        Schema::table('tenants_menues', function (Blueprint $table) {
+            $table->foreign('tenant_code')
+                ->references('codigo')
+                ->on('tenants')
+                ->cascadeOnDelete();
+            $table->foreign('menu_code')
+                ->references('code')
+                ->on('menues')
+                ->cascadeOnDelete();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('tenants_menues', function (Blueprint $table) {
+            $table->dropForeign(['tenant_code']);
+            $table->dropForeign(['menu_code']);
+        });
+
+        Schema::table('menues', function (Blueprint $table) {
+            $table->dropForeign(['parent_menu_code']);
+            $table->dropColumn([
+                'parent_menu_code',
+                'content_type',
+                'static_content_schema',
+            ]);
+        });
+
+        Schema::table('tenants_menues', function (Blueprint $table) {
+            $table->dropColumn('static_content');
+            $table->renameColumn('tenant_code', 'tenant_codigo');
+        });
+
+        Schema::rename('tenants_menues', 'tenant_menues');
+
+        Schema::table('tenant_menues', function (Blueprint $table) {
+            $table->foreign('tenant_codigo')
+                ->references('codigo')
+                ->on('tenants')
+                ->cascadeOnDelete();
+            $table->foreign('menu_code')
+                ->references('code')
+                ->on('menues')
+                ->cascadeOnDelete();
+        });
+    }
+};