feat(ticket): persist and expose refund details

Documenta la prioridad cliente a tipo de sitio, la edicion compartida, los permisos y los contratos de la API. Aclara la migracion del requisito de configuracion y la asociacion directa requerida por el webhook de Telepagos.

.env.example

@@ -8,6 +8,7 @@ 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
 
@@ -31,6 +32,7 @@ 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
@@ -41,6 +43,9 @@ TELEPAGOS_LOG_LEVEL=info
 TELEPAGOS_LOG_DAYS=30
 COMMANDS_LOG_LEVEL=info
 COMMANDS_LOG_DAYS=30
+EMAILS_LOG_LEVEL=info
+EMAILS_LOG_DAYS=30
+EMAIL_DELIVERY_LEASE_SECONDS=300
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

app/Domains/Administrator/Controllers/AdminAppAdministratorController.php

@@ -0,0 +1,49 @@
+<?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

@@ -0,0 +1,38 @@
+<?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

@@ -0,0 +1,41 @@
+<?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

@@ -0,0 +1,27 @@
+<?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

@@ -0,0 +1,99 @@
+<?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

@@ -0,0 +1,63 @@
+# 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

@@ -0,0 +1,10 @@
+<?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,6 +5,7 @@ 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;
@@ -26,6 +27,7 @@ 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,6 +5,7 @@ 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;
@@ -22,10 +23,19 @@ class ValidateResetPasswordAttemptController extends Controller
     {
         $data = $request->validated();
 
-        if (! $this->resetPasswordAttemptService->validateCode(
+        $result = $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'])]
+#[Fillable(['user_id', 'codigo', 'reason', 'status', 'expires_at'])]
 #[Hidden(['codigo'])]
 class ResetPasswordAttempt extends Model
 {
@@ -17,6 +17,8 @@ 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';
@@ -31,6 +33,7 @@ class ResetPasswordAttempt extends Model
     {
         return [
             'user_id' => 'integer',
+            'expires_at' => 'datetime',
         ];
     }
 

app/Domains/Auth/Models/User.php

@@ -6,6 +6,7 @@ use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Authorization\Models\Role;
 use App\Domains\Catalog\Models\Category;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Models\ScanAttempt;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
@@ -13,16 +14,17 @@ 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'])]
+#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
 class User extends Authenticatable
 {
     /** @use HasFactory<UserFactory> */
-    use HasApiTokens, HasFactory, Notifiable;
+    use HasApiTokens, HasFactory, Notifiable, SoftDeletes;
 
     protected $attributes = [
         'rol_codigo' => RoleCode::User->value,
@@ -45,6 +47,12 @@ class User extends Authenticatable
         return $this->hasMany(LoginAttempt::class);
     }
 
+    /** @return HasMany<ScanAttempt, $this> */
+    public function scanAttempts(): HasMany
+    {
+        return $this->hasMany(ScanAttempt::class, 'scanner_user_id');
+    }
+
     /**
      * @return BelongsTo<Role, $this>
      */

app/Domains/Auth/Requests/RegisterUserRequest.php

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

app/Domains/Auth/Resources/UserResource.php

@@ -24,6 +24,11 @@ class UserResource extends JsonResource
             'telefono' => $this->telefono,
             'rol_codigo' => $this->rol_codigo,
             'tenant_codigo' => $this->tenant_codigo,
+            'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
+                ->map(fn ($category) => [
+                    'id' => $category->id,
+                    'nombre' => $category->nombre,
+                ])->values()),
         ];
     }
 }

app/Domains/Auth/Services/AdminCredentialVerifier.php

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

app/Domains/Auth/Services/GoogleAuthService.php

@@ -3,6 +3,7 @@
 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;
@@ -124,12 +125,12 @@ class GoogleAuthService
             ]);
         }
 
-        $user = User::query()->where('google_id', $googleId)->first();
+        $user = User::query()->where('rol_codigo', RoleCode::User->value)->where('google_id', $googleId)->first();
         if ($user) {
             return $user;
         }
 
-        $user = User::query()->where('email', $email)->first();
+        $user = User::query()->where('rol_codigo', RoleCode::User->value)->where('active_email', mb_strtolower(trim($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,
-            null,
+            RoleCode::Scanner,
             true,
             PermissionCode::ScanTickets->value,
             PasswordResetRequested::CHANNEL_SCANNER,
@@ -120,7 +120,7 @@ class PasswordLoginService
             $passwordResetChannel,
         ): array {
             $user = User::query()
-                ->where('email', $normalizedEmail)
+                ->where('active_email', $normalizedEmail)
                 ->when(
                     $requiredRole !== null,
                     fn ($query) => $query->where('rol_codigo', $requiredRole->value),

app/Domains/Auth/Services/ResetPasswordAttemptService.php

@@ -12,6 +12,12 @@ 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,
@@ -22,7 +28,8 @@ class ResetPasswordAttemptService
         try {
             $attemptId = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?int {
                 $user = User::query()
-                    ->where('email', $email)
+                    ->where('active_email', mb_strtolower(trim($email)))
+                    ->where('rol_codigo', RoleCode::User->value)
                     ->lockForUpdate()
                     ->first();
 
@@ -59,7 +66,7 @@ class ResetPasswordAttemptService
         try {
             $result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
                 $user = User::query()
-                    ->where('email', $email)
+                    ->where('active_email', mb_strtolower(trim($email)))
                     ->where('rol_codigo', RoleCode::AdminApp->value)
                     ->whereNotNull('tenant_codigo')
                     ->lockForUpdate()
@@ -107,7 +114,7 @@ class ResetPasswordAttemptService
         try {
             $result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
                 $user = User::query()
-                    ->where('email', $email)
+                    ->where('active_email', mb_strtolower(trim($email)))
                     ->where('rol_codigo', RoleCode::Scanner->value)
                     ->whereNotNull('tenant_codigo')
                     ->lockForUpdate()
@@ -146,14 +153,15 @@ class ResetPasswordAttemptService
         );
     }
 
-    public function validateCode(string $email, string $code): bool
+    public function validateCode(string $email, string $code, RoleCode $role = RoleCode::User): string
     {
         $emailFingerprint = $this->emailFingerprint($email);
 
         try {
-            return DB::transaction(function () use ($email, $code, $emailFingerprint): bool {
+            return DB::transaction(function () use ($email, $code, $emailFingerprint, $role): string {
                 $user = User::query()
-                    ->where('email', $email)
+                    ->where('active_email', mb_strtolower(trim($email)))
+                    ->where('rol_codigo', $role->value)
                     ->lockForUpdate()
                     ->first();
 
@@ -169,14 +177,27 @@ class ResetPasswordAttemptService
                         'email_fingerprint' => $emailFingerprint,
                     ]);
 
-                    return false;
+                    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;
                 }
 
                 $attempt->update([
                     'status' => ResetPasswordAttempt::STATUS_VALIDATED,
                 ]);
 
-                return true;
+                return self::CODE_VALID;
             });
         } catch (Throwable $exception) {
             Log::error('Failed to validate password reset code.', [
@@ -188,14 +209,15 @@ class ResetPasswordAttemptService
         }
     }
 
-    public function resetPassword(string $email, string $code, string $password): bool
+    public function resetPassword(string $email, string $code, string $password, RoleCode $role = RoleCode::User): bool
     {
         $emailFingerprint = $this->emailFingerprint($email);
 
         try {
-            return DB::transaction(function () use ($email, $code, $password, $emailFingerprint): bool {
+            return DB::transaction(function () use ($email, $code, $password, $emailFingerprint, $role): bool {
                 $user = User::query()
-                    ->where('email', $email)
+                    ->where('active_email', mb_strtolower(trim($email)))
+                    ->where('rol_codigo', $role->value)
                     ->lockForUpdate()
                     ->first();
 
@@ -214,6 +236,19 @@ 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;
@@ -270,6 +305,7 @@ 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/Services/ScannerContextService.php

@@ -19,6 +19,16 @@ class ScannerContextService
 
         $user->setRelation('tenant', $tenant);
 
+        if ($tenant->requiresScannerCategoryValidation()) {
+            $categories = $user->scanCategories()
+                ->orderBy('nombre')
+                ->get();
+
+            if ($categories->isNotEmpty()) {
+                $user->setRelation('scanCategories', $categories);
+            }
+        }
+
         return $user;
     }
 }

app/Domains/Auth/routes/adminapp.php

@@ -12,8 +12,10 @@ 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,8 +12,10 @@ 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

@@ -17,6 +17,7 @@ class AdminAppBootstrapResource extends JsonResource
 
         return [
             'website_type_code' => $websiteType->codigo,
+            'site_title' => $websiteType->site_title,
             'primary_color' => $websiteType->primary_color,
             'secondary_color' => $websiteType->secondary_color,
             'danger_color' => $websiteType->danger_color,
@@ -30,6 +31,7 @@ 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'])
+                ->with(['siteLogo', 'footerLogo', 'favicon'])
                 ->where('dominio', $domain)
                 ->firstOrFail(),
         ];

app/Domains/Bootstrap/Services/ScannerBootstrapService.php

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

app/Domains/Cart/Controllers/CartController.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Cart\Controllers;
 
-use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Cart\Requests\AddCartItemRequest;
 use App\Domains\Cart\Requests\UpdateCartItemQuantityRequest;
@@ -78,36 +77,6 @@ class CartController extends Controller
         ]);
     }
 
-    public function updateCheckoutItem(
-        UpdateCartItemQuantityRequest $request,
-        Tenant $tenant,
-        Cart $cart,
-        CartItem $cartItem,
-    ): CartResource {
-        $updatesVariant = $request->exists('variant_id');
-
-        return CartResource::make(
-            $this->cartService->updateCheckoutItem(
-                $tenant,
-                $request,
-                $cart,
-                $cartItem->getKey(),
-                (int) $request->validated('cantidad'),
-                $updatesVariant
-                    ? ($request->validated('variant_id') !== null
-                        ? (int) $request->validated('variant_id')
-                        : null)
-                    : $cartItem->variant_id,
-                $updatesVariant,
-            ),
-        )->additional([
-            'code' => $updatesVariant ? 'cart.item_updated' : 'cart.quantity_updated',
-            'message' => $updatesVariant
-                ? __('api.cart.item_updated')
-                : __('api.cart.quantity_updated'),
-        ]);
-    }
-
     public function removeItem(Request $request, Tenant $tenant, CartItem $cartItem): CartResource
     {
         return CartResource::make(
@@ -117,23 +86,4 @@ class CartController extends Controller
             'message' => __('api.cart.item_removed'),
         ]);
     }
-
-    public function removeCheckoutItem(
-        Request $request,
-        Tenant $tenant,
-        Cart $cart,
-        CartItem $cartItem,
-    ): CartResource {
-        return CartResource::make(
-            $this->cartService->removeCheckoutItem(
-                $tenant,
-                $request,
-                $cart,
-                $cartItem->getKey(),
-            ),
-        )->additional([
-            'code' => 'cart.item_removed',
-            'message' => __('api.cart.item_removed'),
-        ]);
-    }
 }

app/Domains/Cart/Models/Cart.php

@@ -5,6 +5,7 @@ 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;
@@ -27,6 +28,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
     'guest_token',
     'status',
     'origin',
+    'current_purchase_id',
+    'current_stock_reservation_id',
 ])]
 class Cart extends Model
 {
@@ -35,6 +38,16 @@ 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';
@@ -43,6 +56,8 @@ class Cart extends Model
     {
         return [
             'user_id' => 'integer',
+            'current_purchase_id' => 'integer',
+            'current_stock_reservation_id' => 'integer',
         ];
     }
 
@@ -76,6 +91,21 @@ class Cart extends Model
         return $this->hasMany(Purchase::class, 'cart_id');
     }
 
+    /** @return BelongsTo<Purchase, $this> */
+    public function currentPurchase(): BelongsTo
+    {
+        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')
@@ -98,7 +128,8 @@ class Cart extends Model
         }
 
         return DB::transaction(function () use ($catalogItemId, $variantId, $quantity): CartItem {
-            self::query()->whereKey($this->getKey())->lockForUpdate()->firstOrFail();
+            $this->invalidateCurrentCheckout();
+            app(StockReservationService::class)->assertCartReservationUsable($this);
             $selectedItem = $this->resolveScopedItem($catalogItemId, $variantId, true);
             $cartQuantity = (int) $this->items()
                 ->where('catalog_item_id', $catalogItemId)
@@ -132,12 +163,11 @@ class Cart extends Model
                     'cantidad' => $quantity,
                 ]);
             } else {
-                app(StockReservationService::class)->ensure($item, $selectedItem);
                 $item->cantidad += $quantity;
                 $item->save();
             }
 
-            app(StockReservationService::class)->reserve($item, $selectedItem, $quantity);
+            app(StockReservationService::class)->syncCart($this);
 
             return $item->fresh();
         });
