Merge branch 'feature/event_scoped_admin' into homo

- Introduced new routes for entry reservations in admin app, including form, index, store, and download functionalities.
- Created a migration to add the "Reserva de Tickets" menu item to the admin app.
- Updated MenuSeeder to include the new menu item for ticket reservations.
- Developed a PDF view for entry reservations.
- Implemented tests for the EntryReservationController and EntryReservationService to ensure proper functionality and access control.
- Refactored test setup to use a dedicated schema creation trait for better isolation and maintainability.

app/Domains/Commerce/Catalog/Models/CatalogItem.php

@@ -8,6 +8,7 @@ use App\Domains\Commerce\Catalog\Enums\InventorySubject;
 use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
 use App\Domains\Core\Tenant\Models\Tenant;
 use App\Domains\Ticketing\Event\Models\Event;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
 use App\Domains\Ticketing\Ticket\Models\Ticket;
 use App\Shared\Attachable\Models\Attachment;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -148,6 +149,12 @@ class CatalogItem extends Model
         return $this->hasMany(Ticket::class, 'source_catalog_item_id');
     }
 
+    /** @return HasMany<EntryReservation, $this> */
+    public function entryReservations(): HasMany
+    {
+        return $this->hasMany(EntryReservation::class);
+    }
+
     /** @return BelongsToMany<Attribute, $this> */
     public function attributes(): BelongsToMany
     {
@@ -269,13 +276,13 @@ class CatalogItem extends Model
     {
         $this->variants
             ->filter(fn (Variant $variant): bool => $variant->exists)
-            ->loadMissing('desfileEntryReservations');
+            ->loadMissing('entryReservations');
 
         return $this->variants
             ->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $this))
             ->filter(fn (Variant $variant): bool => $variant->hasOnlyActiveEventDates()
-                && (! $variant->relationLoaded('desfileEntryReservations')
+                && (! $variant->relationLoaded('entryReservations')
-                    || $variant->desfileEntryReservations->isEmpty())
+                    || $variant->entryReservations->isEmpty())
                 && (($includedVariantId !== null && $variant->id === $includedVariantId)
                     || ($variant->isSellable() && (
                         $this->inventory_policy === InventoryPolicy::Unlimited

app/Domains/Commerce/Catalog/Models/Variant.php

@@ -2,8 +2,8 @@
 
 namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Ticketing\Desfile\Models\EntryReservation;
 use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
 use App\Domains\Ticketing\Ticket\Models\Ticket;
 use App\Shared\Attachable\Models\Attachment;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -76,7 +76,7 @@ class Variant extends Model
     }
 
     /** @return HasMany<EntryReservation, $this> */
-    public function desfileEntryReservations(): HasMany
+    public function entryReservations(): HasMany
     {
         return $this->hasMany(EntryReservation::class);
     }

app/Domains/Commerce/Catalog/Services/VariantReplacementService.php

@@ -7,8 +7,8 @@ use App\Domains\Commerce\Catalog\Models\Inventory;
 use App\Domains\Commerce\Catalog\Models\StockReservation;
 use App\Domains\Commerce\Catalog\Models\StockReservationLine;
 use App\Domains\Commerce\Catalog\Models\Variant;
-use App\Domains\Ticketing\Desfile\Models\EntryReservation;
 use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
 use Illuminate\Support\Collection;
 
 class VariantReplacementService

app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php

@@ -8,12 +8,14 @@ use Illuminate\Database\Eloquent\Builder;
 
 class PurchaseRefundSummaryService
 {
-    public function totalForTenant(Tenant $tenant): string
+    public function totalForTenant(Tenant $tenant, ?int $eventId = null): string
     {
         $total = TicketRefund::query()
             ->whereHas(
                 'purchaseItem.purchase',
-                fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo)
+                fn (Builder $query): Builder => $query
+                    ->where('tenant_codigo', $tenant->codigo)
+                    ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId))
             )
             ->sum('amount');
 

app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php

@@ -26,9 +26,8 @@ class TenantTransactionResetService
             'carts' => $scope['cart_ids']->count(),
             'cart_items' => $scope['cart_item_ids']->count(),
             'tickets' => DB::table('tickets')->where('tenant_code', $tenantCode)->count(),
-            'entry_reservations' => DB::table('desfile_entry_reservations')
+            'entry_reservations' => DB::table('entry_reservations')
-                ->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
+                ->whereIn('catalog_item_id', DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->count(),
-                    DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->count(),
             'stock_reservations' => $this->reservationQuery($scope)->count(),
             'purchase_changes' => DB::table('value_changes')
                 ->where('tenant_code', $tenantCode)
@@ -51,10 +50,9 @@ class TenantTransactionResetService
             $telepagosQr = DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count();
             $summary = [
                 'stock_reservations_deleted' => $this->reservationQuery($scope)->delete(),
-                'entry_reservations_deleted' => DB::table('desfile_entry_reservations')
+                'entry_reservations_deleted' => DB::table('entry_reservations')
-                    ->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
+                    ->whereIn('catalog_item_id', DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->delete(),
-                        DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->delete(),
+                'entry_reservation_batches_deleted' => DB::table('reservation_batches')->where('tenant_code', $tenantCode)->delete(),
-                'entry_reservation_batches_deleted' => DB::table('desfile_reservation_batches')->where('tenant_code', $tenantCode)->delete(),
                 'tickets_deleted' => DB::table('tickets')->where('tenant_code', $tenantCode)->delete(),
                 'purchase_changes_deleted' => DB::table('value_changes')
                     ->where('tenant_code', $tenantCode)

app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php

@@ -32,10 +32,10 @@ class SaleController extends Controller
         $tenant = $request->user()->tenant()->firstOrFail();
 
         return SaleResource::collection(
-            $this->saleService->sales($tenant, $request->validated())
+            $this->saleService->sales($tenant, $request->validated(), $request->user()->event_id)
         )->additional([
-            'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant),
+            'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant, $request->user()->event_id),
-            'refunded_total' => $this->saleService->refundedTotal($tenant),
+            'refunded_total' => $this->saleService->refundedTotal($tenant, $request->user()->event_id),
         ]);
     }
 
@@ -43,7 +43,7 @@ class SaleController extends Controller
     {
         $tenant = $request->user()->tenant()->firstOrFail();
 
-        return new SaleDetailResource($this->saleService->detail($tenant, $sale));
+        return new SaleDetailResource($this->saleService->detail($tenant, $sale, $request->user()->event_id));
     }
 
     public function tickets(Request $request, int $sale): AnonymousResourceCollection
@@ -51,7 +51,7 @@ class SaleController extends Controller
         $tenant = $request->user()->tenant()->firstOrFail();
 
         return SaleTicketResource::collection(
-            $this->saleService->tickets($tenant, $sale)
+            $this->saleService->tickets($tenant, $sale, $request->user()->event_id)
         );
     }
 
@@ -59,14 +59,14 @@ class SaleController extends Controller
     {
         $tenant = $request->user()->tenant()->firstOrFail();
 
-        return new SaleResource($this->saleService->confirm($tenant, $sale));
+        return new SaleResource($this->saleService->confirm($tenant, $sale, $request->user()->event_id));
     }
 
     public function cancel(Request $request, int $sale): SaleResource
     {
         $tenant = $request->user()->tenant()->firstOrFail();
 
-        return new SaleResource($this->saleService->cancel($tenant, $sale));
+        return new SaleResource($this->saleService->cancel($tenant, $sale, $request->user()->event_id));
     }
 
     public function modifications(
@@ -76,6 +76,7 @@ class SaleController extends Controller
             $this->saleService->modifications(
                 $request->user()->tenant()->firstOrFail(),
                 $request->validated(),
+                $request->user()->event_id,
             )
         );
     }
@@ -86,7 +87,7 @@ class SaleController extends Controller
 
         return $this->salePdfService->downloadSales(
             $tenant,
-            $this->saleService->salesForExport($tenant, $request->validated()),
+            $this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
             $request->validated('timezone'),
         );
     }
@@ -97,7 +98,7 @@ class SaleController extends Controller
 
         return $this->salePdfService->downloadModifications(
             $tenant,
-            $this->saleService->modificationsForExport($tenant, $request->validated()),
+            $this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
             $request->validated('timezone'),
         );
     }
@@ -108,7 +109,7 @@ class SaleController extends Controller
 
         return $this->saleExcelService->downloadSales(
             $tenant,
-            $this->saleService->salesForExport($tenant, $request->validated()),
+            $this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
             $request->validated('timezone'),
         );
     }
@@ -120,7 +121,7 @@ class SaleController extends Controller
 
         return $this->saleExcelService->downloadModifications(
             $tenant,
-            $this->saleService->modificationsForExport($tenant, $request->validated()),
+            $this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
             $request->validated('timezone'),
         );
     }

app/Domains/Commerce/Sale/Services/AdminAppSaleService.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Commerce\Sale\Services;
 
-use App\Shared\Logging\Models\ValueChange;
 use App\Domains\Commerce\Purchase\Models\Purchase;
 use App\Domains\Commerce\Purchase\Services\CheckoutService;
 use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
@@ -10,6 +9,7 @@ use App\Domains\Core\Tenant\Models\Tenant;
 use App\Domains\Ticketing\Ticket\Models\Ticket;
 use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
 use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
+use App\Shared\Logging\Models\ValueChange;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -21,19 +21,18 @@ class AdminAppSaleService
         protected PurchaseRefundSummaryService $refundSummaryService,
     ) {}
 
-    public function confirmedSalesTotal(Tenant $tenant): string
+    public function confirmedSalesTotal(Tenant $tenant, ?int $eventId = null): string
     {
-        $total = Purchase::query()
+        $total = $this->purchasesQuery($tenant, $eventId)
-            ->where('tenant_codigo', $tenant->codigo)
             ->where('status', Purchase::STATUS_PAID)
             ->sum('total');
 
         return number_format((float) $total, 2, '.', '');
     }
 
-    public function refundedTotal(Tenant $tenant): string
+    public function refundedTotal(Tenant $tenant, ?int $eventId = null): string
     {
-        return $this->refundSummaryService->totalForTenant($tenant);
+        return $this->refundSummaryService->totalForTenant($tenant, $eventId);
     }
 
     /**
@@ -47,43 +46,42 @@ class AdminAppSaleService
      * }  $filters
      * @return LengthAwarePaginator<Purchase>
      */
