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

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

app/Domains/Catalog/Models/CatalogItem.php

@@ -7,6 +7,7 @@ use App\Domains\Catalog\Enums\CatalogItemType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use App\Domains\Ticket\Models\Ticket;
 use App\Domains\Ticket\Models\ValidityTime;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -31,6 +32,7 @@ use Illuminate\Support\Collection;
     'inventory_policy',
     'max_units_per_user',
     'has_tickets',
+    'ticket_generation_policy',
     'validity_time_id',
 ])]
 class CatalogItem extends Model
@@ -45,6 +47,7 @@ class CatalogItem extends Model
         'type' => CatalogItemType::Standard->value,
         'inventory_policy' => InventoryPolicy::Tracked->value,
         'has_tickets' => false,
+        'ticket_generation_policy' => TicketGenerationPolicy::PerEventDate->value,
     ];
 
     protected function casts(): array
@@ -58,6 +61,7 @@ class CatalogItem extends Model
             'inventory_policy' => InventoryPolicy::class,
             'max_units_per_user' => 'integer',
             'has_tickets' => 'boolean',
+            'ticket_generation_policy' => TicketGenerationPolicy::class,
             'validity_time_id' => 'integer',
         ];
     }

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -5,6 +5,7 @@ namespace App\Domains\Catalog\Requests;
 use App\Domains\Catalog\Enums\CatalogItemType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Shared\Rules\ImageOrBase64Rule;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -55,6 +56,7 @@ class StoreCatalogItemRequest extends FormRequest
             'inventory_policy' => [Rule::prohibitedIf($isBundle), 'sometimes', Rule::enum(InventoryPolicy::class)],
             'max_units_per_user' => ['sometimes', 'nullable', 'integer', 'min:1'],
             'has_tickets' => [Rule::prohibitedIf($isBundle), 'sometimes', 'boolean'],
+            'ticket_generation_policy' => [Rule::prohibitedIf($isBundle), 'sometimes', Rule::enum(TicketGenerationPolicy::class)],
             'validity_time_id' => [Rule::prohibitedIf($isBundle), 'sometimes', 'nullable', 'integer', Rule::exists('validity_times', 'id')],
             'real_stock' => [Rule::prohibitedIf($isBundle), 'sometimes', 'integer', 'min:0'],
             'inventory_id' => ['prohibited'],

app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php

@@ -31,6 +31,7 @@ class CatalogFeaturedItemResource extends JsonResource
             'nombre' => $catalogItem->nombre,
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
+            'ticket_generation_policy' => $catalogItem->ticket_generation_policy->value,
             'validity_time_id' => $catalogItem->validity_time_id,
             'validity_time' => ValidityTimeResource::make($catalogItem->validityTime),
             'stock_tecnico' => $catalogItem->availableStock(),
@@ -65,6 +66,7 @@ class CatalogFeaturedItemResource extends JsonResource
             'type' => $catalogItem->type->value,
             'nombre' => $catalogItem->nombre,
             'precio' => $catalogItem->precio,
+            'ticket_generation_policy' => $catalogItem->ticket_generation_policy->value,
             'validity_time_id' => $catalogItem->validity_time_id,
             'validity_time' => ValidityTimeResource::make($catalogItem->validityTime),
             'image' => $attachment?->getTemporaryUrl(1440),

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -35,6 +35,7 @@ class CatalogItemDetailResource extends JsonResource
             'inventory_policy' => $this->inventory_policy?->value,
             'max_units_per_user' => $this->max_units_per_user,
             'has_tickets' => $this->has_tickets,
+            'ticket_generation_policy' => $this->ticket_generation_policy->value,
             'validity_time_id' => $this->validity_time_id,
             'validity_time' => $this->validityTime === null
                 ? null
@@ -106,8 +107,8 @@ class CatalogItemDetailResource extends JsonResource
                 'value' => (string) $eventDate->id,
                 'label' => $eventDate->date->format('d/m/Y'),
                 'sort_order' => $index,
-                'validity_time_id' => null,
+                'validity_time_id' => $eventDate->validity_time_id,
-                'validity_time' => null,
+                'validity_time' => ValidityTimeResource::make($eventDate->validityTime),
                 'metadata' => [
                     'date' => $eventDate->date->format('Y-m-d'),
                     'time_start' => $eventDate->time_start,

app/Domains/Catalog/Resources/CatalogItemResource.php

@@ -25,6 +25,7 @@ class CatalogItemResource extends JsonResource
             'inventory_policy' => $this->inventory_policy?->value,
             'max_units_per_user' => $this->max_units_per_user,
             'has_tickets' => $this->has_tickets,
+            'ticket_generation_policy' => $this->ticket_generation_policy->value,
             'validity_time_id' => $this->validity_time_id,
             'validity_time' => $this->whenLoaded(
                 'validityTime',

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -26,6 +26,7 @@ class CatalogSearchItemResource extends JsonResource
             'nombre' => $this->nombre,
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
+            'ticket_generation_policy' => $this->ticket_generation_policy->value,
             'validity_time_id' => $this->validity_time_id,
             'validity_time' => ValidityTimeResource::make($this->validityTime),
             'image' => $attachment?->getTemporaryUrl(1440),

app/Domains/Catalog/Services/CatalogService.php

@@ -167,7 +167,7 @@ class CatalogService
             'brand',
             'validityTime',
             'itemAttributes.attribute.options.validityTime',
-            'itemAttributes.attribute.eventDates',
+            'itemAttributes.attribute.eventDates.validityTime',
             'variants' => fn ($query) => $query->orderBy('id'),
             'variants.inventory',
             'variants.attachments',
@@ -442,6 +442,7 @@ class CatalogService
             'attribute_codes',
             'variants',
             'has_tickets',
+            'ticket_generation_policy',
             'validity_time_id',
         ] as $field) {
             if (array_key_exists($field, $data)) {

app/Domains/Event/Models/EventDate.php

@@ -3,7 +3,10 @@
 namespace App\Domains\Event\Models;
 
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Event\Services\EventDateTextFormatter;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticket\Models\ValidityTime;
 use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -25,10 +28,31 @@ class EventDate extends Model
 
     public $timestamps = false;
 
+    protected static function booted(): void
+    {
+        static::creating(fn (self $eventDate) => $eventDate->syncValidityTime());
+        static::created(fn (self $eventDate) => $eventDate->syncTenantDateText());
+        static::updated(function (self $eventDate): void {
+            if ($eventDate->wasChanged(['date', 'time_start', 'time_end'])) {
+                $eventDate->syncValidityTime();
+            }
+
+            $eventDate->syncTenantDateText();
+        });
+        static::deleted(function (self $eventDate): void {
+            $eventDate->syncTenantDateText();
+            ValidityTime::query()
+                ->whereKey($eventDate->validity_time_id)
+                ->whereDoesntHave('ticketValidityGroups')
+                ->delete();
+        });
+    }
+
     protected function casts(): array
     {
         return [
             'date' => 'date:Y-m-d',
+            'validity_time_id' => 'integer',
         ];
     }
 
@@ -38,6 +62,12 @@ class EventDate extends Model
         return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
     }
 
+    /** @return BelongsTo<ValidityTime, $this> */
+    public function validityTime(): BelongsTo
+    {
+        return $this->belongsTo(ValidityTime::class);
+    }
+
     /** @return HasMany<Variant, $this> */
     public function variants(): HasMany
     {
@@ -64,4 +94,48 @@ class EventDate extends Model
     {
         return Carbon::parse($this->date->format('Y-m-d').' '.$this->time_end);
     }
+
+    private function syncTenantDateText(): void
+    {
+        $tenant = $this->tenant()->first();
+
+        if (! $tenant) {
+            return;
+        }
+
+        $tenant->update([
+            'event_date_text' => app(EventDateTextFormatter::class)->format(
+                $tenant->eventDates()->pluck('date')
+            ),
+        ]);
+    }
+
+    private function syncValidityTime(): void
+    {
+        $startsAt = $this->startsAt();
+        $expiresAt = $this->endsAt();
+
+        if ($expiresAt->lessThanOrEqualTo($startsAt)) {
+            $expiresAt = $expiresAt->addDay();
+        }
+
+        $attributes = [
+            'type' => ValidityTimeType::FixedWindow,
+            'start_time' => null,
+            'end_time' => null,
+            'fixed_starts_at' => $startsAt,
+            'fixed_expires_at' => $expiresAt,
+        ];
+
+        if ($this->validity_time_id === null) {
+            $validityTime = ValidityTime::query()->create($attributes);
+            $this->validity_time_id = $validityTime->getKey();
+            $this->setRelation('validityTime', $validityTime);
+
+            return;
+        }
+
+        $this->validityTime()->update($attributes);
+        $this->unsetRelation('validityTime');
+    }
 }

app/Domains/Event/Resources/EventResource.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Event\Resources;
 
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -20,6 +21,8 @@ class EventResource extends JsonResource
             'location' => $this->event_location,
             'dates' => $this->eventDates->map(fn ($eventDate): array => [
                 'id' => $eventDate->id,
+                'validity_time_id' => $eventDate->validity_time_id,
+                'validity_time' => ValidityTimeResource::make($eventDate->validityTime),
                 'date' => $eventDate->date->format('Y-m-d'),
                 'start_time' => substr($eventDate->time_start, 0, 5),
                 'end_time' => substr($eventDate->time_end, 0, 5),

app/Domains/Event/Services/EventService.php

@@ -13,11 +13,9 @@ class EventService
         'facebook_url' => 'facebook',
     ];
 
-    public function __construct(protected EventDateTextFormatter $eventDateTextFormatter) {}
-
     public function forTenant(Tenant $tenant): Tenant
     {
-        return $tenant->load(['eventDates', 'socialMedia']);
+        return $tenant->load(['eventDates.validityTime', 'socialMedia']);
     }
 
     /** @param array<string, mixed> $data */
@@ -28,9 +26,6 @@ class EventService
             $tenant->update([
                 'event_title' => $data['title'],
                 'event_location' => $data['location'],
-                'event_date_text' => $this->eventDateTextFormatter->format(
-                    array_column($data['dates'], 'date')
-                ),
             ]);
 
             $this->syncDates($tenant, $data['dates']);
@@ -40,7 +35,7 @@ class EventService
                 $this->syncLegacyContact($tenant, $data['contact']);
             }
 
-            return $tenant->load(['eventDates', 'socialMedia']);
+            return $tenant->load(['eventDates.validityTime', 'socialMedia']);
         });
     }
 

app/Domains/FiestaFutbolInfantil/Services/AccommodationService.php

@@ -12,6 +12,7 @@ use App\Domains\Catalog\Models\ItemAttribute;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -136,6 +137,7 @@ class AccommodationService
                 'category_id' => $category->id,
                 'inventory_policy' => InventoryPolicy::Tracked->value,
                 'has_tickets' => true,
+                'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             ]);
 
             return $accommodation;
@@ -150,6 +152,7 @@ class AccommodationService
             'precio' => collect($variants)->min('price') ?? 0,
             'inventory_policy' => InventoryPolicy::Tracked->value,
             'has_tickets' => true,
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             'inventory_id' => null,
         ]);
     }

app/Domains/FiestaFutbolInfantil/Services/EntryService.php

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

app/Domains/FiestaFutbolInfantil/Services/FoodService.php

@@ -12,6 +12,7 @@ use App\Domains\Catalog\Models\ItemAttribute;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -147,6 +148,7 @@ class FoodService
                 'category_id' => $category->id,
                 'inventory_policy' => InventoryPolicy::Tracked->value,
                 'has_tickets' => true,
+                'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             ]);
 
             return $food;
@@ -161,6 +163,7 @@ class FoodService
             'precio' => collect($variants)->min('price') ?? 0,
             'inventory_policy' => InventoryPolicy::Tracked->value,
             'has_tickets' => true,
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
             'inventory_id' => null,
         ]);
     }

app/Domains/FiestaFutbolInfantil/Services/MerchandiseService.php

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

app/Domains/Forms/Resources/FoodFormResource.php

@@ -4,6 +4,7 @@ namespace App\Domains\Forms\Resources;
 
 use App\Domains\Catalog\Models\AttributeOption;
 use App\Domains\Event\Models\EventDate;
