docs(postman): regenerate collection after API cleanup

docs(menu): describe internal-only configuration
docs(integration): remove deleted endpoint references
2026-08-27 12:11:08 -03:00 · 2026-08-27 12:11:08 -03:00 · 2026-08-27 12:11:08 -03:00 · 2026-08-27 12:11:08 -03:00 · 2026-08-27 12:11:08 -03:00 · 2026-08-27 12:10:57 -03:00
216 changed files with 5709 additions and 8106 deletions
--- a/.env.example
+++ b/.env.example
@@ -5,9 +5,6 @@ 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

@@ -31,6 +28,7 @@ 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
@@ -41,6 +39,8 @@ 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
--- a/ShopIt_API_Postman_Collection.json
+++ b/ShopIt_API_Postman_Collection.json
--- a/app/Domains/Auth/Controllers/ValidateResetPasswordAttemptController.php
+++ b/app/Domains/Auth/Controllers/ValidateResetPasswordAttemptController.php
@@ -22,10 +22,18 @@ class ValidateResetPasswordAttemptController extends Controller
    {
        $data = $request->validated();

-        if (! $this->resetPasswordAttemptService->validateCode(
+        $result = $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'),
            ]);
--- a/app/Domains/Auth/Models/ResetPasswordAttempt.php
+++ b/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'])]
+#[Fillable(['user_id', 'codigo', 'reason', 'status', 'expires_at'])]
 #[Hidden(['codigo'])]
 class ResetPasswordAttempt extends Model
 {
@@ -31,6 +31,7 @@ class ResetPasswordAttempt extends Model
    {
        return [
            'user_id' => 'integer',
+            'expires_at' => 'datetime',
        ];
    }

--- a/app/Domains/Auth/Services/ResetPasswordAttemptService.php
+++ b/app/Domains/Auth/Services/ResetPasswordAttemptService.php
@@ -12,6 +12,12 @@ 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,
@@ -146,12 +152,12 @@ class ResetPasswordAttemptService
        );
    }

-    public function validateCode(string $email, string $code): bool
+    public function validateCode(string $email, string $code): string
    {
        $emailFingerprint = $this->emailFingerprint($email);

        try {
-            return DB::transaction(function () use ($email, $code, $emailFingerprint): bool {
+            return DB::transaction(function () use ($email, $code, $emailFingerprint): string {
                $user = User::query()
                    ->where('email', $email)
                    ->lockForUpdate()
@@ -169,14 +175,27 @@ class ResetPasswordAttemptService
                        'email_fingerprint' => $emailFingerprint,
                    ]);

-                    return false;
+                    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;
                }

                $attempt->update([
                    'status' => ResetPasswordAttempt::STATUS_VALIDATED,
                ]);

-                return true;
+                return self::CODE_VALID;
            });
        } catch (Throwable $exception) {
            Log::error('Failed to validate password reset code.', [
@@ -214,6 +233,19 @@ 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;
@@ -270,6 +302,7 @@ class ResetPasswordAttemptService
            'codigo' => $this->generateCode(),
            'reason' => $reason,
            'status' => ResetPasswordAttempt::STATUS_PENDING,
+            'expires_at' => now()->addMinutes((int) config('auth.passwords.users.expire')),
        ]);

        return $attempt->getKey();
--- a/app/Domains/Bootstrap/Resources/AdminAppBootstrapResource.php
+++ b/app/Domains/Bootstrap/Resources/AdminAppBootstrapResource.php
@@ -30,6 +30,7 @@ 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),
        ];
    }
 }
--- a/app/Domains/Bootstrap/Services/AdminAppBootstrapService.php
+++ b/app/Domains/Bootstrap/Services/AdminAppBootstrapService.php
@@ -11,7 +11,7 @@ class AdminAppBootstrapService
    {
        return [
            'website_type' => WebsiteType::query()
-                ->with(['siteLogo', 'footerLogo'])
+                ->with(['siteLogo', 'footerLogo', 'favicon'])
                ->where('dominio', $domain)
                ->firstOrFail(),
        ];
--- a/app/Domains/Bootstrap/Services/ScannerBootstrapService.php
+++ b/app/Domains/Bootstrap/Services/ScannerBootstrapService.php
@@ -11,7 +11,7 @@ class ScannerBootstrapService
    {
        return [
            'website_type' => WebsiteType::query()
-                ->with(['siteLogo', 'footerLogo'])
+                ->with(['siteLogo', 'footerLogo', 'favicon'])
                ->where('scanner_domain', $domain)
                ->firstOrFail(),
        ];
--- a/app/Domains/Cart/Controllers/CartController.php
+++ b/app/Domains/Cart/Controllers/CartController.php
@@ -2,7 +2,6 @@

 namespace App\Domains\Cart\Controllers;

-use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Cart\Requests\AddCartItemRequest;
 use App\Domains\Cart\Requests\UpdateCartItemQuantityRequest;
@@ -78,36 +77,6 @@ class CartController extends Controller
        ]);
    }

-    public function updateCheckoutItem(
-        UpdateCartItemQuantityRequest $request,
-        Tenant $tenant,
-        Cart $cart,
-        CartItem $cartItem,
-    ): CartResource {
-        $updatesVariant = $request->exists('variant_id');
-
-        return CartResource::make(
-            $this->cartService->updateCheckoutItem(
-                $tenant,
-                $request,
-                $cart,
-                $cartItem->getKey(),
-                (int) $request->validated('cantidad'),
-                $updatesVariant
-                    ? ($request->validated('variant_id') !== null
-                        ? (int) $request->validated('variant_id')
-                        : null)
-                    : $cartItem->variant_id,
-                $updatesVariant,
-            ),
-        )->additional([
-            'code' => $updatesVariant ? 'cart.item_updated' : 'cart.quantity_updated',
-            'message' => $updatesVariant
-                ? __('api.cart.item_updated')
-                : __('api.cart.quantity_updated'),
-        ]);
-    }
-
    public function removeItem(Request $request, Tenant $tenant, CartItem $cartItem): CartResource
    {
        return CartResource::make(
@@ -117,23 +86,4 @@ class CartController extends Controller
            'message' => __('api.cart.item_removed'),
        ]);
    }
-
-    public function removeCheckoutItem(
-        Request $request,
-        Tenant $tenant,
-        Cart $cart,
-        CartItem $cartItem,
-    ): CartResource {
-        return CartResource::make(
-            $this->cartService->removeCheckoutItem(
-                $tenant,
-                $request,
-                $cart,
-                $cartItem->getKey(),
-            ),
-        )->additional([
-            'code' => 'cart.item_removed',
-            'message' => __('api.cart.item_removed'),
-        ]);
-    }
 }
--- a/app/Domains/Cart/Models/Cart.php
+++ b/app/Domains/Cart/Models/Cart.php
@@ -5,6 +5,7 @@ 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;
@@ -27,6 +28,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
    'guest_token',
    'status',
    'origin',
+    'current_purchase_id',
+    'current_stock_reservation_id',
 ])]
 class Cart extends Model
 {
@@ -35,6 +38,16 @@ 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';
@@ -43,6 +56,8 @@ class Cart extends Model
    {
        return [
            'user_id' => 'integer',
+            'current_purchase_id' => 'integer',
+            'current_stock_reservation_id' => 'integer',
        ];
    }

@@ -76,6 +91,21 @@ class Cart extends Model
        return $this->hasMany(Purchase::class, 'cart_id');
    }

+    /** @return BelongsTo<Purchase, $this> */
+    public function currentPurchase(): BelongsTo
+    {
+        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')
@@ -98,7 +128,8 @@ class Cart extends Model
        }

        return DB::transaction(function () use ($catalogItemId, $variantId, $quantity): CartItem {
-            self::query()->whereKey($this->getKey())->lockForUpdate()->firstOrFail();
+            $this->invalidateCurrentCheckout();
+            app(StockReservationService::class)->assertCartReservationUsable($this);
            $selectedItem = $this->resolveScopedItem($catalogItemId, $variantId, true);
            $cartQuantity = (int) $this->items()
                ->where('catalog_item_id', $catalogItemId)
@@ -132,12 +163,11 @@ class Cart extends Model
                    'cantidad' => $quantity,
                ]);
            } else {
-                app(StockReservationService::class)->ensure($item, $selectedItem);
                $item->cantidad += $quantity;
                $item->save();
            }

-            app(StockReservationService::class)->reserve($item, $selectedItem, $quantity);
+            app(StockReservationService::class)->syncCart($this);

            return $item->fresh();
        });
@@ -163,6 +193,9 @@ class Cart extends Model
            $updateVariant,
            $excludedPurchaseId,
        ): CartItem {
+            $this->invalidateCurrentCheckout();
+            app(StockReservationService::class)->assertCartReservationUsable($this);
+
            /** @var CartItem $item */
            $item = $this->items()
                ->where('id', $cartItemId)
@@ -195,7 +228,6 @@ class Cart extends Model
                    $nextAvailableQuantity,
                );

-                app(StockReservationService::class)->release($item, $currentSelection, $item->cantidad);
                $availableQuantity = $inventoryService->availableQuantity($nextSelection);

                if ($availableQuantity !== null && $availableQuantity < $quantity) {
@@ -212,11 +244,10 @@ 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();
                }
@@ -224,7 +255,7 @@ class Cart extends Model
                $item->variant_id = $variantId;
                $item->cantidad = $quantity;
                $item->save();
-                app(StockReservationService::class)->reserve($item, $nextSelection, $quantity);
+                app(StockReservationService::class)->syncCart($this);

                return $item->fresh();
            }
@@ -253,16 +284,9 @@ 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();
        });
@@ -271,26 +295,79 @@ class Cart extends Model
    public function removeItem(int $cartItemId): void
    {
        DB::transaction(function () use ($cartItemId): void {
+            $this->invalidateCurrentCheckout();
+            app(StockReservationService::class)->assertCartReservationUsable($this);
+
            /** @var CartItem $item */
            $item = $this->items()
                ->where('id', $cartItemId)
                ->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);
        });
    }

+    private function invalidateCurrentCheckout(): void
+    {
+        $candidatePurchaseId = self::query()
+            ->whereKey($this->getKey())
+            ->value('current_purchase_id');
+        $currentPurchase = $candidatePurchaseId === null
+            ? null
+            : Purchase::query()->lockForUpdate()->find($candidatePurchaseId);
+
+        /** @var self $cart */
+        $cart = self::query()->lockForUpdate()->findOrFail($this->getKey());
+
+        if ($cart->current_purchase_id !== $candidatePurchaseId) {
+            if ($cart->current_purchase_id !== null) {
+                throw ValidationException::withMessages([
+                    'cart' => __('api.purchase.checkout_in_progress'),
+                ]);
+            }
+
+            $this->current_purchase_id = null;
+
+            return;
+        }
+
+        if ($currentPurchase === null) {
+            return;
+        }
+
+        if ($currentPurchase->status === Purchase::STATUS_PAID) {
+            throw ValidationException::withMessages([
+                'cart' => __('api.cart.editing_disabled'),
+            ]);
+        }
+
+        if (in_array($currentPurchase->status, [
+            Purchase::STATUS_CREATED,
+            Purchase::STATUS_PENDING_PAYMENT,
+        ], true)) {
+            app(StockReservationService::class)->returnToCart($currentPurchase, $cart);
+            $currentPurchase->update([
+                'status' => Purchase::STATUS_SUPERSEDED,
+            ]);
+
+            $this->current_purchase_id = null;
+
+            return;
+        }
+
+        app(StockReservationService::class)->releaseForPurchase(
+            $currentPurchase,
+            reason: StockReservationService::REASON_PURCHASE_SUPERSEDED,
+        );
+        self::query()
+            ->whereKey($cart->getKey())
+            ->where('current_purchase_id', $currentPurchase->getKey())
+            ->update(['current_purchase_id' => null]);
+        $this->current_purchase_id = null;
+    }
+
    protected function resolveScopedItem(
        int $catalogItemId,
        ?int $variantId,
--- a/app/Domains/Cart/Models/CartItem.php
+++ b/app/Domains/Cart/Models/CartItem.php
@@ -3,13 +3,11 @@
 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',
@@ -57,10 +55,4 @@ class CartItem extends Model
    {
        return $this->variant ?? $this->catalogItem;
    }
-
-    /** @return HasMany<StockReservation, $this> */
-    public function stockReservations(): HasMany
-    {
-        return $this->hasMany(StockReservation::class);
-    }
 }
--- a/app/Domains/Cart/Resources/CartItemResource.php
+++ b/app/Domains/Cart/Resources/CartItemResource.php
@@ -2,7 +2,6 @@

 namespace App\Domains\Cart\Resources;

-use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\Variant;
@@ -23,13 +22,9 @@ class CartItemResource extends JsonResource
        $selectedItem = $this->selectedItem();
        $imageUrl = null;
        $tenant = $request->route('tenant');
-        $checkoutCart = $request->route('cart');
        $displayImage = ! $tenant instanceof Tenant || $tenant->display_cart_item_images;
        $includeVariants = $tenant instanceof Tenant