-    public function sales(Tenant $tenant, array $filters = []): LengthAwarePaginator
+    public function sales(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
     {
-        return $this->salesQuery($tenant, $filters)
+        return $this->salesQuery($tenant, $filters, $eventId)
             ->paginateFromRequest()
             ->withQueryString();
     }
 
-    public function detail(Tenant $tenant, int $saleId): Purchase
+    public function detail(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
     {
-        return Purchase::query()
+        return $this->purchasesQuery($tenant, $eventId)
-            ->where('tenant_codigo', $tenant->codigo)
             ->with('items')
             ->findOrFail($saleId);
     }
 
     /** @return Collection<int, Ticket> */
-    public function tickets(Tenant $tenant, int $saleId): Collection
+    public function tickets(Tenant $tenant, int $saleId, ?int $eventId = null): Collection
     {
-        return $this->findForTenant($tenant, $saleId)
+        return $this->findForTenant($tenant, $saleId, $eventId)
             ->tickets()
             ->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
             ->orderBy('id')
             ->get();
     }
 
-    public function confirm(Tenant $tenant, int $saleId): Purchase
+    public function confirm(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
     {
-        $sale = $this->findForTenant($tenant, $saleId);
+        $sale = $this->findForTenant($tenant, $saleId, $eventId);
 
         return $this->saleForResponse(
             $this->checkoutService->confirmPaidPurchase($sale)
         );
     }
 
-    public function cancel(Tenant $tenant, int $saleId): Purchase
+    public function cancel(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
     {
-        $sale = $this->findForTenant($tenant, $saleId);
+        $sale = $this->findForTenant($tenant, $saleId, $eventId);
 
         return $this->saleForResponse(
             $this->checkoutService->cancelPurchaseFromAdmin($sale)
@@ -94,18 +92,18 @@ class AdminAppSaleService
      * @param  array<string, mixed>  $filters
      * @return Collection<int, Purchase>
      */
-    public function salesForExport(Tenant $tenant, array $filters = []): Collection
+    public function salesForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
     {
-        return $this->salesQuery($tenant, $filters)->get();
+        return $this->salesQuery($tenant, $filters, $eventId)->get();
     }
 
     /**
      * @param  array<string, mixed>  $filters
      * @return LengthAwarePaginator<ValueChange>
      */
-    public function modifications(Tenant $tenant, array $filters = []): LengthAwarePaginator
+    public function modifications(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
     {
-        return $this->modificationsQuery($tenant, $filters)
+        return $this->modificationsQuery($tenant, $filters, $eventId)
             ->paginateFromRequest()
             ->withQueryString();
     }
@@ -114,13 +112,13 @@ class AdminAppSaleService
      * @param  array<string, mixed>  $filters
      * @return Collection<int, ValueChange>
      */
-    public function modificationsForExport(Tenant $tenant, array $filters = []): Collection
+    public function modificationsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
     {
-        return $this->modificationsQuery($tenant, $filters)->get();
+        return $this->modificationsQuery($tenant, $filters, $eventId)->get();
     }
 
     /** @param array<string, mixed> $filters */
-    protected function salesQuery(Tenant $tenant, array $filters): Builder
+    protected function salesQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
     {
         $sortColumns = [
             'id' => 'id',
@@ -137,8 +135,7 @@ class AdminAppSaleService
             ? $requestedDirection
             : 'desc';
 
-        return Purchase::query()
+        return $this->purchasesQuery($tenant, $eventId)
-            ->where('tenant_codigo', $tenant->codigo)
             ->when($filters['q'] ?? null, function (Builder $query, string $search): void {
                 $term = trim($search);
 
@@ -176,11 +173,18 @@ class AdminAppSaleService
      * @param  array<string, mixed>  $filters
      * @return Builder<ValueChange>
      */
-    protected function modificationsQuery(Tenant $tenant, array $filters): Builder
+    protected function modificationsQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
     {
         return ValueChange::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('trackable_type', (new Purchase)->getMorphClass())
+            ->when($eventId !== null, fn (Builder $query): Builder => $query->whereHasMorph(
+                'trackable',
+                [Purchase::class],
+                fn (Builder $sales): Builder => $sales
+                    ->where('tenant_codigo', $tenant->codigo)
+                    ->where('event_id', $eventId),
+            ))
             ->when($filters['q'] ?? null, function (Builder $query, string $search): void {
                 $term = trim($search);
 
@@ -221,11 +225,18 @@ class AdminAppSaleService
             ->orderByDesc('id');
     }
 
-    protected function findForTenant(Tenant $tenant, int $saleId): Purchase
+    protected function findForTenant(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
+    {
+        return $this->purchasesQuery($tenant, $eventId)
+            ->findOrFail($saleId);
+    }
+
+    /** @return Builder<Purchase> */
+    protected function purchasesQuery(Tenant $tenant, ?int $eventId): Builder
     {
         return Purchase::query()
             ->where('tenant_codigo', $tenant->codigo)
-            ->findOrFail($saleId);
+            ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
     }
 
     protected function saleForResponse(Purchase $sale): Purchase

app/Domains/Commerce/Sale/documentacion/README.md

@@ -29,4 +29,8 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d
 
 La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
 
+Cuando el usuario autenticado tiene `event_id`, el controlador lo pasa al servicio como alcance obligatorio para ventas, totales, historial y exportaciones. El alcance se combina con el tenant y no se obtiene de los filtros enviados por el cliente. Los administradores sin `event_id` conservan el alcance del tenant.
+
+El detalle, los tickets de una venta, la confirmación y la cancelación buscan la compra dentro del mismo alcance. Una venta de otro evento o sin evento devuelve 404 para un administrador con `event_id`, antes de ejecutar cualquier acción en `CheckoutService`.
+
 El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.

app/Domains/Core/Address/Models/Address.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Address\Models;
-
-use App\Domains\Core\Tenant\Models\Tenant;
-use App\Domains\Ticketing\Event\Models\Event;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-class Address extends Model
-{
-    protected $fillable = ['label', 'address_text', 'latitude', 'longitude'];
-
-    protected function casts(): array
-    {
-        return [
-            'latitude' => 'decimal:7',
-            'longitude' => 'decimal:7',
-        ];
-    }
-
-    /** @return array{latitude: float, longitude: float}|null */
-    public function coordinates(): ?array
-    {
-        if ($this->latitude === null || $this->longitude === null) {
-            return null;
-        }
-
-        return ['latitude' => (float) $this->latitude, 'longitude' => (float) $this->longitude];
-    }
-
-    /** @return HasMany<Event, $this> */
-    public function events(): HasMany
-    {
-        return $this->hasMany(Event::class);
-    }
-
-    /** @return BelongsToMany<Tenant, $this> */
-    public function tenants(): BelongsToMany
-    {
-        return $this->belongsToMany(Tenant::class, 'tenant_addresses', 'address_id', 'tenant_codigo', 'id', 'codigo')
-            ->using(TenantAddress::class)
-            ->withPivot(['id', 'is_main'])
-            ->withTimestamps();
-    }
-}

app/Domains/Core/Address/Models/TenantAddress.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Address\Models;
-
-use App\Domains\Core\Tenant\Models\Tenant;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\Pivot;
-
-class TenantAddress extends Pivot
-{
-    protected $table = 'tenant_addresses';
-
-    public $incrementing = true;
-
-    protected $fillable = ['tenant_codigo', 'address_id', 'is_main'];
-
-    protected function casts(): array
-    {
-        return ['is_main' => 'boolean'];
-    }
-
-    /** @return BelongsTo<Tenant, $this> */
-    public function tenant(): BelongsTo
-    {
-        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
-    }
-
-    /** @return BelongsTo<Address, $this> */
-    public function address(): BelongsTo
-    {
-        return $this->belongsTo(Address::class);
-    }
-}

app/Domains/Core/Address/Resources/AddressResource.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Address\Resources;
-
-use App\Domains\Core\Address\Models\Address;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin Address */
-class AddressResource extends JsonResource
-{
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'label' => $this->label,
-            'address_text' => $this->address_text,
-            'latitude' => $this->latitude === null ? null : (float) $this->latitude,
-            'longitude' => $this->longitude === null ? null : (float) $this->longitude,
-        ];
-    }
-}

app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php

@@ -20,6 +20,7 @@ class AdminAppAdministratorController extends Controller
         return AdministratorResource::collection($this->administratorService->list(
             $request->user()->tenant()->firstOrFail(),
             $request->string('search')->trim()->toString() ?: null,
+            $request->user()->event_id,
         ));
     }
 
@@ -28,6 +29,7 @@ class AdminAppAdministratorController extends Controller
         return AdministratorResource::make($this->administratorService->create(
             $request->user()->tenant()->firstOrFail(),
             $request->validated(),
+            $request->user()->event_id,
         ));
     }
 
@@ -37,6 +39,7 @@ class AdminAppAdministratorController extends Controller
             $request->user()->tenant()->firstOrFail(),
             $administrator,
             $request->validated(),
+            $request->user()->event_id,
         ));
     }
 

app/Domains/Core/Administrator/Resources/AdministratorResource.php

@@ -18,6 +18,7 @@ class AdministratorResource extends JsonResource
             'dni' => $this->dni,
             'email' => $this->email,
             'rol_codigo' => $this->rol_codigo,
+            'event_id' => $this->event_id,
             'role' => $this->whenLoaded('role', fn () => [
                 'codigo' => $this->role?->codigo,
                 'nombre' => $this->role?->nombre,

app/Domains/Core/Administrator/Services/AdministratorService.php

@@ -19,9 +19,9 @@ class AdministratorService
     public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
 
     /** @return Collection<int, User> */
-    public function list(Tenant $tenant, ?string $search = null): Collection
+    public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
     {
-        return $this->query($tenant)->with('role')
+        return $this->query($tenant, $eventId)->with('role')
             ->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
                 $query->where('nombre_apellido', 'like', "%{$search}%")
                     ->orWhere('dni', 'like', "%{$search}%")
@@ -31,14 +31,15 @@ class AdministratorService
     }
 
     /** @param array<string, mixed> $data */
-    public function create(Tenant $tenant, array $data): User
+    public function create(Tenant $tenant, array $data, ?int $eventId = null): User
     {
-        return DB::transaction(function () use ($tenant, $data): User {
+        return DB::transaction(function () use ($tenant, $data, $eventId): User {
             $administrator = User::query()->create([
                 ...$this->attributes($data),
                 'password' => Str::random(64),
                 'rol_codigo' => RoleCode::AdminApp->value,
                 'tenant_codigo' => $tenant->codigo,
+                'event_id' => $eventId,
             ]);
             $this->resetPasswordAttemptService->createForAdminAppEmail(
                 $administrator->email,
@@ -50,10 +51,10 @@ class AdministratorService
     }
 
     /** @param array<string, mixed> $data */
-    public function update(Tenant $tenant, int $administratorId, array $data): User
+    public function update(Tenant $tenant, int $administratorId, array $data, ?int $eventId = null): User
     {
-        return DB::transaction(function () use ($tenant, $administratorId, $data): User {
+        return DB::transaction(function () use ($tenant, $administratorId, $data, $eventId): User {
-            $administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
+            $administrator = $this->query($tenant, $eventId)->lockForUpdate()->findOrFail($administratorId);
             $administrator->update($this->attributes($data));
 
             return $administrator->load('role');
@@ -66,11 +67,11 @@ class AdministratorService
             // Serialize deletions for this tenant, including requests already authenticated
             // when another administrator removes their account.
             Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
-            $administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
+            $administrator = $this->query($tenant, $actor->event_id)->lockForUpdate()->findOrFail($administratorId);
             if ($administrator->is($actor)) {
                 throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
             }
-            $activeAdministrators = $this->query($tenant)->lockForUpdate()->get();
+            $activeAdministrators = $this->query($tenant, $actor->event_id)->lockForUpdate()->get();
             if ($activeAdministrators->count() <= 1) {
                 throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
             }
@@ -80,10 +81,11 @@ class AdministratorService
         });
     }
 
-    private function query(Tenant $tenant): Builder
+    private function query(Tenant $tenant, ?int $eventId = null): Builder
     {
         return User::query()->where('tenant_codigo', $tenant->codigo)
-            ->where('rol_codigo', RoleCode::AdminApp->value);
+            ->where('rol_codigo', RoleCode::AdminApp->value)
+            ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
     }
 
     /** @param array<string, mixed> $data

app/Domains/Core/Administrator/documentacion/README.md

@@ -55,6 +55,8 @@ No agrega tablas ni migraciones. No modifica el CRUD de escáneres ni el fronten
 
 ## Verificación
 
+Cuando el actor tiene `event_id`, los nuevos administradores heredan su evento y el listado, la búsqueda, la edición y la baja se limitan a ese evento dentro del tenant. La comprobación de administradores activos también usa ese alcance. El evento se toma del usuario autenticado, no del cuerpo de la solicitud; sin `event_id` se conserva el comportamiento por tenant.
+
 `php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
 
 Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de

app/Domains/Core/Auth/Models/User.php

@@ -2,11 +2,12 @@
 
 namespace App\Domains\Core\Auth\Models;
 
+use App\Domains\Commerce\Catalog\Models\Category;
 use App\Domains\Core\Authorization\Enums\RoleCode;
 use App\Domains\Core\Authorization\Models\Role;
-use App\Domains\Commerce\Catalog\Models\Category;
-use App\Domains\Ticketing\Event\Models\EventDateChangeView;
 use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Models\Event;
+use App\Domains\Ticketing\Event\Models\EventDateChangeView;
 use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -20,7 +21,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
 
-#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
+#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo', 'event_id'])]
 #[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
 class User extends Authenticatable
 {
@@ -86,6 +87,12 @@ class User extends Authenticatable
         return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
     }
 
+    /** @return BelongsTo<Event, $this> */
+    public function event(): BelongsTo
+    {
+        return $this->belongsTo(Event::class);
+    }
+
     /** @return BelongsToMany<Category, $this> */
     public function scanCategories(): BelongsToMany
     {
@@ -103,6 +110,7 @@ class User extends Authenticatable
     protected function casts(): array
     {
         return [
+            'event_id' => 'integer',
             'email_verified_at' => 'datetime',
             'password' => 'hashed',
             'failed_login_attempts' => 'integer',

app/Domains/Core/Auth/Resources/UserResource.php

@@ -24,6 +24,7 @@ class UserResource extends JsonResource
             'telefono' => $this->telefono,
             'rol_codigo' => $this->rol_codigo,
             'tenant_codigo' => $this->tenant_codigo,
+            'event_id' => $this->event_id,
             'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
                 ->map(fn ($category) => [
                     'id' => $category->id,

app/Domains/Core/Bootstrap/Services/TenantBootstrapService.php

@@ -33,14 +33,10 @@ class TenantBootstrapService
             $tenant,
             [
                 'eventDateChanges',
-                'menues' => fn ($query) => $query
+                'menues' => fn ($query) => $query->whereHas(
-                    ->where(fn ($query) => $query
+                    'roles',
-                        ->where('menues.code', 'help.contact')
+                    fn ($query) => $query->where('codigo', RoleCode::User->value)
-                        ->orWhere('tenants_menues.is_enabled', true))
+                ),
-                    ->whereHas(
-                        'roles',
-                        fn ($query) => $query->where('codigo', RoleCode::User->value)
-                    ),
                 $tenant->storefront_website_type_code === 'onticket_multi_event'
                     ? 'eventCategories' : 'categories' => fn ($query) => $query->orderBy('nombre'),
             ]

app/Domains/Core/Menu/Models/Menu.php

@@ -76,7 +76,7 @@ class Menu extends Model
             'codigo'
         )
             ->using(TenantMenu::class)
-            ->withPivot('static_content', 'is_enabled')
+            ->withPivot('static_content')
             ->withTimestamps();
     }
 

app/Domains/Core/Menu/Models/TenantMenu.php

@@ -16,14 +16,12 @@ class TenantMenu extends Pivot
         'tenant_code',
         'menu_code',
         'static_content',
-        'is_enabled',
     ];
 
     protected function casts(): array
     {
         return [
             'static_content' => 'array',
-            'is_enabled' => 'boolean',
         ];
     }
 

app/Domains/Core/Staff/Controllers/AdminAppStaffController.php

@@ -26,6 +26,7 @@ class AdminAppStaffController extends Controller
         return StaffResource::collection($this->staffService->list(
             $request->user()->tenant()->firstOrFail(),
             $request->string('search')->trim()->toString() ?: null,
+            $request->user()->event_id,
         ));
     }
 
@@ -34,6 +35,7 @@ class AdminAppStaffController extends Controller
         return StaffResource::make($this->staffService->create(
             $request->user()->tenant()->firstOrFail(),
             $request->validated(),
+            $request->user()->event_id,
         ));
     }
 
@@ -43,12 +45,13 @@ class AdminAppStaffController extends Controller
             $request->user()->tenant()->firstOrFail(),
             $staff,
             $request->validated(),
+            $request->user()->event_id,
         ));
     }
 
     public function destroy(Request $request, int $staff): Response
     {
-        $this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff);
+        $this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff, $request->user()->event_id);
 
         return response()->noContent();
     }
@@ -60,6 +63,7 @@ class AdminAppStaffController extends Controller
         $scanner = $this->staffService->find(
             $request->user()->tenant()->firstOrFail(),
             $staff,
+            $request->user()->event_id,
         );
 
         return ScanAttemptResource::collection(

app/Domains/Core/Staff/Resources/StaffResource.php

@@ -18,6 +18,7 @@ class StaffResource extends JsonResource
             'dni' => $this->dni,
             'email' => $this->email,
             'rol_codigo' => $this->rol_codigo,
+            'event_id' => $this->event_id,
             'role' => $this->whenLoaded('role', fn () => [
                 'codigo' => $this->role?->codigo,
                 'nombre' => $this->role?->nombre,

app/Domains/Core/Staff/Services/StaffService.php

@@ -2,11 +2,11 @@
 
 namespace App\Domains\Core\Staff\Services;
 
+use App\Domains\Commerce\Catalog\Models\Category;
 use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
 use App\Domains\Core\Auth\Models\User;
 use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
 use App\Domains\Core\Authorization\Enums\RoleCode;
-use App\Domains\Commerce\Catalog\Models\Category;
 use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -22,9 +22,9 @@ class StaffService
     ) {}
 
     /** @return Collection<int, User> */
-    public function list(Tenant $tenant, ?string $search = null): Collection
+    public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
     {
-        return $this->staffQuery($tenant)
+        return $this->staffQuery($tenant, $eventId)
             ->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
             ->when($search, function (Builder $query, string $search): void {
                 $query->where(function (Builder $query) use ($search): void {
@@ -52,18 +52,19 @@ class StaffService
     }
 
     /** @param array<string, mixed> $data */
-    public function create(Tenant $tenant, array $data): User
+    public function create(Tenant $tenant, array $data, ?int $eventId = null): User
     {
         $categoryIds = $this->categoryIdsFor($tenant, $data);
         $this->assertCategoriesBelongToTenant($tenant, $categoryIds);
 
-        return DB::transaction(function () use ($tenant, $data, $categoryIds): User {
+        return DB::transaction(function () use ($tenant, $data, $categoryIds, $eventId): User {
             $staff = User::query()->create([
                 ...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
                 'email' => mb_strtolower(trim((string) $data['email'])),
                 'password' => Str::random(64),
                 'rol_codigo' => RoleCode::Scanner->value,
                 'tenant_codigo' => $tenant->codigo,
+                'event_id' => $eventId,
             ]);
             $staff->scanCategories()->sync($categoryIds);
             $this->resetPasswordAttemptService->createForScannerEmail(
@@ -76,9 +77,9 @@ class StaffService
     }
 
     /** @param array<string, mixed> $data */
-    public function update(Tenant $tenant, int $staffId, array $data): User
+    public function update(Tenant $tenant, int $staffId, array $data, ?int $eventId = null): User
     {
-        $staff = $this->find($tenant, $staffId);
+        $staff = $this->find($tenant, $staffId, $eventId);
         $categoryIds = $this->categoryIdsFor($tenant, $data);
         $this->assertCategoriesBelongToTenant($tenant, $categoryIds);
 
@@ -92,9 +93,9 @@ class StaffService
         });
     }
 
-    public function delete(Tenant $tenant, int $staffId): void
+    public function delete(Tenant $tenant, int $staffId, ?int $eventId = null): void
     {
-        $staff = $this->find($tenant, $staffId);
+        $staff = $this->find($tenant, $staffId, $eventId);
 
         DB::transaction(function () use ($staff): void {
             $staff->tokens()->delete();
@@ -102,16 +103,17 @@ class StaffService
         });
     }
 
-    public function find(Tenant $tenant, int $staffId): User
+    public function find(Tenant $tenant, int $staffId, ?int $eventId = null): User
     {
-        return $this->staffQuery($tenant)->findOrFail($staffId);
+        return $this->staffQuery($tenant, $eventId)->findOrFail($staffId);
     }
 
-    private function staffQuery(Tenant $tenant): Builder
+    private function staffQuery(Tenant $tenant, ?int $eventId = null): Builder
     {
         return User::query()
             ->where('tenant_codigo', $tenant->codigo)
-            ->where('rol_codigo', RoleCode::Scanner->value);
+            ->where('rol_codigo', RoleCode::Scanner->value)
+            ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
     }
 
     /**

app/Domains/Core/Staff/documentacion/README.md

@@ -18,3 +18,5 @@ Recurso REST `/v1/adminapp/tenant/staff`, excepto detalle individual, protegido
 ## Dependencias y reglas
 
 Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
+
+Si el administrador autenticado tiene `event_id`, el alta de scanners hereda ese valor y las búsquedas, ediciones, bajas y consultas de intentos de escaneo se limitan a personal del mismo evento. El cliente no puede elegir ni cambiar el evento. Sin `event_id`, se mantiene el alcance por tenant.

app/Domains/Core/Tenant/Controllers/AdminApp/BrandController.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Controllers\AdminApp;
-
-use App\Domains\Core\Tenant\Requests\AdminApp\UpdateBrandRequest;
-use App\Domains\Core\Tenant\Resources\AdminApp\BrandResource;
-use App\Domains\Core\Tenant\Services\BrandService;
-use App\Domains\Core\Tenant\Services\TenantInformationService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class BrandController extends Controller
-{
-    public function show(Request $request, TenantInformationService $tenantInformationService): BrandResource
-    {
-        $tenant = $request->user()->tenant()->firstOrFail();
-
-        return BrandResource::make($tenantInformationService->load($tenant));
-    }
-
-    public function update(
-        UpdateBrandRequest $request,
-        BrandService $brandService,
-        TenantInformationService $tenantInformationService,
-    ): BrandResource {
-        $tenant = $request->user()->tenant()->firstOrFail();
-        $brandService->update($tenant, $request->validated());
-
-        return BrandResource::make($tenantInformationService->load($tenant->fresh()));
-    }
-}

app/Domains/Core/Tenant/Controllers/AdminApp/HelpMenuController.php

@@ -1,90 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Controllers\AdminApp;
-
-use App\Domains\Core\Tenant\Requests\AdminApp\UpdateHelpMenuContentRequest;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class HelpMenuController extends Controller
-{
-    private const MENU_CODES = [
-        'help.faq',
-        'help.terms-and-conditions',
-    ];
-
-    public function index(Request $request): JsonResponse
-    {
-        $tenant = $request->user()->tenant()->firstOrFail();
-        $menus = $tenant->menues()
-            ->whereIn('menues.code', self::MENU_CODES)
-            ->get()
-            ->keyBy('code');
-
-        return response()->json([
-            'data' => collect(self::MENU_CODES)->mapWithKeys(
-                fn (string $code): array => [$code => [
-                    'code' => $code,
-                    'is_enabled' => (bool) ($menus->get($code)?->pivot?->is_enabled ?? false),
-                    'static_content' => $menus->get($code)?->pivot?->static_content
-                        ?? $this->emptyContent($code),
-                ]]
-            ),
-        ]);
-    }
-
-    public function toggle(
-        Request $request,
-        string $menuCode,
-    ): JsonResponse {
-        abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
-
-        $tenant = $request->user()->tenant()->firstOrFail();
-        $tenantMenu = $tenant->menues()
-            ->where('menues.code', $menuCode)
-            ->firstOrFail();
-        $isEnabled = ! $tenantMenu->pivot->is_enabled;
-
-        $tenant->menues()->updateExistingPivot($menuCode, [
-            'is_enabled' => $isEnabled,
-        ]);
-
-        return response()->json([
-            'data' => [
-                'code' => $tenantMenu->code,
-                'is_enabled' => $isEnabled,
-            ],
-        ]);
-    }
-
-    public function updateContent(
-        UpdateHelpMenuContentRequest $request,
-        string $menuCode,
-    ): JsonResponse {
-        abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
-
-        $tenant = $request->user()->tenant()->firstOrFail();
-        $tenantMenu = $tenant->menues()
-            ->where('menues.code', $menuCode)
-            ->firstOrFail();
-        $staticContent = $request->validated('static_content');
-
-        $tenant->menues()->updateExistingPivot($menuCode, [
-            'static_content' => $staticContent,
-        ]);
-
-        return response()->json([
-            'data' => [
-                'code' => $tenantMenu->code,
-                'is_enabled' => (bool) $tenantMenu->pivot->is_enabled,
-                'static_content' => $staticContent,
-            ],
-        ]);
-    }
-
-    private function emptyContent(string $menuCode): array
-    {
-        return $menuCode === 'help.faq' ? [] : ['html' => ''];
-    }
-}

app/Domains/Core/Tenant/Models/Tenant.php

@@ -6,8 +6,6 @@ use App\Domains\Commerce\Catalog\Enums\GroupLayout;
 use App\Domains\Commerce\Catalog\Enums\ProductLayout;
 use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use App\Domains\Commerce\Catalog\Models\Category;
-use App\Domains\Core\Address\Models\Address;
-use App\Domains\Core\Address\Models\TenantAddress;
 use App\Domains\Core\Client\Models\Client;
 use App\Domains\Core\Menu\Models\Menu;
 use App\Domains\Core\Menu\Models\TenantMenu;
@@ -24,7 +22,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\Relations\HasOneThrough;
 use Illuminate\Support\Facades\Schema;
 
 #[Fillable([
@@ -311,23 +308,6 @@ class Tenant extends Model
         return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
     }
 
-    /** @return BelongsToMany<Address, $this> */
-    public function addresses(): BelongsToMany
-    {
-        return $this->belongsToMany(Address::class, 'tenant_addresses', 'tenant_codigo', 'address_id', 'codigo', 'id')
-            ->using(TenantAddress::class)
-            ->withPivot(['id', 'is_main'])
-            ->withTimestamps()
-            ->orderByPivot('id');
-    }
-
-    /** @return HasOneThrough<Address, TenantAddress, $this> */
-    public function mainAddress(): HasOneThrough
-    {
-        return $this->hasOneThrough(Address::class, TenantAddress::class, 'tenant_codigo', 'id', 'codigo', 'address_id')
-            ->where('tenant_addresses.is_main', true);
-    }
-
     public function menues(): BelongsToMany
     {
         return $this->belongsToMany(
@@ -339,7 +319,7 @@ class Tenant extends Model
             'code'
         )
             ->using(TenantMenu::class)
-            ->withPivot('static_content', 'is_enabled')
+            ->withPivot('static_content')
             ->withTimestamps();
     }
 }

app/Domains/Core/Tenant/Requests/AdminApp/UpdateBrandRequest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Requests\AdminApp;
-
-use App\Shared\Rules\CroppedImageOrBase64Rule;
-use App\Shared\Rules\ImageOrBase64Rule;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UpdateBrandRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        $shopit = $this->user()->tenant()->firstOrFail()->storefront_website_type_code === 'shopit';
-
-        return [
-            'nombre' => ['required', 'string', 'max:255'],
-            'primary_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
-            'footer_bg_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
-            'header_logo' => ['present', 'nullable', new ImageOrBase64Rule],
-            'footer_logo' => ['present', 'nullable', new ImageOrBase64Rule],
-            'banner_images' => [$shopit ? 'present' : 'prohibited', 'array', 'max:10'],
-            'banner_images.*' => ['required', new CroppedImageOrBase64Rule],
-        ];
-    }
-}

app/Domains/Core/Tenant/Requests/AdminApp/UpdateHelpMenuContentRequest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Requests\AdminApp;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UpdateHelpMenuContentRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        return match ($this->route('menuCode')) {
-            'help.faq' => [
-                'static_content' => ['required', 'array'],
-                'static_content.*.pregunta' => ['required', 'string'],
-                'static_content.*.respuesta' => ['required', 'string'],
-                'static_content.*.is_active' => ['required', 'boolean'],
-            ],
-            'help.terms-and-conditions' => [
-                'static_content' => ['required', 'array'],
-                'static_content.html' => ['present', 'nullable', 'string'],
-            ],
-            default => [],
-        };
-    }
-}

app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php

@@ -1,104 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Resources\AdminApp;
-
-use App\Domains\Core\Tenant\Models\Tenant;
-use App\Shared\Attachable\Models\Attachment;
-use App\Shared\Attachable\Models\AttachmentCrop;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin Tenant */
-class BrandResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'nombre' => $this->nombre,
-            'primary_color' => $this->primary_color,
-            'header_bg_color' => $this->header_bg_color,
-            'footer_color' => $this->footerColor(),
-            'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
-            'header_logo_key' => $this->headerLogo?->key,
-            'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440),
-            'footer_logo_key' => $this->footerLogo?->key,
-            'can_edit_carousel' => $this->canEditCarousel(),
-            'banner_images' => $this->bannerImages(),
-        ];
-    }
-
-    private function footerColor(): string
-    {
-        $footerColor = strtolower(trim((string) $this->footer_bg_color));
-        $primaryColor = strtolower(trim((string) $this->primary_color));
-
-        if ($footerColor !== '' && $footerColor === $primaryColor) {
-            return 'primary';
-        }
-
-        if (in_array($footerColor, ['#000', '#000000', 'black'], true)) {
-            return 'black';
-        }
-
-        if ($footerColor === '' || in_array($footerColor, ['#fff', '#ffffff', 'white'], true)) {
-            return 'white';
-        }
-
-        return 'primary';
-    }
-
-    /** @return array<int, array<string, mixed>> */
-    private function bannerImages(): array
-    {
-        if (! $this->canEditCarousel()) {
-            return [];
-        }
-
-        $extra = $this->websiteExtras->first(
-            fn ($extra) => $extra->is_enabled && $extra->websiteTypeExtra->codigo === 'carousel'
-        );
-
-        if ($extra === null) {
-            return [];
-        }
-
-        $images = $extra->resolvedConfig();
-
-        if (! is_array($images)) {
-            return [];
-        }
-
-        return collect($images)
-            ->filter(fn ($image) => $image instanceof Attachment)
-            ->map(function (Attachment $image): array {
-                $desktopCrop = $image->cropVariants
-                    ->firstWhere('variant', AttachmentCrop::DESKTOP);
-
-                return [
-                    'key' => $image->key,
-                    'url' => ($desktopCrop?->croppedAttachment ?? $image)->getTemporaryUrl(1440),
-                    'original_url' => $image->getTemporaryUrl(1440),
-                    'crop' => $desktopCrop === null ? null : [
-                        'crop_horizontal' => $desktopCrop->crop_horizontal,
-                        'crop_vertical' => $desktopCrop->crop_vertical,
-                    ],
-                ];
-            })
-            ->values()
-            ->all();
-    }
-
-    private function canEditCarousel(): bool
-    {
-        if ($this->storefront_website_type_code !== 'shopit') {
-            return false;
-        }
-
-        $extra = $this->websiteExtras->first(
-            fn ($extra) => $extra->websiteTypeExtra->codigo === 'carousel'
-        );
-
-        return $extra === null || $extra->is_enabled;
-    }
-}

app/Domains/Core/Tenant/Resources/TenantAddressResource.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Resources;
-
-use App\Domains\Core\Address\Resources\AddressResource;
-use Illuminate\Http\Request;
-
-class TenantAddressResource extends AddressResource
-{
-    public function toArray(Request $request): array
-    {
-        return [...parent::toArray($request), 'is_main' => (bool) $this->pivot->is_main];
-    }
-}

app/Domains/Core/Tenant/Resources/TenantResource.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Core\Tenant\Resources;
 
 use App\Domains\Commerce\Catalog\Models\Category;
-use App\Domains\Core\Address\Resources\AddressResource;
 use App\Domains\Core\Menu\Models\Menu;
 use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use App\Domains\Core\Tenant\Models\Tenant;
@@ -42,8 +41,6 @@ class TenantResource extends JsonResource
             'site_title' => $this->site_title ?? 'ShopitFront',
             'asset_url' => config('filesystems.disks.s3.url'),
             'address' => $this->address,
-            'addresses' => $this->whenLoaded('addresses', fn () => TenantAddressResource::collection($this->addresses)),
-            'main_address' => $this->whenLoaded('mainAddress', fn () => AddressResource::make($this->mainAddress)),
             'phone' => $this->phone,
             'favicon' => $this->favicon?->getTemporaryUrl(1440),
             'primary_color' => $this->primary_color,
@@ -130,7 +127,6 @@ class TenantResource extends JsonResource
             'subtitle' => $event->subtitle,
             'description' => $event->description,
             'location' => $event->location,
-            'address' => AddressResource::make($event->address),
             'date_text' => $event->date_text,
             'dates' => $event->dates
                 ->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)

app/Domains/Core/Tenant/Services/BrandService.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Services;
-
-use App\Domains\Core\Tenant\Models\Tenant;
-use App\Shared\Attachable\Enums\AttachmentType;
-use App\Shared\Attachable\Models\Attachment;
-use App\Shared\Attachable\Services\AttachmentService;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-use Throwable;
-
-class BrandService
-{
-    public function __construct(
-        private readonly AttachmentService $attachmentService,
-        private readonly WebsiteExtraService $websiteExtraService,
-    ) {}
-
-    /** @param array<string, mixed> $data */
-    public function update(Tenant $tenant, array $data): void
-    {
-        $carousel = $tenant->storefront_website_type_code === 'shopit'
-            ? $tenant->websiteExtras()->whereHas('websiteTypeExtra',
-                fn ($query) => $query->where('codigo', 'carousel'))->first()
-            : null;
-        $allowedBannerIds = is_array($carousel?->config) ? $carousel->config : [];
-        if ($carousel !== null && ! $carousel->is_enabled && ($data['banner_images'] ?? []) !== []) {
-            throw ValidationException::withMessages(['banner_images' => 'El carrusel está deshabilitado.']);
-        }
-        $seen = [];
-
-        foreach (['header_logo' => $tenant->header_logo_id, 'footer_logo' => $tenant->footer_logo_id] as $field => $id) {
-            $this->existingImage($data[$field], $id === null ? [] : [$id], $field);
-        }
-        foreach ($data['banner_images'] ?? [] as $index => $item) {
-            $image = is_array($item) ? $item['image'] : $item;
-            $attachment = $this->existingImage($image, $allowedBannerIds, "banner_images.{$index}");
-            if ($attachment !== null) {
-                if (isset($seen[$attachment->id])) {
-                    throw ValidationException::withMessages(["banner_images.{$index}" => 'La imagen está repetida.']);
-                }
-                $seen[$attachment->id] = true;
-            }
-        }
-
-        $created = [];
-
-        try {
-            DB::transaction(function () use ($tenant, $data, $carousel, &$created): void {
-                $header = $this->logo($data['header_logo'], $tenant->header_logo_id, $tenant, $created);
-                $footer = $this->logo($data['footer_logo'], $tenant->footer_logo_id, $tenant, $created);
-
-                $tenant->update([
-                    'nombre' => trim($data['nombre']),
-                    'primary_color' => $data['primary_color'],
-                    'footer_bg_color' => $data['footer_bg_color'],
-                    'header_logo_id' => $header?->id,
-                    'footer_logo_id' => $footer?->id,
-                ]);
-
-                if ($tenant->storefront_website_type_code !== 'shopit'
-                    || ($carousel !== null && ! $carousel->is_enabled)) {
-                    return;
-                }
-
-                $definition = $this->websiteExtraService->definitionForTenant($tenant, 'carousel');
-                $ids = [];
-                $recrops = [];
-                foreach ($data['banner_images'] as $item) {
-                    $image = is_array($item) ? $item['image'] : $item;
-                    $attachment = $this->existingImage($image, $carousel?->config ?? [], 'banner_images');
-                    $crops = $this->crops($item);
-
-                    if ($attachment === null) {
-                        $attachment = $crops === null
-                            ? $this->attachmentService->store($image, "tenants/{$tenant->codigo}/extras/carousel")
-                            : $this->attachmentService->storeCroppedImageVariants(
-                                $image, "tenants/{$tenant->codigo}/extras/carousel", $crops
-                            );
-                        $created[] = $attachment;
-                    } elseif ($crops !== null) {
-                        $recrops[] = [$attachment, $crops];
-                    }
-                    $ids[] = $attachment->id;
-                }
-
-                $tenant->websiteExtras()->updateOrCreate(
-                    ['website_type_extra_id' => $definition->id],
-                    ['config' => $ids]
-                );
-
-                foreach ($recrops as [$attachment, $crops]) {
-                    $this->attachmentService->updateImageCropVariants($attachment, $crops);
-                }
-            });
-        } catch (Throwable $error) {
-            foreach ($created as $attachment) {
-                $paths = [$attachment->path];
-                foreach ($attachment->cropVariants as $crop) {
-                    if ($crop->croppedAttachment !== null) {
-                        $paths[] = $crop->croppedAttachment->path;
-                    }
-                }
-                Storage::disk('s3')->delete($paths);
-            }
-            throw $error;
-        }
-    }
-
-    /** @param array<int, int> $allowedIds */
-    private function existingImage(mixed $value, array $allowedIds, string $field): ?Attachment
-    {
-        if (! is_string($value) || ! Str::isUuid($value)) {
-            return null;
-        }
-
-        $attachment = Attachment::query()->where('key', $value)->first();
-        if ($attachment === null || $attachment->type !== AttachmentType::Image
-            || ! in_array($attachment->id, $allowedIds, true)) {
-            throw ValidationException::withMessages([$field => 'La imagen no pertenece a esta marca.']);
-        }
-
-        return $attachment;
-    }
-
-    /** @param array<int, Attachment> $created */
-    private function logo(mixed $value, ?int $currentId, Tenant $tenant, array &$created): ?Attachment
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        $existing = $this->existingImage($value, $currentId === null ? [] : [$currentId], 'logo');
-        if ($existing !== null) {
-            return $existing;
-        }
-
-        $attachment = $this->attachmentService->store($value, "tenants/{$tenant->codigo}/logos");
-        $created[] = $attachment;
-
-        return $attachment;
-    }
-
-    /** @return array<string, array<string, mixed>>|null */
-    private function crops(mixed $item): ?array
-    {
-        if (! is_array($item)) {
-            return null;
-        }
-
-        if (! isset($item['crop_horizontal'], $item['crop_vertical'])) {
-            return null;
-        }
-
-        $crop = [
-            'crop_horizontal' => $item['crop_horizontal'],
-            'crop_vertical' => $item['crop_vertical'],
-        ];
-
-        return ['desktop' => $crop, 'mobile' => $crop];
-    }
-}

app/Domains/Core/Tenant/Services/TenantAddressService.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Core\Tenant\Services;
-
-use App\Domains\Core\Address\Models\Address;
-use App\Domains\Core\Tenant\Models\Tenant;
-use Illuminate\Support\Facades\DB;
-
-class TenantAddressService
-{
-    public function setMainAddress(Tenant $tenant, Address $address): void
-    {
-        DB::transaction(function () use ($tenant, $address): void {
-            // Serialize changes for this tenant, including when it has no principal address yet.
-            Tenant::query()->where('codigo', $tenant->codigo)->lockForUpdate()->firstOrFail();
-            $tenant->addresses()->where('addresses.id', $address->id)->firstOrFail();
-
-            DB::table('tenant_addresses')->where('tenant_codigo', $tenant->codigo)
-                ->where('is_main', true)->update(['is_main' => false, 'updated_at' => now()]);
-            $tenant->addresses()->updateExistingPivot($address->id, ['is_main' => true]);
-        });
-
-        $tenant->unsetRelation('addresses');
-        $tenant->unsetRelation('mainAddress');
-    }
-}

app/Domains/Core/Tenant/Services/TenantInformationService.php

@@ -18,12 +18,9 @@ class TenantInformationService
         'footerBackgroundImage',
         'storefrontWebsiteType',
         'socialMedia',
-        'addresses',
-        'mainAddress',
         'websiteExtras.websiteTypeExtra',
         'activeEvent.dates',
         'activeEvent.socialMedia',
-        'activeEvent.address',
     ];
 
     /**

app/Domains/Core/Tenant/routes/adminapp.php

@@ -1,18 +1,11 @@
 <?php
 
-use App\Domains\Core\Tenant\Controllers\AdminApp\BrandController;
-use App\Domains\Core\Tenant\Controllers\AdminApp\HelpMenuController;
 use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
     ->middleware(['auth:sanctum', 'adminapp.tenant'])
     ->group(function (): void {
-        Route::get('brand', [BrandController::class, 'show']);
-        Route::put('brand', [BrandController::class, 'update']);
-        Route::get('help-menus', [HelpMenuController::class, 'index']);
-        Route::patch('help-menus/{menuCode}/toggle', [HelpMenuController::class, 'toggle']);
-        Route::put('help-menus/{menuCode}/content', [HelpMenuController::class, 'updateContent']);
         Route::get('website-extras', [WebsiteExtraController::class, 'show']);
         Route::get('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'showExtra']);
         Route::put('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'update']);

app/Domains/Ticketing/Desfile/Controllers/DesfileEntryReservationController.php

@@ -6,18 +6,18 @@ use App\Domains\Ticketing\Desfile\Requests\ExportEntryReservationsRequest;
 use App\Domains\Ticketing\Desfile\Requests\IndexEntryReservationsRequest;
 use App\Domains\Ticketing\Desfile\Requests\StoreEntryReservationsRequest;
 use App\Domains\Ticketing\Desfile\Resources\EntryReservationResource;
+use App\Domains\Ticketing\Desfile\Services\DesfileEntryReservationService;
 use App\Domains\Ticketing\Desfile\Services\EntryReservationExcelService;
 use App\Domains\Ticketing\Desfile\Services\EntryReservationPdfService;
-use App\Domains\Ticketing\Desfile\Services\EntryReservationService;
 use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
-class EntryReservationController extends Controller
+class DesfileEntryReservationController extends Controller
 {
-    public function index(IndexEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
+    public function index(IndexEntryReservationsRequest $request, DesfileEntryReservationService $service): AnonymousResourceCollection
     {
         return EntryReservationResource::collection(
             $service->reservations($request->user(), $request->validated()),
@@ -26,7 +26,7 @@ class EntryReservationController extends Controller
 
     public function downloadPdf(
         ExportEntryReservationsRequest $request,
-        EntryReservationService $service,
+        DesfileEntryReservationService $service,
         EntryReservationPdfService $pdf,
     ): Response {
         $user = $request->user();
@@ -40,7 +40,7 @@ class EntryReservationController extends Controller
 
     public function downloadExcel(
         ExportEntryReservationsRequest $request,
-        EntryReservationService $service,
+        DesfileEntryReservationService $service,
         EntryReservationExcelService $excel,
     ): StreamedResponse {
         $user = $request->user();
@@ -55,7 +55,7 @@ class EntryReservationController extends Controller
     public function downloadTicketPdf(
         IndexEntryReservationsRequest $request,
         int $reservation,
-        EntryReservationService $service,
+        DesfileEntryReservationService $service,
         TicketPdfService $pdf,
     ): Response {
         $user = $request->user();
@@ -66,7 +66,7 @@ class EntryReservationController extends Controller
         );
     }
 
-    public function store(StoreEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
+    public function store(StoreEntryReservationsRequest $request, DesfileEntryReservationService $service): AnonymousResourceCollection
     {
         return EntryReservationResource::collection($service->reserve(
             $request->user(), $request->validated('idempotency_key'), $request->validated('rows'),
@@ -76,7 +76,7 @@ class EntryReservationController extends Controller
     public function destroy(
         IndexEntryReservationsRequest $request,
         int $reservation,
-        EntryReservationService $service,
+        DesfileEntryReservationService $service,
     ): Response {
         $service->cancel($request->user(), $reservation);
 

app/Domains/Ticketing/Desfile/Models/EntryReservation.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Domains\Ticketing\Desfile\Models;
-
-use App\Domains\Commerce\Catalog\Models\Inventory;
-use App\Domains\Commerce\Catalog\Models\Variant;
-use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
-use App\Domains\Ticketing\Ticket\Models\Ticket;
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-#[Fillable([
-    'variant_id',
-    'ticket_id',
-    'inventory_id',
-    'batch_id',
-    'fecha_reserva',
-    'importe',
-    'tipo_pago',
-])]
-class EntryReservation extends Model
-{
-    use SoftDeletes;
-
-    protected $table = 'desfile_entry_reservations';
-
-    protected function casts(): array
-    {
-        return [
-            'variant_id' => 'integer',
-            'fecha_reserva' => 'datetime',
-            'importe' => 'decimal:2',
-            'tipo_pago' => EntryReservationPaymentType::class,
-        ];
-    }
-
-    /** @return BelongsTo<Variant, $this> */
-    public function variant(): BelongsTo
-    {
-        return $this->belongsTo(Variant::class)->withTrashed();
-    }
-
-    public function ticket(): BelongsTo
-    {
-        return $this->belongsTo(Ticket::class);
-    }
-
-    public function inventory(): BelongsTo
-    {
-        return $this->belongsTo(Inventory::class);
-    }
-}

app/Domains/Ticketing/Desfile/Requests/IndexEntryReservationsRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Ticketing\Desfile\Requests;
 
-use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 

app/Domains/Ticketing/Desfile/Requests/StoreEntryReservationsRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Ticketing\Desfile\Requests;
 
-use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 

app/Domains/Ticketing/Desfile/Resources/EntryReservationResource.php

@@ -15,6 +15,7 @@ class EntryReservationResource extends JsonResource
 
         return [
             'id' => $this->id,
+            'catalog_item_id' => $this->catalog_item_id,
             'variant_id' => $this->variant_id,
             'ticket_id' => $this->ticket_id,
             'fecha_reserva' => $this->fecha_reserva->toIso8601String(),

app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationPolicy.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Domains\Ticketing\Desfile\Services;
+
+use App\Domains\Ticketing\Ticket\Services\EntryReservationPolicy;
+use Illuminate\Validation\ValidationException;
+
+class DesfileEntryReservationPolicy implements EntryReservationPolicy
+{
+    public function validate(array $selections): void
+    {
+        $errors = [];
+        $seen = [];
+
+        foreach ($selections as $index => $selection) {
+            $variant = $selection['variant'];
+            if ($variant === null || $selection['inventory'] === null
+                || isset($seen[$variant->id])
+                || $variant->entryReservations()->lockForUpdate()->get()->isNotEmpty()) {
+                $errors["rows.{$index}.variant_id"] = 'La entrada ya no está disponible.';
+            }
+            if ($variant !== null) {
+                $seen[$variant->id] = true;
+            }
+        }
+
+        if ($errors !== []) {
+            throw ValidationException::withMessages($errors);
+        }
+    }
+}

app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationService.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Domains\Ticketing\Desfile\Services;
+
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Services\EntryReservationService as TicketEntryReservationService;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use Illuminate\Validation\ValidationException;
+
+/** Adapts the Desfile API and seat rules to the catalog-based reservation workflow. */
+class DesfileEntryReservationService
+{
+    private const SELECTION_RELATIONS = [
+        'variant.catalogItem.itemAttributes.attribute.options',
+        'variant.definitions.itemAttribute.attribute.options',
+        'variant.eventDates',
+        'variant.eventDate',
+    ];
+
+    public function __construct(
+        private readonly TicketEntryReservationService $reservations,
+        private readonly DesfileEntryReservationPolicy $policy,
+    ) {}
+
+    /**
+     * @param  array{tipo_pago?: string|null, page?: int, per_page?: int}  $filters
+     * @return LengthAwarePaginator<EntryReservation>
+     */
+    public function reservations(User $user, array $filters = []): LengthAwarePaginator
+    {
+        $result = $this->reservations->reservations($user, [
+            ...$filters, 'catalog_item_id' => $this->entryId($user),
+        ]);
+        $result->getCollection()->loadMissing(self::SELECTION_RELATIONS);
+
+        return $result;
+    }
+
+    /**
+     * @param  array{tipo_pago?: string|null}  $filters
+     * @return Collection<int, EntryReservation>
+     */
+    public function reservationsForExport(User $user, array $filters = []): Collection
+    {
+        return $this->reservations->reservationsForExport($user, [
+            ...$filters, 'catalog_item_id' => $this->entryId($user),
+        ])->loadMissing(self::SELECTION_RELATIONS);
+    }
+
+    public function reservationTicket(User $user, int $reservationId): Ticket
+    {
+        return $this->reservations->reservationTicket($user, $reservationId, $this->entryId($user));
+    }
+
+    public function cancel(User $user, int $reservationId): void
+    {
+        $this->reservations->cancel($user, $reservationId, $this->entryId($user));
+    }
+
+    /** @param list<array{variant_id: int, tipo_pago: string}> $rows */
+    public function reserve(User $user, string $key, array $rows): Collection
+    {
+        $this->authorize($user);
+        $entry = CatalogItem::query()->where('tenant_code', $user->tenant_codigo)
+            ->where('slug', 'entrada')->firstOrFail();
+        $catalogRows = array_map(fn (array $row): array => [
+            ...$row, 'catalog_item_id' => $entry->id,
+        ], $rows);
+
+        try {
+            return $this->reservations->reserve($user, $key, $catalogRows, $this->policy)
+                ->loadMissing(self::SELECTION_RELATIONS);
+        } catch (ValidationException $exception) {
+            // Keep the row fields used by the form and describe the selected seat.
+            $variants = $entry->variants()->whereKey(array_column($rows, 'variant_id'))
+                ->with(['definitions.itemAttribute.attribute.options'])->get()->keyBy('id');
+            $errors = [];
+            foreach ($exception->errors() as $field => $messages) {
+                if (preg_match('/^rows\.(\d+)\.variant_id$/', $field, $match)) {
+                    $index = (int) $match[1];
+                    $label = $this->entryLabel($variants->get($rows[$index]['variant_id'] ?? null), $index);
+                    $messages = array_map(fn (string $message): string => $label.': '.$message, $messages);
+                }
+                $errors[$field] = $messages;
+            }
+
+            throw ValidationException::withMessages($errors);
+        }
+    }
+
+    private function authorize(User $user): void
+    {
+        abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
+    }
+
+    private function entryId(User $user): int
+    {
+        $this->authorize($user);
+
+        // Historical reservations remain accessible when the active event changes.
+        // A missing entry must not remove the catalog filter from the generic query.
+        return CatalogItem::query()->where('tenant_code', $user->tenant_codigo)
+            ->where('slug', 'entrada')->value('id') ?? -1;
+    }
+
+    private function entryLabel(?Variant $variant, int $index): string
+    {
+        if ($variant === null) {
+            return 'Entrada '.($index + 1);
+        }
+
+        $values = $variant->selectionValues();
+
+        return collect(['tipo' => 'Tipo', 'sector' => 'Sector', 'fila' => 'Fila', 'asiento' => 'Asiento'])
+            ->map(fn (string $label, string $key): string => $label.': '.($values->get($key) ?? 'sin especificar'))
+            ->implode(', ');
+    }
+}

app/Domains/Ticketing/Desfile/Services/EntryReservationExcelService.php

@@ -3,7 +3,7 @@
 namespace App\Domains\Ticketing\Desfile\Services;
 
 use App\Domains\Core\Tenant\Models\Tenant;
-use App\Domains\Ticketing\Desfile\Models\EntryReservation;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
 use Illuminate\Support\Collection;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Shared\Date;

app/Domains/Ticketing/Desfile/Services/EntryReservationPdfService.php

@@ -3,7 +3,7 @@
 namespace App\Domains\Ticketing\Desfile\Services;
 
 use App\Domains\Core\Tenant\Models\Tenant;
-use App\Domains\Ticketing\Desfile\Models\EntryReservation;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Barryvdh\DomPDF\PDF as DomPdf;
 use Illuminate\Http\Response;

app/Domains/Ticketing/Desfile/Services/EntryReservationReportService.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Ticketing\Desfile\Services;
 
-use App\Domains\Ticketing\Desfile\Models\EntryReservation;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
 use Illuminate\Support\Collection;
 
 class EntryReservationReportService

app/Domains/Ticketing/Desfile/Services/EntryReservationService.php

@@ -1,240 +0,0 @@
-<?php
-
-namespace App\Domains\Ticketing\Desfile\Services;
-
-use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
-use App\Domains\Commerce\Catalog\Models\CatalogItem;
-use App\Domains\Commerce\Catalog\Models\Inventory;
-use App\Domains\Commerce\Catalog\Models\Variant;
-use App\Domains\Core\Auth\Models\User;
-use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
-use App\Domains\Ticketing\Desfile\Models\EntryReservation;
-use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
-use App\Domains\Ticketing\Ticket\Models\Ticket;
-use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService;
-use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
-use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
-
-class EntryReservationService
-{
-    public function __construct(private readonly TicketGeneratorService $tickets) {}
-
-    /**
-     * @param  array{tipo_pago?: string|null, page?: int, per_page?: int}  $filters
-     * @return LengthAwarePaginator<EntryReservation>
-     */
-    public function reservations(User $user, array $filters = []): LengthAwarePaginator
-    {
-        abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
-
-        return $this->reservationsQuery($user, $filters)
-            ->paginate(
-                perPage: $filters['per_page'] ?? 15,
-                pageName: 'page',
-                page: $filters['page'] ?? 1,
-            )
-            ->withQueryString();
-    }
-
-    /**
-     * @param  array{tipo_pago?: string|null}  $filters
-     * @return Collection<int, EntryReservation>
-     */
-    public function reservationsForExport(User $user, array $filters = []): Collection
-    {
-        abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
-
-        return $this->reservationsQuery($user, $filters)->get();
-    }
-
-    public function reservationTicket(User $user, int $reservationId): Ticket
-    {
-        abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
-
-        $reservation = EntryReservation::query()
-            ->whereKey($reservationId)
-            ->whereNotNull('ticket_id')
-            ->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
-                ->where('tenant_code', $user->tenant_codigo)
-                ->where('slug', 'entrada'))
-            ->with(['ticket' => fn ($query) => $query->with([
-                ...TicketValidityResolver::RELATIONS,
-                ...TicketPresentationResolver::RELATIONS,
-            ])])
-            ->firstOrFail();
-
-        return $reservation->ticket;
-    }
-
-    public function cancel(User $user, int $reservationId): void
-    {
-        abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
-
-        DB::transaction(function () use ($user, $reservationId): void {
-            $reservation = EntryReservation::query()
-                ->whereKey($reservationId)
-                ->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
-                    ->where('tenant_code', $user->tenant_codigo)
-                    ->where('slug', 'entrada'))
-                ->lockForUpdate()
-                ->firstOrFail();
-
-            if ($reservation->ticket_id !== null) {
-                $ticket = Ticket::query()->lockForUpdate()->findOrFail($reservation->ticket_id);
-
-                if (! $ticket->can_cancel()) {
-                    throw ValidationException::withMessages([
-                        'status' => 'El ticket debe estar activo para poder cancelar la reserva.',
-                    ]);
-                }
-
-                $ticket->markAsCancelled();
-                $ticket->save();
-            }
-
-            if ($reservation->inventory_id !== null) {
-                $inventory = Inventory::query()->lockForUpdate()->findOrFail($reservation->inventory_id);
-                $inventory->releaseEntry(1);
-            }
-
-            $reservation->delete();
-        }, 3);
-    }
-
-    /** @param array{tipo_pago?: string|null} $filters */
-    private function reservationsQuery(User $user, array $filters = []): Builder
-    {
-        return EntryReservation::query()
-            ->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
-                ->where('tenant_code', $user->tenant_codigo)
-                ->where('slug', 'entrada'))
-            ->when(
-                $filters['tipo_pago'] ?? null,
-                fn (Builder $query, string $paymentType): Builder => $query->where('tipo_pago', $paymentType),
-            )
-            ->with([
-                'variant.catalogItem.itemAttributes.attribute.options',
-                'variant.definitions.itemAttribute.attribute.options',
-                'variant.eventDates',
-                'variant.eventDate',
-            ])
-            ->orderByDesc('fecha_reserva')
-            ->orderByDesc('id');
-    }
-
-    /** @param list<array{variant_id: int, tipo_pago: string}> $rows */
-    public function reserve(User $user, string $key, array $rows): Collection
-    {
-        abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
-        $normalized = collect($rows)->map(fn (array $row): array => [
-            'variant_id' => (int) $row['variant_id'], 'tipo_pago' => $row['tipo_pago'],
-        ])->sortBy('variant_id')->values()->all();
-        $hash = hash('sha256', json_encode($normalized, JSON_THROW_ON_ERROR));
-
-        return DB::transaction(function () use ($user, $key, $rows, $hash): Collection {
-            // Serialize retries by the same administrator, including the first insert.
-            User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail();
-            $batch = DB::table('desfile_reservation_batches')
-                ->where('user_id', $user->id)->where('idempotency_key', $key)->lockForUpdate()->first();
-            if ($batch !== null) {
-                abort_unless($batch->tenant_code === $user->tenant_codigo && hash_equals($batch->request_hash, $hash), 409,
-                    'La clave de envío ya fue utilizada con otras entradas.');
-
-                return EntryReservation::query()->where('batch_id', $batch->id)->with('ticket')->orderBy('id')->get();
-            }
-
-            $tenant = $user->tenant()->firstOrFail();
-            $entry = CatalogItem::query()->forTenantCatalog($tenant)->where('slug', 'entrada')
-                ->lockForUpdate()->firstOrFail();
-            $ids = array_column($rows, 'variant_id');
-            $variants = $entry->variants()->whereKey($ids)->orderBy('id')->lockForUpdate()->get();
-            $inventories = Inventory::query()->whereKey($variants->pluck('inventory_id')->filter()->unique())
-                ->orderBy('id')->lockForUpdate()->get()->keyBy('id');
-            $variants->load([
-                'eventDates', 'eventDate',
-                'desfileEntryReservations' => fn ($query) => $query->lockForUpdate(),
-            ]);
-            foreach ($variants as $variant) {
-                $variant->setRelation('inventory', $inventories->get($variant->inventory_id));
-            }
-            $entry->setRelation('variants', $variants);
-            $available = $entry->visibleVariants()->keyBy('id');
-            $requirements = [];
-            $errors = [];
-            foreach ($rows as $index => $row) {
-                $variant = $available->get($row['variant_id']);
-                if ($variant === null || $variant->inventory === null) {
-                    $errors["rows.{$index}.variant_id"] = $this->entryLabel($variants->firstWhere('id', $row['variant_id']), $index).': la entrada ya no está disponible.';
-
-                    continue;
-                }
-                $requirements[$variant->inventory_id] = ($requirements[$variant->inventory_id] ?? 0) + 1;
-            }
-            if ($errors !== []) {
-                throw ValidationException::withMessages($errors);
-            }
-            $tracked = $entry->inventory_policy !== InventoryPolicy::Unlimited;
-            foreach ($requirements as $inventoryId => $quantity) {
-                if ($tracked && $inventories[$inventoryId]->availableStock() < $quantity) {
-                    foreach ($rows as $index => $row) {
-                        $variant = $available[$row['variant_id']];
-                        if ($variant->inventory_id === $inventoryId) {
-                            $errors["rows.{$index}.variant_id"] = $this->entryLabel($variant, $index).': no hay stock suficiente para reservar las entradas seleccionadas.';
-                        }
-                    }
-                }
-            }
-            if ($errors !== []) {
-                throw ValidationException::withMessages($errors);
-            }
-
-            $batchId = DB::table('desfile_reservation_batches')->insertGetId([
-                'user_id' => $user->id, 'tenant_code' => $tenant->codigo,
-                'idempotency_key' => $key, 'request_hash' => $hash,
-                'created_at' => now(), 'updated_at' => now(),
-            ]);
-            foreach ($requirements as $inventoryId => $quantity) {
-                $inventories[$inventoryId]->reserveEntry($quantity, $tracked);
-            }
-            $reservations = collect();
-            foreach ($rows as $index => $row) {
-                $variant = $available[$row['variant_id']];
-                $payment = EntryReservationPaymentType::from($row['tipo_pago']);
-                try {
-                    $ticket = $this->tickets->generate($entry, $user, 1, $variant->id)->sole();
-                } catch (TicketGenerationException $exception) {
-                    throw ValidationException::withMessages([
-                        "rows.{$index}.variant_id" => $this->entryLabel($variant, $index).': no se pudo emitir el ticket. '.$exception->getMessage(),
-                    ]);
-                }
-                $reservation = EntryReservation::query()->create([
-                    'batch_id' => $batchId, 'ticket_id' => $ticket->id,
-                    'variant_id' => $variant->id, 'inventory_id' => $variant->inventory_id,
-                    'fecha_reserva' => now(), 'tipo_pago' => $payment,
-                    'importe' => $payment === EntryReservationPaymentType::Free ? 0 : $variant->getPrice(),
-                ]);
-                $reservations->push($reservation->setRelation('ticket', $ticket));
-            }
-
-            return $reservations;
-        }, 3);
-    }
-
-    private function entryLabel(?Variant $variant, int $index): string
-    {
-        if ($variant === null) {
-            return 'Entrada '.($index + 1);
-        }
-
-        $values = $variant->selectionValues();
-
-        return collect(['tipo' => 'Tipo', 'sector' => 'Sector', 'fila' => 'Fila', 'asiento' => 'Asiento'])
-            ->map(fn (string $label, string $key): string => $label.': '.($values->get($key) ?? 'sin especificar'))
-            ->implode(', ');
-    }
-}

app/Domains/Ticketing/Desfile/routes/api.php

@@ -1,32 +1,32 @@
 <?php
 
+use App\Domains\Ticketing\Desfile\Controllers\DesfileEntryReservationController;
 use App\Domains\Ticketing\Desfile\Controllers\EntryController;
-use App\Domains\Ticketing\Desfile\Controllers\EntryReservationController;
 use Illuminate\Support\Facades\Route;
 
-Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
+Route::get('v1/adminapp/tenant/desfile/entry-reservations', [DesfileEntryReservationController::class, 'index'])
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
+    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
     ->name('adminapp.desfile.entry-reservations.index');
-Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
+Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [DesfileEntryReservationController::class, 'downloadPdf'])
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
+    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
     ->name('adminapp.desfile.entry-reservations.pdf');
-Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
+Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [DesfileEntryReservationController::class, 'downloadExcel'])
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
+    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
     ->name('adminapp.desfile.entry-reservations.excel');
-Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
+Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [DesfileEntryReservationController::class, 'downloadTicketPdf'])
     ->whereNumber('reservation')
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
+    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
     ->name('adminapp.desfile.entry-reservations.ticket.pdf');
-Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
+Route::post('v1/adminapp/tenant/desfile/entry-reservations', [DesfileEntryReservationController::class, 'store'])
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
+    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
     ->name('adminapp.desfile.entry-reservations.store');
-Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
+Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [DesfileEntryReservationController::class, 'destroy'])
     ->whereNumber('reservation')
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
+    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
     ->name('adminapp.desfile.entry-reservations.destroy');
 
 Route::prefix('v1/adminapp/tenant/desfile')
-    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.entradas'])
+    ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
     ->group(function (): void {
         Route::get('entries', [EntryController::class, 'show'])
             ->name('adminapp.desfile.entries.show');

app/Domains/Ticketing/Event/Models/Event.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Ticketing\Event\Models;
 
 use App\Domains\Commerce\Catalog\Models\CatalogItem;
-use App\Domains\Core\Address\Models\Address;
 use App\Domains\Core\Client\Models\Client;
 use App\Domains\Core\Tenant\Models\SocialMedia;
 use App\Domains\Core\Tenant\Models\Tenant;
@@ -16,14 +15,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
-#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'address_id', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
+#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
 class Event extends Model
 {
     use HasFactory;
 
     protected function casts(): array
     {
-        return ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
+        return ['client_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
     }
 
     /** @return BelongsTo<Tenant, $this> */
@@ -38,12 +37,6 @@ class Event extends Model
         return $this->belongsTo(Client::class);
     }
 
-    /** @return BelongsTo<Address, $this> */
-    public function address(): BelongsTo
-    {
-        return $this->belongsTo(Address::class);
-    }
-
     public function effectiveClient(): Client
     {
         return $this->client ?? $this->tenant->client;

app/Domains/Ticketing/Event/Resources/EventResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Ticketing\Event\Resources;
 
-use App\Domains\Core\Address\Resources\AddressResource;
 use App\Domains\Ticketing\Event\Models\Event;
 use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
 use Illuminate\Http\Request;
@@ -22,7 +21,6 @@ class EventResource extends JsonResource
             'title' => $this->title,
             'subtitle' => $this->subtitle,
             'description' => $this->description,
-            'address' => AddressResource::make($this->address),
             'location' => $this->location,
             'exact_location' => $this->exact_location,
             'date_text' => $this->date_text,

app/Domains/Ticketing/Event/Resources/PublicEventResource.php

@@ -5,7 +5,6 @@ namespace App\Domains\Ticketing\Event\Resources;
 use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
 use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use App\Domains\Commerce\Catalog\Models\Variant;
-use App\Domains\Core\Address\Resources\AddressResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -20,7 +19,6 @@ class PublicEventResource extends JsonResource
             'title' => $this->title,
             'subtitle' => $this->subtitle,
             'description' => $this->description,
-            'address' => AddressResource::make($this->address),
             'location' => $this->location,
             'exact_location' => $this->exact_location,
             'date_text' => $this->date_text,

app/Domains/Ticketing/Event/Services/EventAddressService.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Domains\Ticketing\Event\Services;
-
-use App\Domains\Core\Address\Models\Address;
-use App\Domains\Ticketing\Event\Models\Event;
-
-class EventAddressService
-{
-    /** Called inside the event update transaction, after validating the legacy location fields. */
-    public function syncLocation(Event $event, bool $coordinatesProvided = false): void
-    {
-        $address = $event->address;
-        $coordinates = $coordinatesProvided || $address === null ? $event->exact_location : $address->coordinates();
-        $values = [
-            'address_text' => $event->location,
-            'latitude' => $coordinates['latitude'] ?? null,
-            'longitude' => $coordinates['longitude'] ?? null,
-        ];
-
-        if ($address !== null && ! (clone $address)->fill($values)->isDirty()) {
-            return;
-        }
-
-        // Editing one event must not change the location of another event or a tenant.
-        if ($address === null || $address->tenants()->exists()
-            || $address->events()->where('events.id', '!=', $event->id)->exists()) {
-            $address = Address::create(['label' => $address?->label ?? 'Ubicación del evento', ...$values]);
-            $event->address()->associate($address);
-            $event->save();
-        } else {
-            $address->update($values);
-        }
-
-        $event->setRelation('address', $address);
-    }
-}

app/Domains/Ticketing/Event/Services/EventService.php

@@ -2,18 +2,18 @@
 
 namespace App\Domains\Ticketing\Event\Services;
 
+use App\Domains\Core\Auth\Models\User;
 use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
 use App\Domains\Commerce\Catalog\Models\Variant;
 use App\Domains\Commerce\Catalog\Services\StockReservationService;
 use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
-use App\Domains\Core\Auth\Models\User;
-use App\Domains\Core\Tenant\Models\Tenant;
 use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
 use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
 use App\Domains\Ticketing\Event\Events\EventDateSuspended;
-use App\Domains\Ticketing\Event\Models\Event;
 use App\Domains\Ticketing\Event\Models\EventDate;
 use App\Domains\Ticketing\Event\Models\EventDateChange;
+use App\Domains\Ticketing\Event\Models\Event;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -32,12 +32,11 @@ class EventService
         private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
         private readonly VariantReplacementService $variantReplacementService,
         private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
-        private readonly EventAddressService $eventAddressService,
     ) {}
 
     public function forTenant(Tenant $tenant): Event
     {
-        return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia', 'address']);
+        return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
     }
 
     /** @param array<string, mixed> $data */
@@ -50,7 +49,6 @@ class EventService
                 'location' => $data['location'],
                 ...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
             ]);
-            $this->eventAddressService->syncLocation($event, array_key_exists('exact_location', $data));
             $tenant->update([
                 ...array_intersect_key($data, array_flip([
                     'allow_ticket_refund',
@@ -66,7 +64,7 @@ class EventService
                 $this->syncLegacyContact($event, $data['contact']);
             }
 
-            return $event->load(['dates.validityTime', 'socialMedia', 'address']);
+            return $event->load(['dates.validityTime', 'socialMedia']);
         });
     }
 

app/Domains/Ticketing/Event/Services/PublicEventService.php

@@ -23,12 +23,11 @@ class PublicEventService
             $query->where(function ($query) use ($term): void {
                 $query->where('title', 'like', '%'.$term.'%')
                     ->orWhere('subtitle', 'like', '%'.$term.'%')
-                    ->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
+                    ->orWhere('location', 'like', '%'.$term.'%');
-                    ->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
             });
         }
 
-        return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
+        return $query->with('attachment')->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
     }
 
     public function find(Tenant $tenant, Event $event): Event
@@ -39,7 +38,6 @@ class PublicEventService
 
         return $event->load([
             'attachment',
-            'address',
             'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
             'socialMedia',
             'catalogItems.attachments',

app/Domains/Ticketing/Event/documentacion/README.md

@@ -13,32 +13,6 @@ mediante `event_id`. El catálogo `social_media` define las plataformas;
 `exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
 y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
 
-`events.address_id` es una referencia opcional a `addresses.id`: `Event::address()`
-obtiene su dirección y `Address::events()` permite reutilizar una dirección en varios
-eventos. Al borrar una dirección, el vínculo queda en `NULL` y se conserva el evento.
-
-La migración `2026_09_30_000200_add_address_id_to_events` agrega el vínculo.
-`2026_09_30_000300_copy_event_locations_to_addresses` copia `location` a
-`address_text` y las coordenadas de `exact_location` a `latitude` y `longitude`, con
-el label `Ubicación del evento`. Solo copia eventos sin `address_id` y con texto de
-ubicación; no modifica los campos ni los timestamps originales, ni vincula la
-dirección al tenant. Si faltan texto y coordenadas, el vínculo queda en `NULL`.
-Los datos inválidos, incluidas coordenadas sin texto de dirección, detienen la
-copia y revierten las inserciones para evitar una migración parcial. Las migraciones
-deben ejecutarse explícitamente por quien administra la base.
-
-Las respuestas públicas, administrativas y el evento del bootstrap incluyen
-`address` con `id`, `label`, `address_text`, `latitude` y `longitude`. Las coordenadas
-se serializan como números o `null`. Los campos anteriores de la respuesta conservan
-sus valores originales; el frontend lee la ubicación y coordenadas desde `address`.
-El guardado administrativo de
-`location` y `exact_location` también actualiza `addresses`; si una dirección está
-compartida con otro evento o con un tenant, se crea una copia para el evento editado.
-El tenant devuelve `addresses` con `is_main` y `main_address`. El storefront usa
-todas las direcciones en contacto, la principal en el footer y la propia del evento
-en sus tarjetas, cabecera y mapa. Solo se agregan al mapa las direcciones con ambas
-coordenadas.
-
 La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
 tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
 `2026_09_18_000600_associate_active_event_social_media` copia al evento activo las

app/Domains/Ticketing/FiestaFutbolInfantil/routes/api.php

@@ -19,48 +19,48 @@ Route::prefix('v1/adminapp/tenant')
                 ->middleware("tenant.menu:{$menuCode}");
         };
 
-        $visibilityRoutes('entries', 'entries', 'onticket.adminapp.fiesta-futbol-infantil.entradas');
+        $visibilityRoutes('entries', 'entries', 'adminapp.fiesta-futbol-infantil.entradas');
-        $visibilityRoutes('foods', 'foods', 'onticket.adminapp.fiesta-futbol-infantil.comida');
+        $visibilityRoutes('foods', 'foods', 'adminapp.fiesta-futbol-infantil.comida');
-        $visibilityRoutes('accommodations', 'accommodations', 'onticket.adminapp.fiesta-futbol-infantil.alojamientos');
+        $visibilityRoutes('accommodations', 'accommodations', 'adminapp.fiesta-futbol-infantil.alojamientos');
-        $visibilityRoutes('merchandise', 'merchandise', 'onticket.adminapp.fiesta-futbol-infantil.merchandising');
+        $visibilityRoutes('merchandise', 'merchandise', 'adminapp.fiesta-futbol-infantil.merchandising');
 
         Route::get('entries', [EntryController::class, 'index'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
             ->name('adminapp.fiesta-futbol-infantil.entries.index');
         Route::post('entries', [EntryController::class, 'store'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
             ->name('adminapp.fiesta-futbol-infantil.entries.store');
         Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
             ->name('adminapp.fiesta-futbol-infantil.entries.destroy');
         Route::get('foods', [FoodController::class, 'index'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
             ->name('adminapp.fiesta-futbol-infantil.foods.index');
         Route::post('foods', [FoodController::class, 'store'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
             ->name('adminapp.fiesta-futbol-infantil.foods.store');
         Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
             ->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
         Route::delete('foods/{food}', [FoodController::class, 'destroy'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
             ->name('adminapp.fiesta-futbol-infantil.foods.destroy');
         Route::get('accommodations', [AccommodationController::class, 'index'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
             ->name('adminapp.fiesta-futbol-infantil.accommodations.index');
         Route::post('accommodations', [AccommodationController::class, 'store'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
             ->name('adminapp.fiesta-futbol-infantil.accommodations.store');
         Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
             ->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
         Route::get('merchandise', [MerchandiseController::class, 'index'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
             ->name('adminapp.fiesta-futbol-infantil.merchandise.index');
         Route::post('merchandise', [MerchandiseController::class, 'store'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
             ->name('adminapp.fiesta-futbol-infantil.merchandise.store');
         Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
-            ->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
+            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
             ->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
     });

app/Domains/Ticketing/Ticket/Controllers/AdminApp/EntryReservationController.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Controllers\AdminApp;
+
+use App\Domains\Ticketing\Ticket\Requests\ExportEntryReservationsRequest;
+use App\Domains\Ticketing\Ticket\Requests\IndexEntryReservationsRequest;
+use App\Domains\Ticketing\Ticket\Requests\StoreEntryReservationsRequest;
+use App\Domains\Ticketing\Ticket\Resources\EntryReservationFormResource;
+use App\Domains\Ticketing\Ticket\Resources\EntryReservationResource;
+use App\Domains\Ticketing\Ticket\Services\EntryReservationExcelService;
+use App\Domains\Ticketing\Ticket\Services\EntryReservationFormService;
+use App\Domains\Ticketing\Ticket\Services\EntryReservationPdfService;
+use App\Domains\Ticketing\Ticket\Services\EntryReservationService;
+use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Illuminate\Http\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class EntryReservationController extends Controller
+{
+    public function form(IndexEntryReservationsRequest $request, EntryReservationFormService $service): EntryReservationFormResource
+    {
+        return new EntryReservationFormResource($service->get(
+            $request->user()->tenant()->firstOrFail(), $request->user()->event_id,
+        ));
+    }
+
+    public function index(IndexEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
+    {
+        return EntryReservationResource::collection(
+            $service->reservations($request->user(), $request->validated()),
+        );
+    }
+
+    public function downloadPdf(
+        ExportEntryReservationsRequest $request,
+        EntryReservationService $service,
+        EntryReservationPdfService $pdf,
+    ): Response {
+        $user = $request->user();
+
+        return $pdf->download(
+            $user->tenant()->firstOrFail(),
+            $service->reservationsForExport($user, $request->validated()),
+            $request->validated('timezone'),
+        );
+    }
+
+    public function downloadExcel(
+        ExportEntryReservationsRequest $request,
+        EntryReservationService $service,
+        EntryReservationExcelService $excel,
+    ): StreamedResponse {
+        $user = $request->user();
+
+        return $excel->download(
+            $user->tenant()->firstOrFail(),
+            $service->reservationsForExport($user, $request->validated()),
+            $request->validated('timezone'),
+        );
+    }
+
+    public function downloadTicketPdf(
+        IndexEntryReservationsRequest $request,
+        int $reservation,
+        EntryReservationService $service,
+        TicketPdfService $pdf,
+    ): Response {
+        $user = $request->user();
+
+        return $pdf->download(
+            $user->tenant()->firstOrFail(),
+            collect([$service->reservationTicket($user, $reservation)]),
+        );
+    }
+
+    public function store(StoreEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
+    {
+        return EntryReservationResource::collection($service->reserve(
+            $request->user(), $request->validated('idempotency_key'), $request->validated('rows'),
+        ));
+    }
+
+    public function destroy(
+        IndexEntryReservationsRequest $request,
+        int $reservation,
+        EntryReservationService $service,
+    ): Response {
+        $service->cancel($request->user(), $reservation);
+
+        return response()->noContent();
+    }
+}

app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php

@@ -29,7 +29,7 @@ class TicketController extends Controller
         $tenant = $request->user()->tenant()->firstOrFail();
 
         return new AdminAppTicketCollection(
-            $this->ticketService->search($tenant, $request->validated())
+            $this->ticketService->search($tenant, $request->validated(), $request->user()->event_id)
         );
     }
 
@@ -37,7 +37,7 @@ class TicketController extends Controller
     {
         $tenant = $request->user()->tenant()->firstOrFail();
 
-        return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket));
+        return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket, $request->user()->event_id));
     }
 
     public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
@@ -45,7 +45,7 @@ class TicketController extends Controller
         $tenant = $request->user()->tenant()->firstOrFail();
 
         return new AdminAppTicketRefundCalculationResource(
-            $this->ticketService->calculateRefund($tenant, $ticket)
+            $this->ticketService->calculateRefund($tenant, $ticket, $request->user()->event_id)
         );
     }
 
@@ -69,7 +69,7 @@ class TicketController extends Controller
 
         return $this->ticketPdfService->download(
             $tenant,
-            $this->ticketService->ticketsForExport($tenant, $request->validated()),
+            $this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
             $request->validated('timezone'),
         );
     }
@@ -80,7 +80,7 @@ class TicketController extends Controller
 
         return $this->ticketExcelService->download(
             $tenant,
-            $this->ticketService->ticketsForExport($tenant, $request->validated()),
+            $this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
             $request->validated('timezone'),
         );
     }

app/Domains/Ticketing/Ticket/Enums/EntryReservationPaymentType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticketing\Desfile\Enums;
+namespace App\Domains\Ticketing\Ticket\Enums;
 
 enum EntryReservationPaymentType: string
 {

app/Domains/Ticketing/Ticket/Models/EntryReservation.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Models;
+
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Validation\ValidationException;
+
+#[Fillable([
+    'catalog_item_id',
+    'variant_id',
+    'ticket_id',
+    'inventory_id',
+    'batch_id',
+    'fecha_reserva',
+    'importe',
+    'tipo_pago',
+])]
+class EntryReservation extends Model
+{
+    use SoftDeletes;
+
+    protected $table = 'entry_reservations';
+
+    protected function casts(): array
+    {
+        return [
+            'catalog_item_id' => 'integer',
+            'variant_id' => 'integer',
+            'fecha_reserva' => 'datetime',
+            'importe' => 'decimal:2',
+            'tipo_pago' => EntryReservationPaymentType::class,
+        ];
+    }
+
+    protected static function booted(): void
+    {
+        static::saving(function (self $reservation): void {
+            if ($reservation->variant_id === null) {
+                return;
+            }
+
+            $variant = Variant::withTrashed()->findOrFail($reservation->variant_id);
+            // Existing variant-based callers can keep creating reservations as before.
+            $reservation->catalog_item_id ??= $variant->catalog_item_id;
+            if ($reservation->catalog_item_id !== $variant->catalog_item_id) {
+                throw ValidationException::withMessages([
+                    'variant_id' => 'La variante no pertenece al ítem del catálogo seleccionado.',
+                ]);
+            }
+        });
+    }
+
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function catalogItem(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class)->withTrashed();
+    }
+
+    /** @return BelongsTo<ReservationBatch, $this> */
+    public function batch(): BelongsTo
+    {
+        return $this->belongsTo(ReservationBatch::class, 'batch_id');
+    }
+
+    /** @return BelongsTo<Variant, $this> */
+    public function variant(): BelongsTo
+    {
+        return $this->belongsTo(Variant::class)->withTrashed();
+    }
+
+    public function ticket(): BelongsTo
+    {
+        return $this->belongsTo(Ticket::class);
+    }
+
+    public function inventory(): BelongsTo
+    {
+        return $this->belongsTo(Inventory::class);
+    }
+}

app/Domains/Ticketing/Ticket/Models/ReservationBatch.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Models;
+
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable(['user_id', 'tenant_code', 'idempotency_key', 'request_hash'])]
+class ReservationBatch extends Model
+{
+    protected function casts(): array
+    {
+        return ['user_id' => 'integer'];
+    }
+
+    /** @return BelongsTo<User, $this> */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class)->withTrashed();
+    }
+
+    /** @return BelongsTo<Tenant, $this> */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
+    }
+
+    /** @return HasMany<EntryReservation, $this> */
+    public function reservations(): HasMany
+    {
+        return $this->hasMany(EntryReservation::class, 'batch_id');
+    }
+}

app/Domains/Ticketing/Ticket/Models/Ticket.php

@@ -7,7 +7,6 @@ use App\Domains\Commerce\Catalog\Models\Variant;
 use App\Domains\Commerce\Purchase\Models\PurchaseItem;
 use App\Domains\Core\Auth\Models\User;
 use App\Domains\Core\Tenant\Models\Tenant;
-use App\Domains\Ticketing\Desfile\Models\EntryReservation;
 use App\Domains\Ticketing\Event\Models\Event;
 use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity;
 use App\Domains\Ticketing\Ticket\Services\ResolvedValidityGroup;

app/Domains/Ticketing/Ticket/Requests/ExportEntryReservationsRequest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Requests;
+
+use App\Shared\Rules\ValidTimezone;
+
+class ExportEntryReservationsRequest extends IndexEntryReservationsRequest
+{
+    public function rules(): array
+    {
+        return [...parent::rules(), 'timezone' => ['required', 'string', new ValidTimezone]];
+    }
+}

app/Domains/Ticketing/Ticket/Requests/IndexEntryReservationsRequest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Requests;
+
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class IndexEntryReservationsRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return $this->user()?->tenant_codigo === 'onticket';
+    }
+
+    public function rules(): array
+    {
+        return [
+            'catalog_item_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
+            'variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
+            'tipo_pago' => ['sometimes', 'nullable', Rule::enum(EntryReservationPaymentType::class)],
+            'page' => ['sometimes', 'integer', 'min:1'],
+            'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'],
+        ];
+    }
+}

app/Domains/Ticketing/Ticket/Requests/StoreEntryReservationsRequest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Requests;
+
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
+use Illuminate\Validation\Rule;
+
+class StoreEntryReservationsRequest extends IndexEntryReservationsRequest
+{
+    public function rules(): array
+    {
+        return [
+            'idempotency_key' => ['required', 'uuid'],
+            'rows' => ['required', 'array', 'list', 'min:1', 'max:100'],
+            'rows.*' => ['required', 'array:catalog_item_id,variant_id,tipo_pago'],
+            'rows.*.catalog_item_id' => ['required', 'integer', 'min:1'],
+            'rows.*.variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
+            'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)],
+        ];
+    }
+}

app/Domains/Ticketing/Ticket/Resources/EntryReservationFormResource.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class EntryReservationFormResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return $this->resource;
+    }
+}

app/Domains/Ticketing/Ticket/Resources/EntryReservationResource.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class EntryReservationResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'catalog_item_id' => $this->catalog_item_id,
+            'variant_id' => $this->variant_id,
+            'catalog_item' => ['id' => $this->catalog_item_id, 'name' => $this->catalogItem?->nombre],
+            'variant' => $this->variant === null ? null : [
+                'id' => $this->variant_id,
+                'label' => $this->variant->getSelectionLabel(),
+            ],
+            'ticket_id' => $this->ticket_id,
+            'fecha_reserva' => $this->fecha_reserva->toIso8601String(),
+            'tipo_pago' => $this->tipo_pago->value,
+            'tipo_pago_label' => $this->tipo_pago->label(),
+            'importe' => $this->importe,
+        ];
+    }
+}

app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php

@@ -41,9 +41,9 @@ class AdminAppTicketService
     /**
      * @param  array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null}  $filters
      */
-    public function search(Tenant $tenant, array $filters = []): AdminAppTicketResult
+    public function search(Tenant $tenant, array $filters = [], ?int $eventId = null): AdminAppTicketResult
     {
-        $query = $this->baseQuery($tenant, $filters);
+        $query = $this->baseQuery($tenant, $filters, $eventId);
         $countQuery = clone $query;
 
         $databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
@@ -77,7 +77,7 @@ class AdminAppTicketService
             tickets: $tickets,
             scannedTickets: $scannedTickets,
             totalTickets: $totalTickets,
-            refundedTotal: $this->refundSummaryService->totalForTenant($tenant),
+            refundedTotal: $this->refundSummaryService->totalForTenant($tenant, $eventId),
         );
     }
 
@@ -85,9 +85,9 @@ class AdminAppTicketService
      * @param  array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null}  $filters
      * @return Collection<int, Ticket>
      */
-    public function ticketsForExport(Tenant $tenant, array $filters = []): Collection
+    public function ticketsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
     {
-        $query = $this->baseQuery($tenant, $filters);
+        $query = $this->baseQuery($tenant, $filters, $eventId);
         $databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
         $tickets = $query
             ->with(self::RELATIONS)
@@ -97,11 +97,10 @@ class AdminAppTicketService
         return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
     }
 
-    public function cancel(Tenant $tenant, int $ticketId): Ticket
+    public function cancel(Tenant $tenant, int $ticketId, ?int $eventId = null): Ticket
     {
-        return DB::transaction(function () use ($tenant, $ticketId): Ticket {
+        return DB::transaction(function () use ($tenant, $ticketId, $eventId): Ticket {
-            $ticket = Ticket::query()
+            $ticket = $this->ticketsQuery($tenant, $eventId)
-                ->where('tenant_code', $tenant->codigo)
                 ->lockForUpdate()
                 ->findOrFail($ticketId);
 
@@ -124,10 +123,9 @@ class AdminAppTicketService
      *     partial: string|null,
      * }
      */
-    public function calculateRefund(Tenant $tenant, int $ticketId): array
+    public function calculateRefund(Tenant $tenant, int $ticketId, ?int $eventId = null): array
     {
-        $ticket = Ticket::query()
+        $ticket = $this->ticketsQuery($tenant, $eventId)
-            ->where('tenant_code', $tenant->codigo)
             ->findOrFail($ticketId);
 
         if (! $ticket->can_refund()) {
@@ -175,14 +173,13 @@ class AdminAppTicketService
         string $refundType,
         ?User $createdBy = null,
     ): Ticket {
-        $this->ensureRefundIsAllowed($tenant, $refundType);
-
         return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
-            $ticket = Ticket::query()
+            $ticket = $this->ticketsQuery($tenant, $createdBy?->event_id)
-                ->where('tenant_code', $tenant->codigo)
                 ->lockForUpdate()
                 ->findOrFail($ticketId);
 
+            $this->ensureRefundIsAllowed($tenant, $refundType);
+
             if (! $ticket->can_refund()) {
                 if ($ticket->status !== Ticket::STATUS_ACTIVE) {
                     throw ValidationException::withMessages([
@@ -310,12 +307,11 @@ class AdminAppTicketService
      * @param  array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int}  $filters
      * @return Builder<Ticket>
      */
-    private function baseQuery(Tenant $tenant, array $filters): Builder
+    private function baseQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
     {
         $search = trim((string) ($filters['q'] ?? ''));
 
-        $query = Ticket::query()
+        $query = $this->ticketsQuery($tenant, $eventId)
-            ->where('tenant_code', $tenant->codigo)
             ->when($search !== '', function (Builder $query) use ($search): void {
                 $this->applySearchFilter($query, $search);
             })
@@ -355,6 +351,14 @@ class AdminAppTicketService
         return $query;
     }
 
+    /** @return Builder<Ticket> */
+    private function ticketsQuery(Tenant $tenant, ?int $eventId): Builder
+    {
+        return Ticket::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->when($eventId !== null, fn (Builder $query): Builder => $query->where('tickets.event_id', $eventId));
+    }
+
     /** @param Builder<Ticket> $query */
     private function applySearchFilter(Builder $query, string $search): void
     {

app/Domains/Ticketing/Ticket/Services/EntryReservationExcelService.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Services;
+
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
+use Illuminate\Support\Collection;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class EntryReservationExcelService
+{
+    public function __construct(private readonly EntryReservationReportService $report) {}
+
+    /** @param Collection<int, EntryReservation> $reservations */
+    public function download(Tenant $tenant, Collection $reservations, string $timeZone): StreamedResponse
+    {
+        $generatedAt = now();
+        $rows = $this->report->rows($reservations);
+        $spreadsheet = new Spreadsheet;
+        $spreadsheet->getProperties()
+            ->setCreator('Shopit')
+            ->setTitle('Reservas de tickets')
+            ->setSubject($tenant->nombre);
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('Reservas');
+        $sheet->fromArray([
+            'Ítem',
+            'Variante',
+            'ID',
+            'Fecha',
+            'Importe',
+            'Pago',
+        ], null, 'A1');
+
+        foreach ($rows as $index => $reservation) {
+            $row = $index + 2;
+            foreach (['A' => 'item', 'B' => 'variant'] as $column => $key) {
+                $sheet->setCellValueExplicit("{$column}{$row}", $reservation[$key], DataType::TYPE_STRING);
+            }
+            $sheet->setCellValueExplicit(
+                "C{$row}",
+                $reservation['ticket_id'] === null ? '-' : (string) $reservation['ticket_id'],
+                DataType::TYPE_STRING,
+            );
+            $sheet->setCellValue(
+                "D{$row}",
+                Date::dateTimeToExcel($reservation['fecha_reserva']->copy()->timezone($timeZone)),
+            );
+            if ($reservation['importe'] !== null) {
+                $sheet->setCellValue("E{$row}", (float) $reservation['importe']);
+            }
+            $sheet->setCellValueExplicit("F{$row}", $reservation['pago'], DataType::TYPE_STRING);
+        }
+
+        $lastRow = max(2, $rows->count() + 1);
+        $sheet->getStyle("D2:D{$lastRow}")->getNumberFormat()->setFormatCode('dd/mm/yyyy hh:mm');
+        $sheet->getStyle("E2:E{$lastRow}")->getNumberFormat()->setFormatCode('$ #,##0.00');
+        $sheet->getStyle('A1:F1')->applyFromArray([
+            'font' => ['bold' => true, 'color' => ['rgb' => 'FFFFFF']],
+            'fill' => [
+                'fillType' => Fill::FILL_SOLID,
+                'startColor' => ['rgb' => '26382E'],
+            ],
+            'alignment' => ['vertical' => Alignment::VERTICAL_CENTER],
+        ]);
+        $sheet->getRowDimension(1)->setRowHeight(24);
+        $sheet->freezePane('A2');
+        $sheet->setAutoFilter("A1:F{$lastRow}");
+        foreach (['A' => 30, 'B' => 60, 'C' => 16, 'D' => 20, 'E' => 16, 'F' => 18] as $column => $width) {
+            $sheet->getColumnDimension($column)->setWidth($width);
+        }
+
+        $filename = 'reservas_tickets_'.$tenant->codigo.'_'
+            .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.xlsx';
+
+        return response()->streamDownload(function () use ($spreadsheet): void {
+            (new Xlsx($spreadsheet))->save('php://output');
+            $spreadsheet->disconnectWorksheets();
+        }, $filename, [
+            'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        ]);
+    }
+}

app/Domains/Ticketing/Ticket/Services/EntryReservationFormService.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Services;
+
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
+use Illuminate\Database\Eloquent\Builder;
+
+class EntryReservationFormService
+{
+    public function get(Tenant $tenant, ?int $eventId = null): array
+    {
+        $items = CatalogItem::query()->where('tenant_code', $tenant->codigo)->where('has_tickets', true)
+            ->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
+            ->with([
+                'inventory', 'itemAttributes.attribute.options',
+                'variants' => fn ($query) => $query->orderBy('id'),
+                'variants.inventory', 'variants.definitions.itemAttribute.attribute.options',
+                'variants.eventDates', 'variants.eventDate',
+            ])->orderBy('nombre')->orderBy('id')->get();
+
+        $filterItems = $items->map(fn (CatalogItem $item): array => [
+            'id' => $item->id, 'name' => $item->nombre,
+            'variants' => $item->variants->map(function (Variant $variant) use ($item): array {
+                $variant->setRelation('catalogItem', $item);
+
+                return ['id' => $variant->id, 'label' => $variant->getSelectionLabel()];
+            })->values()->all(),
+        ])->values()->all();
+
+        $reservationEventId = $eventId ?? $tenant->active_event_id;
+        $available = $items->filter(fn (CatalogItem $item): bool => ! $item->isBundle()
+            && $item->isSaleOpen()
+            && ($reservationEventId === null || $item->event_id === $reservationEventId))
+            ->map(function (CatalogItem $item): ?array {
+                $tracked = $item->inventory_policy !== InventoryPolicy::Unlimited;
+                $requiresVariant = $item->variants->isNotEmpty();
+                $variants = $item->variants->filter(function (Variant $variant) use ($item, $tracked): bool {
+                    $variant->setRelation('catalogItem', $item);
+
+                    return $variant->isSellable()
+                        && (! $tracked || ($variant->inventory?->availableStock() ?? 0) > 0);
+                })->map(fn (Variant $variant): array => [
+                    'id' => $variant->id, 'label' => $variant->getSelectionLabel(),
+                    'price' => $variant->getPrice(),
+                    'available_stock' => $tracked ? $variant->inventory->availableStock() : null,
+                ])->values()->all();
+                if (($requiresVariant && $variants === [])
+                    || (! $requiresVariant && $tracked && ($item->inventory?->availableStock() ?? 0) <= 0)) {
+                    return null;
+                }
+
+                return [
+                    'id' => $item->id, 'name' => $item->nombre, 'price' => $item->getPrice(),
+                    'requires_variant' => $requiresVariant, 'variants' => $variants,
+                    'available_stock' => $tracked ? $item->inventory?->availableStock() : null,
+                ];
+            })->filter()->values()->all();
+
+        return ['payment_types' => EntryReservationPaymentType::options(), 'items' => $available, 'filter_items' => $filterItems];
+    }
+}

app/Domains/Ticketing/Ticket/Services/EntryReservationPdfService.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Services;
+
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Barryvdh\DomPDF\PDF as DomPdf;
+use Illuminate\Http\Response;
+use Illuminate\Support\Collection;
+
+class EntryReservationPdfService
+{
+    public function __construct(private readonly EntryReservationReportService $report) {}
+
+    /** @param Collection<int, EntryReservation> $reservations */
+    public function download(Tenant $tenant, Collection $reservations, string $timeZone): Response
+    {
+        $generatedAt = now();
+        $rows = $this->report->rows($reservations);
+        $pdf = Pdf::loadView('pdf.adminapp.entry-reservations', [
+            'tenant' => $tenant,
+            'reservations' => $rows,
+            'generatedAt' => $generatedAt,
+            'timeZone' => $timeZone,
+        ])->setPaper('a4', 'landscape');
+
+        $this->addPageNumbers($pdf);
+
+        return $pdf->download(
+            'reservas_tickets_'.$tenant->codigo.'_'
+            .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.pdf'
+        );
+    }
+
+    private function addPageNumbers(DomPdf $pdf): void
+    {
+        $pdf->render();
+        $domPdf = $pdf->getDomPDF();
+        $font = $domPdf->getFontMetrics()->getFont('DejaVu Sans');
+
+        $domPdf->getCanvas()->page_text(
+            385,
+            575,
+            'Página {PAGE_NUM} de {PAGE_COUNT}',
+            $font,
+            7,
+            [0.48, 0.52, 0.49],
+        );
+    }
+}

app/Domains/Ticketing/Ticket/Services/EntryReservationPolicy.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Services;
+
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use Illuminate\Validation\ValidationException;
+
+interface EntryReservationPolicy
+{
+    /**
+     * Validate additional rules after selections are resolved and locked, before
+     * stock or tickets change. Idempotent replays do not run this validation.
+     *
+     * @param  array<int, array{item: CatalogItem, variant: Variant|null, inventory: Inventory|null}>  $selections
+     *
+     * @throws ValidationException
+     */
+    public function validate(array $selections): void;
+}

app/Domains/Ticketing/Ticket/Services/EntryReservationReportService.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Services;
+
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
+use Illuminate\Support\Collection;
+
+class EntryReservationReportService
+{
+    public function rows(Collection $reservations): Collection
+    {
+        return $reservations->values()->map(fn (EntryReservation $reservation): array => [
+            'item' => $reservation->catalogItem?->nombre ?? '-',
+            'variant' => $reservation->variant?->getSelectionLabel() ?? 'Sin variante',
+            'ticket_id' => $reservation->ticket_id,
+            'fecha_reserva' => $reservation->fecha_reserva,
+            'importe' => $reservation->importe,
+            'pago' => $reservation->tipo_pago->label(),
+        ]);
+    }
+}

app/Domains/Ticketing/Ticket/Services/EntryReservationService.php

@@ -0,0 +1,313 @@
+<?php
+
+namespace App\Domains\Ticketing\Ticket\Services;
+
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
+use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
+use App\Domains\Ticketing\Ticket\Models\EntryReservation;
+use App\Domains\Ticketing\Ticket\Models\ReservationBatch;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
+
+/** Application workflow for one ticket per selected catalog item / variant. */
+class EntryReservationService
+{
+    private const SELECTION_RELATIONS = [
+        'catalogItem',
+        'variant.catalogItem.itemAttributes.attribute.options',
+        'variant.definitions.itemAttribute.attribute.options',
+        'variant.eventDates',
+        'variant.eventDate',
+    ];
+
+    public function __construct(private readonly TicketGeneratorService $tickets) {}
+
+    /**
+     * @param  array{catalog_item_id?: int, variant_id?: int, tipo_pago?: string|null, page?: int, per_page?: int}  $filters
+     * @return LengthAwarePaginator<EntryReservation>
+     */
+    public function reservations(User $user, array $filters = []): LengthAwarePaginator
+    {
+        return $this->reservationsQuery($user, $filters)
+            ->paginate(perPage: $filters['per_page'] ?? 15, page: $filters['page'] ?? 1)
+            ->withQueryString();
+    }
+
+    /**
+     * @param  array{catalog_item_id?: int, variant_id?: int, tipo_pago?: string|null}  $filters
+     * @return Collection<int, EntryReservation>
+     */
+    public function reservationsForExport(User $user, array $filters = []): Collection
+    {
+        return $this->reservationsQuery($user, $filters)->get();
+    }
+
+    public function reservationTicket(User $user, int $reservationId, ?int $catalogItemId = null): Ticket
+    {
+        $reservation = $this->reservationsQuery($user, ['catalog_item_id' => $catalogItemId])
+            ->whereKey($reservationId)->whereNotNull('ticket_id')
+            ->with(['ticket' => fn ($query) => $query->with([
+                ...TicketValidityResolver::RELATIONS,
+                ...TicketPresentationResolver::RELATIONS,
+            ])])->firstOrFail();
+
+        return $reservation->ticket;
+    }
+
+    public function cancel(User $user, int $reservationId, ?int $catalogItemId = null): void
+    {
+        DB::transaction(function () use ($user, $reservationId, $catalogItemId): void {
+            $reservation = $this->reservationsQuery($user, ['catalog_item_id' => $catalogItemId])
+                ->whereKey($reservationId)->lockForUpdate()->firstOrFail();
+
+            if ($reservation->ticket_id !== null) {
+                $ticket = Ticket::query()->whereKey($reservation->ticket_id)->lockForUpdate()->firstOrFail();
+                if (! $ticket->can_cancel()) {
+                    throw ValidationException::withMessages([
+                        'status' => 'El ticket debe estar activo para poder cancelar la reserva.',
+                    ]);
+                }
+                $ticket->markAsCancelled();
+                $ticket->save();
+            }
+
+            if ($reservation->inventory_id !== null) {
+                $inventory = Inventory::query()->whereKey($reservation->inventory_id)->lockForUpdate()->firstOrFail();
+                $inventory->releaseEntry(1);
+            }
+            $reservation->delete();
+        }, 3);
+    }
+
+    /**
+     * Each row reserves one unit. Prices and inventory are resolved on the server.
+     *
+     * @param  list<array{catalog_item_id: int, variant_id?: int|null, tipo_pago: string}>  $rows
+     * @return Collection<int, EntryReservation>
+     */
+    public function reserve(User $user, string $key, array $rows, ?EntryReservationPolicy $policy = null): Collection
+    {
+        $validated = Validator::make(['idempotency_key' => $key, 'rows' => $rows], [
+            'idempotency_key' => ['required', 'uuid'],
+            'rows' => ['required', 'array', 'list', 'min:1', 'max:100'],
+            'rows.*' => ['required', 'array:catalog_item_id,variant_id,tipo_pago'],
+            'rows.*.catalog_item_id' => ['required', 'integer', 'min:1'],
+            'rows.*.variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
+            'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)],
+        ])->validate();
+        $rows = array_map(fn (array $row): array => [
+            'catalog_item_id' => (int) $row['catalog_item_id'],
+            'variant_id' => isset($row['variant_id']) ? (int) $row['variant_id'] : null,
+            'tipo_pago' => $row['tipo_pago'],
+        ], $validated['rows']);
+        $hash = $this->requestHash($rows);
+
+        return DB::transaction(function () use ($user, $key, $rows, $hash, $policy): Collection {
+            User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail();
+            $tenant = $user->tenant()->firstOrFail();
+            $batch = ReservationBatch::query()->where('user_id', $user->id)
+                ->where('idempotency_key', $key)->lockForUpdate()->first();
+            if ($batch !== null) {
+                abort_unless($batch->tenant_code === $tenant->codigo && $this->matchesBatch($batch, $rows, $hash),
+                    409, 'La clave de envío ya fue utilizada con otra selección.');
+
+                // A scope change must not expose any part of a previously submitted batch.
+                if ($user->event_id !== null) {
+                    abort_if($batch->reservations()->withTrashed()
+                        ->whereDoesntHave('catalogItem', fn (Builder $query) => $query
+                            ->where('tenant_code', $user->tenant_codigo)
+                            ->where('event_id', $user->event_id))
+                        ->exists(), 403);
+                }
+
+                return $batch->reservations()->with([...self::SELECTION_RELATIONS, 'ticket'])->orderBy('id')->get();
+            }
+
+            $eventId = $user->event_id ?? $tenant->active_event_id;
+            $items = CatalogItem::query()->where('tenant_code', $tenant->codigo)
+                ->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
+                ->whereKey(array_column($rows, 'catalog_item_id'))->orderBy('id')->lockForUpdate()->get()->keyBy('id');
+            $variants = Variant::query()->whereIn('catalog_item_id', $items->keys())
+                ->whereKey(array_filter(array_column($rows, 'variant_id')))
+                ->orderBy('id')->lockForUpdate()->get()->keyBy('id');
+            $variants->load(['eventDates', 'eventDate']);
+            $inventoryIds = $items->pluck('inventory_id')->merge($variants->pluck('inventory_id'))->filter()->unique();
+            $inventories = Inventory::query()->whereKey($inventoryIds)->orderBy('id')->lockForUpdate()->get()->keyBy('id');
+            $selections = [];
+            $requirements = [];
+            $errors = [];
+
+            foreach ($rows as $index => $row) {
+                $item = $items->get($row['catalog_item_id']);
+                $variant = $row['variant_id'] !== null ? $variants->get($row['variant_id']) : null;
+                $field = $this->selectionField($row, $index);
+                if ($item === null || ! $item->has_tickets || ! $item->isSaleOpen()) {
+                    $errors[$field] = 'El ítem no está disponible para reservar tickets en este catálogo.';
+
+                    continue;
+                }
+                if ($item->isBundle()) {
+                    $errors[$field] = 'Seleccioná el ítem que emite el ticket; los paquetes requieren reservar sus componentes.';
+
+                    continue;
+                }
+                if ($row['variant_id'] !== null) {
+                    if ($variant === null || $variant->catalog_item_id !== $item->id) {
+                        $errors[$field] = 'La variante no pertenece al ítem del catálogo seleccionado.';
+
+                        continue;
+                    }
+                    $variant->setRelation('catalogItem', $item);
+                    if (! $variant->isSellable()) {
+                        $errors[$field] = 'La variante ya no está disponible.';
+
+                        continue;
+                    }
+                } elseif ($item->variants()->exists()) {
+                    $errors["rows.{$index}.variant_id"] = 'Seleccioná una variante del ítem del catálogo.';
+
+                    continue;
+                }
+
+                $selection = $variant ?? $item;
+                $inventory = $inventories->get($selection->inventory_id);
+                $tracked = $item->inventory_policy !== InventoryPolicy::Unlimited;
+                if ($inventory === null && ($selection->inventory_id !== null || $tracked)) {
+                    $errors[$field] = 'La selección no tiene un inventario disponible.';
+
+                    continue;
+                }
+                $selection->setRelation('inventory', $inventory);
+                $selections[$index] = ['item' => $item, 'variant' => $variant, 'inventory' => $inventory];
+                if ($inventory !== null) {
+                    $requirement = $requirements[$inventory->id] ?? ['quantity' => 0, 'tracked' => false];
+                    $requirements[$inventory->id] = [
+                        'quantity' => $requirement['quantity'] + 1,
+                        'tracked' => $requirement['tracked'] || $tracked,
+                    ];
+                }
+            }
+            if ($errors !== []) {
+                throw ValidationException::withMessages($errors);
+            }
+
+            $policy?->validate($selections);
+
+            foreach ($requirements as $inventoryId => $requirement) {
+                if ($requirement['tracked'] && $inventories[$inventoryId]->availableStock() < $requirement['quantity']) {
+                    foreach ($selections as $index => $selection) {
+                        if ($selection['inventory']?->id === $inventoryId) {
+                            $errors[$this->selectionField($rows[$index], $index)] = 'No hay stock suficiente para reservar la selección.';
+                        }
+                    }
+                }
+            }
+            if ($errors !== []) {
+                throw ValidationException::withMessages($errors);
+            }
+
+            $batch = ReservationBatch::query()->create([
+                'user_id' => $user->id, 'tenant_code' => $tenant->codigo,
+                'idempotency_key' => $key, 'request_hash' => $hash,
+            ]);
+            foreach ($requirements as $inventoryId => $requirement) {
+                $inventories[$inventoryId]->reserveEntry($requirement['quantity'], $requirement['tracked']);
+            }
+
+            $reservations = new Collection;
+            foreach ($selections as $index => $selection) {
+                $item = $selection['item'];
+                $variant = $selection['variant'];
+                try {
+                    $ticket = $this->tickets->generate($item, $user, 1, $variant?->id)->sole();
+                } catch (TicketGenerationException $exception) {
+                    throw ValidationException::withMessages([
+                        $this->selectionField($rows[$index], $index) => 'No se pudo emitir el ticket. '.$exception->getMessage(),
+                    ]);
+                }
+                $payment = EntryReservationPaymentType::from($rows[$index]['tipo_pago']);
+                $reservation = EntryReservation::query()->create([
+                    'batch_id' => $batch->id, 'ticket_id' => $ticket->id,
+                    'catalog_item_id' => $variant?->catalog_item_id ?? $item->id,
+                    'variant_id' => $variant?->id, 'inventory_id' => $selection['inventory']?->id,
+                    'fecha_reserva' => now(), 'tipo_pago' => $payment,
+                    'importe' => $payment === EntryReservationPaymentType::Free ? 0 : ($variant ?? $item)->getPrice(),
+                ]);
+                $reservations->push($reservation->setRelation('ticket', $ticket)
+                    ->setRelation('catalogItem', $item)->setRelation('variant', $variant));
+            }
+
+            return $reservations->loadMissing(self::SELECTION_RELATIONS);
+        }, 3);
+    }
+
+    /** @param array<string, mixed> $filters */
+    private function reservationsQuery(User $user, array $filters = []): Builder
+    {
+        abort_unless($user->tenant_codigo !== null && $user->tenant_codigo !== '', 403);
+
+        return EntryReservation::query()
+            ->whereHas('catalogItem', fn (Builder $query) => $query->where('tenant_code', $user->tenant_codigo)
+                ->when($user->event_id !== null, fn (Builder $query) => $query->where('event_id', $user->event_id)))
+            ->when($filters['catalog_item_id'] ?? null, fn (Builder $query, int $id) => $query->where('catalog_item_id', $id))
+            ->when($filters['variant_id'] ?? null, fn (Builder $query, int $id) => $query->where('variant_id', $id))
+            ->when($filters['tipo_pago'] ?? null, fn (Builder $query, string $type) => $query->where('tipo_pago', $type))
+            ->with(self::SELECTION_RELATIONS)
+            ->orderByDesc('fecha_reserva')->orderByDesc('id');
+    }
+
+    /** @param array{variant_id: int|null} $row */
+    private function selectionField(array $row, int $index): string
+    {
+        return "rows.{$index}.".($row['variant_id'] !== null ? 'variant_id' : 'catalog_item_id');
+    }
+
+    /** @param list<array{catalog_item_id: int, variant_id: int|null, tipo_pago: string}> $rows */
+    private function requestHash(array $rows): string
+    {
+        $normalized = collect($rows)->sortBy([
+            ['catalog_item_id', 'asc'], ['variant_id', 'asc'], ['tipo_pago', 'asc'],
+        ])->values()->all();
+
+        return hash('sha256', json_encode($normalized, JSON_THROW_ON_ERROR));
+    }
+
+    /** @param list<array{catalog_item_id: int, variant_id: int|null, tipo_pago: string}> $rows */
+    private function matchesBatch(ReservationBatch $batch, array $rows, string $hash): bool
+    {
+        if (hash_equals($batch->request_hash, $hash)) {
+            return true;
+        }
+        if (collect($rows)->contains(fn (array $row) => $row['variant_id'] === null)) {
+            return false;
+        }
+
+        // Older batches fingerprinted variant and payment only. Check the persisted
+        // catalog IDs too, so compatibility cannot replay a different catalog item.
+        $legacyRows = collect($rows)->map(fn (array $row) => [
+            'variant_id' => $row['variant_id'], 'tipo_pago' => $row['tipo_pago'],
+        ])->sortBy('variant_id')->values()->all();
+        $legacyHash = hash('sha256', json_encode($legacyRows, JSON_THROW_ON_ERROR));
+        if (! hash_equals($batch->request_hash, $legacyHash)) {
+            return false;
+        }
+        $storedRows = $batch->reservations()->withTrashed()->get()->map(fn (EntryReservation $reservation) => [
+            'catalog_item_id' => $reservation->catalog_item_id,
+            'variant_id' => $reservation->variant_id,
+            'tipo_pago' => $reservation->tipo_pago->value,
+        ])->all();
+
+        return hash_equals($this->requestHash($storedRows), $hash);
+    }
+}

app/Domains/Ticketing/Ticket/documentacion/README.md

@@ -82,13 +82,17 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`:
 - `POST /tickets/pdf`.
 
 Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
-`onticket.adminapp.tickets`:
+`adminapp.tickets`:
 
 - `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
   `scanned_tickets` y `total_tickets` para el tenant autenticado.
 
 `TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
 
+Si el administrador autenticado tiene `event_id`, las consultas de Tickets y sus exportaciones se limitan a `tickets.event_id` dentro del tenant. Los contadores usan el mismo alcance y el total reembolsado se limita a las compras del evento. Sin `event_id`, se conserva el alcance por tenant.
+
+La cancelación, el cálculo de reembolso y el reembolso buscan el ticket dentro de ese alcance antes de validar o ejecutar la operación. Un ticket de otro evento o sin evento devuelve 404 para un administrador con evento asignado. El alcance se obtiene del usuario autenticado, no de los parámetros del cliente.
+
 ## Dependencias y reglas
 
 Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.

app/Domains/Ticketing/Ticket/routes/adminapp.php

@@ -1,30 +1,43 @@
 <?php
 
+use App\Domains\Ticketing\Ticket\Controllers\AdminApp\EntryReservationController;
 use App\Domains\Ticketing\Ticket\Controllers\AdminApp\TicketController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
     ->middleware(['auth:sanctum', 'adminapp.tenant'])
     ->group(function (): void {
+        Route::prefix('entry-reservations')->middleware('tenant.menu:adminapp.ticket-reservations')
+            ->group(function (): void {
+                Route::get('form', [EntryReservationController::class, 'form'])->name('adminapp.entry-reservations.form');
+                Route::get('/', [EntryReservationController::class, 'index'])->name('adminapp.entry-reservations.index');
+                Route::post('/', [EntryReservationController::class, 'store'])->name('adminapp.entry-reservations.store');
+                Route::get('pdf', [EntryReservationController::class, 'downloadPdf'])->name('adminapp.entry-reservations.pdf');
+                Route::get('excel', [EntryReservationController::class, 'downloadExcel'])->name('adminapp.entry-reservations.excel');
+                Route::get('{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
+                    ->whereNumber('reservation')->name('adminapp.entry-reservations.ticket.pdf');
+                Route::delete('{reservation}', [EntryReservationController::class, 'destroy'])
+                    ->whereNumber('reservation')->name('adminapp.entry-reservations.destroy');
+            });
         Route::get('tickets', [TicketController::class, 'index'])
-            ->middleware('tenant.menu:onticket.adminapp.tickets')
+            ->middleware('tenant.menu:adminapp.tickets')
             ->name('adminapp.tickets.index');
         Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
             ->whereNumber('ticket')
-            ->middleware('tenant.menu:onticket.adminapp.tickets')
+            ->middleware('tenant.menu:adminapp.tickets')
             ->name('adminapp.tickets.cancel');
         Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
             ->whereNumber('ticket')
-            ->middleware('tenant.menu:onticket.adminapp.tickets')
+            ->middleware('tenant.menu:adminapp.tickets')
             ->name('adminapp.tickets.calculate-refund');
         Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
             ->whereNumber('ticket')
-            ->middleware('tenant.menu:onticket.adminapp.tickets')
+            ->middleware('tenant.menu:adminapp.tickets')
             ->name('adminapp.tickets.refund');
         Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
-            ->middleware('tenant.menu:onticket.adminapp.tickets')
+            ->middleware('tenant.menu:adminapp.tickets')
             ->name('adminapp.tickets.pdf');
         Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
-            ->middleware('tenant.menu:onticket.adminapp.tickets')
+            ->middleware('tenant.menu:adminapp.tickets')
             ->name('adminapp.tickets.excel');
     });

app/Http/Middleware/EnsureTenantHasMenu.php

@@ -13,9 +13,6 @@ class EnsureTenantHasMenu
         $tenant = $request->user()?->tenant()->first();
         $hasMenu = $tenant?->menues()
             ->where('menues.code', $menuCode)
-            ->where(fn ($query) => $query
-                ->where('menues.code', 'help.contact')
-                ->orWhere('tenants_menues.is_enabled', true))
             ->exists() ?? false;
 
         abort_unless($hasMenu, 404);

app/Shared/Forms/Services/DesfileEntryReservationFormService.php

@@ -5,7 +5,7 @@ namespace App\Shared\Forms\Services;
 use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use App\Domains\Commerce\Catalog\Models\Variant;
 use App\Domains\Core\Tenant\Models\Tenant;
-use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
+use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
 
 class DesfileEntryReservationFormService
 {

app/Shared/Forms/routes/adminapp.php

@@ -18,12 +18,12 @@ Route::prefix('v1/adminapp/forms')
         Route::get(
             'desfile/entry-reservation',
             DesfileEntryReservationFormController::class
-        )->middleware('tenant.menu:onticket.adminapp.desfile.reservas')
+        )->middleware('tenant.menu:adminapp.desfile.reservas')
             ->name('adminapp.forms.desfile.entry-reservation');
         Route::get('sale', SaleFormController::class);
         Route::get('staff', StaffFormController::class);
         Route::get('tickets-filter', TicketFilterFormController::class)
-            ->middleware('tenant.menu:onticket.adminapp.tickets')
+            ->middleware('tenant.menu:adminapp.tickets')
             ->name('adminapp.forms.tickets-filter');
         Route::get(
             'fiesta-futbol-infantil/ticket',

database/migrations/2026_08_26_000000_set_website_type_favicon.php

@@ -41,7 +41,7 @@ return new class extends Migration
             return;
         }
 
-        $sourcePath = public_path('images/website_types/onticket/'.self::FILENAME);
+        $sourcePath = public_path('images/website_types/'.self::FILENAME);
 
         if (! is_file($sourcePath)) {
             throw new RuntimeException("Favicon not found at path: {$sourcePath}");

database/migrations/2026_09_28_000000_update_shopit_admin_assets.php

@@ -1,47 +0,0 @@
-<?php
-
-use App\Domains\Core\Tenant\Models\AdminWebsiteType;
-use App\Domains\Core\Tenant\Services\AdminWebsiteTypeService;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Storage;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        if (app()->environment('testing')) {
-            Storage::fake('s3');
-        }
-
-        if (! AdminWebsiteType::query()->where('codigo', 'shopit')->exists()) {
-            return;
-        }
-
-        app(AdminWebsiteTypeService::class)->updateOrCreate(
-            ['codigo' => 'shopit'],
-            [
-                'primary_color' => '#2FD3AC',
-                'site_logo' => $this->uploadedImage('shopit_logo.png', 'image/png'),
-                'footer_logo' => $this->uploadedImage('shopit_footer_logo.png', 'image/png'),
-                'favicon' => $this->uploadedImage('shopit-favicon.svg', 'image/svg+xml'),
-            ],
-        );
-    }
-
-    public function down(): void
-    {
-        // Brand assets are operational data and are intentionally preserved.
-    }
-
-    private function uploadedImage(string $filename, string $mimeType): UploadedFile
-    {
-        $path = public_path("images/website_types/shopit/{$filename}");
-
-        if (! is_file($path)) {
-            throw new RuntimeException("ShopIt image not found at path: {$path}");
-        }
-
-        return new UploadedFile($path, $filename, $mimeType, null, true);
-    }
-};

database/migrations/2026_09_29_000000_separate_adminapp_menus_by_website_type.php

@@ -1,236 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    private const ONTICKET_MENUS = [
-        'adminapp.event' => ['onticket.adminapp.event', 'Eventos', '/admin/event'],
-        'adminapp.inicio' => ['onticket.adminapp.inicio', 'Inicio', '/admin/inicio'],
-        'adminapp.catalog' => ['onticket.adminapp.catalog', 'Catálogo', '/admin/catalog'],
-        'adminapp.combos' => ['onticket.adminapp.combos', 'Combos', '/admin/combos'],
-        'adminapp.categories' => ['onticket.adminapp.categories', 'Categorías', '/admin/categories'],
-        'adminapp.ventas' => ['onticket.adminapp.ventas', 'Ventas', '/admin/ventas'],
-        'adminapp.staff' => ['onticket.adminapp.staff', 'Usuarios', '/admin/staff'],
-        'adminapp.tickets' => ['onticket.adminapp.tickets', 'Tickets', '/admin/tickets'],
-        'adminapp.fiesta-futbol-infantil.entradas' => [
-            'onticket.adminapp.fiesta-futbol-infantil.entradas',
-            'Entradas',
-            '/admin/entradas',
-        ],
-        'adminapp.fiesta-futbol-infantil.alojamientos' => [
-            'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
-            'Alojamientos',
-            '/admin/alojamientos',
-        ],
-        'adminapp.fiesta-futbol-infantil.merchandising' => [
-            'onticket.adminapp.fiesta-futbol-infantil.merchandising',
-            'Merchandising',
-            '/admin/merchandising',
-        ],
-        'adminapp.fiesta-futbol-infantil.comida' => [
-            'onticket.adminapp.fiesta-futbol-infantil.comida',
-            'Comida',
-            '/admin/comidas',
-        ],
-        'adminapp.desfile.entradas' => [
-            'onticket.adminapp.desfile.entradas',
-            'Entradas',
-            '/admin/desfile/entradas',
-        ],
-        'adminapp.desfile.reservas' => [
-            'onticket.adminapp.desfile.reservas',
-            'Reserva de Tickets',
-            '/admin/desfile/reservas',
-        ],
-    ];
-
-    private const SHOPIT_MENUS = [
-        'shopit.adminapp.marca' => ['Marca', '/admin/marca'],
-        'shopit.adminapp.contacto' => ['Contacto', '/admin/contacto'],
-        'shopit.adminapp.productos' => ['Productos', '/admin/productos'],
-        'shopit.adminapp.categorias' => ['Categorías', '/admin/categorias'],
-        'shopit.adminapp.transacciones' => ['Transacciones', '/admin/transacciones'],
-        'shopit.adminapp.reportes' => ['Reportes', '/admin/reportes'],
-        'shopit.adminapp.usuarios_roles' => ['Usuarios y roles', '/admin/usuarios-roles'],
-    ];
-
-    private const LEGACY_SHOPIT_ADMIN_MENUS = [
-        'adminapp.event',
-        'adminapp.inicio',
-        'adminapp.catalog',
-        'adminapp.combos',
-        'adminapp.categories',
-        'adminapp.ventas',
-        'adminapp.staff',
-    ];
-
-    public function up(): void
-    {
-        DB::transaction(function (): void {
-            if (! DB::table('menues')->where('code', 'main.adminapp')->exists()) {
-                return;
-            }
-
-            foreach (self::ONTICKET_MENUS as $legacyCode => [$code, $label, $route]) {
-                $this->replaceMenuCode($legacyCode, $code, $label, $route);
-                $this->assignMenuToAdminRoles($code);
-            }
-
-            foreach (self::SHOPIT_MENUS as $code => [$label, $route]) {
-                $this->upsertMenu($code, $label, $route);
-                $this->assignMenuToAdminRoles($code);
-            }
-
-            $shopItTenantCodes = DB::table('tenants')
-                ->where('admin_website_type_code', 'shopit')
-                ->pluck('codigo');
-
-            if ($shopItTenantCodes->isEmpty()) {
-                return;
-            }
-
-            $adminMenuCodes = DB::table('menues')
-                ->where('parent_menu_code', 'main.adminapp')
-                ->pluck('code');
-
-            DB::table('tenants_menues')
-                ->whereIn('tenant_code', $shopItTenantCodes)
-                ->whereIn('menu_code', $adminMenuCodes)
-                ->delete();
-
-            foreach ($shopItTenantCodes as $tenantCode) {
-                $this->assignMenuToTenant($tenantCode, 'main.adminapp');
-
-                foreach (array_keys(self::SHOPIT_MENUS) as $menuCode) {
-                    $this->assignMenuToTenant($tenantCode, $menuCode);
-                }
-            }
-        });
-    }
-
-    public function down(): void
-    {
-        DB::transaction(function (): void {
-            if (! DB::table('menues')->where('code', 'main.adminapp')->exists()) {
-                return;
-            }
-
-            $shopItTenantCodes = DB::table('tenants')
-                ->where('admin_website_type_code', 'shopit')
-                ->pluck('codigo');
-
-            DB::table('tenants_menues')
-                ->whereIn('tenant_code', $shopItTenantCodes)
-                ->whereIn('menu_code', array_keys(self::SHOPIT_MENUS))
-                ->delete();
-            DB::table('roles_menues')
-                ->whereIn('menu_codigo', array_keys(self::SHOPIT_MENUS))
-                ->delete();
-            DB::table('menues')
-                ->whereIn('code', array_keys(self::SHOPIT_MENUS))
-                ->delete();
-
-            foreach (self::ONTICKET_MENUS as $legacyCode => [$code, $label, $route]) {
-                $this->replaceMenuCode($code, $legacyCode, $label, $route);
-            }
-
-            foreach ($shopItTenantCodes as $tenantCode) {
-                foreach (self::LEGACY_SHOPIT_ADMIN_MENUS as $menuCode) {
-                    $this->assignMenuToTenant($tenantCode, $menuCode);
-                }
-            }
-        });
-    }
-
-    private function replaceMenuCode(
-        string $sourceCode,
-        string $targetCode,
-        string $label,
-        string $route,
-    ): void {
-        $source = DB::table('menues')->where('code', $sourceCode)->first();
-
-        $this->upsertMenu($targetCode, $label, $route, $source);
-
-        if ($source === null) {
-            return;
-        }
-
-        DB::table('tenants_menues')
-            ->where('menu_code', $sourceCode)
-            ->get()
-            ->each(function (object $assignment) use ($targetCode): void {
-                DB::table('tenants_menues')->updateOrInsert(
-                    [
-                        'tenant_code' => $assignment->tenant_code,
-                        'menu_code' => $targetCode,
-                    ],
-                    [
-                        'static_content' => $assignment->static_content,
-                        'created_at' => $assignment->created_at ?? now(),
-                        'updated_at' => now(),
-                    ],
-                );
-            });
-
-        DB::table('roles_menues')
-            ->where('menu_codigo', $sourceCode)
-            ->pluck('rol_codigo')
-            ->each(fn (string $roleCode) => DB::table('roles_menues')->updateOrInsert([
-                'rol_codigo' => $roleCode,
-                'menu_codigo' => $targetCode,
-            ]));
-
-        DB::table('tenants_menues')->where('menu_code', $sourceCode)->delete();
-        DB::table('roles_menues')->where('menu_codigo', $sourceCode)->delete();
-        DB::table('menues')->where('code', $sourceCode)->delete();
-    }
-
-    private function upsertMenu(
-        string $code,
-        string $label,
-        string $route,
-        ?object $source = null,
-    ): void {
-        DB::table('menues')->updateOrInsert(
-            ['code' => $code],
-            [
-                'label' => $source->label ?? $label,
-                'parent_menu_code' => 'main.adminapp',
-                'content_type' => $source->content_type ?? 'dynamic',
-                'static_content_schema' => $source->static_content_schema ?? null,
-                'route' => $source->route ?? $route,
-                'created_at' => $source->created_at ?? now(),
-                'updated_at' => now(),
-            ],
-        );
-    }
-
-    private function assignMenuToAdminRoles(string $menuCode): void
-    {
-        DB::table('roles')
-            ->whereIn('codigo', ['admin', 'adminapp'])
-            ->pluck('codigo')
-            ->each(fn (string $roleCode) => DB::table('roles_menues')->updateOrInsert([
-                'rol_codigo' => $roleCode,
-                'menu_codigo' => $menuCode,
-            ]));
-    }
-
-    private function assignMenuToTenant(string $tenantCode, string $menuCode): void
-    {
-        DB::table('tenants_menues')->updateOrInsert(
-            [
-                'tenant_code' => $tenantCode,
-                'menu_code' => $menuCode,
-            ],
-            [
-                'static_content' => null,
-                'created_at' => now(),
-                'updated_at' => now(),
-            ],
-        );
-    }
-};

database/migrations/2026_09_29_010000_add_is_enabled_to_tenants_menues_table.php

@@ -1,22 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        Schema::table('tenants_menues', function (Blueprint $table): void {
-            $table->boolean('is_enabled')->default(true);
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('tenants_menues', function (Blueprint $table): void {
-            $table->dropColumn('is_enabled');
-        });
-    }
-};

database/migrations/2026_09_29_020000_make_help_terms_content_static.php

@@ -1,29 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        DB::table('menues')
-            ->where('code', 'help.terms-and-conditions')
-            ->update([
-                'content_type' => 'static',
-                'static_content_schema' => json_encode([
-                    'html' => 'present|nullable|string',
-                ], JSON_THROW_ON_ERROR),
-            ]);
-    }
-
-    public function down(): void
-    {
-        DB::table('menues')
-            ->where('code', 'help.terms-and-conditions')
-            ->update([
-                'content_type' => 'dynamic',
-                'static_content_schema' => null,
-            ]);
-    }
-};

database/migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php

@@ -1,57 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        $driver = DB::connection()->getDriverName();
-
-        if (! in_array($driver, ['mysql', 'mariadb', 'sqlite', 'pgsql', 'sqlsrv'], true)) {
-            throw new RuntimeException("Unsupported address database driver: {$driver}");
-        }
-
-        Schema::create('addresses', function (Blueprint $table): void {
-            $table->id();
-            $table->string('label');
-            $table->text('address_text');
-            $table->decimal('latitude', 10, 7)->nullable();
-            $table->decimal('longitude', 10, 7)->nullable();
-            $table->timestamps();
-        });
-
-        Schema::create('tenant_addresses', function (Blueprint $table) use ($driver): void {
-            $table->id();
-            $table->string('tenant_codigo');
-            $table->foreignId('address_id')->constrained('addresses')->cascadeOnDelete();
-            $table->boolean('is_main')->default(false);
-            $table->timestamps();
-
-            $table->foreign('tenant_codigo')->references('codigo')->on('tenants')->cascadeOnDelete();
-            $table->unique(['tenant_codigo', 'address_id']);
-
-            if (in_array($driver, ['mysql', 'mariadb'], true)) {
-                // NULL allows many secondary addresses, while a tenant code can occur only once.
-                $table->string('main_tenant_codigo')->nullable()
-                    ->virtualAs('CASE WHEN is_main = 1 THEN tenant_codigo ELSE NULL END');
-                $table->unique('main_tenant_codigo', 'tenant_addresses_one_main_per_tenant');
-            }
-        });
-
-        if (! in_array($driver, ['mysql', 'mariadb'], true)) {
-            $condition = $driver === 'pgsql' ? 'is_main = true' : 'is_main = 1';
-            DB::statement('CREATE UNIQUE INDEX tenant_addresses_one_main_per_tenant '
-                ."ON tenant_addresses (tenant_codigo) WHERE {$condition}");
-        }
-    }
-
-    public function down(): void
-    {
-        Schema::dropIfExists('tenant_addresses');
-        Schema::dropIfExists('addresses');
-    }
-};