+use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
@@ -17,6 +18,8 @@ class FoodFormResource extends JsonResource
             'event_dates' => $this->resource['event_dates']->map(
                 fn (EventDate $eventDate): array => [
                     'id' => $eventDate->id,
+                    'validity_time_id' => $eventDate->validity_time_id,
+                    'validity_time' => ValidityTimeResource::make($eventDate->validityTime),
                     'date' => $eventDate->date->format('Y-m-d'),
                 ]
             )->values(),

app/Domains/Forms/Services/FoodFormService.php

@@ -27,7 +27,7 @@ class FoodFormService
             ->keyBy('codigo');
 
         return [
-            'event_dates' => $tenant->eventDates()->get(),
+            'event_dates' => $tenant->eventDates()->with('validityTime')->get(),
             'schedules' => $attributes->get('horario')?->options ?? new Collection,
             'services' => $attributes->get('servicio')?->options ?? new Collection,
         ];

app/Domains/Integration/Services/TelepagosWebhookService.php

@@ -127,8 +127,7 @@ class TelepagosWebhookService
 
             DB::transaction(function () use ($compra, $paymentData) {
                 TelepagosPayment::create($paymentData);
-                $this->checkoutService->confirmPurchase($compra);
+                $this->checkoutService->confirmPaidPurchase($compra);
-                $compra->markAsPaid();
             });
 
             Log::info("Telepagos webhook: Successfully processed cashin {$cashinId} for purchase {$compra->id}");

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

@@ -18,12 +18,17 @@ class ReleaseCheckoutService
 
     public function cancel(Purchase $purchase): Purchase
     {
-        return $this->release($purchase, Purchase::STATUS_CANCELLED);
+        return $this->release($purchase, Purchase::STATUS_CANCELLED, restoreCart: true);
+    }
+
+    public function cancelWithoutRestoringCart(Purchase $purchase): Purchase
+    {
+        return $this->release($purchase, Purchase::STATUS_CANCELLED, restoreCart: false);
     }
 
     public function expire(Purchase $purchase): Purchase
     {
-        return $this->release($purchase, Purchase::STATUS_EXPIRED);
+        return $this->release($purchase, Purchase::STATUS_EXPIRED, restoreCart: true);
     }
 
     public function expireOverdue(): int
@@ -46,9 +51,9 @@ class ReleaseCheckoutService
         return $expiredCount;
     }
 