-            && ($checkoutCart instanceof Cart
-                ? $tenant->checkout_editing_policy
-                : $tenant->cart_editing_policy)
-                ->allowsVariantChanges();
+            && $tenant->cart_editing_policy->allowsVariantChanges();

        if ($displayImage && $selectedItem?->relationLoaded('attachments')) {
            $imageUrl = $selectedItem->attachments->first()?->getTemporaryUrl(1440);
--- a/app/Domains/Cart/Services/CartService.php
+++ b/app/Domains/Cart/Services/CartService.php
@@ -4,10 +4,8 @@ namespace App\Domains\Cart\Services;

 use App\Domains\Auth\Models\User;
 use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
+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;
@@ -19,11 +17,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 class CartService
 {
-    public function __construct(
-        private readonly StockReservationService $reservations,
-        private readonly PurchaseStateGuard $purchaseState,
-    ) {}
-
    public function show(Tenant $tenant, Request $request): Cart
    {
        $resolvedIdentity = $this->resolveIdentity($request);
@@ -32,7 +25,7 @@ class CartService
            return $this->makeEmptyCart($tenant);
        }

-        $cart = $this->findCart($tenant, $resolvedIdentity['identity']);
+        $cart = $this->resolveCart($tenant, $resolvedIdentity['identity']);

        if ($cart === null) {
            return $this->makeEmptyCart($tenant);
@@ -89,125 +82,6 @@ class CartService
        return $this->loadCart($cart, $tenant);
    }

-    public function updateCheckoutItem(
-        Tenant $tenant,
-        Request $request,
-        Cart $cart,
-        int $cartItemId,
-        int $quantity,
-        ?int $variantId,
-        bool $updateVariant,
-    ): Cart {
-        $user = $request->user() ?? Auth::guard('sanctum')->user();
-
-        if (! $user instanceof User) {
-            throw new NotFoundHttpException('Checkout cart not found.');
-        }
-
-        return DB::transaction(function () use (
-            $tenant,
-            $user,
-            $cart,
-            $cartItemId,
-            $quantity,
-            $variantId,
-            $updateVariant,
-        ): Cart {
-            /** @var Purchase|null $purchase */
-            $purchase = Purchase::query()
-                ->where('cart_id', $cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->whereDoesntHave('items')
-                ->lockForUpdate()
-                ->first();
-
-            if ($purchase === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            $this->purchaseState->assertNotExpired($purchase);
-
-            if (! in_array($purchase->status, [
-                Purchase::STATUS_CREATED,
-                Purchase::STATUS_PENDING_PAYMENT,
-            ], true)) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            /** @var Cart|null $checkoutCart */
-            $checkoutCart = Cart::query()
-                ->whereKey($cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->where('status', 'checkout')
-                ->lockForUpdate()
-                ->first();
-
-            if ($checkoutCart === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            /** @var CartItem|null $cartItem */
-            $cartItem = $checkoutCart->items()
-                ->whereKey($cartItemId)
-                ->lockForUpdate()
-                ->first();
-
-            if ($cartItem === null) {
-                throw new NotFoundHttpException('Checkout item not found.');
-            }
-
-            $hasChanges = (int) $cartItem->cantidad !== $quantity
-                || ($updateVariant && $cartItem->variant_id !== $variantId);
-
-            if (! $hasChanges) {
-                return $this->loadCart($checkoutCart, $tenant, true);
-            }
-
-            if (
-                (int) $cartItem->cantidad !== $quantity
-                && ! $tenant->checkout_editing_policy->allowsQuantityChanges()
-            ) {
-                throw ValidationException::withMessages([
-                    'cantidad' => __('api.cart.editing_disabled'),
-                ]);
-            }
-
-            if (
-                $updateVariant
-                && $cartItem->variant_id !== $variantId
-                && ! $tenant->checkout_editing_policy->allowsVariantChanges()
-            ) {
-                throw ValidationException::withMessages([
-                    'variant_id' => __('api.cart.variant_change_disabled'),
-                ]);
-            }
-
-            $checkoutCart->updateItem(
-                $cartItemId,
-                $quantity,
-                $variantId,
-                $updateVariant,
-                $purchase->getKey(),
-            );
-
-            $purchase->telepagosQr()->delete();
-            $purchase->update([
-                'status' => Purchase::STATUS_CREATED,
-                'payment_method' => null,
-                'transfer_payer_dni' => null,
-                'total' => $checkoutCart->getTotalAmount(),
-                'expires_at' => now()->addMinutes(
-                    max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
-                ),
-            ]);
-            $this->reservations->syncPurchaseExpiration($purchase);
-
-            return $this->loadCart($checkoutCart, $tenant, true);
-        });
-    }
-
    public function removeItem(Tenant $tenant, Request $request, int $cartItemId): Cart
    {
        if (! $tenant->cart_editing_policy->allowsRemoval()) {
@@ -223,77 +97,6 @@ class CartService
        return $this->loadCart($cart, $tenant);
    }

-    public function removeCheckoutItem(
-        Tenant $tenant,
-        Request $request,
-        Cart $cart,
-        int $cartItemId,
-    ): Cart {
-        if (! $tenant->checkout_editing_policy->allowsRemoval()) {
-            throw ValidationException::withMessages([
-                'cart_item' => __('api.cart.editing_disabled'),
-            ]);
-        }
-
-        $user = $request->user() ?? Auth::guard('sanctum')->user();
-
-        if (! $user instanceof User) {
-            throw new NotFoundHttpException('Checkout cart not found.');
-        }
-
-        return DB::transaction(function () use ($tenant, $user, $cart, $cartItemId): Cart {
-            /** @var Purchase|null $purchase */
-            $purchase = Purchase::query()
-                ->where('cart_id', $cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->whereDoesntHave('items')
-                ->lockForUpdate()
-                ->first();
-
-            if ($purchase === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            $this->purchaseState->assertNotExpired($purchase);
-
-            if (! in_array($purchase->status, [
-                Purchase::STATUS_CREATED,
-                Purchase::STATUS_PENDING_PAYMENT,
-            ], true)) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            /** @var Cart|null $checkoutCart */
-            $checkoutCart = Cart::query()
-                ->whereKey($cart->getKey())
-                ->where('tenant_codigo', $tenant->codigo)
-                ->where('user_id', $user->getKey())
-                ->where('status', 'checkout')
-                ->lockForUpdate()
-                ->first();
-
-            if ($checkoutCart === null) {
-                throw new NotFoundHttpException('Checkout cart not found.');
-            }
-
-            $checkoutCart->removeItem($cartItemId);
-            $purchase->telepagosQr()->delete();
-            $purchase->update([
-                'status' => Purchase::STATUS_CREATED,
-                'payment_method' => null,
-                'transfer_payer_dni' => null,
-                'total' => $checkoutCart->getTotalAmount(),
-                'expires_at' => now()->addMinutes(
-                    max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
-                ),
-            ]);
-            $this->reservations->syncPurchaseExpiration($purchase);
-
-            return $this->loadCart($checkoutCart, $tenant, true);
-        });
-    }
-
    public function makeGuestTokenCookie(string $guestToken): Cookie
    {
        $secure = (bool) config('session.secure');
@@ -319,7 +122,7 @@ class CartService
    {
        $cart = new Cart([
            'tenant_codigo' => $tenant->codigo,
-            'status' => 'active',
+            'status' => Cart::STATUS_ACTIVE,
        ]);

        $cart->setRelation('items', collect());
@@ -327,7 +130,7 @@ class CartService
        return $cart;
    }

-    protected function loadCart(Cart $cart, Tenant $tenant, bool $isCheckout = false): Cart
+    protected function loadCart(Cart $cart, Tenant $tenant): Cart
    {
        $relations = [
            'items.catalogItem.attachments',
@@ -340,11 +143,7 @@ class CartService
            'items.variant.eventDate',
        ];

-        $editingPolicy = $isCheckout
-            ? $tenant->checkout_editing_policy
-            : $tenant->cart_editing_policy;
-
-        if ($editingPolicy->allowsVariantChanges()) {
+        if ($tenant->cart_editing_policy->allowsVariantChanges()) {
            $relations = [
                ...$relations,
                'items.catalogItem.variants' => fn ($query) => $query->orderBy('id'),
@@ -424,12 +223,14 @@ class CartService
    {
        return Cart::query()
            ->where('tenant_codigo', $tenant->codigo)
-            ->where('status', 'active')
+            ->where('origin', Cart::ORIGIN_USER)
+            ->whereIn('status', [Cart::STATUS_ACTIVE, Cart::STATUS_EXPIRED])
            ->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();
    }

@@ -438,7 +239,7 @@ class CartService
     */
    protected function findCartOrFail(Tenant $tenant, array $identity): Cart
    {
-        $cart = $this->findCart($tenant, $identity);
+        $cart = $this->resolveCart($tenant, $identity, replaceExpired: false);

        if ($cart === null) {
            throw new NotFoundHttpException('Cart not found.');
@@ -451,10 +252,73 @@ 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' => 'active',
+            'status' => Cart::STATUS_ACTIVE,
+            'origin' => Cart::ORIGIN_USER,
        ];

        if ($identity['user_id'] !== null) {
--- a/app/Domains/Cart/Services/ExpireCartReservationsService.php
+++ b/app/Domains/Cart/Services/ExpireCartReservationsService.php
@@ -1,123 +0,0 @@
-<?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;
-        });
-    }
-}
--- a/app/Domains/Cart/documentacion/README.md
+++ b/app/Domains/Cart/documentacion/README.md
@@ -6,13 +6,12 @@ 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 y permite agregar, actualizar o quitar ítems.
+- `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`.
 - `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
@@ -34,4 +33,6 @@ 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.

-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`.
+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.
--- a/app/Domains/Cart/routes/api.php
+++ b/app/Domains/Cart/routes/api.php
@@ -10,10 +10,3 @@ Route::prefix('tenants/{tenant:codigo}')
        Route::patch('cart/items/{cartItem}', [CartController::class, 'updateItemQuantity']);
        Route::delete('cart/items/{cartItem}', [CartController::class, 'removeItem']);
    });
-
-Route::prefix('tenants/{tenant:codigo}')
-    ->middleware('auth:sanctum')
-    ->group(function (): void {
-        Route::patch('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'updateCheckoutItem'])->withTrashed();
-        Route::delete('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'removeCheckoutItem'])->withTrashed();
-    });
--- a/app/Domains/Catalog/Controllers/AdminApp/OnTicketFeaturedGroupController.php
+++ b/app/Domains/Catalog/Controllers/AdminApp/OnTicketFeaturedGroupController.php
@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Controllers\AdminApp;
-
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Requests\AdminApp\UpsertOnTicketFeaturedGroupRequest;
-use App\Domains\Catalog\Resources\AdminApp\OnTicketFeaturedGroupResource;
-use App\Domains\Catalog\Services\OnTicketFeaturedGroupService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-
-class OnTicketFeaturedGroupController extends Controller
-{
-    public function __construct(
-        private readonly OnTicketFeaturedGroupService $featuredGroupService,
-    ) {}
-
-    public function index(Request $request): AnonymousResourceCollection
-    {
-        return OnTicketFeaturedGroupResource::collection(
-            $this->featuredGroupService->forTenant($this->onTicketTenant($request))
-        );
-    }
-
-    public function store(UpsertOnTicketFeaturedGroupRequest $request): JsonResponse
-    {
-        $featuredGroup = $this->featuredGroupService->create(
-            $this->onTicketTenant($request),
-            $request->validated(),
-        );
-
-        return OnTicketFeaturedGroupResource::make($featuredGroup)
-            ->response()
-            ->setStatusCode(201);
-    }
-
-    public function update(
-        UpsertOnTicketFeaturedGroupRequest $request,
-        FeaturedGroup $featuredGroup,
-    ): OnTicketFeaturedGroupResource {
-        $tenant = $this->onTicketTenant($request);
-
-        abort_unless($featuredGroup->tenant_code === $tenant->codigo, 404);
-
-        return OnTicketFeaturedGroupResource::make(
-            $this->featuredGroupService->update(
-                $tenant,
-                $featuredGroup,
-                $request->validated(),
-            )
-        );
-    }
-
-    private function onTicketTenant(Request $request): Tenant
-    {
-        $tenant = $request->user()->tenant()->firstOrFail();
-
-        abort_unless($tenant->website_type_code === 'onticket', 404);
-
-        return $tenant;
-    }
-}
--- a/app/Domains/Catalog/Exceptions/StockReservationExpiredException.php
+++ b/app/Domains/Catalog/Exceptions/StockReservationExpiredException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Domains\Catalog\Exceptions;
+
+use RuntimeException;
+
+class StockReservationExpiredException extends RuntimeException
+{
+    public function __construct()
+    {
+        parent::__construct(__('api.cart.reservation_expired'));
+    }
+}
--- a/app/Domains/Catalog/Models/CatalogItem.php
+++ b/app/Domains/Catalog/Models/CatalogItem.php
@@ -27,6 +27,7 @@ use Illuminate\Support\Collection;
    'type',
    'slug',
    'nombre',
+    'group_order',
    'descripcion',
    'precio',
    'inventory_policy',
@@ -47,6 +48,7 @@ class CatalogItem extends Model
        'inventory_policy' => InventoryPolicy::Tracked->value,
        'inventory_subject' => InventorySubject::Product->value,
        'has_tickets' => false,
+        'group_order' => 0,
    ];

    protected function casts(): array
@@ -56,6 +58,7 @@ 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,
@@ -172,17 +175,29 @@ class CatalogItem extends Model
    }

    /** @param Builder<CatalogItem> $query */
-    public function scopeWhereVariantsAvailable(Builder $query): Builder
+    public function scopeWhereAvailable(Builder $query): Builder
    {
        return $query->where(function (Builder $query): void {
            $query
-                ->whereDoesntHave('variants')
-                ->orWhere('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
+                ->where('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')
+                                );
+                        });
+                });
        });
    }

--- a/app/Domains/Catalog/Models/Category.php
+++ b/app/Domains/Catalog/Models/Category.php
@@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
    'tenant_code',
    'categoria_id',
    'nombre',
+    'is_enabled',
 ])]
 class Category extends Model
 {
@@ -22,6 +23,10 @@ class Category extends Model

    protected $table = 'categorias';

+    protected $attributes = [
+        'is_enabled' => true,
+    ];
+
    /**
     * @return array<string, string>
     */
@@ -29,6 +34,7 @@ class Category extends Model
    {
        return [
            'categoria_id' => 'integer',
+            'is_enabled' => 'boolean',
        ];
    }

--- a/app/Domains/Catalog/Models/Inventory.php
+++ b/app/Domains/Catalog/Models/Inventory.php
@@ -48,10 +48,10 @@ class Inventory extends Model
        return $this->hasOne(Variant::class);
    }

-    /** @return HasMany<StockReservation, $this> */
-    public function stockReservations(): HasMany
+    /** @return HasMany<StockReservationLine, $this> */
+    public function stockReservationLines(): HasMany
    {
-        return $this->hasMany(StockReservation::class);
+        return $this->hasMany(StockReservationLine::class);
    }

    public function availableStock(): int
--- a/app/Domains/Catalog/Models/StockReservation.php
+++ b/app/Domains/Catalog/Models/StockReservation.php
@@ -2,21 +2,20 @@

 namespace App\Domains\Catalog\Models;

-use App\Domains\Cart\Models\CartItem;
+use App\Domains\Cart\Models\Cart;
 use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;

 #[Fillable([
-    'inventory_id',
-    'cart_item_id',
-    'purchase_id',
-    'quantity',
    'status',
    'expires_at',
    'committed_at',
    'released_at',
+    'expired_at',
+    'release_reason',
 ])]
 class StockReservation extends Model
 {
@@ -31,31 +30,28 @@ 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 BelongsTo<Inventory, $this> */
-    public function inventory(): BelongsTo
+    /** @return HasMany<StockReservationLine, $this> */
+    public function lines(): HasMany
    {
-        return $this->belongsTo(Inventory::class);
+        return $this->hasMany(StockReservationLine::class);
    }

-    /** @return BelongsTo<CartItem, $this> */
-    public function cartItem(): BelongsTo
+    /** @return HasOne<Cart, $this> */
+    public function currentCart(): HasOne
    {
-        return $this->belongsTo(CartItem::class);
+        return $this->hasOne(Cart::class, 'current_stock_reservation_id');
    }

-    /** @return BelongsTo<Purchase, $this> */
-    public function purchase(): BelongsTo
+    /** @return HasOne<Purchase, $this> */
+    public function purchase(): HasOne
    {
-        return $this->belongsTo(Purchase::class);
+        return $this->hasOne(Purchase::class);
    }
 }
--- a/app/Domains/Catalog/Models/StockReservationLine.php
+++ b/app/Domains/Catalog/Models/StockReservationLine.php
@@ -0,0 +1,38 @@
+<?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);
+    }
+}
--- a/app/Domains/Catalog/Requests/AdminApp/UpsertOnTicketFeaturedGroupRequest.php
+++ b/app/Domains/Catalog/Requests/AdminApp/UpsertOnTicketFeaturedGroupRequest.php
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests\AdminApp;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UpsertOnTicketFeaturedGroupRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        return [
-            'category_name' => ['required', 'string', 'max:255'],
-            'is_featured' => ['required', 'boolean'],
-        ];
-    }
-}
--- a/app/Domains/Catalog/Requests/StoreCatalogItemRequest.php
+++ b/app/Domains/Catalog/Requests/StoreCatalogItemRequest.php
@@ -51,6 +51,7 @@ 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)],
--- a/app/Domains/Catalog/Resources/AdminApp/OnTicketFeaturedGroupResource.php
+++ b/app/Domains/Catalog/Resources/AdminApp/OnTicketFeaturedGroupResource.php
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources\AdminApp;
-
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin FeaturedGroup */
-class OnTicketFeaturedGroupResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'code' => $this->code,
-            'category_id' => $this->category_id,
-            'category_name' => $this->category->nombre,
-            'group_name' => $this->group_name,
-            'is_featured' => $this->product_layout === ProductLayout::Row,
-            'type' => $this->source_type->value,
-            'product_layout' => $this->product_layout->value,
-            'group_layout' => $this->group_layout->value,
-            'order' => $this->group_order,
-        ];
-    }
-}
--- a/app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php
+++ b/app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php
@@ -20,7 +20,6 @@ class CatalogFeaturedItemResource extends JsonResource
        $catalogItem = $this->resource;
        /** @var FeaturedGroup $featuredGroup */
        $featuredGroup = $catalogItem->getRelation('featuredGroup');
-        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');

        if ($featuredGroup->product_layout === ProductLayout::ColumnWithImage) {
            return $this->columnWithImageData($catalogItem);
@@ -30,6 +29,9 @@ class CatalogFeaturedItemResource extends JsonResource
            return $this->ticketSelectorData($catalogItem);
        }

+        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');
+        $availableStock = $catalogItem->availableStock();
+
        $data = [
            'id' => $catalogItem->id,
            'type' => $catalogItem->type->value,
@@ -37,26 +39,38 @@ class CatalogFeaturedItemResource extends JsonResource
            'descripcion' => $catalogItem->descripcion,
            'precio' => $catalogItem->precio,
            'maximum_addable_quantity' => $this->maximumAddable(
-                $catalogItem->availableStock(),
+                $availableStock,
+                $remainingUserQuota,
+            ),
+            'unavailable_message' => $this->unavailableMessage(
+                $availableStock,
                $remainingUserQuota,
            ),
            'variants' => $catalogItem->visibleVariants()
-                ->map(fn (Variant $variant): array => [
-                    'id' => $variant->id,
-                    'event_date_id' => $variant->event_date_id,
-                    'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
-                    'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
-                    '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(
-                        $catalogItem->inventory_policy === InventoryPolicy::Unlimited
-                            ? null
-                            : $variant->inventory->availableStock(),
-                        $remainingUserQuota,
-                    ),
-                    'values' => $variant->selectorOptions($catalogItem->itemAttributes),
-                ])
+                ->map(function (Variant $variant) use ($catalogItem, $remainingUserQuota): array {
+                    $variantStock = $catalogItem->inventory_policy === InventoryPolicy::Unlimited
+                        ? null
+                        : $variant->inventory->availableStock();
+
+                    return [
+                        'id' => $variant->id,
+                        'event_date_id' => $variant->event_date_id,
+                        'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
+                        'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
+                        '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,
+                        ),
+                        'values' => $variant->selectorOptions($catalogItem->itemAttributes),
+                    ];
+                })
                ->values(),
        ];

@@ -66,6 +80,9 @@ class CatalogFeaturedItemResource extends JsonResource
    /** @return array<string, mixed> */
    private function ticketSelectorData(CatalogItem $catalogItem): array
    {
+        $availableStock = $catalogItem->availableStock();
+        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');
+
        return [
            'id' => $catalogItem->id,
            'type' => $catalogItem->type->value,
@@ -73,25 +90,32 @@ 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),
        ];
    }

    /** @return array<string, mixed> */
    private function columnWithImageData(CatalogItem $catalogItem): array
    {
+        $availableStock = $catalogItem->availableStock();
+        $remainingUserQuota = $catalogItem->getAttribute('remaining_user_quota');
+
        return [
            'id' => $catalogItem->id,
            'type' => $catalogItem->type->value,
            'nombre' => $catalogItem->nombre,
            'precio' => $catalogItem->precio,
            'image' => $this->firstImageUrl($catalogItem),
+            'maximum_addable_quantity' => $this->maximumAddable($availableStock, $remainingUserQuota),
+            'unavailable_message' => $this->unavailableMessage($availableStock, $remainingUserQuota),
        ];
    }

    private function firstImageUrl(CatalogItem $catalogItem): ?string
    {
        $attachment = $catalogItem->attachments->first()
-            ?? $catalogItem->variants
+            ?? $catalogItem->visibleVariants()
                ->flatMap(fn (Variant $variant) => $variant->attachments)
                ->first();

@@ -103,4 +127,10 @@ class CatalogFeaturedItemResource extends JsonResource
        return app(CatalogItemAllowanceService::class)
            ->maximumAddableQuantity($stock, $remainingUserQuota);
    }
+
+    private function unavailableMessage(?int $stock, ?int $remainingUserQuota): ?string
+    {
+        return app(CatalogItemAllowanceService::class)
+            ->unavailableMessage($stock, $remainingUserQuota);
+    }
 }
--- a/app/Domains/Catalog/Resources/CatalogItemDetailResource.php
+++ b/app/Domains/Catalog/Resources/CatalogItemDetailResource.php
@@ -42,11 +42,15 @@ class CatalogItemDetailResource extends JsonResource
                $selectedVariant === null,
                fn () => $this->maximumAddable($this->availableStock()),
            ),
+            'unavailable_message' => $this->when(
+                $selectedVariant === null,
+                fn () => $this->unavailableMessage($this->availableStock()),
+            ),
            'images' => $this->when(
                $selectedVariant === null,
                fn () => $this->imageUrls($this->attachments),
            ),
-            'variants' => $this->visibleVariants()
+            'variants' => $this->variants
                ->map(fn (Variant $variant): array => $this->variantData($variant))
                ->values(),
            'selected_variant' => $this->when(
@@ -159,6 +163,7 @@ class CatalogItemDetailResource extends JsonResource
    {
        $values = $variant->selectionOptions($this->itemAttributes);
        $eventDates = $variant->selectedEventDates();
+        $variantStock = $this->variantStock($variant);

        return [
            'id' => $variant->id,
@@ -168,7 +173,8 @@ 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($this->variantStock($variant)),
+            'maximum_addable_quantity' => $this->maximumAddable($variantStock),
+            'unavailable_message' => $this->unavailableMessage($variantStock),
            'values' => $values,
        ];
    }
@@ -195,4 +201,12 @@ class CatalogItemDetailResource extends JsonResource
            $this->getAttribute('remaining_user_quota'),
        );
    }
+
+    private function unavailableMessage(?int $stock): ?string
+    {
+        return app(CatalogItemAllowanceService::class)->unavailableMessage(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
 }
--- a/app/Domains/Catalog/Resources/CatalogSearchItemResource.php
+++ b/app/Domains/Catalog/Resources/CatalogSearchItemResource.php
@@ -15,8 +15,10 @@ class CatalogSearchItemResource extends JsonResource
    /** @return array<string, mixed> */
    public function toArray(Request $request): array
    {
+        $availableStock = $this->availableStock();
+        $visibleVariants = $this->visibleVariants();
        $attachment = $this->attachments->first()
-            ?? $this->variants
+            ?? $visibleVariants
                ->flatMap(fn (Variant $variant) => $variant->attachments)
                ->first();

@@ -27,23 +29,27 @@ class CatalogSearchItemResource extends JsonResource
            'descripcion' => $this->descripcion,
            'precio' => $this->precio,
            'image' => $attachment?->getTemporaryUrl(1440),
-            'maximum_addable_quantity' => $this->maximumAddable($this->availableStock()),
-            'variants' => $this->visibleVariants()
-                ->map(fn (Variant $variant): array => [
-                    'id' => $variant->id,
-                    'event_date_id' => $variant->event_date_id,
-                    'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
-                    'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
-                    '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(
-                        $this->inventory_policy === InventoryPolicy::Unlimited
-                            ? null
-                            : $variant->inventory?->availableStock(),
-                    ),
-                    'values' => $variant->selectorOptions($this->itemAttributes),
-                ])
+            'maximum_addable_quantity' => $this->maximumAddable($availableStock),
+            'unavailable_message' => $this->unavailableMessage($availableStock),
+            'variants' => $visibleVariants
+                ->map(function (Variant $variant): array {
+                    $variantStock = $this->inventory_policy === InventoryPolicy::Unlimited
+                        ? null
+                        : $variant->inventory?->availableStock();
+
+                    return [
+                        'id' => $variant->id,
+                        'event_date_id' => $variant->event_date_id,
+                        'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
+                        'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
+                        '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),
+                        'values' => $variant->selectorOptions($this->itemAttributes),
+                    ];
+                })
                ->values(),
        ];
    }
@@ -55,4 +61,12 @@ class CatalogSearchItemResource extends JsonResource
            $this->getAttribute('remaining_user_quota'),
        );
    }
+
+    private function unavailableMessage(?int $stock): ?string
+    {
+        return app(CatalogItemAllowanceService::class)->unavailableMessage(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
 }
--- a/app/Domains/Catalog/Services/CatalogInventoryService.php
+++ b/app/Domains/Catalog/Services/CatalogInventoryService.php
@@ -25,6 +25,24 @@ 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
--- a/app/Domains/Catalog/Services/CatalogItemAllowanceService.php
+++ b/app/Domains/Catalog/Services/CatalogItemAllowanceService.php
@@ -8,6 +8,10 @@ use Illuminate\Support\Collection;

 class CatalogItemAllowanceService
 {
+    private const USER_QUOTA_REACHED_MESSAGE = 'Alcanzaste el cupo máximo permitido para este producto.';
+
+    private const OUT_OF_STOCK_MESSAGE = 'Este producto no tiene stock disponible.';
+
    public function __construct(
        private readonly UserPurchaseLimitService $purchaseLimits,
    ) {}
@@ -37,4 +41,17 @@ class CatalogItemAllowanceService

        return min($availableStock, $remainingUserQuota);
    }
+
+    public function unavailableMessage(?int $availableStock, ?int $remainingUserQuota): ?string
+    {
+        if ($remainingUserQuota !== null && $remainingUserQuota <= 0) {
+            return self::USER_QUOTA_REACHED_MESSAGE;
+        }
+
+        if ($availableStock !== null && $availableStock <= 0) {
+            return self::OUT_OF_STOCK_MESSAGE;
+        }
+
+        return null;
+    }
 }
--- a/app/Domains/Catalog/Services/CatalogService.php
+++ b/app/Domains/Catalog/Services/CatalogService.php
@@ -205,6 +205,13 @@ 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);
@@ -231,7 +238,7 @@ class CatalogService

        $paginator = CatalogItem::query()
            ->where('tenant_code', $tenant->codigo)