database/migrations/2026_09_30_000100_copy_contact_menu_addresses.php

@@ -1,108 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        DB::transaction(function (): void {
-            DB::table('tenants_menues')
-                ->where('menu_code', 'help.contact')
-                ->whereNotNull('static_content')
-                ->orderBy('id')
-                ->chunkById(100, function ($menus): void {
-                    foreach ($menus as $menu) {
-                        $content = json_decode($menu->static_content, true, flags: JSON_THROW_ON_ERROR);
-
-                        if ($content === null) {
-                            continue;
-                        }
-
-                        if (! is_array($content) || ! is_array($content['locations'] ?? [])) {
-                            throw new RuntimeException("Invalid contact locations for tenant {$menu->tenant_code}");
-                        }
-
-                        foreach ($content['locations'] ?? [] as $location) {
-                            if (! is_array($location) || ! is_array($location['addresses'] ?? [])) {
-                                throw new RuntimeException("Invalid contact addresses for tenant {$menu->tenant_code}");
-                            }
-
-                            foreach ($location['addresses'] ?? [] as $address) {
-                                $this->copyAddress($menu->tenant_code, $location, $address);
-                            }
-                        }
-                    }
-                });
-        });
-    }
-
-    private function copyAddress(string $tenantCode, array $location, mixed $address): void
-    {
-        if (! is_array($address) || ! is_string($address['address'] ?? null)
-            || trim($address['address']) === '') {
-            throw new RuntimeException("Invalid contact address text for tenant {$tenantCode}");
-        }
-
-        $coordinates = $address['coordinates'] ?? null;
-
-        if ($coordinates !== null && (! is_array($coordinates) || count($coordinates) !== 2
-            || ! is_numeric($coordinates[0] ?? null) || ! is_numeric($coordinates[1] ?? null)
-            || ! is_finite((float) $coordinates[0]) || ! is_finite((float) $coordinates[1])
-            || abs((float) $coordinates[0]) > 90 || abs((float) $coordinates[1]) > 180)) {
-            throw new RuntimeException("Invalid contact coordinates for tenant {$tenantCode}");
-        }
-
-        $label = $address['label'] ?? $location['label'] ?? 'Dirección';
-
-        if (! is_string($label) || trim($label) === '' || mb_strlen($label) > 255) {
-            throw new RuntimeException("Invalid contact address label for tenant {$tenantCode}");
-        }
-
-        $values = [
-            'label' => $label,
-            'address_text' => $address['address'],
-            'latitude' => $coordinates === null ? null : number_format((float) $coordinates[0], 7, '.', ''),
-            'longitude' => $coordinates === null ? null : number_format((float) $coordinates[1], 7, '.', ''),
-        ];
-
-        // Reuse only within this tenant; equal legacy addresses in different tenants stay independent.
-        $existing = DB::table('addresses')
-            ->join('tenant_addresses', 'tenant_addresses.address_id', '=', 'addresses.id')
-            ->where('tenant_addresses.tenant_codigo', $tenantCode)
-            ->where(array_combine(
-                array_map(fn (string $field): string => 'addresses.'.$field, array_keys($values)),
-                array_values($values),
-            ))
-            ->first(['addresses.id', 'tenant_addresses.id as link_id']);
-
-        if ($existing !== null) {
-            return;
-        }
-
-        $now = now();
-        $isMain = ! DB::table('tenant_addresses')
-            ->where('tenant_codigo', $tenantCode)
-            ->where('is_main', true)
-            ->exists();
-        $addressId = DB::table('addresses')->insertGetId([
-            ...$values,
-            'created_at' => $now,
-            'updated_at' => $now,
-        ]);
-
-        DB::table('tenant_addresses')->insert([
-            'tenant_codigo' => $tenantCode,
-            'address_id' => $addressId,
-            'is_main' => $isMain,
-            'created_at' => $now,
-            'updated_at' => $now,
-        ]);
-    }
-
-    public function down(): void
-    {
-        // Keep copies: they may already have been edited or reused. Legacy menus were never changed.
-    }
-};

