feat(event): add EventDateTextFormatter for formatting event dates; update Tenant model and resource to include event_date_text; create migration for event_date_text column; enhance tests for event date formatting and tenant updates

refactor(catalog): add description and price fields to variants and update related resources

feat(migration): add commercial overrides to variants with description and price fields

test(food): add tests for FoodController and ensure correct seeding of food items and variants

app/Domains/Auth/Controllers/ScannerLoginController.php

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

app/Domains/Auth/Controllers/ScannerMeController.php

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

app/Domains/Auth/Models/User.php

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

app/Domains/Auth/Requests/ScannerLoginRequest.php

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

app/Domains/Auth/Resources/ScannerMeResource.php

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

app/Domains/Auth/Services/PasswordLoginService.php

@@ -5,7 +5,6 @@ namespace App\Domains\Auth\Services;
 use App\Domains\Auth\Exceptions\AccountLockedException;
 use App\Domains\Auth\Models\LoginAttempt;
 use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
 use App\Domains\Authorization\Enums\RoleCode;
 use Carbon\CarbonImmutable;
 use Illuminate\Support\Facades\DB;
@@ -63,39 +62,14 @@ class PasswordLoginService
         );
     }
 
-    /**
-     * Authenticate a tenant-bound user authorized to scan tickets.
-     *
-     * @throws AccountLockedException
-     * @throws ValidationException
-     */
-    public function authenticateScanner(
-        string $email,
-        string $password,
-        ?string $ipAddress,
-        ?string $userAgent,
-    ): User {
-        return $this->authenticateUser(
-            $email,
-            $password,
-            null,
-            $ipAddress,
-            $userAgent,
-            null,
-            true,
-            PermissionCode::ScanTickets->value,
-        );
-    }
-
     private function authenticateUser(
         string $email,
         string $password,
         ?string $tenantCode,
         ?string $ipAddress,
         ?string $userAgent,
-        ?RoleCode $requiredRole = RoleCode::User,
+        RoleCode $requiredRole = RoleCode::User,
         bool $requiresTenant = false,
-        ?string $requiredPermission = null,
     ): User {
         $normalizedEmail = mb_strtolower(trim($email));
         $now = CarbonImmutable::now();
@@ -110,21 +84,10 @@ class PasswordLoginService
             $now,
             $requiredRole,
             $requiresTenant,
-            $requiredPermission,
         ): array {
             $user = User::query()
                 ->where('email', $normalizedEmail)
-                ->when(
-                    $requiredRole !== null,
-                    fn ($query) => $query->where('rol_codigo', $requiredRole->value),
-                )
-                ->when(
-                    $requiredPermission !== null,
-                    fn ($query) => $query->whereHas(
-                        'role.permissions',
-                        fn ($query) => $query->where('permisos.codigo', $requiredPermission)
-                    ),
-                )
+                ->where('rol_codigo', $requiredRole->value)
                 ->when(
                     $requiresTenant,
                     fn ($query) => $query->whereNotNull('tenant_codigo'),
@@ -159,8 +122,8 @@ class PasswordLoginService
             }
 
             if ($user === null || ! Hash::check($password, $user->password)) {
-                if ($user !== null && $attemptTenantCode !== null) {
-                    $this->registerFailure($user, $now, $attemptTenantCode);
+                if ($user !== null) {
+                    $this->registerFailure($user, $now, $tenantCode);
                 }
 
                 $outcome = $user?->locked_until?->isFuture()
@@ -247,7 +210,7 @@ class PasswordLoginService
             } catch (\Throwable $e) {
                 Log::error('Failed to trigger reset password on account lock', [
                     'user_id' => $user->id,
-                    'exception' => $e,
+                    'exception' => $e
                 ]);
             }
         }

app/Domains/Auth/Services/ScannerContextService.php

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

app/Domains/Auth/routes/api.php

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

app/Domains/Auth/routes/scanner.php

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

app/Domains/Authorization/Enums/PermissionCode.php

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

app/Domains/Bootstrap/Controllers/ScannerBootstrapController.php

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

app/Domains/Bootstrap/Requests/ScannerBootstrapRequest.php

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

app/Domains/Bootstrap/Resources/ScannerBootstrapResource.php

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

app/Domains/Bootstrap/Services/ScannerBootstrapService.php

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

app/Domains/Bootstrap/routes/api.php

@@ -7,4 +7,3 @@ Route::get('tenants/bootstrap/{dominio}', TenantBootstrapController::class)
     ->where('dominio', '.*');
 
 require __DIR__.'/adminapp.php';
-require __DIR__.'/scanner.php';

app/Domains/Bootstrap/routes/scanner.php

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

app/Domains/Cart/Controllers/CartController.php

@@ -54,26 +54,16 @@ class CartController extends Controller
         Tenant $tenant,
         CartItem $cartItem,
     ): CartResource {
-        $updatesVariant = $request->exists('variant_id');
-
         return CartResource::make(
-            $this->cartService->updateItem(
+            $this->cartService->updateItemQuantity(
                 $tenant,
                 $request,
                 $cartItem->getKey(),
                 (int) $request->validated('cantidad'),
-                $updatesVariant
-                    ? ($request->validated('variant_id') !== null
-                        ? (int) $request->validated('variant_id')
-                        : null)
-                    : $cartItem->variant_id,
-                $updatesVariant,
             )
         )->additional([
-            'code' => $updatesVariant ? 'cart.item_updated' : 'cart.quantity_updated',
-            'message' => $updatesVariant
-                ? __('api.cart.item_updated')
-                : __('api.cart.quantity_updated'),
+            'code' => 'cart.quantity_updated',
+            'message' => __('api.cart.quantity_updated'),
         ]);
     }
 

app/Domains/Cart/Models/Cart.php

@@ -124,85 +124,27 @@ class Cart extends Model
         });
     }
 
-    public function updateItem(
-        int $cartItemId,
-        int $quantity,
-        ?int $variantId = null,
-        bool $updateVariant = false,
-    ): CartItem {
+    public function updateItem(int $cartItemId, int $quantity): CartItem
+    {
         if ($quantity <= 0) {
             throw ValidationException::withMessages([
                 'cantidad' => __('api.cart.positive_quantity'),
             ]);
         }
 
-        return DB::transaction(function () use (
-            $cartItemId,
-            $quantity,
-            $variantId,
-            $updateVariant,
-        ): CartItem {
+        return DB::transaction(function () use ($cartItemId, $quantity): CartItem {
             /** @var CartItem $item */
             $item = $this->items()
                 ->where('id', $cartItemId)
                 ->lockForUpdate()
                 ->firstOrFail();
 
-            $currentSelection = $this->resolveScopedItem(
+            $selectedItem = $this->resolveScopedItem(
                 $item->catalog_item_id,
                 $item->variant_id,
                 true,
             );
             $inventoryService = app(CatalogInventoryService::class);
-
-            if ($updateVariant && $variantId !== $item->variant_id) {
-                $nextSelection = $this->resolveScopedItem(
-                    $item->catalog_item_id,
-                    $variantId,
-                    true,
-                );
-                $otherVariantsQuantity = (int) $this->items()
-                    ->where('catalog_item_id', $item->catalog_item_id)
-                    ->whereKeyNot($item->getKey())
-                    ->sum('cantidad');
-                $this->assertUserPurchaseLimit(
-                    $nextSelection,
-                    $otherVariantsQuantity + $quantity,
-                );
-
-                $inventoryService->release($currentSelection, $item->cantidad);
-                $availableQuantity = $inventoryService->availableQuantity($nextSelection);
-
-                if ($availableQuantity !== null && $availableQuantity < $quantity) {
-                    throw ValidationException::withMessages([
-                        'variant_id' => __('api.cart.insufficient_stock', ['max' => $availableQuantity]),
-                    ]);
-                }
-
-                $targetItem = $this->items()
-                    ->where('catalog_item_id', $item->catalog_item_id)
-                    ->where('variant_id', $variantId)
-                    ->whereKeyNot($item->getKey())
-                    ->lockForUpdate()
-                    ->first();
-
-                $inventoryService->reserve($nextSelection, $quantity);
-
-                if ($targetItem !== null) {
-                    $targetItem->cantidad += $quantity;
-                    $targetItem->save();
-                    $item->delete();
-
-                    return $targetItem->fresh();
-                }
-
-                $item->variant_id = $variantId;
-                $item->cantidad = $quantity;
-                $item->save();
-
-                return $item->fresh();
-            }
-
             $delta = $quantity - $item->cantidad;
 
             if ($delta > 0) {
@@ -211,12 +153,12 @@ class Cart extends Model
                     ->whereKeyNot($item->getKey())
                     ->sum('cantidad');
                 $this->assertUserPurchaseLimit(
-                    $currentSelection,
+                    $selectedItem,
                     $otherVariantsQuantity + $quantity,
                 );
             }
 
-            $availableQuantity = $inventoryService->availableQuantity($currentSelection);
+            $availableQuantity = $inventoryService->availableQuantity($selectedItem);
 
             if ($delta > 0 && $availableQuantity !== null && $availableQuantity < $delta) {
                 $maxAvailable = $availableQuantity + $item->cantidad;
@@ -229,11 +171,11 @@ class Cart extends Model
             $item->save();
 
             if ($delta > 0) {
-                $inventoryService->reserve($currentSelection, $delta);
+                $inventoryService->reserve($selectedItem, $delta);
             }
 
             if ($delta < 0) {
-                $inventoryService->release($currentSelection, abs($delta));
+                $inventoryService->release($selectedItem, abs($delta));
             }
 
             return $item->fresh();

app/Domains/Cart/Requests/UpdateCartItemQuantityRequest.php

@@ -19,7 +19,7 @@ class UpdateCartItemQuantityRequest extends FormRequest
         return [
             'cantidad' => ['required', 'integer', 'min:1'],
             'catalog_item_id' => ['prohibited'],
-            'variant_id' => ['sometimes', 'nullable', 'integer'],
+            'variant_id' => ['prohibited'],
         ];
     }
 }

app/Domains/Cart/Resources/CartItemResource.php

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

app/Domains/Cart/Services/CartService.php

@@ -51,17 +51,11 @@ class CartService
         ];
     }
 
-    public function updateItem(
-        Tenant $tenant,
-        Request $request,
-        int $cartItemId,
-        int $quantity,
-        ?int $variantId,
-        bool $updateVariant,
-    ): Cart {
+    public function updateItemQuantity(Tenant $tenant, Request $request, int $cartItemId, int $quantity): Cart
+    {
         $identity = $this->requireIdentity($request);
         $cart = $this->findCartOrFail($tenant, $identity);
-        $cart->updateItem($cartItemId, $quantity, $variantId, $updateVariant);
+        $cart->updateItem($cartItemId, $quantity);
 
         return $this->loadCart($cart);
     }
@@ -107,14 +101,9 @@ class CartService
         return $cart->fresh()->load([
             'items.catalogItem.attachments',
             'items.catalogItem.inventory',
-            'items.catalogItem.itemAttributes.attribute',
-            'items.catalogItem.variants.inventory',
-            'items.catalogItem.variants.definitions.itemAttribute.attribute.options',
-            'items.catalogItem.variants.eventDates',
-            'items.catalogItem.variants.eventDate',
             'items.variant.attachments',
             'items.variant.inventory',
-            'items.variant.definitions.itemAttribute.attribute.options',
+            'items.variant.definitions.itemAttribute.attribute',
             'items.variant.eventDates',
             'items.variant.eventDate',
         ]);

app/Domains/Catalog/Enums/EventProductType.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Ticket\Enums;
+namespace App\Domains\Catalog\Enums;
 
-enum TicketGenerationPolicy: string
+enum EventProductType: string
 {
-    case PerEventDate = 'per_event_date';
-    case OnePerUnit = 'one_per_unit';
+    case Entry = 'entrada';
+    case Product = 'producto';
 
     /** @return list<string> */
     public static function values(): array

app/Domains/Catalog/Models/CatalogItem.php

@@ -4,23 +4,22 @@ namespace App\Domains\Catalog\Models;
 
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\EventProductType;
 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;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Collection;
 
 #[Fillable([
     'tenant_code',
+    'event_product_type',
     'category_id',
     'brand_id',
     'inventory_id',
@@ -32,7 +31,6 @@ use Illuminate\Support\Collection;
     'inventory_policy',
     'max_units_per_user',
     'has_tickets',
-    'ticket_generation_policy',
     'validity_time_id',
 ])]
 class CatalogItem extends Model
@@ -47,7 +45,6 @@ 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
@@ -56,12 +53,12 @@ class CatalogItem extends Model
             'category_id' => 'integer',
             'brand_id' => 'integer',
             'inventory_id' => 'integer',
+            'event_product_type' => EventProductType::class,
             'type' => CatalogItemType::class,
             'precio' => 'decimal:2',
             'inventory_policy' => InventoryPolicy::class,
             'max_units_per_user' => 'integer',
             'has_tickets' => 'boolean',
-            'ticket_generation_policy' => TicketGenerationPolicy::class,
             'validity_time_id' => 'integer',
         ];
     }
@@ -173,31 +170,6 @@ class CatalogItem extends Model
         return ($this->availableStock() ?? 0) > 0;
     }
 