-            ->whereVariantsAvailable()
+            ->whereAvailable()
            ->where(function (Builder $query) use ($containsPattern): void {
                $query
                    ->whereRaw('LOWER(nombre) LIKE ?', [$containsPattern])
@@ -281,7 +288,7 @@ class CatalogService
        return CatalogItem::query()
            ->where('tenant_code', $tenant->codigo)
            ->where('category_id', $category->id)
-            ->whereVariantsAvailable()
+            ->whereAvailable()
            ->with([
                'attachments',
                'inventory',
--- a/app/Domains/Catalog/Services/ExpireStockReservationsService.php
+++ b/app/Domains/Catalog/Services/ExpireStockReservationsService.php
@@ -2,50 +2,184 @@

 namespace App\Domains\Catalog\Services;

-use App\Domains\Cart\Services\ExpireCartReservationsService;
-use App\Domains\Purchase\Services\CheckoutService;
+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 Illuminate\Support\Facades\Log;
+use RuntimeException;
 use Throwable;

 class ExpireStockReservationsService
 {
+    private const BATCH_SIZE = 500;
+
    public function __construct(
-        private readonly CheckoutService $checkout,
-        private readonly ExpireCartReservationsService $carts,
+        private readonly ReleaseCheckoutService $purchases,
+        private readonly StockReservationService $reservations,
    ) {}

    /**
-     * @return array{purchases: int, cart_items: int}
+     * @return array{purchases: int, cart_reservations: int, orphan_reservations: int, failed: int}
     */
    public function expireOverdue(): array
    {
-        $expiredPurchases = null;
-        $expiredCartItems = null;
+        $summary = [
+            'purchases' => 0,
+            'cart_reservations' => 0,
+            'orphan_reservations' => 0,
+            'failed' => 0,
+        ];
+        $lastReservationId = 0;

-        try {
-            $expiredPurchases = $this->checkout->expireOverduePurchases();
-            $expiredCartItems = $this->carts->expireOverdue();
+        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');

-            Log::channel('commands')->info('Stock reservation cleanup completed.', [
-                'command' => 'reservations:expire',
-                'expired_purchases' => $expiredPurchases,
-                'expired_cart_items' => $expiredCartItems,
-                'total_expired' => $expiredPurchases + $expiredCartItems,
-            ]);
+            foreach ($reservationIds as $reservationId) {
+                $lastReservationId = (int) $reservationId;

-            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,
-            ]);
+                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);

-            throw $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;
        }
+        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();
    }
 }
--- a/app/Domains/Catalog/Services/FeaturedGroupService.php
+++ b/app/Domains/Catalog/Services/FeaturedGroupService.php
@@ -49,7 +49,16 @@ class FeaturedGroupService
    {
        $query = CatalogItem::query()
            ->where('catalog_items.tenant_code', $featuredGroup->tenant_code)
-            ->whereVariantsAvailable()
+            ->whereAvailable()
+            ->where(function (Builder $query): void {
+                $query
+                    ->whereDoesntHave('category')
+                    ->orWhereHas(
+                        'category',
+                        fn (Builder $categoryQuery): Builder => $categoryQuery
+                            ->where('is_enabled', true),
+                    );
+            })
            ->with([
                'inventory',
                'attachments',
@@ -73,7 +82,9 @@ class FeaturedGroupService
            FeaturedGroupSource::Category => $query
                ->where('catalog_items.category_id', $featuredGroup->category_id)
                ->orderBy('catalog_items.id'),
-            FeaturedGroupSource::All => $query->orderBy('catalog_items.id'),
+            FeaturedGroupSource::All => $query
+                ->orderBy('catalog_items.group_order')
+                ->orderBy('catalog_items.id'),
        };
    }

--- a/app/Domains/Catalog/Services/OnTicketFeaturedGroupService.php
+++ b/app/Domains/Catalog/Services/OnTicketFeaturedGroupService.php
@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Services;
-
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Facades\DB;
-
-class OnTicketFeaturedGroupService
-{
-    /** @return Collection<int, FeaturedGroup> */
-    public function forTenant(Tenant $tenant): Collection
-    {
-        return FeaturedGroup::query()
-            ->where('tenant_code', $tenant->codigo)
-            ->where('source_type', FeaturedGroupSource::Category)
-            ->whereHas('category', fn ($query) => $query->where('tenant_code', $tenant->codigo))
-            ->with('category')
-            ->orderBy('group_order')
-            ->orderBy('id')
-            ->get();
-    }
-
-    /** @param array{category_name: string, is_featured: bool} $data */
-    public function create(Tenant $tenant, array $data): FeaturedGroup
-    {
-        return DB::transaction(function () use ($tenant, $data): FeaturedGroup {
-            $category = $tenant->categories()->create([
-                'nombre' => $data['category_name'],
-            ]);
-
-            $featuredGroup = FeaturedGroup::query()->create([
-                'tenant_code' => $tenant->codigo,
-                'source_type' => FeaturedGroupSource::Category,
-                'category_id' => $category->id,
-                'product_layout' => $this->productLayout($data['is_featured']),
-                'group_layout' => GroupLayout::Paginated,
-                'group_name' => $data['category_name'],
-                'group_order' => $this->nextOrder($tenant),
-            ]);
-
-            return $featuredGroup->setRelation('category', $category);
-        });
-    }
-
-    /** @param array{category_name: string, is_featured: bool} $data */
-    public function update(
-        Tenant $tenant,
-        FeaturedGroup $featuredGroup,
-        array $data,
-    ): FeaturedGroup {
-        return DB::transaction(function () use ($tenant, $featuredGroup, $data): FeaturedGroup {
-            $featuredGroup = FeaturedGroup::query()
-                ->whereKey($featuredGroup->getKey())
-                ->where('tenant_code', $tenant->codigo)
-                ->where('source_type', FeaturedGroupSource::Category)
-                ->lockForUpdate()
-                ->firstOrFail();
-
-            $category = Category::query()
-                ->whereKey($featuredGroup->category_id)
-                ->where('tenant_code', $tenant->codigo)
-                ->lockForUpdate()
-                ->firstOrFail();
-
-            $category->update(['nombre' => $data['category_name']]);
-            $featuredGroup->update([
-                'group_name' => $data['category_name'],
-                'product_layout' => $this->productLayout($data['is_featured']),
-                'group_layout' => GroupLayout::Paginated,
-            ]);
-
-            return $featuredGroup->setRelation('category', $category);
-        });
-    }
-
-    private function productLayout(bool $isFeatured): ProductLayout
-    {
-        return $isFeatured ? ProductLayout::Row : ProductLayout::ColumnWithCart;
-    }
-
-    private function nextOrder(Tenant $tenant): int
-    {
-        $maximumOrder = FeaturedGroup::query()
-            ->where('tenant_code', $tenant->codigo)
-            ->max('group_order');
-
-        return $maximumOrder === null ? 0 : ((int) $maximumOrder) + 1;
-    }
-}
--- a/app/Domains/Catalog/Services/StockReservationService.php
+++ b/app/Domains/Catalog/Services/StockReservationService.php
@@ -2,223 +2,486 @@

 namespace App\Domains\Catalog\Services;

+use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Catalog\Models\Inventory;
 use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Catalog\Models\StockReservationLine;
 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 reserve(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
+    public function syncCart(Cart $cart): ?StockReservation
    {
-        DB::transaction(function () use ($cartItem, $selection, $quantity): void {
-            $this->inventory->reserve($selection, $quantity);
-            $this->recordIncrease($cartItem, $selection, $quantity);
-        });
-    }
+        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);

-    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);
-        });
-    }
+            $reservation = $lockedCart->current_stock_reservation_id === null
+                ? null
+                : StockReservation::query()->lockForUpdate()->find($lockedCart->current_stock_reservation_id);

-    public function commit(CartItem $cartItem, CatalogItem|Variant $selection): void
-    {
-        DB::transaction(function () use ($cartItem, $selection): void {
-            $this->ensure($cartItem, $selection);
-            $this->inventory->commit($selection, (int) $cartItem->cantidad);
+            if ($reservation !== null) {
+                $this->assertUsableCartReservation($reservation);
+            }

-            $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->quantity !== $quantity) {
-                    throw new \InvalidArgumentException('La reserva de stock no coincide con el item del carrito.');
+            if ($requirements === []) {
+                if ($reservation !== null && $reservation->status === StockReservation::STATUS_ACTIVE) {
+                    $this->finalizeLocked(
+                        $reservation,
+                        StockReservation::STATUS_RELEASED,
+                        self::REASON_CART_EMPTY,
+                    );
                }

-                $reservation->update([
-                    'status' => StockReservation::STATUS_COMMITTED,
-                    'committed_at' => now(),
-                    'expires_at' => null,
-                ]);
+                $lockedCart->update(['current_stock_reservation_id' => null]);
+                $cart->current_stock_reservation_id = null;
+
+                return 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) {
-                StockReservation::query()->create([
-                    'inventory_id' => $inventoryId,
-                    'cart_item_id' => $cartItem->getKey(),
-                    'quantity' => $quantity,
+                $reservation = StockReservation::query()->create([
                    'status' => StockReservation::STATUS_ACTIVE,
                    'expires_at' => $this->expiration(),
                ]);
-
-                continue;
+                $lockedCart->update(['current_stock_reservation_id' => $reservation->getKey()]);
            }

-            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(),
-                ]);
+            if (Purchase::query()->where('stock_reservation_id', $reservation->getKey())->exists()) {
+                throw new \InvalidArgumentException('La reserva vinculada a una compra no se puede modificar.');
            }
-        }
-    }

-    public function attachToPurchase(
-        CartItem $cartItem,
-        CatalogItem|Variant $selection,
-        Purchase $purchase,
-    ): 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 detachFromPurchase(Purchase $purchase): void
-    {
-        StockReservation::query()
-            ->where('purchase_id', $purchase->getKey())
-            ->where('status', StockReservation::STATUS_ACTIVE)
-            ->update([
-                'purchase_id' => null,
-                'expires_at' => $this->expiration(),
-            ]);
-    }
-
-    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)
+            $currentLines = StockReservationLine::query()
+                ->where('stock_reservation_id', $reservation->getKey())
                ->orderBy('inventory_id')
                ->lockForUpdate()
-                ->get();
+                ->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 ($sourceReservations as $sourceReservation) {
-                $targetReservation = $this->lockReservation($target, (int) $sourceReservation->inventory_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 ($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(),
-                    ]);
+                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;
                }

-                $targetReservation->update([
-                    'quantity' => $targetReservation->quantity + $sourceReservation->quantity,
-                    'status' => StockReservation::STATUS_ACTIVE,
-                    'expires_at' => $this->expiration(),
-                ]);
-                $sourceReservation->delete();
+                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,
+        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');
+        });
+    }
+
+    public function commit(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,
+            ]);
+        });
+    }
+
+    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);
            }
        });
    }

-    private function recordIncrease(CartItem $cartItem, CatalogItem|Variant $selection, int $quantity): void
+    public function returnToCart(Purchase $purchase, Cart $cart): StockReservation
    {
-        foreach ($this->inventory->requirementsFor($selection, $quantity) as $inventoryId => $requiredQuantity) {
-            $reservation = $this->lockReservation($cartItem, $inventoryId);
+        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 ($reservation === null) {
-                StockReservation::query()->create([
-                    'inventory_id' => $inventoryId,
-                    'cart_item_id' => $cartItem->getKey(),
-                    'quantity' => $requiredQuantity,
-                    'status' => StockReservation::STATUS_ACTIVE,
-                    'expires_at' => $this->expiration(),
-                ]);
-
-                continue;
+            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.');
            }

-            $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(),
-            ]);
-        }
+            /** @var StockReservation $reservation */
+            $reservation = StockReservation::query()
+                ->lockForUpdate()
+                ->findOrFail($purchase->stock_reservation_id);
+            $this->assertUsableCartReservation($reservation);
+
+            $purchase->update(['stock_reservation_id' => null]);
+            $cart->update(['current_purchase_id' => null]);
+            $reservation->update(['expires_at' => $this->expiration()]);
+
+            return $reservation->fresh('lines');
+        });
    }

-    private function recordDecrease(
-        CartItem $cartItem,
-        CatalogItem|Variant $selection,
-        int $quantity,
-        string $releasedStatus,
+    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) {
+                return;
+            }
+
+            /** @var StockReservation $reservation */
+            $reservation = StockReservation::query()
+                ->lockForUpdate()
+                ->findOrFail($cart->current_stock_reservation_id);
+            $this->assertUsableCartReservation($reservation);
+        });
+    }
+
+    public function releaseCurrentCartReservation(
+        Cart $cart,
+        string $reason = self::REASON_CART_CHANGED,
    ): void {
-        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.');
+        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;
            }

-            $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,
-            ]);
+            /** @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'];
+
+                    continue;
+                }
+
+                $requirements[$inventoryId] = $requirement;
+            }
+        }
+
+        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,
+    ): 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.');
+        }
+
+        $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]);
        }
    }

-    private function lockReservation(CartItem $cartItem, int $inventoryId): ?StockReservation
+    private function assertUsableCartReservation(StockReservation $reservation): void
    {
-        return StockReservation::query()
-            ->where('cart_item_id', $cartItem->getKey())
-            ->where('inventory_id', $inventoryId)
-            ->lockForUpdate()
-            ->first();
+        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.');
+        }
    }

    private function expiration(): Carbon
--- a/app/Domains/Catalog/documentacion/README.md
+++ b/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` atribuye cada unidad reservada a un ítem de carrito y, durante checkout, a una compra, con estados `active`, `committed`, `released` y `expired`.
+- `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.
 - `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,18 +18,14 @@ 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`: mantiene el ledger de reservas sincronizado con `Inventory.reserved_stock`.
+- `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.
 - `FeaturedGroupService`: pagina los ítems destacados para la tienda.
- `OnTicketFeaturedGroupService`: administra grupos destacados del panel para sitios de tickets.

 ## Endpoints de tienda

 Bajo `/tenants/{tenant:codigo}` se publican catálogo, búsqueda, categoría, detalle, alta de ítems y paginación de grupos destacados.

-## Endpoints administrativos
-
-Bajo `/v1/adminapp/tenant/featured-groups`, con `auth:sanctum` y `adminapp.tenant`, se listan, crean y actualizan grupos destacados.
-
 ## Dependencias y reglas

 Usa `Attachable` para imágenes/archivos, `Tenant` para aislamiento y `Ticket`/`Event` para vigencia y fechas. `Cart` y `Purchase` consumen sus precios, variantes e inventario. Los cambios de stock deben pasar por `CatalogInventoryService` para conservar reservas y disponibilidad.
--- a/app/Domains/Catalog/routes/adminapp.php
+++ b/app/Domains/Catalog/routes/adminapp.php
@@ -1,15 +0,0 @@
-<?php
-
-use App\Domains\Catalog\Controllers\AdminApp\OnTicketFeaturedGroupController;
-use Illuminate\Support\Facades\Route;
-
-Route::prefix('v1/adminapp/tenant')
-    ->middleware(['auth:sanctum', 'adminapp.tenant'])
-    ->group(function (): void {
-        Route::get('featured-groups', [OnTicketFeaturedGroupController::class, 'index'])
-            ->name('adminapp.featured-groups.index');
-        Route::post('featured-groups', [OnTicketFeaturedGroupController::class, 'store'])
-            ->name('adminapp.featured-groups.store');
-        Route::put('featured-groups/{featuredGroup}', [OnTicketFeaturedGroupController::class, 'update'])
-            ->name('adminapp.featured-groups.update');
-    });
--- a/app/Domains/Catalog/routes/api.php
+++ b/app/Domains/Catalog/routes/api.php
@@ -15,5 +15,3 @@ Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
    Route::post('catalog-items/{catalogItem}/variant-options', [CatalogController::class, 'variantOptions']);
    Route::post('catalog-items', [CatalogController::class, 'store']);
 });
-
-require __DIR__.'/adminapp.php';
--- a/app/Domains/Client/Controllers/ClientController.php
+++ b/app/Domains/Client/Controllers/ClientController.php
@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Controllers;
-
-use App\Domains\Client\Models\Client;
-use App\Domains\Client\Requests\StoreClientRequest;
-use App\Domains\Client\Requests\UpdateClientRequest;
-use App\Domains\Client\Resources\ClientResource;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-
-class ClientController extends Controller
-{
-    public function index(): JsonResponse
-    {
-        return ClientResource::collection(
-            Client::query()->with('tenants')->latest()->paginateFromRequest()
-        )->response();
-    }
-
-    public function store(StoreClientRequest $request): JsonResponse
-    {
-        return ClientResource::make(
-            Client::query()->create($request->validated())->load('tenants')
-        )->response()->setStatusCode(201);
-    }
-
-    public function show(Client $client): ClientResource
-    {
-        return ClientResource::make($client->load('tenants'));
-    }
-
-    public function update(UpdateClientRequest $request, Client $client): ClientResource
-    {
-        $client->update($request->validated());
-
-        return ClientResource::make($client->fresh()->load('tenants'));
-    }
-
-    public function destroy(Client $client): Response
-    {
-        $client->delete();
-
-        return response()->noContent();
-    }
-}
--- a/app/Domains/Client/Requests/StoreClientRequest.php
+++ b/app/Domains/Client/Requests/StoreClientRequest.php
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StoreClientRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    public function rules(): array
-    {
-        return [
-            'code' => ['required', 'string', 'max:255', Rule::unique('clients', 'code')],
-            'name' => ['required', 'string', 'max:255'],
-        ];
-    }
-}
--- a/app/Domains/Client/Requests/UpdateClientRequest.php
+++ b/app/Domains/Client/Requests/UpdateClientRequest.php
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Requests;
-
-use App\Domains\Client\Models\Client;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdateClientRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    public function rules(): array
-    {
-        /** @var Client|null $client */
-        $client = $this->route('client');
-
-        return [
-            'code' => ['sometimes', 'string', 'max:255', Rule::unique('clients', 'code')->ignore($client?->id)],
-            'name' => ['sometimes', 'string', 'max:255'],
-        ];
-    }
-}
--- a/app/Domains/Client/Resources/ClientResource.php
+++ b/app/Domains/Client/Resources/ClientResource.php
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Client\Resources;
-
-use App\Domains\Client\Models\Client;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin Client */
-class ClientResource extends JsonResource
-{
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'code' => $this->code,
-            'name' => $this->name,
-            'tenants' => $this->whenLoaded('tenants', fn () => $this->tenants->map(fn ($tenant): array => [
-                'id' => $tenant->id,
-                'codigo' => $tenant->codigo,
-                'nombre' => $tenant->nombre,
-                'dominio' => $tenant->dominio,
-            ])),
-        ];
-    }
-}
--- a/app/Domains/Client/routes/api.php
+++ b/app/Domains/Client/routes/api.php
@@ -1,6 +0,0 @@
-<?php
-
-use App\Domains\Client\Controllers\ClientController;
-use Illuminate\Support\Facades\Route;
-
-Route::apiResource('clients', ClientController::class);
--- a/app/Domains/Desfile/Controllers/EntryController.php
+++ b/app/Domains/Desfile/Controllers/EntryController.php
@@ -10,7 +10,6 @@ use App\Domains\Desfile\Services\EntryService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;

 class EntryController extends Controller
 {
@@ -48,10 +47,4 @@ class EntryController extends Controller
        ));
    }

-    public function destroyImage(Request $request): Response
-    {
-        $this->entryService->deleteImage($request->user()->tenant()->firstOrFail());
-
-        return response()->noContent();
-    }
 }
--- a/app/Domains/Desfile/Services/EntryService.php
+++ b/app/Domains/Desfile/Services/EntryService.php
@@ -166,19 +166,6 @@ class EntryService
        return $this->current($tenant);
    }

