test(catalog): cover global availability decisions

.env.example

@@ -5,6 +5,9 @@ APP_DEBUG=false
 APP_URL=http://localhost
 
 PURCHASE_CHECKOUT_EXPIRATION_MINUTES=30
+PURCHASE_QR_EXPIRATION_MINUTES=15
+PURCHASE_TELEPAGOS_EXPIRATION_MINUTES=30
+PURCHASE_TRANSFER_EXPIRATION_MINUTES=1440
 STOCK_RESERVATION_EXPIRATION_MINUTES=30
 FRONTEND_URLS=http://localhost:4200
 
@@ -28,7 +31,6 @@ AUTH_LOGIN_ATTEMPT_WINDOW_MINUTES=30
 AUTH_LOGIN_LOCK_MINUTES=15
 AUTH_LOGIN_RATE_LIMIT_PER_MINUTE=10
 AUTH_LOGIN_IP_RATE_LIMIT_PER_MINUTE=30
-AUTH_PASSWORD_RESET_EXPIRATION_MINUTES=60
 
 LOG_CHANNEL=daily
 LOG_STACK=single
@@ -39,8 +41,6 @@ TELEPAGOS_LOG_LEVEL=info
 TELEPAGOS_LOG_DAYS=30
 COMMANDS_LOG_LEVEL=info
 COMMANDS_LOG_DAYS=30
-EMAILS_LOG_LEVEL=info
-EMAILS_LOG_DAYS=30
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

app/Domains/Auth/Controllers/ValidateResetPasswordAttemptController.php

@@ -22,18 +22,10 @@ class ValidateResetPasswordAttemptController extends Controller
     {
         $data = $request->validated();
 
-        $result = $this->resetPasswordAttemptService->validateCode(
+        if (! $this->resetPasswordAttemptService->validateCode(
             $data['email'],
             $data['codigo'],
-        );
-
-        if ($result === ResetPasswordAttemptService::CODE_EXPIRED) {
-            throw ValidationException::withMessages([
-                'codigo' => __('api.auth.reset_code_expired'),
-            ]);
-        }
-
-        if ($result !== ResetPasswordAttemptService::CODE_VALID) {
+        )) {
             throw ValidationException::withMessages([
                 'codigo' => __('api.auth.reset_code_invalid'),
             ]);

app/Domains/Auth/Models/ResetPasswordAttempt.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-#[Fillable(['user_id', 'codigo', 'reason', 'status', 'expires_at'])]
+#[Fillable(['user_id', 'codigo', 'reason', 'status'])]
 #[Hidden(['codigo'])]
 class ResetPasswordAttempt extends Model
 {
@@ -31,7 +31,6 @@ class ResetPasswordAttempt extends Model
     {
         return [
             'user_id' => 'integer',
-            'expires_at' => 'datetime',
         ];
     }
 

app/Domains/Auth/Services/ResetPasswordAttemptService.php

@@ -12,12 +12,6 @@ use Throwable;
 
 class ResetPasswordAttemptService
 {
-    public const CODE_VALID = 'valid';
-
-    public const CODE_INVALID = 'invalid';
-
-    public const CODE_EXPIRED = 'expired';
-
     public function createForEmail(
         string $email,
         string $tenantCode,
@@ -152,12 +146,12 @@ class ResetPasswordAttemptService
         );
     }
 
-    public function validateCode(string $email, string $code): string
+    public function validateCode(string $email, string $code): bool
     {
         $emailFingerprint = $this->emailFingerprint($email);
 
         try {
-            return DB::transaction(function () use ($email, $code, $emailFingerprint): string {
+            return DB::transaction(function () use ($email, $code, $emailFingerprint): bool {
                 $user = User::query()
                     ->where('email', $email)
                     ->lockForUpdate()
@@ -175,27 +169,14 @@ class ResetPasswordAttemptService
                         'email_fingerprint' => $emailFingerprint,
                     ]);
 
-                    return self::CODE_INVALID;
-                }
-
-                if ($attempt->expires_at?->isPast()) {
-                    $attempt->update([
-                        'status' => ResetPasswordAttempt::STATUS_EXPIRED,
-                    ]);
-
-                    Log::info('Password reset code validation failed: attempt expired.', [
-                        'email_fingerprint' => $emailFingerprint,
-                        'attempt_id' => $attempt->getKey(),
-                    ]);
-
-                    return self::CODE_EXPIRED;
+                    return false;
                 }
 
                 $attempt->update([
                     'status' => ResetPasswordAttempt::STATUS_VALIDATED,
                 ]);
 
-                return self::CODE_VALID;
+                return true;
             });
         } catch (Throwable $exception) {
             Log::error('Failed to validate password reset code.', [
@@ -233,19 +214,6 @@ class ResetPasswordAttemptService
                     return false;
                 }
 
-                if ($attempt->expires_at?->isPast()) {
-                    $attempt->update([
-                        'status' => ResetPasswordAttempt::STATUS_EXPIRED,
-                    ]);
-
-                    Log::info('Password reset failed: attempt expired.', [
-                        'email_fingerprint' => $emailFingerprint,
-                        'attempt_id' => $attempt->getKey(),
-                    ]);
-
-                    return false;
-                }
-
                 $user->password = $password;
                 $user->failed_login_attempts = 0;
                 $user->last_failed_login_at = null;
@@ -302,7 +270,6 @@ class ResetPasswordAttemptService
             'codigo' => $this->generateCode(),
             'reason' => $reason,
             'status' => ResetPasswordAttempt::STATUS_PENDING,
-            'expires_at' => now()->addMinutes((int) config('auth.passwords.users.expire')),
         ]);
 
         return $attempt->getKey();

app/Domains/Bootstrap/Resources/AdminAppBootstrapResource.php

@@ -30,7 +30,6 @@ class AdminAppBootstrapResource extends JsonResource
             'login_header_footer_color' => $websiteType->login_header_footer_color,
             'site_logo' => $websiteType->siteLogo?->getTemporaryUrl(1440),
             'footer_logo' => $websiteType->footerLogo?->getTemporaryUrl(1440),
-            'favicon' => $websiteType->favicon?->getTemporaryUrl(1440),
         ];
     }
 }

app/Domains/Bootstrap/Services/AdminAppBootstrapService.php

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

app/Domains/Bootstrap/Services/ScannerBootstrapService.php

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

app/Domains/Cart/Models/Cart.php

@@ -5,7 +5,6 @@ namespace App\Domains\Cart\Models;
 use App\Domains\Auth\Models\User;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Catalog\Services\StockReservationService;
@@ -29,7 +28,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
     'status',
     'origin',
     'current_purchase_id',
-    'current_stock_reservation_id',
 ])]
 class Cart extends Model
 {
@@ -38,16 +36,6 @@ class Cart extends Model
 
     protected $table = 'carritos';
 
-    public const STATUS_ACTIVE = 'active';
-
-    public const STATUS_CHECKOUT = 'checkout';
-
-    public const STATUS_CONVERTED = 'converted';
-
-    public const STATUS_EXPIRED = 'expired';
-
-    public const STATUS_ABANDONED = 'abandoned';
-
     public const ORIGIN_USER = 'user';
 
     public const ORIGIN_DIRECT_CHECKOUT = 'direct_checkout';
@@ -57,7 +45,6 @@ class Cart extends Model
         return [
             'user_id' => 'integer',
             'current_purchase_id' => 'integer',
-            'current_stock_reservation_id' => 'integer',
         ];
     }
 
@@ -97,15 +84,6 @@ class Cart extends Model
         return $this->belongsTo(Purchase::class, 'current_purchase_id');
     }
 
-    /** @return BelongsTo<StockReservation, $this> */
-    public function currentStockReservation(): BelongsTo
-    {
-        return $this->belongsTo(
-            StockReservation::class,
-            'current_stock_reservation_id',
-        );
-    }
-
     public function getTotalAmount(): float
     {
         $items = $this->relationLoaded('items')
@@ -129,7 +107,6 @@ class Cart extends Model
 
         return DB::transaction(function () use ($catalogItemId, $variantId, $quantity): CartItem {
             $this->invalidateCurrentCheckout();
-            app(StockReservationService::class)->assertCartReservationUsable($this);
             $selectedItem = $this->resolveScopedItem($catalogItemId, $variantId, true);
             $cartQuantity = (int) $this->items()
                 ->where('catalog_item_id', $catalogItemId)
@@ -163,11 +140,12 @@ class Cart extends Model
                     'cantidad' => $quantity,
                 ]);
             } else {
+                app(StockReservationService::class)->ensure($item, $selectedItem);
                 $item->cantidad += $quantity;
                 $item->save();
             }
 
-            app(StockReservationService::class)->syncCart($this);
+            app(StockReservationService::class)->reserve($item, $selectedItem, $quantity);
 
             return $item->fresh();
         });
@@ -194,7 +172,6 @@ class Cart extends Model
             $excludedPurchaseId,
         ): CartItem {
             $this->invalidateCurrentCheckout();
-            app(StockReservationService::class)->assertCartReservationUsable($this);
 
             /** @var CartItem $item */
             $item = $this->items()
@@ -228,6 +205,7 @@ class Cart extends Model
                     $nextAvailableQuantity,
                 );
 
+                app(StockReservationService::class)->release($item, $currentSelection, $item->cantidad);
                 $availableQuantity = $inventoryService->availableQuantity($nextSelection);
 
                 if ($availableQuantity !== null && $availableQuantity < $quantity) {
@@ -244,10 +222,11 @@ class Cart extends Model
                     ->first();
 
                 if ($targetItem !== null) {
+                    app(StockReservationService::class)->ensure($targetItem, $nextSelection);
                     $targetItem->cantidad += $quantity;
                     $targetItem->save();
+                    app(StockReservationService::class)->reserve($targetItem, $nextSelection, $quantity);
                     $item->delete();
-                    app(StockReservationService::class)->syncCart($this);
 
                     return $targetItem->fresh();
                 }
@@ -255,7 +234,7 @@ class Cart extends Model
                 $item->variant_id = $variantId;
                 $item->cantidad = $quantity;
                 $item->save();
-                app(StockReservationService::class)->syncCart($this);
+                app(StockReservationService::class)->reserve($item, $nextSelection, $quantity);
 
                 return $item->fresh();
             }
@@ -284,9 +263,16 @@ class Cart extends Model
                 ]);
             }
 
+            if ($delta > 0) {
+                app(StockReservationService::class)->reserve($item, $currentSelection, $delta);
+            }
+
+            if ($delta < 0) {
+                app(StockReservationService::class)->release($item, $currentSelection, abs($delta));
+            }
+
             $item->cantidad = $quantity;
             $item->save();
-            app(StockReservationService::class)->syncCart($this);
 
             return $item->fresh();
         });
@@ -296,7 +282,6 @@ class Cart extends Model
     {
         DB::transaction(function () use ($cartItemId): void {
             $this->invalidateCurrentCheckout();
-            app(StockReservationService::class)->assertCartReservationUsable($this);
 
             /** @var CartItem $item */
             $item = $this->items()
@@ -304,8 +289,17 @@ class Cart extends Model
                 ->lockForUpdate()
                 ->firstOrFail();
 
+            $selectedItem = $this->resolveScopedItem(
+                $item->catalog_item_id,
+                $item->variant_id,
+                true,
+            );
+            app(StockReservationService::class)->release(
+                $item,
+                $selectedItem,
+                $item->cantidad,
+            );
             $item->delete();
-            app(StockReservationService::class)->syncCart($this);
         });
     }
 
@@ -347,20 +341,13 @@ class Cart extends Model
             Purchase::STATUS_CREATED,
             Purchase::STATUS_PENDING_PAYMENT,
         ], true)) {
-            app(StockReservationService::class)->returnToCart($currentPurchase, $cart);
             $currentPurchase->update([
                 'status' => Purchase::STATUS_SUPERSEDED,
+                'expires_at' => null,
             ]);
-
-            $this->current_purchase_id = null;
-
-            return;
         }
 
-        app(StockReservationService::class)->releaseForPurchase(
-            $currentPurchase,
-            reason: StockReservationService::REASON_PURCHASE_SUPERSEDED,
-        );
+        app(StockReservationService::class)->detachFromPurchase($currentPurchase);
         self::query()
             ->whereKey($cart->getKey())
             ->where('current_purchase_id', $currentPurchase->getKey())

app/Domains/Cart/Models/CartItem.php

@@ -3,11 +3,13 @@
 namespace App\Domains\Cart\Models;
 
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Catalog\Models\Variant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'cart_id',
@@ -55,4 +57,10 @@ class CartItem extends Model
     {
         return $this->variant ?? $this->catalogItem;
     }
+
+    /** @return HasMany<StockReservation, $this> */
+    public function stockReservations(): HasMany
+    {
+        return $this->hasMany(StockReservation::class);
+    }
 }

app/Domains/Cart/Services/CartService.php

@@ -4,12 +4,9 @@ namespace App\Domains\Cart\Services;
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Services\ExpireStockReservationsService;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -25,7 +22,7 @@ class CartService
             return $this->makeEmptyCart($tenant);
         }
 
-        $cart = $this->resolveCart($tenant, $resolvedIdentity['identity']);
+        $cart = $this->findCart($tenant, $resolvedIdentity['identity']);
 
         if ($cart === null) {
             return $this->makeEmptyCart($tenant);
@@ -122,7 +119,7 @@ class CartService
     {
         $cart = new Cart([
             'tenant_codigo' => $tenant->codigo,
-            'status' => Cart::STATUS_ACTIVE,
+            'status' => 'active',
         ]);
 
         $cart->setRelation('items', collect());
@@ -223,14 +220,12 @@ class CartService
     {
         return Cart::query()
             ->where('tenant_codigo', $tenant->codigo)
-            ->where('origin', Cart::ORIGIN_USER)
-            ->whereIn('status', [Cart::STATUS_ACTIVE, Cart::STATUS_EXPIRED])
+            ->where('status', 'active')
             ->when(
                 $identity['user_id'] !== null,
                 fn ($query) => $query->where('user_id', $identity['user_id']),
                 fn ($query) => $query->where('guest_token', $identity['guest_token']),
             )
-            ->orderByRaw('CASE WHEN status = ? THEN 0 ELSE 1 END', [Cart::STATUS_ACTIVE])
             ->first();
     }
 
@@ -239,7 +234,7 @@ class CartService
      */
     protected function findCartOrFail(Tenant $tenant, array $identity): Cart
     {
-        $cart = $this->resolveCart($tenant, $identity, replaceExpired: false);
+        $cart = $this->findCart($tenant, $identity);
 
         if ($cart === null) {
             throw new NotFoundHttpException('Cart not found.');
@@ -252,73 +247,10 @@ class CartService
      * @param  array{user_id: ?int, guest_token: ?string}  $identity
      */
     protected function findOrCreateCart(Tenant $tenant, array $identity): Cart
-    {
-        return $this->resolveCart($tenant, $identity)
-            ?? $this->createCart($tenant, $identity);
-    }
-
-    /**
-     * @param  array{user_id: ?int, guest_token: ?string}  $identity
-     */
-    protected function resolveCart(
-        Tenant $tenant,
-        array $identity,
-        bool $replaceExpired = true,
-    ): ?Cart {
-        $cart = $this->findCart($tenant, $identity);
-
-        if ($cart?->status === Cart::STATUS_ACTIVE
-            && $cart->current_stock_reservation_id !== null
-            && app(ExpireStockReservationsService::class)
-                ->expireIfOverdue($cart->current_stock_reservation_id)) {
-            $cart = $this->findCart($tenant, $identity);
-        }
-
-        if ($cart?->status === Cart::STATUS_EXPIRED) {
-            if (! $replaceExpired) {
-                throw new StockReservationExpiredException;
-            }
-
-            return $this->replaceExpiredCart($cart, $tenant, $identity);
-        }
-
-        if ($cart !== null) {
-            return $cart;
-        }
-
-        return null;
-    }
-
-    /**
-     * @param  array{user_id: ?int, guest_token: ?string}  $identity
-     */
-    protected function replaceExpiredCart(Cart $expiredCart, Tenant $tenant, array $identity): Cart
-    {
-        return DB::transaction(function () use ($expiredCart, $tenant, $identity): Cart {
-            /** @var Cart|null $lockedCart */
-            $lockedCart = Cart::query()->lockForUpdate()->find($expiredCart->getKey());
-
-            if ($lockedCart?->status === Cart::STATUS_EXPIRED) {
-                $lockedCart->update([
-                    'status' => Cart::STATUS_ABANDONED,
-                    'current_purchase_id' => null,
-                ]);
-            }
-
-            return $this->findCart($tenant, $identity)
-                ?? $this->createCart($tenant, $identity);
-        });
-    }
-
-    /**
-     * @param  array{user_id: ?int, guest_token: ?string}  $identity
-     */
-    protected function createCart(Tenant $tenant, array $identity): Cart
     {
         $attributes = [
             'tenant_codigo' => $tenant->codigo,
-            'status' => Cart::STATUS_ACTIVE,
-            'origin' => Cart::ORIGIN_USER,
+            'status' => 'active',
         ];
 
         if ($identity['user_id'] !== null) {

app/Domains/Cart/Services/ExpireCartReservationsService.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Domains\Cart\Services;
+
+use App\Domains\Cart\Models\Cart;
+use App\Domains\Cart\Models\CartItem;
+use App\Domains\Catalog\Models\Inventory;
+use App\Domains\Catalog\Models\StockReservation;
+use Illuminate\Support\Facades\DB;
+
+class ExpireCartReservationsService
+{
+    public function expireOverdue(): int
+    {
+        $expiredItems = 0;
+        $lastCartItemId = 0;
+
+        do {
+            $cartItemIds = StockReservation::query()
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->whereNull('purchase_id')
+                ->whereNotNull('cart_item_id')
+                ->whereNotNull('expires_at')
+                ->where('expires_at', '<=', now())
+                ->where('cart_item_id', '>', $lastCartItemId)
+                ->whereHas('cartItem.cart', fn ($query) => $query->where('status', 'active'))
+                ->select('cart_item_id')
+                ->distinct()
+                ->orderBy('cart_item_id')
+                ->limit(500)
+                ->pluck('cart_item_id');
+
+            foreach ($cartItemIds as $cartItemId) {
+                $lastCartItemId = (int) $cartItemId;
+
+                if ($this->expireCartItem($lastCartItemId)) {
+                    $expiredItems++;
+                }
+            }
+        } while ($cartItemIds->count() === 500);
+
+        return $expiredItems;
+    }
+
+    private function expireCartItem(int $cartItemId): bool
+    {
+        /** @var CartItem|null $candidate */
+        $candidate = CartItem::query()->select(['id', 'cart_id'])->find($cartItemId);
+        if ($candidate === null) {
+            return false;
+        }
+
+        return DB::transaction(function () use ($candidate, $cartItemId): bool {
+            /** @var Cart|null $cart */
+            $cart = Cart::query()
+                ->whereKey($candidate->cart_id)
+                ->where('status', 'active')
+                ->lockForUpdate()
+                ->first();
+
+            if ($cart === null) {
+                return false;
+            }
+
+            /** @var CartItem|null $cartItem */
+            $cartItem = $cart->items()
+                ->whereKey($cartItemId)
+                ->lockForUpdate()
+                ->first();
+
+            if ($cartItem === null) {
+                return false;
+            }
+
+            $reservations = StockReservation::query()
+                ->where('cart_item_id', $cartItem->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->orderBy('inventory_id')
+                ->lockForUpdate()
+                ->get();
+
+            if (
+                $reservations->isEmpty()
+                || $reservations->contains(
+                    fn (StockReservation $reservation): bool => $reservation->purchase_id !== null
+                        || $reservation->expires_at === null
+                        || $reservation->expires_at->isFuture(),
+                )
+            ) {
+                return false;
+            }
+
+            $inventories = Inventory::query()
+                ->whereKey($reservations->pluck('inventory_id'))
+                ->orderBy('id')
+                ->lockForUpdate()
+                ->get()
+                ->keyBy('id');
+
+            foreach ($reservations as $reservation) {
+                $inventory = $inventories->get($reservation->inventory_id)
+                    ?? throw new \InvalidArgumentException('No se encontro el inventario reservado.');
+
+                $inventory->release((int) $reservation->quantity);
+                $reservation->update([
+                    'quantity' => 0,
+                    'status' => StockReservation::STATUS_EXPIRED,
+                    'expires_at' => null,
+                    'released_at' => now(),
+                ]);
+            }
+
+            $cartItem->delete();
+
+            if (! $cart->items()->exists()) {
+                $cart->update(['status' => 'expired']);
+                $cart->delete();
+            }
+
+            return true;
+        });
+    }
+}

app/Domains/Cart/documentacion/README.md

@@ -6,12 +6,13 @@ Gestiona el carrito activo de un tenant tanto para visitantes como para usuarios
 
 ## Modelo
 
-- `Cart`: pertenece a un tenant y opcionalmente a un usuario; calcula el total, permite agregar, actualizar o quitar ítems y apunta a su reserva de stock vigente mediante `current_stock_reservation_id`.
+- `Cart`: pertenece a un tenant y opcionalmente a un usuario; calcula el total y permite agregar, actualizar o quitar ítems.
 - `CartItem`: referencia un `CatalogItem` y, opcionalmente, una `Variant`; sólo persiste la selección y cantidad, y expone siempre los datos vigentes del catálogo.
 
 ## Servicios
 
 - `CartService`: obtiene el carrito, modifica ítems y administra la cookie del token invitado.
+- `ExpireCartReservationsService`: libera las reservas vencidas de carritos activos y elimina los carritos que quedan vacíos.
 - `GuestCartMergeService`: incorpora el carrito invitado al usuario cuando este se autentica.
 
 ## Endpoints
@@ -33,6 +34,4 @@ Depende de `Catalog` para productos y variantes, de `Tenant` para aislar datos y
 
 Un carrito puede pasar a `checkout`. Las compras directas usan un carrito técnico con `origin=direct_checkout`; los carritos normales conservan `origin=user` y pueden restaurarse al cancelar o vencer la compra.
 
-Cada edición sincroniza una única reserva para el carrito completo. Si varios ítems o bundles consumen el mismo inventario, se persiste una sola línea con la cantidad agregada. Al editar durante checkout, la compra anterior queda `superseded`, se desvincula y el carrito conserva la misma reserva activa con sus líneas actualizadas.
-
-El comando unificado `php artisan reservations:expire` recorre una sola vez las reservas activas cuyo `expires_at` haya vencido. Cuando pertenecen a un carrito, conserva la reserva y sus líneas como historial, libera el stock como conjunto y cambia el carrito asociado a `expired` sin eliminar sus ítems. Al volver a resolver ese carrito desde la API, el anterior pasa automáticamente a `abandoned` y se crea uno activo y vacío para la misma identidad. El cliente nunca necesita reiniciarlo explícitamente. La API también materializa este vencimiento al acceder al carrito aunque el comando programado todavía no haya corrido.
+El comando unificado `php artisan reservations:expire` procesa primero las compras vencidas y luego las reservas activas sin compra cuyo `expires_at` haya vencido. Se ejecuta cada minuto mediante el scheduler, conserva la fila de reserva con estado `expired`, elimina el ítem abandonado y elimina lógicamente el carrito cuando queda vacío. Cada intento registra sus resultados o su error en el log diario `storage/logs/commands/commands-AAAA-MM-DD.log`.

app/Domains/Catalog/Controllers/CatalogController.php

@@ -123,6 +123,10 @@ class CatalogController extends Controller
             $variantId === null ? null : (int) $variantId,
         );
         $allowances->attach(collect([$item]), $this->userId($request));
+        abort_unless($allowances->availability(
+            $item->availableStock(),
+            $item->getAttribute('remaining_user_quota'),
+        )->isVisible(), 404);
 
         return CatalogItemDetailResource::make($item);
     }

app/Domains/Catalog/Enums/AvailabilityEffect.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum AvailabilityEffect: string
+{
+    case Hide = 'hide';
+    case Restrict = 'restrict';
+    case Notice = 'notice';
+}

app/Domains/Catalog/Enums/CatalogAction.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domains\Catalog\Enums;
+
+enum CatalogAction: string
+{
+    case SelectVariant = 'select_variant';
+    case ChangeQuantity = 'change_quantity';
+    case AddToCart = 'add_to_cart';
+    case BuyNow = 'buy_now';
+}

app/Domains/Catalog/Exceptions/StockReservationExpiredException.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Exceptions;
-
-use RuntimeException;
-
-class StockReservationExpiredException extends RuntimeException
-{
-    public function __construct()
-    {
-        parent::__construct(__('api.cart.reservation_expired'));
-    }
-}

app/Domains/Catalog/Models/CatalogItem.php

@@ -27,7 +27,6 @@ use Illuminate\Support\Collection;
     'type',
     'slug',
     'nombre',
-    'group_order',
     'descripcion',
     'precio',
     'inventory_policy',
@@ -48,7 +47,6 @@ class CatalogItem extends Model
         'inventory_policy' => InventoryPolicy::Tracked->value,
         'inventory_subject' => InventorySubject::Product->value,
         'has_tickets' => false,
-        'group_order' => 0,
     ];
 
     protected function casts(): array
@@ -58,7 +56,6 @@ class CatalogItem extends Model
             'brand_id' => 'integer',
             'inventory_id' => 'integer',
             'type' => CatalogItemType::class,
-            'group_order' => 'integer',
             'precio' => 'decimal:2',
             'inventory_policy' => InventoryPolicy::class,
             'inventory_subject' => InventorySubject::class,
@@ -175,29 +172,17 @@ class CatalogItem extends Model
     }
 
     /** @param Builder<CatalogItem> $query */
-    public function scopeWhereAvailable(Builder $query): Builder
+    public function scopeWhereVariantsAvailable(Builder $query): Builder
     {
         return $query->where(function (Builder $query): void {
             $query
-                ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
+                ->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')
-                )
-                ->orWhere(function (Builder $directItemQuery): void {
-                    $directItemQuery
-                        ->whereDoesntHave('variants')
-                        ->where(function (Builder $inventoryQuery): void {
-                            $inventoryQuery
-                                ->whereNull('catalog_items.inventory_id')
-                                ->orWhereHas(
-                                    'inventory',
-                                    fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery
-                                        ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
-                                );
-                        });
-                });
+                );
         });
     }
 

app/Domains/Catalog/Models/Inventory.php

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

app/Domains/Catalog/Models/StockReservation.php

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

app/Domains/Catalog/Models/StockReservationLine.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'stock_reservation_id',
-    'inventory_id',
-    'quantity',
-    'tracks_inventory',
-])]
-class StockReservationLine extends Model
-{
-    protected function casts(): array
-    {
-        return [
-            'stock_reservation_id' => 'integer',
-            'inventory_id' => 'integer',
-            'quantity' => 'integer',
-            'tracks_inventory' => 'boolean',
-        ];
-    }
-
-    /** @return BelongsTo<StockReservation, $this> */
-    public function reservation(): BelongsTo
-    {
-        return $this->belongsTo(StockReservation::class, 'stock_reservation_id');
-    }
-
-    /** @return BelongsTo<Inventory, $this> */
-    public function inventory(): BelongsTo
-    {
-        return $this->belongsTo(Inventory::class);
-    }
-}

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -51,7 +51,6 @@ class StoreCatalogItemRequest extends FormRequest
                 ),
             ],
             'nombre' => ['required', 'string', 'max:255'],
-            'group_order' => ['sometimes', 'integer', 'min:0'],
             'descripcion' => ['sometimes', 'nullable', 'string'],
             'precio' => ['required', 'numeric', 'min:0'],
             'inventory_policy' => [Rule::prohibitedIf($isBundle), 'sometimes', Rule::enum(InventoryPolicy::class)],

app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php