-    /** @param Builder<CatalogItem> $query */
-    public function scopeWhereVariantsAvailable(Builder $query): Builder
-    {
-        return $query->where(function (Builder $query): void {
-            $query
-                ->whereDoesntHave('variants')
-                ->orWhere('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
-                ->orWhereHas(
-                    'variants.inventory',
-                    fn (Builder $inventoryQuery): Builder => $inventoryQuery
-                        ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
-                );
-        });
-    }
-
-    /** @return Collection<int, Variant> */
-    public function visibleVariants(?int $includedVariantId = null): Collection
-    {
-        return $this->variants
-            ->filter(fn (Variant $variant): bool => ($includedVariantId !== null && $variant->id === $includedVariantId)
-                || $this->inventory_policy === InventoryPolicy::Unlimited
-                || ($variant->inventory?->availableStock() ?? 0) > 0)
-            ->values();
-    }
-
     public function getPrice(): float
     {
         return (float) $this->precio;

app/Domains/Catalog/Models/ItemAttribute.php

@@ -12,7 +12,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
     'catalog_item_id',
     'attribute_id',
     'allow_multi_select',
-    'sort_order',
 ])]
 class ItemAttribute extends Model
 {
@@ -26,7 +25,6 @@ class ItemAttribute extends Model
             'catalog_item_id' => 'integer',
             'attribute_id' => 'integer',
             'allow_multi_select' => 'boolean',
-            'sort_order' => 'integer',
         ];
     }
 

app/Domains/Catalog/Models/Variant.php

@@ -149,87 +149,6 @@ class Variant extends Model
         return $values;
     }
 
-    /**
-     * @return Collection<string, array{value: string, label: string}|array<int, array{value: string, label: string}>>
-     */
-    public function selectionOptions(?Collection $itemAttributes = null): Collection
-    {
-        $options = $this->definitions
-            ->groupBy('item_attribute_id')
-            ->mapWithKeys(function (Collection $definitions): array {
-                $itemAttribute = $definitions->first()?->itemAttribute;
-                $attribute = $itemAttribute?->attribute;
-                $attributeCode = $attribute?->codigo;
-
-                if ($attributeCode === null) {
-                    return [];
-                }
-
-                $values = $definitions
-                    ->pluck('value')
-                    ->values()
-                    ->map(function (string $value) use ($attribute): array {
-                        $attributeOption = $attribute->options->firstWhere('value', $value);
-
-                        return [
-                            'value' => $value,
-                            'label' => $attributeOption?->label ?? $value,
-                        ];
-                    });
-
-                return [
-                    $attributeCode => $itemAttribute->allow_multi_select
-                        ? $values->all()
-                        : $values->first(),
-                ];
-            });
-
-        $eventDateOptions = $this->selectedEventDates()
-            ->map(fn (EventDate $eventDate): array => [
-                'value' => (string) $eventDate->id,
-                'label' => $eventDate->date->format('d/m/Y'),
-            ])
-            ->values();
-
-        if ($eventDateOptions->count() === 1) {
-            $options->put('event_date', $eventDateOptions->first());
-        } elseif ($eventDateOptions->isNotEmpty()) {
-            $options->put('event_date', $eventDateOptions->all());
-        }
-
-        if ($itemAttributes === null) {
-            $itemAttributes = $this->definitions
-                ->map(fn (VariantDefinition $definition) => $definition->itemAttribute)
-                ->filter()
-                ->unique('id')
-                ->values();
-
-            if ($this->catalogItem !== null) {
-                $itemAttributes = $itemAttributes
-                    ->merge($this->catalogItem->itemAttributes)
-                    ->unique('id')
-                    ->values();
-            }
-        }
-
-        $ordering = $itemAttributes->mapWithKeys(function (ItemAttribute $itemAttribute): array {
-            $attribute = $itemAttribute->attribute;
-
-            return $attribute === null
-                ? []
-                : [$attribute->codigo => [$itemAttribute->sort_order, mb_strtolower($attribute->nombre)]];
-        });
-
-        return $options->sortKeysUsing(function (string $left, string $right) use ($ordering): int {
-            [$leftOrder, $leftLabel] = $ordering->get($left, [0, mb_strtolower($left)]);
-            [$rightOrder, $rightLabel] = $ordering->get($right, [0, mb_strtolower($right)]);
-
-            return $leftOrder <=> $rightOrder
-                ?: $leftLabel <=> $rightLabel
-                ?: $left <=> $right;
-        });
-    }
-
     /** @return Collection<int, EventDate> */
     public function selectedEventDates(): Collection
     {

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -3,9 +3,9 @@
 namespace App\Domains\Catalog\Requests;
 
 use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\EventProductType;
 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;
 
@@ -26,6 +26,11 @@ class StoreCatalogItemRequest extends FormRequest
         return [
             'tenant_code' => ['prohibited'],
             'type' => ['sometimes', Rule::enum(CatalogItemType::class)],
+            'event_product_type' => [
+                'sometimes',
+                'nullable',
+                Rule::enum(EventProductType::class),
+            ],
             'category_id' => [
                 'sometimes',
                 'nullable',
@@ -56,7 +61,6 @@ 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,11 +31,10 @@ 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(),
-            'variants' => $catalogItem->visibleVariants()
+            'variants' => $catalogItem->variants
                 ->map(fn (Variant $variant): array => [
                     'id' => $variant->id,
                     'event_date_id' => $variant->event_date_id,
@@ -47,7 +46,7 @@ class CatalogFeaturedItemResource extends JsonResource
                     'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory->availableStock(),
-                    'values' => $variant->selectionOptions($catalogItem->itemAttributes),
+                    'values' => $variant->selectionValues(),
                 ])
                 ->values(),
         ];
@@ -66,7 +65,6 @@ 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

@@ -24,6 +24,7 @@ class CatalogItemDetailResource extends JsonResource
         return [
             'id' => $this->id,
             'type' => $this->type->value,
+            'event_product_type' => $this->event_product_type?->value,
             'category_id' => $this->category_id,
             'brand_id' => $this->brand_id,
             'slug' => $this->slug,
@@ -35,7 +36,6 @@ 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
@@ -49,7 +49,7 @@ class CatalogItemDetailResource extends JsonResource
                 $selectedVariant === null,
                 fn () => $this->imageUrls($this->attachments),
             ),
-            'variants' => $this->visibleVariants()
+            'variants' => $this->variants
                 ->map(fn (Variant $variant): array => $this->variantData($variant))
                 ->values(),
             'selected_variant' => $this->when(
@@ -87,7 +87,6 @@ class CatalogItemDetailResource extends JsonResource
             'id' => $attribute->id,
             'codigo' => $attribute->codigo,
             'nombre' => $attribute->nombre,
-            'sort_order' => $itemAttribute->sort_order,
             'is_required' => $attribute->is_required,
             'allow_multi_select' => $itemAttribute->allow_multi_select,
             'metadata_schema' => $attribute->metadata_schema,
@@ -105,10 +104,12 @@ class CatalogItemDetailResource extends JsonResource
             ->map(fn ($eventDate, int $index): array => [
                 'id' => $eventDate->id,
                 'value' => (string) $eventDate->id,
-                'label' => $eventDate->date->format('d/m/Y'),
+                'label' => $eventDate->date->format('d/m/Y').' · '
+                    .substr($eventDate->time_start, 0, 5).' a '
+                    .substr($eventDate->time_end, 0, 5),
                 'sort_order' => $index,
-                'validity_time_id' => $eventDate->validity_time_id,
-                'validity_time' => ValidityTimeResource::make($eventDate->validityTime),
+                'validity_time_id' => null,
+                'validity_time' => null,
                 'metadata' => [
                     'date' => $eventDate->date->format('Y-m-d'),
                     'time_start' => $eventDate->time_start,
@@ -147,10 +148,7 @@ class CatalogItemDetailResource extends JsonResource
     private function attributesData(): Collection
     {
         return $this->itemAttributes
-            ->sort(function (ItemAttribute $left, ItemAttribute $right): int {
-                return $left->sort_order <=> $right->sort_order
-                    ?: mb_strtolower($left->attribute->nombre) <=> mb_strtolower($right->attribute->nombre);
-            })
+            ->sortBy(fn (ItemAttribute $itemAttribute): int => $itemAttribute->attribute->type === FieldType::EventDate ? 0 : 1)
             ->map(fn (ItemAttribute $itemAttribute): array => $this->attributeData($itemAttribute))
             ->values();
     }
@@ -158,7 +156,7 @@ class CatalogItemDetailResource extends JsonResource
     /** @return array<string, mixed> */
     private function variantData(Variant $variant): array
     {
-        $values = $variant->selectionOptions($this->itemAttributes);
+        $values = $variant->selectionValues();
         $eventDates = $variant->selectedEventDates();
 
         return [

app/Domains/Catalog/Resources/CatalogItemResource.php

@@ -16,6 +16,7 @@ class CatalogItemResource extends JsonResource
         return [
             'id' => $this->id,
             'type' => $this->type->value,
+            'event_product_type' => $this->event_product_type?->value,
             'category_id' => $this->category_id,
             'brand_id' => $this->brand_id,
             'slug' => $this->slug,
@@ -25,7 +26,6 @@ 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',
@@ -45,7 +45,7 @@ class CatalogItemResource extends JsonResource
                     'descripcion' => $variant->getDescription(),
                     'precio' => number_format($variant->getPrice(), 2, '.', ''),
                     'real_stock' => $variant->inventory?->real_stock,
-                    'values' => $variant->selectionOptions($this->itemAttributes),
+                    'values' => $variant->selectionValues(),
                     'images' => $variant->attachments
                         ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
                         ->values(),

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -26,12 +26,11 @@ class CatalogSearchItemResource extends JsonResource
             'nombre' => $this->nombre,
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
-            'ticket_generation_policy' => $this->ticket_generation_policy->value,
             'validity_time_id' => $this->validity_time_id,
             'validity_time' => ValidityTimeResource::make($this->validityTime),
             'image' => $attachment?->getTemporaryUrl(1440),
             'stock_tecnico' => $this->availableStock(),
-            'variants' => $this->visibleVariants()
+            'variants' => $this->variants
                 ->map(fn (Variant $variant): array => [
                     'id' => $variant->id,
                     'event_date_id' => $variant->event_date_id,
@@ -43,7 +42,7 @@ class CatalogSearchItemResource extends JsonResource
                     'stock_tecnico' => $this->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory?->availableStock(),
-                    'values' => $variant->selectionOptions($this->itemAttributes),
+                    'values' => $variant->selectionValues(),
                 ])
                 ->values(),
         ];

app/Domains/Catalog/Services/CatalogService.php

@@ -5,6 +5,7 @@ namespace App\Domains\Catalog\Services;
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Attachable\Services\AttachmentService;
 use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\EventProductType;
 use App\Domains\Catalog\Models\Attribute;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Category;
@@ -64,6 +65,7 @@ class CatalogService
                 ]);
             }
 
+            $this->validateEventProductType($data);
             $this->validateUniqueVariantCombinations($variants, $attributeCodes);
 
             if ($type === CatalogItemType::Bundle) {
@@ -151,7 +153,7 @@ class CatalogService
                 'variants.attachments',
                 'variants.eventDate',
                 'variants.eventDates',
-                'variants.definitions.itemAttribute.attribute.options',
+                'variants.definitions.itemAttribute.attribute',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
             ]);
@@ -167,23 +169,22 @@ class CatalogService
             'brand',
             'validityTime',
             'itemAttributes.attribute.options.validityTime',
-            'itemAttributes.attribute.eventDates.validityTime',
+            'itemAttributes.attribute.eventDates',
             'variants' => fn ($query) => $query->orderBy('id'),
             'variants.inventory',
             'variants.attachments',
             'variants.eventDate',
             'variants.eventDates',
             'variants.definitions' => fn ($query) => $query->orderBy('id'),
-            'variants.definitions.itemAttribute.attribute.options',
+            'variants.definitions.itemAttribute.attribute',
             'bundleComponents.catalogItem.inventory',
             'bundleComponents.variant.inventory',
             'bundleComponents.variant.definitions.itemAttribute.attribute',
         ]);
 
-        $visibleVariants = $catalogItem->visibleVariants();
         $selectedVariant = $variantId === null
-            ? $visibleVariants->first()
-            : $visibleVariants->firstWhere('id', $variantId);
+            ? $catalogItem->variants->first()
+            : $catalogItem->variants->firstWhere('id', $variantId);
 
         if ($variantId !== null && $selectedVariant === null) {
             throw new NotFoundHttpException('Variant not found for catalog item.');
@@ -207,7 +208,6 @@ class CatalogService
 
         $paginator = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
-            ->whereVariantsAvailable()
             ->where(function (Builder $query) use ($containsPattern): void {
                 $query
                     ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
@@ -227,12 +227,11 @@ class CatalogService
                 'attachments',
                 'inventory',
                 'validityTime',
-                'itemAttributes.attribute',
                 'variants.inventory',
                 'variants.attachments',
                 'variants.eventDate',
                 'variants.eventDates',
-                'variants.definitions.itemAttribute.attribute.options',
+                'variants.definitions.itemAttribute.attribute',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
             ])
@@ -258,17 +257,15 @@ class CatalogService
         return CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('category_id', $category->id)
-            ->whereVariantsAvailable()
             ->with([
                 'attachments',
                 'inventory',
                 'validityTime',
-                'itemAttributes.attribute',
                 'variants.inventory',
                 'variants.attachments',
                 'variants.eventDate',
                 'variants.eventDates',
-                'variants.definitions.itemAttribute.attribute.options',
+                'variants.definitions.itemAttribute.attribute',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
             ])
@@ -308,39 +305,6 @@ class CatalogService
         });
     }
 