-    private function release(Purchase $purchase, string $targetStatus): Purchase
+    private function release(Purchase $purchase, string $targetStatus, bool $restoreCart): Purchase
     {
-        return DB::transaction(function () use ($purchase, $targetStatus): Purchase {
+        return DB::transaction(function () use ($purchase, $targetStatus, $restoreCart): Purchase {
             $purchase = $this->lockPurchase($purchase);
 
             if ($purchase->status === Purchase::STATUS_PAID) {
@@ -76,7 +81,7 @@ class ReleaseCheckoutService
                 ->where('reservation_status', PurchaseItem::RESERVATION_ACTIVE)
                 ->lockForUpdate()
                 ->get();
-            $reservationReturnedToCart = $this->sourceCart->restore($purchase);
+            $reservationReturnedToCart = $restoreCart && $this->sourceCart->restore($purchase);
 
             foreach ($items as $item) {
                 if (! $reservationReturnedToCart) {

app/Domains/Purchase/Services/CheckoutService.php

@@ -9,6 +9,7 @@ use App\Domains\Purchase\Services\Checkout\EditCheckoutService;
 use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
 use App\Domains\Purchase\Services\Checkout\StartCheckoutService;
 use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Stable checkout API used by controllers, commands and integrations.
@@ -64,11 +65,26 @@ class CheckoutService
         $this->completer->confirm($purchase);
     }
 
+    public function confirmPaidPurchase(Purchase $purchase): Purchase
+    {
+        return DB::transaction(function () use ($purchase): Purchase {
+            $this->completer->confirm($purchase);
+            $purchase->markAsPaid();
+
+            return $purchase->refresh()->load(['items.imageAttachment']);
+        });
+    }
+
     public function cancelPurchase(Purchase $purchase): Purchase
     {
         return $this->releaser->cancel($purchase);
     }
 
+    public function cancelPurchaseWithoutRestoringCart(Purchase $purchase): Purchase
+    {
+        return $this->releaser->cancelWithoutRestoringCart($purchase);
+    }
+
     public function expirePurchase(Purchase $purchase): Purchase
     {
         return $this->releaser->expire($purchase);

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

@@ -6,6 +6,7 @@ use App\Domains\Sale\Requests\AdminAppSaleIndexRequest;
 use App\Domains\Sale\Resources\AdminApp\SaleDetailResource;
 use App\Domains\Sale\Resources\AdminApp\SaleModificationResource;
 use App\Domains\Sale\Resources\AdminApp\SaleResource;
+use App\Domains\Sale\Resources\AdminApp\SaleTicketResource;
 use App\Domains\Sale\Services\AdminAppSalePdfService;
 use App\Domains\Sale\Services\AdminAppSaleService;
 use App\Http\Controllers\Controller;
@@ -38,6 +39,29 @@ class SaleController extends Controller
         return new SaleDetailResource($this->saleService->detail($tenant, $sale));
     }
 
+    public function tickets(Request $request, int $sale): AnonymousResourceCollection
+    {
+        $tenant = $request->user()->tenant()->firstOrFail();
+
+        return SaleTicketResource::collection(
+            $this->saleService->tickets($tenant, $sale)
+        );
+    }
+
+    public function confirm(Request $request, int $sale): SaleResource
+    {
+        $tenant = $request->user()->tenant()->firstOrFail();
+
+        return new SaleResource($this->saleService->confirm($tenant, $sale));
+    }
+
+    public function cancel(Request $request, int $sale): SaleResource
+    {
+        $tenant = $request->user()->tenant()->firstOrFail();
+
+        return new SaleResource($this->saleService->cancel($tenant, $sale));
+    }
+
     public function modifications(Request $request): AnonymousResourceCollection
     {
         return SaleModificationResource::collection(

app/Domains/Sale/Resources/AdminApp/SaleTicketResource.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Sale\Resources\AdminApp;
+
+use App\Domains\Ticket\Models\Ticket;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin Ticket */
+class SaleTicketResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        return [
+            'product' => $this->name,
+            'id' => $this->id,
+            'expires_at' => $this->getEffectiveExpiresAt(),
+            'status' => $this->status,
+        ];
+    }
+}

app/Domains/Sale/Services/AdminAppSaleService.php

@@ -4,13 +4,19 @@ namespace App\Domains\Sale\Services;
 
 use App\Domains\Logging\Models\ValueChange;
 use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Services\CheckoutService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
 class AdminAppSaleService
 {
+    public function __construct(
+        protected CheckoutService $checkoutService,
+    ) {}
+
     public function confirmedSalesTotal(Tenant $tenant): string
     {
         $total = Purchase::query()
@@ -47,6 +53,34 @@ class AdminAppSaleService
             ->findOrFail($saleId);
     }
 
+    /** @return Collection<int, Ticket> */
+    public function tickets(Tenant $tenant, int $saleId): Collection
+    {
+        return $this->findForTenant($tenant, $saleId)
+            ->tickets()
+            ->with('validityGroups.validityTimes')
+            ->orderBy('id')
+            ->get();
+    }
+
+    public function confirm(Tenant $tenant, int $saleId): Purchase
+    {
+        $sale = $this->findForTenant($tenant, $saleId);
+
+        return $this->saleForResponse(
+            $this->checkoutService->confirmPaidPurchase($sale)
+        );
+    }
+
+    public function cancel(Tenant $tenant, int $saleId): Purchase
+    {
+        $sale = $this->findForTenant($tenant, $saleId);
+
+        return $this->saleForResponse(
+            $this->checkoutService->cancelPurchaseWithoutRestoringCart($sale)
+        );
+    }
+
     /**
      * @param  array<string, mixed>  $filters
      * @return Collection<int, Purchase>
@@ -125,4 +159,18 @@ class AdminAppSaleService
             ->orderByDesc('changed_at')
             ->orderByDesc('id');
     }
+
+    protected function findForTenant(Tenant $tenant, int $saleId): Purchase
+    {
+        return Purchase::query()
+            ->where('tenant_codigo', $tenant->codigo)
+            ->findOrFail($saleId);
+    }
+
+    protected function saleForResponse(Purchase $sale): Purchase
+    {
+        return $sale->refresh()
+            ->loadSum('items as quantity', 'cantidad')
+            ->loadCount('tickets');
+    }
 }

app/Domains/Sale/routes/adminapp.php

@@ -10,5 +10,8 @@ Route::prefix('v1/adminapp/tenant')
         Route::get('sales/pdf', [SaleController::class, 'downloadPdf']);
         Route::get('sales/modifications', [SaleController::class, 'modifications']);
         Route::get('sales/modifications/pdf', [SaleController::class, 'downloadModificationsPdf']);
+        Route::post('sales/{sale}/confirm', [SaleController::class, 'confirm'])->whereNumber('sale');
+        Route::post('sales/{sale}/cancel', [SaleController::class, 'cancel'])->whereNumber('sale');
+        Route::get('sales/{sale}/tickets', [SaleController::class, 'tickets'])->whereNumber('sale');
         Route::get('sales/{sale}', [SaleController::class, 'show'])->whereNumber('sale');
     });

app/Domains/Tenant/Models/Tenant.php

@@ -33,6 +33,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
     'search_product_layout',
     'search_group_layout',
     'search_items_per_page',
+    'display_categories',
+    'display_seach_bar',
     'event_title',
     'event_location',
     'event_date_text',
@@ -45,6 +47,8 @@ class Tenant extends Model
         'search_product_layout' => ProductLayout::ColumnWithImage->value,
         'search_group_layout' => GroupLayout::Paginated->value,
         'search_items_per_page' => 12,
+        'display_categories' => true,
+        'display_seach_bar' => true,
     ];
 
     public function getRouteKeyName(): string
@@ -63,6 +67,8 @@ class Tenant extends Model
             'search_product_layout' => ProductLayout::class,
             'search_group_layout' => GroupLayout::class,
             'search_items_per_page' => 'integer',
+            'display_categories' => 'boolean',
+            'display_seach_bar' => 'boolean',
         ];
     }
 

app/Domains/Tenant/Models/WebsiteExtra.php

@@ -19,6 +19,10 @@ class WebsiteExtra extends Model
 
     protected $table = 'websites_extras';
 
+    protected $attributes = [
+        'is_enabled' => true,
+    ];
+
     private mixed $resolvedConfig = null;
 
     private bool $hasResolvedConfig = false;

app/Domains/Tenant/Requests/StoreTenantRequest.php

@@ -75,6 +75,8 @@ class StoreTenantRequest extends FormRequest
             'search_product_layout' => ['sometimes', Rule::enum(ProductLayout::class)],
             'search_group_layout' => ['sometimes', Rule::enum(GroupLayout::class)],
             'search_items_per_page' => ['sometimes', 'integer', 'min:4', 'max:48'],
+            'display_categories' => ['sometimes', 'boolean'],
+            'display_seach_bar' => ['sometimes', 'boolean'],
             'website_type_code' => [
                 'required_with:extras',
                 'sometimes',

app/Domains/Tenant/Requests/UpdateTenantRequest.php

@@ -85,6 +85,8 @@ class UpdateTenantRequest extends FormRequest
             'search_product_layout' => ['sometimes', Rule::enum(ProductLayout::class)],
             'search_group_layout' => ['sometimes', Rule::enum(GroupLayout::class)],
             'search_items_per_page' => ['sometimes', 'integer', 'min:4', 'max:48'],
+            'display_categories' => ['sometimes', 'boolean'],
+            'display_seach_bar' => ['sometimes', 'boolean'],
         ];
     }
 }

app/Domains/Tenant/Resources/TenantResource.php

@@ -9,6 +9,7 @@ use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 /**
  * @mixin Tenant
@@ -61,6 +62,8 @@ class TenantResource extends JsonResource
             'search_product_layout' => $this->search_product_layout->value,
             'search_group_layout' => $this->search_group_layout->value,
             'search_items_per_page' => $this->search_items_per_page,
+            'display_categories' => $this->display_categories,
+            'display_seach_bar' => $this->display_seach_bar,
             'social_media' => $this->whenLoaded(
                 'socialMedia',
                 fn () => $this->socialMedia
@@ -157,6 +160,10 @@ class TenantResource extends JsonResource
 
             $formatted['submenues'] = $childrenByParent
                 ->get($menu->code, collect())
+                ->sortBy(
+                    fn (Menu $submenu) => Str::lower(Str::ascii($submenu->label)),
+                    SORT_NATURAL
+                )
                 ->map($formatMenu)
                 ->values();
 
@@ -166,6 +173,10 @@ class TenantResource extends JsonResource
         return $menus
             ->filter(fn (Menu $menu) => $menu->parent_menu_code === null
                 || ! $menuCodes->has($menu->parent_menu_code))
+            ->sortBy(
+                fn (Menu $menu) => Str::lower(Str::ascii($menu->label)),
+                SORT_NATURAL
+            )
             ->map($formatMenu)
             ->values();
     }

app/Domains/Ticket/Controllers/TicketController.php

@@ -22,7 +22,7 @@ class TicketController extends Controller
         $tickets = Ticket::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('user_id', $request->user()->getKey())
-            ->with('validityTime', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
+            ->with('validityGroups.validityTimes', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
             ->orderByDesc('id')
             ->get();
 
@@ -36,7 +36,7 @@ class TicketController extends Controller
             ->where('tenant_code', $tenant->codigo)
             ->where('user_id', $request->user()->getKey())
             ->whereIn('id', $ticketIds)
-            ->with('validityTime', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
+            ->with('validityGroups.validityTimes', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
             ->orderByDesc('id')
             ->get();
 

app/Domains/Ticket/Enums/TicketGenerationPolicy.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Domains\Ticket\Enums;
+
+enum TicketGenerationPolicy: string
+{
+    case PerEventDate = 'per_event_date';
+    case OnePerUnit = 'one_per_unit';
+
+    /** @return list<string> */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Ticket/Models/Ticket.php

@@ -9,9 +9,12 @@ use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Tenant\Models\Tenant;
 use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Collection;
 
 #[Fillable([
     'tenant_code',
@@ -21,7 +24,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
     'source_purchase_id',
     'source_catalog_item_id',
     'source_variant_id',
-    'validity_time_id',
     'used_at',
     'scanner_user_id',
     'user_id',
@@ -30,12 +32,19 @@ class Ticket extends Model
 {
     use HasFactory;
 
+    public const STATUS_ACTIVE = 'active';
+
+    public const STATUS_EXPIRED = 'expired';
+
+    public const STATUS_USED = 'used';
+
     public $timestamps = false;
 
     protected $appends = [
         'is_valid',
         'is_expired',
         'is_used',
+        'status',
     ];
 
     protected function casts(): array
@@ -44,7 +53,6 @@ class Ticket extends Model
             'source_catalog_item_id' => 'integer',
             'source_variant_id' => 'integer',
             'source_purchase_id' => 'integer',
-            'validity_time_id' => 'integer',
             'used_at' => 'datetime',
             'scanner_user_id' => 'integer',
             'user_id' => 'integer',
@@ -87,18 +95,23 @@ class Ticket extends Model
         return $this->belongsTo(Variant::class, 'source_variant_id');
     }
 
-    /** @return BelongsTo<ValidityTime, $this> */
+    /** @return HasMany<TicketValidityGroup, $this> */
-    public function validityTime(): BelongsTo
+    public function validityGroups(): HasMany
     {
-        return $this->belongsTo(ValidityTime::class);
+        return $this->hasMany(TicketValidityGroup::class);
     }
 
     public function isValid(): bool
     {
-        return $this->used_at === null
+        if ($this->used_at !== null) {
-            && (
+            return false;
-                $this->validityTime === null
+        }
-                || $this->validityTime->isValid()
+
+        $validityGroups = $this->resolvedValidityGroups();
+
+        return $validityGroups->isEmpty()
+            || $validityGroups->contains(
+                fn (TicketValidityGroup $group): bool => $group->isValid()
             );
     }
 
@@ -109,11 +122,13 @@ class Ticket extends Model
 
     public function getIsExpiredAttribute(): bool
     {
-        $expiresAt = $this->getEffectiveExpiresAt();
+        $validityGroups = $this->resolvedValidityGroups();
 
         return $this->used_at === null
-            && $expiresAt !== null
+            && $validityGroups->isNotEmpty()
-            && $expiresAt->lessThanOrEqualTo(now());
+            && $validityGroups->every(
+                fn (TicketValidityGroup $group): bool => $group->isExpired()
+            );
     }
 
     public function getIsUsedAttribute(): bool
@@ -121,13 +136,65 @@ class Ticket extends Model
         return $this->used_at !== null;
     }
 
+    public function getStatusAttribute(): string
+    {
+        if ($this->is_used) {
+            return self::STATUS_USED;
+        }
+
+        if ($this->is_expired) {
+            return self::STATUS_EXPIRED;
+        }
+
+        return self::STATUS_ACTIVE;
+    }
+
     public function getEffectiveStartsAt(): ?CarbonInterface
     {
-        return $this->validityTime?->startsAt();
+        return $this->resolvedValidityGroups()
+            ->map(fn (TicketValidityGroup $group): ?CarbonInterface => $group->effectiveStartsAt())
+            ->filter()
+            ->sortBy(fn (CarbonInterface $startsAt): int => $startsAt->getTimestamp())
+            ->first();
     }
 
     public function getEffectiveExpiresAt(): ?CarbonInterface
     {
-        return $this->validityTime?->expiresAt();
+        return $this->resolvedValidityGroups()
+            ->map(fn (TicketValidityGroup $group): ?CarbonInterface => $group->effectiveExpiresAt())
+            ->filter()
+            ->sortByDesc(fn (CarbonInterface $expiresAt): int => $expiresAt->getTimestamp())
+            ->first();
+    }
+
+    /** @return Collection<int, ValidityTime> */
+    public function allValidityTimes(): Collection
+    {
+        return $this->resolvedValidityGroups()
+            ->flatMap(fn (TicketValidityGroup $group): EloquentCollection => $group->resolvedValidityTimes())
+            ->unique(
+                fn (ValidityTime $validityTime): int => $validityTime->getKey()
+                    ?? spl_object_id($validityTime)
+            )
+            ->values();
+    }
+
+    /** @return EloquentCollection<int, TicketValidityGroup> */
+    public function resolvedValidityGroups(): EloquentCollection
+    {
+        if ($this->relationLoaded('validityGroups')) {
+            return $this->getRelation('validityGroups');
+        }
+
+        if (! $this->exists) {
+            return new EloquentCollection;
+        }
+
+        $validityGroups = $this->validityGroups()
+            ->with('validityTimes')
+            ->get();
+        $this->setRelation('validityGroups', $validityGroups);
+
+        return $validityGroups;
     }
 }

app/Domains/Ticket/Models/TicketValidityGroup.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Domains\Ticket\Models;
+
+use App\Domains\Ticket\Enums\ValidityTimeType;
+use Carbon\CarbonInterface;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+#[Fillable(['ticket_id'])]
+class TicketValidityGroup extends Model
+{
+    public $timestamps = false;
+
+    /** @return BelongsTo<Ticket, $this> */
+    public function ticket(): BelongsTo
+    {
+        return $this->belongsTo(Ticket::class);
+    }
+
+    /** @return BelongsToMany<ValidityTime, $this> */
+    public function validityTimes(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            ValidityTime::class,
+            'ticket_validity_group_times',
+            'ticket_validity_group_id',
+            'validity_time_id',
+        );
+    }
+
+    public function isValid(?CarbonInterface $at = null): bool
+    {
+        $at ??= now();
+        $validityTimes = $this->resolvedValidityTimes();
+
+        return $validityTimes->isNotEmpty()
+            && $validityTimes->every(
+                fn (ValidityTime $validityTime): bool => $validityTime->isValid($at)
+            );
+    }
+
+    public function isExpired(?CarbonInterface $at = null): bool
+    {
+        $at ??= now();
+        $expiresAt = $this->effectiveExpiresAt($at);
+
+        return $expiresAt !== null && $expiresAt->lessThanOrEqualTo($at);
+    }
+
+    public function effectiveStartsAt(?CarbonInterface $at = null): ?CarbonInterface
+    {
+        $at ??= now();
+        $anchor = $this->dateAnchor() ?? $at;
+
+        return $this->resolvedValidityTimes()
+            ->map(fn (ValidityTime $validityTime): ?CarbonInterface => $validityTime->startsAt($anchor))
+            ->filter()
+            ->sortByDesc(fn (CarbonInterface $startsAt): int => $startsAt->getTimestamp())
+            ->first();
+    }
+
+    public function effectiveExpiresAt(?CarbonInterface $at = null): ?CarbonInterface
+    {
+        $at ??= now();
+        $anchor = $this->dateAnchor() ?? $at;
+
+        return $this->resolvedValidityTimes()
+            ->map(function (ValidityTime $validityTime) use ($anchor): ?CarbonInterface {
+                $startsAt = $validityTime->startsAt($anchor);
+                $expiresAt = $validityTime->expiresAt($anchor);
+
+                if (
+                    $startsAt !== null
+                    && $expiresAt !== null
+                    && $expiresAt->lessThanOrEqualTo($startsAt)
+                ) {
+                    return $expiresAt->addDay();
+                }
+
+                return $expiresAt;
+            })
+            ->filter()
+            ->sortBy(fn (CarbonInterface $expiresAt): int => $expiresAt->getTimestamp())
+            ->first();
+    }
+
+    /** @return EloquentCollection<int, ValidityTime> */
+    public function resolvedValidityTimes(): EloquentCollection
+    {
+        if ($this->relationLoaded('validityTimes')) {
+            return $this->getRelation('validityTimes');
+        }
+
+        if (! $this->exists) {
+            return new EloquentCollection;
+        }
+
+        $validityTimes = $this->validityTimes()->get();
+        $this->setRelation('validityTimes', $validityTimes);
+
+        return $validityTimes;
+    }
+
+    private function dateAnchor(): ?CarbonInterface
+    {
+        return $this->resolvedValidityTimes()
+            ->filter(fn (ValidityTime $validityTime): bool => $validityTime->type === ValidityTimeType::FixedWindow)
+            ->map(fn (ValidityTime $validityTime): ?CarbonInterface => $validityTime->fixed_starts_at)
+            ->filter()
+            ->sortByDesc(fn (CarbonInterface $startsAt): int => $startsAt->getTimestamp())
+            ->first();
+    }
+}

app/Domains/Ticket/Models/ValidityTime.php

@@ -4,13 +4,16 @@ namespace App\Domains\Ticket\Models;
 
 use App\Domains\Catalog\Models\AttributeOption;
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Event\Models\EventDate;
 use App\Domains\Ticket\Enums\ValidityTimeType;
 use Carbon\CarbonImmutable;
 use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 #[Fillable([
     'type',
@@ -44,10 +47,21 @@ class ValidityTime extends Model
         return $this->hasMany(AttributeOption::class);
     }
 
-    /** @return HasMany<Ticket, $this> */
+    /** @return HasOne<EventDate, $this> */
-    public function tickets(): HasMany
+    public function eventDate(): HasOne
     {
-        return $this->hasMany(Ticket::class);
+        return $this->hasOne(EventDate::class);
+    }
+
+    /** @return BelongsToMany<TicketValidityGroup, $this> */
+    public function ticketValidityGroups(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            TicketValidityGroup::class,
+            'ticket_validity_group_times',
+            'validity_time_id',
+            'ticket_validity_group_id',
+        );
     }
 
     public function startsAt(

app/Domains/Ticket/Resources/TicketResource.php

@@ -20,8 +20,10 @@ class TicketResource extends JsonResource
             'description' => $this->description,
             'source_catalog_item_id' => $this->source_catalog_item_id,
             'source_variant_id' => $this->source_variant_id,
-            'validity_time_id' => $this->validity_time_id,
+            'validity_times' => ValidityTimeResource::collection($this->allValidityTimes()),
-            'validity_time' => ValidityTimeResource::make($this->validityTime),
+            'validity_groups' => TicketValidityGroupResource::collection(
+                $this->resolvedValidityGroups()
+            ),
             'starts_at' => $this->getEffectiveStartsAt(),
             'expires_at' => $this->getEffectiveExpiresAt(),
             'used_at' => $this->used_at,

app/Domains/Ticket/Resources/TicketValidityGroupResource.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Domains\Ticket\Resources;
+
+use App\Domains\Ticket\Models\TicketValidityGroup;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin TicketValidityGroup */
+class TicketValidityGroupResource extends JsonResource
+{
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'validity_times' => ValidityTimeResource::collection($this->resolvedValidityTimes()),
+            'starts_at' => $this->effectiveStartsAt(),
+            'expires_at' => $this->effectiveExpiresAt(),
+            'is_valid' => $this->isValid(),
+            'is_expired' => $this->isExpired(),
+        ];
+    }
+}

app/Domains/Ticket/Services/TicketGeneratorService.php

@@ -6,10 +6,12 @@ use App\Domains\Auth\Models\User;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use App\Domains\Ticket\Exceptions\TicketGenerationException;
 use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticket\Models\TicketValidityGroup;
 use App\Domains\Ticket\Models\ValidityTime;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -36,25 +38,22 @@ class TicketGeneratorService
                 $quantity,
                 $sourceVariantId,
             );
-            $fixedValidityTimes = [];
 
             return $targets->map(function (array $target) use (
-                &$fixedValidityTimes,
                 $sourcePurchaseId,
                 $user,
             ): Ticket {
                 $item = $target['catalog_item'];
                 $variant = $target['variant'];
                 $eventDate = $target['event_date'];
-                $validityTime = $this->resolveValidityTime($item, $variant);
+                $validityGroups = $this->buildTicketValidityGroups(
-                $validityTime = $this->materializeEventDateValidityTime(
+                    $item,
                     $variant,
                     $eventDate,
-                    $validityTime,
+                    $this->resolveValidityTime($item, $variant),
-                    $fixedValidityTimes,
                 );
 
-                return Ticket::query()->create([
+                $ticket = Ticket::query()->create([
                     'tenant_code' => $item->tenant_code,
                     'ticket' => (string) Str::uuid(),
                     'name' => $this->ticketName($item, $variant, $eventDate),
@@ -62,10 +61,28 @@ class TicketGeneratorService
                     'source_purchase_id' => $sourcePurchaseId,
                     'source_catalog_item_id' => $item->getKey(),
                     'source_variant_id' => $variant?->getKey(),
-                    'validity_time_id' => $validityTime?->getKey(),
                     'used_at' => null,
                     'user_id' => $user->getKey(),
                 ]);
+
+                $groups = $validityGroups->map(function (Collection $validityTimes) use ($ticket): TicketValidityGroup {
+                    $group = $ticket->validityGroups()->create();
+                    $group->validityTimes()->attach(
+                        $validityTimes
+                            ->map(fn (ValidityTime $validityTime): int => $validityTime->getKey())
+                            ->all()
+                    );
+                    $group->setRelation(
+                        'validityTimes',
+                        new EloquentCollection($validityTimes->all()),
+                    );
+
+                    return $group;
+                });
+
+                $ticket->setRelation('validityGroups', new EloquentCollection($groups->all()));
+
+                return $ticket;
             });
         });
     }
@@ -125,8 +142,21 @@ class TicketGeneratorService
             ]);
         }
 