database/migrations/2026_09_30_000200_add_address_id_to_events.php

@@ -1,22 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        Schema::table('events', function (Blueprint $table): void {
-            $table->foreignId('address_id')->nullable()->constrained('addresses')->nullOnDelete();
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('events', function (Blueprint $table): void {
-            $table->dropConstrainedForeignId('address_id');
-        });
-    }
-};

database/migrations/2026_09_30_000300_copy_event_locations_to_addresses.php

@@ -1,57 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        DB::transaction(function (): void {
-            DB::table('events')->whereNull('address_id')->orderBy('id')->lockForUpdate()
-                ->chunkById(100, function ($events): void {
-                    foreach ($events as $event) {
-                        $coordinates = $event->exact_location === null
-                            ? null
-                            : json_decode($event->exact_location, true, flags: JSON_THROW_ON_ERROR);
-
-                        if ($coordinates !== null && (! is_array($coordinates)
-                            || ! is_numeric($coordinates['latitude'] ?? null)
-                            || ! is_numeric($coordinates['longitude'] ?? null)
-                            || ! is_finite((float) $coordinates['latitude'])
-                            || ! is_finite((float) $coordinates['longitude'])
-                            || abs((float) $coordinates['latitude']) > 90
-                            || abs((float) $coordinates['longitude']) > 180)) {
-                            throw new RuntimeException("Invalid location coordinates for event {$event->id}");
-                        }
-
-                        if ($event->location === null || trim($event->location) === '') {
-                            if ($coordinates !== null) {
-                                throw new RuntimeException("Missing address text for event {$event->id}");
-                            }
-
-                            continue;
-                        }
-
-                        $now = now();
-                        $addressId = DB::table('addresses')->insertGetId([
-                            'label' => 'Ubicación del evento',
-                            'address_text' => $event->location,
-                            'latitude' => $coordinates === null ? null : $coordinates['latitude'],
-                            'longitude' => $coordinates === null ? null : $coordinates['longitude'],
-                            'created_at' => $now,
-                            'updated_at' => $now,
-                        ]);
-
-                        // Update only the new link, preserving the original fields and timestamps.
-                        DB::table('events')->where('id', $event->id)->update(['address_id' => $addressId]);
-                    }
-                });
-        });
-    }
-
-    public function down(): void
-    {
-        // Copies may already have been edited or shared; keep them and the legacy data.
-    }
-};