-    public function deleteVariant(Variant $variant): void
-    {
-        DB::transaction(function () use ($variant): void {
-            $variant = Variant::query()
-                ->with('attachments')
-                ->lockForUpdate()
-                ->findOrFail($variant->getKey());
-            $catalogItem = CatalogItem::query()
-                ->lockForUpdate()
-                ->findOrFail($variant->catalog_item_id);
-            $attachments = $variant->attachments;
-            $inventoryId = $variant->inventory_id;
-
-            $variant->attachments()->detach();
-            $variant->delete();
-            Inventory::query()->whereKey($inventoryId)->delete();
-
-            $minimumPrice = $catalogItem->variants()->min('precio');
-
-            if ($minimumPrice === null) {
-                $this->delete($catalogItem);
-            } else {
-                $catalogItem->update(['precio' => $minimumPrice]);
-            }
-
-            foreach ($attachments as $attachment) {
-                if (! DB::table('catalog_items_attachments')->where('attachment_id', $attachment->id)->exists()) {
-                    $this->attachmentService->delete($attachment);
-                }
-            }
-        });
-    }
-
     private function createInventory(int $realStock): Inventory
     {
         return Inventory::query()->create([
@@ -442,7 +406,6 @@ class CatalogService
             'attribute_codes',
             'variants',
             'has_tickets',
-            'ticket_generation_policy',
             'validity_time_id',
         ] as $field) {
             if (array_key_exists($field, $data)) {
@@ -623,6 +586,22 @@ class CatalogService
         return $variant;
     }
 
+    /** @param array<string, mixed> $data */
+    private function validateEventProductType(array $data): void
+    {
+        $eventProductType = $data['event_product_type'] ?? null;
+
+        if ($eventProductType === null) {
+            return;
+        }
+
+        if (! in_array($eventProductType, EventProductType::values(), true)) {
+            throw ValidationException::withMessages([
+                'event_product_type' => [__('api.catalog.invalid_event_product_type')],
+            ]);
+        }
+    }
+
     /**
      * @param  array<int, array<string, mixed>>  $variants
      * @param  array<int, string>  $attributeCodes

app/Domains/Catalog/Services/FeaturedGroupService.php

@@ -37,17 +37,15 @@ class FeaturedGroupService
     {
         $query = CatalogItem::query()
             ->where('catalog_items.tenant_code', $featuredGroup->tenant_code)
-            ->whereVariantsAvailable()
             ->with([
                 'inventory',
                 'attachments',
                 'validityTime',
-                'itemAttributes.attribute',
                 'variants.inventory',
                 'variants.attachments',
                 'variants.eventDate',
                 'variants.eventDates',
-                'variants.definitions.itemAttribute.attribute.options',
+                'variants.definitions.itemAttribute.attribute',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
             ]);

app/Domains/Event/Models/EventDate.php

@@ -3,10 +3,7 @@
 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;
@@ -28,31 +25,10 @@ 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',
         ];
     }
 
@@ -62,12 +38,6 @@ 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
     {
@@ -94,48 +64,4 @@ 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,7 +3,6 @@
 namespace App\Domains\Event\Resources;
 
 use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -21,8 +20,6 @@ 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,9 +13,11 @@ class EventService
         'facebook_url' => 'facebook',
     ];
 
+    public function __construct(protected EventDateTextFormatter $eventDateTextFormatter) {}
+
     public function forTenant(Tenant $tenant): Tenant
     {
-        return $tenant->load(['eventDates.validityTime', 'socialMedia']);
+        return $tenant->load(['eventDates', 'socialMedia']);
     }
 
     /** @param array<string, mixed> $data */
@@ -26,6 +28,9 @@ 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']);
@@ -35,7 +40,7 @@ class EventService
                 $this->syncLegacyContact($tenant, $data['contact']);
             }
 
-            return $tenant->load(['eventDates.validityTime', 'socialMedia']);
+            return $tenant->load(['eventDates', 'socialMedia']);
         });
     }
 

app/Domains/FiestaFutbolInfantil/Controllers/AccommodationController.php

@@ -7,7 +7,6 @@ use App\Domains\FiestaFutbolInfantil\Resources\AccommodationResource;
 use App\Domains\FiestaFutbolInfantil\Services\AccommodationService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class AccommodationController extends Controller
 {
@@ -31,14 +30,4 @@ class AccommodationController extends Controller
             )
         );
     }
-
-    public function destroy(Request $request, int $accommodation): Response
-    {
-        $this->accommodationService->delete(
-            $request->user()->tenant()->firstOrFail(),
-            $accommodation,
-        );
-
-        return response()->noContent();
-    }
 }

app/Domains/FiestaFutbolInfantil/Controllers/EntryController.php

@@ -9,7 +9,6 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Illuminate\Http\Response;
 
 class EntryController extends Controller
 {
@@ -35,14 +34,4 @@ class EntryController extends Controller
             ->response()
             ->setStatusCode(200);
     }
-
-    public function destroy(Request $request, int $entry): Response
-    {
-        $this->entryService->delete(
-            $request->user()->tenant()->firstOrFail(),
-            $entry,
-        );
-
-        return response()->noContent();
-    }
 }

app/Domains/FiestaFutbolInfantil/Controllers/FoodController.php

@@ -7,7 +7,6 @@ use App\Domains\FiestaFutbolInfantil\Resources\FoodResource;
 use App\Domains\FiestaFutbolInfantil\Services\FoodService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class FoodController extends Controller
 {
@@ -31,14 +30,4 @@ class FoodController extends Controller
             )
         );
     }
-
-    public function destroy(Request $request, int $food): Response
-    {
-        $this->foodService->delete(
-            $request->user()->tenant()->firstOrFail(),
-            $food,
-        );
-
-        return response()->noContent();
-    }
 }

app/Domains/FiestaFutbolInfantil/Controllers/MerchandiseController.php

@@ -9,7 +9,6 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Illuminate\Http\Response;
 
 class MerchandiseController extends Controller
 {
@@ -34,14 +33,4 @@ class MerchandiseController extends Controller
             ->response()
             ->setStatusCode(200);
     }
-
-    public function destroy(Request $request, int $merchandise): Response
-    {
-        $this->merchandiseService->delete(
-            $request->user()->tenant()->firstOrFail(),
-            $merchandise,
-        );
-
-        return response()->noContent();
-    }
 }

app/Domains/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php

@@ -29,11 +29,7 @@ class UpsertEntriesRequest extends FormRequest
                 Rule::exists('catalog_items', 'id')->where(
                     fn ($query) => $query
                         ->where('tenant_code', $tenantCode)
-                        ->whereIn('category_id', fn ($categoryQuery) => $categoryQuery
-                            ->select('id')
-                            ->from('categorias')
-                            ->where('tenant_code', $tenantCode)
-                            ->where('nombre', 'Entradas'))
+                        ->where('event_product_type', 'entrada')
                 ),
             ],
             'entries.*.title' => ['required', 'string', 'max:255'],

app/Domains/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php

@@ -28,11 +28,7 @@ class UpsertMerchandiseRequest extends FormRequest
                 Rule::exists('catalog_items', 'id')->where(
                     fn ($query) => $query
                         ->where('tenant_code', $tenantCode)
-                        ->whereIn('category_id', fn ($categoryQuery) => $categoryQuery
-                            ->select('id')
-                            ->from('categorias')
-                            ->where('tenant_code', $tenantCode)
-                            ->where('nombre', 'Merchandising'))
+                        ->where('event_product_type', 'producto')
                 ),
             ],
             'items.*.title' => ['required', 'string', 'max:255'],