-        $variant->loadMissing(['eventDates', 'eventDate']);
+        $variant->loadMissing(['eventDates.validityTime', 'eventDate.validityTime']);
         $selectedEventDates = $variant->selectedEventDates();
+
+        if ($catalogItem->ticket_generation_policy === TicketGenerationPolicy::OnePerUnit) {
+            $eventDate = $selectedEventDates->count() === 1
+                ? $selectedEventDates->first()
+                : null;
+
+            return Collection::times($quantity, fn (): array => [
+                'catalog_item' => $catalogItem,
+                'variant' => $variant,
+                'event_date' => $eventDate,
+            ]);
+        }
+
         $eventDates = $selectedEventDates->isEmpty()
             ? collect([null])
             : $selectedEventDates;
@@ -246,52 +276,37 @@ class TicketGeneratorService
         return $catalogItem->nombre.' ('.$properties->implode(', ').')';
     }
 
-    /**
+    /** @return Collection<int, Collection<int, ValidityTime>> */
-     * Convert a recurring time window into the fixed date and time purchased by
+    private function buildTicketValidityGroups(
-     * the customer. Equal tickets generated together share the same snapshot.
+        CatalogItem $catalogItem,
-     *
-     * @param  array<string, ValidityTime>  $fixedValidityTimes
-     */
-    private function materializeEventDateValidityTime(
         ?Variant $variant,
         ?EventDate $eventDate,
         ?ValidityTime $validityTime,
-        array &$fixedValidityTimes,
+    ): Collection {
-    ): ?ValidityTime {
+        $eventDates = collect([$eventDate]);
-        if (
-            $variant === null
-            || $eventDate === null
-        ) {
-            return $validityTime;
-        }
-
-        if ($validityTime !== null && $validityTime->type !== ValidityTimeType::TimeWindow) {
-            return $validityTime;
-        }
-
-        $cacheKey = $eventDate->getKey().':'.($validityTime?->getKey() ?? 'event');
-
-        if (isset($fixedValidityTimes[$cacheKey])) {
-            return $fixedValidityTimes[$cacheKey];
-        }
-
-        $startsAt = $validityTime?->startsAt($eventDate->date) ?? $eventDate->startsAt();
-        $expiresAt = $validityTime?->expiresAt($eventDate->date) ?? $eventDate->endsAt();
 
         if (
-            $startsAt !== null
+            $catalogItem->ticket_generation_policy === TicketGenerationPolicy::OnePerUnit
-            && $expiresAt !== null
+            && $variant !== null
-            && $expiresAt->lessThanOrEqualTo($startsAt)
         ) {
-            $expiresAt = $expiresAt->addDay();
+            $variant->loadMissing(['eventDates.validityTime', 'eventDate.validityTime']);
+            $selectedEventDates = $variant->selectedEventDates();
+
+            if ($selectedEventDates->isNotEmpty()) {
+                $eventDates = $selectedEventDates;
+            }
         }
 
-        return $fixedValidityTimes[$cacheKey] = ValidityTime::query()->create([
+        return $eventDates
-            'type' => ValidityTimeType::FixedWindow,
+            ->map(function (?EventDate $date) use ($validityTime): Collection {
-            'start_time' => null,
+                $date?->loadMissing('validityTime');
-            'end_time' => null,
+
-            'fixed_starts_at' => $startsAt,
+                return collect([$date?->validityTime, $validityTime])
-            'fixed_expires_at' => $expiresAt,
+                    ->filter()
-        ]);
+                    ->unique(fn (ValidityTime $time): int => $time->getKey())
+                    ->values();
+            })
+            ->filter(fn (Collection $group): bool => $group->isNotEmpty())
+            ->values();
     }
 }

database/migrations/2026_08_11_000000_add_header_display_options_to_tenants_table.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('tenants', function (Blueprint $table): void {
+            $table->boolean('display_categories')->default(true)->after('search_items_per_page');
+            $table->boolean('display_seach_bar')->default(true)->after('display_categories');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('tenants', function (Blueprint $table): void {
+            $table->dropColumn(['display_categories', 'display_seach_bar']);
+        });
+    }
+};

database/migrations/2026_08_11_000100_configure_header_display_options_for_seeded_tenants.php

@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        DB::table('tenants')
+            ->where('codigo', 'fiesta_futbol_infantil')
+            ->update([
+                'display_categories' => false,
+                'display_seach_bar' => false,
+            ]);
+
+        DB::table('tenants')
+            ->where('codigo', 'sonder')
+            ->update([
+                'display_categories' => true,
+                'display_seach_bar' => true,
+            ]);
+    }
+
+    public function down(): void {}
+};

database/migrations/2026_08_11_120000_default_website_extras_is_enabled_to_true.php

@@ -0,0 +1,27 @@
+<?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
+    {
+        DB::table('websites_extras')
+            ->whereNull('is_enabled')
+            ->update(['is_enabled' => true]);
+
+        Schema::table('websites_extras', function (Blueprint $table): void {
+            $table->boolean('is_enabled')->default(true)->nullable(false)->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('websites_extras', function (Blueprint $table): void {
+            $table->boolean('is_enabled')->nullable()->default(null)->change();
+        });
+    }
+};

database/migrations/2026_08_11_130000_add_ticket_generation_policy_to_catalog_items.php

@@ -0,0 +1,32 @@
+<?php
+
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
+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
+    {
+        Schema::table('catalog_items', function (Blueprint $table): void {
+            $table->enum('ticket_generation_policy', TicketGenerationPolicy::values())
+                ->default(TicketGenerationPolicy::PerEventDate->value)
+                ->after('has_tickets');
+        });
+
+        DB::table('catalog_items')
+            ->where('tenant_code', 'fiesta_futbol_infantil')
+            ->update([
+                'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
+            ]);
+    }
+
+    public function down(): void
+    {
+        Schema::table('catalog_items', function (Blueprint $table): void {
+            $table->dropColumn('ticket_generation_policy');
+        });
+    }
+};

database/migrations/2026_08_11_140000_allow_multiple_validity_times_per_ticket.php

@@ -0,0 +1,63 @@
+<?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
+    {
+        Schema::create('ticket_validity_times', function (Blueprint $table): void {
+            $table->foreignId('ticket_id')
+                ->constrained('tickets')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+            $table->foreignId('validity_time_id')
+                ->constrained('validity_times')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+
+            $table->primary(['ticket_id', 'validity_time_id']);
+        });
+
+        DB::table('ticket_validity_times')->insertUsing(
+            ['ticket_id', 'validity_time_id'],
+            DB::table('tickets')
+                ->select(['id', 'validity_time_id'])
+                ->whereNotNull('validity_time_id'),
+        );
+
+        Schema::table('tickets', function (Blueprint $table): void {
+            $table->dropConstrainedForeignId('validity_time_id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('tickets', function (Blueprint $table): void {
+            $table->foreignId('validity_time_id')
+                ->nullable()
+                ->after('source_variant_id')
+                ->constrained('validity_times')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+        });
+
+        DB::table('ticket_validity_times')
+            ->orderBy('ticket_id')
+            ->orderBy('validity_time_id')
+            ->get()
+            ->groupBy('ticket_id')
+            ->each(function ($validityTimes, int|string $ticketId): void {
+                DB::table('tickets')
+                    ->where('id', $ticketId)
+                    ->update([
+                        'validity_time_id' => $validityTimes->first()->validity_time_id,
+                    ]);
+            });
+
+        Schema::dropIfExists('ticket_validity_times');
+    }
+};

database/migrations/2026_08_11_150000_add_validity_time_to_event_dates.php

@@ -0,0 +1,68 @@
+<?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
+    {
+        Schema::table('event_dates', function (Blueprint $table): void {
+            $table->unsignedBigInteger('validity_time_id')
+                ->nullable()
+                ->unique()
+                ->after('id');
+        });
+
+        DB::table('event_dates')
+            ->orderBy('id')
+            ->each(function (object $eventDate): void {
+                $startsAt = $eventDate->date.' '.$eventDate->time_start;
+                $expiresAt = $eventDate->date.' '.$eventDate->time_end;
+
+                if (strtotime($expiresAt) <= strtotime($startsAt)) {
+                    $expiresAt = date('Y-m-d H:i:s', strtotime($expiresAt.' +1 day'));
+                }
+
+                $validityTimeId = DB::table('validity_times')->insertGetId([
+                    'type' => 'fixed_window',
+                    'start_time' => null,
+                    'end_time' => null,
+                    'fixed_starts_at' => $startsAt,
+                    'fixed_expires_at' => $expiresAt,
+                    'created_at' => now(),
+                    'updated_at' => now(),
+                ]);
+
+                DB::table('event_dates')
+                    ->where('id', $eventDate->id)
+                    ->update(['validity_time_id' => $validityTimeId]);
+            });
+
+        Schema::table('event_dates', function (Blueprint $table): void {
+            $table->unsignedBigInteger('validity_time_id')->nullable(false)->change();
+            $table->foreign('validity_time_id')
+                ->references('id')
+                ->on('validity_times')
+                ->restrictOnDelete();
+        });
+    }
+
+    public function down(): void
+    {
+        $validityTimeIds = DB::table('event_dates')
+            ->pluck('validity_time_id')
+            ->filter()
+            ->all();
+
+        Schema::table('event_dates', function (Blueprint $table): void {
+            $table->dropForeign(['validity_time_id']);
+            $table->dropUnique(['validity_time_id']);
+            $table->dropColumn('validity_time_id');
+        });
+
+        DB::table('validity_times')->whereIn('id', $validityTimeIds)->delete();
+    }
+};