-    public function deleteImage(Tenant $tenant): void
-    {
-        $attachment = DB::transaction(function () use ($tenant): Attachment {
-            $entry = $this->entryQuery($tenant)->lockForUpdate()->firstOrFail();
-            $attachment = $entry->allAttachments()->lockForUpdate()->firstOrFail();
-            $entry->allAttachments()->detach($attachment->id);
-
-            return $attachment;
-        });
-
-        $this->deleteIfUnused($attachment);
-    }
-
    /** @return Collection<string, ItemAttribute> */
    private function itemAttributes(CatalogItem $entry): Collection
    {
--- a/app/Domains/Desfile/Services/InvitationPurchaseProvisioner.php
+++ b/app/Domains/Desfile/Services/InvitationPurchaseProvisioner.php
@@ -17,21 +17,25 @@ class InvitationPurchaseProvisioner
    private const PAYMENT_METHOD = 'invitation';

    /**
-     * @var list<array{sector: string, row: int, seats: int, type: string}>
+     * @var list<array{sector: string, row: int, first_seat: int, last_seat: int, type: string}>
     */
    private const ALLOCATIONS = [
-        ['sector' => 'A', 'row' => 1, 'seats' => 16, 'type' => 'NORMAL'],
-        ['sector' => 'A', 'row' => 3, 'seats' => 14, 'type' => 'NORMAL'],
-        ['sector' => 'C', 'row' => 1, 'seats' => 16, 'type' => 'VIP + LUNCH'],
+        ['sector' => 'A', 'row' => 1, 'first_seat' => 1, 'last_seat' => 16, 'type' => 'NORMAL'],
+        ['sector' => 'A', 'row' => 3, 'first_seat' => 1, 'last_seat' => 14, 'type' => 'NORMAL'],
+        ['sector' => 'C', 'row' => 1, 'first_seat' => 1, 'last_seat' => 16, 'type' => 'VIP + LUNCH'],
+        ['sector' => 'C', 'row' => 3, 'first_seat' => 6, 'last_seat' => 7, 'type' => 'NORMAL'],
    ];

-    public function provision(): void
+    /**
+     * @param  list<array{sector: string, row: int, first_seat: int, last_seat: int, type: string}>|null  $allocations
+     */
+    public function provision(?array $allocations = null): void
    {
        if (! $this->prerequisitesExist()) {
            return;
        }

-        DB::transaction(function (): void {
+        DB::transaction(function () use ($allocations): void {
            $now = now();
            $userId = $this->userId($now);
            $purchaseId = $this->purchaseId($userId, $now);
@@ -44,8 +48,8 @@ class InvitationPurchaseProvisioner
                throw new RuntimeException('No se encontró el catálogo de entradas del desfile.');
            }

-            foreach (self::ALLOCATIONS as $allocation) {
-                foreach (range(1, $allocation['seats']) as $seat) {
+            foreach ($allocations ?? self::ALLOCATIONS as $allocation) {
+                foreach (range($allocation['first_seat'], $allocation['last_seat']) as $seat) {
                    $variant = $this->variant(
                        (int) $catalogItem->id,
                        $allocation['sector'],
@@ -140,7 +144,6 @@ class InvitationPurchaseProvisioner
        if ($purchaseId !== null) {
            DB::table('compras')->where('id', $purchaseId)->update([
                'status' => 'paid',
-                'expires_at' => null,
                'total' => 0,
                'updated_at' => $now,
            ]);
@@ -154,7 +157,6 @@ class InvitationPurchaseProvisioner
            'cart_id' => null,
            'status' => 'paid',
            'payment_method' => self::PAYMENT_METHOD,
-            'expires_at' => null,
            'total' => 0,
            'dni' => null,
            'transfer_payer_dni' => null,
@@ -388,15 +390,27 @@ class InvitationPurchaseProvisioner
            'sold_units' => $inventory->sold_units + 1,
        ]);

-        DB::table('stock_reservations')->insert([
+        $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,
            'inventory_id' => $inventory->id,
-            'cart_item_id' => null,
-            'purchase_id' => $purchaseId,
            'quantity' => 1,
-            'status' => 'committed',
-            'expires_at' => null,
-            'committed_at' => $now,
-            'released_at' => null,
+            'tracks_inventory' => true,
            'created_at' => $now,
            'updated_at' => $now,
        ]);
--- a/app/Domains/Desfile/routes/api.php
+++ b/app/Domains/Desfile/routes/api.php
@@ -14,6 +14,4 @@ Route::prefix('v1/adminapp/tenant/desfile')
            ->name('adminapp.desfile.entries.image.replace');
        Route::patch('entries/image', [EntryController::class, 'updateImage'])
            ->name('adminapp.desfile.entries.image.update');
-        Route::delete('entries/image', [EntryController::class, 'destroyImage'])
-            ->name('adminapp.desfile.entries.image.destroy');
    });
--- a/app/Domains/FiestaFutbolInfantil/Controllers/CategoryVisibilityController.php
+++ b/app/Domains/FiestaFutbolInfantil/Controllers/CategoryVisibilityController.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Controllers;
+
+use App\Domains\FiestaFutbolInfantil\Enums\FiestaCategory;
+use App\Domains\FiestaFutbolInfantil\Requests\UpdateCategoryVisibilityRequest;
+use App\Domains\FiestaFutbolInfantil\Services\CategoryVisibilityService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CategoryVisibilityController extends Controller
+{
+    public function __construct(private readonly CategoryVisibilityService $visibilityService) {}
+
+    public function show(Request $request): JsonResponse
+    {
+        $category = $this->category($request);
+        $tenant = $request->user()->tenant()->firstOrFail();
+
+        return response()->json([
+            'data' => [
+                'is_enabled' => $this->visibilityService->isEnabled($tenant, $category),
+            ],
+        ]);
+    }
+
+    public function update(UpdateCategoryVisibilityRequest $request): JsonResponse
+    {
+        $category = $this->category($request);
+        $tenant = $request->user()->tenant()->firstOrFail();
+        $model = $this->visibilityService->update(
+            $tenant,
+            $category,
+            $request->boolean('is_enabled'),
+        );
+
+        return response()->json([
+            'data' => [
+                'is_enabled' => $model->is_enabled,
+            ],
+            'message' => $model->is_enabled
+                ? 'Mostrar en sitio web se activo correctamente'
+                : 'Mostrar en sitio web se desactivo correctamente',
+        ]);
+    }
+
+    private function category(Request $request): FiestaCategory
+    {
+        return FiestaCategory::from((string) $request->route('category'));
+    }
+}
--- a/app/Domains/FiestaFutbolInfantil/Enums/FiestaCategory.php
+++ b/app/Domains/FiestaFutbolInfantil/Enums/FiestaCategory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Enums;
+
+enum FiestaCategory: string
+{
+    case Entries = 'entries';
+    case Foods = 'foods';
+    case Accommodations = 'accommodations';
+    case Merchandise = 'merchandise';
+
+    public function categoryName(): string
+    {
+        return match ($this) {
+            self::Entries => 'Entradas',
+            self::Foods => 'Comidas',
+            self::Accommodations => 'Alojamientos',
+            self::Merchandise => 'Merchandising',
+        };
+    }
+}
--- a/app/Domains/FiestaFutbolInfantil/Requests/UpdateCategoryVisibilityRequest.php
+++ b/app/Domains/FiestaFutbolInfantil/Requests/UpdateCategoryVisibilityRequest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateCategoryVisibilityRequest extends FormRequest
+{
+    /** @return array<string, mixed> */
+    public function rules(): array
+    {
+        return [
+            'is_enabled' => ['required', 'boolean'],
+        ];
+    }
+}
--- a/app/Domains/FiestaFutbolInfantil/Services/CategoryVisibilityService.php
+++ b/app/Domains/FiestaFutbolInfantil/Services/CategoryVisibilityService.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\FiestaFutbolInfantil\Services;
+
+use App\Domains\Catalog\Models\Category;
+use App\Domains\FiestaFutbolInfantil\Enums\FiestaCategory;
+use App\Domains\Tenant\Models\Tenant;
+
+class CategoryVisibilityService
+{
+    public function isEnabled(Tenant $tenant, FiestaCategory $category): bool
+    {
+        return Category::query()
+            ->where('tenant_code', $tenant->codigo)
+            ->where('nombre', $category->categoryName())
+            ->value('is_enabled') ?? true;
+    }
+
+    public function update(Tenant $tenant, FiestaCategory $category, bool $isEnabled): Category
+    {
+        $model = Category::query()->firstOrCreate([
+            'tenant_code' => $tenant->codigo,
+            'nombre' => $category->categoryName(),
+        ]);
+        $model->update(['is_enabled' => $isEnabled]);
+
+        return $model;
+    }
+}
--- a/app/Domains/FiestaFutbolInfantil/routes/api.php
+++ b/app/Domains/FiestaFutbolInfantil/routes/api.php
@@ -1,6 +1,7 @@
 <?php

 use App\Domains\FiestaFutbolInfantil\Controllers\AccommodationController;
+use App\Domains\FiestaFutbolInfantil\Controllers\CategoryVisibilityController;
 use App\Domains\FiestaFutbolInfantil\Controllers\EntryController;
 use App\Domains\FiestaFutbolInfantil\Controllers\FoodController;
 use App\Domains\FiestaFutbolInfantil\Controllers\MerchandiseController;
@@ -9,6 +10,20 @@ use Illuminate\Support\Facades\Route;
 Route::prefix('v1/adminapp/tenant')
    ->middleware(['auth:sanctum', 'adminapp.tenant'])
    ->group(function (): void {
+        $visibilityRoutes = static function (string $endpoint, string $category, string $menuCode): void {
+            Route::get("{$endpoint}/visibility", [CategoryVisibilityController::class, 'show'])
+                ->defaults('category', $category)
+                ->middleware("tenant.menu:{$menuCode}");
+            Route::patch("{$endpoint}/visibility", [CategoryVisibilityController::class, 'update'])
+                ->defaults('category', $category)
+                ->middleware("tenant.menu:{$menuCode}");
+        };
+
+        $visibilityRoutes('entries', 'entries', 'adminapp.fiesta-futbol-infantil.entradas');
+        $visibilityRoutes('foods', 'foods', 'adminapp.fiesta-futbol-infantil.comida');
+        $visibilityRoutes('accommodations', 'accommodations', 'adminapp.fiesta-futbol-infantil.alojamientos');
+        $visibilityRoutes('merchandise', 'merchandise', 'adminapp.fiesta-futbol-infantil.merchandising');
+
        Route::get('entries', [EntryController::class, 'index'])
            ->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
            ->name('adminapp.fiesta-futbol-infantil.entries.index');
--- a/app/Domains/Forms/Services/SaleFormService.php
+++ b/app/Domains/Forms/Services/SaleFormService.php
@@ -12,10 +12,12 @@ class SaleFormService
        $names = [
            Purchase::STATUS_CREATED => 'Creada',
            Purchase::STATUS_PENDING_PAYMENT => 'Esperando pago',
+            Purchase::STATUS_IN_REVIEW => 'En revisión',
            Purchase::STATUS_PAID => 'Confirmada',
            Purchase::STATUS_CANCELLED => 'Cancelada',
            Purchase::STATUS_REJECTED => 'Rechazada',
            Purchase::STATUS_EXPIRED => 'Vencida',
+            Purchase::STATUS_SUPERSEDED => 'Reemplazada',
        ];

        return [
--- a/app/Domains/Integration/Controllers/IntegrationController.php
+++ b/app/Domains/Integration/Controllers/IntegrationController.php
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Controllers;
-
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\StoreIntegrationRequest;
-use App\Domains\Integration\Requests\UpdateIntegrationRequest;
-use Illuminate\Routing\Controller;
-
-class IntegrationController extends Controller
-{
-    public function index()
-    {
-        return response()->json(Integration::all());
-    }
-
-    public function store(StoreIntegrationRequest $request)
-    {
-        $integration = Integration::create($request->validated());
-
-        return response()->json($integration, 201);
-    }
-
-    public function show(Integration $integration)
-    {
-        return response()->json($integration);
-    }
-
-    public function update(UpdateIntegrationRequest $request, Integration $integration)
-    {
-        $integration->update($request->validated());
-
-        return response()->json($integration->fresh());
-    }
-
-    public function destroy(Integration $integration)
-    {
-        $integration->delete();
-
-        return response()->noContent();
-    }
-}
--- a/app/Domains/Integration/Controllers/TelepagosWebhookController.php
+++ b/app/Domains/Integration/Controllers/TelepagosWebhookController.php
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Controllers;
-
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Requests\TelepagosWebhookRequest;
-use App\Domains\Integration\Services\TelepagosWebhookService;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-
-class TelepagosWebhookController extends Controller
-{
-    /**
-     * Handle the incoming Telepagos webhook.
-     */
-    public function handle(TelepagosWebhookRequest $request, Client $client, TelepagosWebhookService $service): JsonResponse
-    {
-        try {
-            $cashinId = $request->validated('id');
-
-            $service->handleWebhook($client, $cashinId);
-
-            return response()->json(['status' => 'success']);
-        } catch (\Exception $e) {
-            return response()->json([
-                'status' => 'error',
-                'code' => 'integration.webhook_failed',
-                'message' => __('api.integration.webhook_failed'),
-            ], 500);
-        }
-    }
-}
--- a/app/Domains/Integration/Requests/StoreIntegrationRequest.php
+++ b/app/Domains/Integration/Requests/StoreIntegrationRequest.php
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class StoreIntegrationRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    public function rules(): array
-    {
-        return [
-            'integration_code' => ['required', 'string', 'unique:integrations,integration_code'],
-            'name' => ['required', 'string', 'max:255'],
-            'url' => ['nullable', 'url', 'max:255'],
-            'integration_data_schema' => ['nullable', 'array'],
-            'requires_client_configuration' => ['sometimes', 'boolean'],
-        ];
-    }
-}
--- a/app/Domains/Integration/Requests/TelepagosWebhookRequest.php
+++ b/app/Domains/Integration/Requests/TelepagosWebhookRequest.php
@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class TelepagosWebhookRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'id' => ['required', 'string'],
-        ];
-    }
-}
--- a/app/Domains/Integration/Requests/UpdateIntegrationRequest.php
+++ b/app/Domains/Integration/Requests/UpdateIntegrationRequest.php
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UpdateIntegrationRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    public function rules(): array
-    {
-        $integration = $this->route('integration');
-
-        return [
-            'name' => ['sometimes', 'required', 'string', 'max:255'],
-            'url' => ['nullable', 'url', 'max:255'],
-            'integration_data_schema' => ['nullable', 'array'],
-            'requires_client_configuration' => ['sometimes', 'boolean'],
-            // the code shouldn't ideally be updatable, but if it is:
-            'integration_code' => ['sometimes', 'required', 'string', 'unique:integrations,integration_code,'.($integration->id ?? '')],
-        ];
-    }
-}
--- a/app/Domains/Integration/Services/MailService.php
+++ b/app/Domains/Integration/Services/MailService.php
@@ -3,6 +3,8 @@
 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;
@@ -70,24 +72,35 @@ class MailService extends BaseIntegrationService
        return [];
    }

-    public function send(string|array $recipient, string $subject, string $content): void
-    {
+    /**
+     * @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 {
        if (! $this->mailer || ! $this->tenant) {
            throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
        }

-        $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
+        $brand ??= $this->tenant;
+        $branding = $this->brandingFor($brand);

        $html = Blade::render(
            <<<'BLADE'
-                <x-mail.branded-layout :tenant="$tenant" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
+                <x-mail.branded-layout :branding="$branding" :header-logo-url="$headerLogoUrl" :footer-logo-url="$footerLogoUrl">
                    {!! $content !!}
                </x-mail.branded-layout>
                BLADE,
            [
-                'tenant' => $this->tenant,
-                'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
-                'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
+                'branding' => $branding,
+                'headerLogoUrl' => $brand instanceof WebsiteType
+                    ? $brand->siteLogo?->getTemporaryUrl(1440)
+                    : $brand->headerLogo?->getTemporaryUrl(1440),
+                'footerLogoUrl' => $brand->footerLogo?->getTemporaryUrl(1440),
                'content' => $content,
            ],
        );
@@ -96,6 +109,14 @@ 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);
    }

@@ -106,6 +127,36 @@ 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) {
--- a/app/Domains/Integration/Services/TelepagosWebhookService.php
+++ b/app/Domains/Integration/Services/TelepagosWebhookService.php
@@ -1,211 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Services;
-
-use App\Domains\Client\Models\Client;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\TelepagosPayment;
-use App\Domains\Purchase\Models\TelepagosQr;
-use App\Domains\Purchase\Services\CheckoutService;
-use Exception;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-class TelepagosWebhookService
-{
-    public function __construct(
-        private readonly CheckoutService $checkoutService,
-    ) {}
-
-    /**
-     * Handle the Telepagos webhook notification.
-     *
-     * @throws Exception
-     */
-    public function handleWebhook(Client $client, string $cashinId): void
-    {
-        Log::channel('telepagos')->info('Telepagos webhook received.', [
-            'client_code' => $client->code,
-            'cashin_id' => $cashinId,
-        ]);
-
-        $telepagosService = new TelepagosIntegrationService;
-        $telepagosService->forClient($client);
-
-        try {
-            $details = $telepagosService->getCashinDetails($cashinId);
-
-            $qrOrderId = $details['data']['qr_order_id'] ?? $details['qr_order_id'] ?? null;
-            $amount = $this->normalizeAmount($details['data']['amount'] ?? $details['amount'] ?? 0);
-            $operationId = $details['data']['operation_id'] ?? $details['operation_id'] ?? null;
-
-            $paymentData = [
-                'compra_id' => null,
-                'matched_purchase_ids' => null,
-                'cuit_buyer' => $details['data']['buyer']['cuit'] ?? $details['buyer']['cuit'] ?? null,
-                'cvu_buyer' => $details['data']['buyer']['cvu'] ?? $details['buyer']['cvu'] ?? null,
-                'amount' => $amount,
-                'concept' => $details['data']['concept'] ?? $details['concept'] ?? null,
-                'operation' => $details['data']['operation'] ?? $details['operation'] ?? null,
-                'operation_id' => $details['data']['operation_id'] ?? $details['operation_id'] ?? null,
-                'transaction_id' => $details['data']['transaction_id'] ?? $details['transaction_id'] ?? null,
-                'qr_order_id' => $qrOrderId,
-                'link_id' => $details['data']['link_id'] ?? $details['link_id'] ?? null,
-            ];
-
-            $transferenciaOperationIds = [1, 3, 11];
-            $qrOperationIds = [31, 37, 47];
-
-            $compra = null;
-
-            if (in_array((int) $operationId, $transferenciaOperationIds, true)) {
-                $cuit = $details['data']['buyer']['cuit'] ?? $details['buyer']['cuit'] ?? null;
-
-                if (! $cuit) {
-                    Log::channel('telepagos')->warning('Telepagos webhook: CUIT not found for transfer.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                    ]);
-
-                    return;
-                }
-
-                $dni = substr($cuit, 2, -1);
-
-                $tenantCodes = $client->tenants()->pluck('codigo');
-                $purchases = Purchase::whereIn('tenant_codigo', $tenantCodes)
-                    ->where('transfer_payer_dni', $dni)
-                    ->whereIn('status', [
-                        Purchase::STATUS_CREATED,
-                        Purchase::STATUS_PENDING_PAYMENT,
-                    ])
-                    ->where('payment_method', 'transfer')
-                    ->where('total', $amount)
-                    ->latest()
-                    ->get();
-
-                $paymentData['matched_purchase_ids'] = $purchases->pluck('id')->all();
-                $compra = $purchases->count() === 1 ? $purchases->first() : null;
-
-                if (! $compra) {
-                    if ($purchases->count() > 1) {
-                        TelepagosPayment::create($paymentData);
-                    }
-
-                    Log::channel('telepagos')->warning('Telepagos webhook: Expected exactly one matching purchase.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                        'amount' => $amount,
-                        'matches' => $purchases->count(),
-                    ]);
-
-                    return;
-                }
-            } elseif (in_array((int) $operationId, $qrOperationIds, true)) {
-                if (! $qrOrderId) {
-                    Log::channel('telepagos')->warning('Telepagos webhook: qr_order_id not present in provider response.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                    ]);
-
-                    return;
-                }
-
-                $telepagosQr = TelepagosQr::where('qr_order_id', $qrOrderId)->first();
-
-                if (! $telepagosQr) {
-                    Log::channel('telepagos')->warning('Telepagos webhook: QR not found in database.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                        'qr_order_id' => $qrOrderId,
-                    ]);
-
-                    return;
-                }
-
-                $compra = $telepagosQr->compra;
-
-                if (! $compra) {
-                    Log::channel('telepagos')->warning('Telepagos webhook: Purchase not found for QR.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                        'qr_order_id' => $qrOrderId,
-                    ]);
-
-                    return;
-                }
-
-                if (! $client->tenants()->where('codigo', $compra->tenant_codigo)->exists()) {
-                    Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                        'purchase_id' => $compra->id,
-                    ]);
-
-                    return;
-                }
-
-                if (! in_array($compra->status, [
-                    Purchase::STATUS_PENDING_PAYMENT,
-                ], true)) {
-                    Log::channel('telepagos')->warning('Telepagos webhook: Purchase is not awaiting payment confirmation.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                        'purchase_id' => $compra->id,
-                        'purchase_status' => $compra->status,
-                    ]);
-
-                    return;
-                }
-
-                $totalAmount = $this->normalizeAmount($compra->getTotalAmount());
-
-                if ($amount !== $totalAmount) {
-                    Log::channel('telepagos')->warning('Telepagos webhook: Amount mismatch.', [
-                        'client_code' => $client->code,
-                        'cashin_id' => $cashinId,
-                        'purchase_id' => $compra->id,
-                        'cashin_amount' => $amount,
-                        'purchase_amount' => $totalAmount,
-                    ]);
-
-                    return;
-                }
-            } else {
-                Log::channel('telepagos')->warning('Telepagos webhook: Unknown operation_id.', [
-                    'client_code' => $client->code,
-                    'cashin_id' => $cashinId,
-                    'operation_id' => $operationId,
-                ]);
-
-                return;
-            }
-
-            $paymentData['compra_id'] = $compra->id;
-
-            DB::transaction(function () use ($compra, $paymentData) {
-                TelepagosPayment::create($paymentData);
-                $this->checkoutService->confirmPaidPurchase($compra);
-            });
-
-            Log::channel('telepagos')->info('Telepagos webhook processed successfully.', [
-                'client_code' => $client->code,
-                'cashin_id' => $cashinId,
-                'purchase_id' => $compra->id,
-                'transaction_id' => $paymentData['transaction_id'],
-            ]);
-        } catch (Exception $e) {
-            Log::channel('telepagos')->error('Telepagos webhook processing failed.', [
-                'client_code' => $client->code,
-                'cashin_id' => $cashinId,
-                'error' => $e->getMessage(),
-            ]);
-            throw $e;
-        }
-    }
-
-    protected function normalizeAmount(mixed $amount): string
-    {
-        return number_format((float) $amount, 2, '.', '');
-    }
-}
--- a/app/Domains/Integration/documentacion/README.md
+++ b/app/Domains/Integration/documentacion/README.md
@@ -16,18 +16,15 @@ Gestiona integraciones externas disponibles y su configuración por cliente. Un
 - `BaseIntegrationService`: resuelve el cliente desde el tenant operativo y carga exclusivamente la configuración del cliente.
 - `MailService`: envío de correo usando la integración configurada.
 - `TelepagosIntegrationService`: autenticación, caché de token, generación de QR y consulta de cobros.
