feat(ticket): implement ticket generation policies and validity time management

- Added `ticket_generation_policy` column to `catalog_items` table to manage ticket generation strategies.
- Created `ticket_validity_times` table to allow multiple validity times per ticket.
- Introduced `validity_time_id` column in `event_dates` table to associate event dates with validity times.
- Established `ticket_validity_groups` and `ticket_validity_group_times` tables to group validity times for tickets.
- Updated seeder to set default ticket generation policy for specific tenant.
- Enhanced tests to cover new functionality, including ticket generation based on event dates and validity times.
- Refactored ticket validity checks to accommodate multiple validity times in a group.

ShopIt_API_Postman_Collection.json

@@ -188,18 +188,15 @@
               }
             ],
             "url": {
-              "raw": "{{base_url}}/api/tenants/bootstrap?dominio={{tenant_domain}}&path={{tenant_path}}",
+              "raw": "{{base_url}}/api/tenants/bootstrap/{{tenant_domain}}",
               "host": [
                 "{{base_url}}"
               ],
               "path": [
                 "api",
                 "tenants",
-                "bootstrap"
+                "bootstrap",
-              ],
+                "{{tenant_domain}}"
-              "query": [
-                {"key": "dominio", "value": "{{tenant_domain}}"},
-                {"key": "path", "value": "{{tenant_path}}"}
               ]
             }
           },
@@ -1405,11 +1402,6 @@
       "value": "localhost",
       "type": "string"
     },
-    {
-      "key": "tenant_path",
-      "value": "/",
-      "type": "string"
-    },
     {
       "key": "tenant_id",
       "value": "1",

Tenant_CRUD_Postman_Collection.json

@@ -41,18 +41,15 @@
 					}
 				],
 				"url": {
-					"raw": "{{base_url}}/api/tenants/bootstrap?dominio=acme.com&path=/",
+					"raw": "{{base_url}}/api/tenants/bootstrap/acme.com",
 					"host": [
 						"{{base_url}}"
 					],
 					"path": [
 						"api",
 						"tenants",
-						"bootstrap"
+						"bootstrap",
-					],
+						"acme.com"
-					"query": [
-						{"key": "dominio", "value": "acme.com"},
-						{"key": "path", "value": "/"}
 					]
 				}
 			},

app/Domains/Attachable/Models/Attachment.php

@@ -6,9 +6,6 @@ use App\Domains\Attachable\Enums\AttachmentType;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 
 #[Fillable([
@@ -43,34 +40,12 @@ class Attachment extends Model
         ];
     }
 
-    public function cropVariants(): HasMany
-    {
-        return $this->hasMany(AttachmentCrop::class);
-    }
-
-    public function desktopCrop(): HasOne
-    {
-        return $this->hasOne(AttachmentCrop::class)
-            ->where('variant', AttachmentCrop::DESKTOP);
-    }
-
-    public function mobileCrop(): HasOne
-    {
-        return $this->hasOne(AttachmentCrop::class)
-            ->where('variant', AttachmentCrop::MOBILE);
-    }
-
-    public function cropSource(): HasOne
-    {
-        return $this->hasOne(AttachmentCrop::class, 'cropped_attachment_id');
-    }
-
     /**
      * Get the pre-signed temporary S3 URL for this attachment.
      */
     public function getTemporaryUrl(int $expiresInMinutes = 10): string
     {
-        return Storage::disk('s3')->temporaryUrl(
+        return \Illuminate\Support\Facades\Storage::disk('s3')->temporaryUrl(
             $this->path,
             now()->addMinutes($expiresInMinutes)
         );

app/Domains/Attachable/Models/AttachmentCrop.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Domains\Attachable\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'attachment_id',
-    'variant',
-    'crop_horizontal',
-    'crop_vertical',
-    'cropped_attachment_id',
-])]
-class AttachmentCrop extends Model
-{
-    public const DESKTOP = 'desktop';
-
-    public const MOBILE = 'mobile';
-
-    public const VARIANTS = [self::DESKTOP, self::MOBILE];
-
-    protected function casts(): array
-    {
-        return [
-            'attachment_id' => 'integer',
-            'crop_horizontal' => 'array',
-            'crop_vertical' => 'array',
-            'cropped_attachment_id' => 'integer',
-        ];
-    }
-
-    public function attachment(): BelongsTo
-    {
-        return $this->belongsTo(Attachment::class);
-    }
-
-    public function croppedAttachment(): BelongsTo
-    {
-        return $this->belongsTo(Attachment::class, 'cropped_attachment_id');
-    }
-}

app/Domains/Attachable/Services/AttachmentService.php

@@ -5,9 +5,7 @@ namespace App\Domains\Attachable\Services;
 use App\Domains\Attachable\Enums\AttachmentType;
 use App\Domains\Attachable\Exceptions\AttachmentStorageException;
 use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Symfony\Component\Mime\MimeTypes;