app/Domains/FiestaFutbolInfantil/Services/AccommodationService.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\FiestaFutbolInfantil\Services;
 
+use App\Domains\Catalog\Enums\EventProductType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\Attribute;
 use App\Domains\Catalog\Models\AttributeOption;
@@ -10,9 +11,7 @@ use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\Inventory;
 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;
@@ -21,8 +20,6 @@ class AccommodationService
 {
     private const ATTRIBUTE_CODE = 'tipo_alojamiento';
 
-    public function __construct(private readonly CatalogService $catalogService) {}
-
     public function current(Tenant $tenant): ?CatalogItem
     {
         return CatalogItem::query()
@@ -89,18 +86,6 @@ class AccommodationService
         });
     }
 
-    public function delete(Tenant $tenant, int $accommodationId): void
-    {
-        $variant = Variant::query()
-            ->whereKey($accommodationId)
-            ->whereHas('catalogItem', fn ($query) => $query
-                ->where('tenant_code', $tenant->codigo)
-                ->where('slug', 'alojamiento'))
-            ->firstOrFail();
-
-        $this->catalogService->deleteVariant($variant);
-    }
-
     private function attribute(Tenant $tenant): Attribute
     {
         $attribute = Attribute::query()
@@ -135,9 +120,9 @@ class AccommodationService
         if ($accommodation !== null) {
             $accommodation->update([
                 'category_id' => $category->id,
+                'event_product_type' => EventProductType::Product->value,
                 'inventory_policy' => InventoryPolicy::Tracked->value,
-                'has_tickets' => true,
-                'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
+                'has_tickets' => false,
             ]);
 
             return $accommodation;
@@ -150,9 +135,9 @@ class AccommodationService
             'descripcion' => 'Alojamiento',
             'category_id' => $category->id,
             'precio' => collect($variants)->min('price') ?? 0,
+            'event_product_type' => EventProductType::Product->value,
             'inventory_policy' => InventoryPolicy::Tracked->value,
-            'has_tickets' => true,
-            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
+            'has_tickets' => false,
             'inventory_id' => null,
         ]);
     }

app/Domains/FiestaFutbolInfantil/Services/EntryService.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\FiestaFutbolInfantil\Services;
 
+use App\Domains\Catalog\Enums\EventProductType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Category;
@@ -9,7 +10,6 @@ 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;
@@ -24,7 +24,7 @@ class EntryService
     {
         return CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
-            ->whereHas('category', fn ($query) => $query->where('nombre', 'Entradas'))
+            ->where('event_product_type', EventProductType::Entry->value)
             ->with([
                 'variants.inventory',
                 'variants.eventDate',
@@ -62,8 +62,8 @@ class EntryService
                     'descripcion' => $entry['description'] ?? null,
                     'category_id' => $category->id,
                     'precio' => $entry['price'],
+                    'event_product_type' => EventProductType::Entry->value,
                     'has_tickets' => true,
-                    'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
                     'inventory_policy' => InventoryPolicy::Tracked->value,
                     'attribute_codes' => ['event_date'],
                     'multi_select_attribute_codes' => ['event_date'],
@@ -76,24 +76,13 @@ class EntryService
         });
     }
 
-    public function delete(Tenant $tenant, int $entryId): void
-    {
-        $entry = CatalogItem::query()
-            ->whereKey($entryId)
-            ->where('tenant_code', $tenant->codigo)
-            ->whereHas('category', fn ($query) => $query->where('nombre', 'Entradas'))
-            ->firstOrFail();
-
-        $this->catalogService->delete($entry);
-    }
-
     /** @param array<string, mixed> $entry */
     private function update(Tenant $tenant, Category $category, array $entry, int $index): CatalogItem
     {
         $catalogItem = CatalogItem::query()
             ->whereKey($entry['id'])
             ->where('tenant_code', $tenant->codigo)
-            ->whereHas('category', fn ($query) => $query->where('nombre', 'Entradas'))
+            ->where('event_product_type', EventProductType::Entry->value)
             ->lockForUpdate()
             ->firstOrFail();
 
@@ -135,7 +124,6 @@ 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

@@ -2,6 +2,7 @@
 
 namespace App\Domains\FiestaFutbolInfantil\Services;
 
+use App\Domains\Catalog\Enums\EventProductType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\Attribute;
 use App\Domains\Catalog\Models\AttributeOption;
@@ -10,9 +11,7 @@ use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\Inventory;
 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;
@@ -21,14 +20,6 @@ class FoodService
 {
     private const ATTRIBUTE_CODES = ['event_date', 'horario', 'servicio'];
 
-    private const ATTRIBUTE_SORT_ORDERS = [
-        'event_date' => 1,
-        'horario' => 2,
-        'servicio' => 3,
-    ];
-
-    public function __construct(private readonly CatalogService $catalogService) {}
-
     public function current(Tenant $tenant): ?CatalogItem
     {
         return CatalogItem::query()
@@ -96,18 +87,6 @@ class FoodService
         });
     }
 
-    public function delete(Tenant $tenant, int $foodId): void
-    {
-        $variant = Variant::query()
-            ->whereKey($foodId)
-            ->whereHas('catalogItem', fn ($query) => $query
-                ->where('tenant_code', $tenant->codigo)
-                ->where('slug', 'comida'))
-            ->firstOrFail();
-
-        $this->catalogService->deleteVariant($variant);
-    }
-
     /** @return Collection<string, Attribute> */
     private function attributes(Tenant $tenant): Collection
     {
@@ -146,9 +125,9 @@ class FoodService
         if ($food !== null) {
             $food->update([
                 'category_id' => $category->id,
+                'event_product_type' => EventProductType::Product->value,
                 'inventory_policy' => InventoryPolicy::Tracked->value,
-                'has_tickets' => true,
-                'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
+                'has_tickets' => false,
             ]);
 
             return $food;
@@ -161,9 +140,9 @@ class FoodService
             'descripcion' => 'Comida',
             'category_id' => $category->id,
             'precio' => collect($variants)->min('price') ?? 0,
+            'event_product_type' => EventProductType::Product->value,
             'inventory_policy' => InventoryPolicy::Tracked->value,
-            'has_tickets' => true,
-            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
+            'has_tickets' => false,
             'inventory_id' => null,
         ]);
     }