- `TelepagosWebhookService`: procesa notificaciones recibidas desde Telepagos.

 ## Endpoints

- CRUD global bajo `/integrations`.
 - Consulta y configuración por cliente bajo `/clients/{client}/integrations`.
- `POST /webhooks/telepagos/{client}` para notificaciones del proveedor.

 ## Logging de Telepagos

-Los eventos de autenticación, QR, consultas de cuenta y procesamiento de webhooks se escriben en el canal diario `telepagos`, separado del log general. Los archivos se generan en `storage/logs/telepagos/telepagos-YYYY-MM-DD.log`; el nivel y la retención se configuran con `TELEPAGOS_LOG_LEVEL` y `TELEPAGOS_LOG_DAYS`. Tokens y credenciales se eliminan del contexto antes de registrar respuestas del proveedor.
+Los eventos de autenticación, QR y consultas de cuenta se escriben en el canal diario `telepagos`, separado del log general. Los archivos se generan en `storage/logs/telepagos/telepagos-YYYY-MM-DD.log`; el nivel y la retención se configuran con `TELEPAGOS_LOG_LEVEL` y `TELEPAGOS_LOG_DAYS`. Tokens y credenciales se eliminan del contexto antes de registrar respuestas del proveedor.

 ## Dependencias y reglas

-Se integra con `Client`, `Tenant` y con el checkout de `Purchase`. `Notification` utiliza `MailService`. El tenant conserva el contexto operativo y de branding, pero nunca es dueño de credenciales. Las credenciales no se exponen en respuestas ni logs; los webhooks deben validar su contrato antes de alterar una compra.
+Se integra con `Client`, `Tenant` y con el checkout de `Purchase`. `Notification` utiliza `MailService`. El tenant conserva el contexto operativo y de branding, pero nunca es dueño de credenciales. Las credenciales no se exponen en respuestas ni logs.
--- a/app/Domains/Integration/routes/api.php
+++ b/app/Domains/Integration/routes/api.php
@@ -1,22 +1,10 @@
 <?php

 use App\Domains\Integration\Controllers\ClientIntegrationController;
-use App\Domains\Integration\Controllers\IntegrationController;
-use App\Domains\Integration\Controllers\TelepagosWebhookController;
 use Illuminate\Support\Facades\Route;

-Route::group(['prefix' => 'integrations'], function () {
-    Route::get('/', [IntegrationController::class, 'index']);
-    Route::post('/', [IntegrationController::class, 'store']);
-    Route::get('/{integration}', [IntegrationController::class, 'show']);
-    Route::put('/{integration}', [IntegrationController::class, 'update']);
-    Route::delete('/{integration}', [IntegrationController::class, 'destroy']);
-});
-
 Route::group(['prefix' => 'clients/{client}/integrations'], function () {
    Route::get('/', [ClientIntegrationController::class, 'index']);
    Route::get('/{integration_code}', [ClientIntegrationController::class, 'show']);
    Route::put('/{integration_code}', [ClientIntegrationController::class, 'store']);
 });
-
-Route::post('webhooks/telepagos/{client}', [TelepagosWebhookController::class, 'handle']);
--- a/app/Domains/MailTest/Controllers/MailTestController.php
+++ b/app/Domains/MailTest/Controllers/MailTestController.php
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Domains\MailTest\Controllers;
-
-use App\Domains\MailTest\Requests\SendTestMailRequest;
-use App\Domains\MailTest\Services\MailTestService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-
-class MailTestController extends Controller
-{
-    public function __construct(
-        protected MailTestService $mailTestService,
-    ) {}
-
-    public function __invoke(SendTestMailRequest $request, string $tenantCode): JsonResponse
-    {
-        $tenant = Tenant::query()
-            ->where('codigo', $tenantCode)
-            ->firstOrFail();
-
-        return response()->json(
-            $this->mailTestService->send(
-                $tenant,
-                $request->validated('to'),
-                $request->validated('subject'),
-                $request->validated('message'),
-            )
-        );
-    }
-}
--- a/app/Domains/MailTest/Mailables/TestMail.php
+++ b/app/Domains/MailTest/Mailables/TestMail.php
@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Domains\MailTest\Mailables;
-
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class TestMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    public function __construct(
-        public readonly string $mailSubject,
-        public readonly string $mailMessage,
-        public readonly Tenant $tenant,
-    ) {}
-
-    public function envelope(): Envelope
-    {
-        return new Envelope(subject: $this->mailSubject);
-    }
-
-    public function content(): Content
-    {
-        $this->tenant->loadMissing(['headerLogo', 'footerLogo']);
-
-        return new Content(
-            view: 'mail.test',
-            with: [
-                'tenant' => $this->tenant,
-                'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
-                'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
-            ],
-        );
-    }
-}
--- a/app/Domains/MailTest/Requests/SendTestMailRequest.php
+++ b/app/Domains/MailTest/Requests/SendTestMailRequest.php
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Domains\MailTest\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class SendTestMailRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, array<int, string>>
-     */
-    public function rules(): array
-    {
-        return [
-            'to' => ['required', 'string', 'email', 'max:255'],
-            'subject' => ['nullable', 'string', 'max:255'],
-            'message' => ['nullable', 'string', 'max:5000'],
-        ];
-    }
-}
--- a/app/Domains/MailTest/Services/MailTestService.php
+++ b/app/Domains/MailTest/Services/MailTestService.php
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Domains\MailTest\Services;
-
-use App\Domains\Integration\Services\MailService;
-use App\Domains\Tenant\Models\Tenant;
-
-class MailTestService
-{
-    /**
-     * @return array<string, string>
-     */
-    public function send(Tenant $tenant, string $recipient, ?string $subject = null, ?string $message = null): array
-    {
-        $subject ??= 'Prueba de correo de Shopit';
-        $message ??= 'Este es un correo de prueba enviado desde Shopit.';
-
-        $mailService = (new MailService)->forTenant($tenant->codigo);
-        $mailService->send(
-            $recipient,
-            $subject,
-            '<h1 style="margin: 0 0 20px;">'.e($subject).'</h1>'
-                .'<p>'.nl2br(e($message)).'</p>',
-        );
-
-        return [
-            'code' => 'mail.test_sent',
-            'message' => __('api.mail.test_sent'),
-            'recipient' => $recipient,
-            'tenant_code' => $tenant->codigo,
-            'mailer' => $mailService->mailerName(),
-            'sent_at' => now()->toIso8601String(),
-        ];
-    }
-}
--- a/app/Domains/MailTest/documentacion/README.md
+++ b/app/Domains/MailTest/documentacion/README.md
@@ -1,24 +0,0 @@
-# Dominio MailTest
-
-## Propósito
-
-Ofrece una operación técnica para verificar la configuración de correo de un tenant sin ejecutar un flujo funcional real.
-
-## Componentes
-
- `MailTestController`: endpoint invocable de envío.
- `SendTestMailRequest`: valida destinatario y contenido requerido.
- `MailTestService`: coordina el envío de prueba.
- `TestMail`: mailable utilizado para construir el mensaje.
-
-## Endpoint
-
- `POST /{tenant_code}/mail-test/send`.
-
-## Dependencias
-
-Usa la configuración de correo del dominio `Integration` y resuelve el tenant indicado.
-
-## Consideraciones
-
-Es una herramienta de diagnóstico. Debe restringirse o deshabilitarse en entornos donde no corresponda exponer envíos de prueba, y nunca debe registrar credenciales.
--- a/app/Domains/MailTest/routes/api.php
+++ b/app/Domains/MailTest/routes/api.php
@@ -1,6 +0,0 @@
-<?php
-
-use App\Domains\MailTest\Controllers\MailTestController;
-use Illuminate\Support\Facades\Route;
-
-Route::post('{tenant_code}/mail-test/send', MailTestController::class);
--- a/app/Domains/Menu/Controllers/MenuController.php
+++ b/app/Domains/Menu/Controllers/MenuController.php
@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Domains\Menu\Controllers;
-
-use App\Domains\Menu\Models\Menu;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
-
-class MenuController extends Controller
-{
-    public function index(): JsonResponse
-    {
-        $menues = Menu::all();
-
-        return response()->json($menues);
-    }
-
-    public function store(Request $request): JsonResponse
-    {
-        $validated = $request->validate([
-            'code' => 'required|string|unique:menues,code',
-            'label' => 'required|string|max:255',
-            'parent_menu_code' => [
-                'nullable',
-                'string',
-                Rule::exists('menues', 'code'),
-                'different:code',
-            ],
-            'content_type' => [
-                'sometimes',
-                Rule::in([Menu::CONTENT_TYPE_STATIC, Menu::CONTENT_TYPE_DYNAMIC]),
-            ],
-            'static_content_schema' => 'required_if:content_type,static|nullable|array',
-            'route' => 'required|string',
-        ]);
-
-        $menu = Menu::create($validated);
-
-        return response()->json($menu, 201);
-    }
-
-    public function show(Menu $menu): JsonResponse
-    {
-        return response()->json($menu);
-    }
-
-    public function update(Request $request, Menu $menu): JsonResponse
-    {
-        $validated = $request->validate([
-            'code' => 'sometimes|required|string|unique:menues,code,'.$menu->id,
-            'label' => 'sometimes|required|string|max:255',
-            'parent_menu_code' => [
-                'nullable',
-                'string',
-                Rule::exists('menues', 'code'),
-                Rule::notIn([$menu->code]),
-            ],
-            'content_type' => [
-                'sometimes',
-                Rule::in([Menu::CONTENT_TYPE_STATIC, Menu::CONTENT_TYPE_DYNAMIC]),
-            ],
-            'static_content_schema' => 'required_if:content_type,static|nullable|array',
-            'route' => 'sometimes|required|string',
-        ]);
-
-        $menu->update($validated);
-
-        return response()->json($menu);
-    }
-
-    public function destroy(Menu $menu): JsonResponse
-    {
-        $menu->delete();
-
-        return response()->json(null, 204);
-    }
-}
--- a/app/Domains/Menu/Controllers/TenantMenuController.php
+++ b/app/Domains/Menu/Controllers/TenantMenuController.php
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Domains\Menu\Controllers;
-
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Menu\Requests\StoreTenantMenuRequest;
-use App\Domains\Menu\Services\TenantMenuService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-
-class TenantMenuController extends Controller
-{
-    public function __construct(private readonly TenantMenuService $tenantMenuService) {}
-
-    public function store(
-        StoreTenantMenuRequest $request,
-        string $tenantCode,
-        string $menuCode,
-    ): JsonResponse {
-        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
-        $menu = Menu::query()->where('code', $menuCode)->firstOrFail();
-
-        $tenantMenu = $this->tenantMenuService->configure(
-            $tenant,
-            $menu,
-            $request->validated('static_content'),
-        );
-
-        return response()->json($tenantMenu);
-    }
-}
--- a/app/Domains/Menu/Requests/StoreTenantMenuRequest.php
+++ b/app/Domains/Menu/Requests/StoreTenantMenuRequest.php
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Domains\Menu\Requests;
-
-use App\Domains\Menu\Models\Menu;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\ValidationException;
-
-class StoreTenantMenuRequest extends FormRequest
-{
-    private ?Menu $menuModel = null;
-
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    protected function prepareForValidation(): void
-    {
-        $this->menuModel = Menu::query()
-            ->where('code', $this->route('menu_code'))
-            ->first();
-
-        if (! $this->menuModel) {
-            throw ValidationException::withMessages([
-                'menu_code' => __('api.menu.not_found'),
-            ]);
-        }
-    }
-
-    public function rules(): array
-    {
-        if ($this->menuModel?->content_type !== Menu::CONTENT_TYPE_STATIC) {
-            return [
-                'static_content' => ['nullable', 'array'],
-            ];
-        }
-
-        $rules = [
-            'static_content' => ['required', 'array'],
-        ];
-
-        foreach ($this->menuModel->static_content_schema as $field => $rule) {
-            $rules["static_content.{$field}"] = $rule;
-        }
-
-        return $rules;
-    }
-}
--- a/app/Domains/Menu/Services/TenantMenuService.php
+++ b/app/Domains/Menu/Services/TenantMenuService.php
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Menu\Services;
-
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Menu\Models\TenantMenu;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Support\Facades\DB;
-
-class TenantMenuService
-{
-    public function configure(Tenant $tenant, Menu $menu, ?array $staticContent): TenantMenu
-    {
-        return DB::transaction(fn () => TenantMenu::query()->updateOrCreate(
-            [
-                'tenant_code' => $tenant->codigo,
-                'menu_code' => $menu->code,
-            ],
-            [
-                'static_content' => $menu->content_type === Menu::CONTENT_TYPE_STATIC
-                    ? $staticContent
-                    : null,
-            ],
-        ));
-    }
-}
--- a/app/Domains/Menu/documentacion/README.md
+++ b/app/Domains/Menu/documentacion/README.md
@@ -10,15 +10,6 @@ Define menús disponibles y permite configurar su contenido para cada tenant y r
 - `TenantMenu`: configuración específica por tenant, incluyendo contenido estático cuando corresponde.
 - `MenuRole`: asociación entre menú y rol autorizado.

-## Servicios
-
-`TenantMenuService::configure()` crea o actualiza atómicamente la configuración de un menú para un tenant. Solo conserva `static_content` cuando el menú fue definido como contenido estático.
-
-## Endpoints
-
- Recurso REST `/menues` mediante `MenuController`.
- `POST /{tenant_code}/menues/{menu_code}` para configurar un menú del tenant.
-
 ## Dependencias y reglas

-Depende de `Tenant` y `Authorization`. Los códigos de menú y tenant forman la identidad lógica de la configuración; el contenido enviado debe respetar el tipo definido por `Menu`.
+Depende de `Tenant` y `Authorization`. Los menús se configuran mediante seeders y relaciones internas; no se exponen endpoints públicos de administración.
--- a/app/Domains/Menu/routes/api.php
+++ b/app/Domains/Menu/routes/api.php
@@ -1,12 +0,0 @@
-<?php
-
-use App\Domains\Menu\Controllers\MenuController;
-use App\Domains\Menu\Controllers\TenantMenuController;
-use Illuminate\Support\Facades\Route;
-
-Route::apiResource('menues', MenuController::class);
-
-Route::post(
-    '{tenant_code}/menues/{menu_code}',
-    [TenantMenuController::class, 'store']
-);
--- a/app/Domains/Notification/Events/TicketsAvailable.php
+++ b/app/Domains/Notification/Events/TicketsAvailable.php
@@ -1,20 +0,0 @@
-<?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,
-    ) {}
-}
--- a/app/Domains/Notification/Listeners/SendPasswordResetEmail.php
+++ b/app/Domains/Notification/Listeners/SendPasswordResetEmail.php
@@ -6,8 +6,6 @@ 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
 {
@@ -22,21 +20,10 @@ class SendPasswordResetEmail implements ShouldQueueAfterCommit

    public function handle(PasswordResetRequested $event): void
    {
-        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(NotificationMailService::class)->sendPasswordResetCode(
+            $event->attemptId,
+            $event->tenantCode,
+            $event->channel,
+        );
    }
 }
--- a/app/Domains/Notification/Listeners/SendPurchaseConfirmedEmail.php
+++ b/app/Domains/Notification/Listeners/SendPurchaseConfirmedEmail.php
@@ -7,7 +7,7 @@ use App\Domains\Purchase\Events\PurchasePaid;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;

-class SendPurchasePaidEmail implements ShouldQueueAfterCommit
+class SendPurchaseConfirmedEmail implements ShouldQueueAfterCommit
 {
    use InteractsWithQueue;

@@ -20,6 +20,6 @@ class SendPurchasePaidEmail implements ShouldQueueAfterCommit

    public function handle(PurchasePaid $event): void
    {
-        app(NotificationMailService::class)->sendPurchasePaid($event->purchase->getKey());
+        app(NotificationMailService::class)->sendPurchaseConfirmed($event->purchaseId);
    }
 }
--- a/app/Domains/Notification/Listeners/SendTicketsAvailableEmail.php
+++ b/app/Domains/Notification/Listeners/SendTicketsAvailableEmail.php
@@ -1,25 +0,0 @@
-<?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);
-    }
-}
--- a/app/Domains/Notification/Services/NotificationMailService.php
+++ b/app/Domains/Notification/Services/NotificationMailService.php
@@ -9,28 +9,43 @@ 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
    {
-        $tenant = Tenant::query()->where('codigo', $tenantCode)->firstOrFail();
-        $user = User::query()->findOrFail($userId);
+        $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;

-        $this->mailService
-            ->forTenant($tenantCode)
-            ->send(
-                $user->email,
-                "Bienvenido a {$tenant->nombre}",
-                view('mail.notifications.welcome', compact('tenant', 'user'))->render(),
-            );
+            $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',
+            ];
+        });
    }

    public function sendPasswordResetCode(
@@ -38,95 +53,161 @@ class NotificationMailService
        string $tenantCode,
        string $channel = PasswordResetRequested::CHANNEL_STOREFRONT,
    ): void {
-        $tenant = Tenant::query()
-            ->with('websiteType')
-            ->where('codigo', $tenantCode)
-            ->firstOrFail();
-        $attempt = ResetPasswordAttempt::query()
-            ->with('user')
-            ->findOrFail($attemptId);
+        $context = [
+            'attempt_id' => $attemptId,
+            'tenant_code' => $tenantCode,
+            'channel' => $channel,
+        ];

-        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,
-            ]);
+        $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);

-            return;
-        }
+            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,
+                ]));

-        $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);
+                return 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(),
-            );
+            $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,
+            ];
+        });
    }