database/migrations/2026_08_11_160000_group_ticket_validity_times.php

@@ -0,0 +1,88 @@
+<?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
+    {
+        Schema::create('ticket_validity_groups', function (Blueprint $table): void {
+            $table->id();
+            $table->foreignId('ticket_id')
+                ->constrained('tickets')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+        });
+
+        Schema::create('ticket_validity_group_times', function (Blueprint $table): void {
+            $table->foreignId('ticket_validity_group_id')
+                ->constrained('ticket_validity_groups')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+            $table->foreignId('validity_time_id')
+                ->constrained('validity_times')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+
+            $table->primary(['ticket_validity_group_id', 'validity_time_id']);
+        });
+
+        // Every former pivot row was an OR alternative, so each one becomes
+        // an independent group to preserve existing ticket behavior.
+        DB::table('ticket_validity_times')
+            ->orderBy('ticket_id')
+            ->orderBy('validity_time_id')
+            ->each(function (object $association): void {
+                $groupId = DB::table('ticket_validity_groups')->insertGetId([
+                    'ticket_id' => $association->ticket_id,
+                ]);
+
+                DB::table('ticket_validity_group_times')->insert([
+                    'ticket_validity_group_id' => $groupId,
+                    'validity_time_id' => $association->validity_time_id,
+                ]);
+            });
+
+        Schema::dropIfExists('ticket_validity_times');
+    }
+
+    public function down(): void
+    {
+        Schema::create('ticket_validity_times', function (Blueprint $table): void {
+            $table->foreignId('ticket_id')
+                ->constrained('tickets')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+            $table->foreignId('validity_time_id')
+                ->constrained('validity_times')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+
+            $table->primary(['ticket_id', 'validity_time_id']);
+        });
+
+        DB::table('ticket_validity_group_times')
+            ->join(
+                'ticket_validity_groups',
+                'ticket_validity_groups.id',
+                '=',
+                'ticket_validity_group_times.ticket_validity_group_id',
+            )
+            ->select([
+                'ticket_validity_groups.ticket_id',
+                'ticket_validity_group_times.validity_time_id',
+            ])
+            ->distinct()
+            ->orderBy('ticket_validity_groups.ticket_id')
+            ->each(fn (object $association) => DB::table('ticket_validity_times')->insert([
+                'ticket_id' => $association->ticket_id,
+                'validity_time_id' => $association->validity_time_id,
+            ]));
+
+        Schema::dropIfExists('ticket_validity_group_times');
+        Schema::dropIfExists('ticket_validity_groups');
+    }
+};

database/seeders/FiestaFutbolInfantilProductSeeder.php

@@ -11,6 +11,7 @@ use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\FeaturedGroup;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Illuminate\Database\Seeder;
 use RuntimeException;
 
@@ -145,6 +146,7 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
             'inventory_policy' => InventoryPolicy::Tracked->value,
             ...$data,
             'has_tickets' => true,
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
         ]);
     }
 

database/seeders/MenuSeeder.php

@@ -252,6 +252,12 @@ class MenuSeeder extends Seeder
             'adminapp.fiesta-futbol-infantil.merchandising',
             'adminapp.fiesta-futbol-infantil.comida',
         ];
