test(catalog): cover global availability decisions

.env.example

@@ -8,7 +8,6 @@ PURCHASE_CHECKOUT_EXPIRATION_MINUTES=30
 PURCHASE_QR_EXPIRATION_MINUTES=15
 PURCHASE_TELEPAGOS_EXPIRATION_MINUTES=30
 PURCHASE_TRANSFER_EXPIRATION_MINUTES=1440
-PURCHASE_TRANSFER_CANDIDATE_AMOUNT_TOLERANCE_PERCENTAGE=5
 STOCK_RESERVATION_EXPIRATION_MINUTES=30
 FRONTEND_URLS=http://localhost:4200
 
@@ -32,7 +31,6 @@ AUTH_LOGIN_ATTEMPT_WINDOW_MINUTES=30
 AUTH_LOGIN_LOCK_MINUTES=15
 AUTH_LOGIN_RATE_LIMIT_PER_MINUTE=10
 AUTH_LOGIN_IP_RATE_LIMIT_PER_MINUTE=30
-AUTH_PASSWORD_RESET_EXPIRATION_MINUTES=60
 
 LOG_CHANNEL=daily
 LOG_STACK=single
@@ -43,8 +41,6 @@ TELEPAGOS_LOG_LEVEL=info
 TELEPAGOS_LOG_DAYS=30
 COMMANDS_LOG_LEVEL=info
 COMMANDS_LOG_DAYS=30
-EMAILS_LOG_LEVEL=info
-EMAILS_LOG_DAYS=30
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

app/Domains/Administrator/Controllers/AdminAppAdministratorController.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Domains\Administrator\Controllers;
-
-use App\Domains\Administrator\Requests\StoreAdministratorRequest;
-use App\Domains\Administrator\Requests\UpdateAdministratorRequest;
-use App\Domains\Administrator\Resources\AdministratorResource;
-use App\Domains\Administrator\Services\AdministratorService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Symfony\Component\HttpFoundation\Response;
-
-class AdminAppAdministratorController extends Controller
-{
-    public function __construct(private readonly AdministratorService $administratorService) {}
-
-    public function index(Request $request): AnonymousResourceCollection
-    {
-        return AdministratorResource::collection($this->administratorService->list(
-            $request->user()->tenant()->firstOrFail(),
-            $request->string('search')->trim()->toString() ?: null,
-        ));
-    }
-
-    public function store(StoreAdministratorRequest $request): AdministratorResource
-    {
-        return AdministratorResource::make($this->administratorService->create(
-            $request->user()->tenant()->firstOrFail(),
-            $request->validated(),
-        ));
-    }
-
-    public function update(UpdateAdministratorRequest $request, int $administrator): AdministratorResource
-    {
-        return AdministratorResource::make($this->administratorService->update(
-            $request->user()->tenant()->firstOrFail(),
-            $administrator,
-            $request->validated(),
-        ));
-    }
-
-    public function destroy(Request $request, int $administrator): Response
-    {
-        $this->administratorService->delete($request->user()->tenant()->firstOrFail(), $administrator, $request->user());
-
-        return response()->noContent();
-    }
-}

app/Domains/Administrator/Requests/StoreAdministratorRequest.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Domains\Administrator\Requests;
-
-use App\Domains\Authorization\Enums\RoleCode;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StoreAdministratorRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return $this->user()?->rol_codigo === RoleCode::AdminApp->value;
-    }
-
-    protected function prepareForValidation(): void
-    {
-        if (is_string($this->input('email'))) {
-            $this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
-        }
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-
-        return [
-            'nombre_apellido' => ['required', 'string', 'max:255'],
-            'dni' => ['required', 'string', 'max:50'],
-            'email' => [
-                'required',
-                'email',
-                'max:255',
-                Rule::unique('users', 'active_email')->where('rol_codigo', RoleCode::AdminApp->value)->whereNull('deleted_at'),
-            ],
-        ];
-    }
-}

app/Domains/Administrator/Requests/UpdateAdministratorRequest.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Domains\Administrator\Requests;
-
-use App\Domains\Authorization\Enums\RoleCode;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdateAdministratorRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return $this->user()?->rol_codigo === RoleCode::AdminApp->value;
-    }
-
-    protected function prepareForValidation(): void
-    {
-        if (is_string($this->input('email'))) {
-            $this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
-        }
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        $administratorId = (int) $this->route('administrator');
-
-        return [
-            'nombre_apellido' => ['required', 'string', 'max:255'],
-            'dni' => ['required', 'string', 'max:50'],
-            'email' => [
-                'required',
-                'email',
-                'max:255',
-                Rule::unique('users', 'active_email')->where('rol_codigo', RoleCode::AdminApp->value)
-                    ->whereNull('deleted_at')
-                    ->ignore($administratorId),
-            ],
-        ];
-    }
-}

app/Domains/Administrator/Resources/AdministratorResource.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Domains\Administrator\Resources;
-
-use App\Domains\Auth\Models\User;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin User */
-class AdministratorResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'nombre_apellido' => $this->nombre_apellido,
-            'dni' => $this->dni,
-            'email' => $this->email,
-            'rol_codigo' => $this->rol_codigo,
-            'role' => $this->whenLoaded('role', fn () => [
-                'codigo' => $this->role?->codigo,
-                'nombre' => $this->role?->nombre,
-            ]),
-        ];
-    }
-}

app/Domains/Administrator/Services/AdministratorService.php

@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Domains\Administrator\Services;
-
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-
-class AdministratorService
-{
-    public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
-
-    /** @return Collection<int, User> */
-    public function list(Tenant $tenant, ?string $search = null): Collection
-    {
-        return $this->query($tenant)->with('role')
-            ->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
-                $query->where('nombre_apellido', 'like', "%{$search}%")
-                    ->orWhere('dni', 'like', "%{$search}%")
-                    ->orWhere('email', 'like', "%{$search}%");
-            }))
-            ->orderBy('nombre_apellido')->get();
-    }
-
-    /** @param array<string, mixed> $data */
-    public function create(Tenant $tenant, array $data): User
-    {
-        return DB::transaction(function () use ($tenant, $data): User {
-            $administrator = User::query()->create([
-                ...$this->attributes($data),
-                'password' => Str::random(64),
-                'rol_codigo' => RoleCode::AdminApp->value,
-                'tenant_codigo' => $tenant->codigo,
-            ]);
-            $this->resetPasswordAttemptService->createForAdminAppEmail(
-                $administrator->email,
-                ResetPasswordAttempt::REASON_ADMINISTRATOR_CREATED,
-            );
-
-            return $administrator->load('role');
-        });
-    }
-
-    /** @param array<string, mixed> $data */
-    public function update(Tenant $tenant, int $administratorId, array $data): User
-    {
-        return DB::transaction(function () use ($tenant, $administratorId, $data): User {
-            $administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
-            $administrator->update($this->attributes($data));
-
-            return $administrator->load('role');
-        });
-    }
-
-    public function delete(Tenant $tenant, int $administratorId, User $actor): void
-    {
-        DB::transaction(function () use ($tenant, $administratorId, $actor): void {
-            // Serialize deletions for this tenant, including requests already authenticated
-            // when another administrator removes their account.
-            Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
-            $administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
-            if ($administrator->is($actor)) {
-                throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
-            }
-            $activeAdministrators = $this->query($tenant)->lockForUpdate()->get();
-            if ($activeAdministrators->count() <= 1) {
-                throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
-            }
-            abort_unless($activeAdministrators->contains('id', $actor->id), 403);
-            $administrator->tokens()->delete();
-            $administrator->delete();
-        });
-    }
-
-    private function query(Tenant $tenant): Builder
-    {
-        return User::query()->where('tenant_codigo', $tenant->codigo)
-            ->where('rol_codigo', RoleCode::AdminApp->value);
-    }
-
-    /** @param array<string, mixed> $data
-     * @return array<string, mixed>
-     */
-    private function attributes(array $data): array
-    {
-        return [
-            ...Arr::only($data, ['nombre_apellido', 'dni']),
-            'email' => mb_strtolower(trim((string) $data['email'])),
-        ];
-    }
-}

app/Domains/Administrator/documentacion/README.md