database/migrations/2026_10_01_000000_add_event_id_to_users_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table): void {
+            $table->foreignId('event_id')
+                ->nullable()
+                ->after('tenant_codigo')
+                ->constrained('events')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table): void {
+            $table->dropForeign(['event_id']);
+            $table->dropColumn('event_id');
+        });
+    }
+};

database/migrations/2026_10_02_000000_generalize_ticket_reservations.php

@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        // Validate before changing the schema, including soft-deleted reservations.
+        if (DB::table('desfile_entry_reservations as reservations')
+            ->leftJoin('variantes', 'variantes.id', '=', 'reservations.variant_id')
+            ->leftJoin('catalog_items', 'catalog_items.id', '=', 'variantes.catalog_item_id')
+            ->whereNull('catalog_items.id')->exists()) {
+            throw new LogicException('No se puede determinar el catálogo de todas las reservas existentes.');
+        }
+
+        Schema::rename('desfile_reservation_batches', 'reservation_batches');
+        Schema::rename('desfile_entry_reservations', 'entry_reservations');
+
+        Schema::table('entry_reservations', function (Blueprint $table): void {
+            $table->foreignId('catalog_item_id')->nullable()
+                ->constrained('catalog_items')->restrictOnDelete();
+            $table->unsignedBigInteger('variant_id')->nullable()->change();
+        });
+
+        DB::table('entry_reservations')->update([
+            'catalog_item_id' => DB::raw('(SELECT catalog_item_id FROM variantes WHERE variantes.id = entry_reservations.variant_id)'),
+        ]);
+
+        Schema::table('entry_reservations', function (Blueprint $table): void {
+            $table->unsignedBigInteger('catalog_item_id')->nullable(false)->change();
+        });
+    }
+
+    public function down(): void
+    {
+        // The old schema cannot represent tickets without variants. Never discard them.
+        if (DB::table('entry_reservations')->whereNull('variant_id')->exists()) {
+            throw new LogicException('No se puede revertir mientras existan reservas sin variante.');
+        }
+
+        Schema::table('entry_reservations', function (Blueprint $table): void {
+            $table->dropConstrainedForeignId('catalog_item_id');
+            $table->unsignedBigInteger('variant_id')->nullable(false)->change();
+        });
+
+        Schema::rename('entry_reservations', 'desfile_entry_reservations');
+        Schema::rename('reservation_batches', 'desfile_reservation_batches');
+    }
+};