+        $fiestaExcludedAdminMenuCodes = [
+            'adminapp.inicio',
+            'adminapp.catalog',
+            'adminapp.categories',
+            'adminapp.combos',
+        ];
         $frequentlyAskedQuestions = [
             [
                 'pregunta' => '¿Hay algún límite de compra?',
@@ -311,6 +317,8 @@ class MenuSeeder extends Seeder
 
             if ($tenant->codigo !== 'fiesta_futbol_infantil') {
                 $menuCodes = array_diff($menuCodes, $fiestaCategoryMenuCodes);
+            } else {
+                $menuCodes = array_diff($menuCodes, $fiestaExcludedAdminMenuCodes);
             }
 
             // Usar sync para asociar los menues al tenant

database/seeders/TenantSeeder.php

@@ -56,6 +56,8 @@ class TenantSeeder extends Seeder
             'success_color' => '#198754',
             'header_bg_color' => '#ffffff',
             'footer_bg_color' => '#313131',
+            'display_categories' => true,
+            'display_seach_bar' => true,
             'header_logo' => $this->uploadedImage('images/tennants/sonder/sonder_header.png', 'sonder_header.png'),
             'footer_logo' => $this->uploadedImage('images/tennants/sonder/sonder_footer.png', 'sonder_footer.png'),
             'social_media' => self::SOCIAL_MEDIA,
@@ -107,6 +109,8 @@ class TenantSeeder extends Seeder
             'success_color' => '#198754',
             'header_bg_color' => '#ffffff',
             'footer_bg_color' => '#015327',
+            'display_categories' => false,
+            'display_seach_bar' => false,
             'header_logo' => $this->uploadedImage(
                 'images/tennants/fiesta_futbol_infantil/futbol_infantil_header.png',
                 'futbol_infantil_header.png',

tests/Feature/Catalog/CatalogItemDetailControllerTest.php

@@ -218,6 +218,8 @@ class CatalogItemDetailControllerTest extends TestCase
             ->assertJsonPath('data.attributes.0.options.0.id', $eventDate->id)
             ->assertJsonPath('data.attributes.0.options.0.value', (string) $eventDate->id)
             ->assertJsonPath('data.attributes.0.options.0.label', '09/10/2026')
+            ->assertJsonPath('data.attributes.0.options.0.validity_time_id', $eventDate->validity_time_id)
+            ->assertJsonPath('data.attributes.0.options.0.validity_time.type', 'fixed_window')
             ->assertJsonPath('data.attributes.0.options.1.id', $unusedEventDate->id)
             ->assertJsonPath('data.attributes.0.options.1.value', (string) $unusedEventDate->id)
             ->assertJsonPath('data.variants.0.values.event_date.value', (string) $eventDate->id)

tests/Feature/Catalog/CatalogSchemaTest.php

@@ -32,6 +32,7 @@ class CatalogSchemaTest extends TestCase
     {
         $this->assertEqualsCanonicalizing([
             'id',
+            'validity_time_id',
             'tenant_code',
             'category_id',
             'brand_id',
@@ -44,6 +45,7 @@ class CatalogSchemaTest extends TestCase
             'inventory_policy',
             'max_units_per_user',
             'has_tickets',
+            'ticket_generation_policy',
             'validity_time_id',
         ], Schema::getColumnListing('catalog_items'));
     }

tests/Feature/Event/AdminAppEventControllerTest.php

@@ -8,6 +8,7 @@ use App\Domains\Auth\Models\User;
 use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Models\WebsiteType;
+use App\Domains\Ticket\Enums\ValidityTimeType;
 use Database\Seeders\AuthorizationSeeder;
 use Database\Seeders\SocialMediaSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -45,6 +46,7 @@ class AdminAppEventControllerTest extends TestCase
             ->assertJsonPath('data.title', 'Festival Acme')
             ->assertJsonPath('data.location', 'Predio Ferial, Rosario')
             ->assertJsonPath('data.dates.0.date', '2026-10-09')
+            ->assertJsonPath('data.dates.0.validity_time.type', 'fixed_window')
             ->assertJsonPath('data.dates.0.start_time', '09:00')
             ->assertJsonPath('data.dates.0.end_time', '18:30')
             ->assertJsonPath('data.contact.whatsapp_url', 'https://wa.me/5493415550101')
@@ -64,6 +66,17 @@ class AdminAppEventControllerTest extends TestCase
             'time_start' => '09:00:00',
             'time_end' => '18:30:00',
         ]);
+        $eventDate = $tenant->eventDates()->with('validityTime')->sole();
+        $this->assertSame($eventDate->validity_time_id, $response->json('data.dates.0.validity_time_id'));
+        $this->assertSame(ValidityTimeType::FixedWindow, $eventDate->validityTime->type);
+        $this->assertSame(
+            '2026-10-09 09:00:00',
+            $eventDate->validityTime->fixed_starts_at->format('Y-m-d H:i:s'),
+        );
+        $this->assertSame(
+            '2026-10-09 18:30:00',
+            $eventDate->validityTime->fixed_expires_at->format('Y-m-d H:i:s'),
+        );
         $this->assertDatabaseHas('tenant_social_media', [
             'tenant_code' => $tenant->codigo,
             'social_media_code' => 'whatsapp',
@@ -110,6 +123,8 @@ class AdminAppEventControllerTest extends TestCase
             'time_start' => '08:00',
             'time_end' => '12:00',
         ]);
+        $firstValidityTimeId = $firstDate->validity_time_id;
+        $removedValidityTimeId = $removedDate->validity_time_id;
         $tenant->socialMedia()->attach('facebook', [
             'url' => 'https://facebook.com/old',
             'orden' => 2,
@@ -135,9 +150,17 @@ class AdminAppEventControllerTest extends TestCase
 
         $this->assertDatabaseHas('event_dates', [
             'id' => $firstDate->id,
+            'validity_time_id' => $firstValidityTimeId,
             'date' => '2026-11-15',
         ]);
+        $this->assertDatabaseHas('validity_times', [
+            'id' => $firstValidityTimeId,
+            'type' => ValidityTimeType::FixedWindow->value,
+            'fixed_starts_at' => '2026-11-15 10:00:00',
+            'fixed_expires_at' => '2026-11-15 20:00:00',
+        ]);
         $this->assertDatabaseMissing('event_dates', ['id' => $removedDate->id]);
+        $this->assertDatabaseMissing('validity_times', ['id' => $removedValidityTimeId]);
         $this->assertSame('15 de Noviembre 2026', $tenant->fresh()->event_date_text);
         $this->assertDatabaseMissing('tenant_social_media', [
             'tenant_code' => $tenant->codigo,

tests/Feature/Forms/AdminAppFoodFormControllerTest.php

@@ -38,7 +38,7 @@ class AdminAppFoodFormControllerTest extends TestCase
             'dominio' => 'fiesta.test',
             'website_type_code' => 'onticket',
         ]);
-        $tenant->eventDates()->create([
+        $eventDate = $tenant->eventDates()->create([
             'date' => '2026-10-09',
             'time_start' => '00:00',
             'time_end' => '23:59',
@@ -60,6 +60,8 @@ class AdminAppFoodFormControllerTest extends TestCase
             ->assertOk()
             ->assertJsonCount(1, 'data.event_dates')
             ->assertJsonPath('data.event_dates.0.date', '2026-10-09')
+            ->assertJsonPath('data.event_dates.0.validity_time_id', $eventDate->validity_time_id)
+            ->assertJsonPath('data.event_dates.0.validity_time.type', 'fixed_window')
             ->assertJsonPath('data.schedules.0.value', 'Almuerzo')
             ->assertJsonPath('data.schedules.1.value', 'Cena')
             ->assertJsonPath('data.services.0.value', 'Comedor');

tests/Feature/Sale/AdminAppSaleControllerTest.php

@@ -4,12 +4,16 @@ namespace Tests\Feature\Sale;
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Cart\Models\Cart;
+use App\Domains\Purchase\Events\PurchasePaid;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Models\WebsiteType;
+use App\Domains\Ticket\Models\Ticket;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Event;
 use Laravel\Sanctum\Sanctum;
 use Tests\TestCase;
 
@@ -82,6 +86,165 @@ class AdminAppSaleControllerTest extends TestCase
             ->assertNotFound();
     }
 
+    public function test_an_adminapp_user_can_read_all_tickets_from_a_sale_in_its_tenant(): void
+    {
+        $tenant = $this->createTenant('acme');
+        $admin = $this->createAdminAppUser($tenant);
+        Sanctum::actingAs($admin);
+
+        $purchase = Purchase::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PAID,
+            'total' => '20000.00',
+        ]);
+        $firstTicket = Ticket::query()->create([
+            'tenant_code' => $tenant->codigo,
+            'ticket' => '11111111-1111-4111-8111-111111111111',
+            'name' => 'Abono general',
+            'description' => 'Acceso general',
+            'source_purchase_id' => $purchase->id,
+            'user_id' => $admin->id,
+        ]);
+        $usedTicket = Ticket::query()->create([
+            'tenant_code' => $tenant->codigo,
+            'ticket' => '22222222-2222-4222-8222-222222222222',
+            'name' => 'Abono general',
+            'description' => 'Acceso general',
+            'source_purchase_id' => $purchase->id,
+            'used_at' => now()->subMinute(),
+            'user_id' => $admin->id,
+        ]);
+
+        $this->getJson("/api/v1/adminapp/tenant/sales/{$purchase->id}/tickets")
+            ->assertOk()
+            ->assertExactJson([
+                'data' => [
+                    [
+                        'product' => 'Abono general',
+                        'id' => $firstTicket->id,
+                        'expires_at' => null,
+                        'status' => Ticket::STATUS_ACTIVE,
+                    ],
+                    [
+                        'product' => 'Abono general',
+                        'id' => $usedTicket->id,
+                        'expires_at' => null,
+                        'status' => Ticket::STATUS_USED,
+                    ],
+                ],
+            ]);
+    }
+
+    public function test_an_adminapp_user_cannot_read_tickets_from_another_tenant_sale(): void
+    {
+        $tenant = $this->createTenant('acme');
+        $otherTenant = $this->createTenant('other');
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $foreignPurchase = Purchase::query()->create([
+            'tenant_codigo' => $otherTenant->codigo,
+            'status' => Purchase::STATUS_PAID,
+            'total' => '10000.00',
+        ]);
+
+        $this->getJson("/api/v1/adminapp/tenant/sales/{$foreignPurchase->id}/tickets")
+            ->assertNotFound();
+    }
+
+    public function test_an_adminapp_user_can_confirm_a_pending_sale(): void
+    {
+        Event::fake([PurchasePaid::class]);
+        $tenant = $this->createTenant('acme');
+        $admin = $this->createAdminAppUser($tenant);
+        Sanctum::actingAs($admin);
+
+        $purchase = Purchase::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'total' => '10000.00',
+        ]);
+
+        $this->postJson("/api/v1/adminapp/tenant/sales/{$purchase->id}/confirm")
+            ->assertOk()
+            ->assertJsonPath('data.status', Purchase::STATUS_PAID);
+
+        $this->assertSame(Purchase::STATUS_PAID, $purchase->fresh()->status);
+        $this->assertDatabaseHas('value_changes', [
+            'trackable_id' => $purchase->id,
+            'attribute' => 'status',
+            'old_value' => Purchase::STATUS_PENDING_PAYMENT,
+            'new_value' => Purchase::STATUS_PAID,
+            'user_id' => $admin->id,
+        ]);
+        Event::assertDispatchedTimes(PurchasePaid::class, 1);
+
+        $this->postJson("/api/v1/adminapp/tenant/sales/{$purchase->id}/confirm")
+            ->assertOk()
+            ->assertJsonPath('data.status', Purchase::STATUS_PAID);
+        Event::assertDispatchedTimes(PurchasePaid::class, 1);
+    }
+
+    public function test_adminapp_cancellation_does_not_restore_the_source_cart(): void
+    {
+        $tenant = $this->createTenant('acme');
+        $admin = $this->createAdminAppUser($tenant);
+        Sanctum::actingAs($admin);
+
+        $cart = Cart::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'user_id' => $admin->id,
+            'status' => 'converted',
+        ]);
+        $cart->delete();
+        $purchase = Purchase::query()->create([
+            'cart_id' => $cart->id,
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'total' => '10000.00',
+        ]);
+
+        $this->postJson("/api/v1/adminapp/tenant/sales/{$purchase->id}/cancel")
+            ->assertOk()
+            ->assertJsonPath('data.status', Purchase::STATUS_CANCELLED);
+
+        $this->assertSame(Purchase::STATUS_CANCELLED, $purchase->fresh()->status);
+        $this->assertSoftDeleted('carritos', ['id' => $cart->id]);
+        $this->assertSame('converted', Cart::withTrashed()->findOrFail($cart->id)->status);
+    }
+
+    public function test_an_adminapp_user_cannot_change_a_sale_from_another_tenant(): void
+    {
+        $tenant = $this->createTenant('acme');
+        $otherTenant = $this->createTenant('other');
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $foreignPurchase = Purchase::query()->create([
+            'tenant_codigo' => $otherTenant->codigo,
+            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'total' => '10000.00',
+        ]);
+
+        $this->postJson("/api/v1/adminapp/tenant/sales/{$foreignPurchase->id}/confirm")
+            ->assertNotFound();
+        $this->postJson("/api/v1/adminapp/tenant/sales/{$foreignPurchase->id}/cancel")
+            ->assertNotFound();
+    }
+
+    public function test_a_paid_sale_cannot_be_cancelled_from_adminapp(): void
+    {
+        $tenant = $this->createTenant('acme');
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+        $purchase = Purchase::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PAID,
+            'total' => '10000.00',
+        ]);
+
+        $this->postJson("/api/v1/adminapp/tenant/sales/{$purchase->id}/cancel")
+            ->assertUnprocessable()
+            ->assertJsonValidationErrors('purchase');
+    }
+
     private function createTenant(string $code): Tenant
     {
         return Tenant::query()->create([

tests/Feature/Seeders/FiestaFutbolInfantilProductSeederTest.php

@@ -12,6 +12,7 @@ use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\FeaturedGroup;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use Database\Seeders\AttributeSeeder;
 use Database\Seeders\FiestaFutbolInfantilProductSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -42,6 +43,8 @@ class FiestaFutbolInfantilProductSeederTest extends TestCase
         $this->seed([AttributeSeeder::class, FiestaFutbolInfantilProductSeeder::class]);
         $this->seed([AttributeSeeder::class, FiestaFutbolInfantilProductSeeder::class]);
 
+        $this->assertSame('9, 10, 11 y 12 de Octubre 2026', $tenant->fresh()->event_date_text);
+
         $this->assertSame(
             ['color', 'event_date', 'horario', 'servicio', 'talle', 'tipo_alojamiento'],
             Attribute::query()->where('tenant_codigo', $tenant->codigo)->orderBy('codigo')->pluck('codigo')->all(),
@@ -64,6 +67,12 @@ class FiestaFutbolInfantilProductSeederTest extends TestCase
                 ->get()
                 ->every(fn (CatalogItem $item): bool => $item->has_tickets),
         );
+        $this->assertTrue(
+            CatalogItem::query()
+                ->where('tenant_code', $tenant->codigo)
+                ->get()
+                ->every(fn (CatalogItem $item): bool => $item->ticket_generation_policy === TicketGenerationPolicy::OnePerUnit),
+        );
 
         $expectedVariantCounts = [
             'camiseta' => 12,

tests/Feature/Seeders/MenuSeederTest.php

@@ -25,6 +25,7 @@ class MenuSeederTest extends TestCase
         $this->seed(MenuSeeder::class);
 
         $expectedMenus = [
+            'adminapp.inicio' => ['Inicio', '/admin/inicio'],
             'adminapp.catalog' => ['Catálogo', '/admin/catalog'],
             'adminapp.categories' => ['Categorías', '/admin/categories'],
             'adminapp.combos' => ['Combos', '/admin/combos'],
@@ -81,6 +82,17 @@ class MenuSeederTest extends TestCase
             $this->assertTrue($fiestaTenant->menues()->where('menues.code', $code)->exists());
         }
 
+        foreach ([
+            'adminapp.inicio',
+            'adminapp.catalog',
+            'adminapp.categories',
+            'adminapp.combos',
+        ] as $code) {
+            $this->assertFalse(
+                $fiestaTenant->menues()->where('menues.code', $code)->exists()
+            );
+        }
+
         $this->assertFalse(
             Menu::query()->whereIn('code', [
                 'admin.event',

tests/Feature/Tenant/BootstrapTenantControllerTest.php

@@ -53,6 +53,8 @@ class BootstrapTenantControllerTest extends TestCase
             'header_logo_id' => $headerAttachment->id,
             'footer_logo_id' => $footerAttachment->id,
             'event_date_text' => '9, 10, 11 y 12 de Octubre 2026',
+            'display_categories' => false,
+            'display_seach_bar' => false,
         ]);
 
         $response = $this->getJson('/api/tenants/bootstrap/acme.com');
@@ -66,6 +68,8 @@ class BootstrapTenantControllerTest extends TestCase
             ->assertJsonPath('data.danger_color', '#0000ff')
             ->assertJsonPath('data.success_color', '#00ff00')
             ->assertJsonPath('data.event_date_text', '9, 10, 11 y 12 de Octubre 2026')
+            ->assertJsonPath('data.display_categories', false)
+            ->assertJsonPath('data.display_seach_bar', false)
             ->assertJsonPath('data.header_bg_color', '#ffffff')->assertJsonPath('data.footer_bg_color', '#ffffff');
 
         $headerUrl = $response->json('data.header_logo');
@@ -244,10 +248,10 @@ class BootstrapTenantControllerTest extends TestCase
             ->assertJsonPath('data.menues.0.code', 'help')
             ->assertJsonPath('data.menues.0.label', 'Ayuda')
             ->assertJsonPath('data.menues.0.parent_menu_code', null)
-            ->assertJsonPath('data.menues.0.submenues.0.code', 'help.faq')
+            ->assertJsonPath('data.menues.0.submenues.0.code', 'help.shipping')
-            ->assertJsonPath('data.menues.0.submenues.0.label', 'Preguntas frecuentes')
+            ->assertJsonPath('data.menues.0.submenues.0.label', 'Envíos')
             ->assertJsonPath('data.menues.0.submenues.0.parent_menu_code', 'help')
-            ->assertJsonPath('data.menues.0.submenues.1.code', 'help.shipping');
+            ->assertJsonPath('data.menues.0.submenues.1.code', 'help.faq');
 
         $assertCleanMenu = function (array $menu) use (&$assertCleanMenu): void {
             $this->assertArrayNotHasKey('created_at', $menu);
@@ -261,10 +265,10 @@ class BootstrapTenantControllerTest extends TestCase
         };
 
         $menus = $response->json('data.menues');
-        $this->assertEquals($staticContent, $menus[0]['submenues'][0]['static_content']);
+        $this->assertEquals($staticContent, $menus[0]['submenues'][1]['static_content']);
         $assertCleanMenu($menus[0]);
         $this->assertArrayNotHasKey('static_content', $menus[0]);
-        $this->assertArrayNotHasKey('static_content', $menus[0]['submenues'][1]);
+        $this->assertArrayNotHasKey('static_content', $menus[0]['submenues'][0]);
     }
 
     public function test_it_returns_only_menus_assigned_to_the_user_role(): void
@@ -299,6 +303,49 @@ class BootstrapTenantControllerTest extends TestCase
             ->assertJsonMissing(['code' => 'admin.catalog']);
     }
 
+    public function test_it_orders_parent_menus_and_their_submenus_by_label(): void
+    {
+        $tenant = $this->createTenant();
+        $userRole = Role::query()->create([
+            'codigo' => RoleCode::User->value,
+            'nombre' => 'Usuario',
+        ]);
+
+        $zeta = Menu::query()->create([
+            'code' => 'zeta',
+            'label' => 'Zeta',
+            'route' => '/zeta',
+        ]);
+        $tree = Menu::query()->create([
+            'code' => 'tree',
+            'label' => 'Árbol',
+            'route' => '/arbol',
+        ]);
+        $fox = Menu::query()->create([
+            'code' => 'tree.fox',
+            'label' => 'Zorro',
+            'parent_menu_code' => $tree->code,
+            'route' => '/arbol/zorro',
+        ]);
+        $eagle = Menu::query()->create([
+            'code' => 'tree.eagle',
+            'label' => 'Águila',
+            'parent_menu_code' => $tree->code,
+            'route' => '/arbol/aguila',
+        ]);
+
+        $menuCodes = [$zeta->code, $tree->code, $fox->code, $eagle->code];
+        $tenant->menues()->sync($menuCodes);
+        $userRole->menus()->sync($menuCodes);
+
+        $this->getJson('/api/tenants/bootstrap/acme.com')
+            ->assertOk()
+            ->assertJsonPath('data.menues.0.code', 'tree')
+            ->assertJsonPath('data.menues.1.code', 'zeta')
+            ->assertJsonPath('data.menues.0.submenues.0.code', 'tree.eagle')
+            ->assertJsonPath('data.menues.0.submenues.1.code', 'tree.fox');
+    }
+
     public function test_it_rejects_duplicate_domains_after_normalization_when_storing(): void
     {
         $base64Image = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==';

tests/Feature/Ticket/TicketControllerTest.php

@@ -6,7 +6,9 @@ use App\Domains\Attachable\Enums\AttachmentType;
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Auth\Models\User;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\ValidityTimeType;
 use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticket\Models\ValidityTime;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Str;
 use Tests\TestCase;
@@ -21,6 +23,22 @@ class TicketControllerTest extends TestCase
         $user = User::factory()->create();
         $olderTicket = $this->createTicket($tenant, $user, 'Older ticket');
         $newerTicket = $this->createTicket($tenant, $user, 'Newer ticket');
+        $validityTimes = collect([
+            ValidityTime::query()->create([
+                'type' => ValidityTimeType::FixedWindow,
+                'fixed_starts_at' => now()->subHour(),
+                'fixed_expires_at' => now()->addHour(),
+            ]),
+            ValidityTime::query()->create([
+                'type' => ValidityTimeType::FixedWindow,
+                'fixed_starts_at' => now()->addDay(),
+                'fixed_expires_at' => now()->addDays(2),
+            ]),
+        ]);
+        $validityTimes->each(function (ValidityTime $validityTime) use ($newerTicket): void {
+            $group = $newerTicket->validityGroups()->create();
+            $group->validityTimes()->attach($validityTime);
+        });
 
         $this->actingAs($user, 'sanctum')
             ->getJson("/api/tenants/{$tenant->codigo}/tickets")
@@ -31,6 +49,10 @@ class TicketControllerTest extends TestCase
             ->assertJsonPath('data.0.is_valid', true)
             ->assertJsonPath('data.0.is_expired', false)
             ->assertJsonPath('data.0.is_used', false)
+            ->assertJsonCount(2, 'data.0.validity_times')
+            ->assertJsonCount(2, 'data.0.validity_groups')
+            ->assertJsonCount(1, 'data.0.validity_groups.0.validity_times')
+            ->assertJsonMissingPath('data.0.validity_time')
             ->assertJsonPath('data.1.id', $olderTicket->id)
             ->assertJsonMissingPath('meta')
             ->assertJsonMissingPath('links');

tests/Feature/Ticket/TicketGeneratorServiceTest.php

@@ -14,6 +14,7 @@ use App\Domains\Notification\Events\TicketsAvailable;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Shared\Enums\FieldType;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Enums\TicketGenerationPolicy;
 use App\Domains\Ticket\Enums\ValidityTimeType;
 use App\Domains\Ticket\Exceptions\TicketGenerationException;
 use App\Domains\Ticket\Models\ValidityTime;
@@ -69,7 +70,7 @@ class TicketGeneratorServiceTest extends TestCase
             $this->assertSame($item->descripcion, $ticket->description);
             $this->assertSame($item->id, $ticket->source_catalog_item_id);
             $this->assertNull($ticket->source_variant_id);
-            $this->assertNull($ticket->validity_time_id);
+            $this->assertTrue($ticket->validityGroups->isEmpty());
         }
     }
 
@@ -231,7 +232,7 @@ class TicketGeneratorServiceTest extends TestCase
         ]);
     }
 