-    public function sendPurchasePaid(int $purchaseId): void
+    public function sendPurchaseConfirmed(int $purchaseId): void
    {
-        $purchase = Purchase::query()
-            ->with(['tenant', 'user', 'items'])
-            ->findOrFail($purchaseId);
+        $context = ['purchase_id' => $purchaseId];

-        $this->mailService
-            ->forTenant($purchase->tenant_codigo)
-            ->send(
-                $this->recipientFor($purchase),
-                "Pago confirmado - Compra #{$purchase->getKey()}",
-                view('mail.notifications.purchase-paid', compact('purchase'))->render(),
-            );
-    }
+        $this->sendLogged('purchase_confirmed', $context, function () use ($purchaseId, $context): ?array {
+            $purchase = Purchase::query()
+                ->with(['tenant', 'user', 'items'])
+                ->find($purchaseId);

-    /** @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();
+            if ($purchase === null) {
+                $this->logSkipped('purchase_confirmed', array_merge($context, [
+                    'reason' => 'purchase_not_found',
+                    'missing_model' => Purchase::class,
+                ]));

-        if ($tickets->isEmpty()) {
-            return;
-        }
+                return null;
+            }

-        $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(),
-            );
+            /** @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(),
+            ];
+        });
    }

    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,
+        ]));
+    }
 }
--- a/app/Domains/Notification/documentacion/README.md
+++ b/app/Domains/Notification/documentacion/README.md
@@ -8,12 +8,11 @@ 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 pago.
- `TicketsAvailable`: informa y entrega la disponibilidad de tickets.
+- `PurchasePaid`: envía la confirmación de compra y adjunta los tickets generados, cuando corresponde.

 ## Componentes

-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`.
+Los listeners `SendWelcomeEmail`, `SendPasswordResetEmail` y `SendPurchaseConfirmedEmail` delegan en `NotificationMailService`. Este servicio carga el contexto necesario, renderiza las vistas y envía mediante `Integration/MailService`.

 ## API y dependencias

@@ -23,4 +22,6 @@ 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.
--- a/app/Domains/Purchase/Controllers/PurchaseController.php
+++ b/app/Domains/Purchase/Controllers/PurchaseController.php
@@ -4,11 +4,9 @@ namespace App\Domains\Purchase\Controllers;

 use App\Domains\Integration\Services\TelepagosIntegrationService;
 use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Purchase\Requests\PaymentIntentRequest;
 use App\Domains\Purchase\Requests\StartCheckoutRequest;
 use App\Domains\Purchase\Requests\UpdatePurchaseCustomerRequest;
-use App\Domains\Purchase\Requests\UpdatePurchaseItemRequest;
 use App\Domains\Purchase\Resources\PurchaseResource;
 use App\Domains\Purchase\Services\Checkout\PurchaseResponseLoader;
 use App\Domains\Purchase\Services\CheckoutService;
@@ -26,13 +24,23 @@ class PurchaseController extends Controller
 {
    public function index(Request $request, Tenant $tenant): JsonResponse
    {
+        $statusParam = $request->query('status');
+        $statuses = is_string($statusParam)
+            ? collect(explode(',', $statusParam))
+                ->map(fn (string $status): string => trim($status))
+                ->filter()
+                ->unique()
+                ->values()
+                ->all()
+            : [];
+
        return PurchaseResource::collection(
            Purchase::query()
+                ->with('stockReservation')
                ->where('tenant_codigo', $tenant->codigo)
                ->where('user_id', $request->user()->id)
-                ->when($request->query('status'), function ($query, $status) {
-                    $query->where('status', $status);
-                })
+                ->when($statuses !== [], fn ($query) => $query->whereIn('status', $statuses))
+                ->orderBy('status')
                ->latest()
                ->paginateFromRequest()
        )->response();
@@ -81,58 +89,10 @@ class PurchaseController extends Controller
        );
    }

-    public function updateItem(
-        UpdatePurchaseItemRequest $request,
-        Tenant $tenant,
-        Purchase $compra,
-        PurchaseItem $item,
-        CheckoutService $checkoutService,
-    ): PurchaseResource {
-        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
-
-        return PurchaseResource::make(
-            $checkoutService->updateItem(
-                $compra,
-                $item,
-                $request->exists('quantity') ? (int) $request->validated('quantity') : null,
-                $request->exists('variant_id') ? (int) $request->validated('variant_id') : null,
-                $request->exists('variant_id'),
-            ),
-        );
-    }
-
-    public function prepareItemEditing(
-        Request $request,
-        Tenant $tenant,
-        Purchase $compra,
-        CheckoutService $checkoutService,
-    ): PurchaseResource {
-        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
-
-        return PurchaseResource::make(
-            $checkoutService->prepareItemEditing($compra),
-        );
-    }
-
-    public function removeItem(
-        Request $request,
-        Tenant $tenant,
-        Purchase $compra,
-        PurchaseItem $item,
-        CheckoutService $checkoutService,
-    ): PurchaseResource {
-        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
-
-        return PurchaseResource::make(
-            $checkoutService->removeItem($compra, $item),
-        );
-    }
-
    public function paymentIntent(
        PaymentIntentRequest $request,
        Tenant $tenant,
        Purchase $compra,
-        CheckoutService $checkoutService,
        PurchaseStateGuard $purchaseState,
    ): JsonResponse {
        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
@@ -141,7 +101,12 @@ 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())
@@ -163,12 +128,11 @@ class PurchaseController extends Controller
                return false;
            }

+            $purchaseState->lockCurrentCart($purchase);
+
            $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(),
            ];

@@ -188,7 +152,6 @@ class PurchaseController extends Controller

        $compra->refresh();
        $totalAmount = (float) $compra->total;
-        $checkoutService->syncReservationExpiration($compra);

        if ($method === 'transfer') {
            $telepagosService = new TelepagosIntegrationService;
@@ -280,15 +243,6 @@ class PurchaseController extends Controller
        ], 400);
    }

-    public function complete(Request $request, Tenant $tenant, Purchase $compra, CheckoutService $checkoutService): PurchaseResource
-    {
-        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
-
-        return PurchaseResource::make(
-            $checkoutService->completePurchase($compra)
-        );
-    }
-
    public function submitForReview(
        Request $request,
        Tenant $tenant,
--- a/app/Domains/Purchase/Events/PurchasePaid.php
+++ b/app/Domains/Purchase/Events/PurchasePaid.php
@@ -2,7 +2,6 @@

 namespace App\Domains\Purchase\Events;

-use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;

@@ -10,5 +9,5 @@ class PurchasePaid
 {
    use Dispatchable, SerializesModels;

-    public function __construct(public readonly Purchase $purchase) {}
+    public function __construct(public readonly int $purchaseId) {}
 }
--- a/app/Domains/Purchase/Models/Purchase.php
+++ b/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',
@@ -39,6 +39,8 @@ class Purchase extends Model

    public const STATUS_PENDING_PAYMENT = 'pending_payment';

+    public const STATUS_IN_REVIEW = 'in_review';
+
    public const STATUS_PAID = 'paid';

    public const STATUS_CANCELLED = 'cancelled';
@@ -47,16 +49,20 @@ class Purchase extends Model

    public const STATUS_EXPIRED = 'expired';

+    public const STATUS_SUPERSEDED = 'superseded';
+
    /** @return list<string> */
    public static function statuses(): array
    {
        return [
            self::STATUS_CREATED,
            self::STATUS_PENDING_PAYMENT,
+            self::STATUS_IN_REVIEW,
            self::STATUS_PAID,
            self::STATUS_CANCELLED,
            self::STATUS_REJECTED,
            self::STATUS_EXPIRED,
+            self::STATUS_SUPERSEDED,
        ];
    }

@@ -71,8 +77,8 @@ class Purchase extends Model
    {
        return [
            'cart_id' => 'integer',
+            'stock_reservation_id' => 'integer',
            'user_id' => 'integer',
-            'expires_at' => 'datetime',
            'total' => 'decimal:2',
        ];
    }
@@ -117,10 +123,10 @@ class Purchase extends Model
        return $this->hasMany(Ticket::class, 'source_purchase_id');
    }

-    /** @return HasMany<StockReservation, $this> */
-    public function stockReservations(): HasMany
+    /** @return BelongsTo<StockReservation, $this> */
+    public function stockReservation(): BelongsTo
    {
-        return $this->hasMany(StockReservation::class);
+        return $this->belongsTo(StockReservation::class);
    }

    /**
@@ -154,12 +160,7 @@ class Purchase extends Model
            return (float) $this->getRelation('items')->sum('total');
        }

-        $itemsTotal = (float) $this->items()->sum('total');
-        if ($itemsTotal > 0 || $this->items()->exists()) {
-            return $itemsTotal;
-        }
-
-        return (float) ($this->cart?->getTotalAmount() ?? $this->total ?? 0);
+        return (float) $this->items()->sum('total');
    }

    protected function valueChangeTenantCode(): string
@@ -192,7 +193,7 @@ class Purchase extends Model
                'status' => self::STATUS_PAID,
            ]);

-            PurchasePaid::dispatch($this);
+            PurchasePaid::dispatch($this->getKey());
        });
    }
 }
--- a/app/Domains/Purchase/Requests/UpdatePurchaseItemRequest.php
+++ b/app/Domains/Purchase/Requests/UpdatePurchaseItemRequest.php
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\Purchase\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UpdatePurchaseItemRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return $this->user() !== null;
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        return [
-            'quantity' => ['sometimes', 'required_without:variant_id', 'integer', 'min:1', 'max:100'],
-            'variant_id' => ['sometimes', 'required_without:quantity', 'integer', 'min:1'],
-        ];
-    }
-}
--- a/app/Domains/Purchase/Resources/PurchaseItemResource.php
+++ b/app/Domains/Purchase/Resources/PurchaseItemResource.php
@@ -2,16 +2,12 @@

 namespace App\Domains\Purchase\Resources;

-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
 use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;

-/** @mixin PurchaseItem|CartItem */
+/** @mixin PurchaseItem */
 class PurchaseItemResource extends JsonResource
 {
    /** @return array<string, mixed> */
@@ -20,158 +16,29 @@ class PurchaseItemResource extends JsonResource
        $tenant = $request->route('tenant');
        $displayImage = ! $tenant instanceof Tenant || $tenant->display_cart_item_images;

-        if ($this->resource instanceof PurchaseItem) {
-            $imageUrl = $displayImage
-                ? $this->imageAttachment?->getTemporaryUrl(1440)
-                : null;
-            $attributes = $this->variant_attributes ?? [];
-
-            $catalogItem = $this->relationLoaded('sourceCatalogItem')
-                ? $this->sourceCatalogItem
-                : null;
-            $includeVariants = $tenant instanceof Tenant
-                && $tenant->checkout_editing_policy->allowsVariantChanges()
-                && $catalogItem !== null
-                && $catalogItem->relationLoaded('variants');
-
-            return [
-                'id' => $this->id,
-                'quantity' => (int) $this->cantidad,
-                'unit_price' => $this->formatMoney($this->precio_unitario),
-                'line_total' => $this->formatMoney($this->total),
-                'source_catalog_item_id' => $this->source_catalog_item_id,
-                'source_variant_id' => $this->source_variant_id,
-                'item_details' => [
-                    'nombre' => $this->item_nombre,
-                    'descripcion' => $this->descripcion,
-                    'slug' => $this->slug,
-                    'imagen' => $imageUrl,
-                    'attributes' => $attributes,
-                ],
-                'variants' => $this->when(
-                    $includeVariants,
-                    fn () => $catalogItem
-                        ->visibleVariants($this->source_variant_id)
-                        ->map(fn (Variant $variant): array => $this->variantData($catalogItem, $variant))
-                        ->values(),
-                ),
-            ];
-        }
-
-        $selectedItem = $this->selectedItem();
-        $catalogItem = $this->catalogItem;
-        $variant = $this->variant;
-        $quantity = (int) ($this->cantidad ?? 0);
-        $unitPrice = $this->resolveUnitPrice($selectedItem);
-        $lineTotal = $unitPrice * $quantity;
        $imageUrl = $displayImage
-            ? $this->resolveImageUrl($selectedItem, $catalogItem)
+            ? $this->imageAttachment?->getTemporaryUrl(1440)
            : null;
-        $includeVariants = $tenant instanceof Tenant
-            && $tenant->checkout_editing_policy->allowsVariantChanges()
-            && $catalogItem?->relationLoaded('variants');

        return [
            'id' => $this->id,
-            'quantity' => $quantity,
-            'unit_price' => $this->formatMoney($unitPrice),
-            'line_total' => $this->formatMoney($lineTotal),
-            'source_catalog_item_id' => $this->catalog_item_id,
-            'source_variant_id' => $this->variant_id,
-            'item_details' => $selectedItem === null ? null : [
-                'nombre' => $selectedItem->getName(),
-                'descripcion' => $selectedItem->getDescription(),
-                'slug' => $catalogItem?->slug,
+            'quantity' => (int) $this->cantidad,
+            'unit_price' => $this->formatMoney($this->precio_unitario),
+            'line_total' => $this->formatMoney($this->total),
+            'source_catalog_item_id' => $this->source_catalog_item_id,
+            'source_variant_id' => $this->source_variant_id,
+            'item_details' => [
+                'nombre' => $this->item_nombre,
+                'descripcion' => $this->descripcion,
+                'slug' => $this->slug,
                'imagen' => $imageUrl,
-                'attributes' => $variant === null ? [] : $this->resolveAttributes($variant),
+                'attributes' => $this->variant_attributes ?? [],
            ],
-            'variants' => $this->when(
-                $includeVariants,
-                fn () => $catalogItem
-                    ->visibleVariants($this->variant_id)
-                    ->map(fn (Variant $availableVariant): array => $this->variantData(
-                        $catalogItem,
-                        $availableVariant,
-                    ))
-                    ->values(),
-            ),
        ];
    }

-    private function resolveUnitPrice(CatalogItem|Variant|null $selectedItem): float
-    {
-        return (float) ($selectedItem?->getPrice() ?? 0);
-    }
-
-    private function resolveImageUrl(
-        CatalogItem|Variant|null $selectedItem,
-        ?CatalogItem $catalogItem,
-    ): ?string {
-        $attachment = $selectedItem?->relationLoaded('attachments')
-            ? $selectedItem->attachments->first()
-            : null;
-
-        if ($attachment === null && $catalogItem?->relationLoaded('attachments')) {
-            $attachment = $catalogItem->attachments->first();
-        }
-
-        return $attachment?->getTemporaryUrl(1440);
-    }
-
-    /** @return array<int, array{name: string, value: mixed}> */
-    private function resolveAttributes(Variant $variant): array
-    {
-        if (! $variant->relationLoaded('definitions')) {
-            return [];
-        }
-
-        $attributes = $variant->definitions
-            ->groupBy('item_attribute_id')
-            ->map(function ($definitions): array {
-                $itemAttribute = $definitions->first()?->itemAttribute;
-                $values = $definitions->pluck('value')->values();
-
-                return [
-                    'name' => (string) ($itemAttribute?->attribute?->nombre ?? ''),
-                    'value' => $itemAttribute?->allow_multi_select
-                        ? $values->all()
-                        : $values->first(),
-                ];
-            })
-            ->filter(fn (array $attribute): bool => $attribute['name'] !== '' || $attribute['value'] !== null)
-            ->values();
-
-        $eventDates = $variant->relationLoaded('eventDates')
-            ? $variant->selectedEventDates()
-            : collect();
-        if ($eventDates->isNotEmpty()) {
-            $attributes->prepend([
-                'name' => 'Fecha',
-                'value' => $eventDates
-                    ->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))
-                    ->values()
-                    ->all(),
-            ]);
-        }
-
-        return $attributes->all();
-    }
-
    private function formatMoney(float|int|string|null $amount): string
    {
        return number_format((float) ($amount ?? 0), 2, '.', '');
    }
-
-    /** @return array<string, mixed> */
-    private function variantData(CatalogItem $catalogItem, Variant $variant): array
-    {
-        return [
-            'id' => $variant->id,
-            'precio' => $this->formatMoney($variant->precio ?? $catalogItem->precio),
-            'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
-                ? null
-                : $variant->inventory->availableStock(),
-            'values' => $variant->selectorOptions($catalogItem->itemAttributes),
-        ];
-    }
 }
--- a/app/Domains/Purchase/Resources/PurchaseResource.php
+++ b/app/Domains/Purchase/Resources/PurchaseResource.php
@@ -2,7 +2,6 @@

 namespace App\Domains\Purchase\Resources;

-use App\Domains\Cart\Models\CartItem;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
 use Illuminate\Http\Request;
@@ -18,28 +17,18 @@ class PurchaseResource extends JsonResource
     */
    public function toArray(Request $request): array
    {
-        $purchaseItems = $this->resource->relationLoaded('items')
+        $serverTime = now();
+        $expiresAt = $this->stockReservation?->expires_at;
+        $items = $this->resource->relationLoaded('items')
            ? $this->resource->getRelation('items')
            : collect();
-        $cartItems = $this->resource->relationLoaded('cart')
-            && $this->resource->getRelation('cart')?->relationLoaded('items')
-                ? $this->resource->getRelation('cart')->getRelation('items')
-                : null;
-        $usesCartItems = in_array($this->status, [
-            Purchase::STATUS_CREATED,
-            Purchase::STATUS_PENDING_PAYMENT,
-        ], true) && $cartItems !== null;
-        $items = $usesCartItems ? $cartItems : $purchaseItems;
-        $itemsSource = $usesCartItems
-            ? 'cart'
-            : ($purchaseItems->isNotEmpty() ? 'purchase' : null);
        $ticketsCount = array_key_exists('tickets_count', $this->resource->getAttributes())
            ? (int) $this->resource->getAttribute('tickets_count')
            : null;

        $subtotal = $items->isNotEmpty()
            ? $items->reduce(
-                fn (float $carry, PurchaseItem|CartItem $item): float => $carry + $this->resolveItemSubtotal($item),
+                fn (float $carry, PurchaseItem $item): float => $carry + $this->resolveItemSubtotal($item),
                0.0,
            )
            : (float) ($this->total ?? 0);
@@ -48,7 +37,7 @@ class PurchaseResource extends JsonResource
            ? (float) $this->total
            : ($items->isNotEmpty()
                ? $items->reduce(
-                    fn (float $carry, PurchaseItem|CartItem $item): float => $carry + $this->resolveItemTotal($item),
+                    fn (float $carry, PurchaseItem $item): float => $carry + $this->resolveItemTotal($item),
                    0.0,
                )
                : (float) ($this->total ?? 0));
@@ -61,13 +50,17 @@ class PurchaseResource extends JsonResource
            'created_at' => $this->created_at,
            'status' => $this->status,
            'payment_method' => $this->payment_method,
-            'expires_at' => $this->expires_at,
+            'expires_at' => $expiresAt,
+            'expires_in_seconds' => $expiresAt === null
+                ? null
+                : max(0, $expiresAt->getTimestamp() - $serverTime->getTimestamp()),
+            'server_time' => $serverTime,
            'dni' => $this->dni,
            'transfer_payer_dni' => $this->transfer_payer_dni,
            'telefono' => $this->telefono,
            'nombre_apellido' => $this->nombre_apellido,
            'email' => $this->email,
-            'items_source' => $itemsSource,
+            'items_source' => $items->isNotEmpty() ? 'purchase' : null,
            'items' => PurchaseItemResource::collection($items),
            'tickets_count' => $this->when($ticketsCount !== null, $ticketsCount),
            'has_generated_tickets' => $this->when($ticketsCount !== null, $ticketsCount > 0),
@@ -76,21 +69,13 @@ class PurchaseResource extends JsonResource
        ];
    }

-    protected function resolveItemSubtotal(PurchaseItem|CartItem $item): float
+    protected function resolveItemSubtotal(PurchaseItem $item): float
    {
-        if ($item instanceof CartItem) {
-            return (float) ($item->selectedItem()?->getPrice() ?? 0) * $item->cantidad;
-        }
-
        return (float) $item->precio_unitario * $item->cantidad;
    }

-    protected function resolveItemTotal(PurchaseItem|CartItem $item): float
+    protected function resolveItemTotal(PurchaseItem $item): float
    {
-        if ($item instanceof CartItem) {
-            return $this->resolveItemSubtotal($item);
-        }
-
        return (float) ($item->total ?? 0);
    }

--- a/app/Domains/Purchase/Services/Checkout/CompleteCheckoutService.php
+++ b/app/Domains/Purchase/Services/Checkout/CompleteCheckoutService.php
@@ -15,35 +15,9 @@ class CompleteCheckoutService
    public function __construct(
        private readonly StockReservationService $reservations,
        private readonly SourceCartService $sourceCart,
-        private readonly PurchaseItemSnapshotFactory $snapshots,
        private readonly PurchaseStateGuard $purchaseState,
    ) {}

-    public function complete(Purchase $purchase): Purchase
-    {
-        return DB::transaction(function () use ($purchase): Purchase {
-            $purchase = $this->lockPurchase($purchase);
-            $this->purchaseState->assertNotExpired($purchase);
-
-            if ($purchase->payment_method === null) {
-                throw ValidationException::withMessages([
-                    'payment_method' => __('api.purchase.payment_method_required'),
-                ]);
-            }
-
-            if ($this->isTerminal($purchase)) {
-                return $this->loadPurchase($purchase);
-            }
-
-            $purchase->update([
-                'status' => Purchase::STATUS_PENDING_PAYMENT,
-                'total' => $purchase->calculateCurrentTotalAmount(),
-            ]);
-
-            return $this->loadPurchase($purchase);
-        });
-    }
-
    public function submitForReview(Purchase $purchase): Purchase
    {
        return DB::transaction(function () use ($purchase): Purchase {
@@ -54,17 +28,22 @@ class CompleteCheckoutService
                return $this->loadPurchase($purchase);
            }

-            if (
-                $purchase->status !== Purchase::STATUS_PENDING_PAYMENT
-                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
-            ) {
+            if ($purchase->status === Purchase::STATUS_IN_REVIEW) {
+                return $this->loadPurchase($purchase);
+            }
+
+            $this->purchaseState->lockCurrentCart($purchase);
+
+            if ($purchase->status !== Purchase::STATUS_PENDING_PAYMENT) {
                throw ValidationException::withMessages([
                    'purchase' => __('api.purchase.not_available_for_review'),
                ]);
            }

-            $purchase->update(['expires_at' => null]);
-            $this->reservations->syncPurchaseExpiration($purchase);
+            $purchase->update([
+                'status' => Purchase::STATUS_IN_REVIEW,
+            ]);
+            $this->reservations->clearExpirationForReview($purchase);

            return $this->loadPurchase($purchase);
        });
@@ -84,25 +63,26 @@ class CompleteCheckoutService
                Purchase::STATUS_CANCELLED,
                Purchase::STATUS_REJECTED,
                Purchase::STATUS_EXPIRED,
+                Purchase::STATUS_SUPERSEDED,
            ], true)) {
                throw ValidationException::withMessages([
                    'purchase' => __('api.purchase.cannot_confirm'),
                ]);
            }

-            if ($purchase->items()->exists()) {
-                $cart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
-                if ($cart?->status === 'converted' && $cart->trashed()) {
-                    return;
-                }
-
+            if (! $purchase->items()->exists()) {
                throw ValidationException::withMessages([
                    'items' => __('api.purchase.inconsistent_reservation'),
                ]);
            }

-            $cart = $purchase->cart()->lockForUpdate()->first();
-            if ($cart === null || $cart->status !== 'checkout') {
+            $cart = $this->purchaseState->lockCurrentCart($purchase);
+
+            if ($cart->status === 'converted' && $cart->trashed()) {
+                return;
+            }
+
+            if (! in_array($cart->status, ['active', 'checkout'], true)) {
                throw ValidationException::withMessages([
                    'items' => __('api.purchase.inconsistent_reservation'),
                ]);
@@ -115,10 +95,32 @@ class CompleteCheckoutService
                ]);
            }