database/migrations/2026_10_02_010000_add_ticket_reservations_adminapp_menu.php

@@ -0,0 +1,82 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    private const MENU_CODE = 'adminapp.ticket-reservations';
+
+    private const TENANT_CODE = 'onticket';
+
+    public function up(): void
+    {
+        if (! DB::table('menues')->where('code', 'main.adminapp')->exists()) {
+            // Reference data is added by seeders on fresh installations.
+            return;
+        }
+
+        $now = now();
+
+        DB::transaction(function () use ($now): void {
+            DB::table('menues')->updateOrInsert(
+                ['code' => self::MENU_CODE],
+                [
+                    'label' => 'Reserva de Tickets',
+                    'parent_menu_code' => 'main.adminapp',
+                    'content_type' => 'dynamic',
+                    'static_content_schema' => null,
+                    'route' => '/admin/ticket-reservations',
+                    'created_at' => $now,
+                    'updated_at' => $now,
+                ],
+            );
+
+            DB::table('tenants_menues')
+                ->where('menu_code', self::MENU_CODE)
+                ->where('tenant_code', '!=', self::TENANT_CODE)
+                ->delete();
+
+            if (DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()) {
+                DB::table('tenants_menues')->updateOrInsert(
+                    [
+                        'tenant_code' => self::TENANT_CODE,
+                        'menu_code' => self::MENU_CODE,
+                    ],
+                    [
+                        'static_content' => null,
+                        'created_at' => $now,
+                        'updated_at' => $now,
+                    ],
+                );
+            }
+
+            DB::table('roles')
+                ->whereIn('codigo', ['admin', 'adminapp'])
+                ->pluck('codigo')
+                ->each(function (string $roleCode): void {
+                    DB::table('roles_menues')->updateOrInsert([
+                        'rol_codigo' => $roleCode,
+                        'menu_codigo' => self::MENU_CODE,
+                    ]);
+                });
+        });
+    }
+
+    public function down(): void
+    {
+        DB::transaction(function (): void {
+            DB::table('tenants_menues')
+                ->where('menu_code', self::MENU_CODE)
+                ->delete();
+
+            DB::table('roles_menues')
+                ->where('menu_codigo', self::MENU_CODE)
+                ->delete();
+
+            DB::table('menues')
+                ->where('code', self::MENU_CODE)
+                ->delete();
+        });
+    }
+};