@@ -175,12 +154,9 @@ class FoodService
     private function itemAttributes(CatalogItem $food, Collection $attributes): Collection
     {
         return $attributes->mapWithKeys(function (Attribute $attribute, string $code) use ($food): array {
-            $itemAttribute = $food->itemAttributes()->updateOrCreate(
+            $itemAttribute = $food->itemAttributes()->firstOrCreate(
                 ['attribute_id' => $attribute->id],
-                [
-                    'allow_multi_select' => false,
-                    'sort_order' => self::ATTRIBUTE_SORT_ORDERS[$code],
-                ],
+                ['allow_multi_select' => false],
             );
 
             return [$code => $itemAttribute];

app/Domains/FiestaFutbolInfantil/Services/MerchandiseService.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\FiestaFutbolInfantil\Services;
 
+use App\Domains\Catalog\Enums\EventProductType;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\Attribute;
 use App\Domains\Catalog\Models\AttributeOption;
@@ -10,9 +11,7 @@ use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\Inventory;
 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;
@@ -22,13 +21,12 @@ class MerchandiseService
 {
     private const ATTRIBUTE_CODES = ['color', 'talle'];
 
-    public function __construct(private readonly CatalogService $catalogService) {}
-
     /** @return Collection<int, CatalogItem> */
     public function all(Tenant $tenant): Collection
     {
         return CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
+            ->where('event_product_type', EventProductType::Product->value)
             ->whereHas('category', fn ($query) => $query->where('nombre', 'Merchandising'))
             ->with([
                 'itemAttributes.attribute.options',
@@ -73,9 +71,9 @@ class MerchandiseService
                     'descripcion' => $data['description'] ?? null,
                     'category_id' => $category->id,
                     'max_units_per_user' => (int) $data['max_units_per_user'],
+                    'event_product_type' => EventProductType::Product->value,
                     'inventory_policy' => InventoryPolicy::Tracked->value,
-                    'has_tickets' => true,
-                    'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
+                    'has_tickets' => false,
                 ]);
 
                 $itemAttributes = $this->itemAttributes($item, $attributes);
@@ -122,19 +120,6 @@ class MerchandiseService
         });
     }
 
-    public function delete(Tenant $tenant, int $merchandiseId): void
-    {
-        $variant = Variant::query()
-            ->whereKey($merchandiseId)
-            ->whereHas('catalogItem', fn ($query) => $query
-                ->where('tenant_code', $tenant->codigo)
-                ->whereHas('category', fn ($categoryQuery) => $categoryQuery
-                    ->where('nombre', 'Merchandising')))
-            ->firstOrFail();
-
-        $this->catalogService->deleteVariant($variant);
-    }
-
     /** @return Collection<string, Attribute> */
     private function attributes(Tenant $tenant): Collection
     {
@@ -168,6 +153,7 @@ class MerchandiseService
             ->whereKey($itemId)
             ->where('tenant_code', $tenant->codigo)
             ->where('category_id', $category->id)
+            ->where('event_product_type', EventProductType::Product->value)
             ->lockForUpdate()
             ->first();
 
@@ -198,9 +184,9 @@ class MerchandiseService
             'category_id' => $category->id,
             'precio' => collect($data['variants'])->min('price') ?? 0,
             'max_units_per_user' => (int) $data['max_units_per_user'],
+            'event_product_type' => EventProductType::Product->value,
             'inventory_policy' => InventoryPolicy::Tracked->value,
-            'has_tickets' => true,
-            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
+            'has_tickets' => false,
             'inventory_id' => null,
         ]);
     }

app/Domains/FiestaFutbolInfantil/routes/api.php

@@ -15,34 +15,22 @@ Route::prefix('v1/adminapp/tenant')
         Route::post('entries', [EntryController::class, 'store'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
             ->name('adminapp.fiesta-futbol-infantil.entries.store');
-        Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
-            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
-            ->name('adminapp.fiesta-futbol-infantil.entries.destroy');
         Route::get('foods', [FoodController::class, 'index'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
             ->name('adminapp.fiesta-futbol-infantil.foods.index');
         Route::post('foods', [FoodController::class, 'store'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
             ->name('adminapp.fiesta-futbol-infantil.foods.store');
-        Route::delete('foods/{food}', [FoodController::class, 'destroy'])
-            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
-            ->name('adminapp.fiesta-futbol-infantil.foods.destroy');
         Route::get('accommodations', [AccommodationController::class, 'index'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
             ->name('adminapp.fiesta-futbol-infantil.accommodations.index');
         Route::post('accommodations', [AccommodationController::class, 'store'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
             ->name('adminapp.fiesta-futbol-infantil.accommodations.store');
-        Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
-            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
-            ->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
         Route::get('merchandise', [MerchandiseController::class, 'index'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
             ->name('adminapp.fiesta-futbol-infantil.merchandise.index');
         Route::post('merchandise', [MerchandiseController::class, 'store'])
             ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
             ->name('adminapp.fiesta-futbol-infantil.merchandise.store');
-        Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
-            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
-            ->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
     });

app/Domains/Forms/Resources/FoodFormResource.php

@@ -4,7 +4,6 @@ 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;
@@ -18,8 +17,6 @@ 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()->with('validityTime')->get(),
+            'event_dates' => $tenant->eventDates()->get(),
             'schedules' => $attributes->get('horario')?->options ?? new Collection,
             'services' => $attributes->get('servicio')?->options ?? new Collection,
         ];

app/Domains/Integration/Services/TelepagosWebhookService.php

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

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

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

app/Domains/Purchase/Services/CheckoutService.php

@@ -9,7 +9,6 @@ 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.
@@ -65,26 +64,11 @@ 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

@@ -3,10 +3,8 @@
 namespace App\Domains\Sale\Controllers\AdminApp;
 
 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;
@@ -32,36 +30,6 @@ class SaleController extends Controller
         ]);
     }
 
-    public function show(Request $request, int $sale): SaleDetailResource
-    {
-        $tenant = $request->user()->tenant()->firstOrFail();
-
-        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/SaleDetailResource.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Domains\Sale\Resources\AdminApp;
-
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin Purchase */
-class SaleDetailResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'items' => $this->items->map(fn (PurchaseItem $item): array => [
-                'id' => $item->id,
-                'product' => $item->item_nombre,
-                'event_dates' => $this->eventDates($item),
-                'quantity' => (int) $item->cantidad,
-                'unit_price' => $this->formatMoney($item->precio_unitario),
-                'total' => $this->formatMoney($item->total),
-            ])->values(),
-            'total' => $this->formatMoney($this->total),
-        ];
-    }
-
-    /** @return list<string> */
-    private function eventDates(PurchaseItem $item): array
-    {
-        return collect($item->variant_attributes ?? [])
-            ->filter(fn (mixed $attribute): bool => is_array($attribute)
-                && mb_strtolower(trim((string) ($attribute['name'] ?? ''))) === 'fecha')
-            ->flatMap(function (array $attribute): array {
-                $value = $attribute['value'] ?? [];
-
-                return is_array($value) ? $value : [$value];
-            })
-            ->filter(fn (mixed $date): bool => is_string($date) && $date !== '')
-            ->values()
-            ->all();
-    }
-
-    private function formatMoney(float|int|string|null $amount): string
-    {
-        return number_format((float) ($amount ?? 0), 2, '.', '');
-    }
-}

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

@@ -1,22 +0,0 @@
-<?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,19 +4,13 @@ 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()
@@ -45,42 +39,6 @@ class AdminAppSaleService
             ->withQueryString();
     }
 
-    public function detail(Tenant $tenant, int $saleId): Purchase
-    {
-        return Purchase::query()
-            ->where('tenant_codigo', $tenant->codigo)
-            ->with('items')
-            ->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>
@@ -159,18 +117,4 @@ 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,8 +10,4 @@ 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,8 +33,6 @@ 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',
@@ -47,8 +45,6 @@ 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
@@ -67,8 +63,6 @@ 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,10 +19,6 @@ class WebsiteExtra extends Model
 
     protected $table = 'websites_extras';
 
-    protected $attributes = [
-        'is_enabled' => true,
-    ];
-
     private mixed $resolvedConfig = null;
 
     private bool $hasResolvedConfig = false;

app/Domains/Tenant/Models/WebsiteType.php

@@ -13,7 +13,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
     'codigo',
     'nombre',
     'dominio',
-    'scanner_domain',
     'primary_color',
     'secondary_color',
     'danger_color',

app/Domains/Tenant/Requests/StoreTenantRequest.php

@@ -75,8 +75,6 @@ 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,8 +85,6 @@ 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,7 +9,6 @@ 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
@@ -62,8 +61,6 @@ 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
@@ -160,10 +157,6 @@ 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();
 
@@ -173,10 +166,6 @@ 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/Scanner/TicketController.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Domains\Ticket\Controllers\Scanner;
-
-use App\Domains\Auth\Models\User;
-use App\Domains\Ticket\Requests\ScannerTicketIndexRequest;
-use App\Domains\Ticket\Resources\Scanner\ScannedTicketResource;
-use App\Domains\Ticket\Resources\TicketResource;
-use App\Domains\Ticket\Services\ScannerTicketService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-
-class TicketController extends Controller
-{
-    public function __construct(private readonly ScannerTicketService $ticketService) {}
-
-    public function index(ScannerTicketIndexRequest $request): AnonymousResourceCollection
-    {
-        /** @var User $scanner */
-        $scanner = $request->user();
-
-        return ScannedTicketResource::collection(
-            $this->ticketService->scannedBy($scanner, $request->validated())
-        );
-    }
-
-    public function show(Request $request, string $ticketUuid): TicketResource
-    {
-        /** @var User $scanner */
-        $scanner = $request->user();
-
-        return TicketResource::make(
-            $this->ticketService->detail($scanner, $ticketUuid)
-        );
-    }
-
-    public function scan(Request $request, string $ticketUuid): TicketResource
-    {
-        /** @var User $scanner */
-        $scanner = $request->user();
-
-        return TicketResource::make(
-            $this->ticketService->scan($scanner, $ticketUuid)
-        );
-    }
-}

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('validityGroups.validityTimes', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
+            ->with('validityTime', '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('validityGroups.validityTimes', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
+            ->with('validityTime', 'sourceVariant.eventDate', 'sourceVariant.catalogItem')
             ->orderByDesc('id')
             ->get();
 

app/Domains/Ticket/Models/Ticket.php

@@ -9,12 +9,9 @@ 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',
@@ -24,6 +21,7 @@ use Illuminate\Support\Collection;
     'source_purchase_id',
     'source_catalog_item_id',
     'source_variant_id',
+    'validity_time_id',
     'used_at',
     'scanner_user_id',
     'user_id',
@@ -32,19 +30,12 @@ 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
@@ -53,6 +44,7 @@ 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',
@@ -95,23 +87,18 @@ class Ticket extends Model
         return $this->belongsTo(Variant::class, 'source_variant_id');
     }
 
-    /** @return HasMany<TicketValidityGroup, $this> */
-    public function validityGroups(): HasMany
+    /** @return BelongsTo<ValidityTime, $this> */
+    public function validityTime(): BelongsTo
     {
-        return $this->hasMany(TicketValidityGroup::class);
+        return $this->belongsTo(ValidityTime::class);
     }
 
     public function isValid(): bool
     {
-        if ($this->used_at !== null) {
-            return false;
-        }
-
-        $validityGroups = $this->resolvedValidityGroups();
-
-        return $validityGroups->isEmpty()
-            || $validityGroups->contains(
-                fn (TicketValidityGroup $group): bool => $group->isValid()
+        return $this->used_at === null
+            && (
+                $this->validityTime === null
+                || $this->validityTime->isValid()
             );
     }
 
@@ -122,13 +109,11 @@ class Ticket extends Model
 
     public function getIsExpiredAttribute(): bool
     {
-        $validityGroups = $this->resolvedValidityGroups();
+        $expiresAt = $this->getEffectiveExpiresAt();
 
         return $this->used_at === null
-            && $validityGroups->isNotEmpty()
-            && $validityGroups->every(
-                fn (TicketValidityGroup $group): bool => $group->isExpired()
-            );
+            && $expiresAt !== null
+            && $expiresAt->lessThanOrEqualTo(now());
     }
 
     public function getIsUsedAttribute(): bool
@@ -136,65 +121,13 @@ 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->resolvedValidityGroups()
-            ->map(fn (TicketValidityGroup $group): ?CarbonInterface => $group->effectiveStartsAt())
-            ->filter()
-            ->sortBy(fn (CarbonInterface $startsAt): int => $startsAt->getTimestamp())
-            ->first();
+        return $this->validityTime?->startsAt();
     }
 
     public function getEffectiveExpiresAt(): ?CarbonInterface
     {
-        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;
+        return $this->validityTime?->expiresAt();
     }
 }

app/Domains/Ticket/Models/TicketValidityGroup.php

@@ -1,117 +0,0 @@
-<?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,16 +4,13 @@ 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',
@@ -47,21 +44,10 @@ class ValidityTime extends Model
         return $this->hasMany(AttributeOption::class);
     }
 
-    /** @return HasOne<EventDate, $this> */
-    public function eventDate(): HasOne
+    /** @return HasMany<Ticket, $this> */
+    public function tickets(): HasMany
     {
-        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',
-        );
+        return $this->hasMany(Ticket::class);
     }
 
     public function startsAt(

app/Domains/Ticket/Requests/ScannerTicketIndexRequest.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Domains\Ticket\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class ScannerTicketIndexRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /** @return array<string, list<string>> */
-    public function rules(): array
-    {
-        return [
-            'q' => ['sometimes', 'nullable', 'string', 'max:255'],
-            'page' => ['sometimes', 'integer', 'min:1'],
-            'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'],
-        ];
-    }
-}

app/Domains/Ticket/Resources/Scanner/ScannedTicketResource.php

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

app/Domains/Ticket/Resources/TicketResource.php

@@ -18,14 +18,10 @@ class TicketResource extends JsonResource
             'ticket' => $this->ticket,
             'name' => $this->name,
             'description' => $this->description,
-            'client' => $this->user?->nombre_apellido,
-            'category' => $this->sourceCatalogItem?->category?->nombre,
             'source_catalog_item_id' => $this->source_catalog_item_id,
             'source_variant_id' => $this->source_variant_id,
-            'validity_times' => ValidityTimeResource::collection($this->allValidityTimes()),
-            'validity_groups' => TicketValidityGroupResource::collection(
-                $this->resolvedValidityGroups()
-            ),
+            'validity_time_id' => $this->validity_time_id,
+            'validity_time' => ValidityTimeResource::make($this->validityTime),
             'starts_at' => $this->getEffectiveStartsAt(),
             'expires_at' => $this->getEffectiveExpiresAt(),
             'used_at' => $this->used_at,

app/Domains/Ticket/Resources/TicketValidityGroupResource.php

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

@@ -1,163 +0,0 @@
-<?php
-
-namespace App\Domains\Ticket\Services;
-
-use App\Domains\Auth\Models\User;
-use App\Domains\Ticket\Models\Ticket;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
-
-class ScannerTicketService
-{
-    /**
-     * @param  array{q?: string|null, page?: int, per_page?: int}  $filters
-     * @return LengthAwarePaginator<Ticket>
-     */
-    public function scannedBy(User $scanner, array $filters = []): LengthAwarePaginator
-    {
-        $search = trim((string) ($filters['q'] ?? ''));
-
-        return $this->baseQuery()
-            ->where('tenant_code', $scanner->tenant_codigo)
-            ->where('scanner_user_id', $scanner->getKey())
-            ->when($search !== '', function (Builder $query) use ($search): void {
-                $usedAtDate = $this->parseSearchDate($search);
-
-                $query->where(function (Builder $searchQuery) use ($search, $usedAtDate): void {
-                    $searchQuery->where('ticket', 'like', "%{$search}%");
-
-                    if (ctype_digit($search)) {
-                        $searchQuery->orWhere('id', (int) $search);
-                    }
-
-                    if ($usedAtDate !== null) {
-                        $searchQuery->orWhereDate('used_at', $usedAtDate);
-                    }
-                });
-            })
-            ->orderByDesc('used_at')
-            ->orderByDesc('id')
-            ->paginateFromRequest()
-            ->withQueryString();
-    }
-
-    private function parseSearchDate(string $search): ?string
-    {
-        if (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $search, $matches) === 1) {
-            [$year, $month, $day] = array_map('intval', array_slice($matches, 1));
-
-            if (checkdate($month, $day, $year)) {
-                return sprintf('%04d-%02d-%02d', $year, $month, $day);
-            }
-        }
-
-        if (preg_match('/^(\d{2})\/(\d{2})\/(\d{2}|\d{4})$/', $search, $matches) === 1) {
-            $day = (int) $matches[1];
-            $month = (int) $matches[2];
-            $year = (int) $matches[3];
-            $year = strlen($matches[3]) === 2 ? 2000 + $year : $year;
-
-            if (checkdate($month, $day, $year)) {
-                return sprintf('%04d-%02d-%02d', $year, $month, $day);
-            }
-        }
-
-        return null;
-    }
-
-    public function detail(User $scanner, string $ticketUuid): Ticket
-    {
-        $categoryIds = $this->scannerCategoryIds($scanner);
-
-        return $this->baseQuery()
-            ->where('tenant_code', $scanner->tenant_codigo)
-            ->where('ticket', $ticketUuid)
-            ->where(function (Builder $query) use ($scanner, $categoryIds): void {
-                $query
-                    ->where('scanner_user_id', $scanner->getKey())
-                    ->orWhereHas(
-                        'sourceCatalogItem',
-                        fn (Builder $catalogItemQuery): Builder => $catalogItemQuery
-                            ->whereIn('category_id', $categoryIds)
-                    );
-            })
-            ->firstOrFail();
-    }
-
-    public function scan(User $scanner, string $ticketUuid): Ticket
-    {
-        return DB::transaction(function () use ($scanner, $ticketUuid): Ticket {
-            $ticket = $this->baseQuery()
-                ->where('tenant_code', $scanner->tenant_codigo)
-                ->where('ticket', $ticketUuid)
-                ->lockForUpdate()
-                ->firstOrFail();
-
-            if (! $this->scannerCanScan($scanner, $ticket)) {
-                throw ValidationException::withMessages([
-                    'ticket' => __('api.ticket.scanner_category_forbidden'),
-                ]);
-            }
-
-            if ($ticket->is_used) {
-                throw ValidationException::withMessages([
-                    'ticket' => __('api.ticket.already_scanned'),
-                ]);
-            }
-
-            if (! $ticket->is_valid) {
-                throw ValidationException::withMessages([
-                    'ticket' => $ticket->is_expired
-                        ? __('api.ticket.expired_for_scan')
-                        : __('api.ticket.not_valid_for_scan'),
-                ]);
-            }
-
-            $ticket->forceFill([
-                'used_at' => now(),
-                'scanner_user_id' => $scanner->getKey(),
-            ])->save();
-
-            return $ticket->refresh()->load($this->relations());
-        });
-    }
-
-    /** @return Builder<Ticket> */
-    private function baseQuery(): Builder
-    {
-        return Ticket::query()->with($this->relations());
-    }
-
-    /** @return array<int, string> */
-    private function relations(): array
-    {
-        return [
-            'validityGroups.validityTimes',
-            'sourceCatalogItem.category',
-            'sourceVariant.eventDate',
-            'sourceVariant.catalogItem',
-            'user',
-        ];
-    }
-
-    /** @return array<int, int> */
-    private function scannerCategoryIds(User $scanner): array
-    {
-        return $scanner->scanCategories()
-            ->pluck('categorias.id')
-            ->map(fn (mixed $id): int => (int) $id)
-            ->all();
-    }
-
-    private function scannerCanScan(User $scanner, Ticket $ticket): bool
-    {
-        $categoryId = $ticket->sourceCatalogItem?->category_id;
-
-        return $categoryId !== null
-            && $scanner->scanCategories()
-                ->where('categorias.id', $categoryId)
-                ->exists();
-    }
-}

app/Domains/Ticket/Services/TicketGeneratorService.php

@@ -6,12 +6,10 @@ 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\TicketGenerationPolicy;
+use App\Domains\Ticket\Enums\ValidityTimeType;
 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;
@@ -38,51 +36,36 @@ 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'];
-                $validityGroups = $this->buildTicketValidityGroups(
-                    $item,
+                $validityTime = $this->resolveValidityTime($item, $variant);
+                $validityTime = $this->materializeEventDateValidityTime(
                     $variant,
                     $eventDate,
-                    $this->resolveValidityTime($item, $variant),
+                    $validityTime,
+                    $fixedValidityTimes,
                 );
 
-                $ticket = Ticket::query()->create([
+                return Ticket::query()->create([
                     'tenant_code' => $item->tenant_code,
                     'ticket' => (string) Str::uuid(),
-                    'name' => $this->ticketName($item, $variant, $eventDate),
+                    'name' => $item->nombre,
                     'description' => (string) ($item->descripcion ?? ''),
                     '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;
             });
         });
     }
@@ -142,21 +125,8 @@ class TicketGeneratorService
             ]);
         }
 