+            $snapshotQuantities = $purchase->items()
+                ->lockForUpdate()
+                ->get(['source_catalog_item_id', 'source_variant_id', 'cantidad'])
+                ->groupBy(fn ($item): string => $this->itemKey(
+                    (int) $item->source_catalog_item_id,
+                    $item->source_variant_id === null ? null : (int) $item->source_variant_id,
+                ))
+                ->map(fn (Collection $items): int => (int) $items->sum('cantidad'))
+                ->sortKeys()
+                ->all();
+            $cartQuantities = $cartItems
+                ->groupBy(fn (CartItem $item): string => $this->itemKey(
+                    (int) $item->catalog_item_id,
+                    $item->variant_id === null ? null : (int) $item->variant_id,
+                ))
+                ->map(fn (Collection $items): int => (int) $items->sum('cantidad'))
+                ->sortKeys()
+                ->all();
+
+            if ($snapshotQuantities !== $cartQuantities) {
+                throw ValidationException::withMessages([
+                    'items' => __('api.purchase.inconsistent_reservation'),
+                ]);
+            }
+
            $this->loadCartItems($cartItems);
-            $purchase->items()->createMany(
-                $this->snapshots->fromCartItems($cartItems),
-            );

            foreach ($cartItems as $cartItem) {
                $selection = $cartItem->selectedItem();
@@ -128,29 +130,20 @@ class CompleteCheckoutService
                    ]);
                }

-                try {
-                    $this->reservations->commit($cartItem, $selection);
-                } catch (\InvalidArgumentException) {
-                    throw ValidationException::withMessages([
-                        'items' => __('api.purchase.inconsistent_reservation'),
-                    ]);
-                }
+            }
+
+            try {
+                $this->reservations->commit($purchase);
+            } catch (\InvalidArgumentException) {
+                throw ValidationException::withMessages([
+                    'items' => __('api.purchase.inconsistent_reservation'),
+                ]);
            }

            $this->sourceCart->finalize($purchase);
        });
    }

-    private function isTerminal(Purchase $purchase): bool
-    {
-        return in_array($purchase->status, [
-            Purchase::STATUS_PAID,
-            Purchase::STATUS_CANCELLED,
-            Purchase::STATUS_REJECTED,
-            Purchase::STATUS_EXPIRED,
-        ], true);
-    }
-
    private function lockPurchase(Purchase $purchase): Purchase
    {
        /** @var Purchase */
@@ -159,16 +152,12 @@ class CompleteCheckoutService

    private function loadPurchase(Purchase $purchase): Purchase
    {
-        return $purchase->load([
-            'items.imageAttachment',
-            'cart.items.catalogItem.inventory',
-            'cart.items.catalogItem.attachments',
-            'cart.items.variant.inventory',
-            'cart.items.variant.attachments',
-            'cart.items.variant.definitions.itemAttribute.attribute',
-            'cart.items.variant.eventDates',
-            'cart.items.variant.eventDate',
-        ]);
+        return $purchase->load(['items.imageAttachment', 'stockReservation']);
+    }
+
+    private function itemKey(int $catalogItemId, ?int $variantId): string
+    {
+        return $catalogItemId.':'.($variantId ?? 'none');
    }

    /** @param Collection<int, CartItem> $cartItems */
--- a/app/Domains/Purchase/Services/Checkout/EditCheckoutService.php
+++ b/app/Domains/Purchase/Services/Checkout/EditCheckoutService.php
@@ -2,24 +2,14 @@

 namespace App\Domains\Purchase\Services\Checkout;

-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Purchase\Services\PurchaseStateGuard;
-use App\Domains\Purchase\Services\UserPurchaseLimitService;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 class EditCheckoutService
 {
    public function __construct(
-        private readonly CatalogInventoryService $inventory,
-        private readonly UserPurchaseLimitService $purchaseLimits,
-        private readonly CatalogSelectionResolver $selections,
-        private readonly SourceCartService $sourceCart,
-        private readonly PurchaseItemSnapshotFactory $snapshots,
        private readonly PurchaseResponseLoader $responses,
        private readonly PurchaseStateGuard $purchaseState,
    ) {}
@@ -28,295 +18,24 @@ class EditCheckoutService
    public function updateCustomer(Purchase $purchase, array $customerData): Purchase
    {
        return DB::transaction(function () use ($purchase, $customerData): Purchase {
-            $purchase = $this->lockPurchase($purchase);
-            $this->purchaseState->assertNotExpired($purchase);
-            $this->assertEditable($purchase);
-
-            $purchase->update($customerData);
-
-            return $this->loadPurchase($purchase);
-        });
-    }
-
-    public function updateItem(
-        Purchase $purchase,
-        PurchaseItem $purchaseItem,
-        ?int $quantity,
-        ?int $variantId,
-        bool $updateVariant,
-    ): Purchase {
-        return DB::transaction(function () use (
-            $purchase,
-            $purchaseItem,
-            $quantity,
-            $variantId,
-            $updateVariant,
-        ): Purchase {
-            $purchase = $this->lockPurchase($purchase);
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
            $this->purchaseState->assertNotExpired($purchase);

-            if ($purchase->status !== Purchase::STATUS_CREATED || $this->hasExpired($purchase)) {
+            if (! in_array($purchase->status, [
+                Purchase::STATUS_CREATED,
+                Purchase::STATUS_PENDING_PAYMENT,
+            ], true)) {
                throw ValidationException::withMessages([
                    'purchase' => __('api.purchase.not_editable'),
                ]);
            }

-            $purchaseItem = $this->lockPurchaseItem($purchase, $purchaseItem);
-            $tenant = $purchase->tenant()->firstOrFail();
-            $finalQuantity = $quantity ?? (int) $purchaseItem->cantidad;
+            $this->purchaseState->lockCurrentCart($purchase);

-            if ($quantity !== null && ! $tenant->checkout_editing_policy->allowsQuantityChanges()) {
-                throw ValidationException::withMessages([
-                    'quantity' => __('api.cart.editing_disabled'),
-                ]);
-            }
+            $purchase->update($customerData);

-            if ($updateVariant && ! $tenant->checkout_editing_policy->allowsVariantChanges()) {
-                throw ValidationException::withMessages([
-                    'variant_id' => __('api.purchase.variant_change_disabled'),
-                ]);
-            }
-
-            if ($updateVariant && $variantId !== $purchaseItem->source_variant_id) {
-                $this->changeItemVariant(
-                    $purchase,
-                    $purchaseItem,
-                    (int) $variantId,
-                    $finalQuantity,
-                );
-            } else {
-                $difference = $finalQuantity - (int) $purchaseItem->cantidad;
-
-                if ($difference !== 0) {
-                    $this->adjustReservation($purchase, $purchaseItem, $finalQuantity, $difference);
-
-                    $purchaseItem->update([
-                        'cantidad' => $finalQuantity,
-                        'total' => (float) $purchaseItem->precio_unitario * $finalQuantity,
-                    ]);
-                    $this->sourceCart->syncItemQuantity($purchase, $purchaseItem, $finalQuantity);
-                }
-            }
-
-            $purchase->update([
-                'total' => $purchase->calculateCurrentTotalAmount(),
-            ]);
-
-            return $this->loadPurchase($purchase);
+            return $this->responses->load($purchase);
        });
    }
-
-    private function changeItemVariant(
-        Purchase $purchase,
-        PurchaseItem $sourceItem,
-        int $variantId,
-        int $quantity,
-    ): void {
-        $tenant = $purchase->tenant()->firstOrFail();
-        $currentSelection = $this->selections->resolvePurchaseItem($tenant, $sourceItem);
-        $targetSelection = $this->selections->resolve(
-            $tenant,
-            (int) $sourceItem->source_catalog_item_id,
-            $variantId,
-            'item',
-        );
-
-        if (! $targetSelection instanceof Variant) {
-            throw ValidationException::withMessages([
-                'variant_id' => __('api.cart.variant_required'),
-            ]);
-        }
-
-        /** @var PurchaseItem|null $targetItem */
-        $targetItem = $purchase->items()
-            ->where('source_catalog_item_id', $sourceItem->source_catalog_item_id)
-            ->where('source_variant_id', $targetSelection->id)
-            ->whereKeyNot($sourceItem->getKey())
-            ->lockForUpdate()
-            ->first();
-
-        if ($targetItem !== null && $targetItem->reservation_status !== PurchaseItem::RESERVATION_ACTIVE) {
-            throw ValidationException::withMessages([
-                'variant_id' => __('api.purchase.item_not_editable'),
-            ]);
-        }
-
-        $otherItemQuantity = (int) $purchase->items()
-            ->where('source_catalog_item_id', $sourceItem->source_catalog_item_id)
-            ->whereKeyNot($sourceItem->getKey())
-            ->sum('cantidad');
-        $this->purchaseLimits->assertCanPurchase(
-            $targetSelection->catalogItem,
-            (int) $purchase->user_id,
-            $otherItemQuantity + $quantity,
-            $purchase->getKey(),
-            'variant_id',
-        );
-
-        try {
-            $this->inventory->release($currentSelection, (int) $sourceItem->cantidad);
-            $this->inventory->reserve($targetSelection, $quantity);
-        } catch (\InvalidArgumentException) {
-            throw ValidationException::withMessages([
-                'variant_id' => __('api.purchase.insufficient_stock'),
-            ]);
-        }
-
-        $previousVariantId = $sourceItem->source_variant_id;
-        $finalQuantity = $quantity;
-
-        if ($targetItem !== null) {
-            $finalQuantity += (int) $targetItem->cantidad;
-            $targetItem->update($this->snapshots->fromVariant($targetSelection, $finalQuantity));
-            $sourceItem->delete();
-        } else {
-            $sourceItem->update($this->snapshots->fromVariant($targetSelection, $finalQuantity));
-        }
-
-        $this->sourceCart->syncItemSelection(
-            $purchase,
-            (int) $sourceItem->source_catalog_item_id,
-            $previousVariantId,
-            $targetSelection->id,
-            $finalQuantity,
-        );
-    }
-
-    public function prepareItemEditing(Purchase $purchase): Purchase
-    {
-        return DB::transaction(function () use ($purchase): Purchase {
-            $purchase = $this->lockPurchase($purchase);
-            $this->purchaseState->assertNotExpired($purchase);
-            $this->assertEditable($purchase);
-
-            if (! $purchase->tenant()->firstOrFail()->checkout_editing_policy->allowsModification()) {
-                throw ValidationException::withMessages([
-                    'purchase' => __('api.cart.editing_disabled'),
-                ]);
-            }
-
-            $purchase->telepagosQr()->delete();
-            $purchase->update([
-                'status' => Purchase::STATUS_CREATED,
-                'payment_method' => null,
-                'transfer_payer_dni' => null,
-                'expires_at' => now()->addMinutes(
-                    max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
-                ),
-            ]);
-
-            return $this->loadPurchase($purchase);
-        });
-    }
-
-    public function removeItem(Purchase $purchase, PurchaseItem $purchaseItem): Purchase
-    {
-        return DB::transaction(function () use ($purchase, $purchaseItem): Purchase {
-            $purchase = $this->lockPurchase($purchase);
-            $this->purchaseState->assertNotExpired($purchase);
-            $this->assertEditable($purchase);
-
-            if (! $purchase->tenant()->firstOrFail()->checkout_editing_policy->allowsRemoval()) {
-                throw ValidationException::withMessages([
-                    'item' => __('api.cart.editing_disabled'),
-                ]);
-            }
-
-            $purchaseItem = $this->lockPurchaseItem($purchase, $purchaseItem);
-            $selection = $this->selections->resolvePurchaseItem($purchase->tenant, $purchaseItem);
-            $this->inventory->release($selection, (int) $purchaseItem->cantidad);
-            $this->sourceCart->removeItem($purchase, $purchaseItem);
-            $purchaseItem->delete();
-            $purchase->update([
-                'total' => $purchase->calculateCurrentTotalAmount(),
-            ]);
-
-            return $this->loadPurchase($purchase);
-        });
-    }
-
-    private function adjustReservation(
-        Purchase $purchase,
-        PurchaseItem $purchaseItem,
-        int $quantity,
-        int $difference,
-    ): void {
-        $selection = $this->selections->resolvePurchaseItem($purchase->tenant, $purchaseItem);
-
-        try {
-            if ($difference > 0) {
-                $otherItemQuantity = (int) $purchase->items()
-                    ->where('source_catalog_item_id', $purchaseItem->source_catalog_item_id)
-                    ->whereKeyNot($purchaseItem->getKey())
-                    ->sum('cantidad');
-                $catalogItem = $selection instanceof Variant ? $selection->catalogItem : $selection;
-
-                $this->purchaseLimits->assertCanPurchase(
-                    $catalogItem,
-                    (int) $purchase->user_id,
-                    $otherItemQuantity + $quantity,
-                    $purchase->getKey(),
-                );
-                $this->inventory->reserve($selection, $difference);
-            } else {
-                $this->inventory->release($selection, abs($difference));
-            }
-        } catch (\InvalidArgumentException) {
-            throw ValidationException::withMessages([
-                'quantity' => __('api.purchase.insufficient_stock'),
-            ]);
-        }
-    }
-
-    private function lockPurchaseItem(Purchase $purchase, PurchaseItem $item): PurchaseItem
-    {
-        /** @var PurchaseItem|null $lockedItem */
-        $lockedItem = $purchase->items()
-            ->whereKey($item->getKey())
-            ->lockForUpdate()
-            ->first();
-
-        if ($lockedItem === null) {
-            throw new NotFoundHttpException('Purchase item not found.');
-        }
-
-        if ($lockedItem->reservation_status !== PurchaseItem::RESERVATION_ACTIVE) {
-            throw ValidationException::withMessages([
-                'item' => __('api.purchase.item_not_editable'),
-            ]);
-        }
-
-        return $lockedItem;
-    }
-
-    private function assertEditable(Purchase $purchase): void
-    {
-        if (
-            ! in_array($purchase->status, [
-                Purchase::STATUS_CREATED,
-                Purchase::STATUS_PENDING_PAYMENT,
-            ], true)
-            || $this->hasExpired($purchase)
-        ) {
-            throw ValidationException::withMessages([
-                'purchase' => __('api.purchase.not_editable'),
-            ]);
-        }
-    }
-
-    private function hasExpired(Purchase $purchase): bool
-    {
-        return $purchase->expires_at !== null && $purchase->expires_at->isPast();
-    }
-
-    private function lockPurchase(Purchase $purchase): Purchase
-    {
-        /** @var Purchase */
-        return Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
-    }
-
-    private function loadPurchase(Purchase $purchase): Purchase
-    {
-        return $this->responses->load($purchase);
-    }
 }
--- a/app/Domains/Purchase/Services/Checkout/PurchaseItemSnapshotFactory.php
+++ b/app/Domains/Purchase/Services/Checkout/PurchaseItemSnapshotFactory.php
@@ -9,35 +9,6 @@ use Illuminate\Support\Collection;

 class PurchaseItemSnapshotFactory
 {
-    /** @return array<string, mixed> */
-    public function fromVariant(Variant $variant, int $quantity): array
-    {
-        $variant->loadMissing([
-            'attachments',
-            'catalogItem.attachments',
-            'definitions.itemAttribute.attribute.options',
-            'eventDates',
-            'eventDate',
-        ]);
-        $unitPrice = $variant->getPrice();
-
-        return [
-            'source_variant_id' => $variant->id,
-            'image_attachment_id' => $variant->attachments->first()?->id
-                ?? $variant->catalogItem->attachments->first()?->id,
-            'nombre' => $variant->catalogItem->nombre,
-            'descripcion' => $variant->getDescription(),
-            'slug' => $variant->catalogItem->slug,
-            'item_nombre' => $variant->getName(),
-            'variant_attributes' => $this->snapshotAttributes($variant),
-            'cantidad' => $quantity,
-            'precio_unitario' => $unitPrice,
-            'discount_total' => null,
-            'tax_total' => null,
-            'total' => $unitPrice * $quantity,
-        ];
-    }
-
    /**
     * @param  Collection<int, CartItem>  $cartItems
     * @return array<int, array<string, mixed>>
--- a/app/Domains/Purchase/Services/Checkout/PurchaseResponseLoader.php
+++ b/app/Domains/Purchase/Services/Checkout/PurchaseResponseLoader.php
@@ -8,51 +8,6 @@ class PurchaseResponseLoader
 {
    public function load(Purchase $purchase): Purchase
    {
-        $purchase->load(['tenant', 'items.imageAttachment']);
-
-        if (
-            $purchase->cart_id !== null
-            && (
-                in_array($purchase->status, [
-                    Purchase::STATUS_CREATED,
-                    Purchase::STATUS_PENDING_PAYMENT,
-                ], true)
-                || $purchase->items->isEmpty()
-            )
-        ) {
-            $purchase->load([
-                'cart.items.catalogItem.inventory',
-                'cart.items.catalogItem.attachments',
-                'cart.items.variant.inventory',
-                'cart.items.variant.attachments',
-                'cart.items.variant.catalogItem',
-                'cart.items.variant.definitions.itemAttribute.attribute',
-                'cart.items.variant.eventDates',
-                'cart.items.variant.eventDate',
-            ]);
-        }
-
-        if (! $purchase->tenant->checkout_editing_policy->allowsVariantChanges()) {
-            return $purchase;
-        }
-
-        $purchase->load([
-            'items.sourceCatalogItem.itemAttributes.attribute',
-            'items.sourceCatalogItem.variants' => fn ($query) => $query->orderBy('id'),
-            'items.sourceCatalogItem.variants.inventory',
-            'items.sourceCatalogItem.variants.definitions' => fn ($query) => $query->orderBy('id'),
-            'items.sourceCatalogItem.variants.definitions.itemAttribute.attribute.options',
-            'items.sourceCatalogItem.variants.eventDates',
-            'items.sourceCatalogItem.variants.eventDate',
-            'cart.items.catalogItem.itemAttributes.attribute',
-            'cart.items.catalogItem.variants' => fn ($query) => $query->orderBy('id'),
-            'cart.items.catalogItem.variants.inventory',
-            'cart.items.catalogItem.variants.definitions' => fn ($query) => $query->orderBy('id'),
-            'cart.items.catalogItem.variants.definitions.itemAttribute.attribute.options',
-            'cart.items.catalogItem.variants.eventDates',
-            'cart.items.catalogItem.variants.eventDate',
-        ]);
-
-        return $purchase;
+        return $purchase->load(['tenant', 'items.imageAttachment', 'stockReservation']);
    }
 }
--- a/app/Domains/Purchase/Services/Checkout/ReleaseCheckoutService.php
+++ b/app/Domains/Purchase/Services/Checkout/ReleaseCheckoutService.php
@@ -2,21 +2,18 @@

 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 App\Domains\Purchase\Services\PurchaseStateGuard;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
-use Throwable;

 class ReleaseCheckoutService
 {
    public function __construct(
        private readonly StockReservationService $reservations,
-        private readonly SourceCartService $sourceCart,
-        private readonly PurchaseStateGuard $purchaseState,
    ) {}

    public function cancel(Purchase $purchase): Purchase
@@ -24,9 +21,9 @@ class ReleaseCheckoutService
        return $this->release($purchase, Purchase::STATUS_CANCELLED);
    }

-    public function cancelWithoutRestoringCart(Purchase $purchase): Purchase
+    public function cancelFromAdmin(Purchase $purchase): Purchase
    {
-        return $this->release($purchase, Purchase::STATUS_CANCELLED);
+        return $this->release($purchase, Purchase::STATUS_CANCELLED, allowInReviewCancellation: true);
    }

    public function expire(Purchase $purchase): Purchase
@@ -34,47 +31,21 @@ 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): Purchase
-    {
-        return DB::transaction(function () use ($purchase, $targetStatus): Purchase {
+    private function release(
+        Purchase $purchase,
+        string $targetStatus,
+        bool $allowInReviewCancellation = false,
+    ): Purchase {
+        return DB::transaction(function () use (
+            $purchase,
+            $targetStatus,
+            $allowInReviewCancellation,
+        ): Purchase {
            $purchase = $this->lockPurchase($purchase);

-            if ($targetStatus !== Purchase::STATUS_EXPIRED) {
-                $this->purchaseState->assertNotExpired($purchase);
+            if ($purchase->status === Purchase::STATUS_EXPIRED
+                && $targetStatus !== Purchase::STATUS_EXPIRED) {
+                throw new PurchaseExpiredException;
            }

            if ($purchase->status === Purchase::STATUS_PAID) {
@@ -87,24 +58,43 @@ class ReleaseCheckoutService
                ]);
            }

+            if (
+                $purchase->status === Purchase::STATUS_IN_REVIEW
+                && $targetStatus === Purchase::STATUS_CANCELLED
+                && ! $allowInReviewCancellation
+            ) {
+                return $this->createNewCartWithoutCancelling($purchase);
+            }
+
            if ($this->isAlreadyReleased($purchase)) {
                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
-                && ($purchase->expires_at === null || $purchase->expires_at->isFuture())
+                && (! in_array($purchase->status, [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                ], true) || ! $this->hasOverdueActiveReservation($purchase))
            ) {
                return $this->loadPurchase($purchase);
            }

-            if ($purchase->items()->exists()) {
-                throw ValidationException::withMessages([
-                    'items' => __('api.purchase.inconsistent_reservation'),
-                ]);
-            }
-
-            $this->releaseCartReservations($purchase, $targetStatus);
+            $this->releasePurchaseReservations($purchase, $targetStatus, $cart);

            $purchase->update(['status' => $targetStatus]);

@@ -112,58 +102,105 @@ class ReleaseCheckoutService
        });
    }

-    private function releaseCartReservations(
+    private function releasePurchaseReservations(
        Purchase $purchase,
        string $targetStatus,
+        ?Cart $cart,
    ): void {
-        $cart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
+        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'),
+            ]);
+        }
+
        if ($cart === null) {
            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'),
+        if ($targetStatus === Purchase::STATUS_EXPIRED
+            && in_array($cart->status, [Cart::STATUS_ACTIVE, Cart::STATUS_CHECKOUT], true)) {
+            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,
                ]);
-            }
+
+            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' => 'converted']);
+            $cart->update(['status' => Cart::STATUS_CONVERTED]);
            $cart->delete();
        }
    }

+    private function createNewCartWithoutCancelling(Purchase $purchase): Purchase
+    {
+        return DB::transaction(function () use ($purchase): Purchase {
+            $purchase = $this->lockPurchase($purchase);
+
+            if ($purchase->status !== Purchase::STATUS_IN_REVIEW || $purchase->user_id === null) {
+                return $this->loadPurchase($purchase);
+            }
+
+            /** @var Cart|null $sourceCart */
+            $sourceCart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
+            if ($sourceCart !== null && ! $sourceCart->trashed() && $sourceCart->status === 'active') {
+                $sourceCart->update(['status' => 'checkout']);
+            }
+
+            Cart::query()->firstOrCreate([
+                'tenant_codigo' => $purchase->tenant_codigo,
+                'user_id' => $purchase->user_id,
+                'guest_token' => null,
+                'status' => 'active',
+                'origin' => Cart::ORIGIN_USER,
+            ]);
+
+            return $this->loadPurchase($purchase);
+        });
+    }
+
    private function isAlreadyReleased(Purchase $purchase): bool
    {
        return in_array($purchase->status, [
            Purchase::STATUS_CANCELLED,
            Purchase::STATUS_REJECTED,
            Purchase::STATUS_EXPIRED,
+            Purchase::STATUS_SUPERSEDED,
        ], true);
    }