@@ -1,63 +0,0 @@
-# Administradores de AdminApp
-
-CRUD de usuarios con rol `adminapp`, limitado al tenant del usuario autenticado.
-Todos los administradores del tenant pueden gestionar esta sección.
-
-## Endpoints
-
-Base: `/api/v1/adminapp/tenant/administrators`.
-Requieren `auth:sanctum` y `adminapp.tenant`.
-
-- `GET /`: listado ordenado por nombre; acepta `search` por nombre, DNI o email.
-- `POST /`: alta; responde `201` con `data`.
-- `PUT /{administrator}`: actualización de los tres campos; responde `200` con `data`.
-- `DELETE /{administrator}`: baja lógica; responde `204`.
-
-Alta y actualización reciben:
-
-```json
-{
-  "nombre_apellido": "Ada Lovelace",
-  "dni": "12345678",
-  "email": "ada@example.test"
-}
-```
-
-Nombre (hasta 255 caracteres), DNI (hasta 50) y email (hasta 255) son obligatorios.
-El email se normaliza a minúsculas antes de validar y debe ser único entre
-usuarios activos, sin importar su tenant o rol. Se permite reutilizar el email
-de un usuario eliminado. Rol y tenant no son editables desde esta API.
-
-Las respuestas incluyen `id`, `nombre_apellido`, `dni`, `email`, `rol_codigo`
-y `role` (`codigo`, `nombre`). Nunca incluyen contraseña ni datos de escaneo.
-
-## Alta y acceso
-
-Se genera una contraseña aleatoria y un intento de establecimiento de contraseña
-con motivo `administrator_created`, reutilizando `createForAdminAppEmail`.
-El evento usa el canal `adminapp`; el listener existente envía el email después
-del commit mediante la cola `emails`. Requiere la configuración de correo,
-dominio AdminApp y worker existentes. No se envían contraseñas en texto plano.
-
-## Eliminación y aislamiento
-
-Las consultas de usuarios se limitan por tenant y rol `adminapp`. IDs ajenos,
-usuarios eliminados y usuarios de otros roles devuelven `404`.
-La validación de campos devuelve `422`; falta de autenticación, `401`, y rol
-no autorizado, `403`.
-
-No se permite eliminar al propio usuario ni dejar al tenant sin administradores
-(`422`, error `administrator`). La eliminación bloquea la fila del tenant dentro
-de una transacción para serializar bajas concurrentes. También verifica que el
-actor siga activo, revoca tokens y aplica el borrado lógico existente en `users`.
-
-No agrega tablas ni migraciones. No modifica el CRUD de escáneres ni el frontend.
-
-## Verificación
-
-`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
-
-Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de
-contraseña, restricciones de rol y tenant, baja lógica, tokens y protecciones de
-eliminación. El caso de petición autenticada antes de la baja del actor se simula;
-no es una prueba con conexiones concurrentes reales.

app/Domains/Administrator/routes/api.php

@@ -1,10 +0,0 @@
-<?php
-
-use App\Domains\Administrator\Controllers\AdminAppAdministratorController;
-use Illuminate\Support\Facades\Route;
-
-Route::prefix('v1/adminapp/tenant')
-    ->middleware(['auth:sanctum', 'adminapp.tenant'])
-    ->group(function (): void {
-        Route::apiResource('administrators', AdminAppAdministratorController::class)->except('show');
-    });

app/Domains/Auth/Controllers/ResetPasswordController.php

@@ -5,7 +5,6 @@ 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\Domains\Authorization\Enums\RoleCode;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
@@ -27,7 +26,6 @@ class ResetPasswordController extends Controller
             $data['email'],
             $data['codigo'],
             $data['password'],
-            RoleCode::from($request->route('reset_role', RoleCode::User->value)),
         )) {
             throw ValidationException::withMessages([
                 'codigo' => __('api.auth.password_reset_invalid'),

app/Domains/Auth/Controllers/ValidateResetPasswordAttemptController.php

@@ -5,7 +5,6 @@ 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\Domains\Authorization\Enums\RoleCode;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
@@ -23,19 +22,10 @@ class ValidateResetPasswordAttemptController extends Controller
     {
         $data = $request->validated();
 
-        $result = $this->resetPasswordAttemptService->validateCode(
+        if (! $this->resetPasswordAttemptService->validateCode(
             $data['email'],
             $data['codigo'],
-            RoleCode::from($request->route('reset_role', RoleCode::User->value)),
-        );
-
-        if ($result === ResetPasswordAttemptService::CODE_EXPIRED) {
-            throw ValidationException::withMessages([
-                'codigo' => __('api.auth.reset_code_expired'),
-            ]);
-        }
-
-        if ($result !== ResetPasswordAttemptService::CODE_VALID) {
+        )) {
             throw ValidationException::withMessages([
                 'codigo' => __('api.auth.reset_code_invalid'),
             ]);

app/Domains/Auth/Models/ResetPasswordAttempt.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-#[Fillable(['user_id', 'codigo', 'reason', 'status', 'expires_at'])]
+#[Fillable(['user_id', 'codigo', 'reason', 'status'])]
 #[Hidden(['codigo'])]
 class ResetPasswordAttempt extends Model
 {
@@ -17,8 +17,6 @@ class ResetPasswordAttempt extends Model
 
     public const REASON_STAFF_CREATED = 'staff_created';
 
-    public const REASON_ADMINISTRATOR_CREATED = 'administrator_created';
-
     public const STATUS_PENDING = 'pending';
 
     public const STATUS_VALIDATED = 'validated';
@@ -33,7 +31,6 @@ class ResetPasswordAttempt extends Model
     {
         return [
             'user_id' => 'integer',
-            'expires_at' => 'datetime',
         ];
     }
 

app/Domains/Auth/Models/User.php

@@ -13,17 +13,16 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
 
 #[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
-#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
+#[Hidden(['password', 'remember_token'])]
 class User extends Authenticatable
 {
     /** @use HasFactory<UserFactory> */
-    use HasApiTokens, HasFactory, Notifiable, SoftDeletes;
+    use HasApiTokens, HasFactory, Notifiable;
 
     protected $attributes = [
         'rol_codigo' => RoleCode::User->value,

app/Domains/Auth/Requests/RegisterUserRequest.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Auth\Requests;
 
-use App\Domains\Authorization\Enums\RoleCode;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Password;
@@ -14,26 +13,15 @@ class RegisterUserRequest extends FormRequest
         return true;
     }
 
-    protected function prepareForValidation(): void
-    {
-        if (is_string($this->input('email'))) {
-            $this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
-        }
-    }
-
-    /** @return array<string, mixed> */
+    /**
+     * @return array<string, mixed>
+     */
     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', 'active_email')->where('rol_codigo', RoleCode::User->value)->whereNull('deleted_at'),
-            ],
+            'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')],
             'password' => ['required', 'string', 'confirmed', Password::min(8)->mixedCase()->symbols()],
             'dni' => ['nullable', 'string', 'max:255'],
             'telefono' => ['nullable', 'string', 'max:255'],

app/Domains/Auth/Requests/UpdateProfileRequest.php

@@ -4,7 +4,6 @@ namespace App\Domains\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
-use Illuminate\Validation\Rules\Password;
 
 class UpdateProfileRequest extends FormRequest
 {
@@ -13,13 +12,6 @@ class UpdateProfileRequest extends FormRequest
         return true;
     }
 
-    protected function prepareForValidation(): void
-    {
-        if (is_string($this->input('email'))) {
-            $this->merge(['email' => mb_strtolower(trim($this->input('email')))]);
-        }
-    }
-
     public function rules(): array
     {
         return [
@@ -27,13 +19,11 @@ class UpdateProfileRequest extends FormRequest
             'email' => [
                 'required',
                 'email',
-                Rule::unique('users', 'active_email')->where('rol_codigo', $this->user()->rol_codigo)
-                    ->whereNull('deleted_at')
-                    ->ignore($this->user()->id),
+                Rule::unique('users', 'email')->ignore($this->user()->id),
             ],
             'dni' => ['nullable', 'string', 'regex:/^[0-9]{7,8}$/'],
             'telefono' => ['nullable', 'string', 'regex:/^\+?[0-9\s\-]+$/'],
-            'password' => ['nullable', 'string', Password::min(8)->mixedCase()->symbols()],
+            'password' => ['nullable', 'string', \Illuminate\Validation\Rules\Password::min(8)->mixedCase()->symbols()],
         ];
     }
 }

app/Domains/Auth/Services/AdminCredentialVerifier.php

@@ -11,7 +11,7 @@ class AdminCredentialVerifier
     public function verify(string $email, string $password): bool
     {
         $admin = User::query()
-            ->where('active_email', mb_strtolower(trim($email)))
+            ->where('email', mb_strtolower(trim($email)))
             ->where('rol_codigo', RoleCode::Admin->value)
             ->first();
 

app/Domains/Auth/Services/GoogleAuthService.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Auth\Services;
 
 use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Notification\Events\UserRegistered;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Support\TenantDomainNormalizer;
@@ -125,12 +124,12 @@ class GoogleAuthService
             ]);
         }
 
-        $user = User::query()->where('rol_codigo', RoleCode::User->value)->where('google_id', $googleId)->first();
+        $user = User::query()->where('google_id', $googleId)->first();
         if ($user) {
             return $user;
         }
 
-        $user = User::query()->where('rol_codigo', RoleCode::User->value)->where('active_email', mb_strtolower(trim($email)))->first();
+        $user = User::query()->where('email', $email)->first();
         if ($user) {
             $user->forceFill(['google_id' => $googleId])->save();
 

app/Domains/Auth/Services/PasswordLoginService.php

@@ -85,7 +85,7 @@ class PasswordLoginService
             null,
             $ipAddress,
             $userAgent,
-            RoleCode::Scanner,
+            null,
             true,
             PermissionCode::ScanTickets->value,
             PasswordResetRequested::CHANNEL_SCANNER,
@@ -120,7 +120,7 @@ class PasswordLoginService
             $passwordResetChannel,
         ): array {
             $user = User::query()
-                ->where('active_email', $normalizedEmail)
+                ->where('email', $normalizedEmail)
                 ->when(
                     $requiredRole !== null,
                     fn ($query) => $query->where('rol_codigo', $requiredRole->value),

app/Domains/Auth/Services/ResetPasswordAttemptService.php

@@ -12,12 +12,6 @@ use Throwable;
 
 class ResetPasswordAttemptService
 {
-    public const CODE_VALID = 'valid';
-
-    public const CODE_INVALID = 'invalid';
-
-    public const CODE_EXPIRED = 'expired';
-
     public function createForEmail(
         string $email,
         string $tenantCode,
@@ -28,8 +22,7 @@ class ResetPasswordAttemptService
         try {
             $attemptId = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?int {
                 $user = User::query()
-                    ->where('active_email', mb_strtolower(trim($email)))
-                    ->where('rol_codigo', RoleCode::User->value)
+                    ->where('email', $email)
                     ->lockForUpdate()
                     ->first();
 
@@ -66,7 +59,7 @@ class ResetPasswordAttemptService
         try {
             $result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
                 $user = User::query()
-                    ->where('active_email', mb_strtolower(trim($email)))
+                    ->where('email', $email)
                     ->where('rol_codigo', RoleCode::AdminApp->value)
                     ->whereNotNull('tenant_codigo')
                     ->lockForUpdate()
@@ -114,7 +107,7 @@ class ResetPasswordAttemptService
         try {
             $result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
                 $user = User::query()
-                    ->where('active_email', mb_strtolower(trim($email)))
+                    ->where('email', $email)
                     ->where('rol_codigo', RoleCode::Scanner->value)
                     ->whereNotNull('tenant_codigo')
                     ->lockForUpdate()
@@ -153,15 +146,14 @@ class ResetPasswordAttemptService
         );
     }
 
-    public function validateCode(string $email, string $code, RoleCode $role = RoleCode::User): string
+    public function validateCode(string $email, string $code): bool
     {
         $emailFingerprint = $this->emailFingerprint($email);
 
         try {
-            return DB::transaction(function () use ($email, $code, $emailFingerprint, $role): string {
+            return DB::transaction(function () use ($email, $code, $emailFingerprint): bool {
                 $user = User::query()
-                    ->where('active_email', mb_strtolower(trim($email)))
-                    ->where('rol_codigo', $role->value)
+                    ->where('email', $email)
                     ->lockForUpdate()
                     ->first();
 
@@ -177,27 +169,14 @@ class ResetPasswordAttemptService
                         'email_fingerprint' => $emailFingerprint,
                     ]);
 
-                    return self::CODE_INVALID;
-                }
-
-                if ($attempt->expires_at?->isPast()) {
-                    $attempt->update([
-                        'status' => ResetPasswordAttempt::STATUS_EXPIRED,
-                    ]);
-
-                    Log::info('Password reset code validation failed: attempt expired.', [
-                        'email_fingerprint' => $emailFingerprint,
-                        'attempt_id' => $attempt->getKey(),
-                    ]);
-
-                    return self::CODE_EXPIRED;
+                    return false;
                 }
 
                 $attempt->update([
                     'status' => ResetPasswordAttempt::STATUS_VALIDATED,
                 ]);
 
-                return self::CODE_VALID;
+                return true;
             });
         } catch (Throwable $exception) {
             Log::error('Failed to validate password reset code.', [
@@ -209,15 +188,14 @@ class ResetPasswordAttemptService
         }
     }
 
-    public function resetPassword(string $email, string $code, string $password, RoleCode $role = RoleCode::User): bool
+    public function resetPassword(string $email, string $code, string $password): bool
     {
         $emailFingerprint = $this->emailFingerprint($email);
 
         try {
-            return DB::transaction(function () use ($email, $code, $password, $emailFingerprint, $role): bool {
+            return DB::transaction(function () use ($email, $code, $password, $emailFingerprint): bool {
                 $user = User::query()
-                    ->where('active_email', mb_strtolower(trim($email)))
-                    ->where('rol_codigo', $role->value)
+                    ->where('email', $email)
                     ->lockForUpdate()
                     ->first();
 
@@ -236,19 +214,6 @@ class ResetPasswordAttemptService
                     return false;
                 }
 
-                if ($attempt->expires_at?->isPast()) {
-                    $attempt->update([
-                        'status' => ResetPasswordAttempt::STATUS_EXPIRED,
-                    ]);
-
-                    Log::info('Password reset failed: attempt expired.', [
-                        'email_fingerprint' => $emailFingerprint,
-                        'attempt_id' => $attempt->getKey(),
-                    ]);
-
-                    return false;
-                }
-
                 $user->password = $password;
                 $user->failed_login_attempts = 0;
                 $user->last_failed_login_at = null;
@@ -305,7 +270,6 @@ class ResetPasswordAttemptService
             'codigo' => $this->generateCode(),
             'reason' => $reason,
             'status' => ResetPasswordAttempt::STATUS_PENDING,
-            'expires_at' => now()->addMinutes((int) config('auth.passwords.users.expire')),
         ]);
 
         return $attempt->getKey();

app/Domains/Auth/routes/adminapp.php

@@ -12,10 +12,8 @@ Route::prefix('v1/adminapp')->group(function (): void {
     Route::post('password/reset-attempts', CreateAdminAppResetPasswordAttemptController::class)
         ->middleware('throttle:5,1');
     Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
-        ->defaults('reset_role', 'adminapp')
         ->middleware('throttle:10,1');
     Route::post('password/reset', ResetPasswordController::class)
-        ->defaults('reset_role', 'adminapp')
         ->middleware('throttle:5,1');
     Route::middleware(['auth:sanctum', 'adminapp.tenant'])
         ->get('me', AdminAppMeController::class);

app/Domains/Auth/routes/scanner.php

@@ -12,10 +12,8 @@ Route::prefix('v1/scanner')->group(function (): void {
     Route::post('password/reset-attempts', CreateScannerResetPasswordAttemptController::class)
         ->middleware('throttle:5,1');
     Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
-        ->defaults('reset_role', 'scanner')
         ->middleware('throttle:10,1');
     Route::post('password/reset', ResetPasswordController::class)
-        ->defaults('reset_role', 'scanner')
         ->middleware('throttle:5,1');
     Route::middleware(['auth:sanctum', 'scanner.tenant'])
         ->get('me', ScannerMeController::class);

app/Domains/Bootstrap/Resources/AdminAppBootstrapResource.php

@@ -30,7 +30,6 @@ class AdminAppBootstrapResource extends JsonResource
             'login_header_footer_color' => $websiteType->login_header_footer_color,
             'site_logo' => $websiteType->siteLogo?->getTemporaryUrl(1440),
             'footer_logo' => $websiteType->footerLogo?->getTemporaryUrl(1440),
-            'favicon' => $websiteType->favicon?->getTemporaryUrl(1440),
         ];
     }
 }

app/Domains/Bootstrap/Services/AdminAppBootstrapService.php

@@ -11,7 +11,7 @@ class AdminAppBootstrapService
     {
         return [
             'website_type' => WebsiteType::query()
-                ->with(['siteLogo', 'footerLogo', 'favicon'])
+                ->with(['siteLogo', 'footerLogo'])
                 ->where('dominio', $domain)
                 ->firstOrFail(),
         ];

app/Domains/Bootstrap/Services/ScannerBootstrapService.php

@@ -11,7 +11,7 @@ class ScannerBootstrapService
     {
         return [
             'website_type' => WebsiteType::query()
-                ->with(['siteLogo', 'footerLogo', 'favicon'])
+                ->with(['siteLogo', 'footerLogo'])
                 ->where('scanner_domain', $domain)
                 ->firstOrFail(),
         ];

app/Domains/Cart/Models/Cart.php

@@ -5,7 +5,6 @@ namespace App\Domains\Cart\Models;
 use App\Domains\Auth\Models\User;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Catalog\Services\StockReservationService;
@@ -29,7 +28,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
     'status',
     'origin',
     'current_purchase_id',
-    'current_stock_reservation_id',
 ])]
 class Cart extends Model
 {
@@ -38,16 +36,6 @@ class Cart extends Model
 
     protected $table = 'carritos';
 
-    public const STATUS_ACTIVE = 'active';
-
-    public const STATUS_CHECKOUT = 'checkout';
-
-    public const STATUS_CONVERTED = 'converted';
-
-    public const STATUS_EXPIRED = 'expired';
-
-    public const STATUS_ABANDONED = 'abandoned';
-
     public const ORIGIN_USER = 'user';
 
     public const ORIGIN_DIRECT_CHECKOUT = 'direct_checkout';
@@ -57,7 +45,6 @@ class Cart extends Model
         return [
             'user_id' => 'integer',
             'current_purchase_id' => 'integer',
-            'current_stock_reservation_id' => 'integer',
         ];
     }
 
@@ -97,15 +84,6 @@ class Cart extends Model
         return $this->belongsTo(Purchase::class, 'current_purchase_id');
     }
 
-    /** @return BelongsTo<StockReservation, $this> */
-    public function currentStockReservation(): BelongsTo
-    {
-        return $this->belongsTo(
-            StockReservation::class,
-            'current_stock_reservation_id',
-        );
-    }
-
     public function getTotalAmount(): float
     {
         $items = $this->relationLoaded('items')
@@ -129,7 +107,6 @@ class Cart extends Model
 
         return DB::transaction(function () use ($catalogItemId, $variantId, $quantity): CartItem {
             $this->invalidateCurrentCheckout();
-            app(StockReservationService::class)->assertCartReservationUsable($this);
             $selectedItem = $this->resolveScopedItem($catalogItemId, $variantId, true);
             $cartQuantity = (int) $this->items()
                 ->where('catalog_item_id', $catalogItemId)
@@ -163,11 +140,12 @@ class Cart extends Model
                     'cantidad' => $quantity,
                 ]);
             } else {
+                app(StockReservationService::class)->ensure($item, $selectedItem);
                 $item->cantidad += $quantity;
                 $item->save();
             }
 
-            app(StockReservationService::class)->syncCart($this);
+            app(StockReservationService::class)->reserve($item, $selectedItem, $quantity);
 
             return $item->fresh();
         });
@@ -194,7 +172,6 @@ class Cart extends Model
             $excludedPurchaseId,
         ): CartItem {
             $this->invalidateCurrentCheckout();
-            app(StockReservationService::class)->assertCartReservationUsable($this);
 
             /** @var CartItem $item */
             $item = $this->items()
@@ -228,6 +205,7 @@ class Cart extends Model
                     $nextAvailableQuantity,
                 );
 
+                app(StockReservationService::class)->release($item, $currentSelection, $item->cantidad);
                 $availableQuantity = $inventoryService->availableQuantity($nextSelection);
 
                 if ($availableQuantity !== null && $availableQuantity < $quantity) {
@@ -244,10 +222,11 @@ class Cart extends Model
                     ->first();
 
                 if ($targetItem !== null) {
+                    app(StockReservationService::class)->ensure($targetItem, $nextSelection);
                     $targetItem->cantidad += $quantity;
                     $targetItem->save();
+                    app(StockReservationService::class)->reserve($targetItem, $nextSelection, $quantity);
                     $item->delete();
-                    app(StockReservationService::class)->syncCart($this);
 
                     return $targetItem->fresh();
                 }
@@ -255,7 +234,7 @@ class Cart extends Model
                 $item->variant_id = $variantId;
                 $item->cantidad = $quantity;
                 $item->save();
-                app(StockReservationService::class)->syncCart($this);
+                app(StockReservationService::class)->reserve($item, $nextSelection, $quantity);
 
                 return $item->fresh();
             }
@@ -284,9 +263,16 @@ class Cart extends Model
                 ]);
             }
 
+            if ($delta > 0) {
+                app(StockReservationService::class)->reserve($item, $currentSelection, $delta);
+            }
+
+            if ($delta < 0) {
+                app(StockReservationService::class)->release($item, $currentSelection, abs($delta));
+            }
+
             $item->cantidad = $quantity;
             $item->save();
-            app(StockReservationService::class)->syncCart($this);
 
             return $item->fresh();
         });
@@ -296,7 +282,6 @@ class Cart extends Model
     {
         DB::transaction(function () use ($cartItemId): void {
             $this->invalidateCurrentCheckout();
-            app(StockReservationService::class)->assertCartReservationUsable($this);
 
             /** @var CartItem $item */
             $item = $this->items()
@@ -304,8 +289,17 @@ class Cart extends Model
                 ->lockForUpdate()
                 ->firstOrFail();
 
+            $selectedItem = $this->resolveScopedItem(
+                $item->catalog_item_id,
+                $item->variant_id,
+                true,
+            );
+            app(StockReservationService::class)->release(
+                $item,
+                $selectedItem,
+                $item->cantidad,
+            );
             $item->delete();
-            app(StockReservationService::class)->syncCart($this);
         });
     }
 
@@ -347,20 +341,13 @@ class Cart extends Model
             Purchase::STATUS_CREATED,
             Purchase::STATUS_PENDING_PAYMENT,
         ], true)) {
-            app(StockReservationService::class)->returnToCart($currentPurchase, $cart);
             $currentPurchase->update([
                 'status' => Purchase::STATUS_SUPERSEDED,
+                'expires_at' => null,
             ]);
-
-            $this->current_purchase_id = null;
-
-            return;
         }
 
-        app(StockReservationService::class)->releaseForPurchase(
-            $currentPurchase,
-            reason: StockReservationService::REASON_PURCHASE_SUPERSEDED,
-        );
+        app(StockReservationService::class)->detachFromPurchase($currentPurchase);
         self::query()
             ->whereKey($cart->getKey())
             ->where('current_purchase_id', $currentPurchase->getKey())

app/Domains/Cart/Models/CartItem.php

@@ -3,11 +3,13 @@
 namespace App\Domains\Cart\Models;
 
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Catalog\Models\Variant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'cart_id',
@@ -55,4 +57,10 @@ class CartItem extends Model
     {
         return $this->variant ?? $this->catalogItem;
     }
+
+    /** @return HasMany<StockReservation, $this> */
+    public function stockReservations(): HasMany
+    {
+        return $this->hasMany(StockReservation::class);
+    }
 }

app/Domains/Cart/Services/CartService.php

@@ -4,12 +4,9 @@ namespace App\Domains\Cart\Services;
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Services\ExpireStockReservationsService;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -25,7 +22,7 @@ class CartService
             return $this->makeEmptyCart($tenant);
         }
 
-        $cart = $this->resolveCart($tenant, $resolvedIdentity['identity']);
+        $cart = $this->findCart($tenant, $resolvedIdentity['identity']);
 
         if ($cart === null) {
             return $this->makeEmptyCart($tenant);
@@ -122,7 +119,7 @@ class CartService
     {
         $cart = new Cart([
             'tenant_codigo' => $tenant->codigo,
-            'status' => Cart::STATUS_ACTIVE,
+            'status' => 'active',
         ]);
 
         $cart->setRelation('items', collect());
@@ -223,14 +220,12 @@ class CartService
     {
         return Cart::query()
             ->where('tenant_codigo', $tenant->codigo)
-            ->where('origin', Cart::ORIGIN_USER)
-            ->whereIn('status', [Cart::STATUS_ACTIVE, Cart::STATUS_EXPIRED])
+            ->where('status', 'active')
             ->when(
                 $identity['user_id'] !== null,
                 fn ($query) => $query->where('user_id', $identity['user_id']),
                 fn ($query) => $query->where('guest_token', $identity['guest_token']),
             )
-            ->orderByRaw('CASE WHEN status = ? THEN 0 ELSE 1 END', [Cart::STATUS_ACTIVE])
             ->first();
     }
 
@@ -239,7 +234,7 @@ class CartService
      */
     protected function findCartOrFail(Tenant $tenant, array $identity): Cart
     {
-        $cart = $this->resolveCart($tenant, $identity, replaceExpired: false);
+        $cart = $this->findCart($tenant, $identity);
 
         if ($cart === null) {
             throw new NotFoundHttpException('Cart not found.');
@@ -252,73 +247,10 @@ class CartService
      * @param  array{user_id: ?int, guest_token: ?string}  $identity
      */
     protected function findOrCreateCart(Tenant $tenant, array $identity): Cart
-    {
-        return $this->resolveCart($tenant, $identity)
-            ?? $this->createCart($tenant, $identity);
-    }
-
-    /**
-     * @param  array{user_id: ?int, guest_token: ?string}  $identity
-     */
-    protected function resolveCart(
-        Tenant $tenant,
-        array $identity,
-        bool $replaceExpired = true,
-    ): ?Cart {
-        $cart = $this->findCart($tenant, $identity);
-
-        if ($cart?->status === Cart::STATUS_ACTIVE
-            && $cart->current_stock_reservation_id !== null
-            && app(ExpireStockReservationsService::class)
-                ->expireIfOverdue($cart->current_stock_reservation_id)) {
-            $cart = $this->findCart($tenant, $identity);
-        }
-
-        if ($cart?->status === Cart::STATUS_EXPIRED) {
-            if (! $replaceExpired) {
-                throw new StockReservationExpiredException;
-            }
-
-            return $this->replaceExpiredCart($cart, $tenant, $identity);
-        }
-
-        if ($cart !== null) {
-            return $cart;
-        }
-
-        return null;
-    }
-
-    /**
-     * @param  array{user_id: ?int, guest_token: ?string}  $identity
-     */
-    protected function replaceExpiredCart(Cart $expiredCart, Tenant $tenant, array $identity): Cart
-    {
-        return DB::transaction(function () use ($expiredCart, $tenant, $identity): Cart {
-            /** @var Cart|null $lockedCart */
-            $lockedCart = Cart::query()->lockForUpdate()->find($expiredCart->getKey());
-
-            if ($lockedCart?->status === Cart::STATUS_EXPIRED) {
-                $lockedCart->update([
-                    'status' => Cart::STATUS_ABANDONED,
-                    'current_purchase_id' => null,
-                ]);
-            }
-
-            return $this->findCart($tenant, $identity)
-                ?? $this->createCart($tenant, $identity);
-        });
-    }
-
-    /**
-     * @param  array{user_id: ?int, guest_token: ?string}  $identity
-     */
-    protected function createCart(Tenant $tenant, array $identity): Cart
     {
         $attributes = [
             'tenant_codigo' => $tenant->codigo,
-            'status' => Cart::STATUS_ACTIVE,
-            'origin' => Cart::ORIGIN_USER,
+            'status' => 'active',
         ];
 
         if ($identity['user_id'] !== null) {

app/Domains/Cart/Services/ExpireCartReservationsService.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Domains\Cart\Services;
+
+use App\Domains\Cart\Models\Cart;
+use App\Domains\Cart\Models\CartItem;
+use App\Domains\Catalog\Models\Inventory;
+use App\Domains\Catalog\Models\StockReservation;
+use Illuminate\Support\Facades\DB;
+
+class ExpireCartReservationsService
+{
+    public function expireOverdue(): int
+    {
+        $expiredItems = 0;
+        $lastCartItemId = 0;
+
+        do {
+            $cartItemIds = StockReservation::query()
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->whereNull('purchase_id')
+                ->whereNotNull('cart_item_id')
+                ->whereNotNull('expires_at')
+                ->where('expires_at', '<=', now())
+                ->where('cart_item_id', '>', $lastCartItemId)
+                ->whereHas('cartItem.cart', fn ($query) => $query->where('status', 'active'))
+                ->select('cart_item_id')
+                ->distinct()
+                ->orderBy('cart_item_id')
+                ->limit(500)
+                ->pluck('cart_item_id');
+
+            foreach ($cartItemIds as $cartItemId) {
+                $lastCartItemId = (int) $cartItemId;
+
+                if ($this->expireCartItem($lastCartItemId)) {
+                    $expiredItems++;
+                }
+            }
+        } while ($cartItemIds->count() === 500);
+
+        return $expiredItems;
+    }
+
+    private function expireCartItem(int $cartItemId): bool
+    {
+        /** @var CartItem|null $candidate */
+        $candidate = CartItem::query()->select(['id', 'cart_id'])->find($cartItemId);
+        if ($candidate === null) {
+            return false;
+        }
+
+        return DB::transaction(function () use ($candidate, $cartItemId): bool {
+            /** @var Cart|null $cart */
+            $cart = Cart::query()
+                ->whereKey($candidate->cart_id)
+                ->where('status', 'active')
+                ->lockForUpdate()
+                ->first();
+
+            if ($cart === null) {
+                return false;
+            }
+
+            /** @var CartItem|null $cartItem */
+            $cartItem = $cart->items()
+                ->whereKey($cartItemId)
+                ->lockForUpdate()
+                ->first();
+
+            if ($cartItem === null) {
+                return false;
+            }
+
+            $reservations = StockReservation::query()
+                ->where('cart_item_id', $cartItem->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->orderBy('inventory_id')
+                ->lockForUpdate()
+                ->get();
+
+            if (
+                $reservations->isEmpty()
+                || $reservations->contains(
+                    fn (StockReservation $reservation): bool => $reservation->purchase_id !== null
+                        || $reservation->expires_at === null
+                        || $reservation->expires_at->isFuture(),
+                )
+            ) {
+                return false;
+            }
+
+            $inventories = Inventory::query()
+                ->whereKey($reservations->pluck('inventory_id'))
+                ->orderBy('id')
+                ->lockForUpdate()
+                ->get()
+                ->keyBy('id');
+
+            foreach ($reservations as $reservation) {
+                $inventory = $inventories->get($reservation->inventory_id)
+                    ?? throw new \InvalidArgumentException('No se encontro el inventario reservado.');
+
+                $inventory->release((int) $reservation->quantity);
+                $reservation->update([
+                    'quantity' => 0,
+                    'status' => StockReservation::STATUS_EXPIRED,
+                    'expires_at' => null,
+                    'released_at' => now(),
+                ]);
+            }
+
+            $cartItem->delete();
+
+            if (! $cart->items()->exists()) {
+                $cart->update(['status' => 'expired']);
+                $cart->delete();
+            }
+
+            return true;
+        });
+    }
+}

app/Domains/Cart/documentacion/README.md

@@ -6,12 +6,13 @@ Gestiona el carrito activo de un tenant tanto para visitantes como para usuarios
 
 ## Modelo
 
-- `Cart`: pertenece a un tenant y opcionalmente a un usuario; calcula el total, permite agregar, actualizar o quitar ítems y apunta a su reserva de stock vigente mediante `current_stock_reservation_id`.
+- `Cart`: pertenece a un tenant y opcionalmente a un usuario; calcula el total y permite agregar, actualizar o quitar ítems.
 - `CartItem`: referencia un `CatalogItem` y, opcionalmente, una `Variant`; sólo persiste la selección y cantidad, y expone siempre los datos vigentes del catálogo.
 
 ## Servicios
 
 - `CartService`: obtiene el carrito, modifica ítems y administra la cookie del token invitado.
+- `ExpireCartReservationsService`: libera las reservas vencidas de carritos activos y elimina los carritos que quedan vacíos.
 - `GuestCartMergeService`: incorpora el carrito invitado al usuario cuando este se autentica.
 
 ## Endpoints
@@ -33,6 +34,4 @@ Depende de `Catalog` para productos y variantes, de `Tenant` para aislar datos y
 
 Un carrito puede pasar a `checkout`. Las compras directas usan un carrito técnico con `origin=direct_checkout`; los carritos normales conservan `origin=user` y pueden restaurarse al cancelar o vencer la compra.
 
-Cada edición sincroniza una única reserva para el carrito completo. Si varios ítems o bundles consumen el mismo inventario, se persiste una sola línea con la cantidad agregada. Al editar durante checkout, la compra anterior queda `superseded`, se desvincula y el carrito conserva la misma reserva activa con sus líneas actualizadas.
-
-El comando unificado `php artisan reservations:expire` recorre una sola vez las reservas activas cuyo `expires_at` haya vencido. Cuando pertenecen a un carrito, conserva la reserva y sus líneas como historial, libera el stock como conjunto y cambia el carrito asociado a `expired` sin eliminar sus ítems. Al volver a resolver ese carrito desde la API, el anterior pasa automáticamente a `abandoned` y se crea uno activo y vacío para la misma identidad. El cliente nunca necesita reiniciarlo explícitamente. La API también materializa este vencimiento al acceder al carrito aunque el comando programado todavía no haya corrido.
+El comando unificado `php artisan reservations:expire` procesa primero las compras vencidas y luego las reservas activas sin compra cuyo `expires_at` haya vencido. Se ejecuta cada minuto mediante el scheduler, conserva la fila de reserva con estado `expired`, elimina el ítem abandonado y elimina lógicamente el carrito cuando queda vacío. Cada intento registra sus resultados o su error en el log diario `storage/logs/commands/commands-AAAA-MM-DD.log`.

app/Domains/Catalog/Controllers/CatalogController.php

@@ -123,6 +123,10 @@ class CatalogController extends Controller
             $variantId === null ? null : (int) $variantId,
         );
         $allowances->attach(collect([$item]), $this->userId($request));
+        abort_unless($allowances->availability(
+            $item->availableStock(),
+            $item->getAttribute('remaining_user_quota'),
+        )->isVisible(), 404);
 
         return CatalogItemDetailResource::make($item);
     }

app/Domains/Catalog/Enums/AvailabilityEffect.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum AvailabilityEffect: string
+{
+    case Hide = 'hide';
+    case Restrict = 'restrict';
+    case Notice = 'notice';
+}

app/Domains/Catalog/Enums/CatalogAction.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum CatalogAction: string
+{
+    case SelectVariant = 'select_variant';
+    case ChangeQuantity = 'change_quantity';
+    case AddToCart = 'add_to_cart';
+    case BuyNow = 'buy_now';
+}

app/Domains/Catalog/Exceptions/StockReservationExpiredException.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Exceptions;
-
-use RuntimeException;
-
-class StockReservationExpiredException extends RuntimeException
-{
-    public function __construct()
-    {
-        parent::__construct(__('api.cart.reservation_expired'));
-    }
-}

app/Domains/Catalog/Models/CatalogItem.php

@@ -27,7 +27,6 @@ use Illuminate\Support\Collection;
     'type',
     'slug',
     'nombre',
-    'group_order',
     'descripcion',
     'precio',
     'inventory_policy',
@@ -48,7 +47,6 @@ class CatalogItem extends Model
         'inventory_policy' => InventoryPolicy::Tracked->value,
         'inventory_subject' => InventorySubject::Product->value,
         'has_tickets' => false,
-        'group_order' => 0,
     ];
 
     protected function casts(): array
@@ -58,7 +56,6 @@ class CatalogItem extends Model
             'brand_id' => 'integer',
             'inventory_id' => 'integer',
             'type' => CatalogItemType::class,
-            'group_order' => 'integer',
             'precio' => 'decimal:2',
             'inventory_policy' => InventoryPolicy::class,
             'inventory_subject' => InventorySubject::class,
@@ -175,29 +172,17 @@ class CatalogItem extends Model
     }
 
     /** @param Builder<CatalogItem> $query */
-    public function scopeWhereAvailable(Builder $query): Builder
+    public function scopeWhereVariantsAvailable(Builder $query): Builder
     {
         return $query->where(function (Builder $query): void {
             $query
-                ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
+                ->whereDoesntHave('variants')
+                ->orWhere('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
                 ->orWhereHas(
                     'variants.inventory',
                     fn (Builder $inventoryQuery): Builder => $inventoryQuery
                         ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
-                )
-                ->orWhere(function (Builder $directItemQuery): void {
-                    $directItemQuery
-                        ->whereDoesntHave('variants')
-                        ->where(function (Builder $inventoryQuery): void {
-                            $inventoryQuery
-                                ->whereNull('catalog_items.inventory_id')
-                                ->orWhereHas(
-                                    'inventory',
-                                    fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery
-                                        ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
-                                );
-                        });
-                });
+                );
         });
     }
 

app/Domains/Catalog/Models/Inventory.php

@@ -48,10 +48,10 @@ class Inventory extends Model
         return $this->hasOne(Variant::class);
     }
 
-    /** @return HasMany<StockReservationLine, $this> */
-    public function stockReservationLines(): HasMany
+    /** @return HasMany<StockReservation, $this> */
+    public function stockReservations(): HasMany
     {
-        return $this->hasMany(StockReservationLine::class);
+        return $this->hasMany(StockReservation::class);
     }
 
     public function availableStock(): int

app/Domains/Catalog/Models/StockReservation.php

@@ -2,20 +2,21 @@
 
 namespace App\Domains\Catalog\Models;
 
-use App\Domains\Cart\Models\Cart;
+use App\Domains\Cart\Models\CartItem;
 use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 #[Fillable([
+    'inventory_id',
+    'cart_item_id',
+    'purchase_id',
+    'quantity',
     'status',
     'expires_at',
     'committed_at',
     'released_at',
-    'expired_at',
-    'release_reason',
 ])]
 class StockReservation extends Model
 {
@@ -30,28 +31,31 @@ class StockReservation extends Model
     protected function casts(): array
     {
         return [
+            'inventory_id' => 'integer',
+            'cart_item_id' => 'integer',
+            'purchase_id' => 'integer',
+            'quantity' => 'integer',
             'expires_at' => 'datetime',
             'committed_at' => 'datetime',
             'released_at' => 'datetime',
-            'expired_at' => 'datetime',
         ];
     }
 
-    /** @return HasMany<StockReservationLine, $this> */
-    public function lines(): HasMany
+    /** @return BelongsTo<Inventory, $this> */
+    public function inventory(): BelongsTo
     {
-        return $this->hasMany(StockReservationLine::class);
+        return $this->belongsTo(Inventory::class);
     }
 
-    /** @return HasOne<Cart, $this> */
-    public function currentCart(): HasOne
+    /** @return BelongsTo<CartItem, $this> */
+    public function cartItem(): BelongsTo
     {
-        return $this->hasOne(Cart::class, 'current_stock_reservation_id');
+        return $this->belongsTo(CartItem::class);
     }
 
-    /** @return HasOne<Purchase, $this> */
-    public function purchase(): HasOne
+    /** @return BelongsTo<Purchase, $this> */
+    public function purchase(): BelongsTo
     {
-        return $this->hasOne(Purchase::class);
+        return $this->belongsTo(Purchase::class);
     }
 }

app/Domains/Catalog/Models/StockReservationLine.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'stock_reservation_id',
-    'inventory_id',
-    'quantity',
-    'tracks_inventory',
-])]
-class StockReservationLine extends Model
-{
-    protected function casts(): array
-    {
-        return [
-            'stock_reservation_id' => 'integer',
-            'inventory_id' => 'integer',
-            'quantity' => 'integer',
-            'tracks_inventory' => 'boolean',
-        ];
-    }
-
-    /** @return BelongsTo<StockReservation, $this> */
-    public function reservation(): BelongsTo
-    {
-        return $this->belongsTo(StockReservation::class, 'stock_reservation_id');
-    }
-
-    /** @return BelongsTo<Inventory, $this> */
-    public function inventory(): BelongsTo
-    {
-        return $this->belongsTo(Inventory::class);
-    }
-}

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -51,7 +51,6 @@ class StoreCatalogItemRequest extends FormRequest
                 ),
             ],
             'nombre' => ['required', 'string', 'max:255'],
-            'group_order' => ['sometimes', 'integer', 'min:0'],
             'descripcion' => ['sometimes', 'nullable', 'string'],
             'precio' => ['required', 'numeric', 'min:0'],
             'inventory_policy' => [Rule::prohibitedIf($isBundle), 'sometimes', Rule::enum(InventoryPolicy::class)],

app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php

@@ -38,19 +38,13 @@ class CatalogFeaturedItemResource extends JsonResource
             'nombre' => $catalogItem->nombre,
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
-            'maximum_addable_quantity' => $this->maximumAddable(
-                $availableStock,
-                $remainingUserQuota,
-            ),
-            'unavailable_message' => $this->unavailableMessage(
-                $availableStock,
-                $remainingUserQuota,
-            ),
-            'variants' => $catalogItem->visibleVariants()
-                ->map(function (Variant $variant) use ($catalogItem, $remainingUserQuota): array {
+            'availability' => $this->availability($availableStock, $remainingUserQuota),
+            'variants' => $catalogItem->variants
+                ->map(function (Variant $variant) use ($catalogItem): array {
                     $variantStock = $catalogItem->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory->availableStock();
+                    $availability = $this->availability($variantStock, null);
 
                     return [
                         'id' => $variant->id,
@@ -60,17 +54,11 @@ class CatalogFeaturedItemResource extends JsonResource
                         'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
                         'descripcion' => $variant->getDescription(),
                         'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                        'maximum_addable_quantity' => $this->maximumAddable(
-                            $variantStock,
-                            $remainingUserQuota,
-                        ),
-                        'unavailable_message' => $this->unavailableMessage(
-                            $variantStock,
-                            $remainingUserQuota,
-                        ),
+                        'availability' => $availability,
                         'values' => $variant->selectorOptions($catalogItem->itemAttributes),
                     ];
                 })
+                ->filter(fn (array $variant): bool => $variant['availability']['state'] === 'visible')
                 ->values(),
         ];
 
@@ -90,8 +78,7 @@ class CatalogFeaturedItemResource extends JsonResource
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
             'image' => $this->firstImageUrl($catalogItem),
-            'maximum_addable_quantity' => $this->maximumAddable($availableStock, $remainingUserQuota),
-            'unavailable_message' => $this->unavailableMessage($availableStock, $remainingUserQuota),
+            'availability' => $this->availability($availableStock, $remainingUserQuota),
         ];
     }
 
@@ -107,30 +94,27 @@ class CatalogFeaturedItemResource extends JsonResource
             'nombre' => $catalogItem->nombre,
             'precio' => $catalogItem->precio,
             'image' => $this->firstImageUrl($catalogItem),
-            'maximum_addable_quantity' => $this->maximumAddable($availableStock, $remainingUserQuota),
-            'unavailable_message' => $this->unavailableMessage($availableStock, $remainingUserQuota),
+            'availability' => $this->availability($availableStock, $remainingUserQuota),
         ];
     }
 
     private function firstImageUrl(CatalogItem $catalogItem): ?string
     {
         $attachment = $catalogItem->attachments->first()
-            ?? $catalogItem->visibleVariants()
+            ?? $catalogItem->variants
                 ->flatMap(fn (Variant $variant) => $variant->attachments)
                 ->first();
 
         return $attachment?->getTemporaryUrl(1440);
     }
 
-    private function maximumAddable(?int $stock, ?int $remainingUserQuota): ?int
-    {
+    /** @return array<string, mixed> */
+    private function availability(
+        ?int $stock,
+        ?int $remainingUserQuota,
+    ): array {
         return app(CatalogItemAllowanceService::class)
-            ->maximumAddableQuantity($stock, $remainingUserQuota);
-    }
-
-    private function unavailableMessage(?int $stock, ?int $remainingUserQuota): ?string
-    {
-        return app(CatalogItemAllowanceService::class)
-            ->unavailableMessage($stock, $remainingUserQuota);
+            ->availability($stock, $remainingUserQuota)
+            ->toArray();
     }
 }

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -38,20 +38,14 @@ class CatalogItemDetailResource extends JsonResource
             'max_units_per_user' => $this->max_units_per_user,
             'has_tickets' => $this->has_tickets,
             'attributes' => $this->attributesData(),
-            'maximum_addable_quantity' => $this->when(
-                $selectedVariant === null,
-                fn () => $this->maximumAddable($this->availableStock()),
-            ),
-            'unavailable_message' => $this->when(
-                $selectedVariant === null,
-                fn () => $this->unavailableMessage($this->availableStock()),
-            ),
+            'availability' => $this->availability($this->availableStock()),
             'images' => $this->when(
                 $selectedVariant === null,
                 fn () => $this->imageUrls($this->attachments),
             ),
             'variants' => $this->variants
                 ->map(fn (Variant $variant): array => $this->variantData($variant))
+                ->filter(fn (array $variant): bool => $variant['availability']['state'] === 'visible')
                 ->values(),
             'selected_variant' => $this->when(
                 $selectedVariant !== null,
@@ -164,6 +158,10 @@ class CatalogItemDetailResource extends JsonResource
         $values = $variant->selectionOptions($this->itemAttributes);
         $eventDates = $variant->selectedEventDates();
         $variantStock = $this->variantStock($variant);
+        $availability = $this->availability(
+            $variantStock,
+            false,
+        );
 
         return [
             'id' => $variant->id,
@@ -173,8 +171,7 @@ class CatalogItemDetailResource extends JsonResource
             'event_dates' => $eventDates->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
             'descripcion' => $variant->getDescription(),
             'precio' => number_format($variant->getPrice(), 2, '.', ''),
-            'maximum_addable_quantity' => $this->maximumAddable($variantStock),
-            'unavailable_message' => $this->unavailableMessage($variantStock),
+            'availability' => $availability,
             'values' => $values,
         ];
     }
@@ -194,19 +191,14 @@ class CatalogItemDetailResource extends JsonResource
             : $variant->inventory->availableStock();
     }
 
-    private function maximumAddable(?int $stock): ?int
-    {
-        return app(CatalogItemAllowanceService::class)->maximumAddableQuantity(
+    /** @return array<string, mixed> */
+    private function availability(
+        ?int $stock,
+        bool $includeUserQuota = true,
+    ): array {
+        return app(CatalogItemAllowanceService::class)->availability(
             $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
-    }
-
-    private function unavailableMessage(?int $stock): ?string
-    {
-        return app(CatalogItemAllowanceService::class)->unavailableMessage(
-            $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
+            $includeUserQuota ? $this->getAttribute('remaining_user_quota') : null,
+        )->toArray();
     }
 }

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -16,9 +16,8 @@ class CatalogSearchItemResource extends JsonResource
     public function toArray(Request $request): array
     {
         $availableStock = $this->availableStock();
-        $visibleVariants = $this->visibleVariants();
         $attachment = $this->attachments->first()
-            ?? $visibleVariants
+            ?? $this->variants
                 ->flatMap(fn (Variant $variant) => $variant->attachments)
                 ->first();
 
@@ -29,13 +28,16 @@ class CatalogSearchItemResource extends JsonResource
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
             'image' => $attachment?->getTemporaryUrl(1440),
-            'maximum_addable_quantity' => $this->maximumAddable($availableStock),
-            'unavailable_message' => $this->unavailableMessage($availableStock),
-            'variants' => $visibleVariants
+            'availability' => $this->availability($availableStock),
+            'variants' => $this->variants
                 ->map(function (Variant $variant): array {
                     $variantStock = $this->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory?->availableStock();
+                    $availability = $this->availability(
+                        $variantStock,
+                        false,
+                    );
 
                     return [
                         'id' => $variant->id,
@@ -45,28 +47,23 @@ class CatalogSearchItemResource extends JsonResource
                         'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
                         'descripcion' => $variant->getDescription(),
                         'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                        'maximum_addable_quantity' => $this->maximumAddable($variantStock),
-                        'unavailable_message' => $this->unavailableMessage($variantStock),
+                        'availability' => $availability,
                         'values' => $variant->selectorOptions($this->itemAttributes),
                     ];
                 })
+                ->filter(fn (array $variant): bool => $variant['availability']['state'] === 'visible')
                 ->values(),
         ];
     }
 
-    private function maximumAddable(?int $stock): ?int
-    {
-        return app(CatalogItemAllowanceService::class)->maximumAddableQuantity(
+    /** @return array<string, mixed> */
+    private function availability(
+        ?int $stock,
+        bool $includeUserQuota = true,
+    ): array {
+        return app(CatalogItemAllowanceService::class)->availability(
             $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
-    }
-
-    private function unavailableMessage(?int $stock): ?string
-    {
-        return app(CatalogItemAllowanceService::class)->unavailableMessage(
-            $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
+            $includeUserQuota ? $this->getAttribute('remaining_user_quota') : null,
+        )->toArray();
     }
 }

app/Domains/Catalog/Services/AvailabilityDecision.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Enums\CatalogAction;
+
+final readonly class AvailabilityDecision
+{
+    /**
+     * @param  list<CatalogAction>  $allowedActions
+     * @param  list<array{code: string, message: string}>  $reasons
+     */
+    private function __construct(
+        private bool $visible,
+        private ?int $maximumQuantity,
+        private array $allowedActions,
+        private array $reasons,
+    ) {}
+
+    /** @param list<array{code: string, message: string}> $reasons */
+    public static function hidden(array $reasons): self
+    {
+        return new self(false, null, [], $reasons);
+    }
+
+    /**
+     * @param  list<CatalogAction>  $allowedActions
+     * @param  list<array{code: string, message: string}>  $reasons
+     */
+    public static function visible(
+        ?int $maximumQuantity,
+        array $allowedActions,
+        array $reasons,
+    ): self {
+        return new self(true, $maximumQuantity, $allowedActions, $reasons);
+    }
+
+    public function isVisible(): bool
+    {
+        return $this->visible;
+    }
+
+    /** @return array<string, mixed> */
+    public function toArray(): array
+    {
+        if (! $this->visible) {
+            return [
+                'state' => 'hidden',
+                'reasons' => $this->reasons,
+            ];
+        }
+
+        return [
+            'state' => 'visible',
+            'maximum_quantity' => $this->maximumQuantity,
+            'allowed_actions' => array_map(
+                fn (CatalogAction $action): string => $action->value,
+                $this->allowedActions,
+            ),
+            'reasons' => $this->reasons,
+        ];
+    }
+}

app/Domains/Catalog/Services/AvailabilityPolicyResolver.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Enums\AvailabilityEffect;
+use App\Domains\Catalog\Enums\CatalogAction;
+
+final class AvailabilityPolicyResolver
+{
+    /** @return array{effect: AvailabilityEffect, denied_actions: list<CatalogAction>} */
+    public function resolve(string $restrictionCode): array
+    {
+        /** @var array{effect?: string, denied_actions?: list<string>} $configured */
+        $configured = config("catalog.availability.rules.{$restrictionCode}", []);
+
+        return [
+            'effect' => AvailabilityEffect::from(
+                $configured['effect'] ?? AvailabilityEffect::Notice->value,
+            ),
+            'denied_actions' => array_map(
+                fn (string $action): CatalogAction => CatalogAction::from($action),
+                $configured['denied_actions'] ?? [],
+            ),
+        ];
+    }
+}

app/Domains/Catalog/Services/CatalogInventoryService.php

@@ -25,24 +25,6 @@ class CatalogInventoryService
         );
     }
 
-    /**
-     * @return array<int, array{quantity: int, tracks_inventory: bool}>
-     */
-    public function detailedRequirementsFor(CatalogItem|Variant $selection, int $quantity = 1): array
-    {
-        if ($quantity <= 0) {
-            throw new \InvalidArgumentException('La cantidad debe ser mayor a cero.');
-        }
-
-        return array_map(
-            fn (array $requirement): array => [
-                ...$requirement,
-                'quantity' => $requirement['quantity'] * $quantity,
-            ],
-            $this->inventoryRequirements($selection),
-        );
-    }
-
     public function availableQuantity(CatalogItem|Variant $selection): ?int
     {
         if ($selection instanceof CatalogItem

app/Domains/Catalog/Services/CatalogItemAllowanceService.php

@@ -2,6 +2,8 @@
 
 namespace App\Domains\Catalog\Services;
 
+use App\Domains\Catalog\Enums\AvailabilityEffect;
+use App\Domains\Catalog\Enums\CatalogAction;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Purchase\Services\UserPurchaseLimitService;
 use Illuminate\Support\Collection;
@@ -14,6 +16,7 @@ class CatalogItemAllowanceService
 
     public function __construct(
         private readonly UserPurchaseLimitService $purchaseLimits,
+        private readonly AvailabilityPolicyResolver $policies,
     ) {}
 
     /** @param Collection<int, CatalogItem> $catalogItems */
@@ -42,16 +45,82 @@ class CatalogItemAllowanceService
         return min($availableStock, $remainingUserQuota);
     }
 
-    public function unavailableMessage(?int $availableStock, ?int $remainingUserQuota): ?string
-    {
+    public function availability(
+        ?int $availableStock,
+        ?int $remainingUserQuota,
+    ): AvailabilityDecision {
+        $reasons = [];
+
         if ($remainingUserQuota !== null && $remainingUserQuota <= 0) {
-            return self::USER_QUOTA_REACHED_MESSAGE;
+            $reasons[] = [
+                'code' => 'user_quota_reached',
+                'message' => self::USER_QUOTA_REACHED_MESSAGE,
+            ];
         }
 
         if ($availableStock !== null && $availableStock <= 0) {
-            return self::OUT_OF_STOCK_MESSAGE;
+            $reasons[] = [
+                'code' => 'out_of_stock',
+                'message' => self::OUT_OF_STOCK_MESSAGE,
+            ];
         }
 
-        return null;
+        return $this->decision(
+            $this->maximumAddableQuantity($availableStock, $remainingUserQuota),
+            $reasons,
+        );
+    }
+
+    public function purchaseLimitExceededAvailability(
+        int $maximumQuantity,
+        string $message,
+    ): AvailabilityDecision {
+        $reasons = [];
+
+        if ($maximumQuantity <= 0) {
+            $reasons[] = [
+                'code' => 'user_quota_reached',
+                'message' => self::USER_QUOTA_REACHED_MESSAGE,
+            ];
+        } else {
+            $reasons[] = [
+                'code' => 'requested_quantity_exceeds_user_quota',
+                'message' => $message,
+            ];
+        }
+
+        return $this->decision($maximumQuantity, $reasons);
+    }
+
+    /**
+     * @param  list<array{code: string, message: string}>  $reasons
+     */
+    private function decision(?int $maximumQuantity, array $reasons): AvailabilityDecision
+    {
+        /** @var list<string> $configuredActions */
+        $configuredActions = config('catalog.availability.default_actions', []);
+        $allowedActions = collect($configuredActions)
+            ->map(fn (string $action): CatalogAction => CatalogAction::from($action));
+
+        foreach ($reasons as $reason) {
+            $policy = $this->policies->resolve($reason['code']);
+
+            if ($policy['effect'] === AvailabilityEffect::Hide) {
+                return AvailabilityDecision::hidden($reasons);
+            }
+
+            if ($policy['effect'] === AvailabilityEffect::Restrict) {
+                $deniedActions = $policy['denied_actions'];
+                $allowedActions = $allowedActions->reject(
+                    fn (CatalogAction $action): bool => in_array($action, $deniedActions, true),
+                );
+            }
+        }
+
+        return AvailabilityDecision::visible(
+            $maximumQuantity,
+            $allowedActions->values()->all(),
+            $reasons,
+        );
     }
 }

app/Domains/Catalog/Services/CatalogService.php

@@ -22,7 +22,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class CatalogService
 {
-    public function __construct(protected AttachmentService $attachmentService) {}
+    public function __construct(
+        protected AttachmentService $attachmentService,
+        private readonly VisibleCatalogItemsQuery $visibleCatalogItems,
+    ) {}
 
     /**
      * @param  array<string, mixed>  $data
@@ -205,13 +208,6 @@ class CatalogService
         ]);
 
         $visibleVariants = $catalogItem->visibleVariants();
-        if ($catalogItem->type === CatalogItemType::Standard
-            && ($catalogItem->inventory_id !== null || $catalogItem->variants->isNotEmpty())
-            && ! $catalogItem->isAvailable()) {
-            throw new NotFoundHttpException('Catalog item is out of stock.');
-        }
-
-        $catalogItem->setRelation('variants', $visibleVariants);
         $selectedVariant = $variantId === null
             ? $visibleVariants->first()
             : $visibleVariants->firstWhere('id', $variantId);
@@ -236,9 +232,8 @@ class CatalogService
         $containsPattern = "%{$normalizedTerm}%";
         $startsWithPattern = "{$normalizedTerm}%";
 
-        $paginator = CatalogItem::query()
+        $query = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
-            ->whereAvailable()
             ->where(function (Builder $query) use ($containsPattern): void {
                 $query
                     ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
@@ -265,7 +260,10 @@ class CatalogService
                 'variants.definitions.itemAttribute.attribute.options',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
-            ])
+            ]);
+
+        $paginator = $this->visibleCatalogItems
+            ->apply($query)
             ->orderByRaw(
                 'CASE WHEN LOWER(nombre) = ? THEN 0 WHEN LOWER(nombre) LIKE ? THEN 1 ELSE 2 END',
                 [$normalizedTerm, $startsWithPattern],
@@ -285,10 +283,9 @@ class CatalogService
         int $perPage,
         int $page,
     ): LengthAwarePaginator {
-        return CatalogItem::query()
+        $query = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('category_id', $category->id)
-            ->whereAvailable()
             ->with([
                 'attachments',
                 'inventory',
@@ -300,7 +297,10 @@ class CatalogService
                 'variants.definitions.itemAttribute.attribute.options',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
-            ])
+            ]);
+
+        return $this->visibleCatalogItems
+            ->apply($query)
             ->orderBy('nombre')
             ->paginate(perPage: $perPage, pageName: 'page', page: $page);
     }

app/Domains/Catalog/Services/ExpireStockReservationsService.php

@@ -2,184 +2,50 @@
 
 namespace App\Domains\Catalog\Services;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
-use Illuminate\Support\Facades\DB;
+use App\Domains\Cart\Services\ExpireCartReservationsService;
+use App\Domains\Purchase\Services\CheckoutService;
 use Illuminate\Support\Facades\Log;
-use RuntimeException;
 use Throwable;
 
 class ExpireStockReservationsService
 {
-    private const BATCH_SIZE = 500;
-
     public function __construct(
-        private readonly ReleaseCheckoutService $purchases,
-        private readonly StockReservationService $reservations,
+        private readonly CheckoutService $checkout,
+        private readonly ExpireCartReservationsService $carts,
     ) {}
 
     /**
-     * @return array{purchases: int, cart_reservations: int, orphan_reservations: int, failed: int}
+     * @return array{purchases: int, cart_items: int}
      */
     public function expireOverdue(): array
     {
-        $summary = [
-            'purchases' => 0,
-            'cart_reservations' => 0,
-            'orphan_reservations' => 0,
-            'failed' => 0,
-        ];
-        $lastReservationId = 0;
+        $expiredPurchases = null;
+        $expiredCartItems = null;
 
-        do {
-            $reservationIds = StockReservation::query()
-                ->where('status', StockReservation::STATUS_ACTIVE)
-                ->whereNotNull('expires_at')
-                ->where('expires_at', '<=', now())
-                ->where('id', '>', $lastReservationId)
-                ->orderBy('id')
-                ->limit(self::BATCH_SIZE)
-                ->pluck('id');
+        try {
+            $expiredPurchases = $this->checkout->expireOverduePurchases();
+            $expiredCartItems = $this->carts->expireOverdue();
 
-            foreach ($reservationIds as $reservationId) {
-                $lastReservationId = (int) $reservationId;
+            Log::channel('commands')->info('Stock reservation cleanup completed.', [
+                'command' => 'reservations:expire',
+                'expired_purchases' => $expiredPurchases,
+                'expired_cart_items' => $expiredCartItems,
+                'total_expired' => $expiredPurchases + $expiredCartItems,
+            ]);
 
-                try {
-                    $owner = $this->expireReservation($lastReservationId);
-                    if ($owner !== null) {
-                        $summary[$owner]++;
-                    }
-                } catch (Throwable $exception) {
-                    $summary['failed']++;
-                    Log::channel('commands')->error('Failed to expire overdue stock reservation.', [
-                        'command' => 'reservations:expire',
-                        'stock_reservation_id' => $lastReservationId,
-                        'exception' => $exception,
-                    ]);
-                }
-            }
-        } while ($reservationIds->count() === self::BATCH_SIZE);
+            return [
+                'purchases' => $expiredPurchases,
+                'cart_items' => $expiredCartItems,
+            ];
+        } catch (Throwable $exception) {
+            Log::channel('commands')->error('Stock reservation cleanup failed.', [
+                'command' => 'reservations:expire',
+                'expired_purchases' => $expiredPurchases,
+                'expired_cart_items' => $expiredCartItems,
+                'exception' => $exception,
+            ]);
 
-        Log::channel('commands')->info('Stock reservation cleanup completed.', [
-            'command' => 'reservations:expire',
-            'expired_purchases' => $summary['purchases'],
-            'expired_cart_reservations' => $summary['cart_reservations'],
-            'expired_orphan_reservations' => $summary['orphan_reservations'],
-            'failed_reservations' => $summary['failed'],
-            'total_expired' => $summary['purchases']
-                + $summary['cart_reservations']
-                + $summary['orphan_reservations'],
-        ]);
-
-        return $summary;
-    }
-
-    public function expireIfOverdue(int $reservationId): bool
-    {
-        /** @var StockReservation|null $reservation */
-        $reservation = StockReservation::query()->find($reservationId);
-        if ($reservation?->status === StockReservation::STATUS_EXPIRED) {
-            return true;
+            throw $exception;
         }
-        if (! $this->isOverdue($reservation)) {
-            return false;
-        }
-
-        return $this->expireReservation($reservationId) !== null;
-    }
-
-    /** @return 'purchases'|'cart_reservations'|'orphan_reservations'|null */
-    private function expireReservation(int $reservationId): ?string
-    {
-        $purchaseId = Purchase::query()
-            ->where('stock_reservation_id', $reservationId)
-            ->value('id');
-        if ($purchaseId !== null) {
-            return $this->expirePurchase((int) $purchaseId);
-        }
-
-        $cartId = Cart::query()
-            ->where('current_stock_reservation_id', $reservationId)
-            ->where('status', 'active')
-            ->value('id');
-        if ($cartId !== null) {
-            return $this->expireCart((int) $cartId, $reservationId);
-        }
-
-        return $this->expireOrphan($reservationId);
-    }
-
-    /** @return 'purchases'|null */
-    private function expirePurchase(int $purchaseId): ?string
-    {
-        /** @var Purchase|null $purchase */
-        $purchase = Purchase::query()->find($purchaseId);
-        if ($purchase === null) {
-            return null;
-        }
-
-        $purchase = $this->purchases->expire($purchase);
-        if ($purchase->status === Purchase::STATUS_EXPIRED) {
-            return 'purchases';
-        }
-
-        $reservation = $purchase->stockReservation;
-        if ($this->isOverdue($reservation)) {
-            throw new RuntimeException('An overdue active reservation belongs to a purchase that cannot expire.');
-        }
-
-        return null;
-    }
-
-    /** @return 'cart_reservations'|null */
-    private function expireCart(int $cartId, int $reservationId): ?string
-    {
-        return DB::transaction(function () use ($cartId, $reservationId): ?string {
-            /** @var Cart|null $cart */
-            $cart = Cart::query()
-                ->whereKey($cartId)
-                ->where('current_stock_reservation_id', $reservationId)
-                ->where('status', Cart::STATUS_ACTIVE)
-                ->lockForUpdate()
-                ->first();
-            if ($cart === null) {
-                return null;
-            }
-
-            /** @var StockReservation|null $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->find($reservationId);
-            if (! $this->isOverdue($reservation)) {
-                return null;
-            }
-
-            $this->reservations->expire($reservation);
-            $cart->update(['status' => Cart::STATUS_EXPIRED]);
-
-            return 'cart_reservations';
-        });
-    }
-
-    /** @return 'orphan_reservations'|null */
-    private function expireOrphan(int $reservationId): ?string
-    {
-        /** @var StockReservation|null $reservation */
-        $reservation = StockReservation::query()->find($reservationId);
-        if (! $this->isOverdue($reservation)) {
-            return null;
-        }
-
-        $this->reservations->expire($reservation);
-
-        return 'orphan_reservations';
-    }
-
-    private function isOverdue(?StockReservation $reservation): bool
-    {
-        return $reservation !== null
-            && $reservation->status === StockReservation::STATUS_ACTIVE
-            && $reservation->expires_at !== null
-            && ! $reservation->expires_at->isFuture();
     }
 }

app/Domains/Catalog/Services/FeaturedGroupService.php

@@ -17,6 +17,7 @@ class FeaturedGroupService
     /** @return array<array-key, mixed> */
     public function __construct(
         private readonly CatalogItemAllowanceService $allowances,
+        private readonly VisibleCatalogItemsQuery $visibleCatalogItems,
     ) {}
 
     public function itemsResponse(FeaturedGroup $featuredGroup, int $page, ?int $userId = null): array
@@ -49,7 +50,6 @@ class FeaturedGroupService
     {
         $query = CatalogItem::query()
             ->where('catalog_items.tenant_code', $featuredGroup->tenant_code)
-            ->whereAvailable()
             ->where(function (Builder $query): void {
                 $query
                     ->whereDoesntHave('category')
@@ -72,6 +72,8 @@ class FeaturedGroupService
                 'bundleComponents.variant.catalogItem',
             ]);
 
+        $query = $this->visibleCatalogItems->apply($query);
+
         return match ($featuredGroup->source_type) {
             FeaturedGroupSource::Manual => $query
                 ->select('catalog_items.*')
@@ -82,9 +84,7 @@ class FeaturedGroupService
             FeaturedGroupSource::Category => $query
                 ->where('catalog_items.category_id', $featuredGroup->category_id)
                 ->orderBy('catalog_items.id'),
-            FeaturedGroupSource::All => $query
-                ->orderBy('catalog_items.group_order')
-                ->orderBy('catalog_items.id'),
+            FeaturedGroupSource::All => $query->orderBy('catalog_items.id'),
         };
     }
 

app/Domains/Catalog/Services/StockReservationService.php

@@ -2,486 +2,262 @@
 
 namespace App\Domains\Catalog\Services;
 
-use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Models\Inventory;
+use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\StockReservationLine;
+use App\Domains\Catalog\Models\Variant;
 use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 class StockReservationService
 {
-    public const REASON_CART_EMPTY = 'cart_empty';
-
-    public const REASON_CART_CHANGED = 'cart_changed';
-
-    public const REASON_PURCHASE_SUPERSEDED = 'purchase_superseded';
-
-    public const REASON_PURCHASE_CANCELLED = 'purchase_cancelled';
-
-    public const REASON_PAYMENT_REJECTED = 'payment_rejected';
-
-    public const REASON_MANUAL_RELEASE = 'manual_release';
-
     public function __construct(
         private readonly CatalogInventoryService $inventory,
     ) {}
 
-    public function syncCart(Cart $cart): ?StockReservation
+    public function reserve(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
     {
-        return DB::transaction(function () use ($cart): ?StockReservation {
-            /** @var Cart $lockedCart */
-            $lockedCart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            $items = $lockedCart->items()->orderBy('id')->lockForUpdate()->get();
-            $this->loadSelections($items);
-            $requirements = $this->requirementsForItems($items);
+        DB::transaction(function () use ($cartItem, $selection, $quantity): void {
+            $this->inventory->reserve($selection, $quantity);
+            $this->recordIncrease($cartItem, $selection, $quantity);
+        });
+    }
 
-            $reservation = $lockedCart->current_stock_reservation_id === null
-                ? null
-                : StockReservation::query()->lockForUpdate()->find($lockedCart->current_stock_reservation_id);
+    public function release(
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
+        int $quantity,
+        string $releasedStatus = StockReservation::STATUS_RELEASED,
+    ): void {
+        DB::transaction(function () use ($cartItem, $selection, $quantity, $releasedStatus): void {
+            $this->ensure($cartItem, $selection);
+            $this->inventory->release($selection, $quantity);
+            $this->recordDecrease($cartItem, $selection, $quantity, $releasedStatus);
+        });
+    }
 
-            if ($reservation !== null) {
-                $this->assertUsableCartReservation($reservation);
-            }
+    public function commit(
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
+        Purchase $purchase,
+    ): void {
+        DB::transaction(function () use ($cartItem, $selection, $purchase): void {
+            $this->ensure($cartItem, $selection);
+            $this->inventory->commit($selection, (int) $cartItem->cantidad);
 
-            if ($requirements === []) {
-                if ($reservation !== null && $reservation->status === StockReservation::STATUS_ACTIVE) {
-                    $this->finalizeLocked(
-                        $reservation,
-                        StockReservation::STATUS_RELEASED,
-                        self::REASON_CART_EMPTY,
-                    );
+            $requirements = $this->inventory->requirementsFor($selection, (int) $cartItem->cantidad);
+            foreach ($requirements as $inventoryId => $quantity) {
+                $reservation = $this->lockReservation($cartItem, $inventoryId);
+                if (
+                    $reservation === null
+                    || $reservation->status !== StockReservation::STATUS_ACTIVE
+                    || $reservation->purchase_id !== $purchase->getKey()
+                    || $reservation->quantity !== $quantity
+                ) {
+                    throw new \InvalidArgumentException('La reserva de stock no coincide con el item del carrito.');
                 }
 
-                $lockedCart->update(['current_stock_reservation_id' => null]);
-                $cart->current_stock_reservation_id = null;
-
-                return null;
+                $reservation->update([
+                    'status' => StockReservation::STATUS_COMMITTED,
+                    'committed_at' => now(),
+                    'expires_at' => null,
+                ]);
             }
+        });
+    }
+
+    public function ensure(CartItem $cartItem, CatalogItem|Variant $selection): void
+    {
+        $requirements = $this->inventory->requirementsFor($selection, (int) $cartItem->cantidad);
+
+        foreach ($requirements as $inventoryId => $quantity) {
+            $reservation = $this->lockReservation($cartItem, $inventoryId);
 
             if ($reservation === null) {
-                $reservation = StockReservation::query()->create([
+                StockReservation::query()->create([
+                    'inventory_id' => $inventoryId,
+                    'cart_item_id' => $cartItem->getKey(),
+                    'quantity' => $quantity,
                     'status' => StockReservation::STATUS_ACTIVE,
                     'expires_at' => $this->expiration(),
                 ]);
-                $lockedCart->update(['current_stock_reservation_id' => $reservation->getKey()]);
+
+                continue;
             }
 
-            if (Purchase::query()->where('stock_reservation_id', $reservation->getKey())->exists()) {
-                throw new \InvalidArgumentException('La reserva vinculada a una compra no se puede modificar.');
+            if ($reservation->status !== StockReservation::STATUS_ACTIVE || $reservation->quantity !== $quantity) {
+                $reservation->update([
+                    'quantity' => $quantity,
+                    'status' => StockReservation::STATUS_ACTIVE,
+                    'committed_at' => null,
+                    'released_at' => null,
+                    'expires_at' => $this->expiration(),
+                ]);
             }
-
-            $currentLines = StockReservationLine::query()
-                ->where('stock_reservation_id', $reservation->getKey())
-                ->orderBy('inventory_id')
-                ->lockForUpdate()
-                ->get()
-                ->keyBy('inventory_id');
-            $inventoryIds = collect(array_keys($requirements))
-                ->merge($currentLines->keys())
-                ->map(fn ($id): int => (int) $id)
-                ->unique()
-                ->sort()
-                ->values();
-            $inventories = Inventory::query()
-                ->whereKey($inventoryIds)
-                ->orderBy('id')
-                ->lockForUpdate()
-                ->get()
-                ->keyBy('id');
-
-            foreach ($inventoryIds as $inventoryId) {
-                $inventory = $inventories->get($inventoryId)
-                    ?? throw new \InvalidArgumentException('No se encontró el inventario requerido.');
-                $previous = (int) ($currentLines->get($inventoryId)?->quantity ?? 0);
-                $required = (int) ($requirements[$inventoryId]['quantity'] ?? 0);
-                $delta = $required - $previous;
-
-                if ($delta > 0
-                    && $requirements[$inventoryId]['tracks_inventory']
-                    && $inventory->availableStock() < $delta) {
-                    throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar el carrito.');
-                }
-
-                if ($delta < 0 && $inventory->reserved_stock < abs($delta)) {
-                    throw new \InvalidArgumentException('La reserva de stock del carrito es inconsistente.');
-                }
-            }
-
-            foreach ($inventoryIds as $inventoryId) {
-                /** @var Inventory $inventory */
-                $inventory = $inventories->get($inventoryId);
-                $line = $currentLines->get($inventoryId);
-                $previous = (int) ($line?->quantity ?? 0);
-                $required = (int) ($requirements[$inventoryId]['quantity'] ?? 0);
-                $delta = $required - $previous;
-
-                if ($delta > 0) {
-                    $inventory->reserve($delta, $requirements[$inventoryId]['tracks_inventory']);
-                } elseif ($delta < 0) {
-                    $inventory->release(abs($delta));
-                }
-
-                if ($required === 0) {
-                    $line?->delete();
-
-                    continue;
-                }
-
-                StockReservationLine::query()->updateOrCreate(
-                    [
-                        'stock_reservation_id' => $reservation->getKey(),
-                        'inventory_id' => $inventoryId,
-                    ],
-                    [
-                        'quantity' => $required,
-                        'tracks_inventory' => $requirements[$inventoryId]['tracks_inventory'],
-                    ],
-                );
-            }
-
-            $reservation->update([
-                'expires_at' => $this->expiration(),
-                'release_reason' => null,
-            ]);
-            $cart->current_stock_reservation_id = $reservation->getKey();
-
-            return $reservation->fresh('lines');
-        });
+        }
     }
 
     public function attachToPurchase(
-        Cart $cart,
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
         Purchase $purchase,
-        Carbon $expiresAt,
-    ): StockReservation {
-        return DB::transaction(function () use ($cart, $purchase, $expiresAt): StockReservation {
-            /** @var Cart $lockedCart */
-            $lockedCart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            /** @var Purchase $lockedPurchase */
-            $lockedPurchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-
-            if ($lockedCart->current_stock_reservation_id === null) {
-                throw new \InvalidArgumentException('El carrito no tiene una reserva de stock activa.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->findOrFail($lockedCart->current_stock_reservation_id);
-            $this->assertUsableCartReservation($reservation);
-
-            $linkedPurchase = Purchase::query()
-                ->where('stock_reservation_id', $reservation->getKey())
-                ->whereKeyNot($lockedPurchase->getKey())
-                ->exists();
-            if ($linkedPurchase) {
-                throw new \InvalidArgumentException('La reserva de stock ya pertenece a otra compra.');
-            }
-
-            $lockedPurchase->update(['stock_reservation_id' => $reservation->getKey()]);
-            $reservation->update(['expires_at' => $expiresAt]);
-            $purchase->stock_reservation_id = $reservation->getKey();
-            $cart->current_stock_reservation_id = $reservation->getKey();
-
-            return $reservation->fresh('lines');
+    ): void {
+        DB::transaction(function () use ($cartItem, $selection, $purchase): void {
+            $this->ensure($cartItem, $selection);
+            StockReservation::query()
+                ->where('cart_item_id', $cartItem->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->update([
+                    'purchase_id' => $purchase->getKey(),
+                    'expires_at' => $purchase->expires_at,
+                ]);
         });
     }
 
-    public function commit(Purchase $purchase): void
+    public function detachFromPurchase(Purchase $purchase): void
     {
-        DB::transaction(function () use ($purchase): void {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            if ($purchase->stock_reservation_id === null) {
-                throw new \InvalidArgumentException('La compra no tiene una reserva de stock.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->findOrFail($purchase->stock_reservation_id);
-            if ($reservation->status === StockReservation::STATUS_COMMITTED) {
-                return;
-            }
-            if ($reservation->status !== StockReservation::STATUS_ACTIVE) {
-                throw new \InvalidArgumentException('La reserva de stock no está activa.');
-            }
-            if ($reservation->expires_at !== null && ! $reservation->expires_at->isFuture()) {
-                throw new StockReservationExpiredException;
-            }
-
-            $lines = $this->lockLines($reservation);
-            if ($lines->isEmpty()) {
-                throw new \InvalidArgumentException('La reserva de stock no tiene inventarios.');
-            }
-
-            $inventories = $this->lockInventories($lines);
-            foreach ($lines as $line) {
-                $inventory = $inventories->get($line->inventory_id)
-                    ?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
-                if ($inventory->reserved_stock < $line->quantity
-                    || ($line->tracks_inventory && $inventory->real_stock < $line->quantity)) {
-                    throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.');
-                }
-            }
-
-            foreach ($lines as $line) {
-                $inventories->get($line->inventory_id)->buy(
-                    (int) $line->quantity,
-                    (bool) $line->tracks_inventory,
-                );
-            }
-
-            $reservation->update([
-                'status' => StockReservation::STATUS_COMMITTED,
-                'expires_at' => null,
-                'committed_at' => now(),
-                'released_at' => null,
-                'expired_at' => null,
-                'release_reason' => null,
+        StockReservation::query()
+            ->where('purchase_id', $purchase->getKey())
+            ->where('status', StockReservation::STATUS_ACTIVE)
+            ->update([
+                'purchase_id' => null,
+                'expires_at' => $this->expiration(),
             ]);
-        });
     }
 
-    public function releaseForPurchase(
-        Purchase $purchase,
-        string $status = StockReservation::STATUS_RELEASED,
-        ?string $reason = null,
-    ): void {
-        DB::transaction(function () use ($purchase, $status, $reason): void {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            if ($purchase->stock_reservation_id === null) {
-                return;
-            }
-
-            /** @var StockReservation|null $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->find($purchase->stock_reservation_id);
-            if ($reservation !== null) {
-                $this->finalizeLocked($reservation, $status, $reason);
-            }
-        });
-    }
-
-    public function returnToCart(Purchase $purchase, Cart $cart): StockReservation
+    public function restore(CartItem $cartItem, CatalogItem|Variant $selection): void
     {
-        return DB::transaction(function () use ($purchase, $cart): StockReservation {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            /** @var Cart $cart */
-            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-
-            if ($purchase->stock_reservation_id === null
-                || $cart->current_stock_reservation_id !== $purchase->stock_reservation_id) {
-                throw new \InvalidArgumentException('La compra y el carrito no comparten la reserva activa.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()
+        DB::transaction(function () use ($cartItem, $selection): void {
+            $requirements = $this->inventory->requirementsFor(
+                $selection,
+                (int) $cartItem->cantidad,
+            );
+            $activeReservations = StockReservation::query()
+                ->where('cart_item_id', $cartItem->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
                 ->lockForUpdate()
-                ->findOrFail($purchase->stock_reservation_id);
-            $this->assertUsableCartReservation($reservation);
+                ->get()
+                ->keyBy('inventory_id');
 
-            $purchase->update(['stock_reservation_id' => null]);
-            $cart->update(['current_purchase_id' => null]);
-            $reservation->update(['expires_at' => $this->expiration()]);
+            $hasCompleteReservation = collect($requirements)->every(
+                fn (int $quantity, int $inventoryId): bool => (int) ($activeReservations->get($inventoryId)?->quantity ?? 0) === $quantity,
+            );
 
-            return $reservation->fresh('lines');
-        });
-    }
-
-    public function assertCartReservationUsable(Cart $cart): void
-    {
-        DB::transaction(function () use ($cart): void {
-            /** @var Cart $cart */
-            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            if ($cart->current_stock_reservation_id === null) {
+            if ($hasCompleteReservation) {
                 return;
             }
 
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()
+            if ($activeReservations->isNotEmpty()) {
+                throw new \InvalidArgumentException('La reserva de stock del carrito es inconsistente.');
+            }
+
+            $this->inventory->reserve($selection, (int) $cartItem->cantidad);
+            $this->recordIncrease($cartItem, $selection, (int) $cartItem->cantidad);
+        });
+    }
+
+    public function syncPurchaseExpiration(Purchase $purchase): void
+    {
+        StockReservation::query()
+            ->where('purchase_id', $purchase->getKey())
+            ->where('status', StockReservation::STATUS_ACTIVE)
+            ->update(['expires_at' => $purchase->expires_at]);
+    }
+
+    public function transfer(CartItem $source, CartItem $target): void
+    {
+        DB::transaction(function () use ($source, $target): void {
+            $sourceReservations = StockReservation::query()
+                ->where('cart_item_id', $source->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->orderBy('inventory_id')
                 ->lockForUpdate()
-                ->findOrFail($cart->current_stock_reservation_id);
-            $this->assertUsableCartReservation($reservation);
-        });
-    }
+                ->get();
 
-    public function releaseCurrentCartReservation(
-        Cart $cart,
-        string $reason = self::REASON_CART_CHANGED,
-    ): void {
-        DB::transaction(function () use ($cart, $reason): void {
-            /** @var Cart $cart */
-            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            if ($cart->current_stock_reservation_id === null) {
-                return;
-            }
+            foreach ($sourceReservations as $sourceReservation) {
+                $targetReservation = $this->lockReservation($target, (int) $sourceReservation->inventory_id);
 
-            /** @var StockReservation|null $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->find($cart->current_stock_reservation_id);
-            if ($reservation !== null) {
-                $this->finalizeLocked($reservation, StockReservation::STATUS_RELEASED, $reason);
-            }
-            $cart->update(['current_stock_reservation_id' => null]);
-        });
-    }
-
-    public function expire(StockReservation $reservation): void
-    {
-        DB::transaction(function () use ($reservation): void {
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->findOrFail($reservation->getKey());
-            if ($reservation->status !== StockReservation::STATUS_ACTIVE
-                || $reservation->expires_at === null
-                || $reservation->expires_at->isFuture()) {
-                return;
-            }
-
-            $this->finalizeLocked($reservation, StockReservation::STATUS_EXPIRED, null);
-        });
-    }
-
-    public function clearExpirationForReview(Purchase $purchase): void
-    {
-        DB::transaction(function () use ($purchase): void {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            if ($purchase->stock_reservation_id === null) {
-                throw new \InvalidArgumentException('La compra no tiene una reserva de stock.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()
-                ->lockForUpdate()
-                ->findOrFail($purchase->stock_reservation_id);
-            if ($reservation->status !== StockReservation::STATUS_ACTIVE) {
-                throw new \InvalidArgumentException('La reserva de stock no está activa.');
-            }
-            if ($reservation->expires_at !== null && ! $reservation->expires_at->isFuture()) {
-                throw new StockReservationExpiredException;
-            }
-
-            $reservation->update(['expires_at' => null]);
-        });
-    }
-
-    /**
-     * @param  Collection<int, CartItem>  $items
-     * @return array<int, array{quantity: int, tracks_inventory: bool}>
-     */
-    private function requirementsForItems(Collection $items): array
-    {
-        $requirements = [];
-        foreach ($items as $item) {
-            $selection = $item->selectedItem();
-            if ($selection === null) {
-                throw new \InvalidArgumentException('El carrito contiene un item de catálogo inexistente.');
-            }
-
-            foreach ($this->inventory->detailedRequirementsFor($selection, (int) $item->cantidad) as $inventoryId => $requirement) {
-                if (isset($requirements[$inventoryId])) {
-                    $requirements[$inventoryId]['quantity'] += $requirement['quantity'];
-                    $requirements[$inventoryId]['tracks_inventory'] =
-                        $requirements[$inventoryId]['tracks_inventory'] || $requirement['tracks_inventory'];
+                if ($targetReservation === null) {
+                    $sourceItemQuantity = (int) $source->cantidad;
+                    $targetItemQuantity = (int) $target->fresh()->cantidad;
+                    $perItemQuantity = intdiv((int) $sourceReservation->quantity, $sourceItemQuantity);
+                    $sourceReservation->update([
+                        'cart_item_id' => $target->getKey(),
+                        'purchase_id' => null,
+                        'quantity' => $perItemQuantity * $targetItemQuantity,
+                        'expires_at' => $this->expiration(),
+                    ]);
 
                     continue;
                 }
 
-                $requirements[$inventoryId] = $requirement;
+                $targetReservation->update([
+                    'quantity' => $targetReservation->quantity + $sourceReservation->quantity,
+                    'status' => StockReservation::STATUS_ACTIVE,
+                    'expires_at' => $this->expiration(),
+                ]);
+                $sourceReservation->delete();
             }
+        });
+    }
+
+    private function recordIncrease(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
+    {
+        foreach ($this->inventory->requirementsFor($selection, $quantity) as $inventoryId => $requiredQuantity) {
+            $reservation = $this->lockReservation($cartItem, $inventoryId);
+
+            if ($reservation === null) {
+                StockReservation::query()->create([
+                    'inventory_id' => $inventoryId,
+                    'cart_item_id' => $cartItem->getKey(),
+                    'quantity' => $requiredQuantity,
+                    'status' => StockReservation::STATUS_ACTIVE,
+                    'expires_at' => $this->expiration(),
+                ]);
+
+                continue;
+            }
+
+            $reservation->update([
+                'quantity' => ($reservation->status === StockReservation::STATUS_ACTIVE ? $reservation->quantity : 0) + $requiredQuantity,
+                'status' => StockReservation::STATUS_ACTIVE,
+                'committed_at' => null,
+                'released_at' => null,
+                'expires_at' => $this->expiration(),
+            ]);
         }
-
-        ksort($requirements);
-
-        return $requirements;
     }
 
-    /** @param Collection<int, CartItem> $items */
-    private function loadSelections(Collection $items): void
-    {
-        $items->load([
-            'catalogItem.inventory',
-            'catalogItem.bundleComponents.catalogItem.inventory',
-            'catalogItem.bundleComponents.variant.inventory',
-            'catalogItem.bundleComponents.variant.catalogItem',
-            'variant.inventory',
-            'variant.catalogItem',
-        ]);
-    }
-
-    /** @return Collection<int, StockReservationLine> */
-    private function lockLines(StockReservation $reservation): Collection
-    {
-        return StockReservationLine::query()
-            ->where('stock_reservation_id', $reservation->getKey())
-            ->orderBy('inventory_id')
-            ->lockForUpdate()
-            ->get();
-    }
-
-    /**
-     * @param  Collection<int, StockReservationLine>  $lines
-     * @return Collection<int, Inventory>
-     */
-    private function lockInventories(Collection $lines): Collection
-    {
-        return Inventory::query()
-            ->whereKey($lines->pluck('inventory_id'))
-            ->orderBy('id')
-            ->lockForUpdate()
-            ->get()
-            ->keyBy('id');
-    }
-
-    private function finalizeLocked(
-        StockReservation $reservation,
-        string $status,
-        ?string $reason,
+    private function recordDecrease(
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
+        int $quantity,
+        string $releasedStatus,
     ): void {
-        if ($reservation->status !== StockReservation::STATUS_ACTIVE) {
-            return;
-        }
-        if (! in_array($status, [StockReservation::STATUS_RELEASED, StockReservation::STATUS_EXPIRED], true)) {
-            throw new \InvalidArgumentException('El estado final de la reserva no es válido.');
-        }
+        foreach ($this->inventory->requirementsFor($selection, $quantity) as $inventoryId => $requiredQuantity) {
+            $reservation = $this->lockReservation($cartItem, $inventoryId);
+            if ($reservation === null || $reservation->status !== StockReservation::STATUS_ACTIVE || $reservation->quantity < $requiredQuantity) {
+                throw new \InvalidArgumentException('La reserva de stock no alcanza para liberar la cantidad solicitada.');
+            }
 
-        $lines = $this->lockLines($reservation);
-        $inventories = $this->lockInventories($lines);
-        foreach ($lines as $line) {
-            $inventory = $inventories->get($line->inventory_id)
-                ?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
-            $inventory->release((int) $line->quantity);
-        }
-
-        $now = now();
-        $reservation->update([
-            'status' => $status,
-            'expires_at' => null,
-            'released_at' => $status === StockReservation::STATUS_RELEASED ? $now : null,
-            'expired_at' => $status === StockReservation::STATUS_EXPIRED ? $now : null,
-            'release_reason' => $status === StockReservation::STATUS_RELEASED ? $reason : null,
-        ]);
-
-        if ($status === StockReservation::STATUS_RELEASED) {
-            Cart::query()
-                ->where('current_stock_reservation_id', $reservation->getKey())
-                ->update(['current_stock_reservation_id' => null]);
+            $remaining = $reservation->quantity - $requiredQuantity;
+            $reservation->update([
+                'quantity' => $remaining,
+                'status' => $remaining === 0 ? $releasedStatus : StockReservation::STATUS_ACTIVE,
+                'released_at' => $remaining === 0 ? now() : null,
+                'expires_at' => $remaining === 0 ? null : $reservation->expires_at,
+            ]);
         }
     }
 
-    private function assertUsableCartReservation(StockReservation $reservation): void
+    private function lockReservation(CartItem $cartItem, int $inventoryId): ?StockReservation
     {
-        if ($reservation->status === StockReservation::STATUS_EXPIRED
-            || ($reservation->expires_at !== null && ! $reservation->expires_at->isFuture())) {
-            throw new StockReservationExpiredException;
-        }
-
-        if ($reservation->status !== StockReservation::STATUS_ACTIVE
-            || $reservation->expires_at === null) {
-            throw new \InvalidArgumentException('La reserva de stock no está disponible para operar el carrito.');
-        }
+        return StockReservation::query()
+            ->where('cart_item_id', $cartItem->getKey())
+            ->where('inventory_id', $inventoryId)
+            ->lockForUpdate()
+            ->first();
     }
 
     private function expiration(): Carbon

app/Domains/Catalog/Services/VariantSelectionService.php

@@ -10,6 +10,10 @@ use Illuminate\Support\Collection;
 
 class VariantSelectionService
 {
+    public function __construct(
+        private readonly CatalogItemAllowanceService $allowances,
+    ) {}
+
     /**
      * @param  array<string, mixed>  $selectedValues
      * @return array<string, mixed>
@@ -188,13 +192,17 @@ class VariantSelectionService
     /** @return array<string, mixed> */
     private function variantData(CatalogItem $catalogItem, Variant $variant): array
     {
+        $availableStock = $catalogItem->inventory_policy === InventoryPolicy::Unlimited
+            ? null
+            : $variant->inventory?->availableStock();
+
         return [
             'id' => $variant->id,
             'descripcion' => $variant->getDescription(),
             'precio' => number_format($variant->getPrice(), 2, '.', ''),
-            'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
-                ? null
-                : $variant->inventory?->availableStock(),
+            'availability' => $this->allowances
+                ->availability($availableStock, null)
+                ->toArray(),
             'values' => $variant->selectorOptions($catalogItem->itemAttributes),
         ];
     }

app/Domains/Catalog/Services/VisibleCatalogItemsQuery.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Enums\AvailabilityEffect;
+use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\CatalogItem;
+use Illuminate\Database\Eloquent\Builder;
+
+final class VisibleCatalogItemsQuery
+{
+    public function __construct(
+        private readonly AvailabilityPolicyResolver $policies,
+    ) {}
+
+    /** @param Builder<CatalogItem> $query */
+    public function apply(Builder $query): Builder
+    {
+        if ($this->policies->resolve('out_of_stock')['effect'] !== AvailabilityEffect::Hide) {
+            return $query;
+        }
+
+        return $query->where(function (Builder $query): void {
+            $query
+                ->where(fn (Builder $query) => $this->applyStandardItemAvailability($query))
+                ->orWhere(fn (Builder $query) => $this->applyBundleAvailability($query));
+        });
+    }
+
+    /** @param Builder<CatalogItem> $query */
+    private function applyStandardItemAvailability(Builder $query): Builder
+    {
+        return $query
+            ->where('catalog_items.type', CatalogItemType::Standard->value)
+            ->where(function (Builder $query): void {
+                $query
+                    ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
+                    ->orWhereHas(
+                        'inventory',
+                        fn (Builder $query): Builder => $query
+                            ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock'),
+                    )
+                    ->orWhereHas(
+                        'variants.inventory',
+                        fn (Builder $query): Builder => $query
+                            ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock'),
+                    );
+            });
+    }
+
+    /** @param Builder<CatalogItem> $query */
+    private function applyBundleAvailability(Builder $query): Builder
+    {
+        return $query
+            ->where('catalog_items.type', CatalogItemType::Bundle->value)
+            ->whereRaw(<<<'SQL'
+                NOT EXISTS (
+                    SELECT 1
+                    FROM bundle_components AS availability_components
+                    INNER JOIN catalog_items AS availability_items
+                        ON availability_items.id = availability_components.component_catalog_item_id
+                    LEFT JOIN variantes AS availability_variants
+                        ON availability_variants.id = availability_components.component_variant_id
+                    INNER JOIN inventories AS availability_inventories
+                        ON availability_inventories.id = COALESCE(
+                            availability_variants.inventory_id,
+                            availability_items.inventory_id
+                        )
+                    WHERE availability_components.bundle_catalog_item_id = catalog_items.id
+                        AND availability_items.inventory_policy = ?
+                    GROUP BY availability_inventories.id,
+                        availability_inventories.real_stock,
+                        availability_inventories.reserved_stock
+                    HAVING availability_inventories.real_stock
+                        - availability_inventories.reserved_stock
+                        < SUM(availability_components.quantity)
+                )
+                SQL, [InventoryPolicy::Tracked->value]);
+    }
+}

app/Domains/Catalog/documentacion/README.md

@@ -9,7 +9,7 @@ Modela y publica la oferta comercial del tenant: productos, variantes, categorí
 - `CatalogItem` es la raíz del producto y se relaciona con tenant, categoría, marca, inventario, variantes, atributos, adjuntos y grupos destacados.
 - `Variant`, `ItemAttribute`, `Attribute`, `AttributeOption` y `VariantDefinition` describen opciones comercializables.
 - `Inventory` administra stock disponible, reservado y comprado.
-- `StockReservation` representa la reserva completa de un carrito o checkout, con estados `active`, `committed`, `released` y `expired`. Su `expires_at` es el único reloj del bloqueo. Al expirar, también pasan a `expired` la compra pagable y el carrito asociados dentro de la misma transacción. Sus estados terminales nunca se reactivan ni se reemplazan implícitamente. Sus `StockReservationLine` agregan la cantidad requerida por inventario, incluso cuando varios ítems o bundles consumen el mismo stock.
+- `StockReservation` atribuye cada unidad reservada a un ítem de carrito y, durante checkout, a una compra, con estados `active`, `committed`, `released` y `expired`.
 - `Category` soporta jerarquía y categorías globales o propias del tenant.
 - `FeaturedGroup` y `FeaturedItem` organizan secciones destacadas.
 - `BundleComponent` representa los componentes de un paquete.
@@ -18,8 +18,7 @@ Modela y publica la oferta comercial del tenant: productos, variantes, categorí
 
 - `CatalogService`: alta, búsqueda, detalle, listado por categoría y eliminación.
 - `CatalogInventoryService`: consulta, reserva, libera y confirma inventario.
-- `StockReservationService`: sincroniza el carrito como conjunto, bloquea todos sus inventarios en orden estable y mantiene el ledger agregado consistente con `Inventory.reserved_stock`.
-- `ExpireStockReservationsService`: detecta en un único recorrido reservas vencidas de compras, carritos y huérfanas, y delega los efectos comerciales sin mezclar esas reglas con la liberación física del inventario.
+- `StockReservationService`: mantiene el ledger de reservas sincronizado con `Inventory.reserved_stock`.
 - `FeaturedGroupService`: pagina los ítems destacados para la tienda.
 - `OnTicketFeaturedGroupService`: administra grupos destacados del panel para sitios de tickets.
 

app/Domains/Desfile/Services/InvitationPurchaseProvisioner.php

@@ -5,7 +5,6 @@ namespace App\Domains\Desfile\Services;
 use DateTimeInterface;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use RuntimeException;
 
@@ -23,7 +22,7 @@ class InvitationPurchaseProvisioner
     private const ALLOCATIONS = [
         ['sector' => 'A', 'row' => 1, 'first_seat' => 1, 'last_seat' => 16, 'type' => 'NORMAL'],
         ['sector' => 'A', 'row' => 3, 'first_seat' => 1, 'last_seat' => 14, 'type' => 'NORMAL'],
-        ['sector' => 'C', 'row' => 1, 'first_seat' => 1, 'last_seat' => 17, 'type' => 'VIP + LUNCH'],
+        ['sector' => 'C', 'row' => 1, 'first_seat' => 1, 'last_seat' => 16, 'type' => 'VIP + LUNCH'],
         ['sector' => 'C', 'row' => 3, 'first_seat' => 6, 'last_seat' => 7, 'type' => 'NORMAL'],
     ];
 
@@ -59,7 +58,7 @@ class InvitationPurchaseProvisioner
                         $allocation['type'],
                     );
 
-                    $purchaseItemId = $this->createPurchaseItem(
+                    $this->createPurchaseItem(
                         $purchaseId,
                         $catalogItem,
                         $variant,
@@ -71,7 +70,6 @@ class InvitationPurchaseProvisioner
                     );
                     $this->createTicketAndCommitStock(
                         $purchaseId,
-                        $purchaseItemId,
                         $userId,
                         (int) $catalogItem->id,
                         $variant,
@@ -104,11 +102,7 @@ class InvitationPurchaseProvisioner
 
     private function userId(DateTimeInterface $now): int
     {
-        $user = DB::table('users')
-            ->where('active_email', self::USER_EMAIL)
-            ->where('rol_codigo', 'user')
-            ->whereNull('deleted_at')
-            ->first();
+        $user = DB::table('users')->where('email', self::USER_EMAIL)->first();
 
         if ($user !== null) {
             if ($user->tenant_codigo !== self::TENANT_CODE) {
@@ -150,6 +144,7 @@ class InvitationPurchaseProvisioner
         if ($purchaseId !== null) {
             DB::table('compras')->where('id', $purchaseId)->update([
                 'status' => 'paid',
+                'expires_at' => null,
                 'total' => 0,
                 'updated_at' => $now,
             ]);
@@ -163,6 +158,7 @@ class InvitationPurchaseProvisioner
             'cart_id' => null,
             'status' => 'paid',
             'payment_method' => self::PAYMENT_METHOD,
+            'expires_at' => null,
             'total' => 0,
             'dni' => null,
             'transfer_payer_dni' => null,
@@ -332,13 +328,12 @@ class InvitationPurchaseProvisioner
         int $seat,
         string $type,
         DateTimeInterface $now,
-    ): int {
-        $existingId = DB::table('compra_items')
+    ): void {
+        if (DB::table('compra_items')
             ->where('compra_id', $purchaseId)
             ->where('source_variant_id', $variant->id)
-            ->value('id');
-        if ($existingId !== null) {
-            return (int) $existingId;
+            ->exists()) {
+            return;
         }
 
         $attributes = [
@@ -348,7 +343,7 @@ class InvitationPurchaseProvisioner
             ['name' => 'Asiento', 'value' => (string) $seat],
         ];
 
-        return DB::table('compra_items')->insertGetId([
+        DB::table('compra_items')->insert([
             'compra_id' => $purchaseId,
             'source_catalog_item_id' => $catalogItem->id,
             'source_variant_id' => $variant->id,
@@ -374,18 +369,13 @@ class InvitationPurchaseProvisioner
 
     private function createTicketAndCommitStock(
         int $purchaseId,
-        int $purchaseItemId,
         int $userId,
         int $catalogItemId,
         object $variant,
         DateTimeInterface $now,
     ): void {
-        $purchaseReference = Schema::hasColumn('tickets', 'source_purchase_item_id')
-            ? ['source_purchase_item_id' => $purchaseItemId]
-            : ['source_purchase_id' => $purchaseId];
-
         if (DB::table('tickets')
-            ->where($purchaseReference)
+            ->where('source_purchase_id', $purchaseId)
             ->where('source_variant_id', $variant->id)
             ->exists()) {
             return;
@@ -402,27 +392,15 @@ class InvitationPurchaseProvisioner
             'sold_units' => $inventory->sold_units + 1,
         ]);
 
-        $reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
-        if ($reservationId === null) {
-            $reservationId = DB::table('stock_reservations')->insertGetId([
-                'status' => 'committed',
-                'committed_at' => $now,
-                'released_at' => null,
-                'expired_at' => null,
-                'release_reason' => null,
-                'created_at' => $now,
-                'updated_at' => $now,
-            ]);
-            DB::table('compras')->where('id', $purchaseId)->update([
-                'stock_reservation_id' => $reservationId,
-            ]);
-        }
-
-        DB::table('stock_reservation_lines')->insert([
-            'stock_reservation_id' => $reservationId,
+        DB::table('stock_reservations')->insert([
             'inventory_id' => $inventory->id,
+            'cart_item_id' => null,
+            'purchase_id' => $purchaseId,
             'quantity' => 1,
-            'tracks_inventory' => true,
+            'status' => 'committed',
+            'expires_at' => null,
+            'committed_at' => $now,
+            'released_at' => null,
             'created_at' => $now,
             'updated_at' => $now,
         ]);
@@ -432,7 +410,7 @@ class InvitationPurchaseProvisioner
             'ticket' => (string) Str::uuid(),
             'name' => null,
             'description' => null,
-            ...$purchaseReference,
+            'source_purchase_id' => $purchaseId,
             'source_catalog_item_id' => $catalogItemId,
             'source_variant_id' => $variant->id,
             'used_at' => null,

app/Domains/Forms/Controllers/AdminApp/TicketFilterFormController.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Domains\Forms\Controllers\AdminApp;
-
-use App\Domains\Forms\Resources\TicketFilterFormResource;
-use App\Domains\Forms\Services\TicketFilterFormService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class TicketFilterFormController extends Controller
-{
-    public function __construct(private readonly TicketFilterFormService $formService) {}
-
-    public function __invoke(Request $request): TicketFilterFormResource
-    {
-        $tenant = $request->user('sanctum')->tenant()->firstOrFail();
-
-        return TicketFilterFormResource::make($this->formService->get($tenant));
-    }
-}

app/Domains/Forms/Controllers/AdminApp/TicketFormController.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\Forms\Controllers\AdminApp;
-
-use App\Domains\Forms\Resources\TicketFormResource;
-use App\Domains\Forms\Services\TicketFormService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class TicketFormController extends Controller
-{
-    public function __construct(protected TicketFormService $ticketFormService) {}
-
-    public function __invoke(Request $request): TicketFormResource
-    {
-        return TicketFormResource::make(
-            $this->ticketFormService->get(
-                $request->user('sanctum')->tenant()->firstOrFail()
-            )
-        );
-    }
-}

app/Domains/Forms/Resources/TicketFilterFormResource.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Domains\Forms\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class TicketFilterFormResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'code' => $this->resource['code'],
-            'action' => $this->resource['action'],
-            'method' => $this->resource['method'],
-            'fields' => $this->resource['fields'],
-            'columns' => $this->resource['columns'],
-        ];
-    }
-}

app/Domains/Forms/Resources/TicketFormResource.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Domains\Forms\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class TicketFormResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'statuses' => $this->resource['statuses'],
-            'categories' => $this->resource['categories'],
-        ];
-    }
-}

app/Domains/Forms/Services/SaleFormService.php

@@ -6,18 +6,27 @@ use App\Domains\Purchase\Models\Purchase;
 
 class SaleFormService
 {
-    /** @return array{statuses: list<array{value: string, label: string, real_statuses: list<string>}>} */
+    /** @return array{statuses: list<array{code: string, name: string}>} */
     public function get(): array
     {
+        $names = [
+            Purchase::STATUS_CREATED => 'Creada',
+            Purchase::STATUS_PENDING_PAYMENT => 'Esperando pago',
+            Purchase::STATUS_IN_REVIEW => 'En revisión',
+            Purchase::STATUS_PAID => 'Confirmada',
+            Purchase::STATUS_CANCELLED => 'Cancelada',
+            Purchase::STATUS_REJECTED => 'Rechazada',
+            Purchase::STATUS_EXPIRED => 'Vencida',
+            Purchase::STATUS_SUPERSEDED => 'Reemplazada',
+        ];
+
         return [
             'statuses' => array_map(
-                fn (string $code, array $definition): array => [
-                    'value' => $code,
-                    'label' => $definition['name'],
-                    'real_statuses' => $definition['statuses'],
+                fn (string $status): array => [
+                    'code' => $status,
+                    'name' => $names[$status],
                 ],
-                array_keys(Purchase::adminStatuses()),
-                array_values(Purchase::adminStatuses()),
+                Purchase::statuses(),
             ),
         ];
     }

app/Domains/Forms/Services/TicketFilterFormService.php

@@ -1,152 +0,0 @@
-<?php
-
-namespace App\Domains\Forms\Services;
-
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\AdminAppTicketColumnService;
-
-class TicketFilterFormService
-{
-    private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
-
-    public function __construct(
-        private readonly TicketFormService $ticketFormService,
-        private readonly AdminAppTicketColumnService $columnService,
-    ) {}
-
-    /** @return array<string, mixed> */
-    public function get(Tenant $tenant): array
-    {
-        $fields = $this->commonFields();
-
-        if ($tenant->codigo === self::FIESTA_FUTBOL_INFANTIL) {
-            $fields = [
-                ...$this->fiestaFutbolInfantilFields($tenant),
-                ...$this->commonFields(includeDate: false),
-            ];
-        }
-
-        return [
-            'code' => 'tickets_filter',
-            'action' => '/api/v1/adminapp/tenant/tickets',
-            'method' => 'GET',
-            'fields' => $fields,
-            'columns' => $this->columnService->publicColumns($tenant),
-        ];
-    }
-
-    /** @return list<array<string, mixed>> */
-    private function fiestaFutbolInfantilFields(Tenant $tenant): array
-    {
-        $form = $this->ticketFormService->getForFilters($tenant);
-
-        return [
-            [
-                'name' => 'category',
-                'query_param' => 'category',
-                'label' => 'Categoría',
-                'type' => 'select',
-                'required' => false,
-                'default' => null,
-                'placeholder' => 'Categoría',
-                'options' => array_map(
-                    fn (array $category): array => [
-                        'value' => $category['value'],
-                        'label' => $category['label'],
-                        'children' => [
-                            [
-                                'field' => 'product',
-                                'disabled' => $category['products'] === [],
-                                'options' => array_map(
-                                    fn (array $product): array => [
-                                        'value' => $product['value'],
-                                        'label' => $product['label'],
-                                        'children' => [
-                                            [
-                                                'field' => 'type',
-                                                'disabled' => $product['types'] === [],
-                                                'options' => array_map(
-                                                    fn (array $type): array => [
-                                                        'value' => $type['value'],
-                                                        'label' => $type['label'],
-                                                        'children' => [[
-                                                            'field' => 'size',
-                                                            'disabled' => ($type['sizes'] ?? []) === [],
-                                                            'options' => $type['sizes'] ?? [],
-                                                        ]],
-                                                    ],
-                                                    $product['types'],
-                                                ),
-                                            ],
-                                        ],
-                                    ],
-                                    $category['products'],
-                                ),
-                            ],
-                            [
-                                'field' => 'date',
-                                'disabled' => ! in_array($category['value'], ['comidas', 'comida'], true),
-                                'options' => [],
-                            ],
-                        ],
-                    ],
-                    $form['categories'],
-                ),
-            ],
-            $this->dependentSelect('product', 'Producto', 'category'),
-            $this->dependentSelect('type', 'Tipo', 'product'),
-            $this->dependentSelect('size', 'Talle', 'type'),
-            [
-                ...$this->dependentSelect('date', 'Fecha', 'category'),
-                'type' => 'date',
-            ],
-        ];
-    }
-
-    /** @return list<array<string, mixed>> */
-    private function commonFields(bool $includeDate = true): array
-    {
-        return [
-            ...($includeDate ? [[
-                'name' => 'date',
-                'query_param' => 'date',
-                'label' => 'Fecha',
-                'type' => 'date',
-                'required' => false,
-                'default' => null,
-            ]] : []),
-            [
-                'name' => 'status',
-                'query_param' => 'status',
-                'label' => 'Estado',
-                'type' => 'select',
-                'required' => false,
-                'default' => null,
-                'placeholder' => 'Estado',
-                'options' => [
-                    ['value' => Ticket::STATUS_ACTIVE, 'label' => 'Activo'],
-                    ['value' => Ticket::STATUS_USED, 'label' => 'Usado'],
-                    ['value' => Ticket::STATUS_EXPIRED, 'label' => 'Vencido'],
-                ],
-            ],
-        ];
-    }
-
-    /** @return array<string, mixed> */
-    private function dependentSelect(string $name, string $label, string $dependency): array
-    {
-        return [
-            'name' => $name,
-            'query_param' => $name,
-            'label' => $label,
-            'type' => 'select',
-            'required' => false,
-            'default' => null,
-            'placeholder' => $label,
-            'depends_on' => $dependency,
-            'disabled' => true,
-            'options' => [],
-        ];
-    }
-}

app/Domains/Forms/Services/TicketFormService.php

@@ -1,400 +0,0 @@
-<?php
-
-namespace App\Domains\Forms\Services;
-
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
-use Illuminate\Database\Eloquent\Collection;
-
-class TicketFormService
-{
-    private const PRODUCT = 'product';
-
-    /**
-     * @var array<string, array{label: string|null, product: string, type: string|null, order: int}>
-     */
-    private const CATEGORY_PRESENTATIONS = [
-        'entradas' => [
-            'label' => null,
-            'product' => self::PRODUCT,
-            'type' => null,
-            'order' => 1,
-        ],
-        'alojamientos' => [
-            'label' => 'Camping',
-            'product' => 'tipo_alojamiento',
-            'type' => null,
-            'order' => 2,
-        ],
-        'camping' => [
-            'label' => null,
-            'product' => 'tipo_alojamiento',
-            'type' => null,
-            'order' => 2,
-        ],
-        'comidas' => [
-            'label' => 'Comida',
-            'product' => 'event_date',
-            'type' => 'horario',
-            'order' => 3,
-        ],
-        'comida' => [
-            'label' => null,
-            'product' => 'event_date',
-            'type' => 'horario',
-            'order' => 3,
-        ],
-        'merchandising' => [
-            'label' => null,
-            'product' => self::PRODUCT,
-            'type' => 'color',
-            'order' => 4,
-        ],
-    ];
-
-    /**
-     * @var array<string, array{label: string|null, product: string, type: string|null, size: string|null, order: int}>
-     */
-    private const FILTER_CATEGORY_PRESENTATIONS = [
-        'entradas' => ['label' => null, 'product' => self::PRODUCT, 'type' => null, 'size' => null, 'order' => 1],
-        'alojamientos' => ['label' => 'Camping', 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null, 'order' => 2],
-        'camping' => ['label' => null, 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null, 'order' => 2],
-        'comidas' => ['label' => 'Comida', 'product' => 'horario', 'type' => 'servicio', 'size' => null, 'order' => 3],
-        'comida' => ['label' => null, 'product' => 'horario', 'type' => 'servicio', 'size' => null, 'order' => 3],
-        'merchandising' => ['label' => null, 'product' => self::PRODUCT, 'type' => 'color', 'size' => 'talle', 'order' => 4],
-    ];
-
-    /**
-     * @return array{
-     *     statuses: list<array{value: string, label: string}>,
-     *     categories: list<array{
-     *         value: string,
-     *         label: string,
-     *         products: list<array{
-     *             value: string,
-     *             label: string,
-     *             types: list<array{value: string, label: string}>
-     *         }>
-     *     }>
-     * }
-     */
-    public function get(Tenant $tenant): array
-    {
-        $items = CatalogItem::query()
-            ->where('tenant_code', $tenant->codigo)
-            ->where('has_tickets', true)
-            ->whereHas('category')
-            ->with($this->relations())
-            ->orderBy('group_order')
-            ->orderBy('nombre')
-            ->get();
-
-        return $this->build($items, self::CATEGORY_PRESENTATIONS);
-    }
-
-    /**
-     * Return active catalog options plus soft-deleted sources still referenced by
-     * tickets, so historical tickets never become impossible to filter.
-     *
-     * @return array{
-     *     statuses: list<array{value: string, label: string}>,
-     *     categories: list<array{
-     *         value: string,
-     *         label: string,
-     *         products: list<array{
-     *             value: string,
-     *             label: string,
-     *             types: list<array{value: string, label: string}>
-     *         }>
-     *     }>
-     * }
-     */
-    public function getForFilters(Tenant $tenant): array
-    {
-        $historicalVariantIds = Ticket::query()
-            ->where('tenant_code', $tenant->codigo)
-            ->whereNotNull('source_variant_id')
-            ->distinct()
-            ->pluck('source_variant_id')
-            ->map(fn ($id): int => (int) $id)
-            ->all();
-        $historicalCatalogItemIds = Ticket::query()
-            ->where('tenant_code', $tenant->codigo)
-            ->whereNotNull('source_catalog_item_id')
-            ->distinct()
-            ->pluck('source_catalog_item_id')
-            ->map(fn ($id): int => (int) $id)
-            ->merge(
-                Variant::withTrashed()
-                    ->whereKey($historicalVariantIds)
-                    ->pluck('catalog_item_id')
-                    ->map(fn ($id): int => (int) $id),
-            )
-            ->unique()
-            ->values()
-            ->all();
-
-        $items = CatalogItem::withTrashed()
-            ->where('tenant_code', $tenant->codigo)
-            ->whereHas('category')
-            ->where(function ($query) use ($historicalCatalogItemIds): void {
-                $query
-                    ->where(function ($activeQuery): void {
-                        $activeQuery
-                            ->whereNull('catalog_items.deleted_at')
-                            ->where('has_tickets', true);
-                    })
-                    ->orWhereIn('catalog_items.id', $historicalCatalogItemIds);
-            })
-            ->with([
-                'category',
-                'itemAttributes.attribute.options',
-                'variants' => fn ($query) => $query
-                    ->withTrashed()
-                    ->where(function ($variantQuery) use ($historicalVariantIds): void {
-                        $variantQuery
-                            ->whereNull('variantes.deleted_at')
-                            ->orWhereIn('variantes.id', $historicalVariantIds);
-                    }),
-                'variants.definitions.itemAttribute.attribute.options',
-                'variants.eventDates',
-                'variants.eventDate',
-            ])
-            ->orderBy('group_order')
-            ->orderBy('nombre')
-            ->get();
-
-        return $this->build($items, self::FILTER_CATEGORY_PRESENTATIONS, includeSizes: true);
-    }
-
-    /**
-     * @param  Collection<int, CatalogItem>  $items
-     * @return array{
-     *     statuses: list<array{value: string, label: string}>,
-     *     categories: list<array{
-     *         value: string,
-     *         label: string,
-     *         products: list<array{
-     *             value: string,
-     *             label: string,
-     *             types: list<array{value: string, label: string}>
-     *         }>
-     *     }>
-     * }
-     */
-    private function build(Collection $items, array $presentations, bool $includeSizes = false): array
-    {
-        $categories = [];
-
-        foreach ($items as $item) {
-            $sourceCategory = trim((string) $item->category?->nombre);
-            $categoryValue = mb_strtolower($sourceCategory);
-            $presentation = $presentations[$categoryValue] ?? [
-                'label' => null,
-                'product' => self::PRODUCT,
-                'type' => null,
-                'size' => null,
-                'order' => PHP_INT_MAX,
-            ];
-
-            $categories[$categoryValue] ??= [
-                'value' => $categoryValue,
-                'label' => $presentation['label'] ?? $sourceCategory,
-                'order' => $presentation['order'],
-                'products' => [],
-            ];
-
-            foreach ($this->products(
-                $item,
-                $presentation['product'],
-                $presentation['type'],
-                $presentation['size'] ?? null,
-            ) as $product) {
-                $productValue = $product['value'];
-                $existingProduct = $categories[$categoryValue]['products'][$productValue] ?? [
-                    'value' => $productValue,
-                    'label' => $product['label'],
-                    'types' => [],
-                    'sizes' => [],
-                ];
-
-                foreach ($product['types'] as $type) {
-                    $existingProduct['types'][$type['value']] = $type;
-                }
-
-                foreach ($product['sizes'] as $size) {
-                    $existingProduct['sizes'][$size['value']] = $size;
-                }
-
-                $categories[$categoryValue]['products'][$productValue] = $existingProduct;
-            }
-        }
-
-        uasort($categories, fn (array $left, array $right): int => $left['order'] <=> $right['order']
-            ?: $left['label'] <=> $right['label']);
-
-        return [
-            'statuses' => [
-                ['value' => Ticket::STATUS_ACTIVE, 'label' => 'Activo'],
-                ['value' => Ticket::STATUS_USED, 'label' => 'Usado'],
-                ['value' => Ticket::STATUS_EXPIRED, 'label' => 'Vencido'],
-            ],
-            'categories' => array_values(array_map(
-                fn (array $category): array => [
-                    'value' => $category['value'],
-                    'label' => $category['label'],
-                    'products' => array_values(array_map(
-                        fn (array $product): array => [
-                            'value' => $product['value'],
-                            'label' => $product['label'],
-                            'types' => array_values($product['types']),
-                            ...($includeSizes ? ['sizes' => array_values($product['sizes'])] : []),
-                        ],
-                        $category['products'],
-                    )),
-                ],
-                $categories,
-            )),
-        ];
-    }
-
-    /** @return list<string> */
-    private function relations(): array
-    {
-        return [
-            'category',
-            'itemAttributes.attribute.options',
-            'variants.definitions.itemAttribute.attribute.options',
-            'variants.eventDates',
-            'variants.eventDate',
-        ];
-    }
-
-    /**
-     * @return list<array{
-     *     value: string,
-     *     label: string,
-     *     types: list<array{value: string, label: string}>,
-     *     sizes: list<array{value: string, label: string}>
-     * }>
-     */
-    private function products(CatalogItem $item, string $productCode, ?string $typeCode, ?string $sizeCode): array
-    {
-        if ($productCode === self::PRODUCT) {
-            return [[
-                'value' => $item->slug,
-                'label' => $item->nombre,
-                'types' => $this->types($item, $typeCode, $sizeCode),
-                'sizes' => $this->types($item, $sizeCode),
-            ]];
-        }
-
-        $products = [];
-
-        foreach ($item->variants as $variant) {
-            foreach ($this->variantOptions($variant, $productCode) as $productOption) {
-                $productValue = $productOption['value'];
-                $products[$productValue] ??= [
-                    'value' => $productValue,
-                    'label' => $this->optionLabel($productOption['label'], $productCode),
-                    'types' => [],
-                    'sizes' => [],
-                ];
-
-                foreach ($this->variantOptions($variant, $typeCode) as $typeOption) {
-                    $this->mergeTypeOption(
-                        $products[$productValue]['types'],
-                        $typeOption,
-                        $variant,
-                        $sizeCode,
-                    );
-                }
-
-                foreach ($this->variantOptions($variant, $sizeCode) as $sizeOption) {
-                    $products[$productValue]['sizes'][$sizeOption['value']] = $sizeOption;
-                }
-            }
-        }
-
-        return array_values(array_map(
-            fn (array $product): array => [
-                'value' => $product['value'],
-                'label' => $product['label'],
-                'types' => array_values($product['types']),
-                'sizes' => array_values($product['sizes']),
-            ],
-            $products,
-        ));
-    }
-
-    /** @return list<array<string, mixed>> */
-    private function types(CatalogItem $item, ?string $typeCode, ?string $sizeCode = null): array
-    {
-        $types = [];
-
-        foreach ($item->variants as $variant) {
-            foreach ($this->variantOptions($variant, $typeCode) as $typeOption) {
-                $this->mergeTypeOption($types, $typeOption, $variant, $sizeCode);
-            }
-        }
-
-        return array_values(array_map(function (array $type) use ($sizeCode): array {
-            if ($sizeCode !== null) {
-                $type['sizes'] = array_values($type['sizes']);
-            }
-
-            return $type;
-        }, $types));
-    }
-
-    /**
-     * @param  array<string, array<string, mixed>>  $types
-     * @param  array{value: string, label: string}  $typeOption
-     */
-    private function mergeTypeOption(
-        array &$types,
-        array $typeOption,
-        Variant $variant,
-        ?string $sizeCode,
-    ): void {
-        $typeValue = $typeOption['value'];
-        $types[$typeValue] ??= [
-            ...$typeOption,
-            ...($sizeCode !== null ? ['sizes' => []] : []),
-        ];
-
-        foreach ($this->variantOptions($variant, $sizeCode) as $sizeOption) {
-            $types[$typeValue]['sizes'][$sizeOption['value']] = $sizeOption;
-        }
-    }
-
-    /** @return list<array{value: string, label: string}> */
-    private function variantOptions(Variant $variant, ?string $attributeCode): array
-    {
-        if ($attributeCode === null) {
-            return [];
-        }
-
-        $selection = $variant->selectionOptions($variant->catalogItem->itemAttributes)
-            ->get($attributeCode);
-
-        if ($selection === null) {
-            return [];
-        }
-
-        return array_is_list($selection) ? $selection : [$selection];
-    }
-
-    private function optionLabel(string $label, string $attributeCode): string
-    {
-        if ($attributeCode !== 'event_date') {
-            return $label;
-        }
-
-        [$day, $month] = array_pad(explode('/', $label), 2, null);
-
-        return $day !== null && $month !== null ? "{$day}/{$month}" : $label;
-    }
-}

app/Domains/Forms/documentacion/README.md

@@ -9,7 +9,6 @@ Provee catálogos y opciones auxiliares para construir formularios del panel adm
 - `EventFormService`: devuelve redes sociales disponibles y las URL configuradas para el tenant.
 - `SaleFormService`: expone los estados admitidos para compras con sus etiquetas de presentación.
 - `StaffFormService`: lista categorías raíz que pueden asignarse al personal del tenant.
-- `TicketFormService`: expone estados y opciones anidadas de categoría, producto y tipo para los tickets de Fiesta Fútbol Infantil.
 
 Cada servicio tiene un controlador invocable y un `JsonResource` específico. `SocialMediaOptionResource` representa las opciones de redes sociales.
 
@@ -20,7 +19,6 @@ Bajo `/v1/adminapp/forms`, con `auth:sanctum` y `adminapp.tenant`:
 - `GET /event`.
 - `GET /sale`.
 - `GET /staff`.
-- `GET /fiesta-futbol-infantil/ticket`: estados y jerarquía categoría → producto → tipo para filtros de tickets.
 - `GET /fiesta-futbol-infantil/merchandise`: opciones de color y talle del tenant para merchandising.
 
 ## Dependencias

app/Domains/Forms/routes/adminapp.php

@@ -5,8 +5,6 @@ use App\Domains\Forms\Controllers\AdminApp\FoodFormController;
 use App\Domains\Forms\Controllers\AdminApp\MerchandiseFormController;
 use App\Domains\Forms\Controllers\AdminApp\SaleFormController;
 use App\Domains\Forms\Controllers\AdminApp\StaffFormController;
-use App\Domains\Forms\Controllers\AdminApp\TicketFilterFormController;
-use App\Domains\Forms\Controllers\AdminApp\TicketFormController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/forms')
@@ -15,13 +13,6 @@ Route::prefix('v1/adminapp/forms')
         Route::get('event', EventFormController::class);
         Route::get('sale', SaleFormController::class);
         Route::get('staff', StaffFormController::class);
-        Route::get('tickets-filter', TicketFilterFormController::class)
-            ->middleware('tenant.menu:adminapp.tickets')
-            ->name('adminapp.forms.tickets-filter');
-        Route::get(
-            'fiesta-futbol-infantil/ticket',
-            TicketFormController::class
-        );
         Route::get(
             'fiesta-futbol-infantil/merchandise',
             MerchandiseFormController::class

app/Domains/Integration/Controllers/ClientIntegrationController.php

@@ -4,9 +4,8 @@ namespace App\Domains\Integration\Controllers;
 
 use App\Domains\Client\Models\Client;
 use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\ConfigureIntegrationRequest;
+use App\Domains\Integration\Requests\StoreClientIntegrationRequest;
 use App\Domains\Integration\Services\ClientIntegrationService;
-use App\Domains\Integration\Services\IntegrationAssociationService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
@@ -36,7 +35,7 @@ class ClientIntegrationController extends Controller
     }
 
     public function store(
-        ConfigureIntegrationRequest $request,
+        StoreClientIntegrationRequest $request,
         Client $client,
         string $integrationCode,
     ): JsonResponse {
@@ -62,11 +61,4 @@ class ClientIntegrationController extends Controller
             ], 400);
         }
     }
-
-    public function destroy(Client $client, string $integrationCode, IntegrationAssociationService $service)
-    {
-        $service->detach($client, $integrationCode);
-
-        return response()->noContent();
-    }
 }

app/Domains/Integration/Controllers/IntegrationController.php

@@ -35,7 +35,6 @@ class IntegrationController extends Controller
 
     public function destroy(Integration $integration)
     {
-        abort_if($integration->instances()->exists(), 409, 'Delete the integration instances first.');
         $integration->delete();
 
         return response()->noContent();

app/Domains/Integration/Controllers/WebsiteTypeIntegrationController.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Controllers;
-
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\ConfigureIntegrationRequest;
-use App\Domains\Integration\Resources\IntegrationAssociationResource;
-use App\Domains\Integration\Services\IntegrationAssociationService;
-use App\Domains\Tenant\Models\WebsiteType;
-use App\Http\Controllers\Controller;
-
-class WebsiteTypeIntegrationController extends Controller
-{
-    public function __construct(private readonly IntegrationAssociationService $service) {}
-
-    public function index(WebsiteType $websiteType)
-    {
-        return IntegrationAssociationResource::collection($websiteType->integrations()->with('integrationInstance')->get());
-    }
-
-    public function show(WebsiteType $websiteType, string $integrationCode)
-    {
-        return new IntegrationAssociationResource($websiteType->integrations()->with('integrationInstance')->where('integration_code', $integrationCode)->firstOrFail());
-    }
-
-    public function store(ConfigureIntegrationRequest $request, WebsiteType $websiteType, string $integrationCode)
-    {
-        $integration = Integration::query()->where('integration_code', $integrationCode)->firstOrFail();
-
-        return new IntegrationAssociationResource($this->service->configure(
-            $websiteType,
-            $integration,
-            $request->validated('integration_data'),
-        ));
-    }
-
-    public function destroy(WebsiteType $websiteType, string $integrationCode)
-    {
-        $this->service->detach($websiteType, $integrationCode);
-
-        return response()->noContent();
-    }
-}

app/Domains/Integration/Models/ClientIntegration.php

@@ -3,15 +3,22 @@
 namespace App\Domains\Integration\Models;
 
 use App\Domains\Client\Models\Client;
+use App\Domains\Integration\Casts\EncryptedIntegrationData;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class ClientIntegration extends Model
 {
+    protected $hidden = ['integration_data'];
+
     protected $fillable = [
         'client_id',
         'integration_code',
-        'integration_instance_id',
+        'integration_data',
+    ];
+
+    protected $casts = [
+        'integration_data' => EncryptedIntegrationData::class,
     ];
 
     /** @return BelongsTo<Client, $this> */
@@ -25,10 +32,4 @@ class ClientIntegration extends Model
     {
         return $this->belongsTo(Integration::class, 'integration_code', 'integration_code');
     }
-
-    /** @return BelongsTo<IntegrationInstance, $this> */
-    public function integrationInstance(): BelongsTo
-    {
-        return $this->belongsTo(IntegrationInstance::class);
-    }
 }

app/Domains/Integration/Models/Integration.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Integration\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Integration extends Model
 {
@@ -14,29 +13,16 @@ class Integration extends Model
         'name',
         'url',
         'integration_data_schema',
-        'requires_configuration',
+        'requires_client_configuration',
     ];
 
     protected $casts = [
         'integration_data_schema' => 'array',
-        'requires_configuration' => 'boolean',
+        'requires_client_configuration' => 'boolean',
     ];
 
-    /** @return HasMany<IntegrationInstance, $this> */
-    public function instances(): HasMany
-    {
-        return $this->hasMany(IntegrationInstance::class, 'integration_code', 'integration_code');
-    }
-
-    /** @return HasMany<ClientIntegration, $this> */
-    public function clientIntegrations(): HasMany
+    public function clientIntegrations()
     {
         return $this->hasMany(ClientIntegration::class, 'integration_code', 'integration_code');
     }
-
-    /** @return HasMany<WebsiteTypeIntegration, $this> */
-    public function websiteTypeIntegrations(): HasMany
-    {
-        return $this->hasMany(WebsiteTypeIntegration::class, 'integration_code', 'integration_code');
-    }
 }

app/Domains/Integration/Models/IntegrationInstance.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Models;
-
-use App\Domains\Integration\Casts\EncryptedIntegrationData;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-class IntegrationInstance extends Model
-{
-    // The ciphertext changes whenever credentials are saved, so old tokens cannot be reused.
-    public function tokenCacheKey(): string
-    {
-        return 'integration_token:instance:'.$this->id.':'.hash('sha256', (string) $this->getRawOriginal('integration_data'));
-    }
-
-    protected $fillable = ['integration_code', 'name', 'integration_data'];
-
-    protected $hidden = ['integration_data'];
-
-    protected $casts = ['integration_data' => EncryptedIntegrationData::class];
-
-    /** @return BelongsTo<Integration, $this> */
-    public function integration(): BelongsTo
-    {
-        return $this->belongsTo(Integration::class, 'integration_code', 'integration_code');
-    }
-
-    /** @return HasMany<ClientIntegration, $this> */
-    public function clientIntegrations(): HasMany
-    {
-        return $this->hasMany(ClientIntegration::class);
-    }
-
-    /** @return HasMany<WebsiteTypeIntegration, $this> */
-    public function websiteTypeIntegrations(): HasMany
-    {
-        return $this->hasMany(WebsiteTypeIntegration::class);
-    }
-}

app/Domains/Integration/Models/WebsiteTypeIntegration.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Models;
-
-use App\Domains\Tenant\Models\WebsiteType;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-class WebsiteTypeIntegration extends Model
-{
-    protected $fillable = ['website_type_code', 'integration_code', 'integration_instance_id'];
-
-    /** @return BelongsTo<WebsiteType, $this> */
-    public function websiteType(): BelongsTo
-    {
-        return $this->belongsTo(WebsiteType::class, 'website_type_code', 'codigo');
-    }
-
-    /** @return BelongsTo<Integration, $this> */
-    public function integration(): BelongsTo
-    {
-        return $this->belongsTo(Integration::class, 'integration_code', 'integration_code');
-    }
-
-    /** @return BelongsTo<IntegrationInstance, $this> */
-    public function integrationInstance(): BelongsTo
-    {
-        return $this->belongsTo(IntegrationInstance::class);
-    }
-}

app/Domains/Integration/Policies/IntegrationPolicy.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Policies;
-
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-
-class IntegrationPolicy
-{
-    public function manage(User $user): bool
-    {
-        return $user->rol_codigo === RoleCode::Admin->value;
-    }
-}

app/Domains/Integration/Requests/StoreClientIntegrationRequest.php

@@ -6,19 +6,20 @@ use App\Domains\Integration\Models\Integration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\ValidationException;
 
-class ConfigureIntegrationRequest extends FormRequest
+class StoreClientIntegrationRequest extends FormRequest
 {
     protected ?Integration $integrationModel = null;
 
     public function authorize(): bool
     {
-        return $this->user()?->can('manage', Integration::class) ?? false;
+        return true;
     }
 
     protected function prepareForValidation(): void
     {
+        $integrationCode = $this->route('integration_code');
         $this->integrationModel = Integration::query()
-            ->where('integration_code', $this->route('integration_code'))
+            ->where('integration_code', $integrationCode)
             ->first();
 
         if (! $this->integrationModel) {
@@ -30,7 +31,7 @@ class ConfigureIntegrationRequest extends FormRequest
 
     public function rules(): array
     {
-        $rules = ['integration_data' => ['present', 'array']];
+        $rules = [];
 
         foreach ($this->integrationModel?->integration_data_schema ?? [] as $field => $rule) {
             $rules['integration_data.'.$field] = $rule;

app/Domains/Integration/Requests/StoreIntegrationRequest.php

@@ -18,7 +18,7 @@ class StoreIntegrationRequest extends FormRequest
             'name' => ['required', 'string', 'max:255'],
             'url' => ['nullable', 'url', 'max:255'],
             'integration_data_schema' => ['nullable', 'array'],
-            'requires_configuration' => ['sometimes', 'boolean'],
+            'requires_client_configuration' => ['sometimes', 'boolean'],
         ];
     }
 }

app/Domains/Integration/Requests/UpdateIntegrationRequest.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Integration\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class UpdateIntegrationRequest extends FormRequest
 {
@@ -20,8 +19,9 @@ class UpdateIntegrationRequest extends FormRequest
             'name' => ['sometimes', 'required', 'string', 'max:255'],
             'url' => ['nullable', 'url', 'max:255'],
             'integration_data_schema' => ['nullable', 'array'],
-            'requires_configuration' => ['sometimes', 'boolean'],
-            'integration_code' => ['sometimes', 'required', 'string', Rule::in([$integration->integration_code])],
+            'requires_client_configuration' => ['sometimes', 'boolean'],
+            // the code shouldn't ideally be updatable, but if it is:
+            'integration_code' => ['sometimes', 'required', 'string', 'unique:integrations,integration_code,'.($integration->id ?? '')],
         ];
     }
 }

app/Domains/Integration/Resources/IntegrationAssociationResource.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class IntegrationAssociationResource extends JsonResource
-{
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'client_id' => $this->when(isset($this->client_id), $this->client_id),
-            'website_type_code' => $this->when(isset($this->website_type_code), $this->website_type_code),
-            'integration_code' => $this->integration_code,
-            'integration_instance_id' => $this->integration_instance_id,
-            'integration_instance' => new IntegrationInstanceResource($this->whenLoaded('integrationInstance')),
-        ];
-    }
-}

app/Domains/Integration/Resources/IntegrationInstanceResource.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class IntegrationInstanceResource extends JsonResource
-{
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'integration_code' => $this->integration_code,
-            'name' => $this->name,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
-}

app/Domains/Integration/Services/BaseIntegrationService.php

@@ -5,8 +5,6 @@ namespace App\Domains\Integration\Services;
 use App\Domains\Client\Models\Client;
 use App\Domains\Integration\Models\ClientIntegration;
 use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\IntegrationInstance;
-use App\Domains\Integration\Models\WebsiteTypeIntegration;
 use App\Domains\Tenant\Models\Tenant;
 use Exception;
 use Illuminate\Http\Client\PendingRequest;
@@ -34,9 +32,9 @@ abstract class BaseIntegrationService
     protected ?Integration $integration = null;
 
     /**
-     * The effective integration instance.
+     * The client-owned integration configuration.
      */
-    protected ?IntegrationInstance $integrationInstance = null;
+    protected ?ClientIntegration $clientIntegration = null;
 
     /**
      * Set the integration code.
@@ -87,7 +85,7 @@ abstract class BaseIntegrationService
     }
 
     /**
-     * Load the integration definition and its effective instance configuration.
+     * Load the integration definition and its client-owned configuration.
      *
      * @throws Exception
      */
@@ -97,7 +95,6 @@ abstract class BaseIntegrationService
             throw new Exception('Integration code is not set.');
         }
 
-        $this->integrationInstance = null;
         $this->integration = Integration::where('integration_code', $this->integrationCode)->first();
         if (! $this->integration) {
             throw new Exception("Integration with code '{$this->integrationCode}' not found.");
@@ -107,18 +104,11 @@ abstract class BaseIntegrationService
             throw new Exception('Client context is not set.');
         }
 
-        $this->integrationInstance = ClientIntegration::with('integrationInstance')->where('client_id', $this->clientContext->id)
+        $this->clientIntegration = ClientIntegration::where('client_id', $this->clientContext->id)
             ->where('integration_code', $this->integrationCode)
-            ->first()?->integrationInstance;
+            ->first();
 
-        if (! $this->integrationInstance && $this->tenant?->website_type_code) {
-            $this->integrationInstance = WebsiteTypeIntegration::with('integrationInstance')
-                ->where('website_type_code', $this->tenant->website_type_code)
-                ->where('integration_code', $this->integrationCode)
-                ->first()?->integrationInstance;
-        }
-
-        if (! $this->integrationInstance && $this->integration->requires_configuration) {
+        if (! $this->clientIntegration && $this->integration->requires_client_configuration) {
             throw new Exception("Client '{$this->clientContext->code}' does not have integration '{$this->integrationCode}' configured.");
         }
     }
@@ -141,15 +131,15 @@ abstract class BaseIntegrationService
     }
 
     /**
-     * Get an integration setting from the effective instance configuration.
+     * Get an integration setting from the client-owned configuration.
      */
     protected function getIntegrationSetting(string $key, mixed $default = null): mixed
     {
-        if (! $this->integrationInstance || ! $this->integrationInstance->integration_data) {
+        if (! $this->clientIntegration || ! $this->clientIntegration->integration_data) {
             return $default;
         }
 
-        return $this->integrationInstance->integration_data[$key] ?? $default;
+        return $this->clientIntegration->integration_data[$key] ?? $default;
     }
 
     /**

app/Domains/Integration/Services/ClientIntegrationService.php

@@ -13,7 +13,6 @@ class ClientIntegrationService
     public function getClientIntegration(Client $client, string $integrationCode): ?ClientIntegration
     {
         return $client->integrations()
-            ->with(['integration', 'integrationInstance'])
             ->where('integration_code', $integrationCode)
             ->first();
     }
@@ -21,7 +20,7 @@ class ClientIntegrationService
     /** @return Collection<int, ClientIntegration> */
     public function getAllForClient(Client $client): Collection
     {
-        return $client->integrations()->with(['integration', 'integrationInstance'])->get();
+        return $client->integrations()->with('integration')->get();
     }
 
     public function updateOrCreateIntegration(
@@ -30,7 +29,13 @@ class ClientIntegrationService
         array $data,
     ): ClientIntegration {
         return DB::transaction(function () use ($client, $integration, $data): ClientIntegration {
-            $clientIntegration = app(IntegrationAssociationService::class)->configure($client, $integration, $data);
+            $clientIntegration = ClientIntegration::query()->updateOrCreate(
+                [
+                    'client_id' => $client->id,
+                    'integration_code' => $integration->integration_code,
+                ],
+                ['integration_data' => $data],
+            );
 
             $service = $this->resolveService($integration->integration_code);
             $service?->forClient($client)->onSetup();

app/Domains/Integration/Services/IntegrationAssociationService.php

@@ -1,98 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Services;
-
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\IntegrationInstance;
-use App\Domains\Integration\Models\WebsiteTypeIntegration;
-use App\Domains\Tenant\Models\WebsiteType;
-use Illuminate\Support\Facades\DB;
-
-class IntegrationAssociationService
-{
-    public function configure(Client|WebsiteType $owner, Integration $integration, array $integrationData): ClientIntegration|WebsiteTypeIntegration
-    {
-        return DB::transaction(function () use ($owner, $integration, $integrationData): ClientIntegration|WebsiteTypeIntegration {
-            $instance = IntegrationInstance::create([
-                'integration_code' => $integration->integration_code,
-                'name' => $integration->name.' / '.$this->ownerName($owner),
-                'integration_data' => $integrationData,
-            ]);
-
-            return $this->associate($owner, $integration->integration_code, $instance);
-        });
-    }
-
-    public function associate(Client|WebsiteType $owner, string $code, IntegrationInstance $instance): ClientIntegration|WebsiteTypeIntegration
-    {
-        return DB::transaction(function () use ($owner, $code, $instance): ClientIntegration|WebsiteTypeIntegration {
-            $association = $owner->integrations()
-                ->where('integration_code', $code)
-                ->lockForUpdate()
-                ->first();
-            $previousInstanceId = $association?->integration_instance_id;
-
-            $instanceIds = array_values(array_unique(array_filter([
-                $previousInstanceId,
-                $instance->id,
-            ])));
-            sort($instanceIds);
-
-            $instances = IntegrationInstance::query()
-                ->whereKey($instanceIds)
-                ->orderBy('id')
-                ->lockForUpdate()
-                ->get()
-                ->keyBy('id');
-            $instance = $instances->get($instance->id) ?? IntegrationInstance::query()->findOrFail($instance->id);
-            abort_unless($instance->integration_code === $code, 422, 'The instance belongs to another integration.');
-
-            $association = $owner->integrations()->updateOrCreate(
-                ['integration_code' => $code],
-                ['integration_instance_id' => $instance->id],
-            );
-
-            if ($previousInstanceId && $previousInstanceId !== $instance->id) {
-                $this->deleteIfUnused($previousInstanceId);
-            }
-
-            return $association->load('integrationInstance');
-        });
-    }
-
-    public function detach(Client|WebsiteType $owner, string $code): void
-    {
-        DB::transaction(function () use ($owner, $code): void {
-            $association = $owner->integrations()
-                ->where('integration_code', $code)
-                ->lockForUpdate()
-                ->first();
-
-            if (! $association) {
-                return;
-            }
-
-            $instanceId = $association->integration_instance_id;
-            $association->delete();
-            $this->deleteIfUnused($instanceId);
-        });
-    }
-
-    private function deleteIfUnused(int $instanceId): void
-    {
-        $instance = IntegrationInstance::query()->lockForUpdate()->find($instanceId);
-
-        if ($instance
-            && ! $instance->clientIntegrations()->exists()
-            && ! $instance->websiteTypeIntegrations()->exists()) {
-            $instance->delete();
-        }
-    }
-
-    private function ownerName(Client|WebsiteType $owner): string
-    {
-        return $owner instanceof Client ? $owner->name : $owner->nombre;
-    }
-}

app/Domains/Integration/Services/IntegrationInstanceService.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Services;
-
-use App\Domains\Integration\Models\IntegrationInstance;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
-
-class IntegrationInstanceService
-{
-    public function create(array $data): IntegrationInstance
-    {
-        return IntegrationInstance::create($data);
-    }
-
-    public function update(IntegrationInstance $instance, array $data): IntegrationInstance
-    {
-        return DB::transaction(function () use ($instance, $data): IntegrationInstance {
-            $instance = IntegrationInstance::query()->lockForUpdate()->findOrFail($instance->id);
-            $cacheKey = $instance->tokenCacheKey();
-            $instance->update($data);
-            if (array_key_exists('integration_data', $data)) {
-                DB::afterCommit(fn () => Cache::forget($cacheKey));
-            }
-
-            return $instance;
-        });
-    }
-
-    public function delete(IntegrationInstance $instance): void
-    {
-        DB::transaction(function () use ($instance): void {
-            $instance = IntegrationInstance::query()->lockForUpdate()->findOrFail($instance->id);
-            abort_if($instance->clientIntegrations()->exists() || $instance->websiteTypeIntegrations()->exists(), 409, 'Unlink the instance before deleting it.');
-            $cacheKey = $instance->tokenCacheKey();
-            $instance->delete();
-            DB::afterCommit(fn () => Cache::forget($cacheKey));
-        });
-    }
-}

app/Domains/Integration/Services/MailService.php

@@ -3,8 +3,6 @@
 namespace App\Domains\Integration\Services;
 
 use App\Domains\Client\Models\Client;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\WebsiteType;
 use Exception;
 use Illuminate\Contracts\Mail\Factory as MailFactory;
 use Illuminate\Contracts\Mail\Mailer;
@@ -29,7 +27,7 @@ class MailService extends BaseIntegrationService
 
     private ?Mailer $mailer = null;
 
-    private bool $usesInstanceMailer = false;
+    private bool $usesClientMailer = false;
 
     public function __construct(?MailFactory $mailFactory = null)
     {
@@ -40,12 +38,12 @@ class MailService extends BaseIntegrationService
     {
         parent::forTenant($tenantCode);
 
-        if ($this->integrationInstance) {
+        if ($this->clientIntegration) {
             $this->mailer = $this->resolveMailer();
-            $this->usesInstanceMailer = true;
+            $this->usesClientMailer = true;
         } else {
             $this->mailer = $this->mailFactory->mailer();
-            $this->usesInstanceMailer = false;
+            $this->usesClientMailer = false;
         }
 
         return $this;
@@ -56,12 +54,12 @@ class MailService extends BaseIntegrationService
         parent::forClient($client);
         $this->tenant = $this->clientContext?->tenants()->first();
 
-        if ($this->integrationInstance) {
+        if ($this->clientIntegration) {
             $this->mailer = $this->resolveMailer();
-            $this->usesInstanceMailer = true;
+            $this->usesClientMailer = true;
         } else {
             $this->mailer = $this->mailFactory->mailer();
-            $this->usesInstanceMailer = false;
+            $this->usesClientMailer = false;
         }
 
         return $this;
@@ -72,35 +70,24 @@ class MailService extends BaseIntegrationService
         return [];
     }
 
-    /**
-     * @param  array<int, array{data: string, name: string, mime: string}>  $attachments
-     */
-    public function send(
-        string|array $recipient,
-        string $subject,
-        string $content,
-        Tenant|WebsiteType|null $brand = null,
-        array $attachments = [],
-    ): void {
+    public function send(string|array $recipient, string $subject, string $content): void
+    {
         if (! $this->mailer || ! $this->tenant) {
             throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
         }
 
-        $brand ??= $this->tenant;
-        $branding = $this->brandingFor($brand);
+        $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
 
         $html = Blade::render(
             <<<'BLADE'
-                <x-mail.branded-layout :branding="$branding" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
+                <x-mail.branded-layout :tenant="$tenant" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
                     {!! $content !!}
                 </x-mail.branded-layout>
                 BLADE,
             [
-                'branding' => $branding,
-                'headerLogoUrl' => $brand instanceof WebsiteType
-                    ? $brand->siteLogo?->getTemporaryUrl(1440)
-                    : $brand->headerLogo?->getTemporaryUrl(1440),
-                'footerLogoUrl' => $brand->footerLogo?->getTemporaryUrl(1440),
+                'tenant' => $this->tenant,
+                'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
+                'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
                 'content' => $content,
             ],
         );
@@ -109,54 +96,16 @@ class MailService extends BaseIntegrationService
             ->subject($subject)
             ->html($html);
 
-        foreach ($attachments as $attachment) {
-            $mail->attachData(
-                $attachment['data'],
-                $attachment['name'],
-                ['mime' => $attachment['mime']],
-            );
-        }
-
         $this->mailer->to($recipient)->send($mail);
     }
 
     public function mailerName(): string
     {
-        return $this->usesInstanceMailer
-            ? 'integration-smtp'
+        return $this->usesClientMailer
+            ? 'client-smtp'
             : (string) config('mail.default');
     }
 
-    /** @return array{name: string, primary_color: string, body_color: string, background_color: string, surface_color: string, header_bg_color: string, footer_bg_color: string} */
-    private function brandingFor(Tenant|WebsiteType $brand): array
-    {
-        if ($brand instanceof WebsiteType) {
-            $brand->loadMissing(['siteLogo', 'footerLogo']);
-
-            return [
-                'name' => $brand->nombre,
-                'primary_color' => $brand->primary_color ?? '#FF7006',
-                'body_color' => $brand->body_color ?? '#666666',
-                'background_color' => $brand->background_color ?? '#f8f8f8',
-                'surface_color' => $brand->surface_color ?? '#ffffff',
-                'header_bg_color' => $brand->surface_color ?? '#ffffff',
-                'footer_bg_color' => $brand->login_header_footer_color ?? '#838383',
-            ];
-        }
-
-        $brand->loadMissing(['headerLogo', 'footerLogo']);
-
-        return [
-            'name' => $brand->nombre,
-            'primary_color' => $brand->primary_color ?? '#6376f3',
-            'body_color' => '#334155',
-            'background_color' => '#f1f5f9',
-            'surface_color' => '#ffffff',
-            'header_bg_color' => $brand->header_bg_color ?? '#ffffff',
-            'footer_bg_color' => $brand->footer_bg_color ?? '#334155',
-        ];
-    }
-
     public function onSetup(): void
     {
         if (! $this->mailer || ! $this->clientContext) {
@@ -187,7 +136,7 @@ class MailService extends BaseIntegrationService
 
     private function resolveMailer(): Mailer
     {
-        $data = $this->integrationInstance?->integration_data;
+        $data = $this->clientIntegration?->integration_data;
 
         if (! is_array($data)) {
             throw new InvalidArgumentException('La configuración SMTP del cliente no es válida.');
@@ -205,7 +154,7 @@ class MailService extends BaseIntegrationService
         }
 
         $mailer = $this->mailFactory->build([
-            'name' => 'integration-smtp-'.$this->integrationInstance?->id,
+            'name' => 'client-smtp-'.$this->clientContext?->id,
             'transport' => 'smtp',
             'scheme' => $data['MAIL_SCHEME'] ?? null,
             'host' => $data['MAIL_HOST'],

app/Domains/Integration/Services/TelepagosIntegrationService.php

@@ -45,11 +45,11 @@ class TelepagosIntegrationService extends BaseIntegrationService
      */
     public function getToken(): string
     {
-        if (! $this->integrationInstance) {
+        if (! $this->clientIntegration || ! $this->clientContext) {
             throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
         }
 
-        $cacheKey = $this->integrationInstance->tokenCacheKey();
+        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
 
         $token = Cache::get($cacheKey);
 
@@ -94,7 +94,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
         // Calculate TTL and subtract a buffer of 60 seconds
         $ttlSeconds = max(1, $expiresAt->diffInSeconds(now()) - 60);
 
-        $cacheKey = $this->integrationInstance->tokenCacheKey();
+        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
         Cache::put($cacheKey, $token, $ttlSeconds);
 
         return $token;
@@ -220,11 +220,11 @@ class TelepagosIntegrationService extends BaseIntegrationService
      */
     public function clearToken(): void
     {
-        if (! $this->integrationInstance) {
+        if (! $this->clientContext) {
             return;
         }
 
-        $cacheKey = $this->integrationInstance->tokenCacheKey();
+        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
         Cache::forget($cacheKey);
     }
 

app/Domains/Integration/Services/TelepagosWebhookService.php

@@ -7,10 +7,7 @@ use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\TelepagosPayment;
 use App\Domains\Purchase\Models\TelepagosQr;
 use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Purchase\Services\DniDistanceService;
 use Exception;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
@@ -18,7 +15,6 @@ class TelepagosWebhookService
 {
     public function __construct(
         private readonly CheckoutService $checkoutService,
-        private readonly DniDistanceService $dniDistance,
     ) {}
 
     /**
@@ -45,6 +41,7 @@ class TelepagosWebhookService
 
             $paymentData = [
                 'compra_id' => null,
+                'matched_purchase_ids' => null,
                 'cuit_buyer' => $details['data']['buyer']['cuit'] ?? $details['buyer']['cuit'] ?? null,
                 'cvu_buyer' => $details['data']['buyer']['cvu'] ?? $details['buyer']['cvu'] ?? null,
                 'amount' => $amount,
@@ -76,55 +73,24 @@ class TelepagosWebhookService
                 $dni = substr($cuit, 2, -1);
 
                 $tenantCodes = $client->tenants()->pluck('codigo');
-                $eligiblePurchases = Purchase::query()
-                    ->whereIn('tenant_codigo', $tenantCodes)
+                $purchases = Purchase::whereIn('tenant_codigo', $tenantCodes)
+                    ->where('transfer_payer_dni', $dni)
                     ->whereIn('status', [
                         Purchase::STATUS_CREATED,
                         Purchase::STATUS_PENDING_PAYMENT,
                         Purchase::STATUS_IN_REVIEW,
                     ])
-                    ->where('payment_method', 'transfer');
-
-                $purchases = (clone $eligiblePurchases)
+                    ->where('payment_method', 'transfer')
                     ->where('total', $amount)
                     ->latest()
-                    ->get()
-                    ->filter(fn (Purchase $purchase): bool => $purchase->transfer_payer_dni !== null
-                        && $this->dniDistance->distance($dni, $purchase->transfer_payer_dni) === 0)
-                    ->values();
+                    ->get();
 
+                $paymentData['matched_purchase_ids'] = $purchases->pluck('id')->all();
                 $compra = $purchases->count() === 1 ? $purchases->first() : null;
 
                 if (! $compra) {
-                    $candidatePurchases = $this->findTransferCandidates(
-                        $eligiblePurchases,
-                        $dni,
-                        $amount,
-                    );
-                    if ($candidatePurchases->isNotEmpty()) {
-                        $payment = $this->storeTransferCandidates(
-                            $paymentData,
-                            $candidatePurchases,
-                            $dni,
-                            $amount,
-                        );
-
-                        Log::channel('telepagos')->info('Telepagos webhook: Transfer payment candidates found.', [
-                            'client_code' => $client->code,
-                            'cashin_id' => $cashinId,
-                            'telepagos_payment_id' => $payment->id,
-                            'amount' => $amount,
-                            'candidate_count' => $payment->candidates->count(),
-                            'candidates' => $payment->candidates
-                                ->map(fn ($candidate): array => [
-                                    'purchase_id' => $candidate->compra_id,
-                                    'match_reason' => $candidate->match_reason,
-                                    'dni_distance' => $candidate->dni_distance,
-                                    'amount_difference' => $candidate->amount_difference,
-                                    'confidence' => $candidate->confidence,
-                                ])
-                                ->all(),
-                        ]);
+                    if ($purchases->count() > 1) {
+                        TelepagosPayment::create($paymentData);
                     }
 
                     Log::channel('telepagos')->warning('Telepagos webhook: Expected exactly one matching purchase.', [
@@ -243,91 +209,4 @@ class TelepagosWebhookService
     {
         return number_format((float) $amount, 2, '.', '');
     }
-
-    /**
-     * @param  Builder<Purchase>  $eligiblePurchases
-     * @return Collection<int, Purchase>
-     */
-    private function findTransferCandidates(Builder $eligiblePurchases, string $dni, string $amount): Collection
-    {
-        $tolerancePercentage = max(
-            0,
-            (float) config('purchase.transfer_candidate_amount_tolerance_percentage', 5),
-        );
-        $numericAmount = (float) $amount;
-        $tolerance = $numericAmount * ($tolerancePercentage / 100);
-        $minimumAmount = $this->normalizeAmount(max(0, $numericAmount - $tolerance));
-        $maximumAmount = $this->normalizeAmount($numericAmount + $tolerance);
-
-        return (clone $eligiblePurchases)
-            ->whereBetween('total', [$minimumAmount, $maximumAmount])
-            ->latest()
-            ->get()
-            ->filter(function (Purchase $purchase) use ($dni, $amount): bool {
-                if ($purchase->transfer_payer_dni === null) {
-                    return false;
-                }
-
-                $purchaseAmount = $this->normalizeAmount($purchase->total);
-                $distance = $this->dniDistance->distance(
-                    $dni,
-                    (string) $purchase->transfer_payer_dni,
-                );
-
-                return $distance === 0
-                    || ($purchaseAmount === $amount && $distance <= 2);
-            })
-            ->values();
-    }
-
-    /**
-     * @param  array<string, mixed>  $paymentData
-     * @param  Collection<int, Purchase>  $candidatePurchases
-     */
-    private function storeTransferCandidates(
-        array $paymentData,
-        Collection $candidatePurchases,
-        string $dni,
-        string $amount,
-    ): TelepagosPayment {
-        return DB::transaction(function () use ($paymentData, $candidatePurchases, $dni, $amount): TelepagosPayment {
-            $payment = TelepagosPayment::create($paymentData);
-
-            $payment->candidates()->createMany(
-                $candidatePurchases
-                    ->map(function (Purchase $purchase) use ($dni, $amount): array {
-                        $purchaseAmount = $this->normalizeAmount($purchase->total);
-                        $dniDistance = $this->dniDistance->distance(
-                            $dni,
-                            (string) $purchase->transfer_payer_dni,
-                        );
-                        $dniMatches = $dniDistance === 0;
-                        $amountMatches = $purchaseAmount === $amount;
-
-                        return [
-                            'compra_id' => $purchase->id,
-                            'dni_matches' => $dniMatches,
-                            'dni_distance' => $dniDistance,
-                            'payment_dni' => $dni,
-                            'purchase_dni' => $purchase->transfer_payer_dni,
-                            'amount_matches' => $amountMatches,
-                            'payment_amount' => $amount,
-                            'purchase_amount' => $purchaseAmount,
-                            'amount_difference' => $this->normalizeAmount(
-                                abs((float) $purchaseAmount - (float) $amount),
-                            ),
-                            'match_reason' => $amountMatches
-                                ? ($dniMatches ? 'ambiguous_exact_match' : 'exact_amount_near_dni')
-                                : 'exact_dni_near_amount',
-                            'confidence' => $amountMatches
-                                ? ($dniMatches ? 'exact' : 'medium')
-                                : 'high',
-                        ];
-                    })
-                    ->all(),
-            );
-
-            return $payment->load('candidates');
-        });
-    }
 }

app/Domains/Integration/documentacion/README.md

@@ -1,48 +1,33 @@
 # Dominio Integration
 
-## Modelo
+## Propósito
 
-- `Integration`: catálogo, URL base, `integration_data_schema` y `requires_configuration`.
-- `IntegrationInstance`: configuración interna concreta con nombre. `integration_data` se cifra con `EncryptedIntegrationData`, se almacena en `longText` y nunca se devuelve en la API.
-- `ClientIntegration` y `WebsiteTypeIntegration`: asociaciones a instancias. La clave compuesta verifica el código de la instancia y la unicidad permite una instancia por integración y propietario.
+Gestiona integraciones externas disponibles y su configuración por cliente. Un cliente puede agrupar múltiples tenants que comparten las mismas credenciales. Incluye correo y pagos mediante Telepagos.
 
-Las instancias no se administran directamente por HTTP. Cada configuración enviada desde un cliente o tipo de sitio crea una instancia interna nueva y reemplaza únicamente la asociación de ese propietario. Al reemplazar o desvincular una instancia, esta se elimina si ya no tiene asociaciones con ningún cliente ni tipo de sitio; las instancias compartidas se conservan mientras tengan al menos una asociación.
+## Modelo y seguridad
 
-## Resolución
+- `Integration`: definición global de una integración.
+- `ClientIntegration`: configuración y credenciales de una integración para un cliente.
+- `EncryptedIntegrationData`: cast que protege los datos sensibles persistidos.
+- `ClientIntegrationService`: consulta y configura integraciones del cliente.
 
-`BaseIntegrationService::forTenant()` busca primero la asociación del cliente y después la del tipo de sitio del tenant. Selecciona una configuración completa, sin mezclar credenciales entre niveles. Si una configuración está presente pero es inválida, produce un error en vez de recurrir a otra instancia.
+## Servicios externos
 
-`forClient()` usa únicamente la asociación del cliente: sin un tenant concreto no se elige un tipo de sitio. Si no existe una instancia y `requires_configuration` es verdadero, se genera un error. Para correo opcional, `MailService` usa el mailer global si no encuentra una instancia; cuando la encuentra, construye un transporte SMTP aislado identificado como `integration-smtp`.
+- `BaseIntegrationService`: resuelve el cliente desde el tenant operativo y carga exclusivamente la configuración del cliente.
+- `MailService`: envío de correo usando la integración configurada.
+- `TelepagosIntegrationService`: autenticación, caché de token, generación de QR y consulta de cobros.
+- `TelepagosWebhookService`: procesa notificaciones recibidas desde Telepagos.
 
-Telepagos utiliza una clave de caché basada en el ID de instancia y una huella del texto cifrado. Volver a configurar el servicio con `forClient()` o `forTenant()` carga la configuración actual.
+## Endpoints
 
-## Administración
+- CRUD global bajo `/integrations`.
+- Consulta y configuración por cliente bajo `/clients/{client}/integrations`.
+- `POST /webhooks/telepagos/{client}` para notificaciones del proveedor.
 
-Todas estas rutas llevan el prefijo `/api`, requieren `auth:sanctum` y el rol global `admin` mediante `IntegrationPolicy`. Los roles `adminapp`, `scanner` y `user` no administran configuraciones.
+## Logging de Telepagos
 
-| Método | Ruta | Operación |
-| --- | --- | --- |
-| GET | `/clients/{client}/integrations[/{integration_code}]` | Consultar asociaciones directas. |
-| PUT | `/clients/{client}/integrations/{integration_code}` | Configurar: crea una instancia interna nueva y reemplaza solo la asociación del cliente. Ejecuta el hook de configuración existente. |
-| DELETE | `/clients/{client}/integrations/{integration_code}` | Desvincular. |
-| GET | `/website-types/{codigo}/integrations[/{integration_code}]` | Consultar asociaciones del tipo de sitio. |
-| PUT | `/website-types/{codigo}/integrations/{integration_code}` | Configurar: crea una instancia interna nueva y reemplaza solo la asociación del tipo de sitio. |
-| DELETE | `/website-types/{codigo}/integrations/{integration_code}` | Desvincular. |
+Los eventos de autenticación, QR, consultas de cuenta y procesamiento de webhooks se escriben en el canal diario `telepagos`, separado del log general. Los archivos se generan en `storage/logs/telepagos/telepagos-YYYY-MM-DD.log`; el nivel y la retención se configuran con `TELEPAGOS_LOG_LEVEL` y `TELEPAGOS_LOG_DAYS`. Tokens y credenciales se eliminan del contexto antes de registrar respuestas del proveedor.
 
-Los dos `PUT` reciben `integration_data`, un objeto completo validado según el esquema de la integración. La integración debe existir previamente en el catálogo interno. No hay endpoints públicos para administrar el catálogo ni las instancias directamente.
+## Dependencias y reglas
 
-Las respuestas y consultas incluyen metadatos de `integration_instance`, pero nunca sus credenciales. La configuración del cliente conserva su mensaje de respuesta histórico; la del tipo de sitio usa un resource con envoltorio `data`.
-
-## Webhooks y contexto operativo
-
-`POST /webhooks/telepagos/{client}` conserva su contrato público con el proveedor y la validación de pertenencia de las compras al cliente. Como no recibe un tenant, requiere una asociación directa al cliente. Para usar una instancia compartida en ese flujo, asociarla también al cliente; la herencia por tipo de sitio no se aplica a esa URL.
-
-`Notification` consume `MailService`; `Purchase` consume Telepagos. Los tenants mantienen el contexto operativo y el branding.
-
-## Despliegue
-
-Ejecutar `php artisan migrate` junto con este código. La migración `2026_09_04_000003` renombra `requires_client_configuration` a `requires_configuration` conservando sus valores. Los payloads del catálogo deben usar el nuevo nombre. Las migraciones previas trasladan el texto cifrado sin descifrarlo y no comparten instancias automáticamente.
-
-## Logging
-
-Telepagos registra eventos en el canal diario `telepagos`. El nivel y la retención se configuran con `TELEPAGOS_LOG_LEVEL` y `TELEPAGOS_LOG_DAYS`. Se eliminan tokens y credenciales de las estructuras registradas.
+Se integra con `Client`, `Tenant` y con el checkout de `Purchase`. `Notification` utiliza `MailService`. El tenant conserva el contexto operativo y de branding, pero nunca es dueño de credenciales. Las credenciales no se exponen en respuestas ni logs; los webhooks deben validar su contrato antes de alterar una compra.

app/Domains/Integration/routes/api.php

@@ -1,25 +1,22 @@
 <?php
 
 use App\Domains\Integration\Controllers\ClientIntegrationController;
+use App\Domains\Integration\Controllers\IntegrationController;
 use App\Domains\Integration\Controllers\TelepagosWebhookController;
-use App\Domains\Integration\Controllers\WebsiteTypeIntegrationController;
-use App\Domains\Integration\Models\Integration;
 use Illuminate\Support\Facades\Route;
 
-Route::middleware(['auth:sanctum', 'can:manage,'.Integration::class])->group(function (): void {
-    Route::prefix('website-types/{websiteType:codigo}/integrations')->group(function (): void {
-        Route::get('/', [WebsiteTypeIntegrationController::class, 'index']);
-        Route::get('/{integration_code}', [WebsiteTypeIntegrationController::class, 'show']);
-        Route::put('/{integration_code}', [WebsiteTypeIntegrationController::class, 'store']);
-        Route::delete('/{integration_code}', [WebsiteTypeIntegrationController::class, 'destroy']);
-    });
+Route::group(['prefix' => 'integrations'], function () {
+    Route::get('/', [IntegrationController::class, 'index']);
+    Route::post('/', [IntegrationController::class, 'store']);
+    Route::get('/{integration}', [IntegrationController::class, 'show']);
+    Route::put('/{integration}', [IntegrationController::class, 'update']);
+    Route::delete('/{integration}', [IntegrationController::class, 'destroy']);
+});
 
-    Route::group(['prefix' => 'clients/{client}/integrations'], function () {
-        Route::get('/', [ClientIntegrationController::class, 'index']);
-        Route::get('/{integration_code}', [ClientIntegrationController::class, 'show']);
-        Route::put('/{integration_code}', [ClientIntegrationController::class, 'store']);
-        Route::delete('/{integration_code}', [ClientIntegrationController::class, 'destroy']);
-    });
+Route::group(['prefix' => 'clients/{client}/integrations'], function () {
+    Route::get('/', [ClientIntegrationController::class, 'index']);
+    Route::get('/{integration_code}', [ClientIntegrationController::class, 'show']);
+    Route::put('/{integration_code}', [ClientIntegrationController::class, 'store']);
 });
 
 Route::post('webhooks/telepagos/{client}', [TelepagosWebhookController::class, 'handle']);

app/Domains/MailTest/Mailables/TestMail.php

@@ -28,21 +28,10 @@ class TestMail extends Mailable
     {
         $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
 
-        $branding = [
-            'name' => $this->tenant->nombre,
-            'primary_color' => $this->tenant->primary_color ?? '#6376f3',
-            'body_color' => '#334155',
-            'background_color' => '#f1f5f9',
-            'surface_color' => '#ffffff',
-            'header_bg_color' => $this->tenant->header_bg_color ?? '#ffffff',
-            'footer_bg_color' => $this->tenant->footer_bg_color ?? '#334155',
-        ];
-
         return new Content(
             view: 'mail.test',
             with: [
                 'tenant' => $this->tenant,
-                'branding' => $branding,
                 'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
                 'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
             ],

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/Listeners/SendPasswordResetEmail.php

@@ -6,6 +6,8 @@ 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
 {
@@ -20,10 +22,21 @@ class SendPasswordResetEmail implements ShouldQueueAfterCommit
 
     public function handle(PasswordResetRequested $event): void
     {
-        app(NotificationMailService::class)->sendPasswordResetCode(
-            $event->attemptId,
-            $event->tenantCode,
-            $event->channel,
-        );
+        try {
+            app(NotificationMailService::class)->sendPasswordResetCode(
+                $event->attemptId,
+                $event->tenantCode,
+                $event->channel,
+            );
+        } catch (Throwable $exception) {
+            Log::error('Failed to send password reset email.', [
+                'attempt_id' => $event->attemptId,
+                'tenant_code' => $event->tenantCode,
+                'channel' => $event->channel,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
     }
 }

app/Domains/Notification/Listeners/SendPurchasePaidEmail.php

@@ -7,7 +7,7 @@ use App\Domains\Purchase\Events\PurchasePaid;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
 
-class SendPurchaseConfirmedEmail implements ShouldQueueAfterCommit
+class SendPurchasePaidEmail implements ShouldQueueAfterCommit
 {
     use InteractsWithQueue;
 
@@ -20,6 +20,6 @@ class SendPurchaseConfirmedEmail implements ShouldQueueAfterCommit
 
     public function handle(PurchasePaid $event): void
     {
-        app(NotificationMailService::class)->sendPurchaseConfirmed($event->purchaseId);
+        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/Services/NotificationMailService.php

@@ -9,44 +9,28 @@ use App\Domains\Notification\Events\PasswordResetRequested;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\TicketPdfService;
 use App\Domains\Ticket\Services\TicketPresentationResolver;
-use Closure;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
-use Throwable;
 
 class NotificationMailService
 {
     public function __construct(
         private readonly MailService $mailService,
-        private readonly TicketPdfService $ticketPdfService,
     ) {}
 
     public function sendWelcome(int $userId, string $tenantCode): void
     {
-        $this->sendLogged('welcome', [
-            'user_id' => $userId,
-            'tenant_code' => $tenantCode,
-        ], function () use ($userId, $tenantCode): array {
-            $tenant = Tenant::query()->with('websiteType')->where('codigo', $tenantCode)->firstOrFail();
-            $user = User::query()->findOrFail($userId);
-            $brand = $tenant->websiteType ?? $tenant;
-            $tenantUrl = 'https://'.$tenant->dominio.$tenant->base_path;
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
+        $user = User::query()->findOrFail($userId);
 
-            $this->mailService
-                ->forTenant($tenantCode)
-                ->send(
-                    $user->email,
-                    "Bienvenido a {$brand->nombre}",
-                    view('mail.notifications.welcome', compact('brand', 'user', 'tenantUrl'))->render(),
-                    $brand,
-                );
-
-            return [
-                'brand_type' => $tenant->websiteType === null ? 'tenant' : 'website_type',
-            ];
-        });
+        $this->mailService
+            ->forTenant($tenantCode)
+            ->send(
+                $user->email,
+                "Bienvenido a {$tenant->nombre}",
+                view('mail.notifications.welcome', compact('tenant', 'user'))->render(),
+            );
     }
 
     public function sendPasswordResetCode(
@@ -54,173 +38,95 @@ class NotificationMailService
         string $tenantCode,
         string $channel = PasswordResetRequested::CHANNEL_STOREFRONT,
     ): void {
-        $context = [
-            'attempt_id' => $attemptId,
-            'tenant_code' => $tenantCode,
-            'channel' => $channel,
-        ];
+        $tenant = Tenant::query()
+            ->with('websiteType')
+            ->where('codigo', $tenantCode)
+            ->firstOrFail();
+        $attempt = ResetPasswordAttempt::query()
+            ->with('user')
+            ->findOrFail($attemptId);
 
-        $this->sendLogged('password_reset', $context, function () use ($attemptId, $tenantCode, $channel, $context): ?array {
-            $tenant = Tenant::query()
-                ->with('websiteType')
-                ->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,
+            ]);
 
-            if ($attempt->status !== ResetPasswordAttempt::STATUS_PENDING) {
-                $this->logSkipped('password_reset', array_merge($context, [
-                    'reason' => 'attempt_not_pending',
-                    'attempt_status' => $attempt->status,
-                    'user_id' => $attempt->user_id,
-                ]));
+            return;
+        }
 
-                return null;
-            }
+        $recoveryDomain = match ($channel) {
+            PasswordResetRequested::CHANNEL_ADMINAPP => $tenant->websiteType?->dominio,
+            PasswordResetRequested::CHANNEL_SCANNER => $tenant->websiteType?->scanner_domain,
+            default => $tenant->dominio,
+        };
+        $recoveryBasePath = $channel === PasswordResetRequested::CHANNEL_STOREFRONT
+            && $tenant->base_path !== '/'
+                ? $tenant->base_path
+                : '';
+        $recoveryQuery = ['email' => $attempt->user->email];
+        if (
+            $channel === PasswordResetRequested::CHANNEL_SCANNER
+            && $attempt->reason === ResetPasswordAttempt::REASON_STAFF_CREATED
+        ) {
+            $recoveryQuery['code'] = $attempt->codigo;
+        }
+        $recoveryUrl = $recoveryDomain === null
+            ? null
+            : 'https://'.$recoveryDomain.$recoveryBasePath.'/recuperar-contrasena/codigo?'.http_build_query($recoveryQuery);
 
-            $recoveryDomain = match ($channel) {
-                PasswordResetRequested::CHANNEL_ADMINAPP => $tenant->websiteType?->dominio,
-                PasswordResetRequested::CHANNEL_SCANNER => $tenant->websiteType?->scanner_domain,
-                default => $tenant->dominio,
-            };
-            $recoveryBasePath = $channel === PasswordResetRequested::CHANNEL_STOREFRONT
-                && $tenant->base_path !== '/'
-                    ? $tenant->base_path
-                    : '';
-            $recoveryQuery = ['email' => $attempt->user->email];
-            if (
-                $channel === PasswordResetRequested::CHANNEL_SCANNER
-                && $attempt->reason === ResetPasswordAttempt::REASON_STAFF_CREATED
-            ) {
-                $recoveryQuery['code'] = $attempt->codigo;
-            }
-            $recoveryUrl = $recoveryDomain === null
-                ? null
-                : 'https://'.$recoveryDomain.$recoveryBasePath.'/recuperar-contrasena/codigo?'.http_build_query($recoveryQuery);
-            $brand = $tenant->websiteType ?? $tenant;
-
-            [$subject, $template] = match ($attempt->reason) {
-                ResetPasswordAttempt::REASON_STAFF_CREATED => [
-                    'Tu cuenta de escáner está lista', 'scanner-created',
-                ],
-                ResetPasswordAttempt::REASON_ADMINISTRATOR_CREATED => [
-                    'Tu cuenta de administrador está lista', 'administrator-created',
-                ],
-                ResetPasswordAttempt::REASON_ACCOUNT_LOCKED => [
-                    'Desbloqueá tu cuenta', 'account-locked',
-                ],
-                default => ['Código para recuperar tu contraseña', 'password-reset'],
-            };
-
-            $this->mailService
-                ->forTenant($tenantCode)
-                ->send(
-                    $attempt->user->email,
-                    "{$subject} - {$brand->nombre}",
-                    view("mail.notifications.{$template}", [
-                        'attempt' => $attempt,
-                        'recoveryUrl' => $recoveryUrl,
-                        'brand' => $brand,
-                    ])->render(),
-                    $brand,
-                );
-
-            return [
-                'user_id' => $attempt->user_id,
-                'recovery_domain_available' => $recoveryDomain !== null,
-            ];
-        });
+        $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', 'recoveryUrl'))->render(),
+            );
     }
 
-    public function sendPurchaseConfirmed(int $purchaseId): void
+    public function sendPurchasePaid(int $purchaseId): void
     {
-        $context = ['purchase_id' => $purchaseId];
+        $purchase = Purchase::query()
+            ->with(['tenant', 'user', 'items'])
+            ->findOrFail($purchaseId);
 
-        $this->sendLogged('purchase_confirmed', $context, function () use ($purchaseId, $context): ?array {
-            $purchase = Purchase::query()
-                ->with(['tenant', 'user', 'items'])
-                ->find($purchaseId);
+        $this->mailService
+            ->forTenant($purchase->tenant_codigo)
+            ->send(
+                $this->recipientFor($purchase),
+                "Pago confirmado - Compra #{$purchase->getKey()}",
+                view('mail.notifications.purchase-paid', compact('purchase'))->render(),
+            );
+    }
 
-            if ($purchase === null) {
-                $this->logSkipped('purchase_confirmed', array_merge($context, [
-                    'reason' => 'purchase_not_found',
-                    'missing_model' => Purchase::class,
-                ]));
+    /** @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)
+            ->with(TicketPresentationResolver::RELATIONS)
+            ->get();
 
-                return null;
-            }
+        if ($tickets->isEmpty()) {
+            return;
+        }
 
-            /** @var Collection<int, Ticket> $tickets */
-            $tickets = $purchase->tickets()
-                ->where('tenant_code', $purchase->tenant_codigo)
-                ->with(TicketPresentationResolver::RELATIONS)
-                ->get();
-            $attachments = $tickets->isEmpty()
-                ? []
-                : [[
-                    'data' => $this->ticketPdfService->contents($purchase->tenant, $tickets),
-                    'name' => $this->ticketPdfService->filename($tickets),
-                    'mime' => 'application/pdf',
-                ]];
-
-            $this->mailService
-                ->forTenant($purchase->tenant_codigo)
-                ->send(
-                    $this->recipientFor($purchase),
-                    "Compra confirmada - Compra #{$purchase->getKey()}",
-                    view('mail.notifications.purchase-confirmed', compact('purchase', 'tickets'))->render(),
-                    attachments: $attachments,
-                );
-
-            return [
-                'tenant_code' => $purchase->tenant_codigo,
-                'user_id' => $purchase->user_id,
-                'purchase_status' => $purchase->status,
-                'purchase_item_count' => $purchase->items->count(),
-                'ticket_count' => $tickets->count(),
-                'ticket_ids' => $tickets->modelKeys(),
-            ];
-        });
+        $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);
     }
-
-    /**
-     * @param  array<string, mixed>  $context
-     * @param  Closure(): (array<string, mixed>|null)  $send
-     */
-    private function sendLogged(string $emailType, array $context, Closure $send): void
-    {
-        try {
-            $resultContext = $send();
-
-            if ($resultContext === null) {
-                return;
-            }
-
-            Log::channel('emails')->info('Notification email sent.', array_merge($context, $resultContext, [
-                'email_type' => $emailType,
-                'mailer' => $this->mailService->mailerName(),
-            ]));
-        } catch (Throwable $exception) {
-            Log::channel('emails')->error('Notification email delivery failed.', array_merge($context, [
-                'email_type' => $emailType,
-                'exception' => $exception,
-            ]));
-
-            throw $exception;
-        }
-    }
-
-    /** @param array<string, mixed> $context */
-    private function logSkipped(string $emailType, array $context): void
-    {
-        Log::channel('emails')->warning('Notification email skipped.', array_merge($context, [
-            'email_type' => $emailType,
-        ]));
-    }
 }

app/Domains/Notification/documentacion/README.md

@@ -8,11 +8,12 @@ Orquesta notificaciones de negocio por correo a partir de eventos de otros domin
 
 - `UserRegistered`: dispara el correo de bienvenida.
 - `PasswordResetRequested`: envía el código de recuperación si el intento sigue pendiente.
-- `PurchasePaid`: envía la confirmación de compra y adjunta los tickets generados, cuando corresponde.
+- `PurchasePaid`: envía la confirmación de pago.
+- `TicketsAvailable`: informa y entrega la disponibilidad de tickets.
 
 ## Componentes
 
-Los listeners `SendWelcomeEmail`, `SendPasswordResetEmail` y `SendPurchaseConfirmedEmail` delegan en `NotificationMailService`. Este servicio carga el contexto necesario, renderiza las vistas y envía mediante `Integration/MailService`.
+Los listeners `SendWelcomeEmail`, `SendPasswordResetEmail`, `SendPurchasePaidEmail` y `SendTicketsAvailableEmail` delegan en `NotificationMailService`. Este servicio carga el contexto necesario, renderiza las vistas y envía mediante `Integration/MailService`.
 
 ## API y dependencias
 
@@ -22,6 +23,4 @@ No expone rutas HTTP. Consume datos de `Auth`, `Tenant`, `Purchase` y `Ticket`,
 
 - Los listeners reciben identificadores y vuelven a cargar los modelos, evitando transportar entidades obsoletas.
 - La recuperación no se envía si el intento dejó de estar pendiente.
-- Los correos de cuenta (bienvenida y recuperación de contraseña) usan la identidad visual del `WebsiteType` asociado al tenant, con fallback al tenant si no tiene uno configurado.
-- El correo transaccional de compra confirmada usa la identidad visual del tenant y adjunta un único PDF cuando la compra generó tickets.
 - Los handlers deben permanecer idempotentes o tolerantes a reintentos de cola.

app/Domains/Purchase/Controllers/PurchaseController.php

@@ -36,7 +36,6 @@ class PurchaseController extends Controller
 
         return PurchaseResource::collection(
             Purchase::query()
-                ->with('stockReservation')
                 ->where('tenant_codigo', $tenant->codigo)
                 ->where('user_id', $request->user()->id)
                 ->when($statuses !== [], fn ($query) => $query->whereIn('status', $statuses))
@@ -93,6 +92,7 @@ class PurchaseController extends Controller
         PaymentIntentRequest $request,
         Tenant $tenant,
         Purchase $compra,
+        CheckoutService $checkoutService,
         PurchaseStateGuard $purchaseState,
     ): JsonResponse {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
@@ -101,12 +101,7 @@ class PurchaseController extends Controller
             ? preg_replace('/\D+/', '', (string) $request->validated('transfer_payer_dni'))
             : null;
 
-        $updated = DB::transaction(function () use (
-            $compra,
-            $method,
-            $purchaseState,
-            $transferPayerDni,
-        ): bool {
+        $updated = DB::transaction(function () use ($compra, $method, $purchaseState, $transferPayerDni): bool {
             /** @var Purchase|null $purchase */
             $purchase = Purchase::query()
                 ->whereKey($compra->getKey())
@@ -133,6 +128,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' => $purchase->calculateCurrentTotalAmount(),
             ];
 
@@ -152,6 +150,7 @@ class PurchaseController extends Controller
 
         $compra->refresh();
         $totalAmount = (float) $compra->total;
+        $checkoutService->syncReservationExpiration($compra);
 
         if ($method === 'transfer') {
             $telepagosService = new TelepagosIntegrationService;

app/Domains/Purchase/Events/PurchasePaid.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\Purchase\Events;
 
+use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -9,5 +10,5 @@ class PurchasePaid
 {
     use Dispatchable, SerializesModels;
 
-    public function __construct(public readonly int $purchaseId) {}
+    public function __construct(public readonly Purchase $purchase) {}
 }

app/Domains/Purchase/Models/Purchase.php

@@ -14,17 +14,16 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\DB;
 
 #[Fillable([
     'cart_id',
-    'stock_reservation_id',
     'tenant_codigo',
     'user_id',
     'status',
     'payment_method',
+    'expires_at',
     'total',
     'dni',
     'transfer_payer_dni',
@@ -52,14 +51,6 @@ class Purchase extends Model
 
     public const STATUS_SUPERSEDED = 'superseded';
 
-    public const ADMIN_STATUS_INCOMPLETE = 'incomplete';
-
-    public const ADMIN_STATUS_AWAITING_PAYMENT = 'awaiting_payment';
-
-    public const ADMIN_STATUS_CONFIRMED = 'confirmed';
-
-    public const ADMIN_STATUS_CANCELLED = 'cancelled';
-
     /** @return list<string> */
     public static function statuses(): array
     {
@@ -75,68 +66,6 @@ class Purchase extends Model
         ];
     }
 
-    /**
-     * @return array<string, array{name: string, statuses: list<string>}>
-     */
-    public static function adminStatuses(): array
-    {
-        return [
-            self::ADMIN_STATUS_INCOMPLETE => [
-                'name' => 'Por completar datos',
-                'statuses' => [self::STATUS_CREATED],
-            ],
-            self::ADMIN_STATUS_AWAITING_PAYMENT => [
-                'name' => 'Esperando pago',
-                'statuses' => [self::STATUS_PENDING_PAYMENT, self::STATUS_IN_REVIEW],
-            ],
-            self::ADMIN_STATUS_CONFIRMED => [
-                'name' => 'Confirmado',
-                'statuses' => [self::STATUS_PAID],
-            ],
-            self::ADMIN_STATUS_CANCELLED => [
-                'name' => 'Anulado',
-                'statuses' => [
-                    self::STATUS_CANCELLED,
-                    self::STATUS_REJECTED,
-                    self::STATUS_EXPIRED,
-                    self::STATUS_SUPERSEDED,
-                ],
-            ],
-        ];
-    }
-
-    /** @return list<string> */
-    public static function adminStatusCodes(): array
-    {
-        return array_keys(self::adminStatuses());
-    }
-
-    /** @return list<string> */
-    public static function realStatusesForAdminStatus(string $adminStatus): array
-    {
-        return self::adminStatuses()[$adminStatus]['statuses'] ?? [];
-    }
-
-    public static function adminStatusFor(string $realStatus): ?string
-    {
-        foreach (self::adminStatuses() as $adminStatus => $definition) {
-            if (in_array($realStatus, $definition['statuses'], true)) {
-                return $adminStatus;
-            }
-        }
-
-        return null;
-    }
-
-    public static function adminStatusNameFor(string $realStatus): ?string
-    {
-        $adminStatus = self::adminStatusFor($realStatus);
-
-        return $adminStatus === null
-            ? null
-            : self::adminStatuses()[$adminStatus]['name'];
-    }
-
     protected $table = 'compras';
 
     /** @var array<int, string> */
@@ -148,8 +77,8 @@ class Purchase extends Model
     {
         return [
             'cart_id' => 'integer',
-            'stock_reservation_id' => 'integer',
             'user_id' => 'integer',
+            'expires_at' => 'datetime',
             'total' => 'decimal:2',
         ];
     }
@@ -186,21 +115,18 @@ class Purchase extends Model
         return $this->hasMany(PurchaseItem::class, 'compra_id');
     }
 
-    /** @return HasManyThrough<Ticket, PurchaseItem, $this> */
-    public function tickets(): HasManyThrough
+    /**
+     * @return HasMany<Ticket, $this>
+     */
+    public function tickets(): HasMany
     {
-        return $this->hasManyThrough(
-            Ticket::class,
-            PurchaseItem::class,
-            'compra_id',
-            'source_purchase_item_id',
-        );
+        return $this->hasMany(Ticket::class, 'source_purchase_id');
     }
 
-    /** @return BelongsTo<StockReservation, $this> */
-    public function stockReservation(): BelongsTo
+    /** @return HasMany<StockReservation, $this> */
+    public function stockReservations(): HasMany
     {
-        return $this->belongsTo(StockReservation::class);
+        return $this->hasMany(StockReservation::class);
     }
 
     /**
@@ -219,12 +145,6 @@ class Purchase extends Model
         return $this->hasMany(TelepagosPayment::class, 'compra_id');
     }
 
-    /** @return HasMany<TelepagosPaymentCandidate, $this> */
-    public function telepagosPaymentCandidates(): HasMany
-    {
-        return $this->hasMany(TelepagosPaymentCandidate::class, 'compra_id');
-    }
-
     public function getTotalAmount(): float
     {
         if ($this->total !== null) {
@@ -273,7 +193,7 @@ class Purchase extends Model
                 'status' => self::STATUS_PAID,
             ]);
 
-            PurchasePaid::dispatch($this->getKey());
+            PurchasePaid::dispatch($this);
         });
     }
 }

app/Domains/Purchase/Models/PurchaseItem.php

@@ -5,12 +5,10 @@ namespace App\Domains\Purchase\Models;
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
-use App\Domains\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'compra_id',
@@ -58,12 +56,6 @@ class PurchaseItem extends Model
         return $this->belongsTo(Purchase::class, 'compra_id');
     }
 
-    /** @return HasMany<Ticket, $this> */
-    public function tickets(): HasMany
-    {
-        return $this->hasMany(Ticket::class, 'source_purchase_item_id');
-    }
-
     /** @return BelongsTo<Attachment, $this> */
     public function imageAttachment(): BelongsTo
     {

app/Domains/Purchase/Models/TelepagosPayment.php

@@ -6,10 +6,10 @@ use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'compra_id',
+    'matched_purchase_ids',
     'cuit_buyer',
     'cvu_buyer',
     'amount',
@@ -30,6 +30,7 @@ class TelepagosPayment extends Model
     {
         return [
             'compra_id' => 'integer',
+            'matched_purchase_ids' => 'array',
             'amount' => 'decimal:2',
         ];
     }
@@ -41,10 +42,4 @@ class TelepagosPayment extends Model
     {
         return $this->belongsTo(Purchase::class, 'compra_id');
     }
-
-    /** @return HasMany<TelepagosPaymentCandidate, $this> */
-    public function candidates(): HasMany
-    {
-        return $this->hasMany(TelepagosPaymentCandidate::class, 'telepagos_payment_id');
-    }
 }

app/Domains/Purchase/Models/TelepagosPaymentCandidate.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Domains\Purchase\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'telepagos_payment_id',
-    'compra_id',
-    'dni_matches',
-    'dni_distance',
-    'payment_dni',
-    'purchase_dni',
-    'amount_matches',
-    'payment_amount',
-    'purchase_amount',
-    'amount_difference',
-    'match_reason',
-    'confidence',
-])]
-class TelepagosPaymentCandidate extends Model
-{
-    protected $table = 'telepagos_payment_candidates';
-
-    protected function casts(): array
-    {
-        return [
-            'telepagos_payment_id' => 'integer',
-            'compra_id' => 'integer',
-            'dni_matches' => 'boolean',
-            'dni_distance' => 'integer',
-            'amount_matches' => 'boolean',
-            'payment_amount' => 'decimal:2',
-            'purchase_amount' => 'decimal:2',
-            'amount_difference' => 'decimal:2',
-        ];
-    }
-
-    public function payment(): BelongsTo
-    {
-        return $this->belongsTo(TelepagosPayment::class, 'telepagos_payment_id');
-    }
-
-    public function purchase(): BelongsTo
-    {
-        return $this->belongsTo(Purchase::class, 'compra_id');
-    }
-}

app/Domains/Purchase/Resources/PurchaseResource.php

@@ -4,7 +4,6 @@ namespace App\Domains\Purchase\Resources;
 
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Purchase\Models\TelepagosPaymentCandidate;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -18,15 +17,12 @@ class PurchaseResource extends JsonResource
      */
     public function toArray(Request $request): array
     {
-        $serverTime = now();
-        $expiresAt = $this->stockReservation?->expires_at;
         $items = $this->resource->relationLoaded('items')
             ? $this->resource->getRelation('items')
             : collect();
         $ticketsCount = array_key_exists('tickets_count', $this->resource->getAttributes())
             ? (int) $this->resource->getAttribute('tickets_count')
             : null;
-        $paymentVerification = $this->resolvePaymentVerification();
 
         $subtotal = $items->isNotEmpty()
             ? $items->reduce(
@@ -52,11 +48,7 @@ class PurchaseResource extends JsonResource
             'created_at' => $this->created_at,
             'status' => $this->status,
             'payment_method' => $this->payment_method,
-            'expires_at' => $expiresAt,
-            'expires_in_seconds' => $expiresAt === null
-                ? null
-                : max(0, $expiresAt->getTimestamp() - $serverTime->getTimestamp()),
-            'server_time' => $serverTime,
+            'expires_at' => $this->expires_at,
             'dni' => $this->dni,
             'transfer_payer_dni' => $this->transfer_payer_dni,
             'telefono' => $this->telefono,
@@ -66,7 +58,6 @@ class PurchaseResource extends JsonResource
             'items' => PurchaseItemResource::collection($items),
             'tickets_count' => $this->when($ticketsCount !== null, $ticketsCount),
             'has_generated_tickets' => $this->when($ticketsCount !== null, $ticketsCount > 0),
-            'payment_verification' => $this->when($paymentVerification !== null, $paymentVerification),
             'subtotal' => $this->formatMoney($subtotal),
             'total' => $this->formatMoney($total),
         ];
@@ -86,75 +77,4 @@ class PurchaseResource extends JsonResource
     {
         return number_format((float) ($amount ?? 0), 2, '.', '');
     }
-
-    /** @return array<string, mixed>|null */
-    private function resolvePaymentVerification(): ?array
-    {
-        if (
-            $this->status !== Purchase::STATUS_IN_REVIEW
-            || $this->payment_method !== 'transfer'
-            || ! $this->resource->relationLoaded('telepagosPaymentCandidates')
-        ) {
-            return null;
-        }
-
-        $candidates = $this->resource
-            ->getRelation('telepagosPaymentCandidates')
-            ->sort(fn (TelepagosPaymentCandidate $left, TelepagosPaymentCandidate $right): int => $this->comparePaymentCandidates($left, $right))
-            ->values();
-        /** @var TelepagosPaymentCandidate|null $primary */
-        $primary = $candidates->first();
-
-        return [
-            'status' => $primary === null ? 'pending' : 'candidate',
-            'candidate_count' => $candidates->count(),
-            'primary' => $primary === null ? null : [
-                'reason' => $primary->match_reason,
-                'dni_distance' => $primary->dni_distance,
-                'payment_amount' => $this->formatMoney($primary->payment_amount),
-                'purchase_amount' => $this->formatMoney($primary->purchase_amount),
-                'amount_difference' => $this->formatMoney($primary->amount_difference),
-                'confidence' => $primary->confidence,
-                'detected_at' => $primary->payment?->created_at?->toIso8601String(),
-            ],
-            'reasons' => $candidates
-                ->pluck('match_reason')
-                ->unique()
-                ->values()
-                ->all(),
-        ];
-    }
-
-    private function comparePaymentCandidates(
-        TelepagosPaymentCandidate $left,
-        TelepagosPaymentCandidate $right,
-    ): int {
-        $reasonComparison = $this->paymentCandidateRank($left->match_reason)
-            <=> $this->paymentCandidateRank($right->match_reason);
-
-        if ($reasonComparison !== 0) {
-            return $reasonComparison;
-        }
-
-        $differenceComparison = (float) $left->amount_difference <=> (float) $right->amount_difference;
-
-        if ($differenceComparison !== 0) {
-            return $differenceComparison;
-        }
-
-        $leftTimestamp = $left->payment?->created_at?->getTimestamp() ?? 0;
-        $rightTimestamp = $right->payment?->created_at?->getTimestamp() ?? 0;
-
-        return ($rightTimestamp <=> $leftTimestamp) ?: ($right->id <=> $left->id);
-    }
-
-    private function paymentCandidateRank(string $reason): int
-    {
-        return match ($reason) {
-            'ambiguous_exact_match' => 0,
-            'exact_dni_near_amount' => 1,
-            'exact_amount_near_dni' => 2,
-            default => 3,
-        };
-    }
 }

app/Domains/Purchase/Services/Checkout/CompleteCheckoutService.php

@@ -61,7 +61,10 @@ class CompleteCheckoutService
 
             $this->purchaseState->lockCurrentCart($purchase);
 
-            if ($purchase->status !== Purchase::STATUS_PENDING_PAYMENT) {
+            if (
+                $purchase->status !== Purchase::STATUS_PENDING_PAYMENT
+                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
+            ) {
                 throw ValidationException::withMessages([
                     'purchase' => __('api.purchase.not_available_for_review'),
                 ]);
@@ -69,8 +72,9 @@ class CompleteCheckoutService
 
             $purchase->update([
                 'status' => Purchase::STATUS_IN_REVIEW,
+                'expires_at' => null,
             ]);
-            $this->reservations->clearExpirationForReview($purchase);
+            $this->reservations->syncPurchaseExpiration($purchase);
 
             return $this->loadPurchase($purchase);
         });
@@ -157,14 +161,13 @@ class CompleteCheckoutService
                     ]);
                 }
 
-            }
-
-            try {
-                $this->reservations->commit($purchase);
-            } catch (\InvalidArgumentException) {
-                throw ValidationException::withMessages([
-                    'items' => __('api.purchase.inconsistent_reservation'),
-                ]);
+                try {
+                    $this->reservations->commit($cartItem, $selection, $purchase);
+                } catch (\InvalidArgumentException) {
+                    throw ValidationException::withMessages([
+                        'items' => __('api.purchase.inconsistent_reservation'),
+                    ]);
+                }
             }
 
             $this->sourceCart->finalize($purchase);
@@ -191,7 +194,7 @@ class CompleteCheckoutService
 
     private function loadPurchase(Purchase $purchase): Purchase
     {
-        return $purchase->load(['items.imageAttachment', 'stockReservation']);
+        return $purchase->load(['items.imageAttachment']);
     }
 
     private function itemKey(int $catalogItemId, ?int $variantId): string

app/Domains/Purchase/Services/Checkout/PurchaseResponseLoader.php

@@ -8,15 +8,6 @@ class PurchaseResponseLoader
 {
     public function load(Purchase $purchase): Purchase
     {
-        $relations = ['tenant', 'items.imageAttachment', 'stockReservation'];
-
-        if (
-            $purchase->status === Purchase::STATUS_IN_REVIEW
-            && $purchase->payment_method === 'transfer'
-        ) {
-            $relations[] = 'telepagosPaymentCandidates.payment';
-        }
-
-        return $purchase->load($relations);
+        return $purchase->load(['tenant', 'items.imageAttachment']);
     }
 }