-        $variant->loadMissing(['eventDates.validityTime', 'eventDate.validityTime']);
+        $variant->loadMissing(['eventDates', 'eventDate']);
         $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;
@@ -236,77 +206,52 @@ class TicketGeneratorService
         return $validityTimes->first();
     }
 
-    private function ticketName(
-        CatalogItem $catalogItem,
-        ?Variant $variant,
-        ?EventDate $eventDate,
-    ): string {
-        if ($variant === null) {
-            return $catalogItem->nombre;
-        }
-
-        $options = $variant->selectionOptions();
-
-        if ($eventDate !== null) {
-            $options->put('event_date', [
-                'value' => (string) $eventDate->getKey(),
-                'label' => $eventDate->date->format('d/m/Y'),
-            ]);
-        }
-
-        $properties = $options
-            ->flatMap(function (array $option): array {
-                if (array_is_list($option)) {
-                    return collect($option)
-                        ->pluck('label')
-                        ->filter(fn ($label): bool => is_string($label) && $label !== '')
-                        ->all();
-                }
-
-                $label = $option['label'] ?? null;
-
-                return is_string($label) && $label !== '' ? [$label] : [];
-            })
-            ->values();
-
-        if ($properties->isEmpty()) {
-            return $catalogItem->nombre;
-        }
-
-        return $catalogItem->nombre.' ('.$properties->implode(', ').')';
-    }
-
-    /** @return Collection<int, Collection<int, ValidityTime>> */
-    private function buildTicketValidityGroups(
-        CatalogItem $catalogItem,
+    /**
+     * Convert a recurring time window into the fixed date and time purchased by
+     * the customer. Equal tickets generated together share the same snapshot.
+     *
+     * @param  array<string, ValidityTime>  $fixedValidityTimes
+     */
+    private function materializeEventDateValidityTime(
         ?Variant $variant,
         ?EventDate $eventDate,
         ?ValidityTime $validityTime,
-    ): Collection {
-        $eventDates = collect([$eventDate]);
+        array &$fixedValidityTimes,
+    ): ?ValidityTime {
+        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 (
-            $catalogItem->ticket_generation_policy === TicketGenerationPolicy::OnePerUnit
-            && $variant !== null
+            $startsAt !== null
+            && $expiresAt !== null
+            && $expiresAt->lessThanOrEqualTo($startsAt)
         ) {
-            $variant->loadMissing(['eventDates.validityTime', 'eventDate.validityTime']);
-            $selectedEventDates = $variant->selectedEventDates();
-
-            if ($selectedEventDates->isNotEmpty()) {
-                $eventDates = $selectedEventDates;
-            }
+            $expiresAt = $expiresAt->addDay();
         }
 
-        return $eventDates
-            ->map(function (?EventDate $date) use ($validityTime): Collection {
-                $date?->loadMissing('validityTime');
-
-                return collect([$date?->validityTime, $validityTime])
-                    ->filter()
-                    ->unique(fn (ValidityTime $time): int => $time->getKey())
-                    ->values();
-            })
-            ->filter(fn (Collection $group): bool => $group->isNotEmpty())
-            ->values();
+        return $fixedValidityTimes[$cacheKey] = ValidityTime::query()->create([
+            'type' => ValidityTimeType::FixedWindow,
+            'start_time' => null,
+            'end_time' => null,
+            'fixed_starts_at' => $startsAt,
+            'fixed_expires_at' => $expiresAt,
+        ]);
     }
 }

app/Domains/Ticket/routes/api.php

@@ -9,5 +9,3 @@ Route::prefix('tenants/{tenant:codigo}')
         Route::get('tickets', [TicketController::class, 'index']);
         Route::post('tickets/pdf', [TicketController::class, 'downloadPdf']);
     });
-
-require __DIR__.'/scanner.php';

app/Domains/Ticket/routes/scanner.php

@@ -1,14 +0,0 @@
-<?php
-
-use App\Domains\Ticket\Controllers\Scanner\TicketController;
-use Illuminate\Support\Facades\Route;
-
-Route::prefix('v1/scanner/tickets')
-    ->middleware(['auth:sanctum', 'scanner.tenant'])
-    ->group(function (): void {
-        Route::get('/', [TicketController::class, 'index']);
-        Route::get('{ticketUuid}', [TicketController::class, 'show'])
-            ->whereUuid('ticketUuid');
-        Route::post('{ticketUuid}/scan', [TicketController::class, 'scan'])
-            ->whereUuid('ticketUuid');
-    });

app/Http/Middleware/EnsureScannerTenant.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use App\Domains\Authorization\Enums\PermissionCode;
-use Closure;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class EnsureScannerTenant
-{
-    /**
-     * Ensure the authenticated user can scan tickets for a tenant.
-     */
-    public function handle(Request $request, Closure $next): Response
-    {
-        $user = $request->user();
-
-        if (
-            ! $user
-            || ! $user->tenant_codigo
-            || ! $user->hasPermission(PermissionCode::ScanTickets->value)
-        ) {
-            throw new AuthorizationException;
-        }
-
-        return $next($request);
-    }
-}

bootstrap/app.php

@@ -3,7 +3,6 @@
 use App\Domains\Auth\Exceptions\AccountLockedException;
 use App\Domains\Ticket\Exceptions\TicketNotAvailableException;
 use App\Http\Middleware\EnsureAdminAppTenant;