database/seeders/FiestaTradicionArrufoSeeder.php

@@ -14,7 +14,6 @@ use App\Shared\Enums\FieldType;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Storage;
 use RuntimeException;
 
@@ -52,19 +51,14 @@ class FiestaTradicionArrufoSeeder extends Seeder
             ['tenant_code' => $tenant->codigo, 'title' => self::TITLE],
             ['published_at' => now()],
         );
-        $eventData = [
+        $event->update([
+            'client_id' => $client->id,
             'subtitle' => 'Una noche para celebrar nuestras raíces y mantener viva la tradición gaucha.',
             'description' => 'La 26.º Fiesta de la Tradición y 4.º Encuentro de Agrupaciones Gauchas reunirá a agrupaciones, artesanos, pilcheros y público en general para compartir una jornada dedicada a nuestras costumbres y cultura.'
                 ."\n\n".'Un encuentro para disfrutar de la tradición, la identidad gaucha y el espíritu de camaradería, en el Predio de Doma del Club Unión Deportiva Arrufó.'
                 ."\n\n".'Organiza: Biblioteca Popular Miguel Ángel Sosa.',
             'location' => 'Predio de Doma del Club Unión Deportiva Arrufó',
-        ];
+        ]);
-
-        if (Schema::hasColumn('events', 'client_id')) {
-            $eventData['client_id'] = $client->id;
-        }
-
-        $event->update($eventData);
 
         $eventImage = $event->attachment;
         if ($eventImage === null || ! Storage::disk('s3')->exists($eventImage->path)) {

database/seeders/MenuSeeder.php

@@ -53,131 +53,95 @@ class MenuSeeder extends Seeder
                 'route' => '/scanner/detail/:id',
             ],
             [
-                'code' => 'onticket.adminapp.event',
+                'code' => 'adminapp.event',
                 'label' => 'Eventos',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/event',
             ],
             [
-                'code' => 'onticket.adminapp.inicio',
+                'code' => 'adminapp.inicio',
                 'label' => 'Inicio',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/inicio',
             ],
             [
-                'code' => 'onticket.adminapp.catalog',
+                'code' => 'adminapp.catalog',
                 'label' => 'Catálogo',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/catalog',
             ],
             [
-                'code' => 'onticket.adminapp.combos',
+                'code' => 'adminapp.combos',
                 'label' => 'Combos',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/combos',
             ],
             [
-                'code' => 'onticket.adminapp.categories',
+                'code' => 'adminapp.categories',
                 'label' => 'Categorías',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/categories',
             ],
             [
-                'code' => 'onticket.adminapp.ventas',
+                'code' => 'adminapp.ventas',
                 'label' => 'Ventas',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/ventas',
             ],
             [
-                'code' => 'onticket.adminapp.staff',
+                'code' => 'adminapp.staff',
                 'label' => 'Usuarios',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/staff',
             ],
             [
-                'code' => 'onticket.adminapp.tickets',
+                'code' => 'adminapp.tickets',
                 'label' => 'Tickets',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/tickets',
             ],
             [
-                'code' => 'onticket.adminapp.fiesta-futbol-infantil.entradas',
+                'code' => 'adminapp.ticket-reservations',
+                'label' => 'Reserva de Tickets',
+                'parent_menu_code' => 'main.adminapp',
+                'route' => '/admin/ticket-reservations',
+            ],
+            [
+                'code' => 'adminapp.fiesta-futbol-infantil.entradas',
                 'label' => 'Entradas',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/entradas',
             ],
             [
-                'code' => 'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
+                'code' => 'adminapp.fiesta-futbol-infantil.alojamientos',
                 'label' => 'Alojamientos',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/alojamientos',
             ],
             [
-                'code' => 'onticket.adminapp.fiesta-futbol-infantil.merchandising',
+                'code' => 'adminapp.fiesta-futbol-infantil.merchandising',
                 'label' => 'Merchandising',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/merchandising',
             ],
             [
-                'code' => 'onticket.adminapp.fiesta-futbol-infantil.comida',
+                'code' => 'adminapp.fiesta-futbol-infantil.comida',
                 'label' => 'Comida',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/comidas',
             ],
             [
-                'code' => 'onticket.adminapp.desfile.entradas',
+                'code' => 'adminapp.desfile.entradas',
                 'label' => 'Entradas',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/desfile/entradas',
             ],
             [
-                'code' => 'onticket.adminapp.desfile.reservas',
+                'code' => 'adminapp.desfile.reservas',
                 'label' => 'Reserva de Tickets',
                 'parent_menu_code' => 'main.adminapp',
                 'route' => '/admin/desfile/reservas',
             ],