@@ -163,6 +193,9 @@ class Cart extends Model
             $updateVariant,
             $excludedPurchaseId,
         ): CartItem {
+            $this->invalidateCurrentCheckout();
+            app(StockReservationService::class)->assertCartReservationUsable($this);
+
             /** @var CartItem $item */
             $item = $this->items()
                 ->where('id', $cartItemId)
@@ -195,7 +228,6 @@ class Cart extends Model
                     $nextAvailableQuantity,
                 );
 
-                app(StockReservationService::class)->release($item, $currentSelection, $item->cantidad);
                 $availableQuantity = $inventoryService->availableQuantity($nextSelection);
 
                 if ($availableQuantity !== null && $availableQuantity < $quantity) {
@@ -212,11 +244,10 @@ 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();
                 }
@@ -224,7 +255,7 @@ class Cart extends Model
                 $item->variant_id = $variantId;
                 $item->cantidad = $quantity;
                 $item->save();
-                app(StockReservationService::class)->reserve($item, $nextSelection, $quantity);
+                app(StockReservationService::class)->syncCart($this);
 
                 return $item->fresh();
             }
@@ -253,16 +284,9 @@ 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();
         });
@@ -271,26 +295,79 @@ class Cart extends Model
     public function removeItem(int $cartItemId): void
     {
         DB::transaction(function () use ($cartItemId): void {
+            $this->invalidateCurrentCheckout();
+            app(StockReservationService::class)->assertCartReservationUsable($this);
+
             /** @var CartItem $item */
             $item = $this->items()
                 ->where('id', $cartItemId)
                 ->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);
         });
     }
 