-use App\Http\Middleware\EnsureScannerTenant;
 use App\Http\Middleware\EnsureTenantHasMenu;
 use App\Http\Middleware\SetApiLocale;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -26,7 +25,6 @@ return Application::configure(basePath: dirname(__DIR__))
     ->withMiddleware(function (Middleware $middleware): void {
         $middleware->alias([
             'adminapp.tenant' => EnsureAdminAppTenant::class,
-            'scanner.tenant' => EnsureScannerTenant::class,
             'tenant.menu' => EnsureTenantHasMenu::class,
         ]);
         $middleware->encryptCookies(except: [

database/migrations/2026_08_03_000000_create_events_and_link_catalog.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Domains\Catalog\Enums\EventProductType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -42,6 +43,9 @@ return new class extends Migration
                 ->after('tenant_code')
                 ->constrained('events')
                 ->nullOnDelete();
+            $table->enum('event_product_type', EventProductType::values())
+                ->nullable()
+                ->after('event_id');
         });
 
         Schema::table('variantes', function (Blueprint $table): void {
@@ -67,6 +71,7 @@ return new class extends Migration
 
         Schema::table('catalog_items', function (Blueprint $table): void {
             $table->dropConstrainedForeignId('event_id');
+            $table->dropColumn('event_product_type');
         });
 
         Schema::dropIfExists('event_dates');

database/migrations/2026_08_10_000100_add_sort_order_to_item_attributes.php

@@ -1,43 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        Schema::table('item_attributes', function (Blueprint $table): void {
-            $table->unsignedInteger('sort_order')->default(0)->after('allow_multi_select');
-        });
-
-        $foodItemAttributes = DB::table('item_attributes')
-            ->join('catalog_items', 'catalog_items.id', '=', 'item_attributes.catalog_item_id')
-            ->join('attribute', 'attribute.id', '=', 'item_attributes.attribute_id')
-            ->where('catalog_items.slug', 'comida')
-            ->whereIn('attribute.codigo', ['event_date', 'horario', 'servicio'])
-            ->select('item_attributes.id', 'attribute.codigo')
-            ->get();
-
-        $sortOrders = [
-            'event_date' => 1,
-            'horario' => 2,
-            'servicio' => 3,
-        ];
-
-        foreach ($foodItemAttributes as $itemAttribute) {
-            DB::table('item_attributes')
-                ->where('id', $itemAttribute->id)
-                ->update(['sort_order' => $sortOrders[$itemAttribute->codigo]]);
-        }
-    }
-
-    public function down(): void
-    {
-        Schema::table('item_attributes', function (Blueprint $table): void {
-            $table->dropColumn('sort_order');
-        });
-    }
-};

database/migrations/2026_08_10_000200_enable_tickets_for_fiesta_futbol_infantil_catalog.php

@@ -1,27 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        DB::table('catalog_items')
-            ->where('tenant_code', 'fiesta_futbol_infantil')
-            ->update(['has_tickets' => true]);
-    }
-
-    public function down(): void
-    {
-        $entryCategoryIds = DB::table('categorias')
-            ->select('id')
-            ->where('tenant_code', 'fiesta_futbol_infantil')
-            ->where('nombre', 'Entradas');
-
-        DB::table('catalog_items')
-            ->where('tenant_code', 'fiesta_futbol_infantil')
-            ->whereNotIn('category_id', $entryCategoryIds)
-            ->update(['has_tickets' => false]);
-    }
-};

database/migrations/2026_08_10_000300_remove_event_product_type_from_catalog_items.php

@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        if (! Schema::hasColumn('catalog_items', 'event_product_type')) {
-            return;
-        }
-
-        Schema::table('catalog_items', function (Blueprint $table): void {
-            $table->dropColumn('event_product_type');
-        });
-    }
-
-    public function down(): void
-    {
-        if (Schema::hasColumn('catalog_items', 'event_product_type')) {
-            return;
-        }
-
-        Schema::table('catalog_items', function (Blueprint $table): void {
-            $table->enum('event_product_type', ['entrada', 'producto'])
-                ->nullable()
-                ->after('tenant_code');
-        });
-    }
-};

database/migrations/2026_08_11_000000_add_header_display_options_to_tenants_table.php

@@ -1,23 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        Schema::table('tenants', 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

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

@@ -1,27 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        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

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

@@ -1,63 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        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

@@ -1,68 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        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

@@ -1,88 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        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/migrations/2026_08_12_000000_add_scanner_domain_to_website_type_table.php

@@ -1,23 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        Schema::table('website_type', function (Blueprint $table): void {
-            $table->string('scanner_domain')->nullable()->unique()->after('dominio');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('website_type', function (Blueprint $table): void {
-            $table->dropUnique(['scanner_domain']);
-            $table->dropColumn('scanner_domain');
-        });
-    }
-};

database/seeders/AuthorizationSeeder.php

@@ -2,7 +2,6 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Authorization\Enums\PermissionCode;
 use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Authorization\Models\Permission;
 use App\Domains\Authorization\Models\Role;
@@ -82,7 +81,7 @@ class AuthorizationSeeder extends Seeder
             'nombre' => 'Gestionar tickets',
             'descripcion' => 'Permite emitir, invalidar o regenerar tickets.',
         ],
-        PermissionCode::ScanTickets->value => [
+        'tickets.escanear' => [
             'nombre' => 'Escanear tickets',
             'descripcion' => 'Permite validar y consumir tickets de las categorías asignadas al usuario.',
         ],
@@ -120,12 +119,12 @@ class AuthorizationSeeder extends Seeder
         RoleCode::AdminApp->value => [
             'nombre' => 'Administrador de la aplicación',
             'descripcion' => 'Accede a los menús administrativos de la aplicación.',
-            'permisos' => [PermissionCode::ScanTickets->value],
+            'permisos' => [],
         ],
         RoleCode::Scanner->value => [
             'nombre' => 'Scanner',
             'descripcion' => 'Valida y consume tickets de las categorías que tiene asignadas.',
-            'permisos' => [PermissionCode::ScanTickets->value],
+            'permisos' => ['tickets.escanear'],
         ],
         RoleCode::User->value => [
             'nombre' => 'Usuario',

database/seeders/FiestaFutbolInfantilProductSeeder.php

@@ -2,6 +2,7 @@
 
 namespace Database\Seeders;
 
+use App\Domains\Catalog\Enums\EventProductType;
 use App\Domains\Catalog\Enums\FeaturedGroupSource;
 use App\Domains\Catalog\Enums\GroupLayout;
 use App\Domains\Catalog\Enums\InventoryPolicy;
@@ -10,11 +11,7 @@ use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Models\FeaturedGroup;
 use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Event\Models\EventDate;
 use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\TicketGenerationPolicy;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
 use Illuminate\Database\Seeder;
 use RuntimeException;
 
@@ -50,30 +47,13 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
             'event_location' => 'Sunchales, Santa Fe',
         ]);
 
-        $existingValidityTimeIds = $tenant->eventDates()->pluck('validity_time_id');
         $tenant->eventDates()->delete();
-        ValidityTime::query()->whereKey($existingValidityTimeIds)->delete();
-
         $eventDates = collect(['2026-10-09', '2026-10-10', '2026-10-11', '2026-10-12'])