@@ -15,107 +13,6 @@ use Throwable;
 
 class AttachmentService
 {
-    /**
-     * @param  array<string, array{crop_horizontal: array<string, mixed>, crop_vertical: array<string, mixed>}>  $crops
-     */
-    public function storeCroppedImageVariants(
-        UploadedFile|string $image,
-        string $path,
-        array $crops,
-    ): Attachment {
-        $crops = $this->validateCropVariants($crops);
-        $storedPaths = [];
-
-        try {
-            return DB::transaction(function () use (
-                $image,
-                $path,
-                $crops,
-                &$storedPaths,
-            ): Attachment {
-                $original = $this->store($image, $path);
-                $storedPaths[] = $original->path;
-                $contents = $this->imageContents($image);
-
-                foreach ($crops as $variant => $crop) {
-                    $cropped = $this->storeCropVariant($contents, $path, $crop);
-                    $storedPaths[] = $cropped->path;
-                    $original->cropVariants()->create([
-                        'variant' => $variant,
-                        'crop_horizontal' => $crop['crop_horizontal'],
-                        'crop_vertical' => $crop['crop_vertical'],
-                        'cropped_attachment_id' => $cropped->id,
-                    ]);
-                }
-
-                return $original->load('cropVariants.croppedAttachment');
-            });
-        } catch (Throwable $throwable) {
-            if ($storedPaths !== []) {
-                Storage::disk('s3')->delete(array_values(array_unique($storedPaths)));
-            }
-
-            throw $throwable;
-        }
-    }
-
-    /**
-     * @param  array<string, array{crop_horizontal: array<string, mixed>, crop_vertical: array<string, mixed>}>  $crops
-     */
-    public function updateImageCropVariants(
-        Attachment $original,
-        array $crops,
-    ): Attachment {
-        if ($original->type !== AttachmentType::Image) {
-            throw new AttachmentStorageException('Only image attachments can be cropped.');
-        }
-
-        $crops = $this->validateCropVariants($crops);
-        $contents = Storage::disk('s3')->get($original->path);
-
-        if (! is_string($contents) || $contents === '') {
-            throw new AttachmentStorageException('The original image could not be read from the s3 disk.');
-        }
-
-        $directory = trim(str_replace('\\', '/', dirname($original->path)), './');
-        $directory = $directory !== '' ? $directory : 'attachments';
-        $previousCrops = $original->cropVariants()->with('croppedAttachment')->get();
-        $storedCrops = [];
-
-        try {
-            foreach ($crops as $variant => $crop) {
-                $storedCrops[$variant] = $this->storeCropVariant($contents, $directory, $crop);
-            }
-
-            DB::transaction(function () use ($original, $crops, $storedCrops): void {
-                foreach ($crops as $variant => $crop) {
-                    $original->cropVariants()->updateOrCreate(
-                        ['variant' => $variant],
-                        [
-                            'crop_horizontal' => $crop['crop_horizontal'],
-                            'crop_vertical' => $crop['crop_vertical'],
-                            'cropped_attachment_id' => $storedCrops[$variant]->id,
-                        ]
-                    );
-                }
-            });
-        } catch (Throwable $throwable) {
-            foreach ($storedCrops as $storedCrop) {
-                $this->delete($storedCrop);
-            }
-
-            throw $throwable;
-        }
-
-        foreach ($previousCrops as $previousCrop) {
-            if ($previousCrop->croppedAttachment !== null) {
-                $this->delete($previousCrop->croppedAttachment);
-            }
-        }
-
-        return $original->refresh()->load('cropVariants.croppedAttachment');
-    }
-
     public function store(
         UploadedFile|string $file,
         string $path,
@@ -160,30 +57,13 @@ class AttachmentService
 
     public function delete(Attachment $attachment): void
     {
-        $croppedAttachments = $attachment->cropVariants()
+        $deleted = Storage::disk('s3')->delete($attachment->path);
-            ->with('croppedAttachment')
-            ->get()
-            ->pluck('croppedAttachment')
-            ->filter();
-        $paths = $croppedAttachments
-            ->pluck('path')
-            ->prepend($attachment->path)
-            ->filter()
-            ->unique()
-            ->values()
-            ->all();
-        $deleted = Storage::disk('s3')->delete(
-            count($paths) === 1 ? $paths[0] : $paths
-        );
 
         if (! $deleted) {
-            throw new AttachmentStorageException('No se pudieron eliminar los archivos del disco s3.');
+            throw new AttachmentStorageException('No se pudo eliminar el archivo del disco s3.');
         }
 
-        DB::transaction(function () use ($attachment, $croppedAttachments): void {
+        $attachment->delete();
-            $attachment->delete();
-            Attachment::query()->whereKey($croppedAttachments->pluck('id'))->delete();
-        });
     }
 
     public function copy(Attachment $source, string $path): Attachment
@@ -227,171 +107,6 @@ class AttachmentService
         return trim($path, '/');
     }
 
-    /**
-     * @param  array<string, array{crop_horizontal?: mixed, crop_vertical?: mixed}>  $crops
-     * @return array<string, array{crop_horizontal: array{start_percentage: float, end_percentage: float}, crop_vertical: array{start_percentage: float, end_percentage: float}}>
-     */
-    protected function validateCropVariants(array $crops): array
-    {
-        $validated = [];
-
-        foreach (AttachmentCrop::VARIANTS as $variant) {
-            $crop = $crops[$variant] ?? null;
-
-            if (! is_array($crop)) {
-                throw new AttachmentStorageException("The {$variant} crop is required.");
-            }
-
-            $horizontal = $crop['crop_horizontal'] ?? null;
-            $vertical = $crop['crop_vertical'] ?? null;
-
-            if (! is_array($horizontal) || ! is_array($vertical)) {
-                throw new AttachmentStorageException(
-                    "The {$variant} crop must contain crop_horizontal and crop_vertical ranges."
-                );
-            }
-
-            $validated[$variant] = [
-                'crop_horizontal' => $this->validateCropRange($horizontal, "{$variant} horizontal"),
-                'crop_vertical' => $this->validateCropRange($vertical, "{$variant} vertical"),
-            ];
-        }
-
-        return $validated;
-    }
-
-    /**
-     * @param  array{crop_horizontal: array<string, mixed>, crop_vertical: array<string, mixed>}  $crop
-     */
-    protected function storeCropVariant(string $contents, string $path, array $crop): Attachment
-    {
-        $croppedContents = $this->cropImage(
-            $contents,
-            $crop['crop_horizontal'],
-            $crop['crop_vertical'],
-        );
-
-        return $this->store(
-            'data:'.$croppedContents['mime_type'].';base64,'.base64_encode($croppedContents['contents']),
-            $path,
-        );
-    }
-
-    /**
-     * @param  array{start_percentage?: mixed, end_percentage?: mixed}  $range
-     * @return array{start_percentage: float, end_percentage: float}
-     */
-    protected function validateCropRange(array $range, string $axis): array
-    {
-        $start = $range['start_percentage'] ?? null;
-        $end = $range['end_percentage'] ?? null;
-
-        if (! is_numeric($start) || ! is_numeric($end)) {
-            throw new AttachmentStorageException(
-                "The {$axis} crop range must contain numeric start_percentage and end_percentage values."
-            );
-        }
-
-        $start = (float) $start;
-        $end = (float) $end;
-
-        if (! is_finite($start) || ! is_finite($end) || $start < 0 || $end > 100 || $start >= $end) {
-            throw new AttachmentStorageException(
-                "The {$axis} crop range must satisfy 0 <= start_percentage < end_percentage <= 100."
-            );
-        }
-
-        return [
-            'start_percentage' => $start,
-            'end_percentage' => $end,
-        ];
-    }
-
-    protected function imageContents(UploadedFile|string $image): string
-    {
-        if (is_string($image)) {
-            return $this->decodeBase64File($image)['data'];
-        }
-
-        $contents = file_get_contents($image->getRealPath());
-
-        if (! is_string($contents) || $contents === '') {
-            throw new AttachmentStorageException('The image content cannot be empty.');
-        }
-
-        return $contents;
-    }
-
-    /**
-     * @return array{contents: string, mime_type: string}
-     */
-    protected function cropImage(
-        string $contents,
-        array $cropHorizontal,
-        array $cropVertical,
-    ): array {
-        $source = @imagecreatefromstring($contents);
-
-        if ($source === false) {
-            throw new AttachmentStorageException('The attachment must contain a valid image.');
-        }
-
-        $width = imagesx($source);
-        $height = imagesy($source);
-        $x = min($width - 1, (int) floor($width * $cropHorizontal['start_percentage'] / 100));
-        $right = min($width, (int) ceil($width * $cropHorizontal['end_percentage'] / 100));
-        $y = min($height - 1, (int) floor($height * $cropVertical['start_percentage'] / 100));
-        $bottom = min($height, (int) ceil($height * $cropVertical['end_percentage'] / 100));
-        $cropped = imagecrop($source, [
-            'x' => $x,
-            'y' => $y,
-            'width' => $right - $x,
-            'height' => $bottom - $y,
-        ]);
-
-        if ($cropped === false) {
-            throw new AttachmentStorageException('The image could not be cropped.');
-        }
-
-        return $this->encodeImage($cropped, $contents);
-    }
-
-    /**
-     * @return array{contents: string, mime_type: string}
-     */
-    protected function encodeImage(\GdImage $image, string $originalContents): array
-    {
-        $mimeType = (new \finfo(FILEINFO_MIME_TYPE))->buffer($originalContents);
-        $mimeType = is_string($mimeType) ? strtolower($mimeType) : '';
-
-        ob_start();
-
-        try {
-            $encoded = match ($mimeType) {
-                'image/jpeg' => imagejpeg($image, null, 90),
-                'image/gif' => imagegif($image),
-                'image/webp' => imagewebp($image, null, 90),
-                'image/avif' => function_exists('imageavif') && imageavif($image, null, 90),
-                default => imagepng($image),
-            };
-            $output = ob_get_contents();
-        } finally {
-            ob_end_clean();
-        }
-
-        if (! $encoded || ! is_string($output) || $output === '') {
-            throw new AttachmentStorageException('The cropped image could not be encoded.');
-        }
-
-        return [
-            'contents' => $output,
-            'mime_type' => match ($mimeType) {
-                'image/jpeg', 'image/gif', 'image/webp', 'image/avif' => $mimeType,
-                default => 'image/png',
-            },
-        ];
-    }
-
     protected function resolveFilename(UploadedFile|string $file, string $key): string
     {
         if ($file instanceof UploadedFile) {

app/Domains/Attachable/documentacion/README.md

@@ -2,12 +2,11 @@
 
 ## Propósito
 
-Centraliza el almacenamiento y la metadata de archivos adjuntos. Acepta archivos subidos o contenido Base64, los persiste en S3 y registra su tipo, MIME, extensión, tamaño, nombre original y clave única. Para imágenes también permite guardar un original junto con variantes recortadas para desktop y mobile.
+Centraliza el almacenamiento y la metadata de archivos adjuntos. Acepta archivos subidos o contenido Base64, los persiste en S3 y registra su tipo, MIME, extensión, tamaño, nombre original y clave única.
 
 ## Componentes principales
 
 - `Models/Attachment.php`: representa un adjunto y genera URL temporales de acceso.
-- `Models/AttachmentCrop.php`: relaciona un original con su crop desktop o mobile y la imagen generada.
 - `Services/AttachmentService.php`: almacena, copia y elimina archivos, compensando en S3 si falla la escritura en base de datos.
 - `Enums/AttachmentType.php`: clasifica imágenes, videos, PDF, audio, documentos y otros archivos.
 - `Exceptions/AttachmentStorageException.php`: expresa fallos propios del almacenamiento.
@@ -26,8 +25,5 @@ No expone rutas HTTP propias. Lo consumen otros dominios, especialmente `Catalog
 ## Consideraciones
 
 - El directorio no puede quedar vacío después de normalizarlo.
-- Cada eje del crop guarda `start_percentage` y `end_percentage`, cumpliendo `0 <= start < end <= 100`.
-- `attachment_crops` guarda una fila por variante con los rangos horizontal/vertical y el attachment procesado.
-- Al eliminar el original mediante el servicio también se eliminan todas sus variantes recortadas.
 - La eliminación se considera fallida si S3 no confirma el borrado.
 - Las URL generadas son temporales; el vencimiento predeterminado es de 10 minutos.

app/Domains/Auth/Controllers/CreateAdminAppResetPasswordAttemptController.php

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

app/Domains/Auth/Controllers/CreateScannerResetPasswordAttemptController.php

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

app/Domains/Auth/Controllers/ScannerLoginController.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Domains\Auth\Controllers;
-
-use App\Domains\Auth\Requests\ScannerLoginRequest;
-use App\Domains\Auth\Resources\UserResource;
-use App\Domains\Auth\Services\PasswordLoginService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-
-class ScannerLoginController extends Controller
-{
-    public function __construct(
-        private readonly PasswordLoginService $passwordLoginService,
-    ) {}
-
-    public function __invoke(ScannerLoginRequest $request): JsonResponse
-    {
-        $credentials = $request->validated();
-        $user = $this->passwordLoginService->authenticateScanner(
-            $credentials['email'],
-            $credentials['password'],
-            $request->ip(),
-            $request->userAgent(),
-        );
-
-        $expirationMinutes = (int) config('sanctum.expiration');
-        $token = $user->createToken(
-            'scanner-token',
-            ['scanner'],
-            now()->addMinutes($expirationMinutes),
-        )->plainTextToken;
-
-        return response()->json([
-            'code' => 'auth.login_success',
-            'message' => __('api.auth.login_success'),
-            'token' => $token,
-            'token_type' => 'Bearer',
-            'user' => UserResource::make($user),
-        ]);
-    }
-}

app/Domains/Auth/Controllers/ScannerMeController.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Domains\Auth\Controllers;
-
-use App\Domains\Auth\Models\User;
-use App\Domains\Auth\Resources\ScannerMeResource;
-use App\Domains\Auth\Services\ScannerContextService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class ScannerMeController extends Controller
-{
-    public function __construct(
-        private readonly ScannerContextService $scannerContextService,
-    ) {}
-
-    public function __invoke(Request $request): ScannerMeResource
-    {
-        /** @var User $user */
-        $user = $request->user();
-
-        return ScannerMeResource::make($this->scannerContextService->load($user));
-    }
-}

app/Domains/Auth/Models/ResetPasswordAttempt.php

@@ -11,12 +11,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 #[Hidden(['codigo'])]
 class ResetPasswordAttempt extends Model
 {
-    public const REASON_MANUAL = 'manual';
-
-    public const REASON_ACCOUNT_LOCKED = 'account_locked';
-
-    public const REASON_STAFF_CREATED = 'staff_created';
-
     public const STATUS_PENDING = 'pending';
 
     public const STATUS_VALIDATED = 'validated';

app/Domains/Auth/Models/User.php

@@ -53,16 +53,6 @@ class User extends Authenticatable
         return $this->belongsTo(Role::class, 'rol_codigo', 'codigo');
     }
 
-    public function hasPermission(string $permissionCode): bool
-    {
-        return $this->role()
-            ->whereHas(
-                'permissions',
-                fn ($query) => $query->where('permisos.codigo', $permissionCode)
-            )
-            ->exists();
-    }
-
     /**
      * @return BelongsTo<Tenant, $this>
      */

app/Domains/Auth/Requests/AdminAppCreateResetPasswordAttemptRequest.php

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

app/Domains/Auth/Requests/ScannerCreateResetPasswordAttemptRequest.php

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

app/Domains/Auth/Requests/ScannerLoginRequest.php

@@ -1,5 +0,0 @@
-<?php
-
-namespace App\Domains\Auth\Requests;
-
-class ScannerLoginRequest extends AdminAppLoginRequest {}

app/Domains/Auth/Resources/ScannerMeResource.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Domains\Auth\Resources;
-
-use App\Domains\Auth\Models\User;
-use App\Domains\Tenant\Resources\TenantResource;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin User */
-class ScannerMeResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'user' => UserResource::make($this->resource),
-            'tenant' => TenantResource::make($this->tenant),
-        ];
-    }
-}

app/Domains/Auth/Services/PasswordLoginService.php

@@ -4,11 +4,8 @@ namespace App\Domains\Auth\Services;
 
 use App\Domains\Auth\Exceptions\AccountLockedException;
 use App\Domains\Auth\Models\LoginAttempt;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
 use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
 use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Notification\Events\PasswordResetRequested;
 use Carbon\CarbonImmutable;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -62,33 +59,6 @@ class PasswordLoginService
             $userAgent,
             RoleCode::AdminApp,
             true,
-            null,
-            PasswordResetRequested::CHANNEL_ADMINAPP,
-        );
-    }
-
-    /**
-     * Authenticate a tenant-bound user authorized to scan tickets.
-     *
-     * @throws AccountLockedException
-     * @throws ValidationException
-     */
-    public function authenticateScanner(
-        string $email,
-        string $password,
-        ?string $ipAddress,
-        ?string $userAgent,
-    ): User {
-        return $this->authenticateUser(
-            $email,
-            $password,
-            null,
-            $ipAddress,
-            $userAgent,
-            null,
-            true,
-            PermissionCode::ScanTickets->value,
-            PasswordResetRequested::CHANNEL_SCANNER,
         );
     }
 
@@ -98,10 +68,8 @@ class PasswordLoginService
         ?string $tenantCode,
         ?string $ipAddress,
         ?string $userAgent,
-        ?RoleCode $requiredRole = RoleCode::User,
+        RoleCode $requiredRole = RoleCode::User,
         bool $requiresTenant = false,
-        ?string $requiredPermission = null,
-        string $passwordResetChannel = PasswordResetRequested::CHANNEL_STOREFRONT,
     ): User {
         $normalizedEmail = mb_strtolower(trim($email));
         $now = CarbonImmutable::now();
@@ -116,22 +84,10 @@ class PasswordLoginService
             $now,
             $requiredRole,
             $requiresTenant,
-            $requiredPermission,
-            $passwordResetChannel,
         ): array {
             $user = User::query()
                 ->where('email', $normalizedEmail)
-                ->when(
+                ->where('rol_codigo', $requiredRole->value)
-                    $requiredRole !== null,
-                    fn ($query) => $query->where('rol_codigo', $requiredRole->value),
-                )
-                ->when(
-                    $requiredPermission !== null,
-                    fn ($query) => $query->whereHas(
-                        'role.permissions',
-                        fn ($query) => $query->where('permisos.codigo', $requiredPermission)
-                    ),
-                )
                 ->when(
                     $requiresTenant,
                     fn ($query) => $query->whereNotNull('tenant_codigo'),
@@ -166,13 +122,8 @@ class PasswordLoginService
             }
 
             if ($user === null || ! Hash::check($password, $user->password)) {
-                if ($user !== null && $attemptTenantCode !== null) {
+                if ($user !== null) {
-                    $this->registerFailure(
+                    $this->registerFailure($user, $now, $tenantCode);
-                        $user,
-                        $now,
-                        $attemptTenantCode,
-                        $passwordResetChannel,
-                    );
                 }
 
                 $outcome = $user?->locked_until?->isFuture()
@@ -231,12 +182,8 @@ class PasswordLoginService
         return $result['user'];
     }
 
-    private function registerFailure(
+    private function registerFailure(User $user, CarbonImmutable $now, string $tenantCode): void
-        User $user,
+    {
-        CarbonImmutable $now,
-        string $tenantCode,
-        string $passwordResetChannel,
-    ): void {
         $windowMinutes = max(1, (int) config('login-security.attempt_window_minutes'));
         $maxAttempts = max(1, (int) config('login-security.max_attempts'));
         $lockMinutes = max(1, (int) config('login-security.lock_minutes'));
@@ -259,27 +206,11 @@ class PasswordLoginService
 
         if ($attempts >= $maxAttempts && $previousAttempts < $maxAttempts) {
             try {
-                if ($passwordResetChannel === PasswordResetRequested::CHANNEL_ADMINAPP) {
+                $this->resetPasswordAttemptService->createForEmail($user->email, $tenantCode, 'account_locked');
-                    $this->resetPasswordAttemptService->createForAdminAppEmail(
-                        $user->email,
-                        ResetPasswordAttempt::REASON_ACCOUNT_LOCKED,
-                    );
-                } elseif ($passwordResetChannel === PasswordResetRequested::CHANNEL_SCANNER) {
-                    $this->resetPasswordAttemptService->createForScannerEmail(
-                        $user->email,
-                        ResetPasswordAttempt::REASON_ACCOUNT_LOCKED,
-                    );
-                } else {
-                    $this->resetPasswordAttemptService->createForEmail(
-                        $user->email,
-                        $tenantCode,
-                        ResetPasswordAttempt::REASON_ACCOUNT_LOCKED,
-                    );
-                }
             } catch (\Throwable $e) {
                 Log::error('Failed to trigger reset password on account lock', [
                     'user_id' => $user->id,
-                    'exception' => $e,
+                    'exception' => $e
                 ]);
             }
         }

app/Domains/Auth/Services/ResetPasswordAttemptService.php

@@ -4,7 +4,6 @@ namespace App\Domains\Auth\Services;
 
 use App\Domains\Auth\Models\ResetPasswordAttempt;
 use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Notification\Events\PasswordResetRequested;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -12,11 +11,8 @@ use Throwable;
 
 class ResetPasswordAttemptService
 {
-    public function createForEmail(
+    public function createForEmail(string $email, string $tenantCode, string $reason = 'manual'): void
-        string $email,
+    {
-        string $tenantCode,
-        string $reason = ResetPasswordAttempt::REASON_MANUAL,
-    ): void {
         $emailFingerprint = $this->emailFingerprint($email);
 
         try {
@@ -26,12 +22,28 @@ class ResetPasswordAttemptService
                     ->lockForUpdate()
                     ->first();
 
-                return $this->createAttemptForUser(
+                if ($user === null) {
-                    $user,
+                    Log::warning('Password reset attempt was not created because the user was not found.', [
-                    $reason,
+                        'email_fingerprint' => $emailFingerprint,
-                    $emailFingerprint,
+                    ]);
-                    'Password reset attempt was not created because the user was not found.',
+
-                );
+                    return null;
+                }
+
+                $user->resetPasswordAttempts()
+                    ->whereIn('status', [
+                        ResetPasswordAttempt::STATUS_PENDING,
+                        ResetPasswordAttempt::STATUS_VALIDATED,
+                    ])
+                    ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
+
+                $attempt = $user->resetPasswordAttempts()->create([
+                    'codigo' => $this->generateCode(),
+                    'reason' => $reason,
+                    'status' => ResetPasswordAttempt::STATUS_PENDING,
+                ]);
+
+                return $attempt->getKey();
             });
         } catch (Throwable $exception) {
             Log::error('Failed to create password reset attempt.', [
@@ -42,108 +54,20 @@ class ResetPasswordAttemptService
             throw $exception;
         }
 
-        $this->dispatchPasswordResetRequested(
+        if ($attemptId !== null) {
-            $attemptId,
+            try {
-            $tenantCode,
+                PasswordResetRequested::dispatch($attemptId, $tenantCode);
-            PasswordResetRequested::CHANNEL_STOREFRONT,
+            } catch (Throwable $exception) {
-            $emailFingerprint,
+                Log::error('Failed to dispatch password reset email.', [
-        );
-    }
-
-    public function createForAdminAppEmail(
-        string $email,
-        string $reason = ResetPasswordAttempt::REASON_MANUAL,
-    ): void {
-        $emailFingerprint = $this->emailFingerprint($email);
-
-        try {
-            $result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
-                $user = User::query()
-                    ->where('email', $email)
-                    ->where('rol_codigo', RoleCode::AdminApp->value)
-                    ->whereNotNull('tenant_codigo')
-                    ->lockForUpdate()
-                    ->first();
-
-                $attemptId = $this->createAttemptForUser(
-                    $user,
-                    $reason,
-                    $emailFingerprint,
-                    'AdminApp password reset attempt was not created because the user was not found.',
-                );
-
-                if ($user === null || $attemptId === null) {
-                    return null;
-                }
-
-                return [
                     'attempt_id' => $attemptId,
-                    'tenant_code' => $user->tenant_codigo,
+                    'tenant_code' => $tenantCode,
-                ];
+                    'email_fingerprint' => $emailFingerprint,
-            });
+                    'exception' => $exception,
-        } catch (Throwable $exception) {
+                ]);
-            Log::error('Failed to create AdminApp password reset attempt.', [
-                'email_fingerprint' => $emailFingerprint,
-                'exception' => $exception,
-            ]);
 
-            throw $exception;
+                throw $exception;
+            }
         }
-
-        $this->dispatchPasswordResetRequested(
-            $result['attempt_id'] ?? null,
-            $result['tenant_code'] ?? null,
-            PasswordResetRequested::CHANNEL_ADMINAPP,
-            $emailFingerprint,
-        );
-    }
-
-    public function createForScannerEmail(
-        string $email,
-        string $reason = ResetPasswordAttempt::REASON_MANUAL,
-    ): void {
-        $emailFingerprint = $this->emailFingerprint($email);
-
-        try {
-            $result = DB::transaction(function () use ($email, $emailFingerprint, $reason): ?array {
-                $user = User::query()
-                    ->where('email', $email)
-                    ->where('rol_codigo', RoleCode::Scanner->value)
-                    ->whereNotNull('tenant_codigo')
-                    ->lockForUpdate()
-                    ->first();
-
-                $attemptId = $this->createAttemptForUser(
-                    $user,
-                    $reason,
-                    $emailFingerprint,
-                    'Scanner password reset attempt was not created because the user was not found.',
-                );
-
-                if ($user === null || $attemptId === null) {
-                    return null;
-                }
-
-                return [
-                    'attempt_id' => $attemptId,
-                    'tenant_code' => $user->tenant_codigo,
-                ];
-            });
-        } catch (Throwable $exception) {
-            Log::error('Failed to create Scanner password reset attempt.', [
-                'email_fingerprint' => $emailFingerprint,
-                'exception' => $exception,
-            ]);
-
-            throw $exception;
-        }
-
-        $this->dispatchPasswordResetRequested(
-            $result['attempt_id'] ?? null,
-            $result['tenant_code'] ?? null,
-            PasswordResetRequested::CHANNEL_SCANNER,
-            $emailFingerprint,
-        );
     }
 
     public function validateCode(string $email, string $code): bool
@@ -245,61 +169,6 @@ class ResetPasswordAttemptService
         }
     }
 
-    private function createAttemptForUser(
-        ?User $user,
-        string $reason,
-        string $emailFingerprint,
-        string $userNotFoundMessage,
-    ): ?int {
-        if ($user === null) {
-            Log::warning($userNotFoundMessage, [
-                'email_fingerprint' => $emailFingerprint,
-            ]);
-
-            return null;
-        }
-
-        $user->resetPasswordAttempts()
-            ->whereIn('status', [
-                ResetPasswordAttempt::STATUS_PENDING,
-                ResetPasswordAttempt::STATUS_VALIDATED,
-            ])
-            ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
-
-        $attempt = $user->resetPasswordAttempts()->create([
-            'codigo' => $this->generateCode(),
-            'reason' => $reason,
-            'status' => ResetPasswordAttempt::STATUS_PENDING,
-        ]);
-
-        return $attempt->getKey();
-    }
-
-    private function dispatchPasswordResetRequested(
-        ?int $attemptId,
-        ?string $tenantCode,
-        string $channel,
-        string $emailFingerprint,
-    ): void {
-        if ($attemptId === null || $tenantCode === null) {
-            return;
-        }
-
-        try {
-            PasswordResetRequested::dispatch($attemptId, $tenantCode, $channel);
-        } catch (Throwable $exception) {
-            Log::error('Failed to dispatch password reset email.', [
-                'attempt_id' => $attemptId,
-                'tenant_code' => $tenantCode,
-                'channel' => $channel,
-                'email_fingerprint' => $emailFingerprint,
-                'exception' => $exception,
-            ]);
-
-            throw $exception;
-        }
-    }
-
     private function generateCode(): string
     {
         return str_pad((string) random_int(0, 9999), 4, '0', STR_PAD_LEFT);

app/Domains/Auth/Services/ScannerContextService.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Domains\Auth\Services;
-
-use App\Domains\Auth\Models\User;
-
-class ScannerContextService
-{
-    public function load(User $user): User
-    {
-        $tenant = $user->tenant()
-            ->with([
-                'menues' => fn ($query) => $query->whereHas(
-                    'roles',
-                    fn ($query) => $query->where('codigo', $user->rol_codigo)
-                ),
-            ])
-            ->firstOrFail();
-
-        $user->setRelation('tenant', $tenant);
-
-        return $user;
-    }
-}

app/Domains/Auth/routes/adminapp.php

@@ -2,19 +2,10 @@
 
 use App\Domains\Auth\Controllers\AdminAppLoginController;
 use App\Domains\Auth\Controllers\AdminAppMeController;
-use App\Domains\Auth\Controllers\CreateAdminAppResetPasswordAttemptController;
-use App\Domains\Auth\Controllers\ResetPasswordController;
-use App\Domains\Auth\Controllers\ValidateResetPasswordAttemptController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp')->group(function (): void {
     Route::post('login', AdminAppLoginController::class)->middleware('throttle:login');
-    Route::post('password/reset-attempts', CreateAdminAppResetPasswordAttemptController::class)
-        ->middleware('throttle:5,1');
-    Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
-        ->middleware('throttle:10,1');
-    Route::post('password/reset', ResetPasswordController::class)
-        ->middleware('throttle:5,1');
     Route::middleware(['auth:sanctum', 'adminapp.tenant'])
         ->get('me', AdminAppMeController::class);
 });

app/Domains/Auth/routes/api.php

@@ -25,4 +25,3 @@ Route::middleware('auth:sanctum')->get('/me', MeController::class);
 Route::middleware('auth:sanctum')->put('/me', UpdateProfileController::class);
 
 require __DIR__.'/adminapp.php';
-require __DIR__.'/scanner.php';

app/Domains/Auth/routes/scanner.php

@@ -1,20 +0,0 @@
-<?php
-
-use App\Domains\Auth\Controllers\CreateScannerResetPasswordAttemptController;
-use App\Domains\Auth\Controllers\ResetPasswordController;
-use App\Domains\Auth\Controllers\ScannerLoginController;
-use App\Domains\Auth\Controllers\ScannerMeController;
-use App\Domains\Auth\Controllers\ValidateResetPasswordAttemptController;
-use Illuminate\Support\Facades\Route;
-
-Route::prefix('v1/scanner')->group(function (): void {
-    Route::post('login', ScannerLoginController::class)->middleware('throttle:login');
-    Route::post('password/reset-attempts', CreateScannerResetPasswordAttemptController::class)
-        ->middleware('throttle:5,1');
-    Route::post('password/reset-attempts/validate', ValidateResetPasswordAttemptController::class)
-        ->middleware('throttle:10,1');
-    Route::post('password/reset', ResetPasswordController::class)
-        ->middleware('throttle:5,1');
-    Route::middleware(['auth:sanctum', 'scanner.tenant'])
-        ->get('me', ScannerMeController::class);
-});

app/Domains/Authorization/Enums/PermissionCode.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Domains\Authorization\Enums;
-
-enum PermissionCode: string
-{
-    case ScanTickets = 'tickets.escanear';
-}

app/Domains/Bootstrap/Controllers/ScannerBootstrapController.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Domains\Bootstrap\Controllers;
-
-use App\Domains\Bootstrap\Requests\ScannerBootstrapRequest;
-use App\Domains\Bootstrap\Resources\ScannerBootstrapResource;
-use App\Domains\Bootstrap\Services\ScannerBootstrapService;
-use App\Http\Controllers\Controller;
-
-class ScannerBootstrapController extends Controller
-{
-    public function __construct(protected ScannerBootstrapService $bootstrapService) {}
-
-    public function __invoke(ScannerBootstrapRequest $request): ScannerBootstrapResource
-    {
-        return ScannerBootstrapResource::make(
-            $this->bootstrapService->get((string) $request->validated('dominio'))
-        );
-    }
-}

app/Domains/Bootstrap/Controllers/TenantBootstrapController.php

@@ -14,10 +14,7 @@ class TenantBootstrapController extends Controller
     public function __invoke(TenantBootstrapRequest $request): TenantResource
     {
         return TenantResource::make(
-            $this->bootstrapService->get(
+            $this->bootstrapService->get((string) $request->validated('dominio'))
-                (string) $request->validated('dominio'),
-                (string) $request->validated('path'),
-            )
         );
     }
 }

app/Domains/Bootstrap/Requests/ScannerBootstrapRequest.php

@@ -1,5 +0,0 @@
-<?php
-
-namespace App\Domains\Bootstrap\Requests;
-
-class ScannerBootstrapRequest extends TenantBootstrapRequest {}

app/Domains/Bootstrap/Requests/TenantBootstrapRequest.php

@@ -10,8 +10,6 @@ class TenantBootstrapRequest extends FormRequest
 {
     protected bool $hasInvalidDomain = false;
 
-    protected bool $hasInvalidPath = false;
-
     public function authorize(): bool
     {
         return true;
@@ -19,20 +17,13 @@ class TenantBootstrapRequest extends FormRequest
 
     protected function prepareForValidation(): void
     {
-        $rawDomain = $this->query('dominio', $this->route('dominio'));
+        $rawDomain = $this->route('dominio');
-        $rawPath = $this->query('path', '/');
         $normalizedDomain = TenantDomainNormalizer::normalize($rawDomain);
-        $normalizedPath = TenantDomainNormalizer::normalizePath($rawPath);
 
         $this->hasInvalidDomain = TenantDomainNormalizer::hasValue($rawDomain)
             && $normalizedDomain === null;
 
-        $this->hasInvalidPath = ! is_string($rawPath) || $normalizedPath === null;
+        $this->merge(['dominio' => $normalizedDomain]);
-
-        $this->merge([
-            'dominio' => $normalizedDomain,
-            'path' => $normalizedPath,
-        ]);
     }
 
     /** @return array<string, mixed> */
@@ -50,17 +41,6 @@ class TenantBootstrapRequest extends FormRequest
                 'string',
                 'max:255',
             ],
-            'path' => [
-                'bail',
-                function (string $attribute, mixed $value, Closure $fail): void {
-                    if ($this->hasInvalidPath) {
-                        $fail("The {$attribute} field must contain a valid URL path.");
-                    }
-                },
-                'required',
-                'string',
-                'max:2048',
-            ],
         ];
     }
 }

app/Domains/Bootstrap/Resources/ScannerBootstrapResource.php

@@ -1,5 +0,0 @@
-<?php
-
-namespace App\Domains\Bootstrap\Resources;
-
-class ScannerBootstrapResource extends AdminAppBootstrapResource {}

app/Domains/Bootstrap/Services/ScannerBootstrapService.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Domains\Bootstrap\Services;
-
-use App\Domains\Tenant\Models\WebsiteType;
-
-class ScannerBootstrapService
-{
-    /** @return array{website_type: WebsiteType} */
-    public function get(string $domain): array
-    {
-        return [
-            'website_type' => WebsiteType::query()
-                ->with(['siteLogo', 'footerLogo'])
-                ->where('scanner_domain', $domain)
-                ->firstOrFail(),
-        ];
-    }
-}

app/Domains/Bootstrap/Services/TenantBootstrapService.php

@@ -5,31 +5,15 @@ namespace App\Domains\Bootstrap\Services;
 use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Services\TenantInformationService;
-use App\Domains\Tenant\Support\TenantDomainNormalizer;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class TenantBootstrapService
 {
     public function __construct(protected TenantInformationService $tenantInformationService) {}
 
-    public function get(string $domain, string $path = '/'): Tenant
+    public function get(string $domain): Tenant
     {
-        $candidateKeys = TenantDomainNormalizer::tenantKeyCandidates($domain, $path);
-        $tenantsByDomain = Tenant::query()
-            ->whereIn('dominio', $candidateKeys)
-            ->get()
-            ->keyBy('dominio');
-
-        $tenant = collect($candidateKeys)
-            ->map(fn (string $candidate): ?Tenant => $tenantsByDomain->get($candidate))
-            ->first(fn (?Tenant $candidate): bool => $candidate !== null);
-
-        if (! $tenant instanceof Tenant) {
-            throw (new ModelNotFoundException)->setModel(Tenant::class);
-        }
-
         return $this->tenantInformationService->load(
-            $tenant,
+            Tenant::query()->where('dominio', $domain)->firstOrFail(),
             [
                 'menues' => fn ($query) => $query->whereHas(
                     'roles',

app/Domains/Bootstrap/documentacion/README.md

@@ -12,12 +12,12 @@ Entrega la configuración inicial que necesitan la tienda y el panel administrat
 
 ## Endpoints
 
-- `GET /tenants/bootstrap?dominio={hostname}&path={path}`: bootstrap público de la tienda. Resuelve la clave de tenant más específica que sea prefijo completo del path y usa el dominio raíz como fallback.
+- `GET /tenants/bootstrap/{dominio}`: bootstrap público de la tienda.
 - Endpoint de bootstrap bajo `/v1/adminapp`, protegido por `auth:sanctum` y `adminapp.tenant`.
 
 ## Validación
 
-`TenantBootstrapRequest` valida y normaliza por separado el hostname y el path recibidos. `AdminAppBootstrapRequest` reutiliza ese contrato para el panel.
+`TenantBootstrapRequest` valida el dominio recibido. `AdminAppBootstrapRequest` reutiliza ese contrato para el panel.
 
 ## Dependencias
 

app/Domains/Bootstrap/routes/api.php

@@ -3,7 +3,7 @@
 use App\Domains\Bootstrap\Controllers\TenantBootstrapController;
 use Illuminate\Support\Facades\Route;
 
-Route::get('tenants/bootstrap', TenantBootstrapController::class);
+Route::get('tenants/bootstrap/{dominio}', TenantBootstrapController::class)
+    ->where('dominio', '.*');
 
 require __DIR__.'/adminapp.php';
-require __DIR__.'/scanner.php';

app/Domains/Bootstrap/routes/scanner.php

@@ -1,9 +0,0 @@
-<?php
-
-use App\Domains\Bootstrap\Controllers\ScannerBootstrapController;
-use Illuminate\Support\Facades\Route;
-
-Route::get(
-    'v1/scanner/bootstrap/{dominio}',
-    ScannerBootstrapController::class
-);

app/Domains/Cart/Resources/CartItemResource.php

@@ -4,6 +4,7 @@ namespace App\Domains\Cart\Resources;
 
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\Variant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -34,15 +35,19 @@ class CartItemResource extends JsonResource
             'precio_unitario' => $this->formatMoney($selectedItem?->getPrice()),
             'catalog_item_id' => $this->catalog_item_id,
             'variant_id' => $this->variant_id,
-            'nombre' => $selectedItem?->getName(),
+            'product' => $selectedItem === null ? null : [
-            'imagen' => $imageUrl,
+                'nombre' => $selectedItem->getName(),
-            'variant' => $this->variant === null ? null : [
+                'imagen' => $imageUrl,
-                'id' => $this->variant->id,
+                'variants' => $this->catalogItem->visibleVariants($this->variant_id)
-                'precio' => $this->formatMoney($this->variant->getPrice()),
+                    ->map(fn (Variant $variant): array => [
-                'stock_tecnico' => $this->catalogItem->inventory_policy === InventoryPolicy::Unlimited
+                        'id' => $variant->id,
-                    ? null
+                        'precio' => $this->formatMoney($variant->getPrice()),
-                    : $this->variant->inventory->availableStock(),
+                        'stock_tecnico' => $this->catalogItem->inventory_policy === InventoryPolicy::Unlimited
-                'values' => $this->variant->selectorOptions($this->catalogItem->itemAttributes),
+                            ? null
+                            : $variant->inventory->availableStock(),
+                        'values' => $variant->selectionOptions($this->catalogItem->itemAttributes),
+                    ])
+                    ->values(),
             ],
         ];
     }

app/Domains/Cart/Services/CartService.php

@@ -82,11 +82,11 @@ class CartService
             $guestToken,
             60 * 24 * 180,
             '/',
-            config('session.domain'),
+            null,
-            (bool) config('session.secure'),
+            false,
             true,
             false,
-            config('session.same_site'),
+            'lax',
         );
     }
 
@@ -108,6 +108,10 @@ class CartService
             'items.catalogItem.attachments',
             'items.catalogItem.inventory',
             'items.catalogItem.itemAttributes.attribute',
+            'items.catalogItem.variants.inventory',
+            'items.catalogItem.variants.definitions.itemAttribute.attribute.options',
+            'items.catalogItem.variants.eventDates',
+            'items.catalogItem.variants.eventDate',
             'items.variant.attachments',
             'items.variant.inventory',
             'items.variant.definitions.itemAttribute.attribute.options',

app/Domains/Cart/documentacion/README.md

@@ -25,7 +25,7 @@ Bajo `/tenants/{tenant:codigo}`:
 
 ## Contratos
 
-`AddCartItemRequest` y `UpdateCartItemQuantityRequest` validan selección y cantidad. `CartResource` y `CartItemResource` estabilizan la respuesta pública. Cada ítem expone `nombre`, `imagen` y `precio_unitario` en la raíz, priorizando la variante seleccionada y usando el catálogo base como respaldo. La variante seleccionada se serializa en `variant`; las variantes alternativas no forman parte de la respuesta del carrito.
+`AddCartItemRequest` y `UpdateCartItemQuantityRequest` validan selección y cantidad. `CartResource` y `CartItemResource` estabilizan la respuesta pública.
 
 ## Dependencias y reglas
 

app/Domains/Catalog/Controllers/CatalogController.php

@@ -2,12 +2,10 @@
 
 namespace App\Domains\Catalog\Controllers;
 
-use App\Domains\Cart\Services\CartService;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\FeaturedGroup;
 use App\Domains\Catalog\Requests\CatalogItemDetailRequest;
-use App\Domains\Catalog\Requests\CatalogVariantOptionsRequest;
 use App\Domains\Catalog\Requests\CategoryPageRequest;
 use App\Domains\Catalog\Requests\FeaturedGroupPageRequest;
 use App\Domains\Catalog\Requests\SearchCatalogItemsRequest;
@@ -16,10 +14,8 @@ use App\Domains\Catalog\Resources\CatalogFeaturedGroupResource;
 use App\Domains\Catalog\Resources\CatalogItemDetailResource;
 use App\Domains\Catalog\Resources\CatalogItemResource;
 use App\Domains\Catalog\Resources\CatalogSearchItemResource;
-use App\Domains\Catalog\Resources\CatalogVariantOptionsResource;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Catalog\Services\FeaturedGroupService;
-use App\Domains\Catalog\Services\VariantSelectionService;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
@@ -114,42 +110,6 @@ class CatalogController extends Controller
         );
     }
 
-    public function variantOptions(
-        CatalogVariantOptionsRequest $request,
-        Tenant $tenant,
-        CatalogItem $catalogItem,
-        VariantSelectionService $variantSelectionService,
-        CartService $cartService,
-    ): CatalogVariantOptionsResource {
-        abort_unless($catalogItem->tenant_code === $tenant->codigo, 404);
-
-        $includedVariantId = null;
-        $cartItemId = $request->validated('cart_item_id');
-        $selectedValues = $request->validated('selected_values', []);
-
-        if ($cartItemId !== null) {
-            $cartItem = $cartService->show($tenant, $request)
-                ->items
-                ->firstWhere('id', (int) $cartItemId);
-            abort_unless($cartItem?->catalog_item_id === $catalogItem->id, 404);
-            $includedVariantId = $cartItem->variant_id;
-
-            if ($selectedValues === [] && $cartItem->variant !== null) {
-                $selectedValues = $cartItem->variant
-                    ->selectorOptions($catalogItem->itemAttributes)
-                    ->all();
-            }
-        }
-
-        return CatalogVariantOptionsResource::make(
-            $variantSelectionService->options(
-                $catalogItem,
-                $selectedValues,
-                $includedVariantId,
-            )
-        );
-    }
-
     public function store(
         StoreCatalogItemRequest $request,
         Tenant $tenant,

app/Domains/Catalog/Enums/GroupLayout.php

@@ -8,7 +8,6 @@ enum GroupLayout: string
     case Simple = 'simple';
     case SimpleVertical = 'simple_vertical';
     case Carousel = 'carousel';
-    case Single = 'single';
 
     /**
      * @return list<string>

app/Domains/Catalog/Enums/InventorySubject.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Enums;
-
-enum InventorySubject: string
-{
-    case Product = 'product';
-    case Seat = 'seat';
-    case Ticket = 'ticket';
-
-    /** @return array<int, string> */
-    public static function values(): array
-    {
-        return array_column(self::cases(), 'value');
-    }
-}

app/Domains/Catalog/Enums/ProductLayout.php

@@ -7,7 +7,6 @@ enum ProductLayout: string
     case Row = 'row';
     case ColumnWithImage = 'column_with_image';
     case ColumnWithCart = 'column_with_cart';
-    case TicketSelector = 'ticket_selector';
 
     /**
      * @return list<string>

app/Domains/Catalog/Models/CatalogItem.php

@@ -5,10 +5,11 @@ namespace App\Domains\Catalog\Models;
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Catalog\Enums\CatalogItemType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
 use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticket\Models\ValidityTime;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -16,7 +17,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
 
 #[Fillable([
@@ -30,13 +30,14 @@ use Illuminate\Support\Collection;
     'descripcion',
     'precio',
     'inventory_policy',
-    'inventory_subject',
     'max_units_per_user',
     'has_tickets',
+    'ticket_generation_policy',
+    'validity_time_id',
 ])]
 class CatalogItem extends Model
 {
-    use HasFactory, SoftDeletes;
+    use HasFactory;
 
     public $timestamps = false;
 
@@ -45,8 +46,8 @@ class CatalogItem extends Model
     protected $attributes = [
         'type' => CatalogItemType::Standard->value,
         'inventory_policy' => InventoryPolicy::Tracked->value,
-        'inventory_subject' => InventorySubject::Product->value,
         'has_tickets' => false,
+        'ticket_generation_policy' => TicketGenerationPolicy::PerEventDate->value,
     ];
 
     protected function casts(): array
@@ -58,9 +59,10 @@ class CatalogItem extends Model
             'type' => CatalogItemType::class,
             'precio' => 'decimal:2',
             'inventory_policy' => InventoryPolicy::class,
-            'inventory_subject' => InventorySubject::class,
             'max_units_per_user' => 'integer',
             'has_tickets' => 'boolean',
+            'ticket_generation_policy' => TicketGenerationPolicy::class,
+            'validity_time_id' => 'integer',
         ];
     }
 
@@ -112,6 +114,12 @@ class CatalogItem extends Model
         return $this->hasMany(Ticket::class, 'source_catalog_item_id');
     }
 
+    /** @return BelongsTo<ValidityTime, $this> */
+    public function validityTime(): BelongsTo
+    {
+        return $this->belongsTo(ValidityTime::class);
+    }
+
     /** @return BelongsToMany<Attribute, $this> */
     public function attributes(): BelongsToMany
     {
@@ -133,12 +141,6 @@ class CatalogItem extends Model
 
     /** @return BelongsToMany<Attachment, $this> */
     public function attachments(): BelongsToMany
-    {
-        return $this->allAttachments()->wherePivot('is_enabled', true);
-    }
-
-    /** @return BelongsToMany<Attachment, $this> */
-    public function allAttachments(): BelongsToMany
     {
         return $this->belongsToMany(
             Attachment::class,
@@ -146,7 +148,7 @@ class CatalogItem extends Model
             'catalog_item_id',
             'attachment_id'
         )
-            ->withPivot(['orden', 'is_enabled'])
+            ->withPivot('orden')
             ->wherePivotNull('variant_id')
             ->orderByPivot('orden');
     }
@@ -206,11 +208,6 @@ class CatalogItem extends Model
         return $this->nombre;
     }
 
-    public function getSelectionLabel(): string
-    {
-        return $this->getName();
-    }
-
     public function getDescription(): ?string
     {
         return $this->descripcion;

app/Domains/Catalog/Models/ItemAttribute.php

@@ -13,7 +13,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
     'attribute_id',
     'allow_multi_select',
     'sort_order',
-    'show_in_selector',
 ])]
 class ItemAttribute extends Model
 {
@@ -21,10 +20,6 @@ class ItemAttribute extends Model
 
     protected $table = 'item_attributes';
 
-    protected $attributes = [
-        'show_in_selector' => true,
-    ];
-
     protected function casts(): array
     {
         return [
@@ -32,7 +27,6 @@ class ItemAttribute extends Model
             'attribute_id' => 'integer',
             'allow_multi_select' => 'boolean',
             'sort_order' => 'integer',
-            'show_in_selector' => 'boolean',
         ];
     }
 

app/Domains/Catalog/Models/Variant.php

@@ -11,10 +11,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Str;
 
 #[Fillable([
     'catalog_item_id',
@@ -25,7 +22,7 @@ use Illuminate\Support\Str;
 ])]
 class Variant extends Model
 {
-    use HasFactory, SoftDeletes;
+    use HasFactory;
 
     public $timestamps = false;
 
@@ -44,7 +41,7 @@ class Variant extends Model
     /** @return BelongsTo<CatalogItem, $this> */
     public function catalogItem(): BelongsTo
     {
-        return $this->belongsTo(CatalogItem::class)->withTrashed();
+        return $this->belongsTo(CatalogItem::class);
     }
 
     /** @return BelongsTo<EventDate, $this> */
@@ -84,12 +81,6 @@ class Variant extends Model
 
     /** @return BelongsToMany<Attachment, $this> */
     public function attachments(): BelongsToMany
-    {
-        return $this->allAttachments()->wherePivot('is_enabled', true);
-    }
-
-    /** @return BelongsToMany<Attachment, $this> */
-    public function allAttachments(): BelongsToMany
     {
         $relation = $this->belongsToMany(
             Attachment::class,
@@ -97,7 +88,7 @@ class Variant extends Model
             'variant_id',
             'attachment_id'
         )
-            ->withPivot(['orden', 'is_enabled'])
+            ->withPivot('orden')
             ->orderByPivot('orden');
 
         if ($this->catalog_item_id !== null) {
@@ -122,42 +113,6 @@ class Variant extends Model
         return $this->catalogItem->nombre;
     }
 
-    public function getSelectionLabel(): string
-    {
-        $this->loadMissing([
-            'catalogItem.itemAttributes.attribute.options',
-            'definitions.itemAttribute.attribute.options',
-            'eventDates',
-            'eventDate',
-        ]);
-
-        $itemAttributes = $this->catalogItem->itemAttributes;
-
-        $label = $this->selectionOptions($itemAttributes)
-            ->map(function (array $option, string $attributeCode) use ($itemAttributes): ?string {
-                $itemAttribute = $itemAttributes->first(
-                    fn (ItemAttribute $candidate): bool => $candidate->attribute?->codigo === $attributeCode,
-                );
-                $translationKey = "api.catalog.attribute_labels.{$attributeCode}";
-                $attributeName = Lang::has($translationKey)
-                    ? __($translationKey)
-                    : ($itemAttribute?->attribute?->nombre ?? Str::headline($attributeCode));
-                $selectedOptions = array_is_list($option) ? $option : [$option];
-                $selectedLabels = collect($selectedOptions)
-                    ->pluck('label')
-                    ->filter()
-                    ->implode(', ');
-
-                return $selectedLabels === ''
-                    ? null
-                    : "{$attributeName} {$selectedLabels}";
-            })
-            ->filter()
-            ->implode(' · ');
-
-        return $label !== '' ? $label : $this->getName();
-    }
-
     /** @return Collection<string, string|array<int, string>> */
     public function selectionValues(): Collection
     {
@@ -275,25 +230,6 @@ class Variant extends Model
         });
     }
 
-    /**
-     * @param  Collection<int, ItemAttribute>  $itemAttributes
-     * @return Collection<string, array{value: string, label: string}|array<int, array{value: string, label: string}>>
-     */
-    public function selectorOptions(Collection $itemAttributes): Collection
-    {
-        $visibleAttributeCodes = $itemAttributes
-            ->filter(fn (ItemAttribute $itemAttribute): bool => $itemAttribute->show_in_selector)
-            ->map(fn (ItemAttribute $itemAttribute): ?string => $itemAttribute->attribute?->codigo)
-            ->filter()
-            ->values();
-
-        return $this->selectionOptions($itemAttributes)
-            ->filter(
-                fn (array $option, string $attributeCode): bool => $visibleAttributeCodes
-                    ->contains($attributeCode)
-            );
-    }
-
     /** @return Collection<int, EventDate> */
     public function selectedEventDates(): Collection
     {

app/Domains/Catalog/Requests/CatalogVariantOptionsRequest.php

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

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -4,8 +4,8 @@ namespace App\Domains\Catalog\Requests;
 
 use App\Domains\Catalog\Enums\CatalogItemType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
 use App\Domains\Shared\Rules\ImageOrBase64Rule;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -54,9 +54,10 @@ class StoreCatalogItemRequest extends FormRequest
             'descripcion' => ['sometimes', 'nullable', 'string'],
             'precio' => ['required', 'numeric', 'min:0'],
             'inventory_policy' => [Rule::prohibitedIf($isBundle), 'sometimes', Rule::enum(InventoryPolicy::class)],
-            'inventory_subject' => ['sometimes', Rule::enum(InventorySubject::class)],
             'max_units_per_user' => ['sometimes', 'nullable', 'integer', 'min:1'],
             'has_tickets' => [Rule::prohibitedIf($isBundle), 'sometimes', 'boolean'],
+            'ticket_generation_policy' => [Rule::prohibitedIf($isBundle), 'sometimes', Rule::enum(TicketGenerationPolicy::class)],
+            'validity_time_id' => [Rule::prohibitedIf($isBundle), 'sometimes', 'nullable', 'integer', Rule::exists('validity_times', 'id')],
             'real_stock' => [Rule::prohibitedIf($isBundle), 'sometimes', 'integer', 'min:0'],
             'inventory_id' => ['prohibited'],
             'reserved_stock' => ['prohibited'],
@@ -79,15 +80,6 @@ class StoreCatalogItemRequest extends FormRequest
                     fn ($query) => $query->where('tenant_codigo', $tenantCode)
                 ),
             ],
-            'hidden_attribute_codes' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],
-            'hidden_attribute_codes.*' => [
-                'required',
-                'string',
-                'distinct',
-                Rule::exists('attribute', 'codigo')->where(
-                    fn ($query) => $query->where('tenant_codigo', $tenantCode)
-                ),
-            ],
             'images' => ['sometimes', 'array'],
             'images.*' => ['required', new ImageOrBase64Rule],
             'variants' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],

app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php

@@ -7,6 +7,7 @@ use App\Domains\Catalog\Enums\ProductLayout;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\FeaturedGroup;
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -24,16 +25,15 @@ class CatalogFeaturedItemResource extends JsonResource
             return $this->columnWithImageData($catalogItem);
         }
 
-        if ($featuredGroup->product_layout === ProductLayout::TicketSelector) {
+        return [
-            return $this->ticketSelectorData($catalogItem);
-        }
-
-        $data = [
             'id' => $catalogItem->id,
             'type' => $catalogItem->type->value,
             'nombre' => $catalogItem->nombre,
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
+            'ticket_generation_policy' => $catalogItem->ticket_generation_policy->value,
+            'validity_time_id' => $catalogItem->validity_time_id,
+            'validity_time' => ValidityTimeResource::make($catalogItem->validityTime),
             'stock_tecnico' => $catalogItem->availableStock(),
             'variants' => $catalogItem->visibleVariants()
                 ->map(fn (Variant $variant): array => [
@@ -47,46 +47,29 @@ class CatalogFeaturedItemResource extends JsonResource
                     'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory->availableStock(),
-                    'values' => $variant->selectorOptions($catalogItem->itemAttributes),
+                    'values' => $variant->selectionOptions($catalogItem->itemAttributes),
                 ])
                 ->values(),
         ];
-
-        return $data;
-    }
-
-    /** @return array<string, mixed> */
-    private function ticketSelectorData(CatalogItem $catalogItem): array
-    {
-        return [
-            'id' => $catalogItem->id,
-            'type' => $catalogItem->type->value,
-            'nombre' => $catalogItem->nombre,
-            'descripcion' => $catalogItem->descripcion,
-            'precio' => $catalogItem->precio,
-            'image' => $this->firstImageUrl($catalogItem),
-        ];
     }
 
     /** @return array<string, mixed> */
     private function columnWithImageData(CatalogItem $catalogItem): array
-    {
-        return [
-            'id' => $catalogItem->id,
-            'type' => $catalogItem->type->value,
-            'nombre' => $catalogItem->nombre,
-            'precio' => $catalogItem->precio,
-            'image' => $this->firstImageUrl($catalogItem),
-        ];
-    }
-
-    private function firstImageUrl(CatalogItem $catalogItem): ?string
     {
         $attachment = $catalogItem->attachments->first()
             ?? $catalogItem->variants
                 ->flatMap(fn (Variant $variant) => $variant->attachments)
                 ->first();
 
-        return $attachment?->getTemporaryUrl(1440);
+        return [
+            'id' => $catalogItem->id,
+            'type' => $catalogItem->type->value,
+            'nombre' => $catalogItem->nombre,
+            'precio' => $catalogItem->precio,
+            'ticket_generation_policy' => $catalogItem->ticket_generation_policy->value,
+            'validity_time_id' => $catalogItem->validity_time_id,
+            'validity_time' => ValidityTimeResource::make($catalogItem->validityTime),
+            'image' => $attachment?->getTemporaryUrl(1440),
+        ];
     }
 }

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -33,9 +33,13 @@ class CatalogItemDetailResource extends JsonResource
             'category' => $this->category?->nombre,
             'brand' => $this->brand?->nombre,
             'inventory_policy' => $this->inventory_policy?->value,
-            'inventory_subject' => $this->inventory_subject->value,
             'max_units_per_user' => $this->max_units_per_user,
             'has_tickets' => $this->has_tickets,
+            'ticket_generation_policy' => $this->ticket_generation_policy->value,
+            'validity_time_id' => $this->validity_time_id,
+            'validity_time' => $this->validityTime === null
+                ? null
+                : ValidityTimeResource::make($this->validityTime),
             'attributes' => $this->attributesData(),
             'stock_tecnico' => $this->when(
                 $selectedVariant === null,
@@ -84,7 +88,6 @@ class CatalogItemDetailResource extends JsonResource
             'codigo' => $attribute->codigo,
             'nombre' => $attribute->nombre,
             'sort_order' => $itemAttribute->sort_order,
-            'show_in_selector' => $itemAttribute->show_in_selector,
             'is_required' => $attribute->is_required,
             'allow_multi_select' => $itemAttribute->allow_multi_select,
             'metadata_schema' => $attribute->metadata_schema,

app/Domains/Catalog/Resources/CatalogItemResource.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Catalog\Resources;
 
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -22,9 +23,14 @@ class CatalogItemResource extends JsonResource
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
             'inventory_policy' => $this->inventory_policy?->value,
-            'inventory_subject' => $this->inventory_subject->value,
             'max_units_per_user' => $this->max_units_per_user,
             'has_tickets' => $this->has_tickets,
+            'ticket_generation_policy' => $this->ticket_generation_policy->value,
+            'validity_time_id' => $this->validity_time_id,
+            'validity_time' => $this->whenLoaded(
+                'validityTime',
+                fn () => ValidityTimeResource::make($this->validityTime),
+            ),
             'real_stock' => $this->whenLoaded('inventory', fn () => $this->inventory?->real_stock),
             'images' => $this->whenLoaded('attachments', fn () => $this->attachments
                 ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
@@ -39,7 +45,7 @@ class CatalogItemResource extends JsonResource
                     'descripcion' => $variant->getDescription(),
                     'precio' => number_format($variant->getPrice(), 2, '.', ''),
                     'real_stock' => $variant->inventory?->real_stock,
-                    'values' => $variant->selectorOptions($this->itemAttributes),
+                    'values' => $variant->selectionOptions($this->itemAttributes),
                     'images' => $variant->attachments
                         ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
                         ->values(),

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -5,6 +5,7 @@ namespace App\Domains\Catalog\Resources;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -25,6 +26,9 @@ class CatalogSearchItemResource extends JsonResource
             'nombre' => $this->nombre,
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
+            'ticket_generation_policy' => $this->ticket_generation_policy->value,
+            'validity_time_id' => $this->validity_time_id,
+            'validity_time' => ValidityTimeResource::make($this->validityTime),
             'image' => $attachment?->getTemporaryUrl(1440),
             'stock_tecnico' => $this->availableStock(),
             'variants' => $this->visibleVariants()
@@ -39,7 +43,7 @@ class CatalogSearchItemResource extends JsonResource
                     'stock_tecnico' => $this->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory?->availableStock(),
-                    'values' => $variant->selectorOptions($this->itemAttributes),
+                    'values' => $variant->selectionOptions($this->itemAttributes),
                 ])
                 ->values(),
         ];

app/Domains/Catalog/Resources/CatalogVariantOptionsResource.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class CatalogVariantOptionsResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return $this->resource;
-    }
-}

app/Domains/Catalog/Services/CatalogService.php

@@ -37,7 +37,6 @@ class CatalogService
             $images = $data['images'] ?? [];
             $attributeCodes = $data['attribute_codes'] ?? [];
             $multiSelectAttributeCodes = $data['multi_select_attribute_codes'] ?? [];
-            $hiddenAttributeCodes = $data['hidden_attribute_codes'] ?? [];
             $components = $data['components'] ?? [];
             $hasDirectStock = array_key_exists('real_stock', $data);
             $realStock = (int) ($data['real_stock'] ?? 0);
@@ -65,14 +64,6 @@ class CatalogService
                 ]);
             }
 
-            if (array_diff($hiddenAttributeCodes, $attributeCodes) !== []) {
-                throw ValidationException::withMessages([
-                    'hidden_attribute_codes' => [
-                        __('api.catalog.hidden_attribute_not_on_item'),
-                    ],
-                ]);
-            }
-
             $this->validateUniqueVariantCombinations($variants, $attributeCodes);
 
             if ($type === CatalogItemType::Bundle) {
@@ -97,7 +88,6 @@ class CatalogService
                 $data['images'],
                 $data['attribute_codes'],
                 $data['multi_select_attribute_codes'],
-                $data['hidden_attribute_codes'],
                 $data['components'],
                 $data['real_stock'],
                 $data['reserved_stock'],
@@ -119,12 +109,7 @@ class CatalogService
 
             $catalogItem = CatalogItem::query()->create($data);
             $itemAttributes = $type === CatalogItemType::Standard
-                ? $this->createItemAttributes(
+                ? $this->createItemAttributes($catalogItem, $attributeCodes, $multiSelectAttributeCodes)
-                    $catalogItem,
-                    $attributeCodes,
-                    $multiSelectAttributeCodes,
-                    $hiddenAttributeCodes,
-                )
                 : [];
 
             if ($type === CatalogItemType::Bundle) {
@@ -160,6 +145,7 @@ class CatalogService
                 'inventory',
                 'category',
                 'brand',
+                'validityTime',
                 'itemAttributes.attribute',
                 'variants.inventory',
                 'variants.attachments',
@@ -179,6 +165,7 @@ class CatalogService
             'inventory',
             'category',
             'brand',
+            'validityTime',
             'itemAttributes.attribute.options.validityTime',
             'itemAttributes.attribute.eventDates.validityTime',
             'variants' => fn ($query) => $query->orderBy('id'),
@@ -239,6 +226,7 @@ class CatalogService
             ->with([
                 'attachments',
                 'inventory',
+                'validityTime',
                 'itemAttributes.attribute',
                 'variants.inventory',
                 'variants.attachments',
@@ -274,6 +262,7 @@ class CatalogService
             ->with([
                 'attachments',
                 'inventory',
+                'validityTime',
                 'itemAttributes.attribute',
                 'variants.inventory',
                 'variants.attachments',
@@ -290,8 +279,32 @@ class CatalogService
     public function delete(CatalogItem $catalogItem): void
     {
         DB::transaction(function () use ($catalogItem): void {
-            $catalogItem->variants()->delete();
+            $catalogItem->load([
+                'attachments',
+                'variants.attachments',
+            ]);
+
+            $attachments = $catalogItem->attachments
+                ->merge($catalogItem->variants->flatMap->attachments)
+                ->unique('id');
+            $inventoryIds = collect([$catalogItem->inventory_id])
+                ->merge($catalogItem->variants->pluck('inventory_id'))
+                ->filter()
+                ->unique();
+
+            $catalogItem->attachments()->detach();
+            foreach ($catalogItem->variants as $variant) {
+                $variant->attachments()->detach();
+            }
+
             $catalogItem->delete();
+            Inventory::query()->whereKey($inventoryIds)->delete();
+
+            foreach ($attachments as $attachment) {
+                if (! DB::table('catalog_items_attachments')->where('attachment_id', $attachment->id)->exists()) {
+                    $this->attachmentService->delete($attachment);
+                }
+            }
         });
     }
 
@@ -299,19 +312,32 @@ class CatalogService
     {
         DB::transaction(function () use ($variant): void {
             $variant = Variant::query()
+                ->with('attachments')
                 ->lockForUpdate()
                 ->findOrFail($variant->getKey());
             $catalogItem = CatalogItem::query()
                 ->lockForUpdate()
                 ->findOrFail($variant->catalog_item_id);
-            $variant->delete();
+            $attachments = $variant->attachments;
+            $inventoryId = $variant->inventory_id;
 
-            if (! $catalogItem->variants()->exists()) {
+            $variant->attachments()->detach();
+            $variant->delete();
+            Inventory::query()->whereKey($inventoryId)->delete();
+
+            $minimumPrice = $catalogItem->variants()->min('precio');
+
+            if ($minimumPrice === null) {
                 $this->delete($catalogItem);
-            } elseif (($minimumPrice = $catalogItem->variants()->min('precio')) !== null) {
+            } else {
                 $catalogItem->update(['precio' => $minimumPrice]);
             }
 
+            foreach ($attachments as $attachment) {
+                if (! DB::table('catalog_items_attachments')->where('attachment_id', $attachment->id)->exists()) {
+                    $this->attachmentService->delete($attachment);
+                }
+            }
         });
     }
 
@@ -416,6 +442,8 @@ class CatalogService
             'attribute_codes',
             'variants',
             'has_tickets',
+            'ticket_generation_policy',
+            'validity_time_id',
         ] as $field) {
             if (array_key_exists($field, $data)) {
                 throw ValidationException::withMessages([
@@ -460,14 +488,12 @@ class CatalogService
     /**
      * @param  array<int, string>  $attributeCodes
      * @param  array<int, string>  $multiSelectAttributeCodes
-     * @param  array<int, string>  $hiddenAttributeCodes
      * @return array<string, ItemAttribute>
      */
     private function createItemAttributes(
         CatalogItem $catalogItem,
         array $attributeCodes,
         array $multiSelectAttributeCodes = [],
-        array $hiddenAttributeCodes = [],
     ): array {
         $itemAttributes = [];
         $attributeCodes = array_values(array_unique($attributeCodes));
@@ -491,7 +517,6 @@ class CatalogService
             $itemAttribute = $catalogItem->itemAttributes()->create([
                 'attribute_id' => $attribute->id,
                 'allow_multi_select' => in_array($attributeCode, $multiSelectAttributeCodes, true),
-                'show_in_selector' => ! in_array($attributeCode, $hiddenAttributeCodes, true),
             ]);
 
             $itemAttributes[$attributeCode] = $itemAttribute;
@@ -688,6 +713,16 @@ class CatalogService
                 ]);
             }
 
+            $validityTimeIds = $resolvedOptions
+                ->pluck('validity_time_id')
+                ->filter()
+                ->unique();
+            if ($validityTimeIds->count() > 1) {
+                throw ValidationException::withMessages([
+                    $validationKey => [__('api.catalog.incompatible_validity_windows')],
+                ]);
+            }
+
             return $resolvedOptions->pluck('value')->all();
         }
 

app/Domains/Catalog/Services/FeaturedGroupService.php

@@ -18,13 +18,7 @@ class FeaturedGroupService
     public function itemsResponse(FeaturedGroup $featuredGroup, int $page): array
     {
         if ($featuredGroup->group_layout !== GroupLayout::Paginated) {
-            $query = $this->itemsQuery($featuredGroup);
+            $items = $this->itemsQuery($featuredGroup)->get();
-
-            if ($featuredGroup->group_layout === GroupLayout::Single) {
-                $query->limit(1);
-            }
-
-            $items = $query->get();
             $this->attachGroup($items, $featuredGroup);
 
             return CatalogFeaturedItemResource::collection($items)->resolve();
@@ -47,6 +41,7 @@ class FeaturedGroupService
             ->with([
                 'inventory',
                 'attachments',
+                'validityTime',
                 'itemAttributes.attribute',
                 'variants.inventory',
                 'variants.attachments',

app/Domains/Catalog/Services/VariantSelectionService.php

@@ -1,225 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Services;
-
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use Illuminate\Support\Collection;
-
-class VariantSelectionService
-{
-    /**
-     * @param  array<string, mixed>  $selectedValues
-     * @return array<string, mixed>
-     */
-    public function options(
-        CatalogItem $catalogItem,
-        array $selectedValues,
-        ?int $includedVariantId = null,
-    ): array {
-        $catalogItem->load([
-            'itemAttributes.attribute',
-            'variants' => fn ($query) => $query->orderBy('id'),
-            'variants.inventory',
-            'variants.eventDate',
-            'variants.eventDates',
-            'variants.definitions' => fn ($query) => $query->orderBy('id'),
-            'variants.definitions.itemAttribute.attribute.options',
-        ]);
-
-        $variants = $catalogItem->visibleVariants($includedVariantId)
-            ->values();
-        $normalizedSelections = collect($selectedValues)
-            ->mapWithKeys(fn ($value, string $key): array => [$key => $this->normalizeValue($value)])
-            ->filter(fn ($value): bool => $value !== null && $value !== '' && $value !== [])
-            ->all();
-        $matchingVariants = $variants
-            ->filter(fn (Variant $variant): bool => $this->matches($variant, $normalizedSelections))
-            ->values();
-        $attributeKeys = $this->attributeKeys($catalogItem, $catalogItem->variants->values());
-        $isComplete = $attributeKeys->isNotEmpty()
-            && $attributeKeys->every(fn (string $key): bool => array_key_exists($key, $normalizedSelections));
-        $resolvedVariant = $isComplete && $matchingVariants->count() === 1
-            ? $matchingVariants->first()
-            : null;
-
-        return [
-            'variants' => $variants
-                ->map(fn (Variant $variant): array => $this->variantData($catalogItem, $variant))
-                ->values()
-                ->all(),
-            'selectors' => $this->selectors(
-                $catalogItem,
-                $variants,
-                $attributeKeys,
-                $matchingVariants->isEmpty() ? [] : $normalizedSelections,
-            ),
-            'selected_values' => (object) ($matchingVariants->isEmpty() ? [] : $normalizedSelections),
-            'resolved_variant' => $resolvedVariant === null
-                ? null
-                : $this->variantData($catalogItem, $resolvedVariant),
-            'valid' => $matchingVariants->isNotEmpty(),
-            'available_variant_count' => $variants->count(),
-            'matching_variant_count' => $matchingVariants->count(),
-            'price_range' => $this->priceRange($catalogItem, $variants),
-        ];
-    }
-
-    /** @param array<string, mixed> $selectedValues */
-    private function matches(Variant $variant, array $selectedValues): bool
-    {
-        $variantValues = $variant->selectionValues();
-
-        foreach ($selectedValues as $key => $selectedValue) {
-            if (! $variantValues->has($key)
-                || $this->valueKey($variantValues->get($key)) !== $this->valueKey($selectedValue)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /** @param Collection<int, Variant> $variants */
-    private function attributeKeys(CatalogItem $catalogItem, Collection $variants): Collection
-    {
-        return $variants
-            ->flatMap(fn (Variant $variant): array => $variant
-                ->selectorOptions($catalogItem->itemAttributes)
-                ->keys()
-                ->all())
-            ->unique()
-            ->values();
-    }
-
-    /**
-     * @param  Collection<int, Variant>  $variants
-     * @param  Collection<int, string>  $attributeKeys
-     * @param  array<string, mixed>  $selectedValues
-     * @return list<array<string, mixed>>
-     */
-    private function selectors(
-        CatalogItem $catalogItem,
-        Collection $variants,
-        Collection $attributeKeys,
-        array $selectedValues,
-    ): array {
-        return $attributeKeys
-            ->map(function (string $key, int $index) use (
-                $catalogItem,
-                $variants,
-                $attributeKeys,
-                $selectedValues,
-            ): array {
-                $previousKeys = $attributeKeys->take($index);
-                $previousSelections = collect($selectedValues)
-                    ->only($previousKeys->all())
-                    ->all();
-                $compatibleVariants = $variants
-                    ->filter(fn (Variant $variant): bool => $this->matches($variant, $previousSelections));
-
-                return [
-                    'key' => $key,
-                    'label' => $this->attributeLabel($catalogItem, $key),
-                    'options' => $this->optionsFor($catalogItem, $compatibleVariants, $key),
-                    'enabled' => $index === 0 || $previousKeys->every(
-                        fn (string $previousKey): bool => array_key_exists($previousKey, $selectedValues),
-                    ),
-                ];
-            })
-            ->values()
-            ->all();
-    }
-
-    /**
-     * @param  Collection<int, Variant>  $variants
-     * @return list<mixed>
-     */
-    private function optionsFor(CatalogItem $catalogItem, Collection $variants, string $key): array
-    {
-        $options = [];
-        $seen = [];
-
-        foreach ($variants as $variant) {
-            $option = $variant->selectorOptions($catalogItem->itemAttributes)->get($key);
-            if ($option === null || $option === '') {
-                continue;
-            }
-
-            $optionKey = $this->valueKey($option);
-            if (isset($seen[$optionKey])) {
-                continue;
-            }
-
-            $seen[$optionKey] = true;
-            $options[] = $option;
-        }
-
-        return $options;
-    }
-
-    private function attributeLabel(CatalogItem $catalogItem, string $key): string
-    {
-        if ($key === 'event_date') {
-            return 'Fecha';
-        }
-
-        return $catalogItem->itemAttributes
-            ->first(fn (ItemAttribute $itemAttribute): bool => $itemAttribute->attribute?->codigo === $key)
-            ?->attribute
-            ?->nombre ?? str($key)->headline()->toString();
-    }
-
-    /** @param Collection<int, Variant> $variants */
-    private function priceRange(CatalogItem $catalogItem, Collection $variants): array
-    {
-        $prices = $variants
-            ->map(fn (Variant $variant): float => $variant->getPrice())
-            ->whenEmpty(fn (Collection $prices): Collection => $prices->push($catalogItem->getPrice()));
-
-        return [
-            'minimum' => number_format((float) $prices->min(), 2, '.', ''),
-            'maximum' => number_format((float) $prices->max(), 2, '.', ''),
-        ];
-    }
-
-    /** @return array<string, mixed> */
-    private function variantData(CatalogItem $catalogItem, Variant $variant): array
-    {
-        return [
-            'id' => $variant->id,
-            'descripcion' => $variant->getDescription(),
-            'precio' => number_format($variant->getPrice(), 2, '.', ''),
-            'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
-                ? null
-                : $variant->inventory?->availableStock(),
-            'values' => $variant->selectorOptions($catalogItem->itemAttributes),
-        ];
-    }
-
-    private function normalizeValue(mixed $value): mixed
-    {
-        if (is_array($value) && array_key_exists('value', $value)) {
-            return (string) $value['value'];
-        }
-
-        if (is_array($value)) {
-            return array_map(fn ($item) => $this->normalizeValue($item), $value);
-        }
-
-        return is_scalar($value) ? (string) $value : null;
-    }
-
-    private function valueKey(mixed $value): string
-    {
-        $normalized = $this->normalizeValue($value);
-
-        if (is_array($normalized)) {
-            sort($normalized);
-        }
-
-        return json_encode($normalized, JSON_THROW_ON_ERROR);
-    }
-}

app/Domains/Catalog/routes/api.php

@@ -12,7 +12,6 @@ Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
     Route::get('categories/{category}', [CatalogController::class, 'category'])
         ->name('categories.show');
     Route::get('catalog-items/{catalogItem}', [CatalogController::class, 'show']);
-    Route::post('catalog-items/{catalogItem}/variant-options', [CatalogController::class, 'variantOptions']);
     Route::post('catalog-items', [CatalogController::class, 'store']);
 });
 

app/Domains/Client/Controllers/ClientController.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Controllers;
-
-use App\Domains\Client\Models\Client;
-use App\Domains\Client\Requests\StoreClientRequest;
-use App\Domains\Client\Requests\UpdateClientRequest;
-use App\Domains\Client\Resources\ClientResource;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-
-class ClientController extends Controller
-{
-    public function index(): JsonResponse
-    {
-        return ClientResource::collection(
-            Client::query()->with('tenants')->latest()->paginateFromRequest()
-        )->response();
-    }
-
-    public function store(StoreClientRequest $request): JsonResponse
-    {
-        return ClientResource::make(
-            Client::query()->create($request->validated())->load('tenants')
-        )->response()->setStatusCode(201);
-    }
-
-    public function show(Client $client): ClientResource
-    {
-        return ClientResource::make($client->load('tenants'));
-    }
-
-    public function update(UpdateClientRequest $request, Client $client): ClientResource
-    {
-        $client->update($request->validated());
-
-        return ClientResource::make($client->fresh()->load('tenants'));
-    }
-
-    public function destroy(Client $client): Response
-    {
-        $client->delete();
-
-        return response()->noContent();
-    }
-}

app/Domains/Client/Models/Client.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Models;
-
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-#[Fillable(['code', 'name'])]
-class Client extends Model
-{
-    public function getRouteKeyName(): string
-    {
-        return 'code';
-    }
-
-    /** @return HasMany<Tenant, $this> */
-    public function tenants(): HasMany
-    {
-        return $this->hasMany(Tenant::class);
-    }
-
-    /** @return HasMany<ClientIntegration, $this> */
-    public function integrations(): HasMany
-    {
-        return $this->hasMany(ClientIntegration::class);
-    }
-}

app/Domains/Client/Requests/StoreClientRequest.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StoreClientRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    public function rules(): array
-    {
-        return [
-            'code' => ['required', 'string', 'max:255', Rule::unique('clients', 'code')],
-            'name' => ['required', 'string', 'max:255'],
-        ];
-    }
-}

app/Domains/Client/Requests/UpdateClientRequest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Requests;
-
-use App\Domains\Client\Models\Client;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdateClientRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    public function rules(): array
-    {
-        /** @var Client|null $client */
-        $client = $this->route('client');
-
-        return [
-            'code' => ['sometimes', 'string', 'max:255', Rule::unique('clients', 'code')->ignore($client?->id)],
-            'name' => ['sometimes', 'string', 'max:255'],
-        ];
-    }
-}

app/Domains/Client/Resources/ClientResource.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Resources;
-
-use App\Domains\Client\Models\Client;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin Client */
-class ClientResource extends JsonResource
-{
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'code' => $this->code,
-            'name' => $this->name,
-            'tenants' => $this->whenLoaded('tenants', fn () => $this->tenants->map(fn ($tenant): array => [
-                'id' => $tenant->id,
-                'codigo' => $tenant->codigo,
-                'nombre' => $tenant->nombre,
-                'dominio' => $tenant->dominio,
-            ])),
-        ];
-    }
-}

app/Domains/Client/routes/api.php

@@ -1,6 +0,0 @@
-<?php
-
-use App\Domains\Client\Controllers\ClientController;
-use Illuminate\Support\Facades\Route;
-
-Route::apiResource('clients', ClientController::class);

app/Domains/Desfile/Controllers/EntryController.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Domains\Desfile\Controllers;
-
-use App\Domains\Desfile\Requests\ReplaceEntryImageRequest;
-use App\Domains\Desfile\Requests\SyncEntryRowsRequest;
-use App\Domains\Desfile\Requests\UpdateEntryImageRequest;
-use App\Domains\Desfile\Resources\EntryResource;
-use App\Domains\Desfile\Services\EntryService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-class EntryController extends Controller
-{
-    public function __construct(private readonly EntryService $entryService) {}
-
-    public function show(Request $request): EntryResource
-    {
-        return new EntryResource(
-            $this->entryService->current($request->user()->tenant()->firstOrFail()),
-        );
-    }
-
-    public function update(SyncEntryRowsRequest $request): EntryResource
-    {
-        return new EntryResource($this->entryService->syncRows(
-            $request->user()->tenant()->firstOrFail(),
-            $request->validated('rows'),
-        ));
-    }
-
-    public function replaceImage(ReplaceEntryImageRequest $request): JsonResponse
-    {
-        return (new EntryResource($this->entryService->replaceImage(
-            $request->user()->tenant()->firstOrFail(),
-            $request->file('image'),
-            $request->boolean('is_enabled', true),
-        )))->response();
-    }
-
-    public function updateImage(UpdateEntryImageRequest $request): EntryResource
-    {
-        return new EntryResource($this->entryService->updateImage(
-            $request->user()->tenant()->firstOrFail(),
-            $request->boolean('is_enabled'),
-        ));
-    }
-
-    public function destroyImage(Request $request): Response
-    {
-        $this->entryService->deleteImage($request->user()->tenant()->firstOrFail());
-
-        return response()->noContent();
-    }
-}

app/Domains/Desfile/Requests/ReplaceEntryImageRequest.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\Desfile\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class ReplaceEntryImageRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        return [
-            'image' => ['required', 'image', 'mimes:jpeg,jpg,png,webp', 'max:10240'],
-            'is_enabled' => ['sometimes', 'boolean'],
-        ];
-    }
-}

app/Domains/Desfile/Requests/SyncEntryRowsRequest.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Domains\Desfile\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;
-
-class SyncEntryRowsRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        return [
-            'rows' => ['required', 'array', 'min:1', 'max:1000'],
-            'rows.*' => ['required', 'array:type,sector,row,max_seat,price'],
-            'rows.*.type' => ['required', 'string', 'max:100'],
-            'rows.*.sector' => ['required', 'string', 'max:100'],
-            'rows.*.row' => ['required', 'integer', 'between:1,5'],
-            'rows.*.max_seat' => ['required', 'integer', 'between:1,100'],
-            'rows.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
-        ];
-    }
-
-    /** @return array<int, callable> */
-    public function after(): array
-    {
-        return [function (Validator $validator): void {
-            $combinations = [];
-
-            foreach ($this->input('rows', []) as $index => $row) {
-                if (! is_array($row)) {
-                    continue;
-                }
-
-                $combination = collect(['type', 'sector', 'row'])
-                    ->map(fn (string $field): string => mb_strtolower(trim((string) ($row[$field] ?? ''))))
-                    ->implode('|');
-
-                if (isset($combinations[$combination])) {
-                    $validator->errors()->add(
-                        "rows.{$index}",
-                        'La combinación de tipo, sector y fila no puede repetirse.',
-                    );
-                }
-
-                $combinations[$combination] = true;
-            }
-        }];
-    }
-}

app/Domains/Desfile/Requests/UpdateEntryImageRequest.php

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

app/Domains/Desfile/Resources/EntryResource.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Domains\Desfile\Resources;
-
-use App\Domains\Catalog\Models\CatalogItem;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin CatalogItem */
-class EntryResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        $image = $this->allAttachments->first();
-
-        return [
-            'id' => $this->id,
-            'rows' => $this->variants
-                ->map(function ($variant): array {
-                    $values = $variant->selectionValues();
-
-                    return [
-                        'type' => $values->get('tipo'),
-                        'sector' => $values->get('sector'),
-                        'row' => $values->get('fila'),
-                        'seat' => (int) $values->get('asiento'),
-                        'price' => $variant->getPrice(),
-                    ];
-                })
-                ->groupBy(fn (array $variant): string => implode('|', [
-                    mb_strtolower(trim((string) $variant['type'])),
-                    mb_strtolower(trim((string) $variant['sector'])),
-                    mb_strtolower(trim((string) $variant['row'])),
-                ]))
-                ->map(function ($variants): array {
-                    $first = $variants->first();
-
-                    return [
-                        'type' => $first['type'],
-                        'sector' => $first['sector'],
-                        'row' => $first['row'],
-                        'max_seat' => $variants->max('seat'),
-                        'price' => number_format($first['price'], 2, '.', ''),
-                    ];
-                })
-                ->values(),
-            'image' => $image === null ? null : [
-                'key' => $image->key,
-                'filename' => $image->filename,
-                'url' => $image->getTemporaryUrl(1440),
-                'is_enabled' => (bool) $image->pivot->is_enabled,
-            ],
-        ];
-    }
-}

app/Domains/Desfile/Services/EntryService.php

@@ -1,302 +0,0 @@
-<?php
-
-namespace App\Domains\Desfile\Services;
-
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-use Throwable;
-
-class EntryService
-{
-    private const ATTRIBUTE_MAP = [
-        'type' => 'tipo',
-        'sector' => 'sector',
-        'row' => 'fila',
-        'seat' => 'asiento',
-    ];
-
-    private const ROW_ATTRIBUTE_MAP = [
-        'type' => 'tipo',
-        'sector' => 'sector',
-        'row' => 'fila',
-    ];
-
-    public function __construct(private readonly AttachmentService $attachmentService) {}
-
-    public function current(Tenant $tenant): CatalogItem
-    {
-        return $this->entryQuery($tenant)
-            ->with([
-                'allAttachments',
-                'itemAttributes.attribute.options',
-                'variants' => fn ($query) => $query->orderBy('id'),
-                'variants.inventory',
-                'variants.definitions.itemAttribute.attribute',
-            ])
-            ->firstOrFail();
-    }
-
-    /**
-     * @param  array<int, array<string, mixed>>  $rows
-     */
-    public function syncRows(Tenant $tenant, array $rows): CatalogItem
-    {
-        DB::transaction(function () use ($tenant, $rows): void {
-            $entry = $this->entryQuery($tenant)->lockForUpdate()->firstOrFail();
-            $itemAttributes = $this->itemAttributes($entry);
-            $existingVariants = $entry->variants()
-                ->with(['inventory', 'definitions.itemAttribute.attribute'])
-                ->lockForUpdate()
-                ->get();
-            $existingBySelection = $existingVariants->keyBy(
-                fn (Variant $variant): string => $this->selectionKey($variant->selectionValues()->all()),
-            );
-            $desiredSelections = collect();
-
-            foreach (array_values($rows) as $index => $data) {
-                $rowValues = $this->resolveRowValues($itemAttributes, $data, $index);
-
-                foreach (range(1, (int) $data['max_seat']) as $seat) {
-                    $values = [
-                        ...$rowValues,
-                        'asiento' => $this->resolveAttributeValue(
-                            $itemAttributes,
-                            'asiento',
-                            (string) $seat,
-                            "rows.{$index}.max_seat",
-                        ),
-                    ];
-                    $selectionKey = $this->selectionKey($values);
-                    $desiredSelections->put($selectionKey, true);
-                    $variant = $existingBySelection->get($selectionKey);
-
-                    if ($variant === null) {
-                        $variant = $entry->variants()->create([
-                            'inventory_id' => Inventory::query()->create(['real_stock' => 1])->id,
-                            'descripcion' => $this->description($values),
-                            'precio' => $data['price'],
-                        ]);
-                        $variant->definitions()->createMany(
-                            collect($values)->map(
-                                fn (string $value, string $code): array => [
-                                    'item_attribute_id' => $itemAttributes[$code]->id,
-                                    'value' => $value,
-                                ],
-                            )->values()->all(),
-                        );
-                    } else {
-                        $variant->update([
-                            'descripcion' => $this->description($values),
-                            'precio' => $data['price'],
-                        ]);
-                    }
-                }
-            }
-
-            foreach ($existingVariants as $variant) {
-                $selectionKey = $this->selectionKey($variant->selectionValues()->all());
-                if ($desiredSelections->has($selectionKey)) {
-                    continue;
-                }
-
-                $this->assertVariantCanChangeIdentity($variant, 'rows');
-                $variant->delete();
-            }
-
-            $minimumPrice = $entry->variants()->min('precio');
-            if ($minimumPrice !== null) {
-                $entry->update(['precio' => $minimumPrice]);
-            }
-        });
-
-        return $this->current($tenant);
-    }
-
-    public function replaceImage(
-        Tenant $tenant,
-        UploadedFile $image,
-        bool $isEnabled,
-    ): CatalogItem {
-        $attachment = $this->attachmentService->store($image, 'catalog-items');
-        $previousAttachments = collect();
-
-        try {
-            DB::transaction(function () use ($tenant, $attachment, $isEnabled, &$previousAttachments): void {
-                $entry = $this->entryQuery($tenant)->lockForUpdate()->firstOrFail();
-                $previousAttachments = $entry->allAttachments()->get();
-                $entry->allAttachments()->sync([
-                    $attachment->id => [
-                        'orden' => 0,
-                        'is_enabled' => $isEnabled,
-                    ],
-                ]);
-            });
-        } catch (Throwable $throwable) {
-            $this->deleteAttachmentQuietly($attachment);
-            throw $throwable;
-        }
-
-        $previousAttachments->each(fn (Attachment $previous) => $this->deleteIfUnused($previous));
-
-        return $this->current($tenant);
-    }
-
-    public function updateImage(Tenant $tenant, bool $isEnabled): CatalogItem
-    {
-        DB::transaction(function () use ($tenant, $isEnabled): void {
-            $entry = $this->entryQuery($tenant)->lockForUpdate()->firstOrFail();
-            $attachment = $entry->allAttachments()->lockForUpdate()->firstOrFail();
-
-            $entry->allAttachments()->updateExistingPivot($attachment->id, [
-                'is_enabled' => $isEnabled,
-            ]);
-        });
-
-        return $this->current($tenant);
-    }
-
-    public function deleteImage(Tenant $tenant): void
-    {
-        $attachment = DB::transaction(function () use ($tenant): Attachment {
-            $entry = $this->entryQuery($tenant)->lockForUpdate()->firstOrFail();
-            $attachment = $entry->allAttachments()->lockForUpdate()->firstOrFail();
-            $entry->allAttachments()->detach($attachment->id);
-
-            return $attachment;
-        });
-
-        $this->deleteIfUnused($attachment);
-    }
-
-    /** @return Collection<string, ItemAttribute> */
-    private function itemAttributes(CatalogItem $entry): Collection
-    {
-        $attributes = $entry->itemAttributes()
-            ->with('attribute.options')
-            ->get()
-            ->filter(fn (ItemAttribute $itemAttribute): bool => $itemAttribute->attribute !== null)
-            ->keyBy(fn (ItemAttribute $itemAttribute): string => $itemAttribute->attribute->codigo);
-        $missing = collect(self::ATTRIBUTE_MAP)->diff($attributes->keys());
-
-        if ($missing->isNotEmpty()) {
-            throw ValidationException::withMessages([
-                'rows' => [
-                    'Faltan atributos requeridos para las entradas del desfile: '.$missing->implode(', ').'.',
-                ],
-            ]);
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * @param  Collection<string, ItemAttribute>  $itemAttributes
-     * @param  array<string, mixed>  $data
-     * @return array<string, string>
-     */
-    private function resolveRowValues(Collection $itemAttributes, array $data, int $index): array
-    {
-        $values = [];
-
-        foreach (self::ROW_ATTRIBUTE_MAP as $input => $code) {
-            $values[$code] = $this->resolveAttributeValue(
-                $itemAttributes,
-                $code,
-                (string) $data[$input],
-                "rows.{$index}.{$input}",
-            );
-        }
-
-        return $values;
-    }
-
-    /** @param Collection<string, ItemAttribute> $itemAttributes */
-    private function resolveAttributeValue(
-        Collection $itemAttributes,
-        string $code,
-        string $requestedValue,
-        string $errorKey,
-    ): string {
-        $requestedValue = trim($requestedValue);
-        $option = $itemAttributes[$code]->attribute->options->first(
-            fn ($candidate): bool => $this->normalize($candidate->value) === $this->normalize($requestedValue),
-        );
-
-        if ($option === null) {
-            throw ValidationException::withMessages([
-                $errorKey => ['La opción seleccionada no es válida.'],
-            ]);
-        }
-
-        return $option->value;
-    }
-
-    /** @param array<string, mixed> $values */
-    private function selectionKey(array $values): string
-    {
-        return collect(self::ATTRIBUTE_MAP)
-            ->map(fn (string $code): string => $this->normalize((string) ($values[$code] ?? '')))
-            ->implode('|');
-    }
-
-    private function assertVariantCanChangeIdentity(Variant $variant, string $key): void
-    {
-        $inventory = $variant->inventory;
-
-        if (($inventory?->reserved_stock ?? 0) > 0 || ($inventory?->sold_units ?? 0) > 0) {
-            throw ValidationException::withMessages([
-                $key => [
-                    'No se puede modificar ni eliminar un asiento con ventas o reservas.',
-                ],
-            ]);
-        }
-    }
-
-    /** @param array<string, string> $values */
-    private function description(array $values): string
-    {
-        return "Sector {$values['sector']} - Fila {$values['fila']} - Asiento {$values['asiento']} - {$values['tipo']}";
-    }
-
-    private function normalize(string $value): string
-    {
-        return Str::ascii(mb_strtolower(trim($value)));
-    }
-
-    /** @return Builder<CatalogItem> */
-    private function entryQuery(Tenant $tenant): Builder
-    {
-        return CatalogItem::query()
-            ->where('tenant_code', $tenant->codigo)
-            ->where('slug', 'entrada');
-    }
-
-    private function deleteIfUnused(Attachment $attachment): void
-    {
-        if (DB::table('catalog_items_attachments')->where('attachment_id', $attachment->id)->exists()) {
-            return;
-        }
-
-        $this->deleteAttachmentQuietly($attachment);
-    }
-
-    private function deleteAttachmentQuietly(Attachment $attachment): void
-    {
-        try {
-            $this->attachmentService->delete($attachment);
-        } catch (Throwable $throwable) {
-            report($throwable);
-        }
-    }
-}

app/Domains/Desfile/routes/api.php

@@ -1,19 +0,0 @@
-<?php
-
-use App\Domains\Desfile\Controllers\EntryController;
-use Illuminate\Support\Facades\Route;
-
-Route::prefix('v1/adminapp/tenant/desfile')
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
-    ->group(function (): void {
-        Route::get('entries', [EntryController::class, 'show'])
-            ->name('adminapp.desfile.entries.show');
-        Route::put('entries', [EntryController::class, 'update'])
-            ->name('adminapp.desfile.entries.update');
-        Route::post('entries/image', [EntryController::class, 'replaceImage'])
-            ->name('adminapp.desfile.entries.image.replace');
-        Route::patch('entries/image', [EntryController::class, 'updateImage'])
-            ->name('adminapp.desfile.entries.image.update');
-        Route::delete('entries/image', [EntryController::class, 'destroyImage'])
-            ->name('adminapp.desfile.entries.image.destroy');
-    });

app/Domains/Event/Models/EventDate.php

@@ -43,6 +43,7 @@ class EventDate extends Model
             $eventDate->syncTenantDateText();
             ValidityTime::query()
                 ->whereKey($eventDate->validity_time_id)
+                ->whereDoesntHave('ticketValidityGroups')
                 ->delete();
         });
     }

app/Domains/Event/Services/EventService.php

@@ -4,7 +4,6 @@ namespace App\Domains\Event\Services;
 
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
 
 class EventService
 {
@@ -61,19 +60,7 @@ class EventService
             }
         }
 
-        $datesToDelete = $existingDates->slice(count($dates));
+        $existingDates->slice(count($dates))->each->delete();
-
-        if ($datesToDelete->contains(fn ($eventDate): bool => $eventDate
-            ->selectedByVariants()
-            ->whereHas('sourceTickets')
-            ->exists()
-            || $eventDate->variants()->whereHas('sourceTickets')->exists())) {
-            throw ValidationException::withMessages([
-                'dates' => ['No se puede eliminar una fecha utilizada por tickets generados.'],
-            ]);
-        }
-
-        $datesToDelete->each->delete();
         $tenant->unsetRelation('eventDates');
     }
 

app/Domains/FiestaFutbolInfantil/Services/AccommodationService.php

@@ -12,6 +12,7 @@ use App\Domains\Catalog\Models\ItemAttribute;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -125,21 +126,18 @@ class AccommodationService
             'tenant_code' => $tenant->codigo,
             'nombre' => 'Alojamientos',
         ]);
-        $accommodation = CatalogItem::withTrashed()
+        $accommodation = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('slug', 'alojamiento')
             ->lockForUpdate()
             ->first();
 
         if ($accommodation !== null) {
-            if ($accommodation->trashed()) {
-                $accommodation->restore();
-            }
-
             $accommodation->update([
                 'category_id' => $category->id,
                 'inventory_policy' => InventoryPolicy::Tracked->value,
                 'has_tickets' => true,
+                'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             ]);
 
             return $accommodation;
@@ -154,6 +152,7 @@ class AccommodationService
             'precio' => collect($variants)->min('price') ?? 0,
             'inventory_policy' => InventoryPolicy::Tracked->value,
             'has_tickets' => true,
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             'inventory_id' => null,
         ]);
     }

app/Domains/FiestaFutbolInfantil/Services/EntryService.php

@@ -9,6 +9,7 @@ use App\Domains\Catalog\Models\Inventory;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -62,6 +63,7 @@ class EntryService
                     'category_id' => $category->id,
                     'precio' => $entry['price'],
                     'has_tickets' => true,
+                    'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
                     'inventory_policy' => InventoryPolicy::Tracked->value,
                     'attribute_codes' => ['event_date'],
                     'multi_select_attribute_codes' => ['event_date'],
@@ -133,6 +135,7 @@ class EntryService
             'category_id' => $category->id,
             'precio' => $entry['price'],
             'has_tickets' => true,
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             'inventory_policy' => InventoryPolicy::Tracked->value,
         ]);
         $variant->update([
@@ -160,7 +163,7 @@ class EntryService
 
         while (
             in_array($slug, $reservedSlugs, true)
-            || CatalogItem::withTrashed()
+            || CatalogItem::query()
                 ->where('tenant_code', $tenant->codigo)
                 ->where('slug', $slug)
                 ->exists()

app/Domains/FiestaFutbolInfantil/Services/FoodService.php

@@ -12,6 +12,7 @@ use App\Domains\Catalog\Models\ItemAttribute;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -136,21 +137,18 @@ class FoodService
             'tenant_code' => $tenant->codigo,
             'nombre' => 'Comidas',
         ]);
-        $food = CatalogItem::withTrashed()
+        $food = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('slug', 'comida')
             ->lockForUpdate()
             ->first();
 
         if ($food !== null) {
-            if ($food->trashed()) {
-                $food->restore();
-            }
-
             $food->update([
                 'category_id' => $category->id,
                 'inventory_policy' => InventoryPolicy::Tracked->value,
                 'has_tickets' => true,
+                'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             ]);
 
             return $food;
@@ -165,6 +163,7 @@ class FoodService
             'precio' => collect($variants)->min('price') ?? 0,
             'inventory_policy' => InventoryPolicy::Tracked->value,
             'has_tickets' => true,
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             'inventory_id' => null,
         ]);
     }

app/Domains/FiestaFutbolInfantil/Services/MerchandiseService.php

@@ -12,6 +12,7 @@ use App\Domains\Catalog\Models\ItemAttribute;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -74,6 +75,7 @@ class MerchandiseService
                     'max_units_per_user' => (int) $data['max_units_per_user'],
                     'inventory_policy' => InventoryPolicy::Tracked->value,
                     'has_tickets' => true,
+                    'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
                 ]);
 
                 $itemAttributes = $this->itemAttributes($item, $attributes);
@@ -198,6 +200,7 @@ class MerchandiseService
             'max_units_per_user' => (int) $data['max_units_per_user'],
             'inventory_policy' => InventoryPolicy::Tracked->value,
             'has_tickets' => true,
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             'inventory_id' => null,
         ]);
     }
@@ -411,7 +414,7 @@ class MerchandiseService
 
         while (
             in_array($slug, $reservedSlugs, true)
-            || CatalogItem::withTrashed()
+            || CatalogItem::query()
                 ->where('tenant_code', $tenant->codigo)
                 ->where('slug', $slug)
                 ->exists()

app/Domains/Integration/Controllers/ClientIntegrationController.php

@@ -1,64 +0,0 @@
-<?php
-
-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\Services\ClientIntegrationService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-
-class ClientIntegrationController extends Controller
-{
-    public function __construct(
-        private readonly ClientIntegrationService $clientIntegrationService,
-    ) {}
-
-    public function index(Client $client): JsonResponse
-    {
-        return response()->json($this->clientIntegrationService->getAllForClient($client));
-    }
-
-    public function show(Client $client, string $integrationCode): JsonResponse
-    {
-        $integration = $this->clientIntegrationService->getClientIntegration($client, $integrationCode);
-
-        if (! $integration) {
-            return response()->json([
-                'code' => 'integration.not_configured',
-                'message' => __('api.integration.not_configured'),
-            ], 404);
-        }
-
-        return response()->json($integration);
-    }
-
-    public function store(
-        StoreClientIntegrationRequest $request,
-        Client $client,
-        string $integrationCode,
-    ): JsonResponse {
-        $integration = Integration::query()
-            ->where('integration_code', $integrationCode)
-            ->firstOrFail();
-
-        try {
-            $this->clientIntegrationService->updateOrCreateIntegration(
-                $client,
-                $integration,
-                $request->input('integration_data', []),
-            );
-
-            return response()->json([
-                'code' => 'integration.configured',
-                'message' => __('api.integration.configured'),
-            ]);
-        } catch (\Exception $exception) {
-            return response()->json([
-                'code' => 'integration.validation_failed',
-                'message' => __('api.integration.validation_failed', ['error' => $exception->getMessage()]),
-            ], 400);
-        }
-    }
-}

app/Domains/Integration/Controllers/TelepagosWebhookController.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Integration\Controllers;
 
-use App\Domains\Client\Models\Client;
 use App\Domains\Integration\Requests\TelepagosWebhookRequest;
 use App\Domains\Integration\Services\TelepagosWebhookService;
 use App\Http\Controllers\Controller;
@@ -13,12 +12,12 @@ class TelepagosWebhookController extends Controller
     /**
      * Handle the incoming Telepagos webhook.
      */
-    public function handle(TelepagosWebhookRequest $request, Client $client, TelepagosWebhookService $service): JsonResponse
+    public function handle(TelepagosWebhookRequest $request, string $tenantCodigo, TelepagosWebhookService $service): JsonResponse
     {
         try {
             $cashinId = $request->validated('id');
 
-            $service->handleWebhook($client, $cashinId);
+            $service->handleWebhook($tenantCodigo, $cashinId);
 
             return response()->json(['status' => 'success']);
         } catch (\Exception $e) {

app/Domains/Integration/Controllers/TenantIntegrationController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Domains\Integration\Controllers;
+
+use App\Domains\Integration\Models\Integration;
+use App\Domains\Integration\Requests\StoreTenantIntegrationRequest;
+use App\Domains\Integration\Services\TenantIntegrationService;
+use Illuminate\Routing\Controller;
+
+class TenantIntegrationController extends Controller
+{
+    protected TenantIntegrationService $tenantIntegrationService;
+
+    public function __construct(TenantIntegrationService $tenantIntegrationService)
+    {
+        $this->tenantIntegrationService = $tenantIntegrationService;
+    }
+
+    public function index(string $tenantCode)
+    {
+        return response()->json($this->tenantIntegrationService->getAllForTenant($tenantCode));
+    }
+
+    public function show(string $tenantCode, string $integrationCode)
+    {
+        $integration = $this->tenantIntegrationService->getTenantIntegration($tenantCode, $integrationCode);
+
+        if (! $integration) {
+            return response()->json([
+                'code' => 'integration.not_configured',
+                'message' => __('api.integration.not_configured'),
+            ], 404);
+        }
+
+        return response()->json($integration);
+    }
+
+    public function store(StoreTenantIntegrationRequest $request, string $tenantCode, string $integrationCode)
+    {
+        $integration = Integration::where('integration_code', $integrationCode)->firstOrFail();
+
+        try {
+            $this->tenantIntegrationService->updateOrCreateIntegration(
+                $tenantCode,
+                $integration,
+                $request->input('integration_data', [])
+            );
+
+            return response()->json([
+                'code' => 'integration.configured',
+                'message' => __('api.integration.configured'),
+            ]);
+        } catch (\Exception $e) {
+            return response()->json([
+                'code' => 'integration.validation_failed',
+                'message' => __('api.integration.validation_failed', ['error' => $e->getMessage()]),
+            ], 400);
+        }
+    }
+}

app/Domains/Integration/Models/Integration.php

@@ -13,16 +13,16 @@ class Integration extends Model
         'name',
         'url',
         'integration_data_schema',
-        'requires_client_configuration',
+        'requires_tenant_configuration',
     ];
 
     protected $casts = [
         'integration_data_schema' => 'array',
-        'requires_client_configuration' => 'boolean',
+        'requires_tenant_configuration' => 'boolean',
     ];
-
+    
-    public function clientIntegrations()
+    public function tenantIntegrations()
     {
-        return $this->hasMany(ClientIntegration::class, 'integration_code', 'integration_code');
+        return $this->hasMany(TenantIntegration::class, 'integration_code', 'integration_code');
     }
 }

app/Domains/Integration/Models/TenantIntegration.php

@@ -2,18 +2,16 @@
 
 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
+class TenantIntegration extends Model
 {
-    protected $hidden = ['integration_data'];
+    protected $table = 'tenant_integration';
 
     protected $fillable = [
-        'client_id',
         'integration_code',
+        'tenant_code',
         'integration_data',
     ];
 
@@ -21,14 +19,7 @@ class ClientIntegration extends Model
         'integration_data' => EncryptedIntegrationData::class,
     ];
 
-    /** @return BelongsTo<Client, $this> */
+    public function integration()
-    public function client(): BelongsTo
-    {
-        return $this->belongsTo(Client::class);
-    }
-
-    /** @return BelongsTo<Integration, $this> */
-    public function integration(): BelongsTo
     {
         return $this->belongsTo(Integration::class, 'integration_code', 'integration_code');
     }

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_tenant_configuration' => ['sometimes', 'boolean'],
         ];
     }
 }

app/Domains/Integration/Requests/StoreTenantIntegrationRequest.php

@@ -6,7 +6,7 @@ use App\Domains\Integration\Models\Integration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\ValidationException;
 
-class StoreClientIntegrationRequest extends FormRequest
+class StoreTenantIntegrationRequest extends FormRequest
 {
     protected ?Integration $integrationModel = null;
 
@@ -15,12 +15,10 @@ class StoreClientIntegrationRequest extends FormRequest
         return true;
     }
 
-    protected function prepareForValidation(): void
+    protected function prepareForValidation()
     {
         $integrationCode = $this->route('integration_code');
-        $this->integrationModel = Integration::query()
+        $this->integrationModel = Integration::where('integration_code', $integrationCode)->first();
-            ->where('integration_code', $integrationCode)
-            ->first();
 
         if (! $this->integrationModel) {
             throw ValidationException::withMessages([
@@ -33,8 +31,11 @@ class StoreClientIntegrationRequest extends FormRequest
     {
         $rules = [];
 
-        foreach ($this->integrationModel?->integration_data_schema ?? [] as $field => $rule) {
+        // Dynamic validation rules based on the integration data schema
-            $rules['integration_data.'.$field] = $rule;
+        if ($this->integrationModel && $this->integrationModel->integration_data_schema) {
+            foreach ($this->integrationModel->integration_data_schema as $field => $rule) {
+                $rules['integration_data.'.$field] = $rule;
+            }
         }
 
         return $rules;

app/Domains/Integration/Requests/UpdateIntegrationRequest.php

@@ -14,14 +14,14 @@ class UpdateIntegrationRequest extends FormRequest
     public function rules(): array
     {
         $integration = $this->route('integration');
-
+        
         return [
             'name' => ['sometimes', 'required', 'string', 'max:255'],
             'url' => ['nullable', 'url', 'max:255'],
             'integration_data_schema' => ['nullable', 'array'],
-            'requires_client_configuration' => ['sometimes', 'boolean'],
+            'requires_tenant_configuration' => ['sometimes', 'boolean'],
             // the code shouldn't ideally be updatable, but if it is:
-            'integration_code' => ['sometimes', 'required', 'string', 'unique:integrations,integration_code,'.($integration->id ?? '')],
+            'integration_code' => ['sometimes', 'required', 'string', 'unique:integrations,integration_code,' . ($integration->id ?? '')],
         ];
     }
 }

app/Domains/Integration/Services/BaseIntegrationService.php

@@ -2,54 +2,58 @@
 
 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\Tenant\Models\Tenant;
+use App\Domains\Integration\Models\TenantIntegration;
-use Exception;
-use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Http\Client\PendingRequest;
+use Exception;
 
 abstract class BaseIntegrationService
 {
     /**
      * The unique code of the integration.
+     *
+     * @var string
      */
     protected string $integrationCode;
 
     /**
      * The current tenant code.
+     *
+     * @var string
      */
     protected string $tenantCode;
 
-    protected ?Tenant $tenant = null;
-
-    protected ?Client $clientContext = null;
-
     /**
      * The integration model instance.
+     *
+     * @var Integration|null
      */
     protected ?Integration $integration = null;
 
     /**
-     * The client-owned integration configuration.
+     * The tenant-specific integration model instance.
+     *
+     * @var TenantIntegration|null
      */
-    protected ?ClientIntegration $clientIntegration = null;
+    protected ?TenantIntegration $tenantIntegration = null;
 
     /**
      * Set the integration code.
      *
+     * @param string $integrationCode
      * @return $this
      */
     public function setIntegrationCode(string $integrationCode): self
     {
         $this->integrationCode = $integrationCode;
-
         return $this;
     }
 
     /**
      * Get the integration code.
+     *
+     * @return string
      */
     public function getIntegrationCode(): string
     {
@@ -59,69 +63,53 @@ abstract class BaseIntegrationService
     /**
      * Set the tenant code and load the integration models.
      *
+     * @param string $tenantCode
      * @return $this
-     *
      * @throws Exception
      */
     public function forTenant(string $tenantCode): self
     {
         $this->tenantCode = $tenantCode;
-        $this->tenant = Tenant::query()->with('client')->where('codigo', $tenantCode)->firstOrFail();
-        $this->clientContext = $this->tenant->client;
         $this->loadIntegration();
-
-        return $this;
-    }
-
-    public function forClient(Client|string $client): self
-    {
-        $this->clientContext = $client instanceof Client
-            ? $client
-            : Client::query()->where('code', $client)->firstOrFail();
-        $this->tenant = null;
-        $this->loadIntegration();
-
         return $this;
     }
 
     /**
-     * Load the integration definition and its client-owned configuration.
+     * Load the Integration and TenantIntegration models.
      *
      * @throws Exception
      */
     protected function loadIntegration(): void
     {
         if (empty($this->integrationCode)) {
-            throw new Exception('Integration code is not set.');
+            throw new Exception("Integration code is not set.");
         }
 
         $this->integration = Integration::where('integration_code', $this->integrationCode)->first();
-        if (! $this->integration) {
+        if (!$this->integration) {
             throw new Exception("Integration with code '{$this->integrationCode}' not found.");
         }
 
-        if (! $this->clientContext) {
+        $this->tenantIntegration = TenantIntegration::where('tenant_code', $this->tenantCode)
-            throw new Exception('Client context is not set.');
-        }
-
-        $this->clientIntegration = ClientIntegration::where('client_id', $this->clientContext->id)
             ->where('integration_code', $this->integrationCode)
             ->first();
 
-        if (! $this->clientIntegration && $this->integration->requires_client_configuration) {
+        if (!$this->tenantIntegration && $this->integration->requires_tenant_configuration) {
-            throw new Exception("Client '{$this->clientContext->code}' does not have integration '{$this->integrationCode}' configured.");
+            throw new Exception("Tenant '{$this->tenantCode}' does not have integration '{$this->integrationCode}' configured.");
         }
     }
 
     /**
      * Build the request URL.
      *
+     * @param string $path
+     * @return string
      * @throws Exception
      */
     public function getUrl(string $path = ''): string
     {
-        if (! $this->integration) {
+        if (!$this->integration) {
-            throw new Exception('Integration is not loaded. Call forTenant() or forClient() first.');
+            throw new Exception("Integration is not loaded. Call forTenant() first.");
         }
 
         $baseUrl = rtrim($this->integration->url, '/');
@@ -131,20 +119,25 @@ abstract class BaseIntegrationService
     }
 
     /**
-     * Get an integration setting from the client-owned configuration.
+     * Get integration setting by key from tenant's integration data.
+     *
+     * @param string $key
+     * @param mixed $default
+     * @return mixed
      */
     protected function getIntegrationSetting(string $key, mixed $default = null): mixed
     {
-        if (! $this->clientIntegration || ! $this->clientIntegration->integration_data) {
+        if (!$this->tenantIntegration || !$this->tenantIntegration->integration_data) {
             return $default;
         }
 
-        return $this->clientIntegration->integration_data[$key] ?? $default;
+        return $this->tenantIntegration->integration_data[$key] ?? $default;
     }
 
     /**
      * Get a pre-configured HTTP client builder.
      *
+     * @return PendingRequest
      * @throws Exception
      */
     public function client(): PendingRequest
@@ -155,13 +148,17 @@ abstract class BaseIntegrationService
 
     /**
      * Get the headers for the integration.
+     *
+     * @return array
      */
     abstract public function getHeaders(): array;
 
     /**
-     * Hook called after the integration is configured for the client.
+     * Hook called after the integration is configured for the tenant.
      * Can be used to validate credentials or perform initial setups.
      * Throw an Exception on failure.
+     *
+     * @return void
      */
     public function onSetup(): void
     {

app/Domains/Integration/Services/ClientIntegrationService.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Services;
-
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\Integration;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Facades\DB;
-
-class ClientIntegrationService
-{
-    public function getClientIntegration(Client $client, string $integrationCode): ?ClientIntegration
-    {
-        return $client->integrations()
-            ->where('integration_code', $integrationCode)
-            ->first();
-    }
-
-    /** @return Collection<int, ClientIntegration> */
-    public function getAllForClient(Client $client): Collection
-    {
-        return $client->integrations()->with('integration')->get();
-    }
-
-    public function updateOrCreateIntegration(
-        Client $client,
-        Integration $integration,
-        array $data,
-    ): ClientIntegration {
-        return DB::transaction(function () use ($client, $integration, $data): ClientIntegration {
-            $clientIntegration = ClientIntegration::query()->updateOrCreate(
-                [
-                    'client_id' => $client->id,
-                    'integration_code' => $integration->integration_code,
-                ],
-                ['integration_data' => $data],
-            );
-
-            $service = $this->resolveService($integration->integration_code);
-            $service?->forClient($client)->onSetup();
-
-            return $clientIntegration;
-        });
-    }
-
-    protected function resolveService(string $integrationCode): ?BaseIntegrationService
-    {
-        return match ($integrationCode) {
-            'email' => new MailService,
-            'telepagos', 'telepagos_homo' => new TelepagosIntegrationService($integrationCode),
-            default => null,
-        };
-    }
-}

app/Domains/Integration/Services/MailService.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Integration\Services;
 
-use App\Domains\Client\Models\Client;
+use App\Domains\Tenant\Models\Tenant;
 use Exception;
 use Illuminate\Contracts\Mail\Factory as MailFactory;
 use Illuminate\Contracts\Mail\Mailer;
@@ -27,7 +27,9 @@ class MailService extends BaseIntegrationService
 
     private ?Mailer $mailer = null;
 
-    private bool $usesClientMailer = false;
+    private ?Tenant $tenant = null;
+
+    private bool $usesTenantMailer = false;
 
     public function __construct(?MailFactory $mailFactory = null)
     {
@@ -38,28 +40,16 @@ class MailService extends BaseIntegrationService
     {
         parent::forTenant($tenantCode);
 
-        if ($this->clientIntegration) {
+        $this->tenant = Tenant::query()
+            ->where('codigo', $tenantCode)
+            ->firstOrFail();
+
+        if ($this->tenantIntegration) {
             $this->mailer = $this->resolveMailer();
-            $this->usesClientMailer = true;
+            $this->usesTenantMailer = true;
         } else {
             $this->mailer = $this->mailFactory->mailer();
-            $this->usesClientMailer = false;
+            $this->usesTenantMailer = false;
-        }
-
-        return $this;
-    }
-
-    public function forClient(Client|string $client): self
-    {
-        parent::forClient($client);
-        $this->tenant = $this->clientContext?->tenants()->first();
-
-        if ($this->clientIntegration) {
-            $this->mailer = $this->resolveMailer();
-            $this->usesClientMailer = true;
-        } else {
-            $this->mailer = $this->mailFactory->mailer();
-            $this->usesClientMailer = false;
         }
 
         return $this;
@@ -73,7 +63,7 @@ class MailService extends BaseIntegrationService
     public function send(string|array $recipient, string $subject, string $content): void
     {
         if (! $this->mailer || ! $this->tenant) {
-            throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
+            throw new Exception('MailService no está configurado. Llamá a forTenant() primero.');
         }
 
         $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
@@ -101,50 +91,43 @@ class MailService extends BaseIntegrationService
 
     public function mailerName(): string
     {
-        return $this->usesClientMailer
+        return $this->usesTenantMailer
-            ? 'client-smtp'
+            ? 'tenant-smtp'
             : (string) config('mail.default');
     }
 
     public function onSetup(): void
     {
-        if (! $this->mailer || ! $this->clientContext) {
+        if (! $this->tenant) {
-            throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
+            throw new Exception('MailService no está configurado. Llamá a forTenant() primero.');
         }
 
         $recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
 
         if (! is_string($recipient) || $recipient === '') {
-            throw new InvalidArgumentException('Falta MAIL_FROM_ADDRESS en la configuración SMTP del cliente.');
+            throw new InvalidArgumentException('Falta MAIL_FROM_ADDRESS en la configuración SMTP del tenant.');
         }
 
-        $subject = 'Configuración de correo validada';
+        $this->send(
-        $content = '<h1 style="margin: 0 0 20px;">Configuración de correo validada</h1>'
+            $recipient,
-            .'<p>La integración SMTP de '.e($this->clientContext->name).' fue configurada correctamente.</p>'
+            'Configuración de correo validada',
-            .'<p style="color: #64748b; font-size: 13px;">Este mensaje fue enviado automáticamente para validar las credenciales de correo.</p>';
+            '<h1 style="margin: 0 0 20px;">Configuración de correo validada</h1>'
-
+                .'<p>La integración SMTP de '.e($this->tenant->nombre).' fue configurada correctamente.</p>'
-        if ($this->tenant) {
+                .'<p style="color: #64748b; font-size: 13px;">Este mensaje fue enviado automáticamente para validar las credenciales de correo.</p>',
-            $this->send($recipient, $subject, $content);
-
-            return;
-        }
-
-        $this->mailer->to($recipient)->send(
-            (new Mailable)->subject($subject)->html($content)
         );
     }
 
     private function resolveMailer(): Mailer
     {
-        $data = $this->clientIntegration?->integration_data;
+        $data = $this->tenantIntegration?->integration_data;
 
         if (! is_array($data)) {
-            throw new InvalidArgumentException('La configuración SMTP del cliente no es válida.');
+            throw new InvalidArgumentException('La configuración SMTP del tenant no es válida.');
         }
 
         foreach (self::REQUIRED_SMTP_FIELDS as $field) {
             if (! array_key_exists($field, $data) || $data[$field] === null || $data[$field] === '') {
-                throw new InvalidArgumentException("Falta {$field} en la configuración SMTP del cliente.");
+                throw new InvalidArgumentException("Falta {$field} en la configuración SMTP del tenant.");
             }
         }
 
@@ -154,7 +137,7 @@ class MailService extends BaseIntegrationService
         }
 
         $mailer = $this->mailFactory->build([
-            'name' => 'client-smtp-'.$this->clientContext?->id,
+            'name' => "tenant-smtp-{$this->tenantCode}",
             'transport' => 'smtp',
             'scheme' => $data['MAIL_SCHEME'] ?? null,
             'host' => $data['MAIL_HOST'],
@@ -167,7 +150,7 @@ class MailService extends BaseIntegrationService
 
         $mailer->alwaysFrom(
             $data['MAIL_FROM_ADDRESS'],
-            $data['MAIL_FROM_NAME'] ?? $this->clientContext?->name,
+            $data['MAIL_FROM_NAME'] ?? $this->tenant?->nombre,
         );
 
         return $mailer;

app/Domains/Integration/Services/TelepagosIntegrationService.php

@@ -2,37 +2,39 @@
 
 namespace App\Domains\Integration\Services;
 
-use Carbon\Carbon;
 use Exception;
-use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
+use Carbon\Carbon;
 
 class TelepagosIntegrationService extends BaseIntegrationService
 {
     /**
      * TelepagosIntegrationService constructor.
+     *
+     * @param string $integrationCode
      */
     public function __construct(string $integrationCode = 'telepagos')
     {
         // Force homologation code if not in production and using default
-        if ($integrationCode === 'telepagos' && ! app()->environment('production')) {
+        if ($integrationCode === 'telepagos' && !app()->environment('production')) {
             $integrationCode = 'telepagos_homo';
         }
-
+        
         $this->integrationCode = $integrationCode;
     }
 
     /**
      * Get the headers for Telepagos integration.
      *
+     * @return array
      * @throws Exception
      */
     public function getHeaders(): array
     {
         return [
-            'Authorization' => 'Bearer '.$this->getToken(),
+            'Authorization' => 'Bearer ' . $this->getToken(),
             'Content-Type' => 'application/json',
             'Accept' => 'application/json',
         ];
@@ -41,15 +43,16 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Get a valid token, either from cache or by performing a login.
      *
+     * @return string
      * @throws Exception
      */
     public function getToken(): string
     {
-        if (! $this->clientIntegration || ! $this->clientContext) {
+        if (!$this->tenantIntegration) {
-            throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
+            throw new Exception("Tenant integration is not loaded. Call forTenant() first.");
         }
 
-        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
+        $cacheKey = "integration_token:{$this->tenantCode}:{$this->integrationCode}";
 
         $token = Cache::get($cacheKey);
 
@@ -63,6 +66,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Authenticate with Telepagos and cache the returned token.
      *
+     * @return string
      * @throws Exception
      */
     public function login(): string
@@ -71,7 +75,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
         $password = $this->getIntegrationSetting('password');
 
         if (empty($username) || empty($password)) {
-            throw new Exception('Missing username or password in Telepagos integration settings.');
+            throw new Exception("Missing username or password in Telepagos integration settings.");
         }
 
         $url = $this->getUrl('/v2/auth/token');
@@ -88,15 +92,15 @@ class TelepagosIntegrationService extends BaseIntegrationService
         $token = $data['token'] ?? null;
         $expiresAtStr = $data['expires_at'] ?? null;
 
-        if (! $token || ! $expiresAtStr) {
+        if (!$token || !$expiresAtStr) {
-            throw new Exception('Telepagos authentication response is missing token or expires_at.');
+            throw new Exception("Telepagos authentication response is missing token or expires_at.");
         }
 
         $expiresAt = Carbon::parse($expiresAtStr);
         // 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 = "integration_token:{$this->tenantCode}:{$this->integrationCode}";
         Cache::put($cacheKey, $token, $ttlSeconds);
 
         return $token;
@@ -104,16 +108,21 @@ class TelepagosIntegrationService extends BaseIntegrationService
 
     /**
      * Send a request to Telepagos, handling 401 Unauthorized for token refresh.
+     *
+     * @param string $method
+     * @param string $endpoint
+     * @param array $data
+     * @return \Illuminate\Http\Client\Response
      */
-    protected function sendRequest(string $method, string $endpoint, array $data = []): Response
+    protected function sendRequest(string $method, string $endpoint, array $data = []): \Illuminate\Http\Client\Response
     {
         $response = $this->client()->$method($endpoint, $data);
 
         if ($response->status() === 401) {
-            Log::info('Telepagos 401 Unauthorized. Refreshing token and retrying...');
+            Log::info("Telepagos 401 Unauthorized. Refreshing token and retrying...");
-
+            
             $this->clearToken();
-
+            
             $response = $this->client()->$method($endpoint, $data);
         }
 
@@ -123,6 +132,10 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Generate a QR code for cash-in.
      *
+     * @param float $amount
+     * @param string $concept
+     * @param string $description
+     * @return array
      * @throws Exception
      */
     public function generateQr(float $amount, string $concept, string $description): array
@@ -141,8 +154,8 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Get the details of a cash-in payment.
      *
-     * @param  int  $cashinId
+     * @param int $cashinId
-     *
+     * @return array
      * @throws Exception
      */
     public function getCashinDetails(string $cashinId): array
@@ -157,21 +170,25 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Get the account info.
      *
+     * @return array
      * @throws Exception
      */
     public function getAccountInfo(): array
     {
         $response = $this->sendRequest('get', '/v2/account/info');
-
         return $this->handleResponse($response, 'get account info');
     }
 
     /**
      * Handle the Telepagos API response, logging any failures and throwing Exceptions.
      *
+     * @param \Illuminate\Http\Client\Response $response
+     * @param string $actionDescription
+     * @param array $context
+     * @return array
      * @throws Exception
      */
-    protected function handleResponse(Response $response, string $actionDescription, array $context = []): array
+    protected function handleResponse(\Illuminate\Http\Client\Response $response, string $actionDescription, array $context = []): array
     {
         if ($response->failed() || $response->json('status') !== 'ok') {
             $errorMessage = $response->json('message') ?? $response->body();
@@ -188,20 +205,19 @@ class TelepagosIntegrationService extends BaseIntegrationService
 
     /**
      * Clear the cached token.
+     *
+     * @return void
      */
     public function clearToken(): void
     {
-        if (! $this->clientContext) {
+        $cacheKey = "integration_token:{$this->tenantCode}:{$this->integrationCode}";
-            return;
-        }
-
-        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
         Cache::forget($cacheKey);
     }
 
     /**
      * Perform initial setup validation for Telepagos.
      *
+     * @return void
      * @throws Exception
      */
     public function onSetup(): void

app/Domains/Integration/Services/TelepagosWebhookService.php

@@ -2,11 +2,11 @@
 
 namespace App\Domains\Integration\Services;
 
-use App\Domains\Client\Models\Client;
 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\Tenant\Models\Tenant;
 use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -22,10 +22,12 @@ class TelepagosWebhookService
      *
      * @throws Exception
      */
-    public function handleWebhook(Client $client, string $cashinId): void
+    public function handleWebhook(string $tenantCodigo, string $cashinId): void
     {
+        $tenant = Tenant::where('codigo', $tenantCodigo)->firstOrFail();
+
         $telepagosService = new TelepagosIntegrationService;
-        $telepagosService->forClient($client);
+        $telepagosService->forTenant($tenant->codigo);
 
         try {
             $details = $telepagosService->getCashinDetails($cashinId);
@@ -50,8 +52,7 @@ class TelepagosWebhookService
 
                 $dni = substr($cuit, 2, -1);
 
-                $tenantCodes = $client->tenants()->pluck('codigo');
+                $compra = Purchase::where('tenant_codigo', $tenantCodigo)
-                $purchases = Purchase::whereIn('tenant_codigo', $tenantCodes)
                     ->where('transfer_payer_dni', $dni)
                     ->whereIn('status', [
                         Purchase::STATUS_CREATED,
@@ -60,13 +61,10 @@ class TelepagosWebhookService
                     ->where('payment_method', 'transfer')
                     ->where('total', $amount)
                     ->latest()
-                    ->limit(2)
+                    ->first();
-                    ->get();
-
-                $compra = $purchases->count() === 1 ? $purchases->first() : null;
 
                 if (! $compra) {
-                    Log::warning("Telepagos webhook: Expected one matching purchase for client {$client->code}, DNI {$dni}, amount {$amount} and cashin {$cashinId}; found {$purchases->count()}");
+                    Log::warning("Telepagos webhook: No matching purchase found for DNI {$dni} and amount {$amount} for cashin {$cashinId}");
 
                     return;
                 }
@@ -93,12 +91,6 @@ class TelepagosWebhookService
                     return;
                 }
 
-                if (! $client->tenants()->where('codigo', $compra->tenant_codigo)->exists()) {
-                    Log::warning("Telepagos webhook: Purchase {$compra->id} does not belong to client {$client->code}");
-
-                    return;
-                }
-
                 if (! in_array($compra->status, [
                     Purchase::STATUS_PENDING_PAYMENT,
                 ], true)) {

app/Domains/Integration/Services/TenantIntegrationService.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Domains\Integration\Services;
+
+use App\Domains\Integration\Models\Integration;
+use App\Domains\Integration\Models\TenantIntegration;
+use Illuminate\Support\Facades\DB;
+
+class TenantIntegrationService
+{
+    public function getTenantIntegration(string $tenantCode, string $integrationCode): ?TenantIntegration
+    {
+        return TenantIntegration::where('tenant_code', $tenantCode)
+            ->where('integration_code', $integrationCode)
+            ->first();
+    }
+
+    public function getAllForTenant(string $tenantCode)
+    {
+        return TenantIntegration::with('integration')
+            ->where('tenant_code', $tenantCode)
+            ->get();
+    }
+
+    public function updateOrCreateIntegration(string $tenantCode, Integration $integration, array $data): TenantIntegration
+    {
+        return DB::transaction(function () use ($tenantCode, $integration, $data) {
+            $tenantIntegration = TenantIntegration::updateOrCreate(
+                [
+                    'tenant_code' => $tenantCode,
+                    'integration_code' => $integration->integration_code,
+                ],
+                [
+                    'integration_data' => $data,
+                ]
+            );
+
+            $service = $this->resolveService($integration->integration_code);
+            if ($service) {
+                $service->forTenant($tenantCode)->onSetup();
+            }
+
+            return $tenantIntegration;
+        });
+    }
+
+    protected function resolveService(string $integrationCode): ?BaseIntegrationService
+    {
+        switch ($integrationCode) {
+            case 'email':
+                return new MailService;
+            case 'telepagos':
+            case 'telepagos_homo':
+                return new TelepagosIntegrationService($integrationCode);
+            default:
+                return null;
+        }
+    }
+}

app/Domains/Integration/documentacion/README.md

@@ -2,18 +2,18 @@
 
 ## Propósito
 
-Gestiona integraciones externas disponibles y su configuración por cliente. Un cliente puede agrupar múltiples tenants que comparten las mismas credenciales. Incluye correo y pagos mediante Telepagos.
+Gestiona integraciones externas disponibles y su configuración por tenant. Incluye correo y pagos mediante Telepagos.
 
 ## Modelo y seguridad
 
 - `Integration`: definición global de una integración.
-- `ClientIntegration`: configuración y credenciales de una integración para un cliente.
+- `TenantIntegration`: configuración y credenciales de una integración para un tenant.
 - `EncryptedIntegrationData`: cast que protege los datos sensibles persistidos.
-- `ClientIntegrationService`: consulta y configura integraciones del cliente.
+- `TenantIntegrationService`: consulta y configura integraciones del tenant.
 
 ## Servicios externos
 
-- `BaseIntegrationService`: resuelve el cliente desde el tenant operativo y carga exclusivamente la configuración del cliente.
+- `BaseIntegrationService`: base para resolver configuración, URL y cliente del tenant.
 - `MailService`: envío de correo usando la integración configurada.
 - `TelepagosIntegrationService`: autenticación, caché de token, generación de QR y consulta de cobros.
 - `TelepagosWebhookService`: procesa notificaciones recibidas desde Telepagos.
@@ -21,9 +21,9 @@ Gestiona integraciones externas disponibles y su configuración por cliente. Un
 ## Endpoints
 
 - CRUD global bajo `/integrations`.
-- Consulta y configuración por cliente bajo `/clients/{client}/integrations`.
+- Consulta y configuración por tenant bajo `/{tenant_code}/integrations`.
-- `POST /webhooks/telepagos/{client}` para notificaciones del proveedor.
+- `POST /webhooks/telepagos/{tenant_codigo}` para notificaciones del proveedor.
 
 ## Dependencias y reglas
 
-Se integra con `Client`, `Tenant` y con el checkout de `Purchase`. `Notification` utiliza `MailService`. El tenant conserva el contexto operativo y de branding, pero nunca es dueño de credenciales. Las credenciales no se exponen en respuestas ni logs; los webhooks deben validar su contrato antes de alterar una compra.
+Se integra con `Tenant` y con el checkout de `Purchase`. `Notification` utiliza `MailService`. Las credenciales no deben exponerse en respuestas ni logs; los webhooks deben validar su contrato antes de alterar una compra.

app/Domains/Integration/routes/api.php

@@ -1,8 +1,7 @@
 <?php
 
-use App\Domains\Integration\Controllers\ClientIntegrationController;
 use App\Domains\Integration\Controllers\IntegrationController;
-use App\Domains\Integration\Controllers\TelepagosWebhookController;
+use App\Domains\Integration\Controllers\TenantIntegrationController;
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'integrations'], function () {
@@ -13,10 +12,10 @@ Route::group(['prefix' => 'integrations'], function () {
     Route::delete('/{integration}', [IntegrationController::class, 'destroy']);
 });
 
-Route::group(['prefix' => 'clients/{client}/integrations'], function () {
+Route::group(['prefix' => '{tenant_code}/integrations'], function () {
-    Route::get('/', [ClientIntegrationController::class, 'index']);
+    Route::get('/', [TenantIntegrationController::class, 'index']);
-    Route::get('/{integration_code}', [ClientIntegrationController::class, 'show']);
+    Route::get('/{integration_code}', [TenantIntegrationController::class, 'show']);
-    Route::put('/{integration_code}', [ClientIntegrationController::class, 'store']);
+    Route::post('/{integration_code}', [TenantIntegrationController::class, 'store']);
 });
 
-Route::post('webhooks/telepagos/{client}', [TelepagosWebhookController::class, 'handle']);
+Route::post('webhooks/telepagos/{tenant_codigo}', [\App\Domains\Integration\Controllers\TelepagosWebhookController::class, 'handle']);

app/Domains/Notification/Events/PasswordResetRequested.php

@@ -9,15 +9,8 @@ class PasswordResetRequested
 {
     use Dispatchable, SerializesModels;
 
-    public const CHANNEL_STOREFRONT = 'storefront';
-
-    public const CHANNEL_ADMINAPP = 'adminapp';
-
-    public const CHANNEL_SCANNER = 'scanner';
-
     public function __construct(
         public readonly int $attemptId,
         public readonly string $tenantCode,
-        public readonly string $channel = self::CHANNEL_STOREFRONT,
     ) {}
 }

app/Domains/Notification/Listeners/SendPasswordResetEmail.php

@@ -26,13 +26,11 @@ class SendPasswordResetEmail implements ShouldQueueAfterCommit
             app(NotificationMailService::class)->sendPasswordResetCode(
                 $event->attemptId,
                 $event->tenantCode,
-                $event->channel,
             );
         } catch (Throwable $exception) {
             Log::error('Failed to send password reset email.', [
                 'attempt_id' => $event->attemptId,
                 'tenant_code' => $event->tenantCode,
-                'channel' => $event->channel,
                 'exception' => $exception,
             ]);
 

app/Domains/Notification/Services/NotificationMailService.php

@@ -5,11 +5,9 @@ namespace App\Domains\Notification\Services;
 use App\Domains\Auth\Models\ResetPasswordAttempt;
 use App\Domains\Auth\Models\User;
 use App\Domains\Integration\Services\MailService;
-use App\Domains\Notification\Events\PasswordResetRequested;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\TicketPresentationResolver;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
@@ -33,15 +31,9 @@ class NotificationMailService
             );
     }
 
-    public function sendPasswordResetCode(
+    public function sendPasswordResetCode(int $attemptId, string $tenantCode): void
-        int $attemptId,
+    {
-        string $tenantCode,
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
-        string $channel = PasswordResetRequested::CHANNEL_STOREFRONT,
-    ): void {
-        $tenant = Tenant::query()
-            ->with('websiteType')
-            ->where('codigo', $tenantCode)
-            ->firstOrFail();
         $attempt = ResetPasswordAttempt::query()
             ->with('user')
             ->findOrFail($attemptId);
@@ -56,28 +48,12 @@ class NotificationMailService
             return;
         }
 
-        $recoveryDomain = match ($channel) {
-            PasswordResetRequested::CHANNEL_ADMINAPP => $tenant->websiteType?->dominio,
-            PasswordResetRequested::CHANNEL_SCANNER => $tenant->websiteType?->scanner_domain,
-            default => $tenant->dominio,
-        };
-        $recoveryQuery = ['email' => $attempt->user->email];
-        if (
-            $channel === PasswordResetRequested::CHANNEL_SCANNER
-            && $attempt->reason === ResetPasswordAttempt::REASON_STAFF_CREATED
-        ) {
-            $recoveryQuery['code'] = $attempt->codigo;
-        }
-        $recoveryUrl = $recoveryDomain === null
-            ? null
-            : 'https://'.$recoveryDomain.'/recuperar-contrasena/codigo?'.http_build_query($recoveryQuery);
-
         $this->mailService
             ->forTenant($tenantCode)
             ->send(
                 $attempt->user->email,
                 "Código para recuperar tu contraseña - {$tenant->nombre}",
-                view('mail.notifications.password-reset', compact('tenant', 'attempt', 'recoveryUrl'))->render(),
+                view('mail.notifications.password-reset', compact('tenant', 'attempt'))->render(),
             );
     }
 
@@ -105,7 +81,6 @@ class NotificationMailService
             ->where('tenant_code', $purchase->tenant_codigo)
             ->where('user_id', $purchase->user_id)
             ->whereKey($ticketIds)
-            ->with(TicketPresentationResolver::RELATIONS)
             ->get();
 
         if ($tickets->isEmpty()) {

app/Domains/Purchase/Exceptions/InsufficientStockException.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Domains\Purchase\Exceptions;
-
-use RuntimeException;
-
-class InsufficientStockException extends RuntimeException
-{
-    /**
-     * @param  array<int, array{
-     *     index: int,
-     *     catalog_item_id: int,
-     *     variant_id: int|null,
-     *     requested_quantity: int,
-     *     available_quantity: int,
-     *     message: string
-     * }>  $unavailableItems
-     */
-    public function __construct(
-        public readonly array $unavailableItems,
-    ) {
-        parent::__construct(
-            collect($unavailableItems)->pluck('message')->unique()->implode(' '),
-        );
-    }
-
-    /** @return array<string, array<int, string>> */
-    public function errors(): array
-    {
-        return collect($this->unavailableItems)
-            ->mapWithKeys(fn (array $item): array => [
-                "direct_items.{$item['index']}.cantidad" => [$item['message']],
-            ])
-            ->all();
-    }
-}

app/Domains/Purchase/Requests/StartCheckoutRequest.php

@@ -19,21 +19,29 @@ class StartCheckoutRequest extends FormRequest
     {
         return [
             'cart_id' => [
-                'required_without:direct_items',
+                'required_without:direct_item',
-                Rule::prohibitedIf(fn (): bool => $this->has('direct_items')),
+                Rule::prohibitedIf(fn (): bool => $this->has('direct_item')),
                 'integer',
                 'exists:carritos,id',
             ],
-            'direct_items' => [
+            'direct_item' => [
                 'required_without:cart_id',
                 Rule::prohibitedIf(fn (): bool => $this->has('cart_id')),
                 'array',
+            ],
+            'direct_item.catalog_item_id' => [
+                'required_with:direct_item',
+                'integer',
+            ],
+            'direct_item.variant_id' => [
+                'nullable',
+                'integer',
+            ],
+            'direct_item.cantidad' => [
+                'required_with:direct_item',
+                'integer',
                 'min:1',
             ],
-            'direct_items.*' => ['required', 'array'],
-            'direct_items.*.catalog_item_id' => ['required', 'integer'],
-            'direct_items.*.variant_id' => ['nullable', 'integer'],
-            'direct_items.*.cantidad' => ['required', 'integer', 'min:1'],
             'dni' => ['prohibited'],
             'telefono' => ['prohibited'],
             'nombre_apellido' => ['prohibited'],

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

@@ -16,7 +16,6 @@ class CatalogSelectionResolver
         Tenant $tenant,
         int $catalogItemId,
         ?int $variantId,
-        string $fieldPrefix = 'direct_items',
     ): CatalogItem|Variant {
         /** @var CatalogItem|null $catalogItem */
         $catalogItem = CatalogItem::query()
@@ -32,13 +31,13 @@ class CatalogSelectionResolver
         if ($catalogItem->isBundle()) {
             if ($variantId !== null) {
                 throw ValidationException::withMessages([
-                    "{$fieldPrefix}.variant_id" => __('api.cart.bundle_variant_forbidden'),
+                    'direct_item.variant_id' => __('api.cart.bundle_variant_forbidden'),
                 ]);
             }
 
             if (! $catalogItem->bundleComponents()->exists()) {
                 throw ValidationException::withMessages([
-                    "{$fieldPrefix}.catalog_item_id" => __('api.cart.empty_bundle'),
+                    'direct_item.catalog_item_id' => __('api.cart.empty_bundle'),
                 ]);
             }
 
@@ -48,7 +47,7 @@ class CatalogSelectionResolver
         if ($variantId === null) {
             if ($catalogItem->inventory_id === null) {
                 throw ValidationException::withMessages([
-                    "{$fieldPrefix}.variant_id" => __('api.cart.variant_required'),
+                    'direct_item.variant_id' => __('api.cart.variant_required'),
                 ]);
             }
 

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

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Domains\Purchase\Services\Checkout;
-
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-
-class InsufficientStockMessageBuilder
-{
-    public function build(
-        CatalogItem $catalogItem,
-        CatalogItem|Variant $selection,
-        int $availableQuantity,
-    ): string {
-        return match ($catalogItem->inventory_subject) {
-            InventorySubject::Seat => __('api.purchase.stock.seat_unavailable', [
-                'selection' => $selection->getSelectionLabel(),
-            ]),
-            InventorySubject::Ticket => __('api.purchase.stock.ticket_unavailable', [
-                'selection' => $selection->getSelectionLabel(),
-            ]),
-            InventorySubject::Product => __('api.purchase.stock.product_unavailable', [
-                'selection' => $this->productSelectionLabel($catalogItem, $selection),
-                'max' => $availableQuantity,
-            ]),
-        };
-    }
-
-    private function productSelectionLabel(
-        CatalogItem $catalogItem,
-        CatalogItem|Variant $selection,
-    ): string {
-        if ($selection instanceof CatalogItem) {
-            return $selection->getSelectionLabel();
-        }
-
-        return __('api.purchase.stock.product_selection', [
-            'product' => $catalogItem->getName(),
-            'selection' => $selection->getSelectionLabel(),
-        ]);
-    }
-}

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

@@ -7,7 +7,6 @@ use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogInventoryService;
-use App\Domains\Purchase\Exceptions\InsufficientStockException;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Services\UserPurchaseLimitService;
 use App\Domains\Tenant\Models\Tenant;
@@ -23,7 +22,6 @@ class StartCheckoutService
         private readonly UserPurchaseLimitService $purchaseLimits,
         private readonly CatalogSelectionResolver $selections,
         private readonly PurchaseItemSnapshotFactory $snapshots,
-        private readonly InsufficientStockMessageBuilder $stockMessages,
     ) {}
 
     /** @param array<string, mixed> $purchaseData */
@@ -35,17 +33,12 @@ class StartCheckoutService
                 ->lockForUpdate()
                 ->findOrFail($tenant->getKey());
 
-            $directItems = $purchaseData['direct_items'] ?? null;
+            $directItem = $purchaseData['direct_item'] ?? null;
             $cartId = isset($purchaseData['cart_id']) ? (int) $purchaseData['cart_id'] : null;
-            unset($purchaseData['direct_items'], $purchaseData['cart_id']);
+            unset($purchaseData['direct_item'], $purchaseData['cart_id']);
 
-            if (is_array($directItems)) {
+            if (is_array($directItem)) {
-                return $this->startDirectItems(
+                return $this->startDirect($tenant, $userId, $purchaseData, $directItem);
-                    $tenant,
-                    $userId,
-                    $purchaseData,
-                    $directItems,
-                );
             }
 
             if ($cartId === null) {
@@ -60,153 +53,63 @@ class StartCheckoutService
 
     /**
      * @param  array<string, mixed>  $purchaseData
-     * @param  array<int, array<string, mixed>>  $directItems
+     * @param  array<string, mixed>  $directItem
      */
-    private function startDirectItems(
+    private function startDirect(
         Tenant $tenant,
         int $userId,
         array $purchaseData,
-        array $directItems,
+        array $directItem,
     ): Purchase {
-        $lines = collect(array_values($directItems))
+        $catalogItemId = (int) $directItem['catalog_item_id'];
-            ->map(function (array $item, int $index): array {
+        $variantId = isset($directItem['variant_id']) ? (int) $directItem['variant_id'] : null;
-                return [
+        $quantity = (int) $directItem['cantidad'];
-                    'index' => $index,
+        $selection = $this->selections->resolve($tenant, $catalogItemId, $variantId);
-                    'catalog_item_id' => (int) $item['catalog_item_id'],
+        $catalogItem = $selection instanceof Variant ? $selection->catalogItem : $selection;
-                    'variant_id' => isset($item['variant_id']) ? (int) $item['variant_id'] : null,
-                    'quantity' => (int) $item['cantidad'],
-                    'field' => "direct_items.{$index}",
-                ];
-            })
-            ->groupBy(fn (array $line): string => sprintf(
-                '%d:%s',
-                $line['catalog_item_id'],
-                $line['variant_id'] === null ? 'none' : (string) $line['variant_id'],
-            ))
-            ->map(function (Collection $duplicateLines): array {
-                $line = $duplicateLines->first();
-                $line['quantity'] = (int) $duplicateLines->sum('quantity');
 
-                return $line;
+        $this->purchaseLimits->assertCanPurchase(
-            })
+            $catalogItem,
-            ->sortBy(fn (array $line): string => sprintf(
+            $userId,
-                '%020d:%020d',
+            $quantity,
-                $line['catalog_item_id'],
+            field: 'direct_item.cantidad',
-                $line['variant_id'] ?? 0,
+        );
-            ))
-            ->values();
 
-        $resolvedLines = $lines->map(function (array $line) use ($tenant): array {
+        $availableQuantity = $this->inventory->availableQuantity($selection);
-            $selection = $this->selections->resolve(
-                $tenant,
-                $line['catalog_item_id'],
-                $line['variant_id'],
-                $line['field'],
-            );
 
-            return [
+        if ($availableQuantity !== null && $availableQuantity < $quantity) {
-                ...$line,
+            throw ValidationException::withMessages([
-                'selection' => $selection,
+                'direct_item.cantidad' => __('api.purchase.direct_item_max_stock', ['max' => $availableQuantity]),
-                'catalog_item' => $selection instanceof Variant
+            ]);
-                    ? $selection->catalogItem
-                    : $selection,
-            ];
-        });
-
-        $resolvedLines
-            ->groupBy(fn (array $line): int => $line['catalog_item']->getKey())
-            ->each(function (Collection $catalogLines) use ($userId): void {
-                /** @var CatalogItem $catalogItem */
-                $catalogItem = $catalogLines->first()['catalog_item'];
-                $this->purchaseLimits->assertCanPurchase(
-                    $catalogItem,
-                    $userId,
-                    (int) $catalogLines->sum('quantity'),
-                    field: 'direct_items',
-                );
-            });
-
-        $unavailableItems = $resolvedLines
-            ->map(function (array $line): ?array {
-                $availableQuantity = $this->inventory->availableQuantity($line['selection']);
-
-                if ($availableQuantity === null || $availableQuantity >= $line['quantity']) {
-                    return null;
-                }
-
-                return $this->unavailableItem($line, $availableQuantity);
-            })
-            ->filter()
-            ->values()
-            ->all();
-
-        if ($unavailableItems !== []) {
-            throw new InsufficientStockException($unavailableItems);
         }
 
-        foreach ($resolvedLines as $line) {
+        try {
-            try {
+            $this->inventory->reserve($selection, $quantity);
-                $this->inventory->reserve($line['selection'], $line['quantity']);
+        } catch (\InvalidArgumentException) {
-            } catch (\InvalidArgumentException) {
+            throw ValidationException::withMessages([
-                $availableQuantity = $this->inventory->availableQuantity($line['selection']) ?? 0;
+                'direct_item.cantidad' => __('api.purchase.insufficient_stock'),
-
+            ]);
-                throw new InsufficientStockException([
-                    $this->unavailableItem($line, $availableQuantity),
-                ]);
-            }
         }
 
         $purchase = $this->createPurchase(
             $tenant,
             $userId,
             $purchaseData,
-            (float) $resolvedLines->sum(
+            $selection->getPrice() * $quantity,
-                fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
-            ),
             null,
         );
-
+        $directCartItem = $this->makeDirectCartItem(
-        $directCartItems = $resolvedLines->map(fn (array $line): CartItem => $this->makeDirectCartItem(
+            $selection,
-            $line['selection'],
+            $catalogItemId,
-            $line['catalog_item_id'],
+            $variantId,
-            $line['variant_id'],
+            $quantity,
-            $line['quantity'],
+        );
-        ));
-
         $purchase->items()->createMany(
-            $this->snapshots->fromCartItems($directCartItems),
+            $this->snapshots->fromCartItems(collect([$directCartItem])),
         );
 
         return $this->loadPurchase($purchase);
     }
 
-    /**
-     * @param  array<string, mixed>  $line
-     * @return array{
-     *     index: int,
-     *     catalog_item_id: int,
-     *     variant_id: int|null,
-     *     requested_quantity: int,
-     *     available_quantity: int,
-     *     message: string
-     * }
-     */
-    private function unavailableItem(array $line, int $availableQuantity): array
-    {
-        return [
-            'index' => $line['index'],
-            'catalog_item_id' => $line['catalog_item_id'],
-            'variant_id' => $line['variant_id'],
-            'requested_quantity' => $line['quantity'],
-            'available_quantity' => $availableQuantity,
-            'message' => $this->stockMessages->build(
-                $line['catalog_item'],
-                $line['selection'],
-                $availableQuantity,
-            ),
-        ];
-    }
-
     /** @param array<string, mixed> $purchaseData */
     private function startFromCart(
         Tenant $tenant,

app/Domains/Sale/Services/AdminAppSaleService.php

@@ -7,8 +7,6 @@ use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Services\CheckoutService;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\TicketPresentationResolver;
-use App\Domains\Ticket\Services\TicketValidityResolver;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -60,7 +58,7 @@ class AdminAppSaleService
     {
         return $this->findForTenant($tenant, $saleId)
             ->tickets()
-            ->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS])
+            ->with('validityGroups.validityTimes')
             ->orderBy('id')
             ->get();
     }

app/Domains/Shared/Rules/CroppedImageOrBase64Rule.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Domains\Shared\Rules;
-
-use Closure;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class CroppedImageOrBase64Rule implements ValidationRule
-{
-    public function validate(string $attribute, mixed $value, Closure $fail): void
-    {
-        if (! is_array($value)) {
-            (new ImageOrBase64Rule)->validate($attribute, $value, $fail);
-
-            return;
-        }
-
-        if (! array_key_exists('image', $value)) {
-            $fail('The :attribute.image field is required.');
-
-            return;
-        }
-
-        $valid = true;
-        (new ImageOrBase64Rule)->validate(
-            "{$attribute}.image",
-            $value['image'],
-            function (string $message) use ($fail, &$valid): void {
-                $valid = false;
-                $fail($message);
-            }
-        );
-
-        if (! $valid) {
-            return;
-        }
-
-        if (isset($value['crops']) && is_array($value['crops'])) {
-            foreach (['desktop', 'mobile'] as $variant) {
-                $crop = $value['crops'][$variant] ?? null;
-
-                if (! is_array($crop)) {
-                    $fail("The :attribute.crops.{$variant} field must be an object.");
-
-                    continue;
-                }
-
-                $this->validateRange("{$attribute}.crops.{$variant}", 'crop_horizontal', $crop, $fail);
-                $this->validateRange("{$attribute}.crops.{$variant}", 'crop_vertical', $crop, $fail);
-            }
-
-            return;
-        }
-
-        // Backwards compatibility with the original single-crop payload.
-        $this->validateRange($attribute, 'crop_horizontal', $value, $fail);
-        $this->validateRange($attribute, 'crop_vertical', $value, $fail);
-    }
-
-    private function validateRange(string $attribute, string $axis, array $value, Closure $fail): void
-    {
-        $range = $value[$axis] ?? null;
-
-        if (! is_array($range)) {
-            $fail("The :attribute.{$axis} field must be an object.");
-
-            return;
-        }
-
-        $start = $range['start_percentage'] ?? null;
-        $end = $range['end_percentage'] ?? null;
-
-        if (
-            ! is_numeric($start)
-            || ! is_numeric($end)
-            || (float) $start < 0
-            || (float) $end > 100
-            || (float) $start >= (float) $end
-        ) {
-            $fail(
-                "The :attribute.{$axis} field must satisfy "
-                .'0 <= start_percentage < end_percentage <= 100.'
-            );
-        }
-    }
-}

app/Domains/Staff/Requests/StoreStaffRequest.php

@@ -15,17 +15,12 @@ class StoreStaffRequest extends FormRequest
     /** @return array<string, mixed> */
     public function rules(): array
     {
-        $categoryRules = $this->user()->tenant()->firstOrFail()
-            ->requiresScannerCategoryValidation()
-            ? ['required', 'array', 'min:1']
-            : ['sometimes', 'array'];
-
         return [
             'nombre_apellido' => ['required', 'string', 'max:255'],
             'dni' => ['required', 'string', 'max:50'],
             'email' => ['required', 'email', 'max:255', 'unique:users,email'],
-            'category_ids' => $categoryRules,
+            'category_ids' => ['required', 'array', 'min:1'],
-            'category_ids.*' => ['integer', 'distinct', Rule::exists('categorias', 'id')],
+            'category_ids.*' => ['required', 'integer', 'distinct', Rule::exists('categorias', 'id')],
         ];
     }
 }