@@ -38,19 +38,13 @@ class CatalogFeaturedItemResource extends JsonResource
             'nombre' => $catalogItem->nombre,
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
-            'maximum_addable_quantity' => $this->maximumAddable(
-                $availableStock,
-                $remainingUserQuota,
-            ),
-            'unavailable_message' => $this->unavailableMessage(
-                $availableStock,
-                $remainingUserQuota,
-            ),
-            'variants' => $catalogItem->visibleVariants()
-                ->map(function (Variant $variant) use ($catalogItem, $remainingUserQuota): array {
+            'availability' => $this->availability($availableStock, $remainingUserQuota),
+            'variants' => $catalogItem->variants
+                ->map(function (Variant $variant) use ($catalogItem): array {
                     $variantStock = $catalogItem->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory->availableStock();
+                    $availability = $this->availability($variantStock, null);
 
                     return [
                         'id' => $variant->id,
@@ -60,17 +54,11 @@ class CatalogFeaturedItemResource extends JsonResource
                         'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
                         'descripcion' => $variant->getDescription(),
                         'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                        'maximum_addable_quantity' => $this->maximumAddable(
-                            $variantStock,
-                            $remainingUserQuota,
-                        ),
-                        'unavailable_message' => $this->unavailableMessage(
-                            $variantStock,
-                            $remainingUserQuota,
-                        ),
+                        'availability' => $availability,
                         'values' => $variant->selectorOptions($catalogItem->itemAttributes),
                     ];
                 })
+                ->filter(fn (array $variant): bool => $variant['availability']['state'] === 'visible')
                 ->values(),
         ];
 
@@ -90,8 +78,7 @@ class CatalogFeaturedItemResource extends JsonResource
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
             'image' => $this->firstImageUrl($catalogItem),
-            'maximum_addable_quantity' => $this->maximumAddable($availableStock, $remainingUserQuota),
-            'unavailable_message' => $this->unavailableMessage($availableStock, $remainingUserQuota),
+            'availability' => $this->availability($availableStock, $remainingUserQuota),
         ];
     }
 
@@ -107,30 +94,27 @@ class CatalogFeaturedItemResource extends JsonResource
             'nombre' => $catalogItem->nombre,
             'precio' => $catalogItem->precio,
             'image' => $this->firstImageUrl($catalogItem),
-            'maximum_addable_quantity' => $this->maximumAddable($availableStock, $remainingUserQuota),
-            'unavailable_message' => $this->unavailableMessage($availableStock, $remainingUserQuota),
+            'availability' => $this->availability($availableStock, $remainingUserQuota),
         ];
     }
 
     private function firstImageUrl(CatalogItem $catalogItem): ?string
     {
         $attachment = $catalogItem->attachments->first()
-            ?? $catalogItem->visibleVariants()
+            ?? $catalogItem->variants
                 ->flatMap(fn (Variant $variant) => $variant->attachments)
                 ->first();
 
         return $attachment?->getTemporaryUrl(1440);
     }
 
-    private function maximumAddable(?int $stock, ?int $remainingUserQuota): ?int
-    {
+    /** @return array<string, mixed> */
+    private function availability(
+        ?int $stock,
+        ?int $remainingUserQuota,
+    ): array {
         return app(CatalogItemAllowanceService::class)
-            ->maximumAddableQuantity($stock, $remainingUserQuota);
-    }
-
-    private function unavailableMessage(?int $stock, ?int $remainingUserQuota): ?string
-    {
-        return app(CatalogItemAllowanceService::class)
-            ->unavailableMessage($stock, $remainingUserQuota);
+            ->availability($stock, $remainingUserQuota)
+            ->toArray();
     }
 }

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -38,20 +38,14 @@ class CatalogItemDetailResource extends JsonResource
             'max_units_per_user' => $this->max_units_per_user,
             'has_tickets' => $this->has_tickets,
             'attributes' => $this->attributesData(),
-            'maximum_addable_quantity' => $this->when(
-                $selectedVariant === null,
-                fn () => $this->maximumAddable($this->availableStock()),
-            ),
-            'unavailable_message' => $this->when(
-                $selectedVariant === null,
-                fn () => $this->unavailableMessage($this->availableStock()),
-            ),
+            'availability' => $this->availability($this->availableStock()),
             'images' => $this->when(
                 $selectedVariant === null,
                 fn () => $this->imageUrls($this->attachments),
             ),
             'variants' => $this->variants
                 ->map(fn (Variant $variant): array => $this->variantData($variant))
+                ->filter(fn (array $variant): bool => $variant['availability']['state'] === 'visible')
                 ->values(),
             'selected_variant' => $this->when(
                 $selectedVariant !== null,
@@ -164,6 +158,10 @@ class CatalogItemDetailResource extends JsonResource
         $values = $variant->selectionOptions($this->itemAttributes);
         $eventDates = $variant->selectedEventDates();
         $variantStock = $this->variantStock($variant);
+        $availability = $this->availability(
+            $variantStock,
+            false,
+        );
 
         return [
             'id' => $variant->id,
@@ -173,8 +171,7 @@ class CatalogItemDetailResource extends JsonResource
             'event_dates' => $eventDates->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
             'descripcion' => $variant->getDescription(),
             'precio' => number_format($variant->getPrice(), 2, '.', ''),
-            'maximum_addable_quantity' => $this->maximumAddable($variantStock),
-            'unavailable_message' => $this->unavailableMessage($variantStock),
+            'availability' => $availability,
             'values' => $values,
         ];
     }
@@ -194,19 +191,14 @@ class CatalogItemDetailResource extends JsonResource
             : $variant->inventory->availableStock();
     }
 
-    private function maximumAddable(?int $stock): ?int
-    {
-        return app(CatalogItemAllowanceService::class)->maximumAddableQuantity(
+    /** @return array<string, mixed> */
+    private function availability(
+        ?int $stock,
+        bool $includeUserQuota = true,
+    ): array {
+        return app(CatalogItemAllowanceService::class)->availability(
             $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
-    }
-
-    private function unavailableMessage(?int $stock): ?string
-    {
-        return app(CatalogItemAllowanceService::class)->unavailableMessage(
-            $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
+            $includeUserQuota ? $this->getAttribute('remaining_user_quota') : null,
+        )->toArray();
     }
 }

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -16,9 +16,8 @@ class CatalogSearchItemResource extends JsonResource
     public function toArray(Request $request): array
     {
         $availableStock = $this->availableStock();
-        $visibleVariants = $this->visibleVariants();
         $attachment = $this->attachments->first()
-            ?? $visibleVariants
+            ?? $this->variants
                 ->flatMap(fn (Variant $variant) => $variant->attachments)
                 ->first();
 
@@ -29,13 +28,16 @@ class CatalogSearchItemResource extends JsonResource
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
             'image' => $attachment?->getTemporaryUrl(1440),
-            'maximum_addable_quantity' => $this->maximumAddable($availableStock),
-            'unavailable_message' => $this->unavailableMessage($availableStock),
-            'variants' => $visibleVariants
+            'availability' => $this->availability($availableStock),
+            'variants' => $this->variants
                 ->map(function (Variant $variant): array {
                     $variantStock = $this->inventory_policy === InventoryPolicy::Unlimited
                         ? null
                         : $variant->inventory?->availableStock();
+                    $availability = $this->availability(
+                        $variantStock,
+                        false,
+                    );
 
                     return [
                         'id' => $variant->id,
@@ -45,28 +47,23 @@ class CatalogSearchItemResource extends JsonResource
                         'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
                         'descripcion' => $variant->getDescription(),
                         'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                        'maximum_addable_quantity' => $this->maximumAddable($variantStock),
-                        'unavailable_message' => $this->unavailableMessage($variantStock),
+                        'availability' => $availability,
                         'values' => $variant->selectorOptions($this->itemAttributes),
                     ];
                 })
+                ->filter(fn (array $variant): bool => $variant['availability']['state'] === 'visible')
                 ->values(),
         ];
     }
 
-    private function maximumAddable(?int $stock): ?int
-    {
-        return app(CatalogItemAllowanceService::class)->maximumAddableQuantity(
+    /** @return array<string, mixed> */
+    private function availability(
+        ?int $stock,
+        bool $includeUserQuota = true,
+    ): array {
+        return app(CatalogItemAllowanceService::class)->availability(
             $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
-    }
-
-    private function unavailableMessage(?int $stock): ?string
-    {
-        return app(CatalogItemAllowanceService::class)->unavailableMessage(
-            $stock,
-            $this->getAttribute('remaining_user_quota'),
-        );
+            $includeUserQuota ? $this->getAttribute('remaining_user_quota') : null,
+        )->toArray();
     }
 }

app/Domains/Catalog/Services/AvailabilityDecision.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Enums\CatalogAction;
+
+final readonly class AvailabilityDecision
+{
+    /**
+     * @param  list<CatalogAction>  $allowedActions
+     * @param  list<array{code: string, message: string}>  $reasons
+     */
+    private function __construct(
+        private bool $visible,
+        private ?int $maximumQuantity,
+        private array $allowedActions,
+        private array $reasons,
+    ) {}
+
+    /** @param list<array{code: string, message: string}> $reasons */
+    public static function hidden(array $reasons): self
+    {
+        return new self(false, null, [], $reasons);
+    }
+
+    /**
+     * @param  list<CatalogAction>  $allowedActions
+     * @param  list<array{code: string, message: string}>  $reasons
+     */
+    public static function visible(
+        ?int $maximumQuantity,
+        array $allowedActions,
+        array $reasons,
+    ): self {
+        return new self(true, $maximumQuantity, $allowedActions, $reasons);
+    }
+
+    public function isVisible(): bool
+    {
+        return $this->visible;
+    }
+
+    /** @return array<string, mixed> */
+    public function toArray(): array
+    {
+        if (! $this->visible) {
+            return [
+                'state' => 'hidden',
+                'reasons' => $this->reasons,
+            ];
+        }
+
+        return [
+            'state' => 'visible',
+            'maximum_quantity' => $this->maximumQuantity,
+            'allowed_actions' => array_map(
+                fn (CatalogAction $action): string => $action->value,
+                $this->allowedActions,
+            ),
+            'reasons' => $this->reasons,
+        ];
+    }
+}

app/Domains/Catalog/Services/AvailabilityPolicyResolver.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Enums\AvailabilityEffect;
+use App\Domains\Catalog\Enums\CatalogAction;
+
+final class AvailabilityPolicyResolver
+{
+    /** @return array{effect: AvailabilityEffect, denied_actions: list<CatalogAction>} */
+    public function resolve(string $restrictionCode): array
+    {
+        /** @var array{effect?: string, denied_actions?: list<string>} $configured */
+        $configured = config("catalog.availability.rules.{$restrictionCode}", []);
+
+        return [
+            'effect' => AvailabilityEffect::from(
+                $configured['effect'] ?? AvailabilityEffect::Notice->value,
+            ),
+            'denied_actions' => array_map(
+                fn (string $action): CatalogAction => CatalogAction::from($action),
+                $configured['denied_actions'] ?? [],
+            ),
+        ];
+    }
+}

app/Domains/Catalog/Services/CatalogInventoryService.php

@@ -25,24 +25,6 @@ class CatalogInventoryService
         );
     }
 