+    private function invalidateCurrentCheckout(): void
+    {
+        $candidatePurchaseId = self::query()
+            ->whereKey($this->getKey())
+            ->value('current_purchase_id');
+        $currentPurchase = $candidatePurchaseId === null
+            ? null
+            : Purchase::query()->lockForUpdate()->find($candidatePurchaseId);
+
+        /** @var self $cart */
+        $cart = self::query()->lockForUpdate()->findOrFail($this->getKey());
+
+        if ($cart->current_purchase_id !== $candidatePurchaseId) {
+            if ($cart->current_purchase_id !== null) {
+                throw ValidationException::withMessages([
+                    'cart' => __('api.purchase.checkout_in_progress'),
+                ]);
+            }
+
+            $this->current_purchase_id = null;
+
+            return;
+        }
+
+        if ($currentPurchase === null) {
+            return;
+        }
+
+        if ($currentPurchase->status === Purchase::STATUS_PAID) {
+            throw ValidationException::withMessages([
+                'cart' => __('api.cart.editing_disabled'),
+            ]);
+        }
+
+        if (in_array($currentPurchase->status, [
+            Purchase::STATUS_CREATED,
+            Purchase::STATUS_PENDING_PAYMENT,
+        ], true)) {
+            app(StockReservationService::class)->returnToCart($currentPurchase, $cart);
+            $currentPurchase->update([
+                'status' => Purchase::STATUS_SUPERSEDED,
+            ]);
+
+            $this->current_purchase_id = null;
+
+            return;
+        }
+
+        app(StockReservationService::class)->releaseForPurchase(
+            $currentPurchase,
+            reason: StockReservationService::REASON_PURCHASE_SUPERSEDED,
+        );
+        self::query()
+            ->whereKey($cart->getKey())
+            ->where('current_purchase_id', $currentPurchase->getKey())
+            ->update(['current_purchase_id' => null]);
+        $this->current_purchase_id = null;
+    }
+
     protected function resolveScopedItem(
         int $catalogItemId,
         ?int $variantId,

app/Domains/Cart/Models/CartItem.php

@@ -3,13 +3,11 @@
 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',
@@ -57,10 +55,4 @@ 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/Resources/CartItemResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Cart\Resources;
 
-use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\Variant;
@@ -23,13 +22,9 @@ class CartItemResource extends JsonResource
         $selectedItem = $this->selectedItem();
         $imageUrl = null;
         $tenant = $request->route('tenant');
-        $checkoutCart = $request->route('cart');
         $displayImage = ! $tenant instanceof Tenant || $tenant->display_cart_item_images;
         $includeVariants = $tenant instanceof Tenant
-            && ($checkoutCart instanceof Cart
+            && $tenant->cart_editing_policy->allowsVariantChanges();
-                ? $tenant->checkout_editing_policy
-                : $tenant->cart_editing_policy)
-                ->allowsVariantChanges();
 
         if ($displayImage && $selectedItem?->relationLoaded('attachments')) {
             $imageUrl = $selectedItem->attachments->first()?->getTemporaryUrl(1440);

app/Domains/Cart/Services/CartService.php

@@ -4,10 +4,8 @@ namespace App\Domains\Cart\Services;
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
+use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Services\StockReservationService;
+use App\Domains\Catalog\Services\ExpireStockReservationsService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -19,11 +17,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class CartService
 {
-    public function __construct(
-        private readonly StockReservationService $reservations,
-        private readonly PurchaseStateGuard $purchaseState,
-    ) {}
-
     public function show(Tenant $tenant, Request $request): Cart
     {
         $resolvedIdentity = $this->resolveIdentity($request);
@@ -32,7 +25,7 @@ class CartService
             return $this->makeEmptyCart($tenant);
         }
 
-        $cart = $this->findCart($tenant, $resolvedIdentity['identity']);
+        $cart = $this->resolveCart($tenant, $resolvedIdentity['identity']);
 
         if ($cart === null) {
             return $this->makeEmptyCart($tenant);
@@ -89,125 +82,6 @@ class CartService
         return $this->loadCart($cart, $tenant);
     }
 
-    public function updateCheckoutItem(
-        Tenant $tenant,
-        Request $request,
-        Cart $cart,
-        int $cartItemId,
-        int $quantity,
-        ?int $variantId,
-        bool $updateVariant,
-    ): Cart {
-        $user = $request->user() ?? Auth::guard('sanctum')->user();
-
-        if (! $user instanceof User) {
-            throw new NotFoundHttpException('Checkout cart not found.');
-        }
-
-        return DB::transaction(function () use (
-            $tenant,
-            $user,
-            $cart,
-            $cartItemId,
-            $quantity,
-            $variantId,
-            $updateVariant,
-        ): Cart {
-            /** @var Purchase|null $purchase */
-            $purchase = Purchase::query()
-                ->where('cart_id', $cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->whereDoesntHave('items')
-                ->lockForUpdate()
-                ->first();
-
-            if ($purchase === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            $this->purchaseState->assertNotExpired($purchase);
-
-            if (! in_array($purchase->status, [
-                Purchase::STATUS_CREATED,
-                Purchase::STATUS_PENDING_PAYMENT,
-            ], true)) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            /** @var Cart|null $checkoutCart */
-            $checkoutCart = Cart::query()
-                ->whereKey($cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->where('status', 'checkout')
-                ->lockForUpdate()
-                ->first();
-
-            if ($checkoutCart === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            /** @var CartItem|null $cartItem */
-            $cartItem = $checkoutCart->items()
-                ->whereKey($cartItemId)
-                ->lockForUpdate()
-                ->first();
-
-            if ($cartItem === null) {
-                throw new NotFoundHttpException('Checkout item not found.');
-            }
-
-            $hasChanges = (int) $cartItem->cantidad !== $quantity
-                || ($updateVariant && $cartItem->variant_id !== $variantId);
-
-            if (! $hasChanges) {
-                return $this->loadCart($checkoutCart, $tenant, true);
-            }
-
-            if (
-                (int) $cartItem->cantidad !== $quantity
-                && ! $tenant->checkout_editing_policy->allowsQuantityChanges()
-            ) {
-                throw ValidationException::withMessages([
-                    'cantidad' => __('api.cart.editing_disabled'),
-                ]);
-            }
-
-            if (
-                $updateVariant
-                && $cartItem->variant_id !== $variantId
-                && ! $tenant->checkout_editing_policy->allowsVariantChanges()
-            ) {
-                throw ValidationException::withMessages([
-                    'variant_id' => __('api.cart.variant_change_disabled'),
-                ]);
-            }
-
-            $checkoutCart->updateItem(
-                $cartItemId,
-                $quantity,
-                $variantId,
-                $updateVariant,
-                $purchase->getKey(),
-            );
-
-            $purchase->telepagosQr()->delete();
-            $purchase->update([
-                'status' => Purchase::STATUS_CREATED,
-                'payment_method' => null,
-                'transfer_payer_dni' => null,
-                'total' => $checkoutCart->getTotalAmount(),
-                'expires_at' => now()->addMinutes(
-                    max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
-                ),
-            ]);
-            $this->reservations->syncPurchaseExpiration($purchase);
-
-            return $this->loadCart($checkoutCart, $tenant, true);
-        });
-    }
-
     public function removeItem(Tenant $tenant, Request $request, int $cartItemId): Cart
     {
         if (! $tenant->cart_editing_policy->allowsRemoval()) {
@@ -223,77 +97,6 @@ class CartService
         return $this->loadCart($cart, $tenant);
     }
 
-    public function removeCheckoutItem(
-        Tenant $tenant,
-        Request $request,
-        Cart $cart,
-        int $cartItemId,
-    ): Cart {
-        if (! $tenant->checkout_editing_policy->allowsRemoval()) {
-            throw ValidationException::withMessages([
-                'cart_item' => __('api.cart.editing_disabled'),
-            ]);
-        }
-
-        $user = $request->user() ?? Auth::guard('sanctum')->user();
-
-        if (! $user instanceof User) {
-            throw new NotFoundHttpException('Checkout cart not found.');
-        }
-
-        return DB::transaction(function () use ($tenant, $user, $cart, $cartItemId): Cart {
-            /** @var Purchase|null $purchase */
-            $purchase = Purchase::query()
-                ->where('cart_id', $cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->whereDoesntHave('items')
-                ->lockForUpdate()
-                ->first();
-
-            if ($purchase === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            $this->purchaseState->assertNotExpired($purchase);
-
-            if (! in_array($purchase->status, [
-                Purchase::STATUS_CREATED,
-                Purchase::STATUS_PENDING_PAYMENT,
-            ], true)) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            /** @var Cart|null $checkoutCart */
-            $checkoutCart = Cart::query()
-                ->whereKey($cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->where('status', 'checkout')
-                ->lockForUpdate()
-                ->first();
-
-            if ($checkoutCart === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            $checkoutCart->removeItem($cartItemId);
-            $purchase->telepagosQr()->delete();
-            $purchase->update([
-                'status' => Purchase::STATUS_CREATED,
-                'payment_method' => null,
-                'transfer_payer_dni' => null,
-                'total' => $checkoutCart->getTotalAmount(),
-                'expires_at' => now()->addMinutes(
-                    max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
-                ),
-            ]);
-            $this->reservations->syncPurchaseExpiration($purchase);
-
-            return $this->loadCart($checkoutCart, $tenant, true);
-        });
-    }
-
     public function makeGuestTokenCookie(string $guestToken): Cookie
     {
         $secure = (bool) config('session.secure');
@@ -319,7 +122,7 @@ class CartService
     {
         $cart = new Cart([
             'tenant_codigo' => $tenant->codigo,
-            'status' => 'active',
+            'status' => Cart::STATUS_ACTIVE,
         ]);
 
         $cart->setRelation('items', collect());
@@ -327,7 +130,7 @@ class CartService
         return $cart;
     }
 
-    protected function loadCart(Cart $cart, Tenant $tenant, bool $isCheckout = false): Cart
+    protected function loadCart(Cart $cart, Tenant $tenant): Cart
     {
         $relations = [
             'items.catalogItem.attachments',
@@ -340,11 +143,7 @@ class CartService
             'items.variant.eventDate',
         ];
 
-        $editingPolicy = $isCheckout
+        if ($tenant->cart_editing_policy->allowsVariantChanges()) {
-            ? $tenant->checkout_editing_policy
-            : $tenant->cart_editing_policy;
-
-        if ($editingPolicy->allowsVariantChanges()) {
             $relations = [
                 ...$relations,
                 'items.catalogItem.variants' => fn ($query) => $query->orderBy('id'),
@@ -424,12 +223,14 @@ class CartService
     {
         return Cart::query()
             ->where('tenant_codigo', $tenant->codigo)
-            ->where('status', 'active')
+            ->where('origin', Cart::ORIGIN_USER)
+            ->whereIn('status', [Cart::STATUS_ACTIVE, Cart::STATUS_EXPIRED])
             ->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();
     }
 
@@ -438,7 +239,7 @@ class CartService
      */
     protected function findCartOrFail(Tenant $tenant, array $identity): Cart
     {
-        $cart = $this->findCart($tenant, $identity);
+        $cart = $this->resolveCart($tenant, $identity, replaceExpired: false);
 
         if ($cart === null) {
             throw new NotFoundHttpException('Cart not found.');
@@ -451,10 +252,73 @@ 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' => 'active',
+            'status' => Cart::STATUS_ACTIVE,
+            'origin' => Cart::ORIGIN_USER,
         ];
 
         if ($identity['user_id'] !== null) {

app/Domains/Cart/Services/ExpireCartReservationsService.php

@@ -1,123 +0,0 @@
-<?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,13 +6,12 @@ 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 y permite agregar, actualizar o quitar ítems.
+- `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`.
 - `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
@@ -34,4 +33,6 @@ 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.
 
-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`.
+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.

app/Domains/Cart/routes/api.php

@@ -10,10 +10,3 @@ Route::prefix('tenants/{tenant:codigo}')
         Route::patch('cart/items/{cartItem}', [CartController::class, 'updateItemQuantity']);
         Route::delete('cart/items/{cartItem}', [CartController::class, 'removeItem']);
     });
-
-Route::prefix('tenants/{tenant:codigo}')
-    ->middleware('auth:sanctum')
-    ->group(function (): void {
-        Route::patch('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'updateCheckoutItem'])->withTrashed();
-        Route::delete('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'removeCheckoutItem'])->withTrashed();
-    });

app/Domains/Catalog/Exceptions/StockReservationExpiredException.php

@@ -0,0 +1,13 @@
+<?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,6 +27,7 @@ use Illuminate\Support\Collection;
     'type',
     'slug',
     'nombre',
+    'group_order',
     'descripcion',
     'precio',
     'inventory_policy',
@@ -47,6 +48,7 @@ class CatalogItem extends Model
         'inventory_policy' => InventoryPolicy::Tracked->value,
         'inventory_subject' => InventorySubject::Product->value,
         'has_tickets' => false,
+        'group_order' => 0,
     ];
 
     protected function casts(): array
@@ -56,6 +58,7 @@ 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,
@@ -172,17 +175,29 @@ class CatalogItem extends Model
     }
 
     /** @param Builder<CatalogItem> $query */
-    public function scopeWhereVariantsAvailable(Builder $query): Builder
+    public function scopeWhereAvailable(Builder $query): Builder
     {
         return $query->where(function (Builder $query): void {
             $query
-                ->whereDoesntHave('variants')
+                ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
-                ->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/Category.php

@@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
     'tenant_code',
     'categoria_id',
     'nombre',
+    'is_enabled',
 ])]
 class Category extends Model
 {
@@ -22,6 +23,10 @@ class Category extends Model
 
     protected $table = 'categorias';
 
+    protected $attributes = [
+        'is_enabled' => true,
+    ];
+
     /**
      * @return array<string, string>
      */
@@ -29,6 +34,7 @@ class Category extends Model
     {
         return [
             'categoria_id' => 'integer',
+            'is_enabled' => 'boolean',
         ];
     }
 

app/Domains/Catalog/Models/Inventory.php

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

app/Domains/Catalog/Models/StockReservation.php

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

app/Domains/Catalog/Models/StockReservationLine.php

@@ -0,0 +1,38 @@
+<?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,6 +51,7 @@ 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

@@ -20,7 +20,6 @@ class CatalogFeaturedItemResource extends JsonResource
         $catalogItem = $this->resource;
         /** @var FeaturedGroup $featuredGroup */
         $featuredGroup = $catalogItem->getRelation('featuredGroup');
-        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');
 
         if ($featuredGroup->product_layout === ProductLayout::ColumnWithImage) {
             return $this->columnWithImageData($catalogItem);
@@ -30,6 +29,9 @@ class CatalogFeaturedItemResource extends JsonResource
             return $this->ticketSelectorData($catalogItem);
         }
 
+        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');
+        $availableStock = $catalogItem->availableStock();
+
         $data = [
             'id' => $catalogItem->id,
             'type' => $catalogItem->type->value,
@@ -37,26 +39,38 @@ class CatalogFeaturedItemResource extends JsonResource
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
             'maximum_addable_quantity' => $this->maximumAddable(
-                $catalogItem->availableStock(),
+                $availableStock,
+                $remainingUserQuota,
+            ),
+            'unavailable_message' => $this->unavailableMessage(
+                $availableStock,
                 $remainingUserQuota,
             ),
             'variants' => $catalogItem->visibleVariants()
-                ->map(fn (Variant $variant): array => [
+                ->map(function (Variant $variant) use ($catalogItem, $remainingUserQuota): array {
-                    'id' => $variant->id,
+                    $variantStock = $catalogItem->inventory_policy === InventoryPolicy::Unlimited
-                    'event_date_id' => $variant->event_date_id,
+                        ? null
-                    'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
+                        : $variant->inventory->availableStock();
-                    'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
+
-                    'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
+                    return [
-                    'descripcion' => $variant->getDescription(),
+                        'id' => $variant->id,
-                    'precio' => number_format($variant->getPrice(), 2, '.', ''),
+                        'event_date_id' => $variant->event_date_id,
-                    'maximum_addable_quantity' => $this->maximumAddable(
+                        'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
-                        $catalogItem->inventory_policy === InventoryPolicy::Unlimited
+                        'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
-                            ? null
+                        'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
-                            : $variant->inventory->availableStock(),
+                        'descripcion' => $variant->getDescription(),
-                        $remainingUserQuota,
+                        'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                    ),
+                        'maximum_addable_quantity' => $this->maximumAddable(
-                    'values' => $variant->selectorOptions($catalogItem->itemAttributes),
+                            $variantStock,
-                ])
+                            $remainingUserQuota,
+                        ),
+                        'unavailable_message' => $this->unavailableMessage(
+                            $variantStock,
+                            $remainingUserQuota,
+                        ),
+                        'values' => $variant->selectorOptions($catalogItem->itemAttributes),
+                    ];
+                })
                 ->values(),
         ];
 
@@ -66,6 +80,9 @@ class CatalogFeaturedItemResource extends JsonResource
     /** @return array<string, mixed> */
     private function ticketSelectorData(CatalogItem $catalogItem): array
     {
+        $availableStock = $catalogItem->availableStock();
+        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');
+
         return [
             'id' => $catalogItem->id,
             'type' => $catalogItem->type->value,
@@ -73,25 +90,32 @@ 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),
         ];
     }
 
     /** @return array<string, mixed> */
     private function columnWithImageData(CatalogItem $catalogItem): array
     {
+        $availableStock = $catalogItem->availableStock();
+        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');
+
         return [
             'id' => $catalogItem->id,
             'type' => $catalogItem->type->value,
             'nombre' => $catalogItem->nombre,
             'precio' => $catalogItem->precio,
             'image' => $this->firstImageUrl($catalogItem),
+            'maximum_addable_quantity' => $this->maximumAddable($availableStock, $remainingUserQuota),
+            'unavailable_message' => $this->unavailableMessage($availableStock, $remainingUserQuota),
         ];
     }
 
     private function firstImageUrl(CatalogItem $catalogItem): ?string
     {
         $attachment = $catalogItem->attachments->first()
-            ?? $catalogItem->variants
+            ?? $catalogItem->visibleVariants()
                 ->flatMap(fn (Variant $variant) => $variant->attachments)
                 ->first();
 
@@ -103,4 +127,10 @@ class CatalogFeaturedItemResource extends JsonResource
         return app(CatalogItemAllowanceService::class)
             ->maximumAddableQuantity($stock, $remainingUserQuota);
     }
+
+    private function unavailableMessage(?int $stock, ?int $remainingUserQuota): ?string
+    {
+        return app(CatalogItemAllowanceService::class)
+            ->unavailableMessage($stock, $remainingUserQuota);
+    }
 }

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -42,11 +42,15 @@ class CatalogItemDetailResource extends JsonResource
                 $selectedVariant === null,
                 fn () => $this->maximumAddable($this->availableStock()),
             ),
+            'unavailable_message' => $this->when(
+                $selectedVariant === null,
+                fn () => $this->unavailableMessage($this->availableStock()),
+            ),
             'images' => $this->when(
                 $selectedVariant === null,
                 fn () => $this->imageUrls($this->attachments),
             ),
-            'variants' => $this->visibleVariants()
+            'variants' => $this->variants
                 ->map(fn (Variant $variant): array => $this->variantData($variant))
                 ->values(),
             'selected_variant' => $this->when(
@@ -159,6 +163,7 @@ class CatalogItemDetailResource extends JsonResource
     {
         $values = $variant->selectionOptions($this->itemAttributes);
         $eventDates = $variant->selectedEventDates();
+        $variantStock = $this->variantStock($variant);
 
         return [
             'id' => $variant->id,
@@ -168,7 +173,8 @@ 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($this->variantStock($variant)),
+            'maximum_addable_quantity' => $this->maximumAddable($variantStock),
+            'unavailable_message' => $this->unavailableMessage($variantStock),
             'values' => $values,
         ];
     }
@@ -195,4 +201,12 @@ class CatalogItemDetailResource extends JsonResource
             $this->getAttribute('remaining_user_quota'),
         );
     }
+
+    private function unavailableMessage(?int $stock): ?string
+    {
+        return app(CatalogItemAllowanceService::class)->unavailableMessage(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
 }

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -15,8 +15,10 @@ class CatalogSearchItemResource extends JsonResource
     /** @return array<string, mixed> */
     public function toArray(Request $request): array
     {
+        $availableStock = $this->availableStock();
+        $visibleVariants = $this->visibleVariants();
         $attachment = $this->attachments->first()
-            ?? $this->variants
+            ?? $visibleVariants
                 ->flatMap(fn (Variant $variant) => $variant->attachments)
                 ->first();
 
@@ -27,23 +29,27 @@ class CatalogSearchItemResource extends JsonResource
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
             'image' => $attachment?->getTemporaryUrl(1440),
-            'maximum_addable_quantity' => $this->maximumAddable($this->availableStock()),
+            'maximum_addable_quantity' => $this->maximumAddable($availableStock),
-            'variants' => $this->visibleVariants()
+            'unavailable_message' => $this->unavailableMessage($availableStock),
-                ->map(fn (Variant $variant): array => [
+            'variants' => $visibleVariants
-                    'id' => $variant->id,
+                ->map(function (Variant $variant): array {
-                    'event_date_id' => $variant->event_date_id,
+                    $variantStock = $this->inventory_policy === InventoryPolicy::Unlimited
-                    'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
+                        ? null
-                    'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
+                        : $variant->inventory?->availableStock();
-                    'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
+
-                    'descripcion' => $variant->getDescription(),
+                    return [
-                    'precio' => number_format($variant->getPrice(), 2, '.', ''),
+                        'id' => $variant->id,
-                    'maximum_addable_quantity' => $this->maximumAddable(
+                        'event_date_id' => $variant->event_date_id,
-                        $this->inventory_policy === InventoryPolicy::Unlimited
+                        'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
-                            ? null
+                        'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
-                            : $variant->inventory?->availableStock(),
+                        'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
-                    ),
+                        'descripcion' => $variant->getDescription(),
-                    'values' => $variant->selectorOptions($this->itemAttributes),
+                        'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                ])
+                        'maximum_addable_quantity' => $this->maximumAddable($variantStock),
+                        'unavailable_message' => $this->unavailableMessage($variantStock),
+                        'values' => $variant->selectorOptions($this->itemAttributes),
+                    ];
+                })
                 ->values(),
         ];
     }
@@ -55,4 +61,12 @@ class CatalogSearchItemResource extends JsonResource
             $this->getAttribute('remaining_user_quota'),
         );
     }
+
+    private function unavailableMessage(?int $stock): ?string
+    {
+        return app(CatalogItemAllowanceService::class)->unavailableMessage(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
 }

app/Domains/Catalog/Services/CatalogInventoryService.php

@@ -25,6 +25,24 @@ 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

@@ -8,6 +8,10 @@ use Illuminate\Support\Collection;
 
 class CatalogItemAllowanceService
 {
+    private const USER_QUOTA_REACHED_MESSAGE = 'Alcanzaste el cupo máximo permitido para este producto.';
+
+    private const OUT_OF_STOCK_MESSAGE = 'Este producto no tiene stock disponible.';
+
     public function __construct(
         private readonly UserPurchaseLimitService $purchaseLimits,
     ) {}
@@ -37,4 +41,17 @@ class CatalogItemAllowanceService
 
         return min($availableStock, $remainingUserQuota);
     }
+
+    public function unavailableMessage(?int $availableStock, ?int $remainingUserQuota): ?string
+    {
+        if ($remainingUserQuota !== null && $remainingUserQuota <= 0) {
+            return self::USER_QUOTA_REACHED_MESSAGE;
+        }
+
+        if ($availableStock !== null && $availableStock <= 0) {
+            return self::OUT_OF_STOCK_MESSAGE;
+        }
+
+        return null;
+    }
 }

app/Domains/Catalog/Services/CatalogService.php

@@ -205,6 +205,13 @@ 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);
@@ -231,7 +238,7 @@ class CatalogService
 
         $paginator = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
-            ->whereVariantsAvailable()
+            ->whereAvailable()
             ->where(function (Builder $query) use ($containsPattern): void {
                 $query
                     ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
@@ -281,7 +288,7 @@ class CatalogService
         return CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('category_id', $category->id)
-            ->whereVariantsAvailable()
+            ->whereAvailable()
             ->with([
                 'attachments',
                 'inventory',

app/Domains/Catalog/Services/ExpireStockReservationsService.php

@@ -2,50 +2,184 @@
 
 namespace App\Domains\Catalog\Services;
 
-use App\Domains\Cart\Services\ExpireCartReservationsService;
+use App\Domains\Cart\Models\Cart;
-use App\Domains\Purchase\Services\CheckoutService;
+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 Illuminate\Support\Facades\Log;
+use RuntimeException;
 use Throwable;
 
 class ExpireStockReservationsService
 {
+    private const BATCH_SIZE = 500;
+
     public function __construct(
-        private readonly CheckoutService $checkout,
+        private readonly ReleaseCheckoutService $purchases,
-        private readonly ExpireCartReservationsService $carts,
+        private readonly StockReservationService $reservations,
     ) {}
 
     /**
-     * @return array{purchases: int, cart_items: int}
+     * @return array{purchases: int, cart_reservations: int, orphan_reservations: int, failed: int}
      */
     public function expireOverdue(): array
     {
-        $expiredPurchases = null;
+        $summary = [
-        $expiredCartItems = null;
+            'purchases' => 0,
+            'cart_reservations' => 0,
+            'orphan_reservations' => 0,
+            'failed' => 0,
+        ];
+        $lastReservationId = 0;
 
-        try {
+        do {
-            $expiredPurchases = $this->checkout->expireOverduePurchases();
+            $reservationIds = StockReservation::query()
-            $expiredCartItems = $this->carts->expireOverdue();
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->whereNotNull('expires_at')
+                ->where('expires_at', '<=', now())
+                ->where('id', '>', $lastReservationId)
+                ->orderBy('id')
+                ->limit(self::BATCH_SIZE)
+                ->pluck('id');
 
-            Log::channel('commands')->info('Stock reservation cleanup completed.', [
+            foreach ($reservationIds as $reservationId) {
-                'command' => 'reservations:expire',
+                $lastReservationId = (int) $reservationId;
-                'expired_purchases' => $expiredPurchases,
-                'expired_cart_items' => $expiredCartItems,
-                'total_expired' => $expiredPurchases + $expiredCartItems,
-            ]);
 
-            return [
+                try {
-                'purchases' => $expiredPurchases,
+                    $owner = $this->expireReservation($lastReservationId);
-                'cart_items' => $expiredCartItems,
+                    if ($owner !== null) {
-            ];
+                        $summary[$owner]++;
-        } catch (Throwable $exception) {
+                    }
-            Log::channel('commands')->error('Stock reservation cleanup failed.', [
+                } catch (Throwable $exception) {
-                'command' => 'reservations:expire',
+                    $summary['failed']++;
-                'expired_purchases' => $expiredPurchases,
+                    Log::channel('commands')->error('Failed to expire overdue stock reservation.', [
-                'expired_cart_items' => $expiredCartItems,
+                        'command' => 'reservations:expire',
-                'exception' => $exception,
+                        'stock_reservation_id' => $lastReservationId,
-            ]);
+                        'exception' => $exception,
+                    ]);
+                }
+            }
+        } while ($reservationIds->count() === self::BATCH_SIZE);
 
-            throw $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;
         }
+        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

@@ -49,7 +49,16 @@ class FeaturedGroupService
     {
         $query = CatalogItem::query()
             ->where('catalog_items.tenant_code', $featuredGroup->tenant_code)
-            ->whereVariantsAvailable()
+            ->whereAvailable()
+            ->where(function (Builder $query): void {
+                $query
+                    ->whereDoesntHave('category')
+                    ->orWhereHas(
+                        'category',
+                        fn (Builder $categoryQuery): Builder => $categoryQuery
+                            ->where('is_enabled', true),
+                    );
+            })
             ->with([
                 'inventory',
                 'attachments',
@@ -73,7 +82,9 @@ class FeaturedGroupService
             FeaturedGroupSource::Category => $query
                 ->where('catalog_items.category_id', $featuredGroup->category_id)
                 ->orderBy('catalog_items.id'),
-            FeaturedGroupSource::All => $query->orderBy('catalog_items.id'),
+            FeaturedGroupSource::All => $query
+                ->orderBy('catalog_items.group_order')
+                ->orderBy('catalog_items.id'),
         };
     }
 

app/Domains/Catalog/Services/StockReservationService.php

@@ -2,223 +2,486 @@
 
 namespace App\Domains\Catalog\Services;
 
+use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Catalog\Models\Inventory;
 use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Catalog\Models\StockReservationLine;
 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 reserve(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
+    public function syncCart(Cart $cart): ?StockReservation
     {
-        DB::transaction(function () use ($cartItem, $selection, $quantity): void {
+        return DB::transaction(function () use ($cart): ?StockReservation {
-            $this->inventory->reserve($selection, $quantity);
+            /** @var Cart $lockedCart */
-            $this->recordIncrease($cartItem, $selection, $quantity);
+            $lockedCart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-        });
+            $items = $lockedCart->items()->orderBy('id')->lockForUpdate()->get();
-    }
+            $this->loadSelections($items);
+            $requirements = $this->requirementsForItems($items);
 
-    public function release(
+            $reservation = $lockedCart->current_stock_reservation_id === null
-        CartItem $cartItem,
+                ? null
-        CatalogItem|Variant $selection,
+                : StockReservation::query()->lockForUpdate()->find($lockedCart->current_stock_reservation_id);
-        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);
-        });
-    }
 
-    public function commit(CartItem $cartItem, CatalogItem|Variant $selection): void
+            if ($reservation !== null) {
-    {
+                $this->assertUsableCartReservation($reservation);
-        DB::transaction(function () use ($cartItem, $selection): void {
+            }
-            $this->ensure($cartItem, $selection);
-            $this->inventory->commit($selection, (int) $cartItem->cantidad);
 
-            $requirements = $this->inventory->requirementsFor($selection, (int) $cartItem->cantidad);
+            if ($requirements === []) {
-            foreach ($requirements as $inventoryId => $quantity) {
+                if ($reservation !== null && $reservation->status === StockReservation::STATUS_ACTIVE) {
-                $reservation = $this->lockReservation($cartItem, $inventoryId);
+                    $this->finalizeLocked(
-                if ($reservation === null || $reservation->status !== StockReservation::STATUS_ACTIVE || $reservation->quantity !== $quantity) {
+                        $reservation,
-                    throw new \InvalidArgumentException('La reserva de stock no coincide con el item del carrito.');
+                        StockReservation::STATUS_RELEASED,
+                        self::REASON_CART_EMPTY,
+                    );
                 }
 
-                $reservation->update([
+                $lockedCart->update(['current_stock_reservation_id' => null]);
-                    'status' => StockReservation::STATUS_COMMITTED,
+                $cart->current_stock_reservation_id = null;
-                    'committed_at' => now(),
+
-                    'expires_at' => null,
+                return 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) {
-                StockReservation::query()->create([
+                $reservation = 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 ($reservation->status !== StockReservation::STATUS_ACTIVE || $reservation->quantity !== $quantity) {
+            if (Purchase::query()->where('stock_reservation_id', $reservation->getKey())->exists()) {
-                $reservation->update([
+                throw new \InvalidArgumentException('La reserva vinculada a una compra no se puede modificar.');
-                    'quantity' => $quantity,
-                    'status' => StockReservation::STATUS_ACTIVE,
-                    'committed_at' => null,
-                    'released_at' => null,
-                    'expires_at' => $this->expiration(),
-                ]);
             }
-        }
-    }
 
-    public function attachToPurchase(
+            $currentLines = StockReservationLine::query()
-        CartItem $cartItem,
+                ->where('stock_reservation_id', $reservation->getKey())
-        CatalogItem|Variant $selection,
-        Purchase $purchase,
-    ): 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 detachFromPurchase(Purchase $purchase): void
-    {
-        StockReservation::query()
-            ->where('purchase_id', $purchase->getKey())
-            ->where('status', StockReservation::STATUS_ACTIVE)
-            ->update([
-                'purchase_id' => null,
-                'expires_at' => $this->expiration(),
-            ]);
-    }
-
-    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()
-                ->get();
+                ->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 ($sourceReservations as $sourceReservation) {
+            foreach ($inventoryIds as $inventoryId) {
-                $targetReservation = $this->lockReservation($target, (int) $sourceReservation->inventory_id);
+                $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 ($targetReservation === null) {
+                if ($delta > 0
-                    $sourceItemQuantity = (int) $source->cantidad;
+                    && $requirements[$inventoryId]['tracks_inventory']
-                    $targetItemQuantity = (int) $target->fresh()->cantidad;
+                    && $inventory->availableStock() < $delta) {
-                    $perItemQuantity = intdiv((int) $sourceReservation->quantity, $sourceItemQuantity);
+                    throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar el carrito.');
-                    $sourceReservation->update([
+                }
-                        'cart_item_id' => $target->getKey(),
+
-                        'purchase_id' => null,
+                if ($delta < 0 && $inventory->reserved_stock < abs($delta)) {
-                        'quantity' => $perItemQuantity * $targetItemQuantity,
+                    throw new \InvalidArgumentException('La reserva de stock del carrito es inconsistente.');
-                        'expires_at' => $this->expiration(),
+                }
-                    ]);
+            }
+
+            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;
                 }
 
-                $targetReservation->update([
+                StockReservationLine::query()->updateOrCreate(
-                    'quantity' => $targetReservation->quantity + $sourceReservation->quantity,
+                    [
-                    'status' => StockReservation::STATUS_ACTIVE,
+                        'stock_reservation_id' => $reservation->getKey(),
-                    'expires_at' => $this->expiration(),
+                        'inventory_id' => $inventoryId,
-                ]);
+                    ],
-                $sourceReservation->delete();
+                    [
+                        '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,
+        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');
+        });
+    }
+
+    public function commit(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,
+            ]);
+        });
+    }
+
+    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);
             }
         });
     }
 
-    private function recordIncrease(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
+    public function returnToCart(Purchase $purchase, Cart $cart): StockReservation
     {
-        foreach ($this->inventory->requirementsFor($selection, $quantity) as $inventoryId => $requiredQuantity) {
+        return DB::transaction(function () use ($purchase, $cart): StockReservation {
-            $reservation = $this->lockReservation($cartItem, $inventoryId);
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
+            /** @var Cart $cart */
+            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
 
-            if ($reservation === null) {
+            if ($purchase->stock_reservation_id === null
-                StockReservation::query()->create([
+                || $cart->current_stock_reservation_id !== $purchase->stock_reservation_id) {
-                    'inventory_id' => $inventoryId,
+                throw new \InvalidArgumentException('La compra y el carrito no comparten la reserva activa.');
-                    'cart_item_id' => $cartItem->getKey(),
-                    'quantity' => $requiredQuantity,
-                    'status' => StockReservation::STATUS_ACTIVE,
-                    'expires_at' => $this->expiration(),
-                ]);
-
-                continue;
             }
 
-            $reservation->update([
+            /** @var StockReservation $reservation */
-                'quantity' => ($reservation->status === StockReservation::STATUS_ACTIVE ? $reservation->quantity : 0) + $requiredQuantity,
+            $reservation = StockReservation::query()
-                'status' => StockReservation::STATUS_ACTIVE,
+                ->lockForUpdate()
-                'committed_at' => null,
+                ->findOrFail($purchase->stock_reservation_id);
-                'released_at' => null,
+            $this->assertUsableCartReservation($reservation);
-                'expires_at' => $this->expiration(),
+
-            ]);
+            $purchase->update(['stock_reservation_id' => null]);
-        }
+            $cart->update(['current_purchase_id' => null]);
+            $reservation->update(['expires_at' => $this->expiration()]);
+
+            return $reservation->fresh('lines');
+        });
     }
 
-    private function recordDecrease(
+    public function assertCartReservationUsable(Cart $cart): void
-        CartItem $cartItem,
+    {
-        CatalogItem|Variant $selection,
+        DB::transaction(function () use ($cart): void {
-        int $quantity,
+            /** @var Cart $cart */
-        string $releasedStatus,
+            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
+            if ($cart->current_stock_reservation_id === null) {
+                return;
+            }
+
+            /** @var StockReservation $reservation */
+            $reservation = StockReservation::query()
+                ->lockForUpdate()
+                ->findOrFail($cart->current_stock_reservation_id);
+            $this->assertUsableCartReservation($reservation);
+        });
+    }
+
+    public function releaseCurrentCartReservation(
+        Cart $cart,
+        string $reason = self::REASON_CART_CHANGED,
     ): void {
-        foreach ($this->inventory->requirementsFor($selection, $quantity) as $inventoryId => $requiredQuantity) {
+        DB::transaction(function () use ($cart, $reason): void {
-            $reservation = $this->lockReservation($cartItem, $inventoryId);
+            /** @var Cart $cart */
-            if ($reservation === null || $reservation->status !== StockReservation::STATUS_ACTIVE || $reservation->quantity < $requiredQuantity) {
+            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-                throw new \InvalidArgumentException('La reserva de stock no alcanza para liberar la cantidad solicitada.');
+            if ($cart->current_stock_reservation_id === null) {
+                return;
             }
 
-            $remaining = $reservation->quantity - $requiredQuantity;
+            /** @var StockReservation|null $reservation */
-            $reservation->update([
+            $reservation = StockReservation::query()->lockForUpdate()->find($cart->current_stock_reservation_id);
-                'quantity' => $remaining,
+            if ($reservation !== null) {
-                'status' => $remaining === 0 ? $releasedStatus : StockReservation::STATUS_ACTIVE,
+                $this->finalizeLocked($reservation, StockReservation::STATUS_RELEASED, $reason);
-                'released_at' => $remaining === 0 ? now() : null,
+            }
-                'expires_at' => $remaining === 0 ? null : $reservation->expires_at,
+            $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'];
+
+                    continue;
+                }
+
+                $requirements[$inventoryId] = $requirement;
+            }
+        }
+
+        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,
+    ): 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.');
+        }
+
+        $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]);
         }
     }
 
-    private function lockReservation(CartItem $cartItem, int $inventoryId): ?StockReservation
+    private function assertUsableCartReservation(StockReservation $reservation): void
     {
-        return StockReservation::query()
+        if ($reservation->status === StockReservation::STATUS_EXPIRED
-            ->where('cart_item_id', $cartItem->getKey())
+            || ($reservation->expires_at !== null && ! $reservation->expires_at->isFuture())) {
-            ->where('inventory_id', $inventoryId)
+            throw new StockReservationExpiredException;
-            ->lockForUpdate()
+        }
-            ->first();
+
+        if ($reservation->status !== StockReservation::STATUS_ACTIVE
+            || $reservation->expires_at === null) {
+            throw new \InvalidArgumentException('La reserva de stock no está disponible para operar el carrito.');
+        }
     }
 
     private function expiration(): Carbon

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` atribuye cada unidad reservada a un ítem de carrito y, durante checkout, a una compra, con estados `active`, `committed`, `released` y `expired`.
+- `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.
 - `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,7 +18,8 @@ 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`: mantiene el ledger de reservas sincronizado con `Inventory.reserved_stock`.
+- `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.
 - `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,6 +5,7 @@ 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;
 
@@ -17,21 +18,25 @@ class InvitationPurchaseProvisioner
     private const PAYMENT_METHOD = 'invitation';
 
     /**
-     * @var list<array{sector: string, row: int, seats: int, type: string}>
+     * @var list<array{sector: string, row: int, first_seat: int, last_seat: int, type: string}>
      */
     private const ALLOCATIONS = [
-        ['sector' => 'A', 'row' => 1, 'seats' => 16, 'type' => 'NORMAL'],
+        ['sector' => 'A', 'row' => 1, 'first_seat' => 1, 'last_seat' => 16, 'type' => 'NORMAL'],
-        ['sector' => 'A', 'row' => 3, 'seats' => 14, 'type' => 'NORMAL'],
+        ['sector' => 'A', 'row' => 3, 'first_seat' => 1, 'last_seat' => 14, 'type' => 'NORMAL'],
-        ['sector' => 'C', 'row' => 1, 'seats' => 16, 'type' => 'VIP + LUNCH'],
+        ['sector' => 'C', 'row' => 1, 'first_seat' => 1, 'last_seat' => 17, 'type' => 'VIP + LUNCH'],
+        ['sector' => 'C', 'row' => 3, 'first_seat' => 6, 'last_seat' => 7, 'type' => 'NORMAL'],
     ];
 
-    public function provision(): void
+    /**
+     * @param  list<array{sector: string, row: int, first_seat: int, last_seat: int, type: string}>|null  $allocations
+     */
+    public function provision(?array $allocations = null): void
     {
         if (! $this->prerequisitesExist()) {
             return;
         }
 
-        DB::transaction(function (): void {
+        DB::transaction(function () use ($allocations): void {
             $now = now();
             $userId = $this->userId($now);
             $purchaseId = $this->purchaseId($userId, $now);
@@ -44,8 +49,8 @@ class InvitationPurchaseProvisioner
                 throw new RuntimeException('No se encontró el catálogo de entradas del desfile.');
             }
 
-            foreach (self::ALLOCATIONS as $allocation) {
+            foreach ($allocations ?? self::ALLOCATIONS as $allocation) {
-                foreach (range(1, $allocation['seats']) as $seat) {
+                foreach (range($allocation['first_seat'], $allocation['last_seat']) as $seat) {
                     $variant = $this->variant(
                         (int) $catalogItem->id,
                         $allocation['sector'],
@@ -54,7 +59,7 @@ class InvitationPurchaseProvisioner
                         $allocation['type'],
                     );
 
-                    $this->createPurchaseItem(
+                    $purchaseItemId = $this->createPurchaseItem(
                         $purchaseId,
                         $catalogItem,
                         $variant,
@@ -66,6 +71,7 @@ class InvitationPurchaseProvisioner
                     );
                     $this->createTicketAndCommitStock(
                         $purchaseId,
+                        $purchaseItemId,
                         $userId,
                         (int) $catalogItem->id,
                         $variant,
@@ -98,7 +104,11 @@ class InvitationPurchaseProvisioner
 
     private function userId(DateTimeInterface $now): int
     {
-        $user = DB::table('users')->where('email', self::USER_EMAIL)->first();
+        $user = DB::table('users')
+            ->where('active_email', self::USER_EMAIL)
+            ->where('rol_codigo', 'user')
+            ->whereNull('deleted_at')
+            ->first();
 
         if ($user !== null) {
             if ($user->tenant_codigo !== self::TENANT_CODE) {
@@ -140,7 +150,6 @@ class InvitationPurchaseProvisioner
         if ($purchaseId !== null) {
             DB::table('compras')->where('id', $purchaseId)->update([
                 'status' => 'paid',
-                'expires_at' => null,
                 'total' => 0,
                 'updated_at' => $now,
             ]);
@@ -154,7 +163,6 @@ class InvitationPurchaseProvisioner
             'cart_id' => null,
             'status' => 'paid',
             'payment_method' => self::PAYMENT_METHOD,
-            'expires_at' => null,
             'total' => 0,
             'dni' => null,
             'transfer_payer_dni' => null,
@@ -324,12 +332,13 @@ class InvitationPurchaseProvisioner
         int $seat,
         string $type,
         DateTimeInterface $now,
-    ): void {
+    ): int {
-        if (DB::table('compra_items')
+        $existingId = DB::table('compra_items')
             ->where('compra_id', $purchaseId)
             ->where('source_variant_id', $variant->id)
-            ->exists()) {
+            ->value('id');
-            return;
+        if ($existingId !== null) {
+            return (int) $existingId;
         }
 
         $attributes = [
@@ -339,7 +348,7 @@ class InvitationPurchaseProvisioner
             ['name' => 'Asiento', 'value' => (string) $seat],
         ];
 
-        DB::table('compra_items')->insert([
+        return DB::table('compra_items')->insertGetId([
             'compra_id' => $purchaseId,
             'source_catalog_item_id' => $catalogItem->id,
             'source_variant_id' => $variant->id,
@@ -365,13 +374,18 @@ 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('source_purchase_id', $purchaseId)
+            ->where($purchaseReference)
             ->where('source_variant_id', $variant->id)
             ->exists()) {
             return;
@@ -388,15 +402,27 @@ class InvitationPurchaseProvisioner
             'sold_units' => $inventory->sold_units + 1,
         ]);
 
-        DB::table('stock_reservations')->insert([
+        $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,
             'inventory_id' => $inventory->id,
-            'cart_item_id' => null,
-            'purchase_id' => $purchaseId,
             'quantity' => 1,
-            'status' => 'committed',
+            'tracks_inventory' => true,
-            'expires_at' => null,
-            'committed_at' => $now,
-            'released_at' => null,
             'created_at' => $now,
             'updated_at' => $now,
         ]);
@@ -406,7 +432,7 @@ class InvitationPurchaseProvisioner
             'ticket' => (string) Str::uuid(),
             'name' => null,
             'description' => null,
-            'source_purchase_id' => $purchaseId,
+            ...$purchaseReference,
             'source_catalog_item_id' => $catalogItemId,
             'source_variant_id' => $variant->id,
             'used_at' => null,

app/Domains/Event/Controllers/AdminApp/EventController.php

@@ -2,7 +2,11 @@
 
 namespace App\Domains\Event\Controllers\AdminApp;
 
+use App\Domains\Event\Models\EventDate;
+use App\Domains\Event\Requests\RescheduleEventDateRequest;
+use App\Domains\Event\Requests\StoreEventDateRequest;
 use App\Domains\Event\Requests\UpdateEventRequest;
+use App\Domains\Event\Resources\EventDateResource;
 use App\Domains\Event\Resources\EventResource;
 use App\Domains\Event\Services\EventService;
 use App\Http\Controllers\Controller;
@@ -28,4 +32,37 @@ class EventController extends Controller
             )
         );
     }
+
+    public function storeDate(StoreEventDateRequest $request): EventDateResource
+    {
+        return EventDateResource::make(
+            $this->eventService->createDateForTenant(
+                $request->user()->tenant()->firstOrFail(),
+                $request->validated(),
+            )
+        );
+    }
+
+    public function rescheduleDate(
+        RescheduleEventDateRequest $request,
+        EventDate $eventDate,
+    ): EventDateResource {
+        return EventDateResource::make(
+            $this->eventService->rescheduleDateForTenant(
+                $request->user()->tenant()->firstOrFail(),
+                $eventDate,
+                $request->validated(),
+            )
+        );
+    }
+
+    public function suspendDate(Request $request, EventDate $eventDate): EventDateResource
+    {
+        return EventDateResource::make(
+            $this->eventService->suspendDateForTenant(
+                $request->user()->tenant()->firstOrFail(),
+                $eventDate,
+            )
+        );
+    }
 }

app/Domains/Event/Enums/EventDateStatus.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Domains\Event\Enums;
+
+enum EventDateStatus: string
+{
+    case Rescheduled = 'rescheduled';
+    case Suspended = 'suspended';
+    case Scheduled = 'scheduled';
+    case InProgress = 'in_progress';
+    case Completed = 'completed';
+}

app/Domains/Event/Events/EventDateRescheduled.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Event\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+
+class EventDateRescheduled
+{
+    use Dispatchable;
+
+    /**
+     * @param  list<array{purchase_id: int, ticket_ids: list<int>}>  $purchaseTickets
+     */
+    public function __construct(
+        public readonly string $tenantCode,
+        public readonly int $sourceEventDateId,
+        public readonly int $destinationEventDateId,
+        public readonly string $previousDate,
+        public readonly string $newDate,
+        public readonly array $purchaseTickets,
+    ) {}
+}

app/Domains/Event/Events/EventDateSuspended.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Domains\Event\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+
+class EventDateSuspended
+{
+    use Dispatchable;
+
+    /**
+     * @param  list<array{purchase_id: int, ticket_ids: list<int>}>  $purchaseTickets
+     */
+    public function __construct(
+        public readonly string $tenantCode,
+        public readonly int $eventDateId,
+        public readonly string $date,
+        public readonly array $purchaseTickets,
+    ) {}
+}

app/Domains/Event/Models/EventDate.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Event\Models;
 
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Event\Enums\EventDateStatus;
 use App\Domains\Event\Services\EventDateTextFormatter;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Enums\ValidityTimeType;
@@ -21,6 +22,8 @@ use Illuminate\Support\Carbon;
     'date',
     'time_start',
     'time_end',
+    'rescheduled_to_event_date_id',
+    'suspended_at',
 ])]
 class EventDate extends Model
 {
@@ -28,6 +31,8 @@ class EventDate extends Model
 
     public $timestamps = false;
 
+    protected $appends = ['status'];
+
     protected static function booted(): void
     {
         static::creating(fn (self $eventDate) => $eventDate->syncValidityTime());
@@ -52,6 +57,8 @@ class EventDate extends Model
         return [
             'date' => 'date:Y-m-d',
             'validity_time_id' => 'integer',
+            'rescheduled_to_event_date_id' => 'integer',
+            'suspended_at' => 'datetime',
         ];
     }
 
@@ -67,6 +74,18 @@ class EventDate extends Model
         return $this->belongsTo(ValidityTime::class);
     }
 
+    /** @return BelongsTo<EventDate, $this> */
+    public function rescheduledTo(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'rescheduled_to_event_date_id');
+    }
+
+    /** @return HasMany<EventDate, $this> */
+    public function rescheduledFrom(): HasMany
+    {
+        return $this->hasMany(self::class, 'rescheduled_to_event_date_id');
+    }
+
     /** @return HasMany<Variant, $this> */
     public function variants(): HasMany
     {
@@ -94,6 +113,27 @@ class EventDate extends Model
         return Carbon::parse($this->date->format('Y-m-d').' '.$this->time_end);
     }
 
+    public function getStatusAttribute(): EventDateStatus
+    {
+        if ($this->rescheduled_to_event_date_id !== null) {
+            return EventDateStatus::Rescheduled;
+        }
+
+        if ($this->suspended_at !== null) {
+            return EventDateStatus::Suspended;
+        }
+
+        if (now()->lt($this->startsAt())) {
+            return EventDateStatus::Scheduled;
+        }
+
+        if (now()->lt($this->endsAt())) {
+            return EventDateStatus::InProgress;
+        }
+
+        return EventDateStatus::Completed;
+    }
+
     private function syncTenantDateText(): void
     {
         $tenant = $this->tenant()->first();
@@ -104,7 +144,10 @@ class EventDate extends Model
 
         $tenant->update([
             'event_date_text' => app(EventDateTextFormatter::class)->format(
-                $tenant->eventDates()->pluck('date')
+                $tenant->eventDates()
+                    ->whereNull('rescheduled_to_event_date_id')
+                    ->whereNull('suspended_at')
+                    ->pluck('date')
             ),
         ]);
     }

app/Domains/Event/Requests/RescheduleEventDateRequest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\Event\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RescheduleEventDateRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, mixed> */
+    public function rules(): array
+    {
+        return [
+            'date' => ['required', 'date_format:Y-m-d'],
+        ];
+    }
+}

app/Domains/Event/Requests/StoreEventDateRequest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Domains\Event\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreEventDateRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, mixed> */
+    public function rules(): array
+    {
+        return [
+            'date' => ['required', 'date_format:Y-m-d'],
+            'start_time' => ['required', 'date_format:H:i'],
+            'end_time' => ['required', 'date_format:H:i'],
+        ];
+    }
+}

app/Domains/Event/Requests/UpdateEventRequest.php

@@ -19,11 +19,6 @@ class UpdateEventRequest extends FormRequest
         return [
             'title' => ['required', 'string', 'max:255'],
             'location' => ['required', 'string', 'max:255'],
-            'dates' => ['required', 'array', 'min:1'],
-            'dates.*' => ['required', 'array:date,start_time,end_time'],
-            'dates.*.date' => ['required', 'date_format:Y-m-d', 'distinct'],
-            'dates.*.start_time' => ['required', 'date_format:H:i'],
-            'dates.*.end_time' => ['required', 'date_format:H:i'],
             'social_media' => ['sometimes', 'array'],
             'social_media.*' => ['required', 'array:code,url,orden'],
             'social_media.*.code' => [
@@ -38,6 +33,16 @@ class UpdateEventRequest extends FormRequest
             'contact.whatsapp_url' => ['nullable', 'url', 'max:2048'],
             'contact.instagram_url' => ['nullable', 'url', 'max:2048'],
             'contact.facebook_url' => ['nullable', 'url', 'max:2048'],
+            'allow_ticket_refund' => ['sometimes', 'boolean'],
+            'allow_ticket_total_refund' => ['sometimes', 'boolean'],
+            'allow_ticket_partial_refund' => ['sometimes', 'boolean'],
+            'ticket_partial_refund_percentage' => [
+                'sometimes',
+                'numeric',
+                'decimal:0,2',
+                'min:0',
+                'max:99.99',
+            ],
         ];
     }
 
@@ -54,6 +59,41 @@ class UpdateEventRequest extends FormRequest
                         'The social media field is required.'
                     );
                 }
+
+                if (! array_key_exists('allow_ticket_refund', $input)) {
+                    return;
+                }
+
+                foreach ([
+                    'allow_ticket_total_refund',
+                    'allow_ticket_partial_refund',
+                    'ticket_partial_refund_percentage',
+                ] as $field) {
+                    if (! array_key_exists($field, $input)) {
+                        $validator->errors()->add($field, 'El campo es obligatorio.');
+                    }
+                }
+
+                $totalEnabled = $this->boolean('allow_ticket_total_refund');
+                $partialEnabled = $this->boolean('allow_ticket_partial_refund');
+
+                $refundEnabled = $this->boolean('allow_ticket_refund');
+
+                if ($refundEnabled && ! $totalEnabled && ! $partialEnabled) {
+                    $validator->errors()->add(
+                        'allow_ticket_refund',
+                        'Seleccioná al menos un tipo de reembolso.'
+                    );
+                }
+
+                if ($refundEnabled
+                    && $partialEnabled
+                    && (float) ($input['ticket_partial_refund_percentage'] ?? 0) <= 0) {
+                    $validator->errors()->add(
+                        'ticket_partial_refund_percentage',
+                        'Ingresá un porcentaje mayor que cero para el reembolso parcial.'
+                    );
+                }
             },
         ];
     }

app/Domains/Event/Resources/EventDateResource.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Domains\Event\Resources;
+
+use App\Domains\Event\Models\EventDate;
+use App\Domains\Ticket\Resources\ValidityTimeResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin EventDate */
+class EventDateResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'validity_time_id' => $this->validity_time_id,
+            'validity_time' => ValidityTimeResource::make($this->whenLoaded('validityTime')),
+            'date' => $this->date->format('Y-m-d'),
+            'start_time' => substr($this->time_start, 0, 5),
+            'end_time' => substr($this->time_end, 0, 5),
+            'status' => $this->status->value,
+            'rescheduled_to_event_date_id' => $this->rescheduled_to_event_date_id,
+            'suspended_at' => $this->suspended_at?->toISOString(),
+        ];
+    }
+}

app/Domains/Event/Resources/EventResource.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Event\Resources;
 
 use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -19,14 +18,11 @@ class EventResource extends JsonResource
             'id' => $this->id,
             'title' => $this->event_title,
             'location' => $this->event_location,
-            'dates' => $this->eventDates->map(fn ($eventDate): array => [
+            'allow_ticket_refund' => $this->allow_ticket_refund,
-                'id' => $eventDate->id,
+            'allow_ticket_total_refund' => $this->allow_ticket_total_refund,
-                'validity_time_id' => $eventDate->validity_time_id,
+            'allow_ticket_partial_refund' => $this->allow_ticket_partial_refund,
-                'validity_time' => ValidityTimeResource::make($eventDate->validityTime),
+            'ticket_partial_refund_percentage' => $this->ticket_partial_refund_percentage,
-                'date' => $eventDate->date->format('Y-m-d'),
+            'dates' => EventDateResource::collection($this->eventDates),
-                'start_time' => substr($eventDate->time_start, 0, 5),
-                'end_time' => substr($eventDate->time_end, 0, 5),
-            ])->values(),
             'social_media' => $this->socialMedia->map(fn ($item): array => [
                 'code' => $item->code,
                 'url' => $item->pivot->url,

app/Domains/Event/Services/AffectedEventDatePurchaseResolver.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Domains\Event\Services;
+
+use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticket\Services\TicketValidityResolver;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Collection;
+
+class AffectedEventDatePurchaseResolver
+{
+    /**
+     * Finds active tickets belonging to paid purchases before an event-date mutation.
+     *
+     * @param  Collection<int, int>|list<int>  $eventDateIds
+     * @return list<array{purchase_id: int, ticket_ids: list<int>}>
+     */
+    public function resolve(Tenant $tenant, Collection|array $eventDateIds): array
+    {
+        $eventDateIds = collect($eventDateIds)->map(fn (mixed $id): int => (int) $id)->unique()->values();
+
+        if ($eventDateIds->isEmpty()) {
+            return [];
+        }
+
+        /** @var Collection<int, Ticket> $tickets */
+        $tickets = Ticket::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->whereHas('sourcePurchaseItem.purchase', fn (Builder $query) => $query
+                ->where('status', Purchase::STATUS_PAID))
+            ->whereHas('sourceVariant', function (Builder $query) use ($eventDateIds): void {
+                $query->whereIn('event_date_id', $eventDateIds)
+                    ->orWhereHas('eventDates', fn (Builder $eventDates) => $eventDates
+                        ->whereIn('event_dates.id', $eventDateIds));
+            })
+            ->with([
+                ...TicketValidityResolver::RELATIONS,
+                'sourcePurchaseItem.purchase',
+            ])
+            ->get()
+            ->filter(fn (Ticket $ticket): bool => $ticket->is_active())
+            ->values();
+
+        return $tickets
+            ->groupBy(fn (Ticket $ticket): int => (int) $ticket->sourcePurchaseItem->purchase->getKey())
+            ->map(function (Collection $purchaseTickets): array {
+                return [
+                    'purchase_id' => (int) $purchaseTickets->first()->sourcePurchaseItem->purchase->getKey(),
+                    'ticket_ids' => $purchaseTickets->modelKeys(),
+                ];
+            })
+            ->values()
+            ->all();
+    }
+}

app/Domains/Event/Services/EffectiveEventDateResolver.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Domains\Event\Services;
+
+use App\Domains\Event\Models\EventDate;
+
+class EffectiveEventDateResolver
+{
+    public function resolve(EventDate $eventDate): ?EventDate
+    {
+        $date = $this->resolveLatest($eventDate);
+
+        return $date !== null && $date->suspended_at === null ? $date : null;
+    }
+
+    /** Sigue las reprogramaciones para presentación, incluso si el destino está suspendido. */
+    public function resolveLatest(EventDate $eventDate): ?EventDate
+    {
+        $current = $eventDate;
+        $visited = [];
+
+        while (true) {
+            $identity = $current->getKey() === null
+                ? 'object:'.spl_object_id($current)
+                : 'key:'.$current->getKey();
+
+            if (isset($visited[$identity])) {
+                return null;
+            }
+
+            $visited[$identity] = true;
+
+            if ($current->rescheduled_to_event_date_id === null) {
+                return $current;
+            }
+
+            $current->loadMissing('rescheduledTo');
+            $current = $current->rescheduledTo;
+
+            if ($current === null) {
+                return null;
+            }
+        }
+    }
+}

app/Domains/Event/Services/EventService.php

@@ -2,7 +2,13 @@
 
 namespace App\Domains\Event\Services;
 
+use App\Domains\Catalog\Models\Variant;
+use App\Domains\Event\Events\EventDateRescheduled;
+use App\Domains\Event\Events\EventDateSuspended;
+use App\Domains\Event\Models\EventDate;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Models\Ticket;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 
@@ -14,6 +20,11 @@ class EventService
         'facebook_url' => 'facebook',
     ];
 
+    public function __construct(
+        private readonly EffectiveEventDateResolver $effectiveEventDateResolver,
+        private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
+    ) {}
+
     public function forTenant(Tenant $tenant): Tenant
     {
         return $tenant->load(['eventDates.validityTime', 'socialMedia']);
@@ -27,9 +38,14 @@ class EventService
             $tenant->update([
                 'event_title' => $data['title'],
                 'event_location' => $data['location'],
+                ...array_intersect_key($data, array_flip([
+                    'allow_ticket_refund',
+                    'allow_ticket_total_refund',
+                    'allow_ticket_partial_refund',
+                    'ticket_partial_refund_percentage',
+                ])),
             ]);
 
-            $this->syncDates($tenant, $data['dates']);
             if (array_key_exists('social_media', $data)) {
                 $this->syncSocialMedia($tenant, $data['social_media']);
             } else {
@@ -40,41 +56,217 @@ class EventService
         });
     }
 
-    /** @param array<int, array{date: string, start_time: string, end_time: string}> $dates */
+    /** @param array{date: string, start_time: string, end_time: string} $data */
-    private function syncDates(Tenant $tenant, array $dates): void
+    public function createDateForTenant(Tenant $tenant, array $data): EventDate
     {
-        $existingDates = $tenant->eventDates()->get()->values();
+        return DB::transaction(function () use ($tenant, $data): EventDate {
+            $attributes = $this->dateAttributes($data);
 
-        foreach (array_values($dates) as $index => $date) {
+            if ($tenant->eventDates()->where($attributes)->exists()) {
-            $attributes = [
+                throw ValidationException::withMessages([
-                'date' => $date['date'],
+                    'date' => ['La fecha y el horario ya existen.'],
-                'time_start' => $date['start_time'],
+                ]);
-                'time_end' => $date['end_time'],
+            }
-            ];
 
-            $existingDate = $existingDates->get($index);
+            return $tenant->eventDates()->create($attributes)->load('validityTime');
+        });
+    }
 
-            if ($existingDate) {
+    /** @param array{date: string} $data */
-                $existingDate->update($attributes);
+    public function rescheduleDateForTenant(Tenant $tenant, EventDate $eventDate, array $data): EventDate
-            } else {
+    {
-                $tenant->eventDates()->create($attributes);
+        return DB::transaction(function () use ($tenant, $eventDate, $data): EventDate {
+            $source = $this->lockedDateForTenant($tenant, $eventDate);
+
+            if ($source->suspended_at !== null) {
+                throw ValidationException::withMessages([
+                    'event_date' => ['No se puede reprogramar una fecha suspendida.'],
+                ]);
+            }
+
+            if ($source->rescheduled_to_event_date_id !== null) {
+                throw ValidationException::withMessages([
+                    'event_date' => ['La fecha ya fue reprogramada.'],
+                ]);
+            }
+
+            $destination = $tenant->eventDates()
+                ->whereDate('date', $data['date'])
+                ->lockForUpdate()
+                ->first();
+
+            if ($destination === null) {
+                $destination = $tenant->eventDates()->create([
+                    'date' => $data['date'],
+                    'time_start' => $source->time_start,
+                    'time_end' => $source->time_end,
+                ]);
+            }
+
+            if ($destination->is($source) || $this->chainContains($destination, $source)) {
+                throw ValidationException::withMessages([
+                    'date' => ['La reprogramación generaría una referencia circular.'],
+                ]);
+            }
+
+            if ($this->effectiveEventDateResolver->resolve($destination) === null) {
+                throw ValidationException::withMessages([
+                    'date' => ['La fecha de destino no es utilizable.'],
+                ]);
+            }
+
+            $purchaseTickets = $this->affectedPurchaseResolver->resolve(
+                $tenant,
+                $this->affectedDateIds($tenant, $source),
+            );
+            $source->update(['rescheduled_to_event_date_id' => $destination->getKey()]);
+
+            EventDateRescheduled::dispatch(
+                $tenant->codigo,
+                $source->getKey(),
+                $destination->getKey(),
+                $source->date->format('d/m/Y'),
+                $destination->date->format('d/m/Y'),
+                $purchaseTickets,
+            );
+
+            return $source->fresh(['validityTime', 'rescheduledTo.validityTime']);
+        });
+    }
+
+    public function suspendDateForTenant(Tenant $tenant, EventDate $eventDate): EventDate
+    {
+        return DB::transaction(function () use ($tenant, $eventDate): EventDate {
+            $date = $this->lockedDateForTenant($tenant, $eventDate);
+
+            if ($date->rescheduled_to_event_date_id !== null) {
+                throw ValidationException::withMessages([
+                    'event_date' => ['No se puede suspender una fecha que ya fue reprogramada.'],
+                ]);
+            }
+
+            if ($date->suspended_at !== null) {
+                return $date->load('validityTime');
+            }
+
+            $purchaseTickets = $this->affectedPurchaseResolver->resolve(
+                $tenant,
+                $this->affectedDateIds($tenant, $date),
+            );
+            $date->update(['suspended_at' => now()]);
+            $this->disableTicketsWithoutUsableDates($tenant, $date);
+
+            EventDateSuspended::dispatch(
+                $tenant->codigo,
+                $date->getKey(),
+                $date->date->format('d/m/Y'),
+                $purchaseTickets,
+            );
+
+            return $date->fresh('validityTime');
+        });
+    }
+
+    private function lockedDateForTenant(Tenant $tenant, EventDate $eventDate): EventDate
+    {
+        return $tenant->eventDates()
+            ->whereKey($eventDate->getKey())
+            ->lockForUpdate()
+            ->firstOrFail();
+    }
+
+    private function chainContains(EventDate $start, EventDate $expected): bool
+    {
+        $current = $start;
+        $visited = [];
+
+        while ($current->rescheduled_to_event_date_id !== null) {
+            if ($current->is($expected)) {
+                return true;
+            }
+
+            if (isset($visited[$current->getKey()])) {
+                return true;
+            }
+
+            $visited[$current->getKey()] = true;
+            $current = $current->rescheduledTo()->lockForUpdate()->first();
+
+            if ($current === null) {
+                return false;
             }
         }
 
-        $datesToDelete = $existingDates->slice(count($dates));
+        return $current->is($expected);
+    }
 
-        if ($datesToDelete->contains(fn ($eventDate): bool => $eventDate
+    /** @return Collection<int, int> */
-            ->selectedByVariants()
+    private function affectedDateIds(Tenant $tenant, EventDate $eventDate): Collection
-            ->whereHas('sourceTickets')
+    {
-            ->exists()
+        $affectedDateIds = collect([$eventDate->getKey()]);
-            || $eventDate->variants()->whereHas('sourceTickets')->exists())) {
+        $frontier = $affectedDateIds;
-            throw ValidationException::withMessages([
+
-                'dates' => ['No se puede eliminar una fecha utilizada por tickets generados.'],
+        while ($frontier->isNotEmpty()) {
-            ]);
+            $predecessors = $tenant->eventDates()
+                ->whereIn('rescheduled_to_event_date_id', $frontier)
+                ->pluck('id')
+                ->diff($affectedDateIds)
+                ->values();
+            $affectedDateIds = $affectedDateIds->merge($predecessors)->unique()->values();
+            $frontier = $predecessors;
         }
 
-        $datesToDelete->each->delete();
+        return $affectedDateIds;
-        $tenant->unsetRelation('eventDates');
+    }
+
+    private function disableTicketsWithoutUsableDates(Tenant $tenant, EventDate $suspendedDate): void
+    {
+        $affectedDateIds = $this->affectedDateIds($tenant, $suspendedDate);
+
+        $variants = Variant::withTrashed()
+            ->where(function ($query) use ($affectedDateIds): void {
+                $query->whereIn('event_date_id', $affectedDateIds)
+                    ->orWhereHas('eventDates', fn ($eventDates) => $eventDates
+                        ->whereIn('event_dates.id', $affectedDateIds));
+            })
+            ->with(['eventDates', 'eventDate'])
+            ->get();
+
+        foreach ($variants as $variant) {
+            $hasUsableDate = $variant->selectedEventDates()->contains(
+                fn (EventDate $candidate): bool => $this->effectiveEventDateResolver->resolve($candidate) !== null
+            );
+
+            if ($hasUsableDate) {
+                continue;
+            }
+
+            Ticket::query()
+                ->where('tenant_code', $tenant->codigo)
+                ->where('source_variant_id', $variant->getKey())
+                ->whereNull('disabled_at')
+                ->whereNull('cancelled_at')
+                ->whereNull('refunded_at')
+                ->lockForUpdate()
+                ->get()
+                ->each(function (Ticket $ticket): void {
+                    $ticket->markAsDisabled();
+                    $ticket->save();
+                });
+        }
+    }
+
+    /**
+     * @param  array{date: string, start_time: string, end_time: string}  $data
+     * @return array{date: string, time_start: string, time_end: string}
+     */
+    private function dateAttributes(array $data): array
+    {
+        return [
+            'date' => $data['date'],
+            'time_start' => $data['start_time'].':00',
+            'time_end' => $data['end_time'].':00',
+        ];
     }
 
     /** @param array<string, string|null> $contact */

app/Domains/Event/routes/adminapp.php

@@ -8,4 +8,7 @@ Route::prefix('v1/adminapp/tenant')
     ->group(function (): void {
         Route::get('event', [EventController::class, 'show']);
         Route::put('event', [EventController::class, 'update']);
+        Route::post('event-dates', [EventController::class, 'storeDate']);
+        Route::post('event-dates/{eventDate}/reschedule', [EventController::class, 'rescheduleDate']);
+        Route::post('event-dates/{eventDate}/suspend', [EventController::class, 'suspendDate']);
     });

app/Domains/FiestaFutbolInfantil/Controllers/CategoryVisibilityController.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Controllers;
+
+use App\Domains\FiestaFutbolInfantil\Enums\FiestaCategory;
+use App\Domains\FiestaFutbolInfantil\Requests\UpdateCategoryVisibilityRequest;
+use App\Domains\FiestaFutbolInfantil\Services\CategoryVisibilityService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CategoryVisibilityController extends Controller
+{
+    public function __construct(private readonly CategoryVisibilityService $visibilityService) {}
+
+    public function show(Request $request): JsonResponse
+    {
+        $category = $this->category($request);
+        $tenant = $request->user()->tenant()->firstOrFail();
+
+        return response()->json([
+            'data' => [
+                'is_enabled' => $this->visibilityService->isEnabled($tenant, $category),
+            ],
+        ]);
+    }
+
+    public function update(UpdateCategoryVisibilityRequest $request): JsonResponse
+    {
+        $category = $this->category($request);
+        $tenant = $request->user()->tenant()->firstOrFail();
+        $model = $this->visibilityService->update(
+            $tenant,
+            $category,
+            $request->boolean('is_enabled'),
+        );
+
+        return response()->json([
+            'data' => [
+                'is_enabled' => $model->is_enabled,
+            ],
+            'message' => $model->is_enabled
+                ? 'Mostrar en sitio web se activo correctamente'
+                : 'Mostrar en sitio web se desactivo correctamente',
+        ]);
+    }
+
+    private function category(Request $request): FiestaCategory
+    {
+        return FiestaCategory::from((string) $request->route('category'));
+    }
+}

app/Domains/FiestaFutbolInfantil/Enums/FiestaCategory.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Enums;
+
+enum FiestaCategory: string
+{
+    case Entries = 'entries';
+    case Foods = 'foods';
+    case Accommodations = 'accommodations';
+    case Merchandise = 'merchandise';
+
+    public function categoryName(): string
+    {
+        return match ($this) {
+            self::Entries => 'Entradas',
+            self::Foods => 'Comidas',
+            self::Accommodations => 'Alojamientos',
+            self::Merchandise => 'Merchandising',
+        };
+    }
+}

app/Domains/FiestaFutbolInfantil/Requests/UpdateCategoryVisibilityRequest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateCategoryVisibilityRequest extends FormRequest
+{
+    /** @return array<string, mixed> */
+    public function rules(): array
+    {
+        return [
+            'is_enabled' => ['required', 'boolean'],
+        ];
+    }
+}

app/Domains/FiestaFutbolInfantil/Services/CategoryVisibilityService.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Services;
+
+use App\Domains\Catalog\Models\Category;
+use App\Domains\FiestaFutbolInfantil\Enums\FiestaCategory;
+use App\Domains\Tenant\Models\Tenant;
+
+class CategoryVisibilityService
+{
+    public function isEnabled(Tenant $tenant, FiestaCategory $category): bool
+    {
+        return Category::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->where('nombre', $category->categoryName())
+            ->value('is_enabled') ?? true;
+    }
+
+    public function update(Tenant $tenant, FiestaCategory $category, bool $isEnabled): Category
+    {
+        $model = Category::query()->firstOrCreate([
+            'tenant_code' => $tenant->codigo,
+            'nombre' => $category->categoryName(),
+        ]);
+        $model->update(['is_enabled' => $isEnabled]);
+
+        return $model;
+    }
+}

app/Domains/FiestaFutbolInfantil/routes/api.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Domains\FiestaFutbolInfantil\Controllers\AccommodationController;
+use App\Domains\FiestaFutbolInfantil\Controllers\CategoryVisibilityController;
 use App\Domains\FiestaFutbolInfantil\Controllers\EntryController;
 use App\Domains\FiestaFutbolInfantil\Controllers\FoodController;
 use App\Domains\FiestaFutbolInfantil\Controllers\MerchandiseController;
@@ -9,6 +10,20 @@ use Illuminate\Support\Facades\Route;
 Route::prefix('v1/adminapp/tenant')
     ->middleware(['auth:sanctum', 'adminapp.tenant'])
     ->group(function (): void {
+        $visibilityRoutes = static function (string $endpoint, string $category, string $menuCode): void {
+            Route::get("{$endpoint}/visibility", [CategoryVisibilityController::class, 'show'])
+                ->defaults('category', $category)
+                ->middleware("tenant.menu:{$menuCode}");
+            Route::patch("{$endpoint}/visibility", [CategoryVisibilityController::class, 'update'])
+                ->defaults('category', $category)
+                ->middleware("tenant.menu:{$menuCode}");
+        };
+
+        $visibilityRoutes('entries', 'entries', 'adminapp.fiesta-futbol-infantil.entradas');
+        $visibilityRoutes('foods', 'foods', 'adminapp.fiesta-futbol-infantil.comida');
+        $visibilityRoutes('accommodations', 'accommodations', 'adminapp.fiesta-futbol-infantil.alojamientos');
+        $visibilityRoutes('merchandise', 'merchandise', 'adminapp.fiesta-futbol-infantil.merchandising');
+
         Route::get('entries', [EntryController::class, 'index'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
             ->name('adminapp.fiesta-futbol-infantil.entries.index');

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

@@ -0,0 +1,20 @@
+<?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

@@ -0,0 +1,22 @@
+<?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

@@ -0,0 +1,21 @@
+<?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

@@ -0,0 +1,18 @@
+<?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,25 +6,18 @@ use App\Domains\Purchase\Models\Purchase;
 
 class SaleFormService
 {
-    /** @return array{statuses: list<array{code: string, name: string}>} */
+    /** @return array{statuses: list<array{value: string, label: string, real_statuses: list<string>}>} */
     public function get(): array
     {
-        $names = [
-            Purchase::STATUS_CREATED => 'Creada',
-            Purchase::STATUS_PENDING_PAYMENT => 'Esperando pago',
-            Purchase::STATUS_PAID => 'Confirmada',
-            Purchase::STATUS_CANCELLED => 'Cancelada',
-            Purchase::STATUS_REJECTED => 'Rechazada',
-            Purchase::STATUS_EXPIRED => 'Vencida',
-        ];
-
         return [
             'statuses' => array_map(
-                fn (string $status): array => [
+                fn (string $code, array $definition): array => [
-                    'code' => $status,
+                    'value' => $code,
-                    'name' => $names[$status],
+                    'label' => $definition['name'],
+                    'real_statuses' => $definition['statuses'],
                 ],
-                Purchase::statuses(),
+                array_keys(Purchase::adminStatuses()),
+                array_values(Purchase::adminStatuses()),
             ),
         ];
     }

app/Domains/Forms/Services/TicketFilterFormService.php

@@ -0,0 +1,148 @@
+<?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' => Ticket::statusOptions(),
+            ],
+        ];
+    }
+
+    /** @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

@@ -0,0 +1,396 @@
+<?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' => Ticket::statusOptions(),
+            '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,6 +9,7 @@ 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.
 
@@ -19,6 +20,7 @@ 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,6 +5,8 @@ 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')
@@ -13,6 +15,13 @@ 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,8 +4,9 @@ namespace App\Domains\Integration\Controllers;
 
 use App\Domains\Client\Models\Client;
 use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\StoreClientIntegrationRequest;
+use App\Domains\Integration\Requests\ConfigureIntegrationRequest;
 use App\Domains\Integration\Services\ClientIntegrationService;
+use App\Domains\Integration\Services\IntegrationAssociationService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
@@ -35,7 +36,7 @@ class ClientIntegrationController extends Controller
     }
 
     public function store(
-        StoreClientIntegrationRequest $request,
+        ConfigureIntegrationRequest $request,
         Client $client,
         string $integrationCode,
     ): JsonResponse {
@@ -61,4 +62,11 @@ 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,6 +35,7 @@ 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

@@ -0,0 +1,43 @@
+<?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,22 +3,15 @@
 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_data',
+        'integration_instance_id',
-    ];
-
-    protected $casts = [
-        'integration_data' => EncryptedIntegrationData::class,
     ];
 
     /** @return BelongsTo<Client, $this> */
@@ -32,4 +25,10 @@ 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,6 +3,7 @@
 namespace App\Domains\Integration\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Integration extends Model
 {
@@ -13,16 +14,29 @@ class Integration extends Model
         'name',
         'url',
         'integration_data_schema',
-        'requires_client_configuration',
+        'requires_configuration',
     ];
 
     protected $casts = [
         'integration_data_schema' => 'array',
-        'requires_client_configuration' => 'boolean',
+        'requires_configuration' => 'boolean',
     ];
 
-    public function clientIntegrations()
+    /** @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
     {
         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

@@ -0,0 +1,41 @@
+<?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

@@ -0,0 +1,30 @@
+<?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

@@ -0,0 +1,14 @@
+<?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/ConfigureIntegrationRequest.php

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

app/Domains/Integration/Requests/UpdateIntegrationRequest.php

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

app/Domains/Integration/Resources/IntegrationAssociationResource.php

@@ -0,0 +1,21 @@
+<?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

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

app/Domains/Integration/Services/ClientIntegrationService.php

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

@@ -0,0 +1,98 @@
+<?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

@@ -0,0 +1,40 @@
+<?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,6 +3,8 @@
 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;
@@ -27,7 +29,7 @@ class MailService extends BaseIntegrationService
 
     private ?Mailer $mailer = null;
 
-    private bool $usesClientMailer = false;
+    private bool $usesInstanceMailer = false;
 
     public function __construct(?MailFactory $mailFactory = null)
     {
@@ -38,12 +40,12 @@ class MailService extends BaseIntegrationService
     {
         parent::forTenant($tenantCode);
 
-        if ($this->clientIntegration) {
+        if ($this->integrationInstance) {
             $this->mailer = $this->resolveMailer();
-            $this->usesClientMailer = true;
+            $this->usesInstanceMailer = true;
         } else {
             $this->mailer = $this->mailFactory->mailer();
-            $this->usesClientMailer = false;
+            $this->usesInstanceMailer = false;
         }
 
         return $this;
@@ -54,12 +56,12 @@ class MailService extends BaseIntegrationService
         parent::forClient($client);
         $this->tenant = $this->clientContext?->tenants()->first();
 
-        if ($this->clientIntegration) {
+        if ($this->integrationInstance) {
             $this->mailer = $this->resolveMailer();
-            $this->usesClientMailer = true;
+            $this->usesInstanceMailer = true;
         } else {
             $this->mailer = $this->mailFactory->mailer();
-            $this->usesClientMailer = false;
+            $this->usesInstanceMailer = false;
         }
 
         return $this;
@@ -70,24 +72,35 @@ class MailService extends BaseIntegrationService
         return [];
     }
 
-    public function send(string|array $recipient, string $subject, string $content): void
+    /**
-    {
+     * @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 {
         if (! $this->mailer || ! $this->tenant) {
             throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
         }
 
-        $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
+        $brand ??= $this->tenant;
+        $branding = $this->brandingFor($brand);
 
         $html = Blade::render(
             <<<'BLADE'
-                <x-mail.branded-layout :tenant="$tenant" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
+                <x-mail.branded-layout :branding="$branding" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
                     {!! $content !!}
                 </x-mail.branded-layout>
                 BLADE,
             [
-                'tenant' => $this->tenant,
+                'branding' => $branding,
-                'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
+                'headerLogoUrl' => $brand instanceof WebsiteType
-                'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
+                    ? $brand->siteLogo?->getTemporaryUrl(1440)
+                    : $brand->headerLogo?->getTemporaryUrl(1440),
+                'footerLogoUrl' => $brand->footerLogo?->getTemporaryUrl(1440),
                 'content' => $content,
             ],
         );
@@ -96,16 +109,54 @@ 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->usesClientMailer
+        return $this->usesInstanceMailer
-            ? 'client-smtp'
+            ? 'integration-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) {
@@ -136,7 +187,7 @@ class MailService extends BaseIntegrationService
 
     private function resolveMailer(): Mailer
     {
-        $data = $this->clientIntegration?->integration_data;
+        $data = $this->integrationInstance?->integration_data;
 
         if (! is_array($data)) {
             throw new InvalidArgumentException('La configuración SMTP del cliente no es válida.');
@@ -154,7 +205,7 @@ class MailService extends BaseIntegrationService
         }
 
         $mailer = $this->mailFactory->build([
-            'name' => 'client-smtp-'.$this->clientContext?->id,
+            'name' => 'integration-smtp-'.$this->integrationInstance?->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->clientIntegration || ! $this->clientContext) {
+        if (! $this->integrationInstance) {
             throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
         }
 
-        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
+        $cacheKey = $this->integrationInstance->tokenCacheKey();
 
         $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 = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
+        $cacheKey = $this->integrationInstance->tokenCacheKey();
         Cache::put($cacheKey, $token, $ttlSeconds);
 
         return $token;
@@ -220,11 +220,11 @@ class TelepagosIntegrationService extends BaseIntegrationService
      */
     public function clearToken(): void
     {
-        if (! $this->clientContext) {
+        if (! $this->integrationInstance) {
             return;
         }
 
-        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
+        $cacheKey = $this->integrationInstance->tokenCacheKey();
         Cache::forget($cacheKey);
     }
 

app/Domains/Integration/Services/TelepagosWebhookService.php

@@ -7,7 +7,10 @@ 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;
 
@@ -15,6 +18,7 @@ class TelepagosWebhookService
 {
     public function __construct(
         private readonly CheckoutService $checkoutService,
+        private readonly DniDistanceService $dniDistance,
     ) {}
 
     /**
@@ -41,7 +45,6 @@ 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,
@@ -73,23 +76,55 @@ class TelepagosWebhookService
                 $dni = substr($cuit, 2, -1);
 
                 $tenantCodes = $client->tenants()->pluck('codigo');
-                $purchases = Purchase::whereIn('tenant_codigo', $tenantCodes)
+                $eligiblePurchases = Purchase::query()
-                    ->where('transfer_payer_dni', $dni)
+                    ->whereIn('tenant_codigo', $tenantCodes)
                     ->whereIn('status', [
                         Purchase::STATUS_CREATED,
                         Purchase::STATUS_PENDING_PAYMENT,
+                        Purchase::STATUS_IN_REVIEW,
                     ])
-                    ->where('payment_method', 'transfer')
+                    ->where('payment_method', 'transfer');
+
+                $purchases = (clone $eligiblePurchases)
                     ->where('total', $amount)
                     ->latest()
-                    ->get();
+                    ->get()
+                    ->filter(fn (Purchase $purchase): bool => $purchase->transfer_payer_dni !== null
+                        && $this->dniDistance->distance($dni, $purchase->transfer_payer_dni) === 0)
+                    ->values();
 
-                $paymentData['matched_purchase_ids'] = $purchases->pluck('id')->all();
                 $compra = $purchases->count() === 1 ? $purchases->first() : null;
 
                 if (! $compra) {
-                    if ($purchases->count() > 1) {
+                    $candidatePurchases = $this->findTransferCandidates(
-                        TelepagosPayment::create($paymentData);
+                        $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(),
+                        ]);
                     }
 
                     Log::channel('telepagos')->warning('Telepagos webhook: Expected exactly one matching purchase.', [
@@ -208,4 +243,91 @@ 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');
+        });
+    }
 }