-            [
-                'code' => 'shopit.adminapp.marca',
-                'label' => 'Marca',
-                'parent_menu_code' => 'main.adminapp',
-                'route' => '/admin/marca',
-            ],
-            [
-                'code' => 'shopit.adminapp.contacto',
-                'label' => 'Contacto',
-                'parent_menu_code' => 'main.adminapp',
-                'route' => '/admin/contacto',
-            ],
-            [
-                'code' => 'shopit.adminapp.productos',
-                'label' => 'Productos',
-                'parent_menu_code' => 'main.adminapp',
-                'route' => '/admin/productos',
-            ],
-            [
-                'code' => 'shopit.adminapp.categorias',
-                'label' => 'Categorías',
-                'parent_menu_code' => 'main.adminapp',
-                'route' => '/admin/categorias',
-            ],
-            [
-                'code' => 'shopit.adminapp.transacciones',
-                'label' => 'Transacciones',
-                'parent_menu_code' => 'main.adminapp',
-                'route' => '/admin/transacciones',
-            ],
-            [
-                'code' => 'shopit.adminapp.reportes',
-                'label' => 'Reportes',
-                'parent_menu_code' => 'main.adminapp',
-                'route' => '/admin/reportes',
-            ],
-            [
-                'code' => 'shopit.adminapp.usuarios_roles',
-                'label' => 'Usuarios y roles',
-                'parent_menu_code' => 'main.adminapp',
-                'route' => '/admin/usuarios-roles',
-            ],
             [
                 'code' => 'account',
                 'label' => 'Mi cuenta',
@@ -261,10 +225,7 @@ class MenuSeeder extends Seeder
                 'code' => 'help.terms-and-conditions',
                 'label' => 'Términos y condiciones',
                 'parent_menu_code' => 'help',
-                'content_type' => Menu::CONTENT_TYPE_STATIC,
+                'content_type' => Menu::CONTENT_TYPE_DYNAMIC,
-                'static_content_schema' => [
-                    'html' => 'present|nullable|string',
-                ],
                 'route' => '/ayuda/terminos-y-condiciones',
             ],
         ];
@@ -300,10 +261,6 @@ class MenuSeeder extends Seeder
             ])
             ->delete();
 
-        Menu::query()
-            ->where('code', 'like', 'adminapp.%')
-            ->delete();
-
         $allRoleMenuCodes = Menu::query()->pluck('code');
         $adminAppMenuCodes = Menu::query()
             ->where('code', 'main.adminapp')
@@ -348,33 +305,26 @@ class MenuSeeder extends Seeder
             'mutual_smep',
         ];
         $ticketAdminMenuCodes = [
-            'onticket.adminapp.tickets',
+            'adminapp.tickets',
         ];
         $fiestaCategoryMenuCodes = [
-            'onticket.adminapp.fiesta-futbol-infantil.entradas',
+            'adminapp.fiesta-futbol-infantil.entradas',
-            'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
+            'adminapp.fiesta-futbol-infantil.alojamientos',
-            'onticket.adminapp.fiesta-futbol-infantil.merchandising',
+            'adminapp.fiesta-futbol-infantil.merchandising',
-            'onticket.adminapp.fiesta-futbol-infantil.comida',
+            'adminapp.fiesta-futbol-infantil.comida',
         ];
         $fiestaExcludedAdminMenuCodes = [
-            'onticket.adminapp.inicio',
+            'adminapp.inicio',
-            'onticket.adminapp.catalog',
+            'adminapp.catalog',
-            'onticket.adminapp.categories',
+            'adminapp.categories',
-            'onticket.adminapp.combos',
+            'adminapp.combos',
         ];
         $desfileMenuCodes = [
-            'onticket.adminapp.desfile.entradas',
+            'adminapp.desfile.entradas',
-            'onticket.adminapp.desfile.reservas',
+            'adminapp.desfile.reservas',
         ];
-        $shopItAdminMenuCodes = Menu::query()
-            ->where('code', 'like', 'shopit.adminapp.%')
-            ->pluck('code')
-            ->all();
-        $onTicketAdminMenuCodes = Menu::query()
-            ->where('code', 'like', 'onticket.adminapp.%')
-            ->pluck('code')
-            ->all();
         $onTicketMenuCodes = [
+            'adminapp.ticket-reservations',
             'event.index',
             'event.category',
             'event.detail',
@@ -463,13 +413,6 @@ class MenuSeeder extends Seeder
         foreach ($tenants as $tenant) {
             $menuCodes = $allMenus;
 
-            $menuCodes = array_diff(
-                $menuCodes,
-                $tenant->admin_website_type_code === 'shopit'
-                    ? $onTicketAdminMenuCodes
-                    : $shopItAdminMenuCodes,
-            );
-
             if ($tenant->codigo === 'sonder') {
                 // Sonder NO tiene tickets
                 $menuCodes = array_diff($menuCodes, ['account.tickets']);

database/seeders/WebsiteTypeSeeder.php

@@ -40,7 +40,7 @@ class WebsiteTypeSeeder extends Seeder
 
     public function run(): void
     {
-        $this->websiteTypeService->updateOrCreate(
+        $shopIt = $this->websiteTypeService->updateOrCreate(
             ['codigo' => 'shopit'],
             [
                 'nombre' => 'ShopIt',
@@ -48,10 +48,9 @@ class WebsiteTypeSeeder extends Seeder
                 'scanner_domain' => 'scanner.localhost',
                 'site_title' => 'ShopIt',
                 ...self::PRESENTATION,
-                'primary_color' => '#2FD3AC',
+                'site_logo' => $this->onTicketLogo(),
-                'site_logo' => $this->shopItLogo(),
+                'footer_logo' => $this->onTicketFooterLogo(),
-                'footer_logo' => $this->shopItFooterLogo(),
+                'favicon' => $this->onTicketFavicon(),
-                'favicon' => $this->shopItFavicon(),
             ],
         );
 
@@ -84,7 +83,7 @@ class WebsiteTypeSeeder extends Seeder
                 ...self::PRESENTATION,
                 'site_logo' => $this->onTicketLogo(),
                 'footer_logo' => $this->onTicketFooterLogo(),
-                'favicon' => $this->onTicketFavicon(),
+                'favicon' => $shopIt->favicon()->firstOrFail()->key,
             ],
         );
 
@@ -205,7 +204,7 @@ class WebsiteTypeSeeder extends Seeder
 
     private function onTicketLogo(): UploadedFile
     {
-        $path = public_path('images/website_types/onticket/onticket_logo.png');
+        $path = public_path('images/website_types/onticket_logo.png');
 
         if (! file_exists($path)) {
             throw new RuntimeException("OnTicket logo not found at path: {$path}");
@@ -222,7 +221,7 @@ class WebsiteTypeSeeder extends Seeder
 
     private function onTicketFooterLogo(): UploadedFile
     {
-        $path = public_path('images/website_types/onticket/onticket_footer_logo.png');
+        $path = public_path('images/website_types/onticket_footer_logo.png');
 
         if (! file_exists($path)) {
             throw new RuntimeException("OnTicket footer logo not found at path: {$path}");
@@ -239,7 +238,7 @@ class WebsiteTypeSeeder extends Seeder
 
     private function onTicketFavicon(): UploadedFile
     {
-        $path = public_path('images/website_types/onticket/onticket_favicon.svg');
+        $path = public_path('images/website_types/onticket_favicon.svg');
 
         if (! file_exists($path)) {
             throw new RuntimeException("OnTicket favicon not found at path: {$path}");
@@ -253,30 +252,4 @@ class WebsiteTypeSeeder extends Seeder
             true,
         );
     }
-
-    private function shopItLogo(): UploadedFile
-    {
-        return $this->uploadedImage('shopit', 'shopit_logo.png', 'image/png');
-    }
-
-    private function shopItFooterLogo(): UploadedFile
-    {
-        return $this->uploadedImage('shopit', 'shopit_footer_logo.png', 'image/png');
-    }
-
-    private function shopItFavicon(): UploadedFile
-    {
-        return $this->uploadedImage('shopit', 'shopit-favicon.svg', 'image/svg+xml');
-    }
-
-    private function uploadedImage(string $websiteType, string $filename, string $mimeType): UploadedFile
-    {
-        $path = public_path("images/website_types/{$websiteType}/{$filename}");
-
-        if (! file_exists($path)) {
-            throw new RuntimeException("Website type image not found at path: {$path}");
-        }
-
-        return new UploadedFile($path, $filename, $mimeType, null, true);
-    }
 }

public/images/website_types/shopit/shopit-favicon.svg

@@ -1,10 +0,0 @@
-<svg width="41" height="41" viewBox="0 0 41 41" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:se="http://svg-edit.googlecode.com" se:swatches="W3siaWQiOiJCMDBEREFFMy0zMjUwLTRERDgtOEU0RS0zMDYxREJGNUE3QTMiLCJuYW1lIjoiIzVCNUI1QiIsImhleCI6IiM1QjVCNUIifSx7ImlkIjoiRjI4QjU4NTYtNUM2OC00QkY4LTk3MDMtOTk5NDJCOTgzNTVBIiwibmFtZSI6IiMyRkQzQUMiLCJoZXgiOiIjMkZEM0FDIn1d">
-
-
-
-
-
-
-
-
-<g><se:title>Layer 1</se:title><path d="m16.32,27.13c2.29,0 3.13,-0.37 3.73,-0.76c0.65,-0.42 1.17,-1.06 1.24,-1.97c0.06,-0.76 -0.29,-1.4 -0.81,-1.78c-0.7,-0.5 -2.05,-0.81 -3.21,-1.05c-1.13,-0.24 -2.14,-0.6 -3.03,-1.22c-1.06,-0.73 -1.61,-1.47 -1.96,-2.52c-0.45,-1.32 -0.36,-3.12 -0.11,-4.02c0.43,-1.54 1.35,-2.86 2.59,-3.84001c1.6,-1.26 3.58,-2.01999 6.46,-2.17999c0.3,-0.02 0.71,-0.04 1.21,-0.04c0,0 0.16,0 0.21,0h13.3c-3.68,-4.71 -9.41,-7.75 -15.85,-7.75c-11.1,0 -20.09,9 -20.09,20.09c0,2.47 0.45,4.84 1.27,7.03h15.06l-0.01,0.01z" fill="#2FD3AC" id="svg_7"/><path d="m23.11,12.59c-0.65,0 -1.64,0.03 -1.95,0.07c-1.3,0.17 -2.25,0.55 -2.82,1.31c-0.3199,0.43 -0.48,0.99 -0.29,1.66c0.31,1.07 2.1501,1.44 3.4001,1.7c1.49,0.31 2.5599,0.57 3.5899,1.08c1.06,0.53 2.03,1.41 2.51,2.43c0.46,0.98 0.6001,1.96 0.5201,3.08c-0.11,1.56 -0.4701,2.72 -0.9901,3.69c-0.49,0.91 -1.32,1.87 -2.03,2.44c-0.74,0.59 -1.81,1.38 -3.15,1.83c-1.35,0.45 -3.1399,0.63 -5.2999,0.63h-12.30005c3.68,4.68 9.39005,7.68 15.80005,7.68c11.1,0 20.0899,-9 20.0899,-20.09c0,-2.65 -0.5199,-5.18 -1.4499,-7.5h-15.6201l-0.01,-0.01z" fill="#5B5B5B" id="svg_8"/></g></svg>