-            ->map(function (string $date) use ($tenant): EventDate {
-                $validityTime = ValidityTime::query()->create([
-                    'type' => ValidityTimeType::FixedWindow,
-                    'start_time' => null,
-                    'end_time' => null,
-                    'fixed_starts_at' => $date.' 00:00:00',
-                    'fixed_expires_at' => $date.' 23:59:59',
-                ]);
-
-                $eventDate = new EventDate;
-                $eventDate->forceFill([
+            ->map(fn (string $date) => $tenant->eventDates()->create([
                 'date' => $date,
                 'time_start' => '00:00:00',
                 'time_end' => '23:59:59',
-                    'validity_time_id' => $validityTime->id,
-                ]);
-
-                return $tenant->eventDates()->save($eventDate);
-            });
+            ]));
         $dateIds = $eventDates->pluck('id')->map(fn ($id): int => (int) $id)->values();
 
         $this->createProduct($tenant, [
@@ -84,8 +64,8 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
             'attribute_codes' => ['color', 'talle'],
             'variants' => collect(['Verde', 'Blanco'])
                 ->crossJoin(['14', 'S', 'M', 'L', 'XL', 'XXL'])
-                ->map(fn (array $values, int $index): array => [
-                    'real_stock' => [24, 3, 18, 0, 12, 2, 25, 0, 14, 1, 19, 8][$index],
+                ->map(fn (array $values): array => [
+                    'real_stock' => 0,
                     'values' => ['color' => $values[0], 'talle' => $values[1]],
                 ])->all(),
         ]);
@@ -96,8 +76,8 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
             'category_id' => $categories['alojamientos']->id,
             'precio' => 35000,
             'attribute_codes' => ['tipo_alojamiento'],
-            'variants' => collect(['Carpa', 'Motorhome'])->map(fn (string $type, int $index): array => [
-                'real_stock' => [0, 3][$index],
+            'variants' => collect(['Carpa', 'Motorhome'])->map(fn (string $type): array => [
+                'real_stock' => 0,
                 'values' => ['tipo_alojamiento' => $type],
             ])->all(),
         ]);
@@ -110,8 +90,8 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
             'attribute_codes' => ['event_date', 'horario', 'servicio'],
             'variants' => $eventDates
                 ->crossJoin(['Desayuno', 'Almuerzo', 'Cena'], ['Comedor', 'Vianda'])
-                ->map(fn (array $values, int $index): array => [
-                    'real_stock' => [80, 3, 65, 0, 42, 2, 70, 18, 0, 5, 55, 40, 90, 1, 35, 0, 60, 8, 75, 22, 0, 4, 50, 30][$index],
+                ->map(fn (array $values): array => [
+                    'real_stock' => 0,
                     'event_date_ids' => [(int) $values[0]->id],
                     'descripcion' => sprintf(
                         '%s del %s - %s',
@@ -129,11 +109,12 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
             'nombre' => 'Abono',
             'category_id' => $categories['entradas']->id,
             'precio' => 40000,
+            'event_product_type' => EventProductType::Entry->value,
             'has_tickets' => true,
             'attribute_codes' => ['event_date'],
             'multi_select_attribute_codes' => ['event_date'],
             'variants' => [[
-                'real_stock' => 120,
+                'real_stock' => 0,
                 'event_date_ids' => $dateIds->all(),
             ]],
         ]);
@@ -142,8 +123,8 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
             'tenant_code' => $tenant->codigo,
             'source_type' => FeaturedGroupSource::All,
             'category_id' => null,
-            'product_layout' => ProductLayout::Row,
-            'group_layout' => GroupLayout::SimpleVertical,
+            'product_layout' => ProductLayout::ColumnWithCart,
+            'group_layout' => GroupLayout::Simple,
             'group_name' => 'Productos',
             'group_order' => 0,
         ]);
@@ -162,11 +143,10 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
     {
         return $this->catalogService->create([
             'tenant_code' => $tenant->codigo,
+            'event_product_type' => EventProductType::Product->value,
             'descripcion' => $data['nombre'],
-            'inventory_policy' => InventoryPolicy::Tracked->value,
+            'inventory_policy' => InventoryPolicy::Unlimited->value,
             ...$data,
-            'has_tickets' => true,
-            'ticket_generation_policy' => TicketGenerationPolicy::OnePerUnit->value,
         ]);
     }
 

database/seeders/MenuSeeder.php

@@ -29,13 +29,6 @@ class MenuSeeder extends Seeder
                 'content_type' => Menu::CONTENT_TYPE_DYNAMIC,
                 'route' => '/',
             ],
-            ['code' => 'scanner.inicio', 'label' => 'Inicio', 'route' => '/scanner/inicio'],
-            ['code' => 'scanner.scan', 'label' => 'Escanear', 'route' => '/scanner/scan'],
-            [
-                'code' => 'scanner.detail',
-                'label' => 'Detalle',
-                'route' => '/scanner/detail/:id',
-            ],
             [
                 'code' => 'adminapp.event',
                 'label' => 'Eventos',
@@ -226,11 +219,8 @@ class MenuSeeder extends Seeder
             ->where('code', 'main.adminapp')
             ->orWhere('parent_menu_code', 'main.adminapp')
             ->pluck('code');
-        $scannerMenuCodes = Menu::query()
-            ->where('code', 'like', 'scanner.%')
-            ->pluck('code');
         $userMenuCodes = Menu::query()
-            ->whereNotIn('code', $adminAppMenuCodes->merge($scannerMenuCodes))
+            ->whereNotIn('code', $adminAppMenuCodes)
             ->pluck('code');
 
         Role::query()
@@ -241,10 +231,6 @@ class MenuSeeder extends Seeder
             ->where('codigo', RoleCode::User->value)
             ->each(fn (Role $role) => $role->menus()->sync($userMenuCodes));
 
-        Role::query()
-            ->where('codigo', RoleCode::Scanner->value)
-            ->each(fn (Role $role) => $role->menus()->sync($scannerMenuCodes));
-
         $tenants = Tenant::all();
 
         $allMenus = Menu::pluck('code')->toArray();
@@ -266,12 +252,6 @@ 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?',
@@ -331,8 +311,6 @@ 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,8 +56,6 @@ 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,
@@ -109,8 +107,6 @@ 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',
@@ -128,8 +124,8 @@ class TenantSeeder extends Seeder
                     'button_text' => 'Comprar entradas',
                     'button_href' => '/tickets',
                     'background_image_id' => $this->uploadedImage(
-                        'images/tennants/fiesta_futbol_infantil/futbol_infantil_hero.png',
-                        'futbol_infantil_hero.png',
+                        'images/tennants/fiesta_futbol_infantil/futbol_infantil_hero.jpg',
+                        'futbol_infantil_hero.jpg',
                     ),
                 ],
                 'eventConfig' => [

database/seeders/WebsiteTypeSeeder.php

@@ -31,7 +31,6 @@ class WebsiteTypeSeeder extends Seeder
             [
                 'nombre' => 'ShopIt',
                 'dominio' => 'localhost',
-                'scanner_domain' => 'scanner.localhost',
                 ...self::PRESENTATION,
                 'site_logo' => $this->onTicketLogo(),
                 'footer_logo' => $this->onTicketFooterLogo(),
@@ -64,7 +63,6 @@ class WebsiteTypeSeeder extends Seeder
             [
                 'nombre' => 'OnTicket',
                 'dominio' => 'onticket.localhost',
-                'scanner_domain' => 'scanner.onticket.localhost',
                 ...self::PRESENTATION,
                 'site_logo' => $this->onTicketLogo(),
                 'footer_logo' => $this->onTicketFooterLogo(),

lang/en/api.php

@@ -24,7 +24,6 @@ return [
     'cart' => [
         'item_added' => 'Product added to cart.',
         'quantity_updated' => 'Product quantity updated.',
-        'item_updated' => 'Product updated.',
         'item_removed' => 'Product removed from cart.',
         'positive_quantity' => 'The quantity must be greater than zero.',
         'insufficient_stock' => 'There is not enough stock for the requested product. Maximum available: :max.',
@@ -62,10 +61,6 @@ return [
         'invalid_variant' => 'Variant :variant does not belong to product :product.',
         'purchase_without_user' => 'Purchase :purchase does not have an associated user.',
         'product_not_found' => 'The product for purchase item :purchase_item was not found.',
-        'already_scanned' => 'The ticket has already been scanned.',
-        'expired_for_scan' => 'The ticket has expired.',
-        'not_valid_for_scan' => 'The ticket is not currently valid.',
-        'scanner_category_forbidden' => 'The scanner is not assigned to the ticket category.',
     ],
     'integration' => [
         'not_configured' => 'The integration is not configured for this tenant.',
@@ -102,6 +97,7 @@ return [
         'event_date_selection_required' => 'At least one event date must be selected.',
         'single_event_date_required' => 'Exactly one event date must be selected.',
         'event_date_wrong_tenant' => 'Every event date must belong to the catalog item tenant.',
+        'invalid_event_product_type' => 'The event product type is invalid.',
         'duplicate_variant_combination' => 'The variant combination must be unique.',
         'multi_value_required' => 'At least one value must be selected.',
         'single_value_required' => 'Exactly one value must be selected.',

lang/es/api.php

@@ -24,7 +24,6 @@ return [
     'cart' => [
         'item_added' => 'Producto agregado al carrito.',
         'quantity_updated' => 'Cantidad de producto actualizada.',
-        'item_updated' => 'Producto actualizado.',
         'item_removed' => 'Producto eliminado del carrito.',
         'positive_quantity' => 'La cantidad debe ser mayor a cero.',
         'insufficient_stock' => 'Stock insuficiente para el producto solicitado. Máximo disponible: :max.',
@@ -62,10 +61,6 @@ return [
         'invalid_variant' => 'La variante :variant no pertenece al producto :product.',
         'purchase_without_user' => 'La compra :purchase no tiene un usuario asociado.',
         'product_not_found' => 'No se encontró el producto de la línea de compra :purchase_item.',
-        'already_scanned' => 'El ticket ya fue escaneado.',
-        'expired_for_scan' => 'El ticket está vencido.',
-        'not_valid_for_scan' => 'El ticket no es válido en este momento.',
-        'scanner_category_forbidden' => 'El scanner no está asignado a la categoría del ticket.',
     ],
     'integration' => [
         'not_configured' => 'La integración no está configurada para este tenant.',
@@ -102,6 +97,7 @@ return [
         'event_date_selection_required' => 'Debe seleccionar al menos una fecha de evento.',
         'single_event_date_required' => 'Debe seleccionar exactamente una fecha de evento.',
         'event_date_wrong_tenant' => 'Todas las fechas del evento deben pertenecer al tenant del ítem de catálogo.',
+        'invalid_event_product_type' => 'El tipo de producto de evento no es válido.',
         'duplicate_variant_combination' => 'La combinación de la variante debe ser única.',
         'multi_value_required' => 'Debe seleccionar al menos un valor.',
         'single_value_required' => 'Debe seleccionar exactamente un valor.',

tests/Feature/Auth/ScannerLoginControllerTest.php

@@ -1,116 +0,0 @@
-<?php
-
-namespace Tests\Feature\Auth;
-
-use App\Domains\Auth\Models\LoginAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Permission;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\Hash;
-use Tests\TestCase;
-
-class ScannerLoginControllerTest extends TestCase
-{
-    use RefreshDatabase;
-
-    public function test_it_logs_in_a_tenant_bound_user_with_scan_permission(): void
-    {
-        $role = Role::query()->create([
-            'codigo' => RoleCode::AdminApp->value,
-            'nombre' => 'Operador',
-        ]);
-        $permission = Permission::query()->create([
-            'codigo' => PermissionCode::ScanTickets->value,
-            'nombre' => 'Escanear tickets',
-        ]);
-        $role->permissions()->attach($permission->codigo);
-        $tenant = Tenant::query()->create([
-            'codigo' => 'acme',
-            'nombre' => 'Acme',
-            'dominio' => 'acme.test',
-        ]);
-        $user = User::factory()->create([
-            'email' => 'scanner@example.com',
-            'password' => Hash::make('secret123'),
-            'rol_codigo' => $role->codigo,
-            'tenant_codigo' => $tenant->codigo,
-        ]);
-
-        $response = $this->postJson('/api/v1/scanner/login', [
-            'email' => ' SCANNER@EXAMPLE.COM ',
-            'password' => 'secret123',
-        ]);
-
-        $response
-            ->assertOk()
-            ->assertJsonPath('user.id', $user->id)
-            ->assertJsonPath('user.rol_codigo', RoleCode::AdminApp->value)
-            ->assertJsonPath('token_type', 'Bearer');
-
-        $this->assertSame(['scanner'], $user->tokens()->sole()->abilities);
-    }
-
-    public function test_it_rejects_a_user_without_scan_permission(): void
-    {
-        $role = Role::query()->create([
-            'codigo' => RoleCode::Scanner->value,
-            'nombre' => 'Scanner sin permiso',
-        ]);
-        $tenant = Tenant::query()->create([
-            'codigo' => 'acme',
-            'nombre' => 'Acme',
-            'dominio' => 'acme.test',
-        ]);
-        $user = User::factory()->create([
-            'email' => 'customer@example.com',
-            'password' => Hash::make('secret123'),
-            'rol_codigo' => $role->codigo,
-            'tenant_codigo' => $tenant->codigo,
-        ]);
-
-        $this->postJson('/api/v1/scanner/login', [
-            'email' => $user->email,
-            'password' => 'secret123',
-        ])->assertUnprocessable()->assertJsonValidationErrors(['email']);
-    }
-
-    public function test_an_invalid_password_is_recorded_with_the_users_tenant(): void
-    {
-        $role = Role::query()->create([
-            'codigo' => RoleCode::Scanner->value,
-            'nombre' => 'Scanner',
-        ]);
-        $permission = Permission::query()->create([
-            'codigo' => PermissionCode::ScanTickets->value,
-            'nombre' => 'Escanear tickets',
-        ]);
-        $role->permissions()->attach($permission->codigo);
-        $tenant = Tenant::query()->create([
-            'codigo' => 'acme',
-            'nombre' => 'Acme',
-            'dominio' => 'acme.test',
-        ]);
-        $user = User::factory()->create([
-            'email' => 'scanner@example.com',
-            'password' => Hash::make('correct-password'),
-            'rol_codigo' => $role->codigo,
-            'tenant_codigo' => $tenant->codigo,
-        ]);
-
-        $this->postJson('/api/v1/scanner/login', [
-            'email' => $user->email,
-            'password' => 'wrong-password',
-        ])->assertUnprocessable()->assertJsonValidationErrors(['email']);
-
-        $this->assertSame(1, $user->refresh()->failed_login_attempts);
-        $this->assertDatabaseHas('login_attempts', [
-            'user_id' => $user->id,
-            'tenant_codigo' => $tenant->codigo,
-            'outcome' => LoginAttempt::OUTCOME_INVALID_CREDENTIALS,
-        ]);
-    }
-}

tests/Feature/Auth/ScannerMeControllerTest.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace Tests\Feature\Auth;
-
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Permission;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Laravel\Sanctum\Sanctum;
-use Tests\TestCase;
-
-class ScannerMeControllerTest extends TestCase
-{
-    use RefreshDatabase;
-
-    public function test_it_returns_only_scanner_menus_assigned_to_the_tenant(): void
-    {
-        $scannerRole = Role::query()->create([
-            'codigo' => RoleCode::Scanner->value,
-            'nombre' => 'Scanner',
-        ]);
-        $permission = Permission::query()->create([
-            'codigo' => PermissionCode::ScanTickets->value,
-            'nombre' => 'Escanear tickets',
-        ]);
-        $scannerRole->permissions()->attach($permission->codigo);
-        $tenant = Tenant::query()->create([
-            'codigo' => 'acme',
-            'nombre' => 'Acme',
-            'dominio' => 'acme.test',
-        ]);
-        $home = Menu::query()->create([
-            'code' => 'scanner.inicio',
-            'label' => 'Inicio',
-            'route' => '/scanner/inicio',
-        ]);
-        $scan = Menu::query()->create([
-            'code' => 'scanner.scan',
-            'label' => 'Escanear',
-            'route' => '/scanner/scan',
-        ]);
-        $foreign = Menu::query()->create([
-            'code' => 'adminapp.inicio',
-            'label' => 'Administración',
-            'route' => '/admin/inicio',
-        ]);
-
-        $scannerRole->menus()->sync([$home->code, $scan->code]);
-        $tenant->menues()->sync([$home->code, $scan->code, $foreign->code]);
-
-        $user = User::factory()->create([
-            'rol_codigo' => $scannerRole->codigo,
-            'tenant_codigo' => $tenant->codigo,
-        ]);
-        Sanctum::actingAs($user);
-
-        $this->getJson('/api/v1/scanner/me')
-            ->assertOk()
-            ->assertJsonPath('data.user.id', $user->id)
-            ->assertJsonPath('data.tenant.codigo', $tenant->codigo)
-            ->assertJsonCount(2, 'data.tenant.menues')
-            ->assertJsonMissing(['code' => $foreign->code]);
-    }
-}