-    public function test_event_date_and_time_window_are_snapshotted_as_a_fixed_window(): void
+    public function test_event_date_and_time_window_are_combined_in_the_same_and_group(): void
     {
         $item = $this->createTicketableItem('scheduled-meal');
         $eventDate = EventDate::query()->create([
@@ -272,13 +273,22 @@ class TicketGeneratorServiceTest extends TestCase
         $tickets = $this->service->generate($item, $this->user, 2, $variant->id);
 
         $this->assertCount(2, $tickets);
-        $this->assertSame(1, $tickets->pluck('validity_time_id')->unique()->count());
+        $this->assertTrue($tickets->every(fn ($ticket): bool => $ticket->validityGroups->count() === 1));
-        $this->assertNotSame($timeWindow->id, $tickets->first()->validity_time_id);
+        $this->assertTrue($tickets->every(
-
+            fn ($ticket): bool => $ticket->validityGroups->sole()->validityTimes
-        $fixedWindow = $tickets->first()->validityTime;
+                ->pluck('id')
-        $this->assertSame(ValidityTimeType::FixedWindow, $fixedWindow->type);
+                ->sort()
-        $this->assertSame('2026-08-20 22:00:00', $fixedWindow->fixed_starts_at->format('Y-m-d H:i:s'));
+                ->values()
-        $this->assertSame('2026-08-21 02:00:00', $fixedWindow->fixed_expires_at->format('Y-m-d H:i:s'));
+                ->all() === collect([$eventDate->validity_time_id, $timeWindow->id])->sort()->values()->all()
+        ));
+        $this->assertSame(
+            '2026-08-20 22:00:00',
+            $tickets->first()->getEffectiveStartsAt()->format('Y-m-d H:i:s'),
+        );
+        $this->assertSame(
+            '2026-08-20 23:59:59',
+            $tickets->first()->getEffectiveExpiresAt()->format('Y-m-d H:i:s'),
+        );
     }
 
     public function test_a_multi_date_variant_generates_one_ticket_for_each_selected_date(): void
@@ -296,12 +306,16 @@ class TicketGeneratorServiceTest extends TestCase
         $variant->eventDates()->sync($dates->pluck('id'));
 
         $tickets = $this->service->generate($item, $this->user, 1, $variant->id);
-        $tickets->each->loadMissing('validityTime');
+        $tickets->each->loadMissing('validityGroups.validityTimes');
 
         $this->assertCount(2, $tickets);
+        $this->assertSame(
+            $dates->pluck('validity_time_id')->all(),
+            $tickets->map(fn ($ticket): int => $ticket->validityGroups->sole()->validityTimes->sole()->id)->all(),
+        );
         $this->assertSame(
             ['2026-08-20 00:00:00', '2026-08-21 00:00:00'],
-            $tickets->map(fn ($ticket): string => $ticket->validityTime->fixed_starts_at->format('Y-m-d H:i:s'))->all(),
+            $tickets->map(fn ($ticket): string => $ticket->validityGroups->sole()->validityTimes->sole()->fixed_starts_at->format('Y-m-d H:i:s'))->all(),
         );
         $this->assertSame(
             ['Multi-date-pass (20/08/2026)', 'Multi-date-pass (21/08/2026)'],
@@ -310,6 +324,116 @@ class TicketGeneratorServiceTest extends TestCase
         $this->assertSame([$variant->id], $tickets->pluck('source_variant_id')->unique()->values()->all());
     }
 
+    public function test_one_per_unit_policy_generates_one_ticket_covering_all_selected_dates(): void
+    {
+        $item = $this->createTicketableItem('multi-date-pass');
+        $item->update([
+            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit,
+        ]);
+        $dates = collect(['2026-08-20', '2026-08-21'])->map(fn (string $date) => EventDate::query()->create([
+            'tenant_code' => $this->tenant->codigo,
+            'date' => $date,
+            'time_start' => '00:00:00',
+            'time_end' => '23:59:59',
+        ]));
+        $variant = $item->variants()->create([
+            'inventory_id' => Inventory::query()->create()->id,
+        ]);
+        $variant->eventDates()->sync($dates->pluck('id'));
+
+        $tickets = $this->service->generate($item, $this->user, 2, $variant->id);
+        $tickets->each->loadMissing('validityGroups.validityTimes');
+
+        $this->assertCount(2, $tickets);
+        $this->assertTrue($tickets->every(fn ($ticket): bool => $ticket->validityGroups->count() === 2));
+        $this->assertTrue($tickets->every(
+            fn ($ticket): bool => $ticket->validityGroups->every(
+                fn ($group): bool => $group->validityTimes->count() === 1
+            )
+        ));
+        $this->assertEqualsCanonicalizing(
+            $dates->pluck('validity_time_id')->all(),
+            $tickets->flatMap(fn ($ticket) => $ticket->allValidityTimes())->pluck('id')->unique()->all(),
+        );
+        $this->assertTrue($tickets->every(
+            fn ($ticket): bool => $ticket->name === 'Multi-date-pass (20/08/2026, 21/08/2026)'
+        ));
+        $this->assertTrue($tickets->every(
+            fn ($ticket): bool => $ticket->allValidityTimes()
+                ->map(fn (ValidityTime $validityTime): array => [
+                    $validityTime->fixed_starts_at->format('Y-m-d H:i:s'),
+                    $validityTime->fixed_expires_at->format('Y-m-d H:i:s'),
+                ])
+                ->all() === [
+                    ['2026-08-20 00:00:00', '2026-08-20 23:59:59'],
+                    ['2026-08-21 00:00:00', '2026-08-21 23:59:59'],
+                ]
+        ));
+    }
+
+    public function test_common_schedule_is_anded_into_each_alternative_event_date_group(): void
+    {
+        $item = $this->createTicketableItem('multi-date-lunch');
+        $item->update(['ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit]);
+        $dates = collect(['2026-08-20', '2026-08-21'])->map(fn (string $date) => EventDate::query()->create([
+            'tenant_code' => $this->tenant->codigo,
+            'date' => $date,
+            'time_start' => '09:00:00',
+            'time_end' => '18:00:00',
+        ]));
+        $lunch = ValidityTime::query()->create([
+            'type' => ValidityTimeType::TimeWindow,
+            'start_time' => '12:00:00',
+            'end_time' => '15:00:00',
+        ]);
+        $schedule = Attribute::query()->create([
+            'tenant_codigo' => $this->tenant->codigo,
+            'codigo' => 'schedule',
+            'nombre' => 'Schedule',
+            'type' => FieldType::Select,
+        ]);
+        $schedule->options()->create([
+            'value' => 'lunch',
+            'label' => 'Lunch',
+            'validity_time_id' => $lunch->id,
+        ]);
+        $itemSchedule = $item->itemAttributes()->create(['attribute_id' => $schedule->id]);
+        $variant = $item->variants()->create([
+            'inventory_id' => Inventory::query()->create()->id,
+        ]);
+        $variant->eventDates()->sync($dates->pluck('id'));
+        $variant->definitions()->create([
+            'item_attribute_id' => $itemSchedule->id,
+            'value' => 'lunch',
+        ]);
+
+        $ticket = $this->service->generate($item, $this->user, 1, $variant->id)->sole();
+        $ticket->loadMissing('validityGroups.validityTimes');
+
+        $this->assertCount(2, $ticket->validityGroups);
+        $this->assertTrue($ticket->validityGroups->every(
+            fn ($group): bool => $group->validityTimes->count() === 2
+                && $group->validityTimes->contains($lunch)
+        ));
+        $this->assertEqualsCanonicalizing(
+            $dates->pluck('validity_time_id')->all(),
+            $ticket->validityGroups
+                ->flatMap->validityTimes
+                ->reject(fn (ValidityTime $validityTime): bool => $validityTime->is($lunch))
+                ->pluck('id')
+                ->all(),
+        );
+        $this->assertSame('2026-08-20 12:00:00', $ticket->getEffectiveStartsAt()->format('Y-m-d H:i:s'));
+        $this->assertSame('2026-08-21 15:00:00', $ticket->getEffectiveExpiresAt()->format('Y-m-d H:i:s'));
+
+        Carbon::setTestNow('2026-08-20 13:00:00');
+        $this->assertTrue($ticket->isValid());
+
+        Carbon::setTestNow('2026-08-20 16:00:00');
+        $this->assertFalse($ticket->isValid());
+        $this->assertFalse($ticket->is_expired);
+    }
+
     public function test_marking_a_purchase_as_paid_ignores_items_without_tickets(): void
     {
         Event::fake([TicketsAvailable::class]);

tests/Feature/Ticket/TicketValiditySchemaTest.php

@@ -23,9 +23,16 @@ class TicketValiditySchemaTest extends TestCase
             'updated_at',
         ], Schema::getColumnListing('validity_times'));
 
-        $this->assertTrue(Schema::hasColumns('tickets', [
+        $this->assertFalse(Schema::hasColumn('tickets', 'validity_time_id'));
+        $this->assertFalse(Schema::hasTable('ticket_validity_times'));
+        $this->assertEqualsCanonicalizing([
+            'id',
+            'ticket_id',
+        ], Schema::getColumnListing('ticket_validity_groups'));
+        $this->assertEqualsCanonicalizing([
+            'ticket_validity_group_id',
             'validity_time_id',
-        ]));
+        ], Schema::getColumnListing('ticket_validity_group_times'));
         $this->assertFalse(Schema::hasColumn('tickets', 'service_date'));
         $this->assertFalse(Schema::hasColumn('tickets', 'starts_at'));
         $this->assertFalse(Schema::hasColumn('tickets', 'expires_at'));
@@ -34,6 +41,7 @@ class TicketValiditySchemaTest extends TestCase
         $this->assertFalse(Schema::hasColumn('catalog_items', 'minimum_use_date'));
         $this->assertFalse(Schema::hasColumn('catalog_items', 'maximum_use_date'));
         $this->assertTrue(Schema::hasColumn('attribute_options', 'validity_time_id'));
+        $this->assertTrue(Schema::hasColumn('event_dates', 'validity_time_id'));
         $this->assertFalse(Schema::hasColumn('variantes', 'minimum_use_date'));
         $this->assertFalse(Schema::hasColumn('variantes', 'maximum_use_date'));
 

tests/Unit/Event/EventModelsTest.php

@@ -5,6 +5,7 @@ namespace Tests\Unit\Event;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Event\Models\EventDate;
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticket\Models\ValidityTime;
 use Tests\TestCase;
 
 class EventModelsTest extends TestCase
@@ -14,6 +15,7 @@ class EventModelsTest extends TestCase
         $eventDate = new EventDate;
         $eventDate->setRawAttributes([
             'tenant_code' => 'acme',
+            'validity_time_id' => '12',
             'date' => '2026-10-09',
             'time_start' => '09:00:00',
             'time_end' => '18:30:00',
@@ -21,9 +23,12 @@ class EventModelsTest extends TestCase
 
         $this->assertFalse($eventDate->usesTimestamps());
         $this->assertSame('acme', $eventDate->tenant_code);
+        $this->assertSame(12, $eventDate->validity_time_id);
         $this->assertSame('2026-10-09 09:00:00', $eventDate->startsAt()->format('Y-m-d H:i:s'));
         $this->assertSame('2026-10-09 18:30:00', $eventDate->endsAt()->format('Y-m-d H:i:s'));
         $this->assertInstanceOf(Tenant::class, $eventDate->tenant()->getRelated());
+        $this->assertInstanceOf(ValidityTime::class, $eventDate->validityTime()->getRelated());
+        $this->assertInstanceOf(EventDate::class, (new ValidityTime)->eventDate()->getRelated());
         $this->assertInstanceOf(Variant::class, $eventDate->variants()->getRelated());
     }
 

tests/Unit/Ticket/TicketTest.php

@@ -8,7 +8,9 @@ use App\Domains\Catalog\Models\Variant;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Enums\ValidityTimeType;
 use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticket\Models\TicketValidityGroup;
 use App\Domains\Ticket\Models\ValidityTime;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
 
@@ -27,7 +29,6 @@ class TicketTest extends TestCase
         $ticket->setRawAttributes([
             'source_catalog_item_id' => '20',
             'source_variant_id' => '30',
-            'validity_time_id' => '40',
             'used_at' => null,
             'scanner_user_id' => '15',
             'user_id' => '10',
@@ -37,7 +38,6 @@ class TicketTest extends TestCase
         $this->assertFalse($ticket->usesTimestamps());
         $this->assertSame(20, $ticket->source_catalog_item_id);
         $this->assertSame(30, $ticket->source_variant_id);
-        $this->assertSame(40, $ticket->validity_time_id);
         $this->assertNull($ticket->used_at);
         $this->assertSame(15, $ticket->scanner_user_id);
         $this->assertSame(10, $ticket->user_id);
@@ -46,12 +46,16 @@ class TicketTest extends TestCase
         $this->assertInstanceOf(User::class, $ticket->scannerUser()->getRelated());
         $this->assertInstanceOf(CatalogItem::class, $ticket->sourceCatalogItem()->getRelated());
         $this->assertInstanceOf(Variant::class, $ticket->sourceVariant()->getRelated());
-        $this->assertInstanceOf(ValidityTime::class, $ticket->validityTime()->getRelated());
+        $this->assertInstanceOf(TicketValidityGroup::class, $ticket->validityGroups()->getRelated());
+        $this->assertInstanceOf(ValidityTime::class, (new TicketValidityGroup)->validityTimes()->getRelated());
     }
 
     public function test_unused_ticket_without_validity_time_is_valid(): void
     {
-        $this->assertTrue((new Ticket)->isValid());
+        $ticket = new Ticket;
+
+        $this->assertTrue($ticket->isValid());
+        $this->assertSame(Ticket::STATUS_ACTIVE, $ticket->status);
     }
 
     public function test_fixed_window_controls_ticket_validity(): void
@@ -70,12 +74,11 @@ class TicketTest extends TestCase
     public function test_time_window_is_resolved_for_current_date(): void
     {
         Carbon::setTestNow('2026-07-21 12:00:00');
-        $ticket = new Ticket;
+        $ticket = $this->ticketWithValidityGroups([[new ValidityTime([
-        $ticket->setRelation('validityTime', new ValidityTime([
             'type' => ValidityTimeType::TimeWindow,
             'start_time' => '10:00:00',
             'end_time' => '14:00:00',
-        ]));
+        ])]]);
 
         $this->assertSame('2026-07-21 10:00:00', $ticket->getEffectiveStartsAt()->format('Y-m-d H:i:s'));
         $this->assertSame('2026-07-21 14:00:00', $ticket->getEffectiveExpiresAt()->format('Y-m-d H:i:s'));
@@ -92,6 +95,50 @@ class TicketTest extends TestCase
 
         $this->assertFalse($ticket->isValid());
         $this->assertTrue($ticket->is_expired);
+        $this->assertSame(Ticket::STATUS_EXPIRED, $ticket->status);
+    }
+
+    public function test_ticket_is_valid_when_any_validity_time_is_active(): void
+    {
+        Carbon::setTestNow('2026-07-21 10:00:00');
+        $ticket = $this->ticketWithValidityGroups([
+            [new ValidityTime([
+                'type' => ValidityTimeType::FixedWindow,
+                'fixed_starts_at' => now()->subDays(2),
+                'fixed_expires_at' => now()->subDay(),
+            ])],
+            [new ValidityTime([
+                'type' => ValidityTimeType::FixedWindow,
+                'fixed_starts_at' => now()->subHour(),
+                'fixed_expires_at' => now()->addHour(),
+            ])],
+        ]);
+
+        $this->assertTrue($ticket->isValid());
+        $this->assertFalse($ticket->is_expired);
+        $this->assertSame('2026-07-19 10:00:00', $ticket->getEffectiveStartsAt()->format('Y-m-d H:i:s'));
+        $this->assertSame('2026-07-21 11:00:00', $ticket->getEffectiveExpiresAt()->format('Y-m-d H:i:s'));
+    }
+
+    public function test_ticket_is_invalid_but_not_expired_between_validity_times(): void
+    {
+        Carbon::setTestNow('2026-07-21 10:00:00');
+        $ticket = $this->ticketWithValidityGroups([
+            [new ValidityTime([
+                'type' => ValidityTimeType::FixedWindow,
+                'fixed_starts_at' => now()->subDays(2),
+                'fixed_expires_at' => now()->subDay(),
+            ])],
+            [new ValidityTime([
+                'type' => ValidityTimeType::FixedWindow,
+                'fixed_starts_at' => now()->addDay(),
+                'fixed_expires_at' => now()->addDays(2),
+            ])],
+        ]);
+
+        $this->assertFalse($ticket->isValid());
+        $this->assertFalse($ticket->is_expired);
+        $this->assertSame(Ticket::STATUS_ACTIVE, $ticket->status);
     }
 
     public function test_used_ticket_is_invalid_and_not_reported_as_expired(): void
@@ -105,12 +152,51 @@ class TicketTest extends TestCase
         $this->assertFalse($ticket->is_valid);
         $this->assertFalse($ticket->is_expired);
         $this->assertTrue($ticket->is_used);
+        $this->assertSame(Ticket::STATUS_USED, $ticket->status);
+    }
+
+    public function test_all_validity_times_in_the_same_group_must_be_active(): void
+    {
+        Carbon::setTestNow('2026-08-20 13:00:00');
+        $ticket = $this->ticketWithValidityGroups([[
+            new ValidityTime([
+                'type' => ValidityTimeType::FixedWindow,
+                'fixed_starts_at' => '2026-08-20 09:00:00',
+                'fixed_expires_at' => '2026-08-20 18:00:00',
+            ]),
+            new ValidityTime([
+                'type' => ValidityTimeType::TimeWindow,
+                'start_time' => '12:00:00',
+                'end_time' => '15:00:00',
+            ]),
+        ]]);
+
+        $this->assertTrue($ticket->isValid());
+        $this->assertSame('2026-08-20 12:00:00', $ticket->getEffectiveStartsAt()->format('Y-m-d H:i:s'));
+        $this->assertSame('2026-08-20 15:00:00', $ticket->getEffectiveExpiresAt()->format('Y-m-d H:i:s'));
+
+        Carbon::setTestNow('2026-08-20 16:00:00');
+
+        $this->assertFalse($ticket->isValid());
+        $this->assertTrue($ticket->is_expired);
     }
 
     private function ticketWithValidityTime(ValidityTime $validityTime): Ticket
+    {
+        return $this->ticketWithValidityGroups([[$validityTime]]);
+    }
+
+    /** @param array<int, array<int, ValidityTime>> $validityGroups */
+    private function ticketWithValidityGroups(array $validityGroups): Ticket
     {
         $ticket = new Ticket;
-        $ticket->setRelation('validityTime', $validityTime);
+        $groups = collect($validityGroups)->map(function (array $validityTimes): TicketValidityGroup {
+            $group = new TicketValidityGroup;
+            $group->setRelation('validityTimes', new EloquentCollection($validityTimes));
+
+            return $group;
+        });
+        $ticket->setRelation('validityGroups', new EloquentCollection($groups->all()));
 
         return $ticket;
     }

tests/Unit/Ticket/ValidityTimeTest.php

@@ -5,7 +5,7 @@ namespace Tests\Unit\Ticket;
 use App\Domains\Catalog\Models\AttributeOption;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticket\Models\TicketValidityGroup;
 use App\Domains\Ticket\Models\ValidityTime;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
@@ -26,7 +26,10 @@ class ValidityTimeTest extends TestCase
         $this->assertInstanceOf(Carbon::class, $validityTime->fixed_expires_at);
         $this->assertInstanceOf(CatalogItem::class, $validityTime->catalogItems()->getRelated());
         $this->assertInstanceOf(AttributeOption::class, $validityTime->attributeOptions()->getRelated());
-        $this->assertInstanceOf(Ticket::class, $validityTime->tickets()->getRelated());
+        $this->assertInstanceOf(
+            TicketValidityGroup::class,
+            $validityTime->ticketValidityGroups()->getRelated(),
+        );
     }
 
     public function test_it_exposes_supported_type_values(): void