-    /**
-     * @return array<int, array{quantity: int, tracks_inventory: bool}>
-     */
-    public function detailedRequirementsFor(CatalogItem|Variant $selection, int $quantity = 1): array
-    {
-        if ($quantity <= 0) {
-            throw new \InvalidArgumentException('La cantidad debe ser mayor a cero.');
-        }
-
-        return array_map(
-            fn (array $requirement): array => [
-                ...$requirement,
-                'quantity' => $requirement['quantity'] * $quantity,
-            ],
-            $this->inventoryRequirements($selection),
-        );
-    }
-
     public function availableQuantity(CatalogItem|Variant $selection): ?int
     {
         if ($selection instanceof CatalogItem

app/Domains/Catalog/Services/CatalogItemAllowanceService.php

@@ -2,6 +2,8 @@
 
 namespace App\Domains\Catalog\Services;
 
+use App\Domains\Catalog\Enums\AvailabilityEffect;
+use App\Domains\Catalog\Enums\CatalogAction;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Purchase\Services\UserPurchaseLimitService;
 use Illuminate\Support\Collection;
@@ -14,6 +16,7 @@ class CatalogItemAllowanceService
 
     public function __construct(
         private readonly UserPurchaseLimitService $purchaseLimits,
+        private readonly AvailabilityPolicyResolver $policies,
     ) {}
 
     /** @param Collection<int, CatalogItem> $catalogItems */
@@ -42,16 +45,82 @@ class CatalogItemAllowanceService
         return min($availableStock, $remainingUserQuota);
     }
 
-    public function unavailableMessage(?int $availableStock, ?int $remainingUserQuota): ?string
-    {
+    public function availability(
+        ?int $availableStock,
+        ?int $remainingUserQuota,
+    ): AvailabilityDecision {
+        $reasons = [];
+
         if ($remainingUserQuota !== null && $remainingUserQuota <= 0) {
-            return self::USER_QUOTA_REACHED_MESSAGE;
+            $reasons[] = [
+                'code' => 'user_quota_reached',
+                'message' => self::USER_QUOTA_REACHED_MESSAGE,
+            ];
         }
 
         if ($availableStock !== null && $availableStock <= 0) {
-            return self::OUT_OF_STOCK_MESSAGE;
+            $reasons[] = [
+                'code' => 'out_of_stock',
+                'message' => self::OUT_OF_STOCK_MESSAGE,
+            ];
         }
 
-        return null;
+        return $this->decision(
+            $this->maximumAddableQuantity($availableStock, $remainingUserQuota),
+            $reasons,
+        );
+    }
+
+    public function purchaseLimitExceededAvailability(
+        int $maximumQuantity,
+        string $message,
+    ): AvailabilityDecision {
+        $reasons = [];
+
+        if ($maximumQuantity <= 0) {
+            $reasons[] = [
+                'code' => 'user_quota_reached',
+                'message' => self::USER_QUOTA_REACHED_MESSAGE,
+            ];
+        } else {
+            $reasons[] = [
+                'code' => 'requested_quantity_exceeds_user_quota',
+                'message' => $message,
+            ];
+        }
+
+        return $this->decision($maximumQuantity, $reasons);
+    }
+
+    /**
+     * @param  list<array{code: string, message: string}>  $reasons
+     */
+    private function decision(?int $maximumQuantity, array $reasons): AvailabilityDecision
+    {
+        /** @var list<string> $configuredActions */
+        $configuredActions = config('catalog.availability.default_actions', []);
+        $allowedActions = collect($configuredActions)
+            ->map(fn (string $action): CatalogAction => CatalogAction::from($action));
+
+        foreach ($reasons as $reason) {
+            $policy = $this->policies->resolve($reason['code']);
+
+            if ($policy['effect'] === AvailabilityEffect::Hide) {
+                return AvailabilityDecision::hidden($reasons);
+            }
+
+            if ($policy['effect'] === AvailabilityEffect::Restrict) {
+                $deniedActions = $policy['denied_actions'];
+                $allowedActions = $allowedActions->reject(
+                    fn (CatalogAction $action): bool => in_array($action, $deniedActions, true),
+                );
+            }
+        }
+
+        return AvailabilityDecision::visible(
+            $maximumQuantity,
+            $allowedActions->values()->all(),
+            $reasons,
+        );
     }
 }

app/Domains/Catalog/Services/CatalogService.php

@@ -22,7 +22,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class CatalogService
 {
-    public function __construct(protected AttachmentService $attachmentService) {}
+    public function __construct(
+        protected AttachmentService $attachmentService,
+        private readonly VisibleCatalogItemsQuery $visibleCatalogItems,
+    ) {}
 
     /**
      * @param  array<string, mixed>  $data
@@ -205,13 +208,6 @@ class CatalogService
         ]);
 
         $visibleVariants = $catalogItem->visibleVariants();
-        if ($catalogItem->type === CatalogItemType::Standard
-            && ($catalogItem->inventory_id !== null || $catalogItem->variants->isNotEmpty())
-            && ! $catalogItem->isAvailable()) {
-            throw new NotFoundHttpException('Catalog item is out of stock.');
-        }
-
-        $catalogItem->setRelation('variants', $visibleVariants);
         $selectedVariant = $variantId === null
             ? $visibleVariants->first()
             : $visibleVariants->firstWhere('id', $variantId);
@@ -236,9 +232,8 @@ class CatalogService
         $containsPattern = "%{$normalizedTerm}%";
         $startsWithPattern = "{$normalizedTerm}%";
 
-        $paginator = CatalogItem::query()
+        $query = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
-            ->whereAvailable()
             ->where(function (Builder $query) use ($containsPattern): void {
                 $query
                     ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
@@ -265,7 +260,10 @@ class CatalogService
                 'variants.definitions.itemAttribute.attribute.options',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
-            ])
+            ]);
+
+        $paginator = $this->visibleCatalogItems
+            ->apply($query)
             ->orderByRaw(
                 'CASE WHEN LOWER(nombre) = ? THEN 0 WHEN LOWER(nombre) LIKE ? THEN 1 ELSE 2 END',
                 [$normalizedTerm, $startsWithPattern],
@@ -285,10 +283,9 @@ class CatalogService
         int $perPage,
         int $page,
     ): LengthAwarePaginator {
-        return CatalogItem::query()
+        $query = CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('category_id', $category->id)
-            ->whereAvailable()
             ->with([
                 'attachments',
                 'inventory',
@@ -300,7 +297,10 @@ class CatalogService
                 'variants.definitions.itemAttribute.attribute.options',
                 'bundleComponents.catalogItem',
                 'bundleComponents.variant.catalogItem',
-            ])
+            ]);
+
+        return $this->visibleCatalogItems
+            ->apply($query)
             ->orderBy('nombre')
             ->paginate(perPage: $perPage, pageName: 'page', page: $page);
     }

app/Domains/Catalog/Services/ExpireStockReservationsService.php

@@ -2,184 +2,50 @@
 
 namespace App\Domains\Catalog\Services;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
-use Illuminate\Support\Facades\DB;
+use App\Domains\Cart\Services\ExpireCartReservationsService;
+use App\Domains\Purchase\Services\CheckoutService;
 use Illuminate\Support\Facades\Log;
-use RuntimeException;
 use Throwable;
 
 class ExpireStockReservationsService
 {
-    private const BATCH_SIZE = 500;
-
     public function __construct(
-        private readonly ReleaseCheckoutService $purchases,
-        private readonly StockReservationService $reservations,
+        private readonly CheckoutService $checkout,
+        private readonly ExpireCartReservationsService $carts,
     ) {}
 
     /**
-     * @return array{purchases: int, cart_reservations: int, orphan_reservations: int, failed: int}
+     * @return array{purchases: int, cart_items: int}
      */
     public function expireOverdue(): array
     {
-        $summary = [
-            'purchases' => 0,
-            'cart_reservations' => 0,
-            'orphan_reservations' => 0,
-            'failed' => 0,
-        ];
-        $lastReservationId = 0;
+        $expiredPurchases = null;
+        $expiredCartItems = null;
 
-        do {
-            $reservationIds = StockReservation::query()
-                ->where('status', StockReservation::STATUS_ACTIVE)
-                ->whereNotNull('expires_at')
-                ->where('expires_at', '<=', now())
-                ->where('id', '>', $lastReservationId)
-                ->orderBy('id')
-                ->limit(self::BATCH_SIZE)
-                ->pluck('id');
+        try {
+            $expiredPurchases = $this->checkout->expireOverduePurchases();
+            $expiredCartItems = $this->carts->expireOverdue();
 
-            foreach ($reservationIds as $reservationId) {
-                $lastReservationId = (int) $reservationId;
+            Log::channel('commands')->info('Stock reservation cleanup completed.', [
+                'command' => 'reservations:expire',
+                'expired_purchases' => $expiredPurchases,
+                'expired_cart_items' => $expiredCartItems,
+                'total_expired' => $expiredPurchases + $expiredCartItems,
+            ]);
 
-                try {
-                    $owner = $this->expireReservation($lastReservationId);
-                    if ($owner !== null) {
-                        $summary[$owner]++;
-                    }
-                } catch (Throwable $exception) {
-                    $summary['failed']++;
-                    Log::channel('commands')->error('Failed to expire overdue stock reservation.', [
-                        'command' => 'reservations:expire',
-                        'stock_reservation_id' => $lastReservationId,
-                        'exception' => $exception,
-                    ]);
-                }
-            }
-        } while ($reservationIds->count() === self::BATCH_SIZE);
+            return [
+                'purchases' => $expiredPurchases,
+                'cart_items' => $expiredCartItems,
+            ];
+        } catch (Throwable $exception) {
+            Log::channel('commands')->error('Stock reservation cleanup failed.', [
+                'command' => 'reservations:expire',
+                'expired_purchases' => $expiredPurchases,
+                'expired_cart_items' => $expiredCartItems,
+                'exception' => $exception,
+            ]);
 
-        Log::channel('commands')->info('Stock reservation cleanup completed.', [
-            'command' => 'reservations:expire',
-            'expired_purchases' => $summary['purchases'],
-            'expired_cart_reservations' => $summary['cart_reservations'],
-            'expired_orphan_reservations' => $summary['orphan_reservations'],
-            'failed_reservations' => $summary['failed'],
-            'total_expired' => $summary['purchases']
-                + $summary['cart_reservations']
-                + $summary['orphan_reservations'],
-        ]);
-
-        return $summary;
-    }
-
-    public function expireIfOverdue(int $reservationId): bool
-    {
-        /** @var StockReservation|null $reservation */
-        $reservation = StockReservation::query()->find($reservationId);
-        if ($reservation?->status === StockReservation::STATUS_EXPIRED) {
-            return true;
+            throw $exception;
         }
-        if (! $this->isOverdue($reservation)) {
-            return false;
-        }
-
-        return $this->expireReservation($reservationId) !== null;
-    }
-
-    /** @return 'purchases'|'cart_reservations'|'orphan_reservations'|null */
-    private function expireReservation(int $reservationId): ?string
-    {
-        $purchaseId = Purchase::query()
-            ->where('stock_reservation_id', $reservationId)
-            ->value('id');
-        if ($purchaseId !== null) {
-            return $this->expirePurchase((int) $purchaseId);
-        }
-
-        $cartId = Cart::query()
-            ->where('current_stock_reservation_id', $reservationId)
-            ->where('status', 'active')
-            ->value('id');
-        if ($cartId !== null) {
-            return $this->expireCart((int) $cartId, $reservationId);
-        }
-
-        return $this->expireOrphan($reservationId);
-    }
-
-    /** @return 'purchases'|null */
-    private function expirePurchase(int $purchaseId): ?string
-    {
-        /** @var Purchase|null $purchase */
-        $purchase = Purchase::query()->find($purchaseId);
-        if ($purchase === null) {
-            return null;
-        }
-
-        $purchase = $this->purchases->expire($purchase);
-        if ($purchase->status === Purchase::STATUS_EXPIRED) {
-            return 'purchases';
-        }
-
-        $reservation = $purchase->stockReservation;
-        if ($this->isOverdue($reservation)) {
-            throw new RuntimeException('An overdue active reservation belongs to a purchase that cannot expire.');
-        }
-
-        return null;
-    }
-
-    /** @return 'cart_reservations'|null */
-    private function expireCart(int $cartId, int $reservationId): ?string
-    {
-        return DB::transaction(function () use ($cartId, $reservationId): ?string {
-            /** @var Cart|null $cart */
-            $cart = Cart::query()
-                ->whereKey($cartId)
-                ->where('current_stock_reservation_id', $reservationId)
-                ->where('status', Cart::STATUS_ACTIVE)
-                ->lockForUpdate()
-                ->first();
-            if ($cart === null) {
-                return null;
-            }
-
-            /** @var StockReservation|null $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->find($reservationId);
-            if (! $this->isOverdue($reservation)) {
-                return null;
-            }
-
-            $this->reservations->expire($reservation);
-            $cart->update(['status' => Cart::STATUS_EXPIRED]);
-
-            return 'cart_reservations';
-        });
-    }
-
-    /** @return 'orphan_reservations'|null */
-    private function expireOrphan(int $reservationId): ?string
-    {
-        /** @var StockReservation|null $reservation */
-        $reservation = StockReservation::query()->find($reservationId);
-        if (! $this->isOverdue($reservation)) {
-            return null;
-        }
-
-        $this->reservations->expire($reservation);
-
-        return 'orphan_reservations';
-    }
-
-    private function isOverdue(?StockReservation $reservation): bool
-    {
-        return $reservation !== null
-            && $reservation->status === StockReservation::STATUS_ACTIVE
-            && $reservation->expires_at !== null
-            && ! $reservation->expires_at->isFuture();
     }
 }

app/Domains/Catalog/Services/FeaturedGroupService.php

@@ -17,6 +17,7 @@ class FeaturedGroupService
     /** @return array<array-key, mixed> */
     public function __construct(
         private readonly CatalogItemAllowanceService $allowances,
+        private readonly VisibleCatalogItemsQuery $visibleCatalogItems,
     ) {}
 
     public function itemsResponse(FeaturedGroup $featuredGroup, int $page, ?int $userId = null): array
@@ -49,7 +50,6 @@ class FeaturedGroupService
     {
         $query = CatalogItem::query()
             ->where('catalog_items.tenant_code', $featuredGroup->tenant_code)
-            ->whereAvailable()
             ->where(function (Builder $query): void {
                 $query
                     ->whereDoesntHave('category')
@@ -72,6 +72,8 @@ class FeaturedGroupService
                 'bundleComponents.variant.catalogItem',
             ]);
 
+        $query = $this->visibleCatalogItems->apply($query);
+
         return match ($featuredGroup->source_type) {
             FeaturedGroupSource::Manual => $query
                 ->select('catalog_items.*')
@@ -82,9 +84,7 @@ class FeaturedGroupService
             FeaturedGroupSource::Category => $query
                 ->where('catalog_items.category_id', $featuredGroup->category_id)
                 ->orderBy('catalog_items.id'),
-            FeaturedGroupSource::All => $query
-                ->orderBy('catalog_items.group_order')
-                ->orderBy('catalog_items.id'),
+            FeaturedGroupSource::All => $query->orderBy('catalog_items.id'),
         };
     }
 

app/Domains/Catalog/Services/StockReservationService.php

@@ -2,486 +2,262 @@
 
 namespace App\Domains\Catalog\Services;
 
-use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Models\Inventory;
+use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\StockReservationLine;
+use App\Domains\Catalog\Models\Variant;
 use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 class StockReservationService
 {
-    public const REASON_CART_EMPTY = 'cart_empty';
-
-    public const REASON_CART_CHANGED = 'cart_changed';
-
-    public const REASON_PURCHASE_SUPERSEDED = 'purchase_superseded';
-
-    public const REASON_PURCHASE_CANCELLED = 'purchase_cancelled';
-
-    public const REASON_PAYMENT_REJECTED = 'payment_rejected';
-
-    public const REASON_MANUAL_RELEASE = 'manual_release';
-
     public function __construct(
         private readonly CatalogInventoryService $inventory,
     ) {}
 
-    public function syncCart(Cart $cart): ?StockReservation
+    public function reserve(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
     {
-        return DB::transaction(function () use ($cart): ?StockReservation {
-            /** @var Cart $lockedCart */
-            $lockedCart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            $items = $lockedCart->items()->orderBy('id')->lockForUpdate()->get();
-            $this->loadSelections($items);
-            $requirements = $this->requirementsForItems($items);
+        DB::transaction(function () use ($cartItem, $selection, $quantity): void {
+            $this->inventory->reserve($selection, $quantity);
+            $this->recordIncrease($cartItem, $selection, $quantity);
+        });
+    }
 
-            $reservation = $lockedCart->current_stock_reservation_id === null
-                ? null
-                : StockReservation::query()->lockForUpdate()->find($lockedCart->current_stock_reservation_id);
+    public function release(
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
+        int $quantity,
+        string $releasedStatus = StockReservation::STATUS_RELEASED,
+    ): void {
+        DB::transaction(function () use ($cartItem, $selection, $quantity, $releasedStatus): void {
+            $this->ensure($cartItem, $selection);
+            $this->inventory->release($selection, $quantity);
+            $this->recordDecrease($cartItem, $selection, $quantity, $releasedStatus);
+        });
+    }
 
-            if ($reservation !== null) {
-                $this->assertUsableCartReservation($reservation);
-            }
+    public function commit(
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
+        Purchase $purchase,
+    ): void {
+        DB::transaction(function () use ($cartItem, $selection, $purchase): void {
+            $this->ensure($cartItem, $selection);
+            $this->inventory->commit($selection, (int) $cartItem->cantidad);
 
-            if ($requirements === []) {
-                if ($reservation !== null && $reservation->status === StockReservation::STATUS_ACTIVE) {
-                    $this->finalizeLocked(
-                        $reservation,
-                        StockReservation::STATUS_RELEASED,
-                        self::REASON_CART_EMPTY,
-                    );
+            $requirements = $this->inventory->requirementsFor($selection, (int) $cartItem->cantidad);
+            foreach ($requirements as $inventoryId => $quantity) {
+                $reservation = $this->lockReservation($cartItem, $inventoryId);
+                if (
+                    $reservation === null
+                    || $reservation->status !== StockReservation::STATUS_ACTIVE
+                    || $reservation->purchase_id !== $purchase->getKey()
+                    || $reservation->quantity !== $quantity
+                ) {
+                    throw new \InvalidArgumentException('La reserva de stock no coincide con el item del carrito.');
                 }
 
-                $lockedCart->update(['current_stock_reservation_id' => null]);
-                $cart->current_stock_reservation_id = null;
-
-                return null;
+                $reservation->update([
+                    'status' => StockReservation::STATUS_COMMITTED,
+                    'committed_at' => now(),
+                    'expires_at' => null,
+                ]);
             }
+        });
+    }
+
+    public function ensure(CartItem $cartItem, CatalogItem|Variant $selection): void
+    {
+        $requirements = $this->inventory->requirementsFor($selection, (int) $cartItem->cantidad);
+
+        foreach ($requirements as $inventoryId => $quantity) {
+            $reservation = $this->lockReservation($cartItem, $inventoryId);
 
             if ($reservation === null) {
-                $reservation = StockReservation::query()->create([
+                StockReservation::query()->create([
+                    'inventory_id' => $inventoryId,
+                    'cart_item_id' => $cartItem->getKey(),
+                    'quantity' => $quantity,
                     'status' => StockReservation::STATUS_ACTIVE,
                     'expires_at' => $this->expiration(),
                 ]);
-                $lockedCart->update(['current_stock_reservation_id' => $reservation->getKey()]);
+
+                continue;
             }
 
-            if (Purchase::query()->where('stock_reservation_id', $reservation->getKey())->exists()) {
-                throw new \InvalidArgumentException('La reserva vinculada a una compra no se puede modificar.');
+            if ($reservation->status !== StockReservation::STATUS_ACTIVE || $reservation->quantity !== $quantity) {
+                $reservation->update([
+                    'quantity' => $quantity,
+                    'status' => StockReservation::STATUS_ACTIVE,
+                    'committed_at' => null,
+                    'released_at' => null,
+                    'expires_at' => $this->expiration(),
+                ]);
             }
-
-            $currentLines = StockReservationLine::query()
-                ->where('stock_reservation_id', $reservation->getKey())
-                ->orderBy('inventory_id')
-                ->lockForUpdate()
-                ->get()
-                ->keyBy('inventory_id');
-            $inventoryIds = collect(array_keys($requirements))
-                ->merge($currentLines->keys())
-                ->map(fn ($id): int => (int) $id)
-                ->unique()
-                ->sort()
-                ->values();
-            $inventories = Inventory::query()
-                ->whereKey($inventoryIds)
-                ->orderBy('id')
-                ->lockForUpdate()
-                ->get()
-                ->keyBy('id');
-
-            foreach ($inventoryIds as $inventoryId) {
-                $inventory = $inventories->get($inventoryId)
-                    ?? throw new \InvalidArgumentException('No se encontró el inventario requerido.');
-                $previous = (int) ($currentLines->get($inventoryId)?->quantity ?? 0);
-                $required = (int) ($requirements[$inventoryId]['quantity'] ?? 0);
-                $delta = $required - $previous;
-
-                if ($delta > 0
-                    && $requirements[$inventoryId]['tracks_inventory']
-                    && $inventory->availableStock() < $delta) {
-                    throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar el carrito.');
-                }
-
-                if ($delta < 0 && $inventory->reserved_stock < abs($delta)) {
-                    throw new \InvalidArgumentException('La reserva de stock del carrito es inconsistente.');
-                }
-            }
-
-            foreach ($inventoryIds as $inventoryId) {
-                /** @var Inventory $inventory */
-                $inventory = $inventories->get($inventoryId);
-                $line = $currentLines->get($inventoryId);
-                $previous = (int) ($line?->quantity ?? 0);
-                $required = (int) ($requirements[$inventoryId]['quantity'] ?? 0);
-                $delta = $required - $previous;
-
-                if ($delta > 0) {
-                    $inventory->reserve($delta, $requirements[$inventoryId]['tracks_inventory']);
-                } elseif ($delta < 0) {
-                    $inventory->release(abs($delta));
-                }
-
-                if ($required === 0) {
-                    $line?->delete();
-
-                    continue;
-                }
-
-                StockReservationLine::query()->updateOrCreate(
-                    [
-                        'stock_reservation_id' => $reservation->getKey(),
-                        'inventory_id' => $inventoryId,
-                    ],
-                    [
-                        'quantity' => $required,
-                        'tracks_inventory' => $requirements[$inventoryId]['tracks_inventory'],
-                    ],
-                );
-            }
-
-            $reservation->update([
-                'expires_at' => $this->expiration(),
-                'release_reason' => null,
-            ]);
-            $cart->current_stock_reservation_id = $reservation->getKey();
-
-            return $reservation->fresh('lines');
-        });
+        }
     }
 
     public function attachToPurchase(
-        Cart $cart,
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
         Purchase $purchase,
-        Carbon $expiresAt,
-    ): StockReservation {
-        return DB::transaction(function () use ($cart, $purchase, $expiresAt): StockReservation {
-            /** @var Cart $lockedCart */
-            $lockedCart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            /** @var Purchase $lockedPurchase */
-            $lockedPurchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-
-            if ($lockedCart->current_stock_reservation_id === null) {
-                throw new \InvalidArgumentException('El carrito no tiene una reserva de stock activa.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->findOrFail($lockedCart->current_stock_reservation_id);
-            $this->assertUsableCartReservation($reservation);
-
-            $linkedPurchase = Purchase::query()
-                ->where('stock_reservation_id', $reservation->getKey())
-                ->whereKeyNot($lockedPurchase->getKey())
-                ->exists();
-            if ($linkedPurchase) {
-                throw new \InvalidArgumentException('La reserva de stock ya pertenece a otra compra.');
-            }
-
-            $lockedPurchase->update(['stock_reservation_id' => $reservation->getKey()]);
-            $reservation->update(['expires_at' => $expiresAt]);
-            $purchase->stock_reservation_id = $reservation->getKey();
-            $cart->current_stock_reservation_id = $reservation->getKey();
-
-            return $reservation->fresh('lines');
+    ): void {
+        DB::transaction(function () use ($cartItem, $selection, $purchase): void {
+            $this->ensure($cartItem, $selection);
+            StockReservation::query()
+                ->where('cart_item_id', $cartItem->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->update([
+                    'purchase_id' => $purchase->getKey(),
+                    'expires_at' => $purchase->expires_at,
+                ]);
         });
     }
 
-    public function commit(Purchase $purchase): void
+    public function detachFromPurchase(Purchase $purchase): void
     {
-        DB::transaction(function () use ($purchase): void {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            if ($purchase->stock_reservation_id === null) {
-                throw new \InvalidArgumentException('La compra no tiene una reserva de stock.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->findOrFail($purchase->stock_reservation_id);
-            if ($reservation->status === StockReservation::STATUS_COMMITTED) {
-                return;
-            }
-            if ($reservation->status !== StockReservation::STATUS_ACTIVE) {
-                throw new \InvalidArgumentException('La reserva de stock no está activa.');
-            }
-            if ($reservation->expires_at !== null && ! $reservation->expires_at->isFuture()) {
-                throw new StockReservationExpiredException;
-            }
-
-            $lines = $this->lockLines($reservation);
-            if ($lines->isEmpty()) {
-                throw new \InvalidArgumentException('La reserva de stock no tiene inventarios.');
-            }
-
-            $inventories = $this->lockInventories($lines);
-            foreach ($lines as $line) {
-                $inventory = $inventories->get($line->inventory_id)
-                    ?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
-                if ($inventory->reserved_stock < $line->quantity
-                    || ($line->tracks_inventory && $inventory->real_stock < $line->quantity)) {
-                    throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.');
-                }
-            }
-
-            foreach ($lines as $line) {
-                $inventories->get($line->inventory_id)->buy(
-                    (int) $line->quantity,
-                    (bool) $line->tracks_inventory,
-                );
-            }
-
-            $reservation->update([
-                'status' => StockReservation::STATUS_COMMITTED,
-                'expires_at' => null,
-                'committed_at' => now(),
-                'released_at' => null,
-                'expired_at' => null,
-                'release_reason' => null,
+        StockReservation::query()
+            ->where('purchase_id', $purchase->getKey())
+            ->where('status', StockReservation::STATUS_ACTIVE)
+            ->update([
+                'purchase_id' => null,
+                'expires_at' => $this->expiration(),
             ]);
-        });
     }
 
-    public function releaseForPurchase(
-        Purchase $purchase,
-        string $status = StockReservation::STATUS_RELEASED,
-        ?string $reason = null,
-    ): void {
-        DB::transaction(function () use ($purchase, $status, $reason): void {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            if ($purchase->stock_reservation_id === null) {
-                return;
-            }
-
-            /** @var StockReservation|null $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->find($purchase->stock_reservation_id);
-            if ($reservation !== null) {
-                $this->finalizeLocked($reservation, $status, $reason);
-            }
-        });
-    }
-
-    public function returnToCart(Purchase $purchase, Cart $cart): StockReservation
+    public function restore(CartItem $cartItem, CatalogItem|Variant $selection): void
     {
-        return DB::transaction(function () use ($purchase, $cart): StockReservation {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            /** @var Cart $cart */
-            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-
-            if ($purchase->stock_reservation_id === null
-                || $cart->current_stock_reservation_id !== $purchase->stock_reservation_id) {
-                throw new \InvalidArgumentException('La compra y el carrito no comparten la reserva activa.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()
+        DB::transaction(function () use ($cartItem, $selection): void {
+            $requirements = $this->inventory->requirementsFor(
+                $selection,
+                (int) $cartItem->cantidad,
+            );
+            $activeReservations = StockReservation::query()
+                ->where('cart_item_id', $cartItem->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
                 ->lockForUpdate()
-                ->findOrFail($purchase->stock_reservation_id);
-            $this->assertUsableCartReservation($reservation);
+                ->get()
+                ->keyBy('inventory_id');
 
-            $purchase->update(['stock_reservation_id' => null]);
-            $cart->update(['current_purchase_id' => null]);
-            $reservation->update(['expires_at' => $this->expiration()]);
+            $hasCompleteReservation = collect($requirements)->every(
+                fn (int $quantity, int $inventoryId): bool => (int) ($activeReservations->get($inventoryId)?->quantity ?? 0) === $quantity,
+            );
 
-            return $reservation->fresh('lines');
-        });
-    }
-
-    public function assertCartReservationUsable(Cart $cart): void
-    {
-        DB::transaction(function () use ($cart): void {
-            /** @var Cart $cart */
-            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            if ($cart->current_stock_reservation_id === null) {
+            if ($hasCompleteReservation) {
                 return;
             }
 
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()
+            if ($activeReservations->isNotEmpty()) {
+                throw new \InvalidArgumentException('La reserva de stock del carrito es inconsistente.');
+            }
+
+            $this->inventory->reserve($selection, (int) $cartItem->cantidad);
+            $this->recordIncrease($cartItem, $selection, (int) $cartItem->cantidad);
+        });
+    }
+
+    public function syncPurchaseExpiration(Purchase $purchase): void
+    {
+        StockReservation::query()
+            ->where('purchase_id', $purchase->getKey())
+            ->where('status', StockReservation::STATUS_ACTIVE)
+            ->update(['expires_at' => $purchase->expires_at]);
+    }
+
+    public function transfer(CartItem $source, CartItem $target): void
+    {
+        DB::transaction(function () use ($source, $target): void {
+            $sourceReservations = StockReservation::query()
+                ->where('cart_item_id', $source->getKey())
+                ->where('status', StockReservation::STATUS_ACTIVE)
+                ->orderBy('inventory_id')
                 ->lockForUpdate()
-                ->findOrFail($cart->current_stock_reservation_id);
-            $this->assertUsableCartReservation($reservation);
-        });
-    }
+                ->get();
 
-    public function releaseCurrentCartReservation(
-        Cart $cart,
-        string $reason = self::REASON_CART_CHANGED,
-    ): void {
-        DB::transaction(function () use ($cart, $reason): void {
-            /** @var Cart $cart */
-            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
-            if ($cart->current_stock_reservation_id === null) {
-                return;
-            }
+            foreach ($sourceReservations as $sourceReservation) {
+                $targetReservation = $this->lockReservation($target, (int) $sourceReservation->inventory_id);
 
-            /** @var StockReservation|null $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->find($cart->current_stock_reservation_id);
-            if ($reservation !== null) {
-                $this->finalizeLocked($reservation, StockReservation::STATUS_RELEASED, $reason);
-            }
-            $cart->update(['current_stock_reservation_id' => null]);
-        });
-    }
-
-    public function expire(StockReservation $reservation): void
-    {
-        DB::transaction(function () use ($reservation): void {
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()->lockForUpdate()->findOrFail($reservation->getKey());
-            if ($reservation->status !== StockReservation::STATUS_ACTIVE
-                || $reservation->expires_at === null
-                || $reservation->expires_at->isFuture()) {
-                return;
-            }
-
-            $this->finalizeLocked($reservation, StockReservation::STATUS_EXPIRED, null);
-        });
-    }
-
-    public function clearExpirationForReview(Purchase $purchase): void
-    {
-        DB::transaction(function () use ($purchase): void {
-            /** @var Purchase $purchase */
-            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-            if ($purchase->stock_reservation_id === null) {
-                throw new \InvalidArgumentException('La compra no tiene una reserva de stock.');
-            }
-
-            /** @var StockReservation $reservation */
-            $reservation = StockReservation::query()
-                ->lockForUpdate()
-                ->findOrFail($purchase->stock_reservation_id);
-            if ($reservation->status !== StockReservation::STATUS_ACTIVE) {
-                throw new \InvalidArgumentException('La reserva de stock no está activa.');
-            }
-            if ($reservation->expires_at !== null && ! $reservation->expires_at->isFuture()) {
-                throw new StockReservationExpiredException;
-            }
-
-            $reservation->update(['expires_at' => null]);
-        });
-    }
-
-    /**
-     * @param  Collection<int, CartItem>  $items
-     * @return array<int, array{quantity: int, tracks_inventory: bool}>
-     */
-    private function requirementsForItems(Collection $items): array
-    {
-        $requirements = [];
-        foreach ($items as $item) {
-            $selection = $item->selectedItem();
-            if ($selection === null) {
-                throw new \InvalidArgumentException('El carrito contiene un item de catálogo inexistente.');
-            }
-
-            foreach ($this->inventory->detailedRequirementsFor($selection, (int) $item->cantidad) as $inventoryId => $requirement) {
-                if (isset($requirements[$inventoryId])) {
-                    $requirements[$inventoryId]['quantity'] += $requirement['quantity'];
-                    $requirements[$inventoryId]['tracks_inventory'] =
-                        $requirements[$inventoryId]['tracks_inventory'] || $requirement['tracks_inventory'];
+                if ($targetReservation === null) {
+                    $sourceItemQuantity = (int) $source->cantidad;
+                    $targetItemQuantity = (int) $target->fresh()->cantidad;
+                    $perItemQuantity = intdiv((int) $sourceReservation->quantity, $sourceItemQuantity);
+                    $sourceReservation->update([
+                        'cart_item_id' => $target->getKey(),
+                        'purchase_id' => null,
+                        'quantity' => $perItemQuantity * $targetItemQuantity,
+                        'expires_at' => $this->expiration(),
+                    ]);
 
                     continue;
                 }
 
-                $requirements[$inventoryId] = $requirement;
+                $targetReservation->update([
+                    'quantity' => $targetReservation->quantity + $sourceReservation->quantity,
+                    'status' => StockReservation::STATUS_ACTIVE,
+                    'expires_at' => $this->expiration(),
+                ]);
+                $sourceReservation->delete();
             }
+        });
+    }
+
+    private function recordIncrease(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
+    {
+        foreach ($this->inventory->requirementsFor($selection, $quantity) as $inventoryId => $requiredQuantity) {
+            $reservation = $this->lockReservation($cartItem, $inventoryId);
+
+            if ($reservation === null) {
+                StockReservation::query()->create([
+                    'inventory_id' => $inventoryId,
+                    'cart_item_id' => $cartItem->getKey(),
+                    'quantity' => $requiredQuantity,
+                    'status' => StockReservation::STATUS_ACTIVE,
+                    'expires_at' => $this->expiration(),
+                ]);
+
+                continue;
+            }
+
+            $reservation->update([
+                'quantity' => ($reservation->status === StockReservation::STATUS_ACTIVE ? $reservation->quantity : 0) + $requiredQuantity,
+                'status' => StockReservation::STATUS_ACTIVE,
+                'committed_at' => null,
+                'released_at' => null,
+                'expires_at' => $this->expiration(),
+            ]);
         }
-
-        ksort($requirements);
-
-        return $requirements;
     }
 
-    /** @param Collection<int, CartItem> $items */
-    private function loadSelections(Collection $items): void
-    {
-        $items->load([
-            'catalogItem.inventory',
-            'catalogItem.bundleComponents.catalogItem.inventory',
-            'catalogItem.bundleComponents.variant.inventory',
-            'catalogItem.bundleComponents.variant.catalogItem',
-            'variant.inventory',
-            'variant.catalogItem',
-        ]);
-    }
-
-    /** @return Collection<int, StockReservationLine> */
-    private function lockLines(StockReservation $reservation): Collection
-    {
-        return StockReservationLine::query()
-            ->where('stock_reservation_id', $reservation->getKey())
-            ->orderBy('inventory_id')
-            ->lockForUpdate()
-            ->get();
-    }
-
-    /**
-     * @param  Collection<int, StockReservationLine>  $lines
-     * @return Collection<int, Inventory>
-     */
-    private function lockInventories(Collection $lines): Collection
-    {
-        return Inventory::query()
-            ->whereKey($lines->pluck('inventory_id'))
-            ->orderBy('id')
-            ->lockForUpdate()
-            ->get()
-            ->keyBy('id');
-    }
-
-    private function finalizeLocked(
-        StockReservation $reservation,
-        string $status,
-        ?string $reason,
+    private function recordDecrease(
+        CartItem $cartItem,
+        CatalogItem|Variant $selection,
+        int $quantity,
+        string $releasedStatus,
     ): void {
-        if ($reservation->status !== StockReservation::STATUS_ACTIVE) {
-            return;
-        }
-        if (! in_array($status, [StockReservation::STATUS_RELEASED, StockReservation::STATUS_EXPIRED], true)) {
-            throw new \InvalidArgumentException('El estado final de la reserva no es válido.');
-        }
+        foreach ($this->inventory->requirementsFor($selection, $quantity) as $inventoryId => $requiredQuantity) {
+            $reservation = $this->lockReservation($cartItem, $inventoryId);
+            if ($reservation === null || $reservation->status !== StockReservation::STATUS_ACTIVE || $reservation->quantity < $requiredQuantity) {
+                throw new \InvalidArgumentException('La reserva de stock no alcanza para liberar la cantidad solicitada.');
+            }
 
-        $lines = $this->lockLines($reservation);
-        $inventories = $this->lockInventories($lines);
-        foreach ($lines as $line) {
-            $inventory = $inventories->get($line->inventory_id)
-                ?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
-            $inventory->release((int) $line->quantity);
-        }
-
-        $now = now();
-        $reservation->update([
-            'status' => $status,
-            'expires_at' => null,
-            'released_at' => $status === StockReservation::STATUS_RELEASED ? $now : null,
-            'expired_at' => $status === StockReservation::STATUS_EXPIRED ? $now : null,
-            'release_reason' => $status === StockReservation::STATUS_RELEASED ? $reason : null,
-        ]);
-
-        if ($status === StockReservation::STATUS_RELEASED) {
-            Cart::query()
-                ->where('current_stock_reservation_id', $reservation->getKey())
-                ->update(['current_stock_reservation_id' => null]);
+            $remaining = $reservation->quantity - $requiredQuantity;
+            $reservation->update([
+                'quantity' => $remaining,
+                'status' => $remaining === 0 ? $releasedStatus : StockReservation::STATUS_ACTIVE,
+                'released_at' => $remaining === 0 ? now() : null,
+                'expires_at' => $remaining === 0 ? null : $reservation->expires_at,
+            ]);
         }
     }
 
-    private function assertUsableCartReservation(StockReservation $reservation): void
+    private function lockReservation(CartItem $cartItem, int $inventoryId): ?StockReservation
     {
-        if ($reservation->status === StockReservation::STATUS_EXPIRED
-            || ($reservation->expires_at !== null && ! $reservation->expires_at->isFuture())) {
-            throw new StockReservationExpiredException;
-        }
-
-        if ($reservation->status !== StockReservation::STATUS_ACTIVE
-            || $reservation->expires_at === null) {
-            throw new \InvalidArgumentException('La reserva de stock no está disponible para operar el carrito.');
-        }
+        return StockReservation::query()
+            ->where('cart_item_id', $cartItem->getKey())
+            ->where('inventory_id', $inventoryId)
+            ->lockForUpdate()
+            ->first();
     }
 
     private function expiration(): Carbon

app/Domains/Catalog/Services/VariantSelectionService.php

@@ -10,6 +10,10 @@ use Illuminate\Support\Collection;
 
 class VariantSelectionService
 {
+    public function __construct(
+        private readonly CatalogItemAllowanceService $allowances,
+    ) {}
+
     /**
      * @param  array<string, mixed>  $selectedValues
      * @return array<string, mixed>
@@ -188,13 +192,17 @@ class VariantSelectionService
     /** @return array<string, mixed> */
     private function variantData(CatalogItem $catalogItem, Variant $variant): array
     {
+        $availableStock = $catalogItem->inventory_policy === InventoryPolicy::Unlimited
+            ? null
+            : $variant->inventory?->availableStock();
+
         return [
             'id' => $variant->id,
             'descripcion' => $variant->getDescription(),
             'precio' => number_format($variant->getPrice(), 2, '.', ''),
-            'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
-                ? null
-                : $variant->inventory?->availableStock(),
+            'availability' => $this->allowances
+                ->availability($availableStock, null)
+                ->toArray(),
             'values' => $variant->selectorOptions($catalogItem->itemAttributes),
         ];
     }

app/Domains/Catalog/Services/VisibleCatalogItemsQuery.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Enums\AvailabilityEffect;
+use App\Domains\Catalog\Enums\CatalogItemType;
+use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\CatalogItem;
+use Illuminate\Database\Eloquent\Builder;
+
+final class VisibleCatalogItemsQuery
+{
+    public function __construct(
+        private readonly AvailabilityPolicyResolver $policies,
+    ) {}
+
+    /** @param Builder<CatalogItem> $query */
+    public function apply(Builder $query): Builder
+    {
+        if ($this->policies->resolve('out_of_stock')['effect'] !== AvailabilityEffect::Hide) {
+            return $query;
+        }
+
+        return $query->where(function (Builder $query): void {
+            $query
+                ->where(fn (Builder $query) => $this->applyStandardItemAvailability($query))
+                ->orWhere(fn (Builder $query) => $this->applyBundleAvailability($query));
+        });
+    }
+
+    /** @param Builder<CatalogItem> $query */
+    private function applyStandardItemAvailability(Builder $query): Builder
+    {
+        return $query
+            ->where('catalog_items.type', CatalogItemType::Standard->value)
+            ->where(function (Builder $query): void {
+                $query
+                    ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
+                    ->orWhereHas(
+                        'inventory',
+                        fn (Builder $query): Builder => $query
+                            ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock'),
+                    )
+                    ->orWhereHas(
+                        'variants.inventory',
+                        fn (Builder $query): Builder => $query
+                            ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock'),
+                    );
+            });
+    }
+
+    /** @param Builder<CatalogItem> $query */
+    private function applyBundleAvailability(Builder $query): Builder
+    {
+        return $query
+            ->where('catalog_items.type', CatalogItemType::Bundle->value)
+            ->whereRaw(<<<'SQL'
+                NOT EXISTS (
+                    SELECT 1
+                    FROM bundle_components AS availability_components
+                    INNER JOIN catalog_items AS availability_items
+                        ON availability_items.id = availability_components.component_catalog_item_id
+                    LEFT JOIN variantes AS availability_variants
+                        ON availability_variants.id = availability_components.component_variant_id
+                    INNER JOIN inventories AS availability_inventories
+                        ON availability_inventories.id = COALESCE(
+                            availability_variants.inventory_id,
+                            availability_items.inventory_id
+                        )
+                    WHERE availability_components.bundle_catalog_item_id = catalog_items.id
+                        AND availability_items.inventory_policy = ?
+                    GROUP BY availability_inventories.id,
+                        availability_inventories.real_stock,
+                        availability_inventories.reserved_stock
+                    HAVING availability_inventories.real_stock
+                        - availability_inventories.reserved_stock
+                        < SUM(availability_components.quantity)
+                )
+                SQL, [InventoryPolicy::Tracked->value]);
+    }
+}

app/Domains/Catalog/documentacion/README.md

@@ -9,7 +9,7 @@ Modela y publica la oferta comercial del tenant: productos, variantes, categorí
 - `CatalogItem` es la raíz del producto y se relaciona con tenant, categoría, marca, inventario, variantes, atributos, adjuntos y grupos destacados.
 - `Variant`, `ItemAttribute`, `Attribute`, `AttributeOption` y `VariantDefinition` describen opciones comercializables.
 - `Inventory` administra stock disponible, reservado y comprado.
-- `StockReservation` representa la reserva completa de un carrito o checkout, con estados `active`, `committed`, `released` y `expired`. Su `expires_at` es el único reloj del bloqueo. Al expirar, también pasan a `expired` la compra pagable y el carrito asociados dentro de la misma transacción. Sus estados terminales nunca se reactivan ni se reemplazan implícitamente. Sus `StockReservationLine` agregan la cantidad requerida por inventario, incluso cuando varios ítems o bundles consumen el mismo stock.
+- `StockReservation` atribuye cada unidad reservada a un ítem de carrito y, durante checkout, a una compra, con estados `active`, `committed`, `released` y `expired`.
 - `Category` soporta jerarquía y categorías globales o propias del tenant.
 - `FeaturedGroup` y `FeaturedItem` organizan secciones destacadas.
 - `BundleComponent` representa los componentes de un paquete.
@@ -18,8 +18,7 @@ Modela y publica la oferta comercial del tenant: productos, variantes, categorí
 
 - `CatalogService`: alta, búsqueda, detalle, listado por categoría y eliminación.
 - `CatalogInventoryService`: consulta, reserva, libera y confirma inventario.
-- `StockReservationService`: sincroniza el carrito como conjunto, bloquea todos sus inventarios en orden estable y mantiene el ledger agregado consistente con `Inventory.reserved_stock`.
-- `ExpireStockReservationsService`: detecta en un único recorrido reservas vencidas de compras, carritos y huérfanas, y delega los efectos comerciales sin mezclar esas reglas con la liberación física del inventario.
+- `StockReservationService`: mantiene el ledger de reservas sincronizado con `Inventory.reserved_stock`.
 - `FeaturedGroupService`: pagina los ítems destacados para la tienda.
 - `OnTicketFeaturedGroupService`: administra grupos destacados del panel para sitios de tickets.
 

app/Domains/Desfile/Services/InvitationPurchaseProvisioner.php

@@ -144,6 +144,7 @@ class InvitationPurchaseProvisioner
         if ($purchaseId !== null) {
             DB::table('compras')->where('id', $purchaseId)->update([
                 'status' => 'paid',
+                'expires_at' => null,
                 'total' => 0,
                 'updated_at' => $now,
             ]);
@@ -157,6 +158,7 @@ class InvitationPurchaseProvisioner
             'cart_id' => null,
             'status' => 'paid',
             'payment_method' => self::PAYMENT_METHOD,
+            'expires_at' => null,
             'total' => 0,
             'dni' => null,
             'transfer_payer_dni' => null,
@@ -390,27 +392,15 @@ class InvitationPurchaseProvisioner
             'sold_units' => $inventory->sold_units + 1,
         ]);
 
-        $reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
-        if ($reservationId === null) {
-            $reservationId = DB::table('stock_reservations')->insertGetId([
-                'status' => 'committed',
-                'committed_at' => $now,
-                'released_at' => null,
-                'expired_at' => null,
-                'release_reason' => null,
-                'created_at' => $now,
-                'updated_at' => $now,
-            ]);
-            DB::table('compras')->where('id', $purchaseId)->update([
-                'stock_reservation_id' => $reservationId,
-            ]);
-        }
-
-        DB::table('stock_reservation_lines')->insert([
-            'stock_reservation_id' => $reservationId,
+        DB::table('stock_reservations')->insert([
             'inventory_id' => $inventory->id,
+            'cart_item_id' => null,
+            'purchase_id' => $purchaseId,
             'quantity' => 1,
-            'tracks_inventory' => true,
+            'status' => 'committed',
+            'expires_at' => null,
+            'committed_at' => $now,
+            'released_at' => null,
             'created_at' => $now,
             'updated_at' => $now,
         ]);

app/Domains/Integration/Services/MailService.php

@@ -3,8 +3,6 @@
 namespace App\Domains\Integration\Services;
 
 use App\Domains\Client\Models\Client;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\WebsiteType;
 use Exception;
 use Illuminate\Contracts\Mail\Factory as MailFactory;
 use Illuminate\Contracts\Mail\Mailer;
@@ -72,35 +70,24 @@ class MailService extends BaseIntegrationService
         return [];
     }
 
-    /**
-     * @param  array<int, array{data: string, name: string, mime: string}>  $attachments
-     */
-    public function send(
-        string|array $recipient,
-        string $subject,
-        string $content,
-        Tenant|WebsiteType|null $brand = null,
-        array $attachments = [],
-    ): void {
+    public function send(string|array $recipient, string $subject, string $content): void
+    {
         if (! $this->mailer || ! $this->tenant) {
             throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
         }
 
-        $brand ??= $this->tenant;
-        $branding = $this->brandingFor($brand);
+        $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
 
         $html = Blade::render(
             <<<'BLADE'
-                <x-mail.branded-layout :branding="$branding" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
+                <x-mail.branded-layout :tenant="$tenant" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
                     {!! $content !!}
                 </x-mail.branded-layout>
                 BLADE,
             [
-                'branding' => $branding,
-                'headerLogoUrl' => $brand instanceof WebsiteType
-                    ? $brand->siteLogo?->getTemporaryUrl(1440)
-                    : $brand->headerLogo?->getTemporaryUrl(1440),
-                'footerLogoUrl' => $brand->footerLogo?->getTemporaryUrl(1440),
+                'tenant' => $this->tenant,
+                'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
+                'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
                 'content' => $content,
             ],
         );
@@ -109,14 +96,6 @@ class MailService extends BaseIntegrationService
             ->subject($subject)
             ->html($html);
 
-        foreach ($attachments as $attachment) {
-            $mail->attachData(
-                $attachment['data'],
-                $attachment['name'],
-                ['mime' => $attachment['mime']],
-            );
-        }
-
         $this->mailer->to($recipient)->send($mail);
     }
 
@@ -127,36 +106,6 @@ class MailService extends BaseIntegrationService
             : (string) config('mail.default');
     }
 
-    /** @return array{name: string, primary_color: string, body_color: string, background_color: string, surface_color: string, header_bg_color: string, footer_bg_color: string} */
-    private function brandingFor(Tenant|WebsiteType $brand): array
-    {
-        if ($brand instanceof WebsiteType) {
-            $brand->loadMissing(['siteLogo', 'footerLogo']);
-
-            return [
-                'name' => $brand->nombre,
-                'primary_color' => $brand->primary_color ?? '#FF7006',
-                'body_color' => $brand->body_color ?? '#666666',
-                'background_color' => $brand->background_color ?? '#f8f8f8',
-                'surface_color' => $brand->surface_color ?? '#ffffff',
-                'header_bg_color' => $brand->surface_color ?? '#ffffff',
-                'footer_bg_color' => $brand->login_header_footer_color ?? '#838383',
-            ];
-        }
-
-        $brand->loadMissing(['headerLogo', 'footerLogo']);
-
-        return [
-            'name' => $brand->nombre,
-            'primary_color' => $brand->primary_color ?? '#6376f3',
-            'body_color' => '#334155',
-            'background_color' => '#f1f5f9',
-            'surface_color' => '#ffffff',
-            'header_bg_color' => $brand->header_bg_color ?? '#ffffff',
-            'footer_bg_color' => $brand->footer_bg_color ?? '#334155',
-        ];
-    }
-
     public function onSetup(): void
     {
         if (! $this->mailer || ! $this->clientContext) {

app/Domains/MailTest/Mailables/TestMail.php

@@ -28,21 +28,10 @@ class TestMail extends Mailable
     {
         $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
 
-        $branding = [
-            'name' => $this->tenant->nombre,
-            'primary_color' => $this->tenant->primary_color ?? '#6376f3',
-            'body_color' => '#334155',
-            'background_color' => '#f1f5f9',
-            'surface_color' => '#ffffff',
-            'header_bg_color' => $this->tenant->header_bg_color ?? '#ffffff',
-            'footer_bg_color' => $this->tenant->footer_bg_color ?? '#334155',
-        ];
-
         return new Content(
             view: 'mail.test',
             with: [
                 'tenant' => $this->tenant,
-                'branding' => $branding,
                 'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
                 'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
             ],

app/Domains/Notification/Events/TicketsAvailable.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Domains\Notification\Events;
+
+use App\Domains\Purchase\Models\Purchase;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class TicketsAvailable
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * @param  array<int, int>  $ticketIds
+     */
+    public function __construct(
+        public readonly Purchase $purchase,
+        public readonly array $ticketIds,
+    ) {}
+}

app/Domains/Notification/Listeners/SendPasswordResetEmail.php

@@ -6,6 +6,8 @@ use App\Domains\Notification\Events\PasswordResetRequested;
 use App\Domains\Notification\Services\NotificationMailService;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
+use Throwable;
 
 class SendPasswordResetEmail implements ShouldQueueAfterCommit
 {
@@ -20,10 +22,21 @@ class SendPasswordResetEmail implements ShouldQueueAfterCommit
 
     public function handle(PasswordResetRequested $event): void
     {
-        app(NotificationMailService::class)->sendPasswordResetCode(
-            $event->attemptId,
-            $event->tenantCode,
-            $event->channel,
-        );
+        try {
+            app(NotificationMailService::class)->sendPasswordResetCode(
+                $event->attemptId,
+                $event->tenantCode,
+                $event->channel,
+            );
+        } catch (Throwable $exception) {
+            Log::error('Failed to send password reset email.', [
+                'attempt_id' => $event->attemptId,
+                'tenant_code' => $event->tenantCode,
+                'channel' => $event->channel,
+                'exception' => $exception,
+            ]);
+
+            throw $exception;
+        }
     }
 }

app/Domains/Notification/Listeners/SendPurchasePaidEmail.php

@@ -7,7 +7,7 @@ use App\Domains\Purchase\Events\PurchasePaid;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
 
-class SendPurchaseConfirmedEmail implements ShouldQueueAfterCommit
+class SendPurchasePaidEmail implements ShouldQueueAfterCommit
 {
     use InteractsWithQueue;
 
@@ -20,6 +20,6 @@ class SendPurchaseConfirmedEmail implements ShouldQueueAfterCommit
 
     public function handle(PurchasePaid $event): void
     {
-        app(NotificationMailService::class)->sendPurchaseConfirmed($event->purchaseId);
+        app(NotificationMailService::class)->sendPurchasePaid($event->purchase->getKey());
     }
 }

app/Domains/Notification/Listeners/SendTicketsAvailableEmail.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Domains\Notification\Listeners;
+
+use App\Domains\Notification\Events\TicketsAvailable;
+use App\Domains\Notification\Services\NotificationMailService;
+use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
+use Illuminate\Queue\InteractsWithQueue;
+
+class SendTicketsAvailableEmail implements ShouldQueueAfterCommit
+{
+    use InteractsWithQueue;
+
+    public string $queue = 'emails';
+
+    public int $tries = 3;
+
+    /** @var array<int, int> */
+    public array $backoff = [30, 120, 300];
+
+    public function handle(TicketsAvailable $event): void
+    {
+        app(NotificationMailService::class)->sendTicketsAvailable($event->purchase->getKey(), $event->ticketIds);
+    }
+}

app/Domains/Notification/Services/NotificationMailService.php

@@ -9,43 +9,28 @@ use App\Domains\Notification\Events\PasswordResetRequested;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\TicketPdfService;
 use App\Domains\Ticket\Services\TicketPresentationResolver;
-use Closure;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
-use Throwable;
 
 class NotificationMailService
 {
     public function __construct(
         private readonly MailService $mailService,
-        private readonly TicketPdfService $ticketPdfService,
     ) {}
 
     public function sendWelcome(int $userId, string $tenantCode): void
     {
-        $this->sendLogged('welcome', [
-            'user_id' => $userId,
-            'tenant_code' => $tenantCode,
-        ], function () use ($userId, $tenantCode): array {
-            $tenant = Tenant::query()->with('websiteType')->where('codigo', $tenantCode)->firstOrFail();
-            $user = User::query()->findOrFail($userId);
-            $brand = $tenant->websiteType ?? $tenant;
+        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
+        $user = User::query()->findOrFail($userId);
 
-            $this->mailService
-                ->forTenant($tenantCode)
-                ->send(
-                    $user->email,
-                    "Bienvenido a {$brand->nombre}",
-                    view('mail.notifications.welcome', compact('brand', 'user'))->render(),
-                    $brand,
-                );
-
-            return [
-                'brand_type' => $tenant->websiteType === null ? 'tenant' : 'website_type',
-            ];
-        });
+        $this->mailService
+            ->forTenant($tenantCode)
+            ->send(
+                $user->email,
+                "Bienvenido a {$tenant->nombre}",
+                view('mail.notifications.welcome', compact('tenant', 'user'))->render(),
+            );
     }
 
     public function sendPasswordResetCode(
@@ -53,161 +38,95 @@ class NotificationMailService
         string $tenantCode,
         string $channel = PasswordResetRequested::CHANNEL_STOREFRONT,
     ): void {
-        $context = [
-            'attempt_id' => $attemptId,
-            'tenant_code' => $tenantCode,
-            'channel' => $channel,
-        ];
+        $tenant = Tenant::query()
+            ->with('websiteType')
+            ->where('codigo', $tenantCode)
+            ->firstOrFail();
+        $attempt = ResetPasswordAttempt::query()
+            ->with('user')
+            ->findOrFail($attemptId);
 
-        $this->sendLogged('password_reset', $context, function () use ($attemptId, $tenantCode, $channel, $context): ?array {
-            $tenant = Tenant::query()
-                ->with('websiteType')
-                ->where('codigo', $tenantCode)
-                ->firstOrFail();
-            $attempt = ResetPasswordAttempt::query()
-                ->with('user')
-                ->findOrFail($attemptId);
+        if ($attempt->status !== ResetPasswordAttempt::STATUS_PENDING) {
+            Log::warning('Password reset email was skipped because the attempt is no longer pending.', [
+                'attempt_id' => $attemptId,
+                'tenant_code' => $tenantCode,
+                'attempt_status' => $attempt->status,
+            ]);
 
-            if ($attempt->status !== ResetPasswordAttempt::STATUS_PENDING) {
-                $this->logSkipped('password_reset', array_merge($context, [
-                    'reason' => 'attempt_not_pending',
-                    'attempt_status' => $attempt->status,
-                    'user_id' => $attempt->user_id,
-                ]));
+            return;
+        }
 
-                return null;
-            }
+        $recoveryDomain = match ($channel) {
+            PasswordResetRequested::CHANNEL_ADMINAPP => $tenant->websiteType?->dominio,
+            PasswordResetRequested::CHANNEL_SCANNER => $tenant->websiteType?->scanner_domain,
+            default => $tenant->dominio,
+        };
+        $recoveryBasePath = $channel === PasswordResetRequested::CHANNEL_STOREFRONT
+            && $tenant->base_path !== '/'
+                ? $tenant->base_path
+                : '';
+        $recoveryQuery = ['email' => $attempt->user->email];
+        if (
+            $channel === PasswordResetRequested::CHANNEL_SCANNER
+            && $attempt->reason === ResetPasswordAttempt::REASON_STAFF_CREATED
+        ) {
+            $recoveryQuery['code'] = $attempt->codigo;
+        }
+        $recoveryUrl = $recoveryDomain === null
+            ? null
+            : 'https://'.$recoveryDomain.$recoveryBasePath.'/recuperar-contrasena/codigo?'.http_build_query($recoveryQuery);
 
-            $recoveryDomain = match ($channel) {
-                PasswordResetRequested::CHANNEL_ADMINAPP => $tenant->websiteType?->dominio,
-                PasswordResetRequested::CHANNEL_SCANNER => $tenant->websiteType?->scanner_domain,
-                default => $tenant->dominio,
-            };
-            $recoveryBasePath = $channel === PasswordResetRequested::CHANNEL_STOREFRONT
-                && $tenant->base_path !== '/'
-                    ? $tenant->base_path
-                    : '';
-            $recoveryQuery = ['email' => $attempt->user->email];
-            if (
-                $channel === PasswordResetRequested::CHANNEL_SCANNER
-                && $attempt->reason === ResetPasswordAttempt::REASON_STAFF_CREATED
-            ) {
-                $recoveryQuery['code'] = $attempt->codigo;
-            }
-            $recoveryUrl = $recoveryDomain === null
-                ? null
-                : 'https://'.$recoveryDomain.$recoveryBasePath.'/recuperar-contrasena/codigo?'.http_build_query($recoveryQuery);
-            $brand = $tenant->websiteType ?? $tenant;
-
-            $this->mailService
-                ->forTenant($tenantCode)
-                ->send(
-                    $attempt->user->email,
-                    "Código para recuperar tu contraseña - {$brand->nombre}",
-                    view('mail.notifications.password-reset', [
-                        'attempt' => $attempt,
-                        'recoveryUrl' => $recoveryUrl,
-                        'brand' => $brand,
-                    ])->render(),
-                    $brand,
-                );
-
-            return [
-                'user_id' => $attempt->user_id,
-                'recovery_domain_available' => $recoveryDomain !== null,
-            ];
-        });
+        $this->mailService
+            ->forTenant($tenantCode)
+            ->send(
+                $attempt->user->email,
+                "Código para recuperar tu contraseña - {$tenant->nombre}",
+                view('mail.notifications.password-reset', compact('tenant', 'attempt', 'recoveryUrl'))->render(),
+            );
     }
 
-    public function sendPurchaseConfirmed(int $purchaseId): void
+    public function sendPurchasePaid(int $purchaseId): void
     {
-        $context = ['purchase_id' => $purchaseId];
+        $purchase = Purchase::query()
+            ->with(['tenant', 'user', 'items'])
+            ->findOrFail($purchaseId);
 
-        $this->sendLogged('purchase_confirmed', $context, function () use ($purchaseId, $context): ?array {
-            $purchase = Purchase::query()
-                ->with(['tenant', 'user', 'items'])
-                ->find($purchaseId);
+        $this->mailService
+            ->forTenant($purchase->tenant_codigo)
+            ->send(
+                $this->recipientFor($purchase),
+                "Pago confirmado - Compra #{$purchase->getKey()}",
+                view('mail.notifications.purchase-paid', compact('purchase'))->render(),
+            );
+    }
 
-            if ($purchase === null) {
-                $this->logSkipped('purchase_confirmed', array_merge($context, [
-                    'reason' => 'purchase_not_found',
-                    'missing_model' => Purchase::class,
-                ]));
+    /** @param array<int, int> $ticketIds */
+    public function sendTicketsAvailable(int $purchaseId, array $ticketIds): void
+    {
+        $purchase = Purchase::query()->with(['tenant', 'user'])->findOrFail($purchaseId);
+        /** @var Collection<int, Ticket> $tickets */
+        $tickets = Ticket::query()
+            ->where('tenant_code', $purchase->tenant_codigo)
+            ->where('user_id', $purchase->user_id)
+            ->whereKey($ticketIds)
+            ->with(TicketPresentationResolver::RELATIONS)
+            ->get();
 
-                return null;
-            }
+        if ($tickets->isEmpty()) {
+            return;
+        }
 
-            /** @var Collection<int, Ticket> $tickets */
-            $tickets = Ticket::query()
-                ->where('source_purchase_id', $purchase->getKey())
-                ->where('tenant_code', $purchase->tenant_codigo)
-                ->with(TicketPresentationResolver::RELATIONS)
-                ->get();
-            $attachments = $tickets->isEmpty()
-                ? []
-                : [[
-                    'data' => $this->ticketPdfService->contents($purchase->tenant, $tickets),
-                    'name' => $this->ticketPdfService->filename($tickets),
-                    'mime' => 'application/pdf',
-                ]];
-
-            $this->mailService
-                ->forTenant($purchase->tenant_codigo)
-                ->send(
-                    $this->recipientFor($purchase),
-                    "Compra confirmada - Compra #{$purchase->getKey()}",
-                    view('mail.notifications.purchase-confirmed', compact('purchase', 'tickets'))->render(),
-                    attachments: $attachments,
-                );
-
-            return [
-                'tenant_code' => $purchase->tenant_codigo,
-                'user_id' => $purchase->user_id,
-                'purchase_status' => $purchase->status,
-                'purchase_item_count' => $purchase->items->count(),
-                'ticket_count' => $tickets->count(),
-                'ticket_ids' => $tickets->modelKeys(),
-            ];
-        });
+        $this->mailService
+            ->forTenant($purchase->tenant_codigo)
+            ->send(
+                $this->recipientFor($purchase),
+                'Tus tickets ya están disponibles',
+                view('mail.notifications.tickets-available', compact('purchase', 'tickets'))->render(),
+            );
     }
 
     private function recipientFor(Purchase $purchase): string
     {
         return (string) ($purchase->email ?: $purchase->user?->email);
     }
-
-    /**
-     * @param  array<string, mixed>  $context
-     * @param  Closure(): (array<string, mixed>|null)  $send
-     */
-    private function sendLogged(string $emailType, array $context, Closure $send): void
-    {
-        try {
-            $resultContext = $send();
-
-            if ($resultContext === null) {
-                return;
-            }
-
-            Log::channel('emails')->info('Notification email sent.', array_merge($context, $resultContext, [
-                'email_type' => $emailType,
-                'mailer' => $this->mailService->mailerName(),
-            ]));
-        } catch (Throwable $exception) {
-            Log::channel('emails')->error('Notification email delivery failed.', array_merge($context, [
-                'email_type' => $emailType,
-                'exception' => $exception,
-            ]));
-
-            throw $exception;
-        }
-    }
-
-    /** @param array<string, mixed> $context */
-    private function logSkipped(string $emailType, array $context): void
-    {
-        Log::channel('emails')->warning('Notification email skipped.', array_merge($context, [
-            'email_type' => $emailType,
-        ]));
-    }
 }

app/Domains/Notification/documentacion/README.md

@@ -8,11 +8,12 @@ Orquesta notificaciones de negocio por correo a partir de eventos de otros domin
 
 - `UserRegistered`: dispara el correo de bienvenida.
 - `PasswordResetRequested`: envía el código de recuperación si el intento sigue pendiente.
-- `PurchasePaid`: envía la confirmación de compra y adjunta los tickets generados, cuando corresponde.
+- `PurchasePaid`: envía la confirmación de pago.
+- `TicketsAvailable`: informa y entrega la disponibilidad de tickets.
 
 ## Componentes
 
-Los listeners `SendWelcomeEmail`, `SendPasswordResetEmail` y `SendPurchaseConfirmedEmail` delegan en `NotificationMailService`. Este servicio carga el contexto necesario, renderiza las vistas y envía mediante `Integration/MailService`.
+Los listeners `SendWelcomeEmail`, `SendPasswordResetEmail`, `SendPurchasePaidEmail` y `SendTicketsAvailableEmail` delegan en `NotificationMailService`. Este servicio carga el contexto necesario, renderiza las vistas y envía mediante `Integration/MailService`.
 
 ## API y dependencias
 
@@ -22,6 +23,4 @@ No expone rutas HTTP. Consume datos de `Auth`, `Tenant`, `Purchase` y `Ticket`,
 
 - Los listeners reciben identificadores y vuelven a cargar los modelos, evitando transportar entidades obsoletas.
 - La recuperación no se envía si el intento dejó de estar pendiente.
-- Los correos de cuenta (bienvenida y recuperación de contraseña) usan la identidad visual del `WebsiteType` asociado al tenant, con fallback al tenant si no tiene uno configurado.
-- El correo transaccional de compra confirmada usa la identidad visual del tenant y adjunta un único PDF cuando la compra generó tickets.
 - Los handlers deben permanecer idempotentes o tolerantes a reintentos de cola.

app/Domains/Purchase/Controllers/PurchaseController.php

@@ -36,7 +36,6 @@ class PurchaseController extends Controller
 
         return PurchaseResource::collection(
             Purchase::query()
-                ->with('stockReservation')
                 ->where('tenant_codigo', $tenant->codigo)
                 ->where('user_id', $request->user()->id)
                 ->when($statuses !== [], fn ($query) => $query->whereIn('status', $statuses))
@@ -93,6 +92,7 @@ class PurchaseController extends Controller
         PaymentIntentRequest $request,
         Tenant $tenant,
         Purchase $compra,
+        CheckoutService $checkoutService,
         PurchaseStateGuard $purchaseState,
     ): JsonResponse {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
@@ -101,12 +101,7 @@ class PurchaseController extends Controller
             ? preg_replace('/\D+/', '', (string) $request->validated('transfer_payer_dni'))
             : null;
 
-        $updated = DB::transaction(function () use (
-            $compra,
-            $method,
-            $purchaseState,
-            $transferPayerDni,
-        ): bool {
+        $updated = DB::transaction(function () use ($compra, $method, $purchaseState, $transferPayerDni): bool {
             /** @var Purchase|null $purchase */
             $purchase = Purchase::query()
                 ->whereKey($compra->getKey())
@@ -133,6 +128,9 @@ class PurchaseController extends Controller
             $purchaseUpdate = [
                 'payment_method' => $method,
                 'status' => Purchase::STATUS_PENDING_PAYMENT,
+                'expires_at' => now()->addMinutes(
+                    max(1, (int) config("purchase.payment_expiration_minutes.{$method}", 30))
+                ),
                 'total' => $purchase->calculateCurrentTotalAmount(),
             ];
 
@@ -152,6 +150,7 @@ class PurchaseController extends Controller
 
         $compra->refresh();
         $totalAmount = (float) $compra->total;
+        $checkoutService->syncReservationExpiration($compra);
 
         if ($method === 'transfer') {
             $telepagosService = new TelepagosIntegrationService;

app/Domains/Purchase/Events/PurchasePaid.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\Purchase\Events;
 
+use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -9,5 +10,5 @@ class PurchasePaid
 {
     use Dispatchable, SerializesModels;
 
-    public function __construct(public readonly int $purchaseId) {}
+    public function __construct(public readonly Purchase $purchase) {}
 }

app/Domains/Purchase/Models/Purchase.php

@@ -19,11 +19,11 @@ use Illuminate\Support\Facades\DB;
 
 #[Fillable([
     'cart_id',
-    'stock_reservation_id',
     'tenant_codigo',
     'user_id',
     'status',
     'payment_method',
+    'expires_at',
     'total',
     'dni',
     'transfer_payer_dni',
@@ -77,8 +77,8 @@ class Purchase extends Model
     {
         return [
             'cart_id' => 'integer',
-            'stock_reservation_id' => 'integer',
             'user_id' => 'integer',
+            'expires_at' => 'datetime',
             'total' => 'decimal:2',
         ];
     }
@@ -123,10 +123,10 @@ class Purchase extends Model
         return $this->hasMany(Ticket::class, 'source_purchase_id');
     }
 
-    /** @return BelongsTo<StockReservation, $this> */
-    public function stockReservation(): BelongsTo
+    /** @return HasMany<StockReservation, $this> */
+    public function stockReservations(): HasMany
     {
-        return $this->belongsTo(StockReservation::class);
+        return $this->hasMany(StockReservation::class);
     }
 
     /**
@@ -193,7 +193,7 @@ class Purchase extends Model
                 'status' => self::STATUS_PAID,
             ]);
 
-            PurchasePaid::dispatch($this->getKey());
+            PurchasePaid::dispatch($this);
         });
     }
 }

app/Domains/Purchase/Resources/PurchaseResource.php

@@ -17,8 +17,6 @@ class PurchaseResource extends JsonResource
      */
     public function toArray(Request $request): array
     {
-        $serverTime = now();
-        $expiresAt = $this->stockReservation?->expires_at;
         $items = $this->resource->relationLoaded('items')
             ? $this->resource->getRelation('items')
             : collect();
@@ -50,11 +48,7 @@ class PurchaseResource extends JsonResource
             'created_at' => $this->created_at,
             'status' => $this->status,
             'payment_method' => $this->payment_method,
-            'expires_at' => $expiresAt,
-            'expires_in_seconds' => $expiresAt === null
-                ? null
-                : max(0, $expiresAt->getTimestamp() - $serverTime->getTimestamp()),
-            'server_time' => $serverTime,
+            'expires_at' => $this->expires_at,
             'dni' => $this->dni,
             'transfer_payer_dni' => $this->transfer_payer_dni,
             'telefono' => $this->telefono,

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

@@ -61,7 +61,10 @@ class CompleteCheckoutService
 
             $this->purchaseState->lockCurrentCart($purchase);
 
-            if ($purchase->status !== Purchase::STATUS_PENDING_PAYMENT) {
+            if (
+                $purchase->status !== Purchase::STATUS_PENDING_PAYMENT
+                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
+            ) {
                 throw ValidationException::withMessages([
                     'purchase' => __('api.purchase.not_available_for_review'),
                 ]);
@@ -69,8 +72,9 @@ class CompleteCheckoutService
 
             $purchase->update([
                 'status' => Purchase::STATUS_IN_REVIEW,
+                'expires_at' => null,
             ]);
-            $this->reservations->clearExpirationForReview($purchase);
+            $this->reservations->syncPurchaseExpiration($purchase);
 
             return $this->loadPurchase($purchase);
         });
@@ -157,14 +161,13 @@ class CompleteCheckoutService
                     ]);
                 }
 
-            }
-
-            try {
-                $this->reservations->commit($purchase);
-            } catch (\InvalidArgumentException) {
-                throw ValidationException::withMessages([
-                    'items' => __('api.purchase.inconsistent_reservation'),
-                ]);
+                try {
+                    $this->reservations->commit($cartItem, $selection, $purchase);
+                } catch (\InvalidArgumentException) {
+                    throw ValidationException::withMessages([
+                        'items' => __('api.purchase.inconsistent_reservation'),
+                    ]);
+                }
             }
 
             $this->sourceCart->finalize($purchase);
@@ -191,7 +194,7 @@ class CompleteCheckoutService
 
     private function loadPurchase(Purchase $purchase): Purchase
     {
-        return $purchase->load(['items.imageAttachment', 'stockReservation']);
+        return $purchase->load(['items.imageAttachment']);
     }
 
     private function itemKey(int $catalogItemId, ?int $variantId): string

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

@@ -8,6 +8,6 @@ class PurchaseResponseLoader
 {
     public function load(Purchase $purchase): Purchase
     {
-        return $purchase->load(['tenant', 'items.imageAttachment', 'stockReservation']);
+        return $purchase->load(['tenant', 'items.imageAttachment']);
     }
 }

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

@@ -5,10 +5,11 @@ namespace App\Domains\Purchase\Services\Checkout;
 use App\Domains\Cart\Models\Cart;
 use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
 use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
+use Throwable;
 
 class ReleaseCheckoutService
 {
@@ -31,6 +32,40 @@ class ReleaseCheckoutService
         return $this->release($purchase, Purchase::STATUS_EXPIRED);
     }
 
+    public function expireOverdue(): int
+    {
+        $expiredCount = 0;
+
+        Purchase::query()
+            ->whereIn('status', [Purchase::STATUS_CREATED, Purchase::STATUS_PENDING_PAYMENT])
+            ->whereNotNull('expires_at')
+            ->where('expires_at', '<=', now())
+            ->orderBy('id')
+            ->eachById(function (Purchase $purchase) use (&$expiredCount): void {
+                try {
+                    $purchase = $this->expire($purchase);
+                } catch (Throwable $exception) {
+                    Log::channel('commands')->error('Failed to expire overdue purchase.', [
+                        'command' => 'reservations:expire',
+                        'purchase_id' => $purchase->getKey(),
+                        'tenant_codigo' => $purchase->tenant_codigo,
+                        'cart_id' => $purchase->cart_id,
+                        'status' => $purchase->status,
+                        'expires_at' => $purchase->expires_at,
+                        'exception' => $exception,
+                    ]);
+
+                    return;
+                }
+
+                if ($purchase->status === Purchase::STATUS_EXPIRED) {
+                    $expiredCount++;
+                }
+            });
+
+        return $expiredCount;
+    }
+
     private function release(
         Purchase $purchase,
         string $targetStatus,
@@ -43,11 +78,6 @@ class ReleaseCheckoutService
         ): Purchase {
             $purchase = $this->lockPurchase($purchase);
 
-            if ($purchase->status === Purchase::STATUS_EXPIRED
-                && $targetStatus !== Purchase::STATUS_EXPIRED) {
-                throw new PurchaseExpiredException;
-            }
-
             if ($purchase->status === Purchase::STATUS_PAID) {
                 if ($targetStatus === Purchase::STATUS_EXPIRED) {
                     return $this->loadPurchase($purchase);
@@ -70,31 +100,14 @@ class ReleaseCheckoutService
                 return $this->loadPurchase($purchase);
             }
 
-            $cart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
-
-            if ($targetStatus === Purchase::STATUS_CANCELLED
-                && $cart?->status === 'active'
-                && in_array($purchase->status, [
-                    Purchase::STATUS_CREATED,
-                    Purchase::STATUS_PENDING_PAYMENT,
-                ], true)) {
-                $this->reservations->returnToCart($purchase, $cart);
-                $purchase->update(['status' => Purchase::STATUS_CANCELLED]);
-
-                return $this->loadPurchase($purchase);
-            }
-
             if (
                 $targetStatus === Purchase::STATUS_EXPIRED
-                && (! in_array($purchase->status, [
-                    Purchase::STATUS_CREATED,
-                    Purchase::STATUS_PENDING_PAYMENT,
-                ], true) || ! $this->hasOverdueActiveReservation($purchase))
+                && ($purchase->expires_at === null || $purchase->expires_at->isFuture())
             ) {
                 return $this->loadPurchase($purchase);
             }
 
-            $this->releasePurchaseReservations($purchase, $targetStatus, $cart);
+            $this->releasePurchaseReservations($purchase, $targetStatus);
 
             $purchase->update(['status' => $targetStatus]);
 
@@ -102,67 +115,60 @@ class ReleaseCheckoutService
         });
     }
 
-    private function releasePurchaseReservations(
-        Purchase $purchase,
-        string $targetStatus,
-        ?Cart $cart,
-    ): void {
-        try {
-            $this->reservations->releaseForPurchase(
-                $purchase,
-                $targetStatus === Purchase::STATUS_EXPIRED
-                    ? StockReservation::STATUS_EXPIRED
-                    : StockReservation::STATUS_RELEASED,
-                $targetStatus === Purchase::STATUS_CANCELLED
-                    ? StockReservationService::REASON_PURCHASE_CANCELLED
-                    : ($targetStatus === Purchase::STATUS_REJECTED
-                        ? StockReservationService::REASON_PAYMENT_REJECTED
-                        : null),
-            );
-        } catch (\InvalidArgumentException) {
-            throw ValidationException::withMessages([
-                'items' => __('api.purchase.inconsistent_reservation'),
-            ]);
-        }
-
+    private function releasePurchaseReservations(Purchase $purchase, string $targetStatus): void
+    {
+        $cart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
         if ($cart === null) {
             return;
         }
 
-        if ($targetStatus === Purchase::STATUS_EXPIRED
-            && in_array($cart->status, [Cart::STATUS_ACTIVE, Cart::STATUS_CHECKOUT], true)) {
+        if ($cart->status === 'active') {
+            $this->reservations->detachFromPurchase($purchase);
             Cart::query()
                 ->whereKey($cart->getKey())
                 ->where('current_purchase_id', $purchase->getKey())
-                ->where('current_stock_reservation_id', $purchase->stock_reservation_id)
-                ->update([
-                    'status' => Cart::STATUS_EXPIRED,
-                    'current_purchase_id' => null,
+                ->update(['current_purchase_id' => null]);
+
+            return;
+        }
+
+        if ($cart->status !== 'checkout') {
+            return;
+        }
+
+        $cartItems = $cart->items()->orderBy('id')->lockForUpdate()->get();
+        $cartItems->load([
+            'catalogItem.inventory',
+            'catalogItem.bundleComponents.catalogItem.inventory',
+            'catalogItem.bundleComponents.variant.inventory',
+            'variant.inventory',
+            'variant.catalogItem',
+        ]);
+
+        foreach ($cartItems as $cartItem) {
+            $selection = $cartItem->selectedItem();
+            if ($selection === null) {
+                continue;
+            }
+
+            try {
+                $this->reservations->release(
+                    $cartItem,
+                    $selection,
+                    (int) $cartItem->cantidad,
+                    $targetStatus === Purchase::STATUS_EXPIRED
+                        ? StockReservation::STATUS_EXPIRED
+                        : StockReservation::STATUS_RELEASED,
+                );
+            } catch (\InvalidArgumentException) {
+                throw ValidationException::withMessages([
+                    'items' => __('api.purchase.inconsistent_reservation'),
                 ]);
-
-            return;
-        }
-
-        if ($cart->status === Cart::STATUS_ACTIVE) {
-            $cartUpdate = [
-                'current_purchase_id' => null,
-                'current_stock_reservation_id' => null,
-            ];
-
-            Cart::query()
-                ->whereKey($cart->getKey())
-                ->where('current_purchase_id', $purchase->getKey())
-                ->update($cartUpdate);
-
-            return;
-        }
-
-        if ($cart->status !== Cart::STATUS_CHECKOUT) {
-            return;
+            }
         }
 
         if (! $cart->trashed()) {
-            $cart->update(['status' => Cart::STATUS_CONVERTED]);
+            $cart->update(['status' => 'converted']);
             $cart->delete();
         }
     }
@@ -212,17 +218,6 @@ class ReleaseCheckoutService
 
     private function loadPurchase(Purchase $purchase): Purchase
     {
-        return $purchase->load(['items.imageAttachment', 'stockReservation']);
-    }
-
-    private function hasOverdueActiveReservation(Purchase $purchase): bool
-    {
-        /** @var StockReservation|null $reservation */
-        $reservation = $purchase->stockReservation()->lockForUpdate()->first();
-
-        return $reservation !== null
-            && $reservation->status === StockReservation::STATUS_ACTIVE
-            && $reservation->expires_at !== null
-            && ! $reservation->expires_at->isFuture();
+        return $purchase->load(['items.imageAttachment']);
     }
 }

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

@@ -4,7 +4,6 @@ namespace App\Domains\Purchase\Services\Checkout;
 
 use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogInventoryService;
@@ -13,7 +12,6 @@ use App\Domains\Purchase\Exceptions\InsufficientStockException;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Services\UserPurchaseLimitService;
 use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -171,31 +169,21 @@ class StartCheckoutService
                 'cantidad' => $line['quantity'],
             ]);
 
+            try {
+                $this->reservations->reserve($cartItem, $line['selection'], $line['quantity']);
+            } catch (\InvalidArgumentException) {
+                $availableQuantity = $this->inventory->availableQuantity($line['selection']) ?? 0;
+
+                throw new InsufficientStockException([
+                    $this->unavailableItem($line, $availableQuantity),
+                ]);
+            }
+
             $cartItem->setRelation('catalogItem', $line['catalog_item']);
             $cartItem->setRelation('variant', $line['selection'] instanceof Variant ? $line['selection'] : null);
             $cartItems->push($cartItem);
         }
 
-        try {
-            $this->reservations->syncCart($cart);
-        } catch (\InvalidArgumentException) {
-            $unavailable = $resolvedLines
-                ->map(function (array $line): ?array {
-                    $availableQuantity = $this->inventory->availableQuantity($line['selection']);
-
-                    return $availableQuantity !== null && $availableQuantity < $line['quantity']
-                        ? $this->unavailableItem($line, $availableQuantity)
-                        : null;
-                })
-                ->filter()
-                ->values()
-                ->all();
-
-            throw new InsufficientStockException($unavailable !== [] ? $unavailable : [
-                $this->unavailableItem($resolvedLines->first(), 0),
-            ]);
-        }
-
         $purchase = $this->createPurchase(
             $tenant,
             $userId,
@@ -206,12 +194,19 @@ class StartCheckoutService
             $cart->getKey(),
         );
         $cart->update(['current_purchase_id' => $purchase->getKey()]);
-        $this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
 
         $cartItems = $cart->items()->orderBy('id')->lockForUpdate()->get();
         $this->loadCartItems($cartItems);
         $purchase->items()->createMany($this->snapshots->fromCartItems($cartItems));
 
+        foreach ($cartItems as $index => $cartItem) {
+            $this->reservations->attachToPurchase(
+                $cartItem,
+                $resolvedLines->get($index)['selection'],
+                $purchase,
+            );
+        }
+
         return $this->loadPurchase($purchase);
     }
 
@@ -262,7 +257,6 @@ class StartCheckoutService
         $this->verifyTenantItems($tenant, $cartItems);
         $this->assertCartPurchaseLimits($tenant, $userId, $cartItems, $cart->getKey());
         $cart->setRelation('items', $cartItems);
-        $this->reservations->syncCart($cart);
 
         $purchase = $this->createPurchase(
             $tenant,
@@ -272,9 +266,16 @@ class StartCheckoutService
             $cart->getKey(),
         );
         $cart->update(['current_purchase_id' => $purchase->getKey()]);
-        $this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
         $purchase->items()->createMany($this->snapshots->fromCartItems($cartItems));
 
+        foreach ($cartItems as $cartItem) {
+            $this->reservations->attachToPurchase(
+                $cartItem,
+                $cartItem->selectedItem(),
+                $purchase,
+            );
+        }
+
         return $this->loadPurchase($purchase);
     }
 
@@ -315,9 +316,9 @@ class StartCheckoutService
             Purchase::STATUS_CREATED,
             Purchase::STATUS_PENDING_PAYMENT,
         ], true)) {
-            $this->reservations->returnToCart($currentPurchase, $cart);
             $currentPurchase->update([
                 'status' => Purchase::STATUS_SUPERSEDED,
+                'expires_at' => null,
             ]);
         }
 
@@ -330,11 +331,7 @@ class StartCheckoutService
             throw new NotFoundHttpException('Cart not found for tenant.');
         }
 
-        if ($cart->status === Cart::STATUS_EXPIRED) {
-            throw new StockReservationExpiredException;
-        }
-
-        if ($cart->status !== Cart::STATUS_ACTIVE) {
+        if ($cart->status !== 'active') {
             throw ValidationException::withMessages([
                 'cart_id' => __('api.purchase.inactive_cart'),
             ]);
@@ -408,17 +405,13 @@ class StartCheckoutService
             'user_id' => $userId,
             'status' => Purchase::STATUS_CREATED,
             'payment_method' => null,
+            'expires_at' => now()->addMinutes(
+                max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
+            ),
             'total' => $total,
         ]);
     }
 
-    private function checkoutExpiration(): Carbon
-    {
-        return now()->addMinutes(
-            max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
-        );
-    }
-
     /** @param Collection<int, CartItem> $cartItems */
     private function loadCartItems(Collection $cartItems): void
     {

app/Domains/Purchase/Services/CheckoutService.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\Purchase\Services;
 
+use App\Domains\Catalog\Services\StockReservationService;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Services\Checkout\CompleteCheckoutService;
 use App\Domains\Purchase\Services\Checkout\EditCheckoutService;
@@ -22,6 +23,7 @@ class CheckoutService
         private readonly EditCheckoutService $editor,
         private readonly CompleteCheckoutService $completer,
         private readonly ReleaseCheckoutService $releaser,
+        private readonly StockReservationService $reservations,
     ) {}
 
     /** @param array<string, mixed> $purchaseData */
@@ -75,4 +77,14 @@ class CheckoutService
     {
         return $this->releaser->expire($purchase);
     }
+
+    public function expireOverduePurchases(): int
+    {
+        return $this->releaser->expireOverdue();
+    }
+
+    public function syncReservationExpiration(Purchase $purchase): void
+    {
+        $this->reservations->syncPurchaseExpiration($purchase);
+    }
 }

app/Domains/Purchase/Services/PurchaseStateGuard.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Purchase\Services;
 
 use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
 use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Validation\ValidationException;
@@ -12,32 +11,15 @@ class PurchaseStateGuard
 {
     public function assertNotExpired(Purchase $purchase): void
     {
-        if ($purchase->status === Purchase::STATUS_EXPIRED) {
-            throw new PurchaseExpiredException;
-        }
-
-        if (! in_array($purchase->status, [
+        $hasExpiredStatus = $purchase->status === Purchase::STATUS_EXPIRED;
+        $hasExpiredByTime = in_array($purchase->status, [
             Purchase::STATUS_CREATED,
             Purchase::STATUS_PENDING_PAYMENT,
-        ], true)) {
-            return;
-        }
+        ], true)
+            && $purchase->expires_at !== null
+            && $purchase->expires_at->isPast();
 
-        /** @var StockReservation|null $reservation */
-        $reservation = $purchase->relationLoaded('stockReservation')
-            ? $purchase->getRelation('stockReservation')
-            : ($purchase->exists
-                ? $purchase->stockReservation()->first()
-                : null);
-
-        if ($reservation !== null && (
-            $reservation->status === StockReservation::STATUS_EXPIRED
-            || (
-                $reservation->status === StockReservation::STATUS_ACTIVE
-                && $reservation->expires_at !== null
-                && ! $reservation->expires_at->isFuture()
-            )
-        )) {
+        if ($hasExpiredStatus || $hasExpiredByTime) {
             throw new PurchaseExpiredException;
         }
     }

app/Domains/Purchase/Services/TenantTransactionResetService.php

@@ -135,25 +135,11 @@ class TenantTransactionResetService
      */
     private function reservationQuery(array $scope): Builder
     {
-        $reservationIds = DB::table('carritos')
-            ->whereIn('id', $scope['cart_ids'])
-            ->whereNotNull('current_stock_reservation_id')
-            ->pluck('current_stock_reservation_id')
-            ->merge(
-                DB::table('compras')
-                    ->whereIn('id', $scope['purchase_ids'])
-                    ->whereNotNull('stock_reservation_id')
-                    ->pluck('stock_reservation_id'),
-            )
-            ->merge(
-                DB::table('stock_reservation_lines')
-                    ->whereIn('inventory_id', $scope['inventory_ids'])
-                    ->pluck('stock_reservation_id'),
-            )
-            ->unique()
-            ->values();
-
         return DB::table('stock_reservations')
-            ->whereIn('id', $reservationIds);
+            ->where(function (Builder $query) use ($scope): void {
+                $query->whereIn('inventory_id', $scope['inventory_ids'])
+                    ->orWhereIn('purchase_id', $scope['purchase_ids'])
+                    ->orWhereIn('cart_item_id', $scope['cart_item_ids']);
+            });
     }
 }

app/Domains/Purchase/Services/UserPurchaseLimitService.php

@@ -88,9 +88,9 @@ class UserPurchaseLimitService
                         $excludedCartId !== null,
                         fn ($query) => $query->whereKeyNot($excludedCartId),
                     ))
-                ->whereHas('cart.currentStockReservation', fn ($query) => $query
+                ->whereHas('stockReservations', fn ($query) => $query
                     ->where('status', 'active')
-                    ->whereDoesntHave('purchase'))
+                    ->whereNull('purchase_id'))
                 ->sum('cantidad');
 
             if ($purchasedQuantity + $checkoutQuantity + $reservedCartQuantity + $requestedQuantity > $limit) {
@@ -161,9 +161,9 @@ class UserPurchaseLimitService
             ->whereHas('cart', fn ($query) => $query
                 ->where('user_id', $userId)
                 ->where('status', 'active'))
-            ->whereHas('cart.currentStockReservation', fn ($query) => $query
+            ->whereHas('stockReservations', fn ($query) => $query
                 ->where('status', 'active')
-                ->whereDoesntHave('purchase'))
+                ->whereNull('purchase_id'))
             ->groupBy('catalog_item_id')
             ->pluck('quantity', 'catalog_item_id');
 

app/Domains/Purchase/documentacion/README.md

@@ -6,7 +6,7 @@ Implementa el ciclo de compra y checkout: crea la cabecera de compra desde un ca
 
 ## Modelo
 
-- `Purchase`: raíz de la compra; estados `created`, `pending_payment`, `in_review`, `paid`, `cancelled`, `rejected` y `expired`, y referencia la reserva que respaldó ese intento de checkout. No guarda un vencimiento propio: expira como consecuencia del vencimiento de su reserva.
+- `Purchase`: raíz de la compra; estados `created`, `pending_payment`, `in_review`, `paid`, `cancelled`, `rejected` y `expired`.
 - `PurchaseItem`: snapshot definitivo del producto o variante, creado recién al confirmar la compra.
 - `TelepagosQr` y `TelepagosPayment`: datos del QR e intentos/resultados del proveedor.
 - `PurchasePaid`: evento emitido una sola vez al pasar a pagada bajo bloqueo transaccional.
@@ -15,16 +15,16 @@ Implementa el ciclo de compra y checkout: crea la cabecera de compra desde un ca
 
 `CheckoutService` es la fachada estable. Delega en:
 
-- `StartCheckoutService`: inicia la compra desde el carrito o crea un carrito técnico para compra directa, refresca el vencimiento de la reserva agregada y crea los snapshots `PurchaseItem`.
+- `StartCheckoutService`: inicia la compra desde el carrito o crea un carrito técnico para compra directa, sin crear todavía `PurchaseItem`.
 - `EditCheckoutService`: modifica los datos del comprador antes del cierre.
 - `CompleteCheckoutService`: completa, envía a revisión o materializa los `PurchaseItem` al confirmar el pago.
-- `ReleaseCheckoutService`: cancela o vence una compra y aplica sus efectos comerciales; el scanner unificado del dominio Catalog detecta las reservas pendientes de vencimiento.
+- `ReleaseCheckoutService`: cancela, vence y procesa vencimientos pendientes.
 - `SourceCartService`: sincroniza o finaliza el carrito de checkout asociado a la compra.
 - `CatalogSelectionResolver` y `PurchaseItemSnapshotFactory`: resuelven selecciones y generan snapshots.
 
-Al iniciar checkout o elegir un medio de pago se refresca directamente `StockReservation.expires_at`, que es la única fuente de verdad y se expone como `expires_at` en la respuesta pública de la compra. El refresco sólo se permite mientras la reserva siga vigente; una fecha vencida bloquea todas las mutaciones aun antes de que corra el scheduler. Al materializar la expiración, la compra pagable, su carrito y la reserva pasan a `expired` dentro de la misma transacción. Al cancelar o reemplazar una compra recuperable, ésta se desvincula y el carrito conserva la misma reserva activa. Al informar una transferencia, la compra pasa de `pending_payment` a `in_review` y ese vencimiento se limpia. Si el comprador abandona el checkout durante la revisión, la compra y sus reservas permanecen intactas y se crea un carrito activo nuevo para que pueda seguir comprando. Adminapp puede confirmar o anular explícitamente la compra en revisión.
+Al informar una transferencia, la compra pasa de `pending_payment` a `in_review` y deja de vencer. Si el comprador abandona el checkout durante la revisión, la compra y sus reservas permanecen intactas y se crea un carrito activo nuevo para que pueda seguir comprando. Adminapp puede confirmar o anular explícitamente la compra en revisión.
 
-Las cantidades y variantes se editan mediante el dominio Cart. El endpoint autenticado `PATCH /checkout-carts/{cart}/items/{cartItem}` valida que el carrito pertenezca al usuario y a una compra editable. Cuando existe un cambio real, invalida atómicamente el intento de pago anterior, devuelve la misma reserva activa al carrito y sincroniza sus líneas con el contenido actualizado; Purchase no expone operaciones sobre líneas antes de la confirmación.
+Las cantidades y variantes se editan mediante el dominio Cart. El endpoint autenticado `PATCH /checkout-carts/{cart}/items/{cartItem}` valida que el carrito pertenezca al usuario y a una compra editable. Cuando existe un cambio real, invalida atómicamente el intento de pago anterior, recalcula el total y renueva la reserva; Purchase no expone operaciones sobre líneas antes de la confirmación.
 
 `UserPurchaseLimitService` controla límites de compra y `CheckoutService` conserva el punto de entrada para controladores e integraciones.
 

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

@@ -9,21 +9,18 @@ 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\AdminAppSaleExcelService;
 use App\Domains\Sale\Services\AdminAppSalePdfService;
 use App\Domains\Sale\Services\AdminAppSaleService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Http\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class SaleController extends Controller
 {
     public function __construct(
         protected AdminAppSaleService $saleService,
         protected AdminAppSalePdfService $salePdfService,
-        protected AdminAppSaleExcelService $saleExcelService,
     ) {}
 
     public function index(AdminAppSaleIndexRequest $request): AnonymousResourceCollection
@@ -97,27 +94,4 @@ class SaleController extends Controller
             $request->validated('timezone'),
         );
     }
-
-    public function downloadExcel(AdminAppSalePdfRequest $request): StreamedResponse
-    {
-        $tenant = $request->user()->tenant()->firstOrFail();
-
-        return $this->saleExcelService->downloadSales(
-            $tenant,
-            $this->saleService->salesForExport($tenant, $request->validated()),
-            $request->validated('timezone'),
-        );
-    }
-
-    public function downloadModificationsExcel(
-        AdminAppSaleModificationPdfRequest $request,
-    ): StreamedResponse {
-        $tenant = $request->user()->tenant()->firstOrFail();
-
-        return $this->saleExcelService->downloadModifications(
-            $tenant,
-            $this->saleService->modificationsForExport($tenant),
-            $request->validated('timezone'),
-        );
-    }
 }

app/Domains/Sale/Services/AdminAppSaleExcelService.php

@@ -1,211 +0,0 @@
-<?php
-
-namespace App\Domains\Sale\Services;
-
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Support\Collection;
-use PhpOffice\PhpSpreadsheet\Cell\DataType;
-use PhpOffice\PhpSpreadsheet\Shared\Date;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Style\Alignment;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-
-class AdminAppSaleExcelService
-{
-    /** @param Collection<int, Purchase> $sales */
-    public function downloadSales(Tenant $tenant, Collection $sales, string $timeZone): StreamedResponse
-    {
-        $generatedAt = now();
-        $spreadsheet = $this->spreadsheet($tenant, 'Historial de ventas');
-        $sheet = $spreadsheet->getActiveSheet();
-        $sheet->setTitle('Ventas');
-        $sheet->fromArray([
-            'ID',
-            'Fecha',
-            'Cliente',
-            'Cantidad',
-            'Estado',
-            'Importe',
-            'Tickets',
-        ], null, 'A1');
-
-        foreach ($sales->values() as $index => $sale) {
-            $row = $index + 2;
-            $sheet->setCellValueExplicit("A{$row}", '#'.$sale->id, DataType::TYPE_STRING);
-            if ($sale->created_at) {
-                $sheet->setCellValue(
-                    "B{$row}",
-                    Date::dateTimeToExcel($sale->created_at->copy()->timezone($timeZone)),
-                );
-            }
-            $sheet->setCellValueExplicit(
-                "C{$row}",
-                $sale->nombre_apellido ?: 'Sin nombre',
-                DataType::TYPE_STRING,
-            );
-            $sheet->setCellValue("D{$row}", (int) ($sale->quantity ?? 0));
-            $sheet->setCellValue("E{$row}", $this->saleStatus($sale->status));
-            $sheet->setCellValue("F{$row}", (float) $sale->total);
-            $sheet->setCellValue("G{$row}", (int) ($sale->tickets_count ?? 0));
-        }
-
-        $lastRow = max(2, $sales->count() + 1);
-        $sheet->getStyle("B2:B{$lastRow}")->getNumberFormat()->setFormatCode('dd/mm/yyyy hh:mm');
-        $sheet->getStyle("F2:F{$lastRow}")->getNumberFormat()->setFormatCode('$ #,##0.00');
-        $this->formatSheet($spreadsheet, 'A1:G1', "A1:G{$lastRow}", [
-            'A' => 13,
-            'B' => 20,
-            'C' => 32,
-            'D' => 12,
-            'E' => 22,
-            'F' => 16,
-            'G' => 12,
-        ]);
-
-        return $this->download(
-            $spreadsheet,
-            'ventas_'.$tenant->codigo.'_'
-                .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.xlsx',
-        );
-    }
-
-    /** @param Collection<int, ValueChange> $modifications */
-    public function downloadModifications(
-        Tenant $tenant,
-        Collection $modifications,
-        string $timeZone,
-    ): StreamedResponse {
-        $generatedAt = now();
-        $spreadsheet = $this->spreadsheet($tenant, 'Historial de modificaciones de ventas');
-        $sheet = $spreadsheet->getActiveSheet();
-        $sheet->setTitle('Modificaciones');
-        $sheet->fromArray([
-            'Fecha',
-            'Hora',
-            'Venta',
-            'Cliente',
-            'Campo',
-            'Valor anterior',
-            'Valor nuevo',
-            'Modificado por',
-        ], null, 'A1');
-
-        foreach ($modifications->values() as $index => $modification) {
-            $row = $index + 2;
-            $changedAt = $modification->changed_at->copy()->timezone($timeZone);
-            $sale = $modification->trackable;
-            $sheet->setCellValue("A{$row}", Date::dateTimeToExcel($changedAt));
-            $sheet->setCellValue("B{$row}", Date::dateTimeToExcel($changedAt));
-            $sheet->setCellValueExplicit(
-                "C{$row}",
-                '#'.$modification->trackable_id,
-                DataType::TYPE_STRING,
-            );
-            $sheet->setCellValueExplicit(
-                "D{$row}",
-                $sale?->nombre_apellido ?: 'Sin nombre',
-                DataType::TYPE_STRING,
-            );
-            $sheet->setCellValueExplicit(
-                "E{$row}",
-                $modification->attribute,
-                DataType::TYPE_STRING,
-            );
-            $sheet->setCellValueExplicit(
-                "F{$row}",
-                $modification->old_value ?? '-',
-                DataType::TYPE_STRING,
-            );
-            $sheet->setCellValueExplicit(
-                "G{$row}",
-                $modification->new_value ?? '-',
-                DataType::TYPE_STRING,
-            );
-            $sheet->setCellValueExplicit(
-                "H{$row}",
-                $modification->user?->nombre_apellido ?? 'Sistema',
-                DataType::TYPE_STRING,
-            );
-        }
-
-        $lastRow = max(2, $modifications->count() + 1);
-        $sheet->getStyle("A2:A{$lastRow}")->getNumberFormat()->setFormatCode('dd/mm/yyyy');
-        $sheet->getStyle("B2:B{$lastRow}")->getNumberFormat()->setFormatCode('hh:mm:ss');
-        $this->formatSheet($spreadsheet, 'A1:H1', "A1:H{$lastRow}", [
-            'A' => 14,
-            'B' => 12,
-            'C' => 13,
-            'D' => 32,
-            'E' => 20,
-            'F' => 24,
-            'G' => 24,
-            'H' => 28,
-        ]);
-
-        return $this->download(
-            $spreadsheet,
-            'historial_modificaciones_'.$tenant->codigo.'_'
-                .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.xlsx',
-        );
-    }
-
-    private function spreadsheet(Tenant $tenant, string $title): Spreadsheet
-    {
-        $spreadsheet = new Spreadsheet;
-        $spreadsheet->getProperties()
-            ->setCreator('Shopit')
-            ->setTitle($title)
-            ->setSubject($tenant->nombre);
-
-        return $spreadsheet;
-    }
-
-    /** @param array<string, int> $widths */
-    private function formatSheet(
-        Spreadsheet $spreadsheet,
-        string $headerRange,
-        string $filterRange,
-        array $widths,
-    ): void {
-        $sheet = $spreadsheet->getActiveSheet();
-        $sheet->getStyle($headerRange)->applyFromArray([
-            'font' => ['bold' => true, 'color' => ['rgb' => 'FFFFFF']],
-            'fill' => [
-                'fillType' => Fill::FILL_SOLID,
-                'startColor' => ['rgb' => '26382E'],
-            ],
-            'alignment' => ['vertical' => Alignment::VERTICAL_CENTER],
-        ]);
-        $sheet->getRowDimension(1)->setRowHeight(24);
-        $sheet->freezePane('A2');
-        $sheet->setAutoFilter($filterRange);
-
-        foreach ($widths as $column => $width) {
-            $sheet->getColumnDimension($column)->setWidth($width);
-        }
-    }
-
-    private function download(Spreadsheet $spreadsheet, string $filename): StreamedResponse
-    {
-        return response()->streamDownload(function () use ($spreadsheet): void {
-            (new Xlsx($spreadsheet))->save('php://output');
-            $spreadsheet->disconnectWorksheets();
-        }, $filename, [
-            'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-        ]);
-    }
-
-    private function saleStatus(string $status): string
-    {
-        return match ($status) {
-            Purchase::STATUS_PAID => 'Confirmado',
-            Purchase::STATUS_CREATED => 'Por completar datos',
-            Purchase::STATUS_PENDING_PAYMENT, Purchase::STATUS_IN_REVIEW => 'Esperando pago',
-            default => 'Anulado',
-        };
-    }
-}

app/Domains/Sale/documentacion/README.md

@@ -8,7 +8,6 @@ Provee consultas administrativas y exportaciones de ventas confirmadas, además
 
 - `AdminAppSaleService`: pagina ventas, calcula totales y obtiene colecciones para exportación; también consulta modificaciones.
 - `AdminAppSalePdfService`: genera descargas PDF de ventas y de cambios.
-- `AdminAppSaleExcelService`: genera descargas Excel de ventas y de cambios.
 - `AdminAppSaleIndexRequest`: valida filtros del listado y la exportación.
 - `SaleResource` y `SaleModificationResource`: representan ventas e historial para AdminApp.
 - `SaleController`: entrada HTTP del panel.
@@ -17,8 +16,8 @@ Provee consultas administrativas y exportaciones de ventas confirmadas, además
 
 Bajo `/v1/adminapp/tenant`, protegidos por `auth:sanctum` y `adminapp.tenant`:
 
-- `GET /sales`, `GET /sales/pdf` y `GET /sales/excel`.
-- `GET /sales/modifications`, `GET /sales/modifications/pdf` y `GET /sales/modifications/excel`.
+- `GET /sales` y `GET /sales/pdf`.
+- `GET /sales/modifications` y `GET /sales/modifications/pdf`.
 
 ## Dependencias
 
@@ -26,4 +25,4 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d
 
 ## Consideraciones
 
-La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
+La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla y PDF.

app/Domains/Sale/routes/adminapp.php

@@ -8,10 +8,8 @@ Route::prefix('v1/adminapp/tenant')
     ->group(function (): void {
         Route::get('sales', [SaleController::class, 'index']);
         Route::get('sales/pdf', [SaleController::class, 'downloadPdf']);
-        Route::get('sales/excel', [SaleController::class, 'downloadExcel']);
         Route::get('sales/modifications', [SaleController::class, 'modifications']);
         Route::get('sales/modifications/pdf', [SaleController::class, 'downloadModificationsPdf']);
-        Route::get('sales/modifications/excel', [SaleController::class, 'downloadModificationsExcel']);
         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');

app/Domains/Tenant/Services/WebsiteTypeService.php

@@ -82,7 +82,6 @@ class WebsiteTypeService
                     && $previousLogo->id !== $websiteType->site_logo
                     && $previousLogo->id !== $websiteType->footer_logo
                     && $previousLogo->id !== $websiteType->favicon_id
-                    && ! $this->isReferencedByWebsiteType($previousLogo)
                 ) {
                     $this->attachmentService->delete($previousLogo);
                 }
@@ -91,16 +90,4 @@ class WebsiteTypeService
             return $websiteType;
         });
     }
-
-    private function isReferencedByWebsiteType(Attachment $attachment): bool
-    {
-        return WebsiteType::query()
-            ->where(function ($query) use ($attachment): void {
-                $query
-                    ->where('site_logo', $attachment->id)
-                    ->orWhere('footer_logo', $attachment->id)
-                    ->orWhere('favicon_id', $attachment->id);
-            })
-            ->exists();
-    }
 }

app/Domains/Ticket/Listeners/GenerateTicketsForPaidPurchase.php

@@ -3,8 +3,8 @@
 namespace App\Domains\Ticket\Listeners;
 
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Notification\Events\TicketsAvailable;
 use App\Domains\Purchase\Events\PurchasePaid;
-use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Ticket\Exceptions\TicketGenerationException;
 use App\Domains\Ticket\Services\TicketGeneratorService;
 
@@ -16,10 +16,13 @@ class GenerateTicketsForPaidPurchase
 
     public function handle(PurchasePaid $event): void
     {
-        $purchase = Purchase::query()
+        $purchase = $event->purchase
+            ->newQuery()
             ->with(['user', 'items'])
-            ->findOrFail($event->purchaseId);
+            ->findOrFail($event->purchase->getKey());
         $user = $purchase->user;
+        $ticketIds = [];
+
         foreach ($purchase->items as $purchaseItem) {
             $catalogItem = CatalogItem::query()
                 ->where('tenant_code', $purchase->tenant_codigo)
@@ -37,13 +40,19 @@ class GenerateTicketsForPaidPurchase
                 throw TicketGenerationException::purchaseWithoutUser($purchase);
             }
 
-            $this->ticketGenerator->generate(
+            $generatedTickets = $this->ticketGenerator->generate(
                 $catalogItem,
                 $user,
                 $purchaseItem->cantidad,
                 $purchaseItem->source_variant_id,
                 $purchase->getKey(),
             );
+
+            array_push($ticketIds, ...$generatedTickets->pluck('id')->all());
+        }
+
+        if ($ticketIds !== []) {
+            TicketsAvailable::dispatch($purchase, $ticketIds);
         }
     }
 

app/Domains/Ticket/Services/TicketPdfService.php

@@ -5,7 +5,6 @@ namespace App\Domains\Ticket\Services;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Models\Ticket;
 use Barryvdh\DomPDF\Facade\Pdf;
-use Barryvdh\DomPDF\PDF as DomPdf;
 use Endroid\QrCode\ErrorCorrectionLevel;
 use Endroid\QrCode\QrCode;
 use Endroid\QrCode\Writer\PngWriter;
@@ -20,36 +19,12 @@ class TicketPdfService
      * @param  Collection<int, Ticket>  $tickets
      */
     public function download(Tenant $tenant, Collection $tickets): Response
-    {
-        return $this->pdf($tenant, $tickets)->download($this->filename($tickets));
-    }
-
-    /**
-     * @param  Collection<int, Ticket>  $tickets
-     */
-    public function contents(Tenant $tenant, Collection $tickets): string
-    {
-        return $this->pdf($tenant, $tickets)->output();
-    }
-
-    /**
-     * @param  Collection<int, Ticket>  $tickets
-     */
-    public function filename(Collection $tickets): string
-    {
-        return 'tickets_'.$tickets->pluck('id')->implode('_').'.pdf';
-    }
-
-    /**
-     * @param  Collection<int, Ticket>  $tickets
-     */
-    private function pdf(Tenant $tenant, Collection $tickets): DomPdf
     {
         $tenant->loadMissing('headerLogo');
         $primaryColor = $this->color($tenant->primary_color, '#009933');
         $headerBackgroundColor = $this->color($tenant->header_bg_color, $primaryColor);
 
-        return Pdf::loadView('pdf.tickets', [
+        $pdf = Pdf::loadView('pdf.tickets', [
             'tenant' => $tenant,
             'tickets' => $tickets,
             'logoDataUri' => $this->logoDataUri($tenant),
@@ -60,6 +35,10 @@ class TicketPdfService
                 fn (Ticket $ticket): array => [$ticket->id => $this->qrCodeDataUri($ticket->ticket)]
             ),
         ])->setPaper('a4');
+
+        $ticketIds = $tickets->pluck('id')->implode('_');
+
+        return $pdf->download("tickets_{$ticketIds}.pdf");
     }
 
     private function qrCodeDataUri(string $value): string

app/Domains/Ticket/documentacion/README.md

@@ -21,7 +21,7 @@ vigente, vencido o usado, y resuelve sus fechas efectivas de inicio y fin sin pe
 1. `Purchase` emite `PurchasePaid` al confirmarse el pago.
 2. `GenerateTicketsForPaidPurchase` atiende el evento.
 3. `TicketGeneratorService` crea los tickets requeridos según ítems, cantidades y vigencia.
-4. `Notification` envía la confirmación de compra después de la generación y adjunta los tickets cuando existen.
+4. El flujo puede emitir disponibilidad para que `Notification` informe al comprador.
 
 ## Endpoints
 

app/Providers/AppServiceProvider.php

@@ -3,9 +3,11 @@
 namespace App\Providers;
 
 use App\Domains\Notification\Events\PasswordResetRequested;
+use App\Domains\Notification\Events\TicketsAvailable;
 use App\Domains\Notification\Events\UserRegistered;
 use App\Domains\Notification\Listeners\SendPasswordResetEmail;
-use App\Domains\Notification\Listeners\SendPurchaseConfirmedEmail;
+use App\Domains\Notification\Listeners\SendPurchasePaidEmail;
+use App\Domains\Notification\Listeners\SendTicketsAvailableEmail;
 use App\Domains\Notification\Listeners\SendWelcomeEmail;
 use App\Domains\Purchase\Events\PurchasePaid;
 use App\Domains\Ticket\Listeners\GenerateTicketsForPaidPurchase;
@@ -31,8 +33,9 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
+        Event::listen(PurchasePaid::class, SendPurchasePaidEmail::class);
         Event::listen(PurchasePaid::class, GenerateTicketsForPaidPurchase::class);
-        Event::listen(PurchasePaid::class, SendPurchaseConfirmedEmail::class);
+        Event::listen(TicketsAvailable::class, SendTicketsAvailableEmail::class);
         Event::listen(UserRegistered::class, SendWelcomeEmail::class);
         Event::listen(PasswordResetRequested::class, SendPasswordResetEmail::class);
 

bootstrap/app.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Domains\Auth\Exceptions\AccountLockedException;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Catalog\Services\CatalogItemAllowanceService;
 use App\Domains\Purchase\Exceptions\InsufficientStockException;
 use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
 use App\Domains\Purchase\Exceptions\PurchaseLimitExceededException;
@@ -101,7 +101,11 @@ return Application::configure(basePath: dirname(__DIR__))
                 'errors' => $exception->errors(),
                 'catalog_item_id' => $exception->catalogItemId,
                 'catalog_item_name' => $exception->catalogItemName,
-                'maximum_addable_quantity' => $exception->maximumAddableQuantity,
+                'availability' => app(CatalogItemAllowanceService::class)
+                    ->purchaseLimitExceededAvailability(
+                        $exception->maximumAddableQuantity,
+                        $exception->getMessage(),
+                    )->toArray(),
             ], 422);
         });
         $exceptions->render(function (PurchaseExpiredException $exception, Request $request) {
@@ -114,16 +118,6 @@ return Application::configure(basePath: dirname(__DIR__))
                 'message' => $exception->getMessage(),
             ], 422);
         });
-        $exceptions->render(function (StockReservationExpiredException $exception, Request $request) {
-            if (! $request->is('api/*')) {
-                return null;
-            }
-
-            return response()->json([
-                'code' => 'stock_reservation.expired',
-                'message' => $exception->getMessage(),
-            ], 422);
-        });
         $exceptions->render(function (ModelNotFoundException $exception, Request $request) {
             if (! $request->is('api/*')) {
                 return null;

composer.json

@@ -6,16 +6,15 @@
     "keywords": ["laravel", "framework"],
     "license": "MIT",
     "require": {
-        "php": "^8.3",
         "ext-gd": "*",
+        "php": "^8.3",
         "barryvdh/laravel-dompdf": "^3.1",
         "endroid/qr-code": "^6.1",
         "laravel/framework": "^13.8",
         "laravel/sanctum": "^4.3",
         "laravel/socialite": "^5.29",
         "laravel/tinker": "^3.0",
-        "league/flysystem-aws-s3-v3": "^3.0",
-        "phpoffice/phpspreadsheet": "^5.9"
+        "league/flysystem-aws-s3-v3": "^3.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a593ab47d99b233f75851dbb7ea50479",
+    "content-hash": "ce185c60c617846be30ae694f0cf6e9c",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -417,82 +417,6 @@
             ],
             "time": "2024-02-09T16:56:22+00:00"
         },
-        {
-            "name": "composer/pcre",
-            "version": "3.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/pcre.git",
-                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/d5a341b3fb61f3001970940afb1d332968a183ed",
-                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<2.2.2"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^2",
-                "phpstan/phpstan-deprecation-rules": "^2",
-                "phpstan/phpstan-strict-rules": "^2",
-                "phpunit/phpunit": "^9"
-            },
-            "type": "library",
-            "extra": {
-                "phpstan": {
-                    "includes": [
-                        "extension.neon"
-                    ]
-                },
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Pcre\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
-            "keywords": [
-                "PCRE",
-                "preg",
-                "regex",
-                "regular expression"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                }
-            ],
-            "time": "2026-06-07T11:47:49+00:00"
-        },
         {
             "name": "dasprid/enum",
             "version": "1.0.7",
@@ -3000,191 +2924,6 @@
             ],
             "time": "2026-03-08T20:05:35+00:00"
         },
-        {
-            "name": "maennchen/zipstream-php",
-            "version": "3.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "77bebeb4c6c340bb3c11c843b2cffd8bbfde4d5e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/77bebeb4c6c340bb3c11c843b2cffd8bbfde4d5e",
-                "reference": "77bebeb4c6c340bb3c11c843b2cffd8bbfde4d5e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "ext-zlib": "*",
-                "php-64bit": "^8.3"
-            },
-            "require-dev": {
-                "brianium/paratest": "^7.7",
-                "ext-zip": "*",
-                "friendsofphp/php-cs-fixer": "^3.86",
-                "guzzlehttp/guzzle": "^7.5",
-                "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.5",
-                "phpunit/phpunit": "^12.0",
-                "vimeo/psalm": "^6.0"
-            },
-            "suggest": {
-                "guzzlehttp/psr7": "^2.4",
-                "psr/http-message": "^2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ZipStream\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paul Duncan",
-                    "email": "pabs@pablotron.org"
-                },
-                {
-                    "name": "Jonatan Männchen",
-                    "email": "jonatan@maennchen.ch"
-                },
-                {
-                    "name": "Jesse Donat",
-                    "email": "donatj@gmail.com"
-                },
-                {
-                    "name": "András Kolesár",
-                    "email": "kolesar@kolesar.hu"
-                }
-            ],
-            "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
-            "keywords": [
-                "stream",
-                "zip"
-            ],
-            "support": {
-                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.2.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/maennchen",
-                    "type": "github"
-                }
-            ],
-            "time": "2026-04-11T18:38:28+00:00"
-        },
-        {
-            "name": "markbaker/complex",
-            "version": "3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/MarkBaker/PHPComplex.git",
-                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
-                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-                "phpcompatibility/php-compatibility": "^9.3",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-                "squizlabs/php_codesniffer": "^3.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Complex\\": "classes/src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mark Baker",
-                    "email": "mark@lange.demon.co.uk"
-                }
-            ],
-            "description": "PHP Class for working with complex numbers",
-            "homepage": "https://github.com/MarkBaker/PHPComplex",
-            "keywords": [
-                "complex",
-                "mathematics"
-            ],
-            "support": {
-                "issues": "https://github.com/MarkBaker/PHPComplex/issues",
-                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
-            },
-            "time": "2022-12-06T16:21:08+00:00"
-        },
-        {
-            "name": "markbaker/matrix",
-            "version": "3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/MarkBaker/PHPMatrix.git",
-                "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c",
-                "reference": "728434227fe21be27ff6d86621a1b13107a2562c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-                "phpcompatibility/php-compatibility": "^9.3",
-                "phpdocumentor/phpdocumentor": "2.*",
-                "phploc/phploc": "^4.0",
-                "phpmd/phpmd": "2.*",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-                "sebastian/phpcpd": "^4.0",
-                "squizlabs/php_codesniffer": "^3.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Matrix\\": "classes/src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mark Baker",
-                    "email": "mark@demon-angel.eu"
-                }
-            ],
-            "description": "PHP Class for working with matrices",
-            "homepage": "https://github.com/MarkBaker/PHPMatrix",
-            "keywords": [
-                "mathematics",
-                "matrix",
-                "vector"
-            ],
-            "support": {
-                "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
-                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
-            },
-            "time": "2022-12-02T22:17:43+00:00"
-        },
         {
             "name": "masterminds/html5",
             "version": "2.10.1",
@@ -3947,115 +3686,6 @@
             },
             "time": "2020-10-15T08:29:30+00:00"
         },
-        {
-            "name": "phpoffice/phpspreadsheet",
-            "version": "5.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "05e99ebf61238a70227b4d9cc02d0030d34f6339"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/05e99ebf61238a70227b4d9cc02d0030d34f6339",
-                "reference": "05e99ebf61238a70227b4d9cc02d0030d34f6339",
-                "shasum": ""
-            },
-            "require": {
-                "composer/pcre": "^1||^2||^3",
-                "ext-ctype": "*",
-                "ext-dom": "*",
-                "ext-fileinfo": "*",
-                "ext-filter": "*",
-                "ext-gd": "*",
-                "ext-iconv": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "ext-xml": "*",
-                "ext-xmlreader": "*",
-                "ext-xmlwriter": "*",
-                "ext-zip": "*",
-                "ext-zlib": "*",
-                "maennchen/zipstream-php": "^2.1 || ^3.0",
-                "markbaker/complex": "^3.0",
-                "markbaker/matrix": "^3.0",
-                "php": "^8.2",
-                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
-                "dompdf/dompdf": "^2.0 || ^3.0",
-                "ext-intl": "*",
-                "friendsofphp/php-cs-fixer": "^3.2",
-                "mitoteam/jpgraph": "^10.5",
-                "mpdf/mpdf": "^8.1.1",
-                "phpcompatibility/php-compatibility": "^9.3",
-                "phpstan/phpstan": "^1.1 || ^2.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0 || ^2.0",
-                "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
-                "phpunit/phpunit": "^10.5 || ^11.0",
-                "squizlabs/php_codesniffer": "^3.7",
-                "tecnickcom/tcpdf": "^6.5"
-            },
-            "suggest": {
-                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
-                "ext-intl": "PHP Internationalization Functions, required for NumberFormat Wizard and StringHelper::setLocale()",
-                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
-                "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Maarten Balliauw",
-                    "homepage": "https://blog.maartenballiauw.be"
-                },
-                {
-                    "name": "Mark Baker",
-                    "homepage": "https://markbakeruk.net"
-                },
-                {
-                    "name": "Franck Lefevre",
-                    "homepage": "https://rootslabs.net"
-                },
-                {
-                    "name": "Erik Tilt"
-                },
-                {
-                    "name": "Adrien Crivelli"
-                },
-                {
-                    "name": "Owen Leibman"
-                }
-            ],
-            "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-            "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
-            "keywords": [
-                "OpenXML",
-                "excel",
-                "gnumeric",
-                "ods",
-                "php",
-                "spreadsheet",
-                "xls",
-                "xlsx"
-            ],
-            "support": {
-                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/5.9.0"
-            },
-            "time": "2026-07-12T19:17:39+00:00"
-        },
         {
             "name": "phpoption/phpoption",
             "version": "1.9.5",
@@ -10208,8 +9838,8 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.3",
-        "ext-gd": "*"
+        "ext-gd": "*",
+        "php": "^8.3"
     },
     "platform-dev": {},
     "plugin-api-version": "2.9.0"

config/auth.php

@@ -96,7 +96,7 @@ return [
         'users' => [
             'provider' => 'users',
             'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
-            'expire' => (int) env('AUTH_PASSWORD_RESET_EXPIRATION_MINUTES', 60),
+            'expire' => 60,
             'throttle' => 60,
         ],
     ],

config/catalog.php

@@ -2,4 +2,33 @@
 
 return [
     'stock_reservation_expiration_minutes' => (int) env('STOCK_RESERVATION_EXPIRATION_MINUTES', 30),
+    'availability' => [
+        'default_actions' => [
+            'select_variant',
+            'change_quantity',
+            'add_to_cart',
+            'buy_now',
+        ],
+        'rules' => [
+            'user_quota_reached' => [
+                'effect' => 'restrict',
+                'denied_actions' => [
+                    'select_variant',
+                    'change_quantity',
+                    'add_to_cart',
+                    'buy_now',
+                ],
+            ],
+            'out_of_stock' => [
+                'effect' => 'hide',
+            ],
+            'requested_quantity_exceeds_user_quota' => [
+                'effect' => 'restrict',
+                'denied_actions' => [
+                    'add_to_cart',
+                    'buy_now',
+                ],
+            ],
+        ],
+    ],
 ];

config/logging.php

@@ -89,14 +89,6 @@ return [
             'replace_placeholders' => true,
         ],
 
-        'emails' => [
-            'driver' => 'daily',
-            'path' => storage_path('logs/emails/emails.log'),
-            'level' => env('EMAILS_LOG_LEVEL', 'info'),
-            'days' => env('EMAILS_LOG_DAYS', 30),
-            'replace_placeholders' => true,
-        ],
-
         'slack' => [
             'driver' => 'slack',
             'url' => env('LOG_SLACK_WEBHOOK_URL'),

config/purchase.php

@@ -2,4 +2,10 @@
 
 return [
     'checkout_expiration_minutes' => (int) env('PURCHASE_CHECKOUT_EXPIRATION_MINUTES', 30),
+
+    'payment_expiration_minutes' => [
+        'qr' => (int) env('PURCHASE_QR_EXPIRATION_MINUTES', 15),
+        'telepagos' => (int) env('PURCHASE_TELEPAGOS_EXPIRATION_MINUTES', 30),
+        'transfer' => (int) env('PURCHASE_TRANSFER_EXPIRATION_MINUTES', 1440),
+    ],
 ];

database/migrations/2026_08_25_000000_add_group_order_to_catalog_items.php

@@ -1,53 +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('catalog_items', function (Blueprint $table): void {
-            $table->unsignedInteger('group_order')->default(0)->after('nombre');
-        });
-
-        $footballOrder = [
-            1 => [
-                'slugs' => ['camiseta', 'camiseta-oficial-fnfi'],
-                'names' => ['Camiseta', 'CAMISETA OFICIAL FNFI'],
-            ],
-            2 => [
-                'slugs' => ['alojamiento', 'camping'],
-                'names' => ['Alojamiento', 'CAMPING'],
-            ],
-            3 => [
-                'slugs' => ['abono'],
-                'names' => ['Abono', 'ABONO'],
-            ],
-            4 => [
-                'slugs' => ['comida'],
-                'names' => ['Comida', 'COMIDA'],
-            ],
-        ];
-
-        foreach ($footballOrder as $order => $identifiers) {
-            DB::table('catalog_items')
-                ->where('tenant_code', 'fiesta_futbol_infantil')
-                ->where(function ($query) use ($identifiers): void {
-                    $query
-                        ->whereIn('slug', $identifiers['slugs'])
-                        ->orWhereIn('nombre', $identifiers['names']);
-                })
-                ->update(['group_order' => $order]);
-        }
-    }
-
-    public function down(): void
-    {
-        Schema::table('catalog_items', function (Blueprint $table): void {
-            $table->dropColumn('group_order');
-        });
-    }
-};

database/migrations/2026_08_25_010000_add_expires_at_to_reset_password_attempts_table.php

@@ -1,32 +0,0 @@
-<?php
-
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-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('reset_password_attempts', function (Blueprint $table): void {
-            $table->timestamp('expires_at')->nullable()->after('status');
-        });
-
-        // Attempts created before this migration did not have an expiration instant.
-        DB::table('reset_password_attempts')
-            ->whereIn('status', [
-                ResetPasswordAttempt::STATUS_PENDING,
-                ResetPasswordAttempt::STATUS_VALIDATED,
-            ])
-            ->update(['status' => ResetPasswordAttempt::STATUS_EXPIRED]);
-    }
-
-    public function down(): void
-    {
-        Schema::table('reset_password_attempts', function (Blueprint $table): void {
-            $table->dropColumn('expires_at');
-        });
-    }
-};

database/migrations/2026_08_25_020000_centralize_stock_reservations.php

@@ -1,180 +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::rename('stock_reservations', 'stock_reservation_lines');
-
-        Schema::create('stock_reservations', function (Blueprint $table): void {
-            $table->id();
-            $table->string('status')->default('active');
-            $table->dateTime('expires_at')->nullable();
-            $table->dateTime('committed_at')->nullable();
-            $table->dateTime('released_at')->nullable();
-            $table->dateTime('expired_at')->nullable();
-            $table->string('release_reason')->nullable();
-            $table->timestamps();
-
-            $table->index(['status', 'expires_at']);
-        });
-
-        Schema::table('stock_reservation_lines', function (Blueprint $table): void {
-            $table->foreignId('stock_reservation_id')->nullable()->after('id');
-            $table->boolean('tracks_inventory')->default(true)->after('quantity');
-        });
-
-        Schema::table('carritos', function (Blueprint $table): void {
-            $table->foreignId('current_stock_reservation_id')->nullable()->after('current_purchase_id');
-        });
-
-        Schema::table('compras', function (Blueprint $table): void {
-            $table->foreignId('stock_reservation_id')->nullable()->after('cart_id');
-        });
-
-        $cartIdsByItem = DB::table('carrito_items')->pluck('cart_id', 'id');
-        $unlimitedInventoryIds = DB::table('catalog_items')
-            ->where('inventory_policy', 'unlimited')
-            ->whereNotNull('inventory_id')
-            ->pluck('inventory_id')
-            ->merge(
-                DB::table('variantes')
-                    ->join('catalog_items', 'catalog_items.id', '=', 'variantes.catalog_item_id')
-                    ->where('catalog_items.inventory_policy', 'unlimited')
-                    ->pluck('variantes.inventory_id'),
-            )
-            ->map(fn ($id): int => (int) $id)
-            ->unique();
-        $legacyRows = DB::table('stock_reservation_lines')->orderBy('id')->get();
-        $groups = $legacyRows->groupBy(function (object $row) use ($cartIdsByItem): string {
-            if ($row->purchase_id !== null) {
-                return 'purchase:'.$row->purchase_id;
-            }
-
-            $cartId = $row->cart_item_id === null ? null : $cartIdsByItem->get($row->cart_item_id);
-
-            return $cartId === null ? 'legacy:'.$row->id : 'cart:'.$cartId;
-        });
-
-        foreach ($groups as $key => $rows) {
-            $statuses = $rows->pluck('status');
-            $status = $statuses->contains('active')
-                ? 'active'
-                : ($statuses->contains('committed')
-                    ? 'committed'
-                    : ($statuses->contains('expired') ? 'expired' : 'released'));
-            $first = $rows->first();
-            $reservationId = DB::table('stock_reservations')->insertGetId([
-                'status' => $status,
-                'expires_at' => $status === 'active' ? $rows->pluck('expires_at')->filter()->max() : null,
-                'committed_at' => $status === 'committed' ? $rows->pluck('committed_at')->filter()->max() : null,
-                'released_at' => $status === 'released' ? $rows->pluck('released_at')->filter()->max() : null,
-                'expired_at' => $status === 'expired' ? $rows->pluck('released_at')->filter()->max() : null,
-                'release_reason' => null,
-                'created_at' => $first->created_at,
-                'updated_at' => $rows->pluck('updated_at')->filter()->max() ?? $first->updated_at,
-            ]);
-
-            foreach ($rows->groupBy('inventory_id') as $inventoryRows) {
-                $line = $inventoryRows->first();
-                DB::table('stock_reservation_lines')->where('id', $line->id)->update([
-                    'stock_reservation_id' => $reservationId,
-                    'quantity' => $inventoryRows->sum('quantity'),
-                    'tracks_inventory' => ! $unlimitedInventoryIds->contains((int) $line->inventory_id),
-                ]);
-                DB::table('stock_reservation_lines')
-                    ->whereIn('id', $inventoryRows->pluck('id')->skip(1))
-                    ->delete();
-            }
-
-            if (str_starts_with($key, 'purchase:')) {
-                $purchaseId = (int) substr($key, strlen('purchase:'));
-                DB::table('compras')->where('id', $purchaseId)->update([
-                    'stock_reservation_id' => $reservationId,
-                ]);
-                $cartId = DB::table('compras')->where('id', $purchaseId)->value('cart_id');
-                $isCurrent = $cartId !== null
-                    && (int) DB::table('carritos')->where('id', $cartId)->value('current_purchase_id') === $purchaseId;
-
-                if ($status === 'active' && $isCurrent) {
-                    DB::table('carritos')->where('id', $cartId)->update([
-                        'current_stock_reservation_id' => $reservationId,
-                    ]);
-                }
-            } elseif (str_starts_with($key, 'cart:') && $status === 'active') {
-                DB::table('carritos')->where('id', (int) substr($key, strlen('cart:')))->update([
-                    'current_stock_reservation_id' => $reservationId,
-                ]);
-            }
-        }
-
-        if (DB::getDriverName() !== 'sqlite') {
-            Schema::table('stock_reservation_lines', function (Blueprint $table): void {
-                $table->dropForeign('stock_reservations_cart_item_id_foreign');
-                $table->dropForeign('stock_reservations_purchase_id_foreign');
-                $table->dropUnique('stock_reservations_cart_item_id_inventory_id_unique');
-                $table->dropIndex('stock_reservations_purchase_id_status_index');
-                $table->dropIndex('stock_reservations_status_expires_at_index');
-            });
-        }
-
-        Schema::table('stock_reservation_lines', function (Blueprint $table): void {
-            $table->unsignedBigInteger('stock_reservation_id')->nullable(false)->change();
-            $table->dropColumn([
-                'cart_item_id',
-                'purchase_id',
-                'status',
-                'expires_at',
-                'committed_at',
-                'released_at',
-            ]);
-            $table->foreign('stock_reservation_id', 'reservation_lines_reservation_fk')
-                ->references('id')
-                ->on('stock_reservations')
-                ->cascadeOnDelete();
-            $table->unique(
-                ['stock_reservation_id', 'inventory_id'],
-                'reservation_lines_reservation_inventory_unique',
-            );
-        });
-
-        Schema::table('carritos', function (Blueprint $table): void {
-            $table->foreign('current_stock_reservation_id', 'carts_current_stock_reservation_fk')
-                ->references('id')
-                ->on('stock_reservations')
-                ->nullOnDelete();
-            $table->unique('current_stock_reservation_id', 'carts_current_stock_reservation_unique');
-        });
-
-        Schema::table('compras', function (Blueprint $table): void {
-            $table->foreign('stock_reservation_id', 'purchases_stock_reservation_fk')
-                ->references('id')
-                ->on('stock_reservations')
-                ->nullOnDelete();
-            $table->unique('stock_reservation_id', 'purchases_stock_reservation_unique');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('compras', function (Blueprint $table): void {
-            $table->dropUnique('purchases_stock_reservation_unique');
-            $table->dropForeign('purchases_stock_reservation_fk');
-            $table->dropColumn('stock_reservation_id');
-        });
-
-        Schema::table('carritos', function (Blueprint $table): void {
-            $table->dropUnique('carts_current_stock_reservation_unique');
-            $table->dropForeign('carts_current_stock_reservation_fk');
-            $table->dropColumn('current_stock_reservation_id');
-        });
-
-        Schema::dropIfExists('stock_reservation_lines');
-        Schema::dropIfExists('stock_reservations');
-    }
-};

database/migrations/2026_08_25_160000_make_stock_reservation_expiration_authoritative.php

@@ -1,51 +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('compras')
-            ->whereNotNull('stock_reservation_id')
-            ->orderBy('id')
-            ->chunkById(500, function ($purchases): void {
-                foreach ($purchases as $purchase) {
-                    DB::table('stock_reservations')
-                        ->where('id', $purchase->stock_reservation_id)
-                        ->where('status', 'active')
-                        ->update(['expires_at' => $purchase->expires_at]);
-                }
-            });
-
-        Schema::table('compras', function (Blueprint $table): void {
-            $table->dropIndex(['expires_at']);
-            $table->dropColumn('expires_at');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('compras', function (Blueprint $table): void {
-            $table->timestamp('expires_at')->nullable()->index()->after('payment_method');
-        });
-
-        DB::table('compras')
-            ->whereNotNull('stock_reservation_id')
-            ->orderBy('id')
-            ->chunkById(500, function ($purchases): void {
-                foreach ($purchases as $purchase) {
-                    DB::table('compras')
-                        ->where('id', $purchase->id)
-                        ->update([
-                            'expires_at' => DB::table('stock_reservations')
-                                ->where('id', $purchase->stock_reservation_id)
-                                ->value('expires_at'),
-                        ]);
-                }
-            });
-    }
-};

database/migrations/2026_08_25_170000_propagate_expired_stock_reservations.php

@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        $expiredReservationIds = fn ($query) => $query
-            ->select('id')
-            ->from('stock_reservations')
-            ->where('status', 'expired');
-
-        DB::table('compras')
-            ->whereIn('status', ['created', 'pending_payment'])
-            ->whereIn('stock_reservation_id', $expiredReservationIds)
-            ->update(['status' => 'expired']);
-
-        DB::table('carritos')
-            ->whereIn('status', ['active', 'checkout'])
-            ->whereIn('current_stock_reservation_id', $expiredReservationIds)
-            ->update(['status' => 'expired']);
-    }
-
-    public function down(): void
-    {
-        // Terminal business states cannot be reversed without inventing their prior state.
-    }
-};

database/migrations/2026_08_26_000000_set_website_type_favicon.php

@@ -1,96 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-
-return new class extends Migration
-{
-    private const FILENAME = 'onticket_favicon.svg';
-
-    /** @var list<string> */
-    private const WEBSITE_TYPE_CODES = ['shopit', 'onticket'];
-
-    public function up(): void
-    {
-        $websiteTypes = DB::table('website_type')
-            ->whereIn('codigo', self::WEBSITE_TYPE_CODES)
-            ->get(['codigo', 'favicon_id']);
-
-        if ($websiteTypes->isEmpty()) {
-            return;
-        }
-
-        $faviconIds = $websiteTypes
-            ->pluck('favicon_id')
-            ->filter()
-            ->unique()
-            ->values();
-
-        if (
-            $faviconIds->count() === 1
-            && DB::table('attachments')
-                ->where('id', $faviconIds->first())
-                ->where('filename', self::FILENAME)
-                ->exists()
-            && $websiteTypes->every(
-                fn (object $websiteType): bool => $websiteType->favicon_id === $faviconIds->first()
-            )
-        ) {
-            return;
-        }
-
-        $sourcePath = public_path('images/website_types/'.self::FILENAME);
-
-        if (! is_file($sourcePath)) {
-            throw new RuntimeException("Favicon not found at path: {$sourcePath}");
-        }
-
-        $contents = file_get_contents($sourcePath);
-
-        if ($contents === false) {
-            throw new RuntimeException("Could not read favicon at path: {$sourcePath}");
-        }
-
-        $key = (string) Str::uuid();
-        $storedPath = "website-types/{$key}.svg";
-
-        if (! Storage::disk('s3')->put($storedPath, $contents)) {
-            throw new RuntimeException("Could not store favicon at path: {$storedPath}");
-        }
-
-        try {
-            DB::transaction(function () use ($contents, $key, $storedPath): void {
-                $attachmentId = DB::table('attachments')->insertGetId([
-                    'key' => $key,
-                    'path' => $storedPath,
-                    'filename' => self::FILENAME,
-                    'type' => 'image',
-                    'mime_type' => 'image/svg+xml',
-                    'extension' => 'svg',
-                    'size' => strlen($contents),
-                    'created_at' => now(),
-                    'updated_at' => now(),
-                ]);
-
-                DB::table('website_type')
-                    ->whereIn('codigo', self::WEBSITE_TYPE_CODES)
-                    ->update([
-                        'favicon_id' => $attachmentId,
-                        'updated_at' => now(),
-                    ]);
-            });
-        } catch (Throwable $throwable) {
-            Storage::disk('s3')->delete($storedPath);
-
-            throw $throwable;
-        }
-    }
-
-    public function down(): void
-    {
-        // The shared attachment may be in use outside these website types.
-        // Keep this data migration irreversible to avoid deleting an active asset.
-    }
-};

database/seeders/DesfilePuraTendenciaSeeder.php

@@ -191,7 +191,6 @@ class DesfilePuraTendenciaSeeder extends Seeder
 
         FeaturedGroup::query()->create([
             'tenant_code' => self::TENANT_CODE,
-            'code' => 'entradas',
             'source_type' => FeaturedGroupSource::All,
             'category_id' => null,
             'product_layout' => ProductLayout::TicketSelector,

database/seeders/FiestaFutbolInfantilProductSeeder.php

@@ -78,7 +78,6 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
         $this->createProduct($tenant, [
             'slug' => 'camiseta',
             'nombre' => 'Camiseta',
-            'group_order' => 1,
             'category_id' => $categories['merchandising']->id,
             'precio' => 18000,
             'attribute_codes' => ['color', 'talle'],
@@ -93,7 +92,6 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
         $this->createProduct($tenant, [
             'slug' => 'alojamiento',
             'nombre' => 'Alojamiento',
-            'group_order' => 2,
             'category_id' => $categories['alojamientos']->id,
             'precio' => 35000,
             'attribute_codes' => ['tipo_alojamiento'],
@@ -106,7 +104,6 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
         $this->createProduct($tenant, [
             'slug' => 'comida',
             'nombre' => 'Comida',
-            'group_order' => 4,
             'category_id' => $categories['comidas']->id,
             'precio' => 4000,
             'attribute_codes' => ['event_date', 'horario', 'servicio'],
@@ -129,7 +126,6 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
         $this->createProduct($tenant, [
             'slug' => 'abono',
             'nombre' => 'Abono',
-            'group_order' => 3,
             'category_id' => $categories['entradas']->id,
             'precio' => 40000,
             'has_tickets' => true,
@@ -144,7 +140,6 @@ class FiestaFutbolInfantilProductSeeder extends Seeder
 
         FeaturedGroup::query()->create([
             'tenant_code' => $tenant->codigo,
-            'code' => 'productos',
             'source_type' => FeaturedGroupSource::All,
             'category_id' => null,
             'product_layout' => ProductLayout::Row,

database/seeders/ProductCatalogFromImagesSeeder.php

@@ -171,7 +171,6 @@ class ProductCatalogFromImagesSeeder extends Seeder
 
         FeaturedGroup::query()->create([
             'tenant_code' => $tenant->codigo,
-            'code' => 'productos',
             'source_type' => FeaturedGroupSource::All,
             'product_layout' => ProductLayout::ColumnWithImage,
             'group_layout' => GroupLayout::Paginated,
@@ -181,7 +180,6 @@ class ProductCatalogFromImagesSeeder extends Seeder
 
         $carouselGroup = FeaturedGroup::query()->create([
             'tenant_code' => $tenant->codigo,
-            'code' => 'productos-destacados',
             'source_type' => FeaturedGroupSource::Manual,
             'product_layout' => ProductLayout::ColumnWithImage,
             'group_layout' => GroupLayout::Carousel,

database/seeders/WebsiteTypeSeeder.php

@@ -36,7 +36,6 @@ class WebsiteTypeSeeder extends Seeder
                 ...self::PRESENTATION,
                 'site_logo' => $this->onTicketLogo(),
                 'footer_logo' => $this->onTicketFooterLogo(),
-                'favicon' => $this->onTicketFavicon(),
             ],
         );
 
@@ -71,7 +70,6 @@ class WebsiteTypeSeeder extends Seeder
                 ...self::PRESENTATION,
                 'site_logo' => $this->onTicketLogo(),
                 'footer_logo' => $this->onTicketFooterLogo(),
-                'favicon' => $shopIt->favicon()->firstOrFail()->key,
             ],
         );
 
@@ -177,21 +175,4 @@ class WebsiteTypeSeeder extends Seeder
             true,
         );
     }
-
-    private function onTicketFavicon(): UploadedFile
-    {
-        $path = public_path('images/website_types/onticket_favicon.svg');
-
-        if (! file_exists($path)) {
-            throw new RuntimeException("OnTicket favicon not found at path: {$path}");
-        }
-
-        return new UploadedFile(
-            $path,
-            'onticket_favicon.svg',
-            'image/svg+xml',
-            null,
-            true,
-        );
-    }
 }

lang/en/api.php

@@ -12,7 +12,6 @@ return [
         'password_reset_invalid' => 'The password recovery request is invalid or has already been used.',
         'password_updated' => 'Password updated successfully.',
         'reset_code_invalid' => 'The code you entered is invalid.',
-        'reset_code_expired' => 'The password recovery code expired. Request a new one.',
         'reset_code_valid' => 'Code validated successfully.',
         'invalid_tenant_or_return_url' => 'The tenant or return URL is invalid.',
         'request_expired' => 'The authentication request expired. Please try again.',
@@ -35,7 +34,6 @@ return [
         'bundle_variant_forbidden' => 'A bundle cannot have a variant.',
         'empty_bundle' => 'The bundle has no components.',
         'variant_required' => 'You must select a variant for this item.',
-        'reservation_expired' => 'The stock reservation has expired. Use the active cart to continue.',
     ],
     'purchase' => [
         'expired' => 'The purchase has expired. Please start a new purchase.',

lang/es/api.php

@@ -12,7 +12,6 @@ return [
         'password_reset_invalid' => 'La solicitud de recuperación es inválida o ya fue utilizada.',
         'password_updated' => 'Contraseña modificada correctamente.',
         'reset_code_invalid' => 'El código ingresado es inválido.',
-        'reset_code_expired' => 'El código de recuperación expiró. Solicitá uno nuevo.',
         'reset_code_valid' => 'Código validado correctamente.',
         'invalid_tenant_or_return_url' => 'El tenant o la URL de retorno no son válidos.',
         'request_expired' => 'La solicitud de autenticación expiró. Intenta nuevamente.',
@@ -35,7 +34,6 @@ return [
         'bundle_variant_forbidden' => 'Un bundle no admite una variante.',
         'empty_bundle' => 'El bundle no tiene componentes.',
         'variant_required' => 'Debe seleccionar una variante para este ítem.',
-        'reservation_expired' => 'La reserva de stock venció. Usá el carrito activo para continuar.',
     ],
     'purchase' => [
         'expired' => "La compra venci\u{00F3}. Inici\u{00E1} una nueva compra.",

public/images/website_types/onticket_favicon.svg

@@ -1,3 +0,0 @@
-<svg width="63" height="36" viewBox="0 0 63 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M44.64 0H17.94C8.05 0 0 8.05 0 17.94C0 27.83 8.05 35.88 17.94 35.88H44.64C54.53 35.88 62.58 27.83 62.58 17.94C62.58 8.05 54.53 0 44.64 0ZM44.62 31.78C36.98 31.78 30.79 25.59 30.79 17.95C30.79 10.31 36.98 4.12 44.62 4.12C52.26 4.12 58.45 10.31 58.45 17.95C58.45 25.59 52.26 31.78 44.62 31.78Z" fill="#FF7006"/>
-</svg>

resources/views/components/mail/branded-layout.blade.php

@@ -1,4 +1,4 @@
-@props(['branding', 'headerLogoUrl' => null, 'footerLogoUrl' => null])
+@props(['tenant', 'headerLogoUrl' => null, 'footerLogoUrl' => null])
 
 <!DOCTYPE html>
 <html lang="es">
@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="color-scheme" content="light">
-    <title>{{ $branding['name'] }}</title>
+    <title>{{ $tenant->nombre }}</title>
     <style>
         @media only screen and (max-width: 620px) {
             .mail-container { width: 100% !important; }
@@ -14,17 +14,17 @@
         }
     </style>
 </head>
-<body style="margin: 0; padding: 0; background-color: {{ $branding['background_color'] }}; color: {{ $branding['body_color'] }}; font-family: Arial, Helvetica, sans-serif;">
-<table role="presentation" width="100%" cellspacing="0" cellpadding="0" border="0" style="background-color: {{ $branding['background_color'] }};">
+<body style="margin: 0; padding: 0; background-color: #f1f5f9; color: #334155; font-family: Arial, Helvetica, sans-serif;">
+<table role="presentation" width="100%" cellspacing="0" cellpadding="0" border="0" style="background-color: #f1f5f9;">
     <tr>
         <td align="center" style="padding: 32px 12px;">
-            <table role="presentation" width="600" cellspacing="0" cellpadding="0" border="0" class="mail-container" style="width: 600px; max-width: 600px; background-color: {{ $branding['surface_color'] }}; border-top: 4px solid {{ $branding['primary_color'] }}; border-radius: 8px; overflow: hidden; box-shadow: 0 2px 8px rgba(15, 23, 42, 0.08);">
+            <table role="presentation" width="600" cellspacing="0" cellpadding="0" border="0" class="mail-container" style="width: 600px; max-width: 600px; background-color: #ffffff; border-top: 4px solid {{ $tenant->primary_color }}; border-radius: 8px; overflow: hidden; box-shadow: 0 2px 8px rgba(15, 23, 42, 0.08);">
                 <tr>
-                    <td align="center" bgcolor="{{ $branding['header_bg_color'] }}" style="padding: 24px 32px; background-color: {{ $branding['header_bg_color'] }};">
+                    <td align="center" bgcolor="{{ $tenant->header_bg_color }}" style="padding: 24px 32px; background-color: {{ $tenant->header_bg_color }};">
                         @if ($headerLogoUrl)
-                            <img src="{{ $headerLogoUrl }}" alt="{{ $branding['name'] }}" width="180" style="display: block; width: auto; max-width: 180px; max-height: 64px; border: 0;">
+                            <img src="{{ $headerLogoUrl }}" alt="{{ $tenant->nombre }}" width="180" style="display: block; width: auto; max-width: 180px; max-height: 64px; border: 0;">
                         @else
-                            <span style="color: {{ $branding['primary_color'] }}; font-size: 24px; font-weight: 700; line-height: 1.2;">{{ $branding['name'] }}</span>
+                            <span style="color: {{ $tenant->primary_color }}; font-size: 24px; font-weight: 700; line-height: 1.2;">{{ $tenant->nombre }}</span>
                         @endif
                     </td>
                 </tr>
@@ -34,11 +34,11 @@
                     </td>
                 </tr>
                 <tr>
-                    <td align="center" bgcolor="{{ $branding['footer_bg_color'] }}" style="padding: 24px 32px; background-color: {{ $branding['footer_bg_color'] }}; color: #ffffff; font-size: 12px; line-height: 1.5;">
+                    <td align="center" bgcolor="{{ $tenant->footer_bg_color }}" style="padding: 24px 32px; background-color: {{ $tenant->footer_bg_color }}; color: #ffffff; font-size: 12px; line-height: 1.5;">
                         @if ($footerLogoUrl)
-                            <img src="{{ $footerLogoUrl }}" alt="{{ $branding['name'] }}" width="140" style="display: block; width: auto; max-width: 140px; max-height: 48px; margin: 0 auto 16px; border: 0;">
+                            <img src="{{ $footerLogoUrl }}" alt="{{ $tenant->nombre }}" width="140" style="display: block; width: auto; max-width: 140px; max-height: 48px; margin: 0 auto 16px; border: 0;">
                         @endif
-                        {{ $footer ?? 'Este correo fue enviado por '.$branding['name'].'.' }}
+                        {{ $footer ?? 'Este correo fue enviado por '.$tenant->nombre.'.' }}
                     </td>
                 </tr>
             </table>

resources/views/mail/notifications/password-reset.blade.php

@@ -1,10 +1,10 @@
-<h1 style="margin: 0 0 20px; color: {{ $brand->primary_color }};">
+<h1 style="margin: 0 0 20px; color: {{ $tenant->primary_color }};">
     Recuperá tu contraseña
 </h1>
 
 @if($attempt->reason === \App\Domains\Auth\Models\ResetPasswordAttempt::REASON_STAFF_CREATED)
 <p>
-    Hola {{ $attempt->user->nombre_apellido }}, creamos tu cuenta de scanner en {{ $brand->nombre }}. Utilizá este código para crear tu contraseña y comenzar a usarla.
+    Hola {{ $attempt->user->nombre_apellido }}, creamos tu cuenta de scanner en {{ $tenant->nombre }}. Utilizá este código para crear tu contraseña y comenzar a usarla.
 </p>
 @elseif($attempt->reason === \App\Domains\Auth\Models\ResetPasswordAttempt::REASON_ACCOUNT_LOCKED)
 <p>
@@ -17,10 +17,10 @@
 </p>
 @endif
 
-<p>Ingresá este código en {{ $brand->nombre }}:</p>
+<p>Ingresá este código en {{ $tenant->nombre }}:</p>
 
-<div style="margin: 28px 0; padding: 20px; border: 2px solid {{ $brand->primary_color }}; border-radius: 8px; text-align: center;">
-    <span style="color: {{ $brand->primary_color }}; font-size: 36px; font-weight: 700; letter-spacing: 12px;">
+<div style="margin: 28px 0; padding: 20px; border: 2px solid {{ $tenant->primary_color }}; border-radius: 8px; text-align: center;">
+    <span style="color: {{ $tenant->primary_color }}; font-size: 36px; font-weight: 700; letter-spacing: 12px;">
         {{ $attempt->codigo }}
     </span>
 </div>
@@ -28,7 +28,7 @@
 @if($recoveryUrl)
 <div style="text-align: center; margin-bottom: 28px;">
     <a href="{{ $recoveryUrl }}" 
-       style="display: inline-block; padding: 12px 24px; background-color: {{ $brand->primary_color }}; color: #ffffff; text-decoration: none; border-radius: 6px; font-weight: bold;">
+       style="display: inline-block; padding: 12px 24px; background-color: {{ $tenant->primary_color }}; color: #ffffff; text-decoration: none; border-radius: 6px; font-weight: bold;">
         {{ $attempt->reason === \App\Domains\Auth\Models\ResetPasswordAttempt::REASON_STAFF_CREATED ? 'Crear mi contraseña' : 'Ingresar código ahora' }}
     </a>
 </div>

resources/views/mail/notifications/purchase-paid.blade.php

@@ -1,4 +1,4 @@
-<h1 style="margin: 0 0 20px;">¡Compra realizada con éxito!</h1>
+<h1 style="margin: 0 0 20px;">¡Recibimos tu pago!</h1>
 <p>La compra <strong>#{{ $purchase->id }}</strong> fue confirmada correctamente.</p>
 <table role="presentation" style="width: 100%; border-collapse: collapse; margin: 20px 0;">
     @foreach ($purchase->items as $item)
@@ -10,6 +10,3 @@
     @endforeach
 </table>
 <p style="font-size: 18px;"><strong>Total pagado: ${{ number_format((float) $purchase->total, 2, ',', '.') }}</strong></p>
-@if ($tickets->isNotEmpty())
-    <p><strong>Tus tickets ya están disponibles</strong></p>
-@endif

resources/views/mail/notifications/tickets-available.blade.php

@@ -0,0 +1,7 @@
+<h1 style="margin: 0 0 20px;">Tus tickets ya están disponibles</h1>
+<p>Generamos {{ $tickets->count() }} {{ $tickets->count() === 1 ? 'ticket' : 'tickets' }} para la compra <strong>#{{ $purchase->id }}</strong>.</p>
+<ul style="padding-left: 20px;">
+    @foreach ($tickets as $ticket)
+        <li style="margin-bottom: 8px;">{{ $ticket->name }}</li>
+    @endforeach
+</ul>

resources/views/mail/notifications/welcome.blade.php

@@ -1,3 +1,3 @@
-<h1 style="margin: 0 0 20px;">¡Bienvenido a {{ $brand->nombre }}!</h1>
+<h1 style="margin: 0 0 20px;">¡Bienvenido a {{ $tenant->nombre }}!</h1>
 <p>Hola {{ $user->nombre_apellido }}, tu cuenta fue creada correctamente.</p>
 <p>Ya podés ingresar y comenzar a comprar.</p>

resources/views/mail/test.blade.php

@@ -1,4 +1,4 @@
-<x-mail.branded-layout :branding="$branding" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
+<x-mail.branded-layout :tenant="$tenant" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
     <h1 style="margin: 0 0 20px; color: {{ $tenant->primary_color }}; font-size: 26px; line-height: 1.3;">
         Prueba de correo de Shopit
     </h1>

routes/console.php

@@ -15,9 +15,7 @@ Artisan::command('reservations:expire', function (): void {
     $expired = app(ExpireStockReservationsService::class)->expireOverdue();
 
     $this->info("Expired purchases: {$expired['purchases']}");
-    $this->info("Expired cart reservations: {$expired['cart_reservations']}");
-    $this->info("Expired orphan reservations: {$expired['orphan_reservations']}");
-    $this->info("Failed reservations: {$expired['failed']}");
+    $this->info("Expired cart items: {$expired['cart_items']}");
 })->purpose('Release expired stock reservations from purchases and abandoned carts');
 
 Schedule::command('reservations:expire')

tests/Feature/Auth/CreateResetPasswordAttemptControllerTest.php

@@ -69,10 +69,6 @@ class CreateResetPasswordAttemptControllerTest extends TestCase
         $this->assertTrue($attempt->user->is($user));
         $this->assertMatchesRegularExpression('/^\d{4}$/', $attempt->codigo);
         $this->assertSame(ResetPasswordAttempt::STATUS_PENDING, $attempt->status);
-        $this->assertTrue($attempt->expires_at->between(
-            now()->addMinutes(59),
-            now()->addMinutes(60),
-        ));
         Event::assertDispatched(
             PasswordResetRequested::class,
             fn (PasswordResetRequested $event): bool => $event->attemptId === $attempt->id

tests/Feature/Auth/ResetPasswordAttemptTest.php

@@ -18,9 +18,7 @@ class ResetPasswordAttemptTest extends TestCase
             'id',
             'user_id',
             'codigo',
-            'reason',
             'status',
-            'expires_at',
         ], Schema::getColumnListing('reset_password_attempts'));
     }
 
@@ -30,14 +28,12 @@ class ResetPasswordAttemptTest extends TestCase
 
         $attempt = $user->resetPasswordAttempts()->create([
             'codigo' => '123456',
-            'expires_at' => now()->addHour(),
         ]);
 
         $this->assertSame(ResetPasswordAttempt::STATUS_PENDING, $attempt->status);
         $this->assertTrue($attempt->user->is($user));
         $this->assertTrue($user->resetPasswordAttempts->contains($attempt));
         $this->assertFalse($attempt->usesTimestamps());
-        $this->assertTrue($attempt->expires_at->isFuture());
         $this->assertArrayNotHasKey('codigo', $attempt->toArray());
     }
 

tests/Feature/Auth/ResetPasswordControllerTest.php

@@ -99,30 +99,6 @@ class ResetPasswordControllerTest extends TestCase
         $this->assertSame(ResetPasswordAttempt::STATUS_USED, $attempt->fresh()->status);
     }
 
-    public function test_an_expired_validated_attempt_cannot_reset_the_password(): void
-    {
-        $user = User::factory()->create([
-            'email' => 'ada@example.com',
-            'password' => 'OldSecret!123',
-        ]);
-        $attempt = $user->resetPasswordAttempts()->create([
-            'codigo' => '1234',
-            'status' => ResetPasswordAttempt::STATUS_VALIDATED,
-            'expires_at' => now()->subSecond(),
-        ]);
-
-        $this->postJson('/api/password/reset', [
-            'email' => 'ada@example.com',
-            'codigo' => '1234',
-            'password' => 'NewSecret!456',
-            'password_confirmation' => 'NewSecret!456',
-        ])->assertUnprocessable()
-            ->assertJsonValidationErrors('codigo');
-
-        $this->assertTrue(Hash::check('OldSecret!123', $user->fresh()->password));
-        $this->assertSame(ResetPasswordAttempt::STATUS_EXPIRED, $attempt->fresh()->status);
-    }
-
     public function test_it_validates_password_confirmation_and_strength(): void
     {
         $this->postJson('/api/password/reset', [

tests/Feature/Auth/ValidateResetPasswordAttemptControllerTest.php

@@ -49,27 +49,6 @@ class ValidateResetPasswordAttemptControllerTest extends TestCase
         );
     }
 
-    public function test_it_expires_an_attempt_and_returns_the_expired_code_message(): void
-    {
-        $user = User::factory()->create(['email' => 'ada@example.com']);
-        $attempt = $user->resetPasswordAttempts()->create([
-            'codigo' => '1234',
-            'expires_at' => now()->subSecond(),
-        ]);
-
-        $this->postJson('/api/password/reset-attempts/validate', [
-            'email' => 'ada@example.com',
-            'codigo' => '1234',
-        ])->assertUnprocessable()
-            ->assertJsonValidationErrors('codigo')
-            ->assertJsonPath('errors.codigo.0', __('api.auth.reset_code_expired'));
-
-        $this->assertSame(
-            ResetPasswordAttempt::STATUS_EXPIRED,
-            $attempt->fresh()->status,
-        );
-    }
-
     public function test_it_rejects_an_expired_or_already_validated_attempt(): void
     {
         $user = User::factory()->create(['email' => 'ada@example.com']);

tests/Feature/Cart/CartControllerTest.php

@@ -5,12 +5,10 @@ namespace Tests\Feature\Cart;
 use App\Domains\Attachable\Enums\AttachmentType;
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Inventory;
 use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Tenant\Models\Tenant;
@@ -30,81 +28,6 @@ class CartControllerTest extends TestCase
         ]));
         $this->assertFalse(Schema::hasColumn('carrito_items', 'buyable_type'));
         $this->assertFalse(Schema::hasColumn('carrito_items', 'buyable_id'));
-        $this->assertTrue(Schema::hasColumns('stock_reservations', [
-            'status',
-            'expires_at',
-            'committed_at',
-            'released_at',
-            'expired_at',
-            'release_reason',
-        ]));
-        $this->assertFalse(Schema::hasColumn('stock_reservations', 'quantity'));
-        $this->assertTrue(Schema::hasColumns('stock_reservation_lines', [
-            'stock_reservation_id',
-            'inventory_id',
-            'quantity',
-            'tracks_inventory',
-        ]));
-        $this->assertTrue(Schema::hasColumn('carritos', 'current_stock_reservation_id'));
-        $this->assertTrue(Schema::hasColumn('compras', 'stock_reservation_id'));
-        $this->assertFalse(Schema::hasColumn('compras', 'expires_at'));
-    }
-
-    public function test_it_aggregates_shared_inventory_into_one_cart_reservation_line(): void
-    {
-        $tenant = $this->createTenant('acme');
-        $firstItem = $this->createDirectItem($tenant, 10, '10.00');
-        $secondItem = app(CatalogService::class)->create([
-            'tenant_code' => $tenant->codigo,
-            'type' => 'bundle',
-            'slug' => 'second-shared-item',
-            'nombre' => 'Second shared item',
-            'precio' => '20.00',
-            'components' => [[
-                'catalog_item_id' => $firstItem->id,
-                'quantity' => 1,
-            ]],
-        ]);
-
-        $firstResponse = $this->postJson('/api/tenants/acme/cart/items', [
-            'catalog_item_id' => $firstItem->id,
-            'cantidad' => 2,
-        ])->assertOk();
-        $guestToken = $firstResponse->getCookie('guest_token', false)?->getValue();
-
-        $this->call(
-            'POST',
-            '/api/tenants/acme/cart/items',
-            [],
-            ['guest_token' => $guestToken],
-            [],
-            ['HTTP_Accept' => 'application/json', 'CONTENT_TYPE' => 'application/json'],
-            json_encode([
-                'catalog_item_id' => $secondItem->id,
-                'cantidad' => 3,
-            ]),
-        )->assertOk();
-
-        $reservationId = (int) $firstResponse->json('data.id');
-        $reservationId = (int) Cart::query()
-            ->findOrFail($reservationId)
-            ->current_stock_reservation_id;
-
-        $this->assertDatabaseCount('stock_reservations', 1);
-        $this->assertDatabaseHas('stock_reservations', [
-            'id' => $reservationId,
-            'status' => 'active',
-        ]);
-        $this->assertDatabaseHas('stock_reservation_lines', [
-            'stock_reservation_id' => $reservationId,
-            'inventory_id' => $firstItem->inventory_id,
-            'quantity' => 5,
-        ]);
-        $this->assertDatabaseCount('stock_reservation_lines', 1);
-        $this->assertDatabaseHas('inventories', [
-            'id' => $firstItem->inventory_id,
-            'reserved_stock' => 5,
-        ]);
     }
 
     public function test_it_adds_a_catalog_item_without_a_variant(): void
@@ -151,11 +74,9 @@ class CartControllerTest extends TestCase
             'id' => $item->inventory_id,
             'reserved_stock' => 2,
         ]);
-        $this->assertDatabaseHas('stock_reservation_lines', [
+        $this->assertDatabaseHas('stock_reservations', [
             'inventory_id' => $item->inventory_id,
             'quantity' => 2,
-        ]);
-        $this->assertDatabaseHas('stock_reservations', [
             'status' => 'active',
         ]);
     }
@@ -175,44 +96,38 @@ class CartControllerTest extends TestCase
         ])->assertOk();
 
         $this->assertDatabaseHas('stock_reservations', [
-            'status' => 'active',
-            'expires_at' => $now->copy()->addMinutes(45)->toDateTimeString(),
-        ]);
-        $this->assertDatabaseHas('stock_reservation_lines', [
             'inventory_id' => $item->inventory_id,
             'quantity' => 2,
+            'status' => 'active',
+            'expires_at' => $now->copy()->addMinutes(45)->toDateTimeString(),
         ]);
 
         $this->travelBack();
     }
 
-    public function test_it_expires_a_cart_reservation_and_automatically_replaces_the_cart(): void
+    public function test_it_expires_abandoned_cart_reservations_and_removes_empty_carts(): void
     {
         config()->set('catalog.stock_reservation_expiration_minutes', 30);
         $tenant = $this->createTenant('acme');
-        $user = User::factory()->create();
         $item = $this->createDirectItem($tenant, 10, '49.90');
 
-        $response = $this->actingAs($user, 'sanctum')
-            ->postJson('/api/tenants/acme/cart/items', [
-                'catalog_item_id' => $item->id,
-                'cantidad' => 2,
-            ])->assertOk();
+        $response = $this->postJson('/api/tenants/acme/cart/items', [
+            'catalog_item_id' => $item->id,
+            'cantidad' => 2,
+        ])->assertOk();
         $cartId = $response->json('data.id');
         $cartItemId = $response->json('data.items.0.id');
-        $cart = Cart::query()->findOrFail($cartId);
-        $reservationId = $cart->current_stock_reservation_id;
 
         $this->artisan('reservations:expire')
             ->expectsOutput('Expired purchases: 0')
-            ->expectsOutput('Expired cart reservations: 0')
+            ->expectsOutput('Expired cart items: 0')
             ->assertSuccessful();
 
         $this->travel(31)->minutes();
 
         $this->artisan('reservations:expire')
             ->expectsOutput('Expired purchases: 0')
-            ->expectsOutput('Expired cart reservations: 1')
+            ->expectsOutput('Expired cart items: 1')
             ->assertSuccessful();
 
         $this->assertDatabaseHas('inventories', [
@@ -220,141 +135,28 @@ class CartControllerTest extends TestCase
             'real_stock' => 10,
             'reserved_stock' => 0,
         ]);
-        $this->assertDatabaseHas('carrito_items', ['id' => $cartItemId]);
-        $this->assertDatabaseHas('carritos', [
+        $this->assertDatabaseMissing('carrito_items', ['id' => $cartItemId]);
+        $this->assertSoftDeleted('carritos', [
             'id' => $cartId,
-            'status' => Cart::STATUS_EXPIRED,
-            'current_stock_reservation_id' => $reservationId,
-            'deleted_at' => null,
+            'status' => 'expired',
         ]);
         $this->assertDatabaseHas('stock_reservations', [
-            'id' => $reservationId,
+            'inventory_id' => $item->inventory_id,
+            'cart_item_id' => null,
+            'purchase_id' => null,
+            'quantity' => 0,
             'status' => 'expired',
             'expires_at' => null,
         ]);
-        $this->assertDatabaseHas('stock_reservation_lines', [
-            'inventory_id' => $item->inventory_id,
-            'quantity' => 2,
-        ]);
-
-        $currentCart = $this->getJson('/api/tenants/acme/cart')
-            ->assertOk()
-            ->assertJsonPath('data.status', Cart::STATUS_ACTIVE)
-            ->assertJsonPath('data.items', [])
-            ->assertJsonMissingPath('data.stock_reservation')
-            ->assertJsonMissingPath('data.current_stock_reservation_id');
-        $newCartId = $currentCart->json('data.id');
-
-        $this->assertNotSame($cartId, $newCartId);
-        $this->assertDatabaseHas('carritos', [
-            'id' => $cartId,
-            'status' => Cart::STATUS_ABANDONED,
-            'current_stock_reservation_id' => $reservationId,
-        ]);
-        $this->assertDatabaseHas('carritos', [
-            'id' => $newCartId,
-            'status' => Cart::STATUS_ACTIVE,
-            'current_stock_reservation_id' => null,
-        ]);
-
-        $this->postJson('/api/tenants/acme/cart/items', [
-            'catalog_item_id' => $item->id,
-            'cantidad' => 1,
-        ])
-            ->assertOk()
-            ->assertJsonPath('data.id', $newCartId)
-            ->assertJsonPath('data.items.0.cantidad', 1);
 
         $this->artisan('reservations:expire')
             ->expectsOutput('Expired purchases: 0')
-            ->expectsOutput('Expired cart reservations: 0')
+            ->expectsOutput('Expired cart items: 0')
             ->assertSuccessful();
 
         $this->travelBack();
     }
 
-    public function test_it_replaces_an_overdue_cart_before_the_expiration_job_runs(): void
-    {
-        config()->set('catalog.stock_reservation_expiration_minutes', 30);
-        $tenant = $this->createTenant('acme');
-        $user = User::factory()->create();
-        $item = $this->createDirectItem($tenant, 10, '49.90');
-
-        $original = $this->actingAs($user, 'sanctum')
-            ->postJson('/api/tenants/acme/cart/items', [
-                'catalog_item_id' => $item->id,
-                'cantidad' => 2,
-            ])->assertOk();
-        $originalCartId = $original->json('data.id');
-
-        $this->travel(31)->minutes();
-
-        $replacement = $this->postJson('/api/tenants/acme/cart/items', [
-            'catalog_item_id' => $item->id,
-            'cantidad' => 1,
-        ])
-            ->assertOk()
-            ->assertJsonPath('data.status', Cart::STATUS_ACTIVE)
-            ->assertJsonPath('data.items.0.cantidad', 1);
-
-        $this->assertNotSame($originalCartId, $replacement->json('data.id'));
-        $this->assertDatabaseHas('carritos', [
-            'id' => $originalCartId,
-            'status' => Cart::STATUS_ABANDONED,
-        ]);
-        $this->assertDatabaseHas('inventories', [
-            'id' => $item->inventory_id,
-            'reserved_stock' => 1,
-        ]);
-
-        $this->travelBack();
-    }
-
-    public function test_expired_cart_mutations_return_the_expiration_error_instead_of_not_found(): void
-    {
-        config()->set('catalog.stock_reservation_expiration_minutes', 30);
-        $tenant = $this->createTenant('acme');
-        $user = User::factory()->create();
-        [$item, $firstVariant] = $this->createVariantItem($tenant, 10, '49.90');
-        $secondInventory = Inventory::query()->create(['real_stock' => 10]);
-        $secondVariant = $item->variants()->create(['inventory_id' => $secondInventory->id]);
-
-        $cartItemId = $this->actingAs($user, 'sanctum')
-            ->postJson('/api/tenants/acme/cart/items', [
-                'catalog_item_id' => $item->id,
-                'variant_id' => $firstVariant->id,
-                'cantidad' => 2,
-            ])
-            ->assertOk()
-            ->json('data.items.0.id');
-
-        $this->travel(31)->minutes();
-
-        $expectedError = [
-            'code' => 'stock_reservation.expired',
-            'message' => __('api.cart.reservation_expired'),
-        ];
-
-        $this->patchJson("/api/tenants/acme/cart/items/{$cartItemId}", [
-            'cantidad' => 3,
-        ])
-            ->assertUnprocessable()
-            ->assertExactJson($expectedError);
-
-        $this->patchJson("/api/tenants/acme/cart/items/{$cartItemId}", [
-            'cantidad' => 2,
-            'variant_id' => $secondVariant->id,
-        ])
-            ->assertUnprocessable()
-            ->assertExactJson($expectedError);
-
-        $this->deleteJson("/api/tenants/acme/cart/items/{$cartItemId}")
-            ->assertUnprocessable()
-            ->assertExactJson($expectedError);
-
-        $this->travelBack();
-    }
-
     public function test_it_filters_item_images_when_the_tenant_disables_them(): void
     {
         $tenant = $this->createTenant('acme');
@@ -410,11 +212,10 @@ class CartControllerTest extends TestCase
             'id' => $variant->inventory_id,
             'reserved_stock' => 5,
         ]);
-        $this->assertDatabaseHas('stock_reservation_lines', [
+        $this->assertDatabaseHas('stock_reservations', [
+            'cart_item_id' => $response->json('data.items.0.id'),
             'inventory_id' => $variant->inventory_id,
             'quantity' => 5,
-        ]);
-        $this->assertDatabaseHas('stock_reservations', [
             'status' => 'active',
         ]);
     }
@@ -428,7 +229,6 @@ class CartControllerTest extends TestCase
         $this->createPurchaseItem($tenant, $user, $item, 1);
 
         $this->actingAs($user, 'sanctum')
-            ->withHeader('Accept-Language', 'es')
             ->postJson('/api/tenants/acme/cart/items', [
                 'catalog_item_id' => $item->id,
                 'cantidad' => 2,
@@ -437,7 +237,6 @@ class CartControllerTest extends TestCase
             ->assertJsonPath('data.items.0.cantidad', 2);
 
         $this->actingAs($user, 'sanctum')
-            ->withHeader('Accept-Language', 'es')
             ->postJson('/api/tenants/acme/cart/items', [
                 'catalog_item_id' => $item->id,
                 'cantidad' => 2,
@@ -447,7 +246,7 @@ class CartControllerTest extends TestCase
             ->assertJsonPath('code', 'purchase.limit_exceeded')
             ->assertJsonPath('catalog_item_id', $item->id)
             ->assertJsonPath('catalog_item_name', $item->nombre)
-            ->assertJsonPath('maximum_addable_quantity', 1)
+            ->assertJsonPath('availability.maximum_quantity', 1)
             ->assertJsonPath(
                 'message',
                 "Podés agregar hasta 1 unidad más de “{$item->nombre}”.",
@@ -582,12 +381,10 @@ class CartControllerTest extends TestCase
             'reserved_stock' => 0,
         ]);
         $this->assertDatabaseHas('stock_reservations', [
-            'status' => 'released',
-            'release_reason' => 'cart_empty',
-        ]);
-        $this->assertDatabaseHas('stock_reservation_lines', [
+            'cart_item_id' => null,
             'inventory_id' => $variant->inventory_id,
-            'quantity' => 5,
+            'quantity' => 0,
+            'status' => 'released',
         ]);
     }
 

tests/Feature/Catalog/BundleCatalogItemTest.php

@@ -267,7 +267,7 @@ class BundleCatalogItemTest extends TestCase
         $this->getJson("/api/tenants/{$this->tenant->codigo}/catalog-items/{$bundleId}")
             ->assertOk()
             ->assertJsonPath('data.type', CatalogItemType::Bundle->value)
-            ->assertJsonPath('data.maximum_addable_quantity', 4)
+            ->assertJsonPath('data.availability.maximum_quantity', 4)
             ->assertJsonMissingPath('data.stock_tecnico')
             ->assertJsonCount(1, 'data.components')
             ->assertJsonPath('data.components.0.catalog_item_id', $component->id)

tests/Feature/Catalog/CatalogControllerTest.php

@@ -41,7 +41,7 @@ class CatalogControllerTest extends TestCase
         $directItem = $this->createItem($tenant, 'Direct', $directInventory);
         $row->featuredItems()->create(['catalog_item_id' => $directItem->id]);
 
-        $variantItem = $this->createItem($tenant, 'Variants');
+        $variantItem = $this->createItem($tenant, 'Variants', withoutInventory: true);
         $firstInventory = Inventory::query()->create([
             'real_stock' => 5,
             'reserved_stock' => 1,
@@ -56,7 +56,7 @@ class CatalogControllerTest extends TestCase
         ]);
         $variantItem->variants()->create(['inventory_id' => $firstInventory->id]);
         $variantItem->variants()->create(['inventory_id' => $secondInventory->id]);
-        $unavailableVariant = $variantItem->variants()->create([
+        $variantItem->variants()->create([
             'inventory_id' => $unavailableInventory->id,
         ]);
         $cart->featuredItems()->create(['catalog_item_id' => $variantItem->id]);
@@ -72,19 +72,16 @@ class CatalogControllerTest extends TestCase
             ->assertJsonPath('0.items.0.nombre', 'Variants')
             ->assertJsonPath('0.items.0.descripcion', 'Variants description')
             ->assertJsonPath('0.items.0.precio', '100.00')
-            ->assertJsonPath('0.items.0.maximum_addable_quantity', 7)
+            ->assertJsonPath('0.items.0.availability.state', 'visible')
+            ->assertJsonPath('0.items.0.availability.maximum_quantity', 7)
             ->assertJsonCount(2, '0.items.0.variants')
-            ->assertJsonPath('0.items.0.variants.0.maximum_addable_quantity', 4)
-            ->assertJsonPath('0.items.0.variants.1.maximum_addable_quantity', 3)
+            ->assertJsonPath('0.items.0.variants.0.availability.maximum_quantity', 4)
+            ->assertJsonPath('0.items.0.variants.0.availability.state', 'visible')
+            ->assertJsonPath('0.items.0.variants.1.availability.maximum_quantity', 3)
             ->assertJsonPath('1.title', 'Row')
-            ->assertJsonPath('1.items.data.0.maximum_addable_quantity', 8)
+            ->assertJsonPath('1.items.data.0.availability.maximum_quantity', 8)
             ->assertJsonMissingPath('1.items.data.0.stock_tecnico')
             ->assertJsonCount(0, '1.items.data.0.variants');
-
-        $this->assertNotContains(
-            $unavailableVariant->id,
-            collect($response->json('0.items.0.variants'))->pluck('id')->all(),
-        );
     }
 
     public function test_maximum_addable_quantity_shares_the_authenticated_user_quota_between_variants(): void
@@ -97,7 +94,7 @@ class CatalogControllerTest extends TestCase
             groupLayout: GroupLayout::Simple,
         );
         $user = User::factory()->create();
-        $item = $this->createItem($tenant, 'Limited variants');
+        $item = $this->createItem($tenant, 'Limited variants', withoutInventory: true);
         $item->update(['max_units_per_user' => 3]);
         $firstVariant = $item->variants()->create([
             'inventory_id' => Inventory::query()->create(['real_stock' => 10])->id,
@@ -118,21 +115,21 @@ class CatalogControllerTest extends TestCase
         $this->actingAs($user, 'sanctum')
             ->getJson("/api/tenants/{$tenant->codigo}/catalog")
             ->assertOk()
-            ->assertJsonPath('0.items.0.variants.0.maximum_addable_quantity', 0)
-            ->assertJsonPath('0.items.0.variants.1.maximum_addable_quantity', 0)
+            ->assertJsonPath('0.items.0.availability.maximum_quantity', 0)
+            ->assertJsonPath('0.items.0.availability.allowed_actions', [])
             ->assertJsonPath(
-                '0.items.0.variants.0.unavailable_message',
-                'Alcanzaste el cupo máximo permitido para este producto.',
-            )
-            ->assertJsonPath(
-                '0.items.0.variants.1.unavailable_message',
+                '0.items.0.availability.reasons.0.message',
                 'Alcanzaste el cupo máximo permitido para este producto.',
             )
+            ->assertJsonPath('0.items.0.variants.0.availability.maximum_quantity', 8)
+            ->assertJsonPath('0.items.0.variants.1.availability.maximum_quantity', 9)
+            ->assertJsonCount(0, '0.items.0.variants.0.availability.reasons')
+            ->assertJsonCount(0, '0.items.0.variants.1.availability.reasons')
             ->assertJsonMissingPath('0.items.0.variants.0.stock_tecnico')
             ->assertJsonMissingPath('0.items.0.variants.1.stock_tecnico');
     }
 
-    public function test_it_excludes_out_of_stock_items(): void
+    public function test_it_hides_out_of_stock_items_before_building_the_group_response(): void
     {
         $tenant = $this->createTenant('catalog-available-variants');
         $group = $this->createGroup(
@@ -142,7 +139,7 @@ class CatalogControllerTest extends TestCase
             groupLayout: GroupLayout::SimpleVertical,
         );
 
-        $unavailableItem = $this->createItem($tenant, 'Unavailable');
+        $unavailableItem = $this->createItem($tenant, 'Unavailable', withoutInventory: true);
         $unavailableInventory = Inventory::query()->create([
             'real_stock' => 4,
             'reserved_stock' => 4,
@@ -150,7 +147,7 @@ class CatalogControllerTest extends TestCase
         $unavailableItem->variants()->create(['inventory_id' => $unavailableInventory->id]);
         $group->featuredItems()->create(['catalog_item_id' => $unavailableItem->id]);
 
-        $availableItem = $this->createItem($tenant, 'Available');
+        $availableItem = $this->createItem($tenant, 'Available', withoutInventory: true);
         $availableInventory = Inventory::query()->create([
             'real_stock' => 4,
             'reserved_stock' => 3,
@@ -162,8 +159,7 @@ class CatalogControllerTest extends TestCase
             ->assertOk()
             ->assertJsonCount(1, '0.items')
             ->assertJsonPath('0.items.0.nombre', 'Available')
-            ->assertJsonPath('0.items.0.unavailable_message', null)
-            ->assertJsonMissing(['nombre' => 'Unavailable']);
+            ->assertJsonCount(0, '0.items.0.availability.reasons');
     }
 
     public function test_column_with_image_uses_item_image_then_variant_image_then_null(): void
@@ -180,8 +176,8 @@ class CatalogControllerTest extends TestCase
             'order' => 0,
         ]);
 
-        $variantItem = $this->createItem($tenant, 'Variant image');
-        $variantInventory = Inventory::query()->create();
+        $variantItem = $this->createItem($tenant, 'Variant image', withoutInventory: true);
+        $variantInventory = Inventory::query()->create(['real_stock' => 1]);
         $variant = $variantItem->variants()->create(['inventory_id' => $variantInventory->id]);
         $variantImage = $this->createAttachment('variant');
         $variant->attachments()->attach($variantImage, ['orden' => 0]);
@@ -348,10 +344,8 @@ class CatalogControllerTest extends TestCase
         ]);
 
         $food = $this->createItem($tenant, 'Hamburger');
-        $food->update(['group_order' => 2]);
         $food->category()->associate($category)->save();
-        $parking = $this->createItem($tenant, 'Parking');
-        $parking->update(['group_order' => 1]);
+        $this->createItem($tenant, 'Parking');
 
         $this->getJson("/api/tenants/{$tenant->codigo}/catalog")
             ->assertOk()
@@ -360,9 +354,6 @@ class CatalogControllerTest extends TestCase
             ->assertJsonPath('0.items.0.nombre', 'Hamburger')
             ->assertJsonPath('1.title', 'All products')
             ->assertJsonCount(2, '1.items.data')
-            ->assertJsonPath('1.items.data.0.nombre', 'Parking')
-            ->assertJsonPath('1.items.data.1.nombre', 'Hamburger')
-            ->assertJsonMissingPath('1.items.data.0.group_order')
             ->assertJsonPath('1.items.meta.total', 2);
     }
 
@@ -433,7 +424,12 @@ class CatalogControllerTest extends TestCase
         Tenant $tenant,
         string $name,
         ?Inventory $inventory = null,
+        bool $withoutInventory = false,
     ): CatalogItem {
+        $inventory ??= $withoutInventory
+            ? null
+            : Inventory::query()->create(['real_stock' => 10]);
+
         return CatalogItem::query()->create([
             'tenant_code' => $tenant->codigo,
             'inventory_id' => $inventory?->id,