@@ -175,15 +212,17 @@ class ReleaseCheckoutService

    private function loadPurchase(Purchase $purchase): Purchase
    {
-        return $purchase->load([
-            'items.imageAttachment',
-            'cart.items.catalogItem.inventory',
-            'cart.items.catalogItem.attachments',
-            'cart.items.variant.inventory',
-            'cart.items.variant.attachments',
-            'cart.items.variant.definitions.itemAttribute.attribute',
-            'cart.items.variant.eventDates',
-            'cart.items.variant.eventDate',
-        ]);
+        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();
    }
 }
--- a/app/Domains/Purchase/Services/Checkout/SourceCartService.php
+++ b/app/Domains/Purchase/Services/Checkout/SourceCartService.php
@@ -7,88 +7,6 @@ use App\Domains\Purchase\Models\Purchase;

 class SourceCartService
 {
-    public function syncItemQuantity(
-        Purchase $purchase,
-        PurchaseItem $purchaseItem,
-        int $quantity,
-    ): void {
-        $sourceCart = $this->findSourceCart($purchase);
-
-        if ($sourceCart === null) {
-            return;
-        }
-
-        $sourceCart->items()
-            ->where('catalog_item_id', $purchaseItem->source_catalog_item_id)
-            ->where('variant_id', $purchaseItem->source_variant_id)
-            ->update(['cantidad' => $quantity]);
-    }
-
-    public function syncItemSelection(
-        Purchase $purchase,
-        int $catalogItemId,
-        ?int $previousVariantId,
-        int $newVariantId,
-        int $finalQuantity,
-    ): void {
-        $sourceCart = $this->findSourceCart($purchase);
-
-        if ($sourceCart === null) {
-            return;
-        }
-
-        /** @var CartItem|null $previousItem */
-        $previousItem = $sourceCart->items()
-            ->where('catalog_item_id', $catalogItemId)
-            ->where('variant_id', $previousVariantId)
-            ->lockForUpdate()
-            ->first();
-
-        /** @var CartItem|null $targetItem */
-        $targetItem = $sourceCart->items()
-            ->where('catalog_item_id', $catalogItemId)
-            ->where('variant_id', $newVariantId)
-            ->when($previousItem !== null, fn ($query) => $query->whereKeyNot($previousItem->getKey()))
-            ->lockForUpdate()
-            ->first();
-
-        if ($targetItem !== null) {
-            $targetItem->update(['cantidad' => $finalQuantity]);
-            $previousItem?->delete();
-
-            return;
-        }
-
-        if ($previousItem !== null) {
-            $previousItem->update([
-                'variant_id' => $newVariantId,
-                'cantidad' => $finalQuantity,
-            ]);
-
-            return;
-        }
-
-        $sourceCart->items()->create([
-            'catalog_item_id' => $catalogItemId,
-            'variant_id' => $newVariantId,
-            'cantidad' => $finalQuantity,
-        ]);
-    }
-
-    public function removeItem(Purchase $purchase, PurchaseItem $purchaseItem): void
-    {
-        $sourceCart = $this->findSourceCart($purchase);
-
-        if ($sourceCart === null) {
-            return;
-        }
-
-        $sourceCart->items()
-            ->where('catalog_item_id', $purchaseItem->source_catalog_item_id)
-            ->where('variant_id', $purchaseItem->source_variant_id)
-            ->delete();
-    }
-
    public function finalize(Purchase $purchase): void
    {
        $sourceCart = $this->findSourceCart($purchase);
--- a/app/Domains/Purchase/Services/Checkout/StartCheckoutService.php
+++ b/app/Domains/Purchase/Services/Checkout/StartCheckoutService.php
@@ -4,6 +4,7 @@ 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;
@@ -12,6 +13,7 @@ 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;
@@ -26,6 +28,7 @@ class StartCheckoutService
        private readonly CatalogSelectionResolver $selections,
        private readonly InsufficientStockMessageBuilder $stockMessages,
        private readonly PurchaseResponseLoader $responses,
+        private readonly PurchaseItemSnapshotFactory $snapshots,
    ) {}

    /** @param array<string, mixed> $purchaseData */
@@ -168,21 +171,31 @@ 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,
@@ -192,14 +205,12 @@ class StartCheckoutService
            ),
            $cart->getKey(),
        );
+        $cart->update(['current_purchase_id' => $purchase->getKey()]);
+        $this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());

-        foreach ($cartItems as $index => $cartItem) {
-            $this->reservations->attachToPurchase(
-                $cartItem,
-                $resolvedLines->get($index)['selection'],
-                $purchase,
-            );
-        }
+        $cartItems = $cart->items()->orderBy('id')->lockForUpdate()->get();
+        $this->loadCartItems($cartItems);
+        $purchase->items()->createMany($this->snapshots->fromCartItems($cartItems));

        return $this->loadPurchase($purchase);
    }
@@ -251,6 +262,7 @@ 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,
@@ -259,42 +271,76 @@ class StartCheckoutService
            $cart->getTotalAmount(),
            $cart->getKey(),
        );
-        foreach ($cartItems as $cartItem) {
-            $this->reservations->attachToPurchase(
-                $cartItem,
-                $cartItem->selectedItem(),
-                $purchase,
-            );
-        }
-
-        // The purchase owns the reservation until checkout finishes. The cart is
-        // retained so it can be restored if the purchase is cancelled or expires.
-        $cart->update([
-            'status' => 'checkout',
-            'guest_token' => null,
-        ]);
+        $cart->update(['current_purchase_id' => $purchase->getKey()]);
+        $this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
+        $purchase->items()->createMany($this->snapshots->fromCartItems($cartItems));

        return $this->loadPurchase($purchase);
    }

    private function resolveCart(Tenant $tenant, int $userId, int $cartId): Cart
    {
+        /** @var Cart|null $candidate */
+        $candidate = Cart::query()->find($cartId);
+
+        $this->assertCartCanCheckout($candidate, $tenant, $userId);
+
+        $candidatePurchaseId = $candidate->current_purchase_id;
+        $currentPurchase = $candidatePurchaseId === null
+            ? null
+            : Purchase::query()->lockForUpdate()->find($candidatePurchaseId);
+
        /** @var Cart|null $cart */
        $cart = Cart::query()->lockForUpdate()->find($cartId);

-        if ($cart === null || $cart->tenant_codigo !== $tenant->codigo || $cart->user_id !== $userId) {
-            throw new NotFoundHttpException('Cart not found for tenant.');
+        $this->assertCartCanCheckout($cart, $tenant, $userId);
+
+        if ($cart->current_purchase_id !== $candidatePurchaseId) {
+            if ($cart->current_purchase_id !== null) {
+                throw ValidationException::withMessages([
+                    'cart_id' => __('api.purchase.checkout_in_progress'),
+                ]);
+            }
+
+            $currentPurchase = null;
        }

-        if ($cart->status !== 'active') {
+        if ($currentPurchase?->status === Purchase::STATUS_PAID) {
            throw ValidationException::withMessages([
-                'cart_id' => __('api.purchase.inactive_cart'),
+                'cart_id' => __('api.purchase.checkout_in_progress'),
+            ]);
+        }
+
+        if ($currentPurchase !== null && in_array($currentPurchase->status, [
+            Purchase::STATUS_CREATED,
+            Purchase::STATUS_PENDING_PAYMENT,
+        ], true)) {
+            $this->reservations->returnToCart($currentPurchase, $cart);
+            $currentPurchase->update([
+                'status' => Purchase::STATUS_SUPERSEDED,
            ]);
        }

        return $cart;
    }

+    private function assertCartCanCheckout(?Cart $cart, Tenant $tenant, int $userId): void
+    {
+        if ($cart === null || $cart->tenant_codigo !== $tenant->codigo || $cart->user_id !== $userId) {
+            throw new NotFoundHttpException('Cart not found for tenant.');
+        }
+
+        if ($cart->status === Cart::STATUS_EXPIRED) {
+            throw new StockReservationExpiredException;
+        }
+
+        if ($cart->status !== Cart::STATUS_ACTIVE) {
+            throw ValidationException::withMessages([
+                'cart_id' => __('api.purchase.inactive_cart'),
+            ]);
+        }
+    }
+
    /** @param Collection<int, CartItem> $cartItems */
    private function verifyTenantItems(Tenant $tenant, Collection $cartItems): void
    {
@@ -362,13 +408,17 @@ 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
    {
--- a/app/Domains/Purchase/Services/CheckoutService.php
+++ b/app/Domains/Purchase/Services/CheckoutService.php
@@ -2,9 +2,7 @@

 namespace App\Domains\Purchase\Services;

-use App\Domains\Catalog\Services\StockReservationService;
 use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Purchase\Services\Checkout\CompleteCheckoutService;
 use App\Domains\Purchase\Services\Checkout\EditCheckoutService;
 use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
@@ -24,7 +22,6 @@ class CheckoutService
        private readonly EditCheckoutService $editor,
        private readonly CompleteCheckoutService $completer,
        private readonly ReleaseCheckoutService $releaser,
-        private readonly StockReservationService $reservations,
    ) {}

    /** @param array<string, mixed> $purchaseData */
@@ -33,11 +30,6 @@ class CheckoutService
        return $this->starter->start($tenant, $userId, $purchaseData);
    }

-    public function completePurchase(Purchase $purchase): Purchase
-    {
-        return $this->completer->complete($purchase);
-    }
-
    public function submitForReview(Purchase $purchase): Purchase
    {
        return $this->completer->submitForReview($purchase);
@@ -49,32 +41,6 @@ class CheckoutService
        return $this->editor->updateCustomer($purchase, $customerData);
    }

-    public function updateItem(
-        Purchase $purchase,
-        PurchaseItem $purchaseItem,
-        ?int $quantity,
-        ?int $variantId,
-        bool $updateVariant,
-    ): Purchase {
-        return $this->editor->updateItem(
-            $purchase,
-            $purchaseItem,
-            $quantity,
-            $variantId,
-            $updateVariant,
-        );
-    }
-
-    public function prepareItemEditing(Purchase $purchase): Purchase
-    {
-        return $this->editor->prepareItemEditing($purchase);
-    }
-
-    public function removeItem(Purchase $purchase, PurchaseItem $purchaseItem): Purchase
-    {
-        return $this->editor->removeItem($purchase, $purchaseItem);
-    }
-
    public function confirmPurchase(Purchase $purchase): void
    {
        $this->completer->confirm($purchase);
@@ -95,23 +61,13 @@ class CheckoutService
        return $this->releaser->cancel($purchase);
    }

-    public function cancelPurchaseWithoutRestoringCart(Purchase $purchase): Purchase
+    public function cancelPurchaseFromAdmin(Purchase $purchase): Purchase
    {
-        return $this->releaser->cancelWithoutRestoringCart($purchase);
+        return $this->releaser->cancelFromAdmin($purchase);
    }

    public function expirePurchase(Purchase $purchase): Purchase
    {
        return $this->releaser->expire($purchase);
    }
-
-    public function expireOverduePurchases(): int
-    {
-        return $this->releaser->expireOverdue();
-    }
-
-    public function syncReservationExpiration(Purchase $purchase): void
-    {
-        $this->reservations->syncPurchaseExpiration($purchase);
-    }
 }
--- a/app/Domains/Purchase/Services/PurchaseStateGuard.php
+++ b/app/Domains/Purchase/Services/PurchaseStateGuard.php
@@ -2,23 +2,57 @@

 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;

 class PurchaseStateGuard
 {
    public function assertNotExpired(Purchase $purchase): void
    {
-        $hasExpiredStatus = $purchase->status === Purchase::STATUS_EXPIRED;
-        $hasExpiredByTime = in_array($purchase->status, [
+        if ($purchase->status === Purchase::STATUS_EXPIRED) {
+            throw new PurchaseExpiredException;
+        }
+
+        if (! in_array($purchase->status, [
            Purchase::STATUS_CREATED,
            Purchase::STATUS_PENDING_PAYMENT,
-        ], true)
-            && $purchase->expires_at !== null
-            && $purchase->expires_at->isPast();
+        ], true)) {
+            return;
+        }

-        if ($hasExpiredStatus || $hasExpiredByTime) {
+        /** @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()
+            )
+        )) {
            throw new PurchaseExpiredException;
        }
    }
+
+    public function lockCurrentCart(Purchase $purchase): Cart
+    {
+        /** @var Cart|null $cart */
+        $cart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
+
+        if ($cart === null || $cart->current_purchase_id !== $purchase->getKey()) {
+            throw ValidationException::withMessages([
+                'purchase' => __('api.purchase.not_current'),
+            ]);
+        }
+
+        return $cart;
+    }
 }
--- a/app/Domains/Purchase/Services/TenantTransactionResetService.php
+++ b/app/Domains/Purchase/Services/TenantTransactionResetService.php
@@ -135,11 +135,25 @@ 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')
-            ->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']);
-            });
+            ->whereIn('id', $reservationIds);
    }
 }
--- a/app/Domains/Purchase/Services/UserPurchaseLimitService.php
+++ b/app/Domains/Purchase/Services/UserPurchaseLimitService.php
@@ -51,6 +51,7 @@ class UserPurchaseLimitService
                        ->whereIn('status', [
                            Purchase::STATUS_CREATED,
                            Purchase::STATUS_PENDING_PAYMENT,
+                            Purchase::STATUS_IN_REVIEW,
                            Purchase::STATUS_PAID,
                        ])
                        ->when(
@@ -68,6 +69,7 @@ class UserPurchaseLimitService
                        ->whereIn('status', [
                            Purchase::STATUS_CREATED,
                            Purchase::STATUS_PENDING_PAYMENT,
+                            Purchase::STATUS_IN_REVIEW,
                        ])
                        ->whereDoesntHave('items')
                        ->when(
@@ -86,7 +88,9 @@ class UserPurchaseLimitService
                        $excludedCartId !== null,
                        fn ($query) => $query->whereKeyNot($excludedCartId),
                    ))
-                ->whereHas('stockReservations', fn ($query) => $query->where('status', 'active'))
+                ->whereHas('cart.currentStockReservation', fn ($query) => $query
+                    ->where('status', 'active')
+                    ->whereDoesntHave('purchase'))
                ->sum('cantidad');

            if ($purchasedQuantity + $checkoutQuantity + $reservedCartQuantity + $requestedQuantity > $limit) {
@@ -131,6 +135,7 @@ class UserPurchaseLimitService
                ->whereIn('status', [
                    Purchase::STATUS_CREATED,
                    Purchase::STATUS_PENDING_PAYMENT,
+                    Purchase::STATUS_IN_REVIEW,
                    Purchase::STATUS_PAID,
                ]))
            ->groupBy('source_catalog_item_id')
@@ -141,7 +146,11 @@ class UserPurchaseLimitService
            ->whereIn('catalog_item_id', $ids)
            ->whereHas('cart.purchases', fn ($query) => $query
                ->where('user_id', $userId)
-                ->whereIn('status', [Purchase::STATUS_CREATED, Purchase::STATUS_PENDING_PAYMENT])
+                ->whereIn('status', [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                    Purchase::STATUS_IN_REVIEW,
+                ])
                ->whereDoesntHave('items'))
            ->groupBy('catalog_item_id')
            ->pluck('quantity', 'catalog_item_id');
@@ -152,7 +161,9 @@ class UserPurchaseLimitService
            ->whereHas('cart', fn ($query) => $query
                ->where('user_id', $userId)
                ->where('status', 'active'))
-            ->whereHas('stockReservations', fn ($query) => $query->where('status', 'active'))
+            ->whereHas('cart.currentStockReservation', fn ($query) => $query
+                ->where('status', 'active')
+                ->whereDoesntHave('purchase'))
            ->groupBy('catalog_item_id')
            ->pluck('quantity', 'catalog_item_id');

--- a/app/Domains/Purchase/documentacion/README.md
+++ b/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`, `paid`, `cancelled`, `rejected` y `expired`.
+- `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.
 - `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, sin crear todavía `PurchaseItem`.
+- `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`.
 - `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, vence y procesa vencimientos pendientes.
+- `ReleaseCheckoutService`: cancela o vence una compra y aplica sus efectos comerciales; el scanner unificado del dominio Catalog detecta las reservas pendientes de vencimiento.
 - `SourceCartService`: sincroniza o finaliza el carrito de checkout asociado a la compra.
 - `CatalogSelectionResolver` y `PurchaseItemSnapshotFactory`: resuelven selecciones y generan snapshots.

-Durante `created` y `pending_payment`, `PurchaseResource` publica las líneas del carrito con `items_source=cart`; una compra materializada publica `items_source=purchase`. Los datos descriptivos y económicos del checkout se resuelven siempre desde el catálogo vigente.
+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.

-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.
+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.

 `UserPurchaseLimitService` controla límites de compra y `CheckoutService` conserva el punto de entrada para controladores e integraciones.

--- a/app/Domains/Purchase/routes/api.php
+++ b/app/Domains/Purchase/routes/api.php
@@ -7,12 +7,8 @@ Route::prefix('tenants/{tenant:codigo}')->middleware('auth:sanctum')->group(func
    Route::get('compras', [PurchaseController::class, 'index']);
    Route::post('compras/start-checkout', [PurchaseController::class, 'startCheckout']);
    Route::get('compras/{compra}', [PurchaseController::class, 'show']);
-    Route::post('compras/{compra}/edit-items', [PurchaseController::class, 'prepareItemEditing']);
-    Route::patch('compras/{compra}/items/{item}', [PurchaseController::class, 'updateItem']);
-    Route::delete('compras/{compra}/items/{item}', [PurchaseController::class, 'removeItem']);
    Route::patch('compras/{compra}/customer-data', [PurchaseController::class, 'updateCustomerData']);
    Route::post('compras/{compra}/payment-intent', [PurchaseController::class, 'paymentIntent']);
-    Route::post('compras/{compra}/complete', [PurchaseController::class, 'complete']);
    Route::post('compras/{compra}/review', [PurchaseController::class, 'submitForReview']);
    Route::post('compras/{compra}/cancel', [PurchaseController::class, 'cancel']);
 });
--- a/Show More
+++ b/Show More