Squashed commit of the following:

commit cd99a6489b
Merge: ebcbbb1 e63a036
Author: ncoronel <ncoronel@quo.ar>
Date:   Wed Aug 26 10:12:44 2026 -0300

    Merge branch 'fix/simplify_stock_reservations' of https://gitea.quo.ar/tbianchini/shopit-back into fix/simplify_stock_reservations

commit ebcbbb1774
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:33:39 2026 -0300

    fix(cart): reconcile expired cart mutations

commit 3dd378ed06
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:10:15 2026 -0300

    docs(stock): describe associated entity expiration

commit 4f705175bd
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:10:14 2026 -0300

    test(stock): cover propagated reservation expiration

commit 82570fe941
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:09:52 2026 -0300

    refactor(stock): propagate reservation expiration

commit d2a2b323e0
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:47 2026 -0300

    docs(stock): document terminal reservation recovery

commit ec67623b7b
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:47 2026 -0300

    test(stock): cover terminal reservation lifecycle

commit f6f138e180
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:41 2026 -0300

    refactor(stock): make expired reservations terminal

commit d612b7a118
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:30 2026 -0300

    docs(stock): describe unified expiration ownership

commit 49f42d4507
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:23 2026 -0300

    test(stock): cover authoritative reservation expiration

commit 1881cc1d4b
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:17 2026 -0300

    refactor(stock): make reservation expiration authoritative

commit 00ec37d8a0
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:34 2026 -0300

    docs(stock): document centralized reservation flow

commit d9f374c718
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:29 2026 -0300

    test(stock): cover aggregate reservation lifecycle

commit bbfdf8f342
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:23 2026 -0300

    refactor(stock): centralize reservation aggregate

commit 8a0f29bdae
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:33:39 2026 -0300

    fix(cart): reconcile expired cart mutations

commit 198ed400a9
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:10:15 2026 -0300

    docs(stock): describe associated entity expiration

commit 23d83166e6
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:10:14 2026 -0300

    test(stock): cover propagated reservation expiration

commit cb090402d0
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:09:52 2026 -0300

    refactor(stock): propagate reservation expiration

commit c120b6f7c0
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:47 2026 -0300

    docs(stock): document terminal reservation recovery

commit 1106fa28b4
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:47 2026 -0300

    test(stock): cover terminal reservation lifecycle

commit 896fb81bcf
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:41 2026 -0300

    refactor(stock): make expired reservations terminal

commit 8545fbc645
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:30 2026 -0300

    docs(stock): describe unified expiration ownership

commit dd6dcb708a
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:23 2026 -0300

    test(stock): cover authoritative reservation expiration

commit 624b246ff5
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:17 2026 -0300

    refactor(stock): make reservation expiration authoritative

commit 007b95b904
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:34 2026 -0300

    docs(stock): document centralized reservation flow

commit 0b3c8c93be
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:29 2026 -0300

    test(stock): cover aggregate reservation lifecycle

commit ede718e448
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:23 2026 -0300

    refactor(stock): centralize reservation aggregate

commit e63a03601a
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:33:39 2026 -0300

    fix(cart): reconcile expired cart mutations

commit 389373ad8c
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:10:15 2026 -0300

    docs(stock): describe associated entity expiration

commit ace02a3133
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:10:14 2026 -0300

    test(stock): cover propagated reservation expiration

commit d69a6210f6
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 16:09:52 2026 -0300

    refactor(stock): propagate reservation expiration

commit 3c0b43fea3
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:47 2026 -0300

    docs(stock): document terminal reservation recovery

commit 9b0008626b
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:47 2026 -0300

    test(stock): cover terminal reservation lifecycle

commit 61861e331a
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:58:41 2026 -0300

    refactor(stock): make expired reservations terminal

commit 2cc9d7dd97
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:30 2026 -0300

    docs(stock): describe unified expiration ownership

commit f982bcead1
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:23 2026 -0300

    test(stock): cover authoritative reservation expiration

commit 7a85e1731d
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:28:17 2026 -0300

    refactor(stock): make reservation expiration authoritative

commit 6db99e775a
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:34 2026 -0300

    docs(stock): document centralized reservation flow

commit e5f7ba3615
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:29 2026 -0300

    test(stock): cover aggregate reservation lifecycle

commit 24bfef431b
Author: ncoronel <ncoronel@quo.ar>
Date:   Tue Aug 25 15:05:23 2026 -0300

    refactor(stock): centralize reservation aggregate

.env.example

@@ -8,6 +8,7 @@ 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
 
 APP_LOCALE=es
@@ -31,10 +32,17 @@ AUTH_LOGIN_LOCK_MINUTES=15
 AUTH_LOGIN_RATE_LIMIT_PER_MINUTE=10
 AUTH_LOGIN_IP_RATE_LIMIT_PER_MINUTE=30
 
-LOG_CHANNEL=stack
+LOG_CHANNEL=daily
 LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
+LOG_DAILY_DAYS=14
+TELEPAGOS_LOG_LEVEL=info
+TELEPAGOS_LOG_DAYS=30
+COMMANDS_LOG_LEVEL=info
+COMMANDS_LOG_DAYS=30
+EMAILS_LOG_LEVEL=info
+EMAILS_LOG_DAYS=30
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

app/Domains/Auth/Services/AdminCredentialVerifier.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Models\User;
+use App\Domains\Authorization\Enums\RoleCode;
+use Illuminate\Support\Facades\Hash;
+
+class AdminCredentialVerifier
+{
+    public function verify(string $email, string $password): bool
+    {
+        $admin = User::query()
+            ->where('email', mb_strtolower(trim($email)))
+            ->where('rol_codigo', RoleCode::Admin->value)
+            ->first();
+
+        return $admin !== null
+            && ! $admin->locked_until?->isFuture()
+            && Hash::check($password, $admin->getAuthPassword());
+    }
+}

app/Domains/Auth/Services/GoogleAuthService.php

@@ -155,16 +155,19 @@ class GoogleAuthService
         $parts = parse_url($returnUrl);
         if (! is_array($parts)
             || ! isset($parts['scheme'], $parts['host'])
-            || isset($parts['user'], $parts['pass'], $parts['query'], $parts['fragment'])
+            || isset($parts['user'], $parts['pass'], $parts['query'], $parts['fragment'])) {
-            || ($parts['path'] ?? '') !== '') {
             return false;
         }
 
         $scheme = strtolower($parts['scheme']);
         $host = TenantDomainNormalizer::normalize($parts['host']);
         $tenantDomain = TenantDomainNormalizer::normalize($tenant->dominio);
+        $returnPath = TenantDomainNormalizer::normalizePath($parts['path'] ?? '/');
 
-        if ($host === null || $tenantDomain === null || $host !== $tenantDomain) {
+        if ($host === null
+            || $tenantDomain === null
+            || $host !== $tenantDomain
+            || $returnPath !== $tenant->base_path) {
             return false;
         }
 

app/Domains/Bootstrap/Services/TenantBootstrapService.php

@@ -14,14 +14,15 @@ class TenantBootstrapService
 
     public function get(string $domain, string $path = '/'): Tenant
     {
-        $candidateKeys = TenantDomainNormalizer::tenantKeyCandidates($domain, $path);
+        $candidateBasePaths = TenantDomainNormalizer::basePathCandidates($path);
-        $tenantsByDomain = Tenant::query()
+        $tenantsByBasePath = Tenant::query()
-            ->whereIn('dominio', $candidateKeys)
+            ->where('dominio', $domain)
+            ->whereIn('base_path', $candidateBasePaths)
             ->get()
-            ->keyBy('dominio');
+            ->keyBy('base_path');
 
-        $tenant = collect($candidateKeys)
+        $tenant = collect($candidateBasePaths)
-            ->map(fn (string $candidate): ?Tenant => $tenantsByDomain->get($candidate))
+            ->map(fn (string $candidate): ?Tenant => $tenantsByBasePath->get($candidate))
             ->first(fn (?Tenant $candidate): bool => $candidate !== null);
 
         if (! $tenant instanceof Tenant) {

app/Domains/Cart/Models/Cart.php

@@ -5,8 +5,11 @@ 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;
+use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Services\UserPurchaseLimitService;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -24,6 +27,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
     'user_id',
     'guest_token',
     'status',
+    'origin',
+    'current_purchase_id',
+    'current_stock_reservation_id',
 ])]
 class Cart extends Model
 {
@@ -32,10 +38,26 @@ 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';
+
     protected function casts(): array
     {
         return [
             'user_id' => 'integer',
+            'current_purchase_id' => 'integer',
+            'current_stock_reservation_id' => 'integer',
         ];
     }
 
@@ -63,6 +85,27 @@ class Cart extends Model
         return $this->hasMany(CartItem::class, 'cart_id');
     }
 
+    /** @return HasMany<Purchase, $this> */
+    public function purchases(): HasMany
+    {
+        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')
@@ -85,14 +128,20 @@ 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)
                 ->sum('cantidad');
-            $this->assertUserPurchaseLimit($selectedItem, $cartQuantity + $quantity);
             $inventoryService = app(CatalogInventoryService::class);
             $availableQuantity = $inventoryService->availableQuantity($selectedItem);
+            $this->assertUserPurchaseLimit(
+                $selectedItem,
+                $cartQuantity + $quantity,
+                heldQuantity: $cartQuantity,
+                maximumAddableCeiling: $availableQuantity,
+            );
 
             if ($availableQuantity !== null && $availableQuantity < $quantity) {
                 throw ValidationException::withMessages([
@@ -118,7 +167,7 @@ class Cart extends Model
                 $item->save();
             }
 
-            $inventoryService->reserve($selectedItem, $quantity);
+            app(StockReservationService::class)->syncCart($this);
 
             return $item->fresh();
         });
@@ -129,6 +178,7 @@ class Cart extends Model
         int $quantity,
         ?int $variantId = null,
         bool $updateVariant = false,
+        ?int $excludedPurchaseId = null,
     ): CartItem {
         if ($quantity <= 0) {
             throw ValidationException::withMessages([
@@ -141,7 +191,11 @@ class Cart extends Model
             $quantity,
             $variantId,
             $updateVariant,
+            $excludedPurchaseId,
         ): CartItem {
+            $this->invalidateCurrentCheckout();
+            app(StockReservationService::class)->assertCartReservationUsable($this);
+
             /** @var CartItem $item */
             $item = $this->items()
                 ->where('id', $cartItemId)
@@ -165,12 +219,15 @@ class Cart extends Model
                     ->where('catalog_item_id', $item->catalog_item_id)
                     ->whereKeyNot($item->getKey())
                     ->sum('cantidad');
+                $nextAvailableQuantity = $inventoryService->availableQuantity($nextSelection);
                 $this->assertUserPurchaseLimit(
                     $nextSelection,
                     $otherVariantsQuantity + $quantity,
+                    $excludedPurchaseId,
+                    $otherVariantsQuantity + $item->cantidad,
+                    $nextAvailableQuantity,
                 );
 
-                $inventoryService->release($currentSelection, $item->cantidad);
                 $availableQuantity = $inventoryService->availableQuantity($nextSelection);
 
                 if ($availableQuantity !== null && $availableQuantity < $quantity) {
@@ -186,12 +243,11 @@ class Cart extends Model
                     ->lockForUpdate()
                     ->first();
 
-                $inventoryService->reserve($nextSelection, $quantity);
-
                 if ($targetItem !== null) {
                     $targetItem->cantidad += $quantity;
                     $targetItem->save();
                     $item->delete();
+                    app(StockReservationService::class)->syncCart($this);
 
                     return $targetItem->fresh();
                 }
@@ -199,11 +255,13 @@ class Cart extends Model
                 $item->variant_id = $variantId;
                 $item->cantidad = $quantity;
                 $item->save();
+                app(StockReservationService::class)->syncCart($this);
 
                 return $item->fresh();
             }
 
             $delta = $quantity - $item->cantidad;
+            $availableQuantity = $inventoryService->availableQuantity($currentSelection);
 
             if ($delta > 0) {
                 $otherVariantsQuantity = (int) $this->items()
@@ -213,11 +271,12 @@ class Cart extends Model
                 $this->assertUserPurchaseLimit(
                     $currentSelection,
                     $otherVariantsQuantity + $quantity,
+                    $excludedPurchaseId,
+                    $otherVariantsQuantity + $item->cantidad,
+                    $availableQuantity,
                 );
             }
 
-            $availableQuantity = $inventoryService->availableQuantity($currentSelection);
-
             if ($delta > 0 && $availableQuantity !== null && $availableQuantity < $delta) {
                 $maxAvailable = $availableQuantity + $item->cantidad;
                 throw ValidationException::withMessages([
@@ -227,14 +286,7 @@ class Cart extends Model
 
             $item->cantidad = $quantity;
             $item->save();
-
+            app(StockReservationService::class)->syncCart($this);
-            if ($delta > 0) {
-                $inventoryService->reserve($currentSelection, $delta);
-            }
-
-            if ($delta < 0) {
-                $inventoryService->release($currentSelection, abs($delta));
-            }
 
             return $item->fresh();
         });
@@ -243,25 +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(CatalogInventoryService::class)->release(
-                $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,
@@ -334,6 +440,9 @@ class Cart extends Model
     private function assertUserPurchaseLimit(
         CatalogItem|Variant $selectedItem,
         int $cartQuantity,
+        ?int $excludedPurchaseId = null,
+        int $heldQuantity = 0,
+        ?int $maximumAddableCeiling = null,
     ): void {
         if ($this->user_id === null) {
             return;
@@ -347,6 +456,10 @@ class Cart extends Model
             $catalogItem,
             $this->user_id,
             $cartQuantity,
+            $excludedPurchaseId,
+            $this->getKey(),
+            $heldQuantity,
+            $maximumAddableCeiling,
             field: 'cantidad',
         );
     }

app/Domains/Cart/Resources/CartItemResource.php

@@ -4,6 +4,8 @@ namespace App\Domains\Cart\Resources;
 
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Catalog\Models\Variant;
+use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -19,12 +21,16 @@ class CartItemResource extends JsonResource
     {
         $selectedItem = $this->selectedItem();
         $imageUrl = null;
+        $tenant = $request->route('tenant');
+        $displayImage = ! $tenant instanceof Tenant || $tenant->display_cart_item_images;
+        $includeVariants = $tenant instanceof Tenant
+            && $tenant->cart_editing_policy->allowsVariantChanges();
 
-        if ($selectedItem?->relationLoaded('attachments')) {
+        if ($displayImage && $selectedItem?->relationLoaded('attachments')) {
             $imageUrl = $selectedItem->attachments->first()?->getTemporaryUrl(1440);
         }
 
-        if ($imageUrl === null && $this->catalogItem?->relationLoaded('attachments')) {
+        if ($displayImage && $imageUrl === null && $this->catalogItem?->relationLoaded('attachments')) {
             $imageUrl = $this->catalogItem->attachments->first()?->getTemporaryUrl(1440);
         }
 
@@ -36,14 +42,27 @@ class CartItemResource extends JsonResource
             'variant_id' => $this->variant_id,
             'nombre' => $selectedItem?->getName(),
             'imagen' => $imageUrl,
-            'variant' => $this->variant === null ? null : [
+            'variant' => $this->variant === null ? null : $this->variantData($this->variant),
-                'id' => $this->variant->id,
+            'variants' => $this->when(
-                'precio' => $this->formatMoney($this->variant->getPrice()),
+                $includeVariants,
+                fn () => $this->catalogItem
+                    ->visibleVariants($this->variant_id)
+                    ->map(fn (Variant $variant): array => $this->variantData($variant))
+                    ->values(),
+            ),
+        ];
+    }
+
+    /** @return array<string, mixed> */
+    protected function variantData(Variant $variant): array
+    {
+        return [
+            'id' => $variant->id,
+            'precio' => $this->formatMoney($variant->precio ?? $this->catalogItem->precio),
             'stock_tecnico' => $this->catalogItem->inventory_policy === InventoryPolicy::Unlimited
                 ? null
-                    : $this->variant->inventory->availableStock(),
+                : $variant->inventory->availableStock(),
-                'values' => $this->variant->selectorOptions($this->catalogItem->itemAttributes),
+            'values' => $variant->selectorOptions($this->catalogItem->itemAttributes),
-            ],
         ];
     }
 

app/Domains/Cart/Services/CartService.php

@@ -4,10 +4,14 @@ namespace App\Domains\Cart\Services;
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Cart\Models\Cart;
+use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Catalog\Services\ExpireStockReservationsService;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -21,13 +25,13 @@ 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);
         }
 
-        return $this->loadCart($cart);
+        return $this->loadCart($cart, $tenant);
     }
 
     /**
@@ -46,7 +50,7 @@ class CartService
         $cart->addItem($catalogItemId, $variantId, $quantity);
 
         return [
-            'cart' => $this->loadCart($cart),
+            'cart' => $this->loadCart($cart, $tenant),
             'guest_token' => $resolvedIdentity['generated_guest_token'],
         ];
     }
@@ -59,34 +63,58 @@ class CartService
         ?int $variantId,
         bool $updateVariant,
     ): Cart {
+        if ($updateVariant && ! $tenant->cart_editing_policy->allowsVariantChanges()) {
+            throw ValidationException::withMessages([
+                'variant_id' => __('api.cart.variant_change_disabled'),
+            ]);
+        }
+
+        if (! $updateVariant && ! $tenant->cart_editing_policy->allowsQuantityChanges()) {
+            throw ValidationException::withMessages([
+                'cantidad' => __('api.cart.editing_disabled'),
+            ]);
+        }
+
         $identity = $this->requireIdentity($request);
         $cart = $this->findCartOrFail($tenant, $identity);
         $cart->updateItem($cartItemId, $quantity, $variantId, $updateVariant);
 
-        return $this->loadCart($cart);
+        return $this->loadCart($cart, $tenant);
     }
 
     public function removeItem(Tenant $tenant, Request $request, int $cartItemId): Cart
     {
+        if (! $tenant->cart_editing_policy->allowsRemoval()) {
+            throw ValidationException::withMessages([
+                'cart_item' => __('api.cart.editing_disabled'),
+            ]);
+        }
+
         $identity = $this->requireIdentity($request);
         $cart = $this->findCartOrFail($tenant, $identity);
         $cart->removeItem($cartItemId);
 
-        return $this->loadCart($cart);
+        return $this->loadCart($cart, $tenant);
     }
 
     public function makeGuestTokenCookie(string $guestToken): Cookie
     {
-        return cookie(
+        $secure = (bool) config('session.secure');
-            'guest_token',
+        $sameSite = config('session.same_site');
-            $guestToken,
+        $partitioned = (bool) config('session.partitioned')
-            60 * 24 * 180,
+            || ($secure && strtolower((string) $sameSite) === 'none');
-            '/',
+
-            config('session.domain'),
+        return Cookie::create(
-            (bool) config('session.secure'),
+            name: 'guest_token',
-            true,
+            value: $guestToken,
-            false,
+            expire: now()->addDays(180),
-            config('session.same_site'),
+            path: '/',
+            domain: config('session.domain'),
+            secure: $secure,
+            httpOnly: true,
+            raw: false,
+            sameSite: $sameSite,
+            partitioned: $partitioned,
         );
     }
 
@@ -94,7 +122,7 @@ class CartService
     {
         $cart = new Cart([
             'tenant_codigo' => $tenant->codigo,
-            'status' => 'active',
+            'status' => Cart::STATUS_ACTIVE,
         ]);
 
         $cart->setRelation('items', collect());
@@ -102,9 +130,9 @@ class CartService
         return $cart;
     }
 
-    protected function loadCart(Cart $cart): Cart
+    protected function loadCart(Cart $cart, Tenant $tenant): Cart
     {
-        return $cart->fresh()->load([
+        $relations = [
             'items.catalogItem.attachments',
             'items.catalogItem.inventory',
             'items.catalogItem.itemAttributes.attribute',
@@ -113,7 +141,21 @@ class CartService
             'items.variant.definitions.itemAttribute.attribute.options',
             'items.variant.eventDates',
             'items.variant.eventDate',
-        ]);
+        ];
+
+        if ($tenant->cart_editing_policy->allowsVariantChanges()) {
+            $relations = [
+                ...$relations,
+                'items.catalogItem.variants' => fn ($query) => $query->orderBy('id'),
+                'items.catalogItem.variants.inventory',
+                'items.catalogItem.variants.definitions' => fn ($query) => $query->orderBy('id'),
+                'items.catalogItem.variants.definitions.itemAttribute.attribute.options',
+                'items.catalogItem.variants.eventDates',
+                'items.catalogItem.variants.eventDate',
+            ];
+        }
+
+        return $cart->fresh()->load($relations);
     }
 
     /**
@@ -181,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();
     }
 
@@ -195,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.');
@@ -208,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) {

app/Domains/Cart/Services/GuestCartMergeService.php

@@ -34,6 +34,10 @@ class GuestCartMergeService
                 ->first();
 
             if ($userCart !== null) {
+                $userCart->items()
+                    ->orderBy('id')
+                    ->pluck('id')
+                    ->each(fn (int $itemId) => $userCart->removeItem($itemId));
                 $userCart->update([
                     'status' => 'converted',
                 ]);

app/Domains/Cart/documentacion/README.md

@@ -6,8 +6,8 @@ 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`; expone la selección efectiva.
+- `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
 
@@ -30,3 +30,9 @@ Bajo `/tenants/{tenant:codigo}`:
 ## Dependencias y reglas
 
 Depende de `Catalog` para productos y variantes, de `Tenant` para aislar datos y de `Auth` cuando existe usuario. Toda operación debe comprobar que carrito e ítem pertenecen al tenant actual.
+
+Un carrito puede pasar a `checkout`. Las compras directas usan un carrito técnico con `origin=direct_checkout`; los carritos normales conservan `origin=user` y pueden restaurarse al cancelar o vencer la compra.
+
+Cada edición sincroniza una única reserva para el carrito completo. Si varios ítems o bundles consumen el mismo inventario, se persiste una sola línea con la cantidad agregada. Al editar durante checkout, la compra anterior queda `superseded`, se desvincula y el carrito conserva la misma reserva activa con sus líneas actualizadas.
+
+El comando unificado `php artisan reservations:expire` recorre una sola vez las reservas activas cuyo `expires_at` haya vencido. Cuando pertenecen a un carrito, conserva la reserva y sus líneas como historial, libera el stock como conjunto y cambia el carrito asociado a `expired` sin eliminar sus ítems. Al volver a resolver ese carrito desde la API, el anterior pasa automáticamente a `abandoned` y se crea uno activo y vacío para la misma identidad. El cliente nunca necesita reiniciarlo explícitamente. La API también materializa este vencimiento al acceder al carrito aunque el comando programado todavía no haya corrido.

app/Domains/Catalog/Controllers/CatalogController.php

@@ -17,17 +17,20 @@ use App\Domains\Catalog\Resources\CatalogItemDetailResource;
 use App\Domains\Catalog\Resources\CatalogItemResource;
 use App\Domains\Catalog\Resources\CatalogSearchItemResource;
 use App\Domains\Catalog\Resources\CatalogVariantOptionsResource;
+use App\Domains\Catalog\Services\CatalogItemAllowanceService;
 use App\Domains\Catalog\Services\CatalogService;
 use App\Domains\Catalog\Services\FeaturedGroupService;
 use App\Domains\Catalog\Services\VariantSelectionService;
 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;
+use Illuminate\Support\Facades\Auth;
 
 class CatalogController extends Controller
 {
-    public function index(Tenant $tenant, FeaturedGroupService $featuredGroupService): JsonResponse
+    public function index(Request $request, Tenant $tenant, FeaturedGroupService $featuredGroupService): JsonResponse
     {
         $featuredGroups = FeaturedGroup::query()
             ->where('tenant_code', $tenant->codigo)
@@ -37,7 +40,7 @@ class CatalogController extends Controller
         return response()->json($featuredGroups->map(
             fn (FeaturedGroup $featuredGroup): array => (new CatalogFeaturedGroupResource(
                 $featuredGroup,
-                $featuredGroupService->itemsResponse($featuredGroup, 1),
+                $featuredGroupService->itemsResponse($featuredGroup, 1, $this->userId($request)),
             ))->resolve()
         ));
     }
@@ -46,15 +49,17 @@ class CatalogController extends Controller
         SearchCatalogItemsRequest $request,
         Tenant $tenant,
         CatalogService $catalogService,
+        CatalogItemAllowanceService $allowances,
     ): AnonymousResourceCollection {
-        return CatalogSearchItemResource::collection(
+        $items = $catalogService->search(
-            $catalogService->search(
             $tenant,
             $request->validated('q'),
             $tenant->search_items_per_page,
             (int) $request->validated('page', 1),
-            )
         );
+        $allowances->attach($items->getCollection(), $this->userId($request));
+
+        return CatalogSearchItemResource::collection($items);
     }
 
     public function category(
@@ -62,17 +67,19 @@ class CatalogController extends Controller
         Tenant $tenant,
         Category $category,
         CatalogService $catalogService,
+        CatalogItemAllowanceService $allowances,
     ): AnonymousResourceCollection {
         abort_unless($category->tenant_code === $tenant->codigo, 404);
 
-        return CatalogSearchItemResource::collection(
+        $items = $catalogService->categoryItems(
-            $catalogService->categoryItems(
             $tenant,
             $category,
             $tenant->search_items_per_page,
             (int) $request->validated('page', 1),
-            )
+        );
-        )->additional([
+        $allowances->attach($items->getCollection(), $this->userId($request));
+
+        return CatalogSearchItemResource::collection($items)->additional([
             'category' => [
                 'id' => $category->id,
                 'nombre' => $category->nombre,
@@ -93,7 +100,11 @@ class CatalogController extends Controller
 
         $page = (int) $request->validated('page', 1);
 
-        return response()->json($featuredGroupService->itemsResponse($featuredGroup, $page));
+        return response()->json($featuredGroupService->itemsResponse(
+            $featuredGroup,
+            $page,
+            $this->userId($request),
+        ));
     }
 
     public function show(
@@ -101,17 +112,19 @@ class CatalogController extends Controller
         Tenant $tenant,
         CatalogItem $catalogItem,
         CatalogService $catalogService,
+        CatalogItemAllowanceService $allowances,
     ): CatalogItemDetailResource {
         abort_unless($catalogItem->tenant_code === $tenant->codigo, 404);
 
         $variantId = $request->validated('variant_id');
 
-        return CatalogItemDetailResource::make(
+        $item = $catalogService->getDetail(
-            $catalogService->getDetail(
             $catalogItem,
             $variantId === null ? null : (int) $variantId,
-            )
         );
+        $allowances->attach(collect([$item]), $this->userId($request));
+
+        return CatalogItemDetailResource::make($item);
     }
 
     public function variantOptions(
@@ -164,4 +177,11 @@ class CatalogController extends Controller
             ->response()
             ->setStatusCode(201);
     }
+
+    private function userId(Request $request): ?int
+    {
+        $userId = $request->user()?->getAuthIdentifier() ?? Auth::guard('sanctum')->id();
+
+        return $userId === null ? null : (int) $userId;
+    }
 }

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'));
+    }
+}

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,18 +175,30 @@ 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')
+                ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
-                ->orWhere('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
                 ->orWhereHas(
                     'variants.inventory',
                     fn (Builder $inventoryQuery): Builder => $inventoryQuery
                         ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
+                )
+                ->orWhere(function (Builder $directItemQuery): void {
+                    $directItemQuery
+                        ->whereDoesntHave('variants')
+                        ->where(function (Builder $inventoryQuery): void {
+                            $inventoryQuery
+                                ->whereNull('catalog_items.inventory_id')
+                                ->orWhereHas(
+                                    'inventory',
+                                    fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery
+                                        ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
                                 );
                         });
+                });
+        });
     }
 
     /** @return Collection<int, Variant> */

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',
         ];
     }
 

app/Domains/Catalog/Models/FeaturedGroup.php

@@ -11,9 +11,11 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Str;
 
 #[Fillable([
     'tenant_code',
+    'code',
     'source_type',
     'category_id',
     'product_layout',
@@ -33,6 +35,29 @@ class FeaturedGroup extends Model
         'source_type' => FeaturedGroupSource::Manual->value,
     ];
 
+    protected static function booted(): void
+    {
+        static::creating(function (FeaturedGroup $featuredGroup): void {
+            if (filled($featuredGroup->code)) {
+                return;
+            }
+
+            $baseCode = Str::slug($featuredGroup->group_name) ?: 'group';
+            $code = $baseCode;
+            $suffix = 2;
+
+            while (static::query()
+                ->where('tenant_code', $featuredGroup->tenant_code)
+                ->where('code', $code)
+                ->exists()) {
+                $code = "{$baseCode}-{$suffix}";
+                $suffix++;
+            }
+
+            $featuredGroup->code = $code;
+        });
+    }
+
     protected function casts(): array
     {
         return [

app/Domains/Catalog/Models/Inventory.php

@@ -5,6 +5,7 @@ namespace App\Domains\Catalog\Models;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 #[Fillable([
@@ -47,6 +48,12 @@ class Inventory extends Model
         return $this->hasOne(Variant::class);
     }
 
+    /** @return HasMany<StockReservationLine, $this> */
+    public function stockReservationLines(): HasMany
+    {
+        return $this->hasMany(StockReservationLine::class);
+    }
+
     public function availableStock(): int
     {
         return max(0, $this->real_stock - $this->reserved_stock);

app/Domains/Catalog/Models/ItemAttribute.php

@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
     'allow_multi_select',
     'sort_order',
     'show_in_selector',
+    'ticket_label',
 ])]
 class ItemAttribute extends Model
 {

app/Domains/Catalog/Models/StockReservation.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+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\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+#[Fillable([
+    'status',
+    'expires_at',
+    'committed_at',
+    'released_at',
+    'expired_at',
+    'release_reason',
+])]
+class StockReservation extends Model
+{
+    public const STATUS_ACTIVE = 'active';
+
+    public const STATUS_COMMITTED = 'committed';
+
+    public const STATUS_RELEASED = 'released';
+
+    public const STATUS_EXPIRED = 'expired';
+
+    protected function casts(): array
+    {
+        return [
+            'expires_at' => 'datetime',
+            'committed_at' => 'datetime',
+            'released_at' => 'datetime',
+            'expired_at' => 'datetime',
+        ];
+    }
+
+    /** @return HasMany<StockReservationLine, $this> */
+    public function lines(): HasMany
+    {
+        return $this->hasMany(StockReservationLine::class);
+    }
+
+    /** @return HasOne<Cart, $this> */
+    public function currentCart(): HasOne
+    {
+        return $this->hasOne(Cart::class, 'current_stock_reservation_id');
+    }
+
+    /** @return HasOne<Purchase, $this> */
+    public function purchase(): HasOne
+    {
+        return $this->hasOne(Purchase::class);
+    }
+}

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

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

app/Domains/Catalog/Resources/AdminApp/OnTicketFeaturedGroupResource.php

@@ -15,6 +15,7 @@ class OnTicketFeaturedGroupResource extends JsonResource
     {
         return [
             'id' => $this->id,
+            'code' => $this->code,
             'category_id' => $this->category_id,
             'category_name' => $this->category->nombre,
             'group_name' => $this->group_name,

app/Domains/Catalog/Resources/CatalogFeaturedGroupResource.php

@@ -20,6 +20,7 @@ class CatalogFeaturedGroupResource extends JsonResource
     {
         return [
             'id' => $this->id,
+            'code' => $this->code,
             'title' => $this->group_name,
             'layout' => $this->product_layout->value,
             'group_layout' => $this->group_layout->value,

app/Domains/Catalog/Resources/CatalogFeaturedItemResource.php

@@ -7,6 +7,7 @@ use App\Domains\Catalog\Enums\ProductLayout;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\FeaturedGroup;
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Catalog\Services\CatalogItemAllowanceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -28,15 +29,30 @@ 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,
             'nombre' => $catalogItem->nombre,
             'descripcion' => $catalogItem->descripcion,
             'precio' => $catalogItem->precio,
-            'stock_tecnico' => $catalogItem->availableStock(),
+            'maximum_addable_quantity' => $this->maximumAddable(
+                $availableStock,
+                $remainingUserQuota,
+            ),
+            'unavailable_message' => $this->unavailableMessage(
+                $availableStock,
+                $remainingUserQuota,
+            ),
             'variants' => $catalogItem->visibleVariants()
-                ->map(fn (Variant $variant): array => [
+                ->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'),
@@ -44,11 +60,17 @@ class CatalogFeaturedItemResource extends JsonResource
                         'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
                         'descripcion' => $variant->getDescription(),
                         'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                    'stock_tecnico' => $catalogItem->inventory_policy === InventoryPolicy::Unlimited
+                        'maximum_addable_quantity' => $this->maximumAddable(
-                        ? null
+                            $variantStock,
-                        : $variant->inventory->availableStock(),
+                            $remainingUserQuota,
+                        ),
+                        'unavailable_message' => $this->unavailableMessage(
+                            $variantStock,
+                            $remainingUserQuota,
+                        ),
                         'values' => $variant->selectorOptions($catalogItem->itemAttributes),
-                ])
+                    ];
+                })
                 ->values(),
         ];
 
@@ -58,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,
@@ -65,28 +90,47 @@ 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();
 
         return $attachment?->getTemporaryUrl(1440);
     }
+
+    private function maximumAddable(?int $stock, ?int $remainingUserQuota): ?int
+    {
+        return app(CatalogItemAllowanceService::class)
+            ->maximumAddableQuantity($stock, $remainingUserQuota);
+    }
+
+    private function unavailableMessage(?int $stock, ?int $remainingUserQuota): ?string
+    {
+        return app(CatalogItemAllowanceService::class)
+            ->unavailableMessage($stock, $remainingUserQuota);
+    }
 }

app/Domains/Catalog/Resources/CatalogItemDetailResource.php

@@ -6,6 +6,7 @@ use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\ItemAttribute;
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Catalog\Services\CatalogItemAllowanceService;
 use App\Domains\Shared\Enums\FieldType;
 use App\Domains\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
@@ -37,15 +38,19 @@ class CatalogItemDetailResource extends JsonResource
             'max_units_per_user' => $this->max_units_per_user,
             'has_tickets' => $this->has_tickets,
             'attributes' => $this->attributesData(),
-            'stock_tecnico' => $this->when(
+            'maximum_addable_quantity' => $this->when(
                 $selectedVariant === null,
-                fn () => $this->availableStock(),
+                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(
@@ -85,6 +90,7 @@ class CatalogItemDetailResource extends JsonResource
             'nombre' => $attribute->nombre,
             'sort_order' => $itemAttribute->sort_order,
             'show_in_selector' => $itemAttribute->show_in_selector,
+            'ticket_label' => $itemAttribute->ticket_label,
             'is_required' => $attribute->is_required,
             'allow_multi_select' => $itemAttribute->allow_multi_select,
             'metadata_schema' => $attribute->metadata_schema,
@@ -157,6 +163,7 @@ class CatalogItemDetailResource extends JsonResource
     {
         $values = $variant->selectionOptions($this->itemAttributes);
         $eventDates = $variant->selectedEventDates();
+        $variantStock = $this->variantStock($variant);
 
         return [
             'id' => $variant->id,
@@ -166,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, '.', ''),
-            'stock_tecnico' => $this->variantStock($variant),
+            'maximum_addable_quantity' => $this->maximumAddable($variantStock),
+            'unavailable_message' => $this->unavailableMessage($variantStock),
             'values' => $values,
         ];
     }
@@ -185,4 +193,20 @@ class CatalogItemDetailResource extends JsonResource
             ? null
             : $variant->inventory->availableStock();
     }
+
+    private function maximumAddable(?int $stock): ?int
+    {
+        return app(CatalogItemAllowanceService::class)->maximumAddableQuantity(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
+
+    private function unavailableMessage(?int $stock): ?string
+    {
+        return app(CatalogItemAllowanceService::class)->unavailableMessage(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
 }

app/Domains/Catalog/Resources/CatalogSearchItemResource.php

@@ -5,6 +5,7 @@ namespace App\Domains\Catalog\Resources;
 use App\Domains\Catalog\Enums\InventoryPolicy;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Catalog\Services\CatalogItemAllowanceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -14,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();
 
@@ -26,9 +29,15 @@ class CatalogSearchItemResource extends JsonResource
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
             'image' => $attachment?->getTemporaryUrl(1440),
-            'stock_tecnico' => $this->availableStock(),
+            'maximum_addable_quantity' => $this->maximumAddable($availableStock),
-            'variants' => $this->visibleVariants()
+            'unavailable_message' => $this->unavailableMessage($availableStock),
-                ->map(fn (Variant $variant): array => [
+            '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'),
@@ -36,12 +45,28 @@ class CatalogSearchItemResource extends JsonResource
                         'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
                         'descripcion' => $variant->getDescription(),
                         'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                    'stock_tecnico' => $this->inventory_policy === InventoryPolicy::Unlimited
+                        'maximum_addable_quantity' => $this->maximumAddable($variantStock),
-                        ? null
+                        'unavailable_message' => $this->unavailableMessage($variantStock),
-                        : $variant->inventory?->availableStock(),
                         'values' => $variant->selectorOptions($this->itemAttributes),
-                ])
+                    ];
+                })
                 ->values(),
         ];
     }
+
+    private function maximumAddable(?int $stock): ?int
+    {
+        return app(CatalogItemAllowanceService::class)->maximumAddableQuantity(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
+
+    private function unavailableMessage(?int $stock): ?string
+    {
+        return app(CatalogItemAllowanceService::class)->unavailableMessage(
+            $stock,
+            $this->getAttribute('remaining_user_quota'),
+        );
+    }
 }

app/Domains/Catalog/Services/CatalogInventoryService.php

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

app/Domains/Catalog/Services/CatalogItemAllowanceService.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Purchase\Services\UserPurchaseLimitService;
+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,
+    ) {}
+
+    /** @param Collection<int, CatalogItem> $catalogItems */
+    public function attach(Collection $catalogItems, ?int $userId): void
+    {
+        $remaining = $this->purchaseLimits->remainingByCatalogItem($catalogItems, $userId);
+
+        foreach ($catalogItems as $catalogItem) {
+            $catalogItem->setAttribute(
+                'remaining_user_quota',
+                $remaining->get($catalogItem->getKey()),
+            );
+        }
+    }
+
+    public function maximumAddableQuantity(?int $availableStock, ?int $remainingUserQuota): ?int
+    {
+        if ($availableStock === null) {
+            return $remainingUserQuota;
+        }
+
+        if ($remainingUserQuota === null) {
+            return $availableStock;
+        }
+
+        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;
+    }
+}

app/Domains/Catalog/Services/CatalogService.php

@@ -38,6 +38,7 @@ class CatalogService
             $attributeCodes = $data['attribute_codes'] ?? [];
             $multiSelectAttributeCodes = $data['multi_select_attribute_codes'] ?? [];
             $hiddenAttributeCodes = $data['hidden_attribute_codes'] ?? [];
+            $ticketAttributeLabels = $data['ticket_attribute_labels'] ?? [];
             $components = $data['components'] ?? [];
             $hasDirectStock = array_key_exists('real_stock', $data);
             $realStock = (int) ($data['real_stock'] ?? 0);
@@ -73,6 +74,14 @@ class CatalogService
                 ]);
             }
 
+            if (array_diff(array_keys($ticketAttributeLabels), $attributeCodes) !== []) {
+                throw ValidationException::withMessages([
+                    'ticket_attribute_labels' => [
+                        __('api.catalog.ticket_label_attribute_not_on_item'),
+                    ],
+                ]);
+            }
+
             $this->validateUniqueVariantCombinations($variants, $attributeCodes);
 
             if ($type === CatalogItemType::Bundle) {
@@ -98,6 +107,7 @@ class CatalogService
                 $data['attribute_codes'],
                 $data['multi_select_attribute_codes'],
                 $data['hidden_attribute_codes'],
+                $data['ticket_attribute_labels'],
                 $data['components'],
                 $data['real_stock'],
                 $data['reserved_stock'],
@@ -124,6 +134,7 @@ class CatalogService
                     $attributeCodes,
                     $multiSelectAttributeCodes,
                     $hiddenAttributeCodes,
+                    $ticketAttributeLabels,
                 )
                 : [];
 
@@ -194,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);
@@ -220,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])
@@ -270,7 +288,7 @@ class CatalogService
         return CatalogItem::query()
             ->where('tenant_code', $tenant->codigo)
             ->where('category_id', $category->id)
-            ->whereVariantsAvailable()
+            ->whereAvailable()
             ->with([
                 'attachments',
                 'inventory',
@@ -461,6 +479,7 @@ class CatalogService
      * @param  array<int, string>  $attributeCodes
      * @param  array<int, string>  $multiSelectAttributeCodes
      * @param  array<int, string>  $hiddenAttributeCodes
+     * @param  array<string, string>  $ticketAttributeLabels
      * @return array<string, ItemAttribute>
      */
     private function createItemAttributes(
@@ -468,6 +487,7 @@ class CatalogService
         array $attributeCodes,
         array $multiSelectAttributeCodes = [],
         array $hiddenAttributeCodes = [],
+        array $ticketAttributeLabels = [],
     ): array {
         $itemAttributes = [];
         $attributeCodes = array_values(array_unique($attributeCodes));
@@ -492,6 +512,7 @@ class CatalogService
                 'attribute_id' => $attribute->id,
                 'allow_multi_select' => in_array($attributeCode, $multiSelectAttributeCodes, true),
                 'show_in_selector' => ! in_array($attributeCode, $hiddenAttributeCodes, true),
+                'ticket_label' => $ticketAttributeLabels[$attributeCode] ?? null,
             ]);
 
             $itemAttributes[$attributeCode] = $itemAttribute;

app/Domains/Catalog/Services/ExpireStockReservationsService.php

@@ -0,0 +1,185 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Cart\Models\Cart;
+use App\Domains\Catalog\Models\StockReservation;
+use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use RuntimeException;
+use Throwable;
+
+class ExpireStockReservationsService
+{
+    private const BATCH_SIZE = 500;
+
+    public function __construct(
+        private readonly ReleaseCheckoutService $purchases,
+        private readonly StockReservationService $reservations,
+    ) {}
+
+    /**
+     * @return array{purchases: int, cart_reservations: int, orphan_reservations: int, failed: int}
+     */
+    public function expireOverdue(): array
+    {
+        $summary = [
+            'purchases' => 0,
+            'cart_reservations' => 0,
+            'orphan_reservations' => 0,
+            'failed' => 0,
+        ];
+        $lastReservationId = 0;
+
+        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');
+
+            foreach ($reservationIds as $reservationId) {
+                $lastReservationId = (int) $reservationId;
+
+                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);
+
+        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();
+    }
+}

app/Domains/Catalog/Services/FeaturedGroupService.php

@@ -15,7 +15,11 @@ class FeaturedGroupService
     private const ITEMS_PER_PAGE = 12;
 
     /** @return array<array-key, mixed> */
-    public function itemsResponse(FeaturedGroup $featuredGroup, int $page): array
+    public function __construct(
+        private readonly CatalogItemAllowanceService $allowances,
+    ) {}
+
+    public function itemsResponse(FeaturedGroup $featuredGroup, int $page, ?int $userId = null): array
     {
         if ($featuredGroup->group_layout !== GroupLayout::Paginated) {
             $query = $this->itemsQuery($featuredGroup);
@@ -26,12 +30,14 @@ class FeaturedGroupService
 
             $items = $query->get();
             $this->attachGroup($items, $featuredGroup);
+            $this->allowances->attach($items, $userId);
 
             return CatalogFeaturedItemResource::collection($items)->resolve();
         }
 
         $paginator = $this->paginateItems($featuredGroup, $page);
         $this->attachGroup($paginator->getCollection(), $featuredGroup);
+        $this->allowances->attach($paginator->getCollection(), $userId);
 
         return CatalogFeaturedItemResource::collection($paginator)
             ->response()
@@ -43,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',
@@ -67,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'),
         };
     }
 

app/Domains/Catalog/Services/StockReservationService.php

@@ -0,0 +1,493 @@
+<?php
+
+namespace App\Domains\Catalog\Services;
+
+use App\Domains\Cart\Models\Cart;
+use App\Domains\Cart\Models\CartItem;
+use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Catalog\Models\Inventory;
+use App\Domains\Catalog\Models\StockReservation;
+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 syncCart(Cart $cart): ?StockReservation
+    {
+        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);
+
+            $reservation = $lockedCart->current_stock_reservation_id === null
+                ? null
+                : StockReservation::query()->lockForUpdate()->find($lockedCart->current_stock_reservation_id);
+
+            if ($reservation !== null) {
+                $this->assertUsableCartReservation($reservation);
+            }
+
+            if ($requirements === []) {
+                if ($reservation !== null && $reservation->status === StockReservation::STATUS_ACTIVE) {
+                    $this->finalizeLocked(
+                        $reservation,
+                        StockReservation::STATUS_RELEASED,
+                        self::REASON_CART_EMPTY,
+                    );
+                }
+
+                $lockedCart->update(['current_stock_reservation_id' => null]);
+                $cart->current_stock_reservation_id = null;
+
+                return null;
+            }
+
+            if ($reservation === null) {
+                $reservation = StockReservation::query()->create([
+                    'status' => StockReservation::STATUS_ACTIVE,
+                    'expires_at' => $this->expiration(),
+                ]);
+                $lockedCart->update(['current_stock_reservation_id' => $reservation->getKey()]);
+            }
+
+            if (Purchase::query()->where('stock_reservation_id', $reservation->getKey())->exists()) {
+                throw new \InvalidArgumentException('La reserva vinculada a una compra no se puede modificar.');
+            }
+
+            $currentLines = StockReservationLine::query()
+                ->where('stock_reservation_id', $reservation->getKey())
+                ->orderBy('inventory_id')
+                ->lockForUpdate()
+                ->get()
+                ->keyBy('inventory_id');
+            $inventoryIds = collect(array_keys($requirements))
+                ->merge($currentLines->keys())
+                ->map(fn ($id): int => (int) $id)
+                ->unique()
+                ->sort()
+                ->values();
+            $inventories = Inventory::query()
+                ->whereKey($inventoryIds)
+                ->orderBy('id')
+                ->lockForUpdate()
+                ->get()
+                ->keyBy('id');
+
+            foreach ($inventoryIds as $inventoryId) {
+                $inventory = $inventories->get($inventoryId)
+                    ?? throw new \InvalidArgumentException('No se encontró el inventario requerido.');
+                $previous = (int) ($currentLines->get($inventoryId)?->quantity ?? 0);
+                $required = (int) ($requirements[$inventoryId]['quantity'] ?? 0);
+                $delta = $required - $previous;
+
+                if ($delta > 0
+                    && $requirements[$inventoryId]['tracks_inventory']
+                    && $inventory->availableStock() < $delta) {
+                    throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar el carrito.');
+                }
+
+                if ($delta < 0 && $inventory->reserved_stock < abs($delta)) {
+                    throw new \InvalidArgumentException('La reserva de stock del carrito es inconsistente.');
+                }
+            }
+
+            foreach ($inventoryIds as $inventoryId) {
+                /** @var Inventory $inventory */
+                $inventory = $inventories->get($inventoryId);
+                $line = $currentLines->get($inventoryId);
+                $previous = (int) ($line?->quantity ?? 0);
+                $required = (int) ($requirements[$inventoryId]['quantity'] ?? 0);
+                $delta = $required - $previous;
+
+                if ($delta > 0) {
+                    $inventory->reserve($delta, $requirements[$inventoryId]['tracks_inventory']);
+                } elseif ($delta < 0) {
+                    $inventory->release(abs($delta));
+                }
+
+                if ($required === 0) {
+                    $line?->delete();
+
+                    continue;
+                }
+
+                StockReservationLine::query()->updateOrCreate(
+                    [
+                        'stock_reservation_id' => $reservation->getKey(),
+                        'inventory_id' => $inventoryId,
+                    ],
+                    [
+                        'quantity' => $required,
+                        'tracks_inventory' => $requirements[$inventoryId]['tracks_inventory'],
+                    ],
+                );
+            }
+
+            $reservation->update([
+                'expires_at' => $this->expiration(),
+                'release_reason' => null,
+            ]);
+            $cart->current_stock_reservation_id = $reservation->getKey();
+
+            return $reservation->fresh('lines');
+        });
+    }
+
+    public function attachToPurchase(
+        Cart $cart,
+        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);
+            }
+        });
+    }
+
+    public function returnToCart(Purchase $purchase, Cart $cart): StockReservation
+    {
+        return DB::transaction(function () use ($purchase, $cart): StockReservation {
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
+            /** @var Cart $cart */
+            $cart = Cart::query()->lockForUpdate()->findOrFail($cart->getKey());
+
+            if ($purchase->stock_reservation_id === null
+                || $cart->current_stock_reservation_id !== $purchase->stock_reservation_id) {
+                throw new \InvalidArgumentException('La compra y el carrito no comparten la reserva activa.');
+            }
+
+            /** @var StockReservation $reservation */
+            $reservation = StockReservation::query()
+                ->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');
+        });
+    }
+
+    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 {
+        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;
+            }
+
+            /** @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 refreshForPurchase(Purchase $purchase, ?Carbon $expiresAt): void
+    {
+        DB::transaction(function () use ($purchase, $expiresAt): 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' => $expiresAt]);
+        });
+    }
+
+    /**
+     * @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 assertUsableCartReservation(StockReservation $reservation): void
+    {
+        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
+    {
+        return now()->addMinutes(
+            max(1, (int) config('catalog.stock_reservation_expiration_minutes', 30)),
+        );
+    }
+}

app/Domains/Catalog/documentacion/README.md

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

app/Domains/Client/Controllers/ClientController.php

@@ -0,0 +1,47 @@
+<?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();
+    }
+}

app/Domains/Client/Models/Client.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Domains\Client\Models;
+
+use App\Domains\Integration\Models\ClientIntegration;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable(['code', 'name'])]
+class Client extends Model
+{
+    public function getRouteKeyName(): string
+    {
+        return 'code';
+    }
+
+    /** @return HasMany<Tenant, $this> */
+    public function tenants(): HasMany
+    {
+        return $this->hasMany(Tenant::class);
+    }
+
+    /** @return HasMany<ClientIntegration, $this> */
+    public function integrations(): HasMany
+    {
+        return $this->hasMany(ClientIntegration::class);
+    }
+}

app/Domains/Client/Requests/StoreClientRequest.php

@@ -0,0 +1,22 @@
+<?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'],
+        ];
+    }
+}

app/Domains/Client/Requests/UpdateClientRequest.php

@@ -0,0 +1,26 @@
+<?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'],
+        ];
+    }
+}

app/Domains/Client/Resources/ClientResource.php

@@ -0,0 +1,26 @@
+<?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,
+            ])),
+        ];
+    }
+}

app/Domains/Client/routes/api.php

@@ -0,0 +1,6 @@
+<?php
+
+use App\Domains\Client\Controllers\ClientController;
+use Illuminate\Support\Facades\Route;
+
+Route::apiResource('clients', ClientController::class);

app/Domains/Desfile/Services/InvitationPurchaseProvisioner.php

@@ -0,0 +1,431 @@
+<?php
+
+namespace App\Domains\Desfile\Services;
+
+use DateTimeInterface;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+use RuntimeException;
+
+class InvitationPurchaseProvisioner
+{
+    public const TENANT_CODE = 'desfile_pura_tendencia';
+
+    public const USER_EMAIL = 'invitados@puratendencia.com';
+
+    private const PAYMENT_METHOD = 'invitation';
+
+    /**
+     * @var list<array{sector: string, row: int, first_seat: int, last_seat: int, type: string}>
+     */
+    private const ALLOCATIONS = [
+        ['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'],
+    ];
+
+    /**
+     * @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 () use ($allocations): void {
+            $now = now();
+            $userId = $this->userId($now);
+            $purchaseId = $this->purchaseId($userId, $now);
+            $catalogItem = DB::table('catalog_items')
+                ->where('tenant_code', self::TENANT_CODE)
+                ->where('slug', 'entrada')
+                ->first();
+
+            if ($catalogItem === null) {
+                throw new RuntimeException('No se encontró el catálogo de entradas del desfile.');
+            }
+
+            foreach ($allocations ?? self::ALLOCATIONS as $allocation) {
+                foreach (range($allocation['first_seat'], $allocation['last_seat']) as $seat) {
+                    $variant = $this->variant(
+                        (int) $catalogItem->id,
+                        $allocation['sector'],
+                        $allocation['row'],
+                        $seat,
+                        $allocation['type'],
+                    );
+
+                    $this->createPurchaseItem(
+                        $purchaseId,
+                        $catalogItem,
+                        $variant,
+                        $allocation['sector'],
+                        $allocation['row'],
+                        $seat,
+                        $allocation['type'],
+                        $now,
+                    );
+                    $this->createTicketAndCommitStock(
+                        $purchaseId,
+                        $userId,
+                        (int) $catalogItem->id,
+                        $variant,
+                        $now,
+                    );
+                }
+            }
+        });
+    }
+
+    private function prerequisitesExist(): bool
+    {
+        if (! DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()) {
+            return false;
+        }
+
+        if (! DB::table('roles')->where('codigo', 'user')->exists()) {
+            throw new RuntimeException('No se encontró el rol de usuario común.');
+        }
+
+        if (! DB::table('catalog_items')
+            ->where('tenant_code', self::TENANT_CODE)
+            ->where('slug', 'entrada')
+            ->exists()) {
+            throw new RuntimeException('No se encontró el catálogo de entradas del desfile.');
+        }
+
+        return true;
+    }
+
+    private function userId(DateTimeInterface $now): int
+    {
+        $user = DB::table('users')->where('email', self::USER_EMAIL)->first();
+
+        if ($user !== null) {
+            if ($user->tenant_codigo !== self::TENANT_CODE) {
+                throw new RuntimeException('El email de invitados ya pertenece a otro tenant.');
+            }
+
+            DB::table('users')->where('id', $user->id)->update([
+                'rol_codigo' => 'user',
+                'nombre_apellido' => 'Invitados Pura Tendencia',
+                'updated_at' => $now,
+            ]);
+
+            return (int) $user->id;
+        }
+
+        return DB::table('users')->insertGetId([
+            'rol_codigo' => 'user',
+            'tenant_codigo' => self::TENANT_CODE,
+            'nombre_apellido' => 'Invitados Pura Tendencia',
+            'email' => self::USER_EMAIL,
+            'email_verified_at' => $now,
+            'password' => Hash::make(Str::random(64)),
+            'dni' => null,
+            'telefono' => null,
+            'remember_token' => null,
+            'created_at' => $now,
+            'updated_at' => $now,
+        ]);
+    }
+
+    private function purchaseId(int $userId, DateTimeInterface $now): int
+    {
+        $purchaseId = DB::table('compras')
+            ->where('tenant_codigo', self::TENANT_CODE)
+            ->where('user_id', $userId)
+            ->where('payment_method', self::PAYMENT_METHOD)
+            ->value('id');
+
+        if ($purchaseId !== null) {
+            DB::table('compras')->where('id', $purchaseId)->update([
+                'status' => 'paid',
+                'total' => 0,
+                'updated_at' => $now,
+            ]);
+
+            return (int) $purchaseId;
+        }
+
+        return DB::table('compras')->insertGetId([
+            'tenant_codigo' => self::TENANT_CODE,
+            'user_id' => $userId,
+            'cart_id' => null,
+            'status' => 'paid',
+            'payment_method' => self::PAYMENT_METHOD,
+            'total' => 0,
+            'dni' => null,
+            'transfer_payer_dni' => null,
+            'telefono' => null,
+            'nombre_apellido' => 'Invitados Pura Tendencia',
+            'email' => self::USER_EMAIL,
+            'created_at' => $now,
+            'updated_at' => $now,
+        ]);
+    }
+
+    private function variant(
+        int $catalogItemId,
+        string $sector,
+        int $row,
+        int $seat,
+        string $type,
+    ): object {
+        $variant = $this->findVariant($catalogItemId, $sector, $row, $seat);
+
+        if ($variant === null) {
+            $variant = $this->createVariant($catalogItemId, $sector, $row, $seat, $type);
+        }
+
+        $this->ensureAttributeOptions($catalogItemId, [
+            'tipo' => $type,
+            'sector' => $sector,
+            'fila' => (string) $row,
+            'asiento' => (string) $seat,
+        ]);
+
+        $typeValueId = DB::table('variant_values as variant_value')
+            ->join('item_attributes as item_attribute', 'item_attribute.id', '=', 'variant_value.item_attribute_id')
+            ->join('attribute', 'attribute.id', '=', 'item_attribute.attribute_id')
+            ->where('variant_value.variant_id', $variant->id)
+            ->where('attribute.codigo', 'tipo')
+            ->value('variant_value.id');
+
+        if ($typeValueId === null) {
+            throw new RuntimeException("La variante {$variant->id} no tiene definido el tipo de entrada.");
+        }
+
+        DB::table('variant_values')->where('id', $typeValueId)->update(['value' => $type]);
+        DB::table('variantes')->where('id', $variant->id)->update([
+            'descripcion' => "Sector {$sector} - Fila {$row} - Asiento {$seat} - {$type}",
+        ]);
+
+        return DB::table('variantes')->where('id', $variant->id)->first();
+    }
+
+    /** @param array<string, string> $values */
+    private function ensureAttributeOptions(int $catalogItemId, array $values): void
+    {
+        $attributes = DB::table('item_attributes')
+            ->join('attribute', 'attribute.id', '=', 'item_attributes.attribute_id')
+            ->where('item_attributes.catalog_item_id', $catalogItemId)
+            ->pluck('attribute.id', 'attribute.codigo');
+
+        foreach ($values as $code => $value) {
+            $attributeId = $attributes[$code] ?? null;
+
+            if ($attributeId === null) {
+                throw new RuntimeException("Falta el atributo {$code} en el catálogo de entradas.");
+            }
+
+            if (DB::table('attribute_options')
+                ->where('attribute_id', $attributeId)
+                ->where('value', $value)
+                ->exists()) {
+                continue;
+            }
+
+            $lastSortOrder = (int) DB::table('attribute_options')
+                ->where('attribute_id', $attributeId)
+                ->max('sort_order');
+
+            DB::table('attribute_options')->insert([
+                'attribute_id' => $attributeId,
+                'validity_time_id' => null,
+                'value' => $value,
+                'label' => $value,
+                'sort_order' => $lastSortOrder + 1,
+                'metadata' => null,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ]);
+        }
+    }
+
+    private function findVariant(int $catalogItemId, string $sector, int $row, int $seat): ?object
+    {
+        $query = DB::table('variantes')->where('catalog_item_id', $catalogItemId);
+
+        foreach (['sector' => $sector, 'fila' => (string) $row, 'asiento' => (string) $seat] as $code => $value) {
+            $query->whereExists(fn ($subquery) => $subquery
+                ->selectRaw('1')
+                ->from('variant_values as selected_value')
+                ->join('item_attributes as selected_item_attribute', 'selected_item_attribute.id', '=', 'selected_value.item_attribute_id')
+                ->join('attribute as selected_attribute', 'selected_attribute.id', '=', 'selected_item_attribute.attribute_id')
+                ->whereColumn('selected_value.variant_id', 'variantes.id')
+                ->where('selected_attribute.codigo', $code)
+                ->where('selected_value.value', $value));
+        }
+
+        return $query->first();
+    }
+
+    private function createVariant(
+        int $catalogItemId,
+        string $sector,
+        int $row,
+        int $seat,
+        string $type,
+    ): object {
+        $itemAttributes = DB::table('item_attributes')
+            ->join('attribute', 'attribute.id', '=', 'item_attributes.attribute_id')
+            ->where('item_attributes.catalog_item_id', $catalogItemId)
+            ->pluck('item_attributes.id', 'attribute.codigo');
+
+        foreach (['tipo', 'sector', 'fila', 'asiento'] as $requiredCode) {
+            if (! isset($itemAttributes[$requiredCode])) {
+                throw new RuntimeException("Falta el atributo {$requiredCode} en el catálogo de entradas.");
+            }
+        }
+
+        $inventoryId = DB::table('inventories')->insertGetId([
+            'sold_units' => 0,
+            'reserved_stock' => 0,
+            'real_stock' => 1,
+        ]);
+        $variantId = DB::table('variantes')->insertGetId([
+            'catalog_item_id' => $catalogItemId,
+            'event_date_id' => null,
+            'inventory_id' => $inventoryId,
+            'descripcion' => "Sector {$sector} - Fila {$row} - Asiento {$seat} - {$type}",
+            'precio' => $this->catalogPrice($sector, $row),
+        ]);
+
+        foreach (['tipo' => $type, 'sector' => $sector, 'fila' => (string) $row, 'asiento' => (string) $seat] as $code => $value) {
+            DB::table('variant_values')->insert([
+                'variant_id' => $variantId,
+                'item_attribute_id' => $itemAttributes[$code],
+                'value' => $value,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ]);
+        }
+
+        return DB::table('variantes')->where('id', $variantId)->first();
+    }
+
+    private function catalogPrice(string $sector, int $row): int
+    {
+        $prices = in_array($sector, ['A', 'C'], true)
+            ? [1 => 250000, 2 => 200000, 3 => 100000, 4 => 75000, 5 => 50000]
+            : [1 => 240000, 2 => 190000, 3 => 90000, 4 => 65000, 5 => 40000];
+
+        return $prices[$row];
+    }
+
+    private function createPurchaseItem(
+        int $purchaseId,
+        object $catalogItem,
+        object $variant,
+        string $sector,
+        int $row,
+        int $seat,
+        string $type,
+        DateTimeInterface $now,
+    ): void {
+        if (DB::table('compra_items')
+            ->where('compra_id', $purchaseId)
+            ->where('source_variant_id', $variant->id)
+            ->exists()) {
+            return;
+        }
+
+        $attributes = [
+            ['name' => 'Tipo', 'value' => $type],
+            ['name' => 'Sector', 'value' => $sector],
+            ['name' => 'Fila', 'value' => (string) $row],
+            ['name' => 'Asiento', 'value' => (string) $seat],
+        ];
+
+        DB::table('compra_items')->insert([
+            'compra_id' => $purchaseId,
+            'source_catalog_item_id' => $catalogItem->id,
+            'source_variant_id' => $variant->id,
+            'image_attachment_id' => DB::table('catalog_items_attachments')
+                ->where('catalog_item_id', $catalogItem->id)
+                ->whereNull('variant_id')
+                ->orderBy('orden')
+                ->value('attachment_id'),
+            'nombre' => $catalogItem->nombre,
+            'descripcion' => $variant->descripcion,
+            'slug' => $catalogItem->slug,
+            'item_nombre' => "Entrada (Sector {$sector}, Fila {$row}, Asiento {$seat})",
+            'variant_attributes' => json_encode($attributes, JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR),
+            'cantidad' => 1,
+            'precio_unitario' => 0,
+            'discount_total' => 0,
+            'tax_total' => 0,
+            'total' => 0,
+            'created_at' => $now,
+            'updated_at' => $now,
+        ]);
+    }
+
+    private function createTicketAndCommitStock(
+        int $purchaseId,
+        int $userId,
+        int $catalogItemId,
+        object $variant,
+        DateTimeInterface $now,
+    ): void {
+        if (DB::table('tickets')
+            ->where('source_purchase_id', $purchaseId)
+            ->where('source_variant_id', $variant->id)
+            ->exists()) {
+            return;
+        }
+
+        $inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first();
+
+        if ($inventory === null || $inventory->real_stock < 1 || $inventory->reserved_stock > 0) {
+            throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible.");
+        }
+
+        DB::table('inventories')->where('id', $inventory->id)->update([
+            'real_stock' => $inventory->real_stock - 1,
+            'sold_units' => $inventory->sold_units + 1,
+        ]);
+
+        $reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
+        if ($reservationId === null) {
+            $reservationId = DB::table('stock_reservations')->insertGetId([
+                'status' => 'committed',
+                'committed_at' => $now,
+                'released_at' => null,
+                'expired_at' => null,
+                'release_reason' => null,
+                'created_at' => $now,
+                'updated_at' => $now,
+            ]);
+            DB::table('compras')->where('id', $purchaseId)->update([
+                'stock_reservation_id' => $reservationId,
+            ]);
+        }
+
+        DB::table('stock_reservation_lines')->insert([
+            'stock_reservation_id' => $reservationId,
+            'inventory_id' => $inventory->id,
+            'quantity' => 1,
+            'tracks_inventory' => true,
+            'created_at' => $now,
+            'updated_at' => $now,
+        ]);
+
+        DB::table('tickets')->insert([
+            'tenant_code' => self::TENANT_CODE,
+            'ticket' => (string) Str::uuid(),
+            'name' => null,
+            'description' => null,
+            'source_purchase_id' => $purchaseId,
+            'source_catalog_item_id' => $catalogItemId,
+            'source_variant_id' => $variant->id,
+            'used_at' => null,
+            'scanner_user_id' => null,
+            'user_id' => $userId,
+        ]);
+    }
+}

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'));
+    }
+}

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',
+        };
+    }
+}

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

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

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');

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 [

app/Domains/Integration/Controllers/ClientIntegrationController.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Domains\Integration\Controllers;
+
+use App\Domains\Client\Models\Client;
+use App\Domains\Integration\Models\Integration;
+use App\Domains\Integration\Requests\StoreClientIntegrationRequest;
+use App\Domains\Integration\Services\ClientIntegrationService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+
+class ClientIntegrationController extends Controller
+{
+    public function __construct(
+        private readonly ClientIntegrationService $clientIntegrationService,
+    ) {}
+
+    public function index(Client $client): JsonResponse
+    {
+        return response()->json($this->clientIntegrationService->getAllForClient($client));
+    }
+
+    public function show(Client $client, string $integrationCode): JsonResponse
+    {
+        $integration = $this->clientIntegrationService->getClientIntegration($client, $integrationCode);
+
+        if (! $integration) {
+            return response()->json([
+                'code' => 'integration.not_configured',
+                'message' => __('api.integration.not_configured'),
+            ], 404);
+        }
+
+        return response()->json($integration);
+    }
+
+    public function store(
+        StoreClientIntegrationRequest $request,
+        Client $client,
+        string $integrationCode,
+    ): JsonResponse {
+        $integration = Integration::query()
+            ->where('integration_code', $integrationCode)
+            ->firstOrFail();
+
+        try {
+            $this->clientIntegrationService->updateOrCreateIntegration(
+                $client,
+                $integration,
+                $request->input('integration_data', []),
+            );
+
+            return response()->json([
+                'code' => 'integration.configured',
+                'message' => __('api.integration.configured'),
+            ]);
+        } catch (\Exception $exception) {
+            return response()->json([
+                'code' => 'integration.validation_failed',
+                'message' => __('api.integration.validation_failed', ['error' => $exception->getMessage()]),
+            ], 400);
+        }
+    }
+}

app/Domains/Integration/Controllers/TelepagosWebhookController.php

@@ -2,6 +2,7 @@
 
 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;
@@ -12,12 +13,12 @@ class TelepagosWebhookController extends Controller
     /**
      * Handle the incoming Telepagos webhook.
      */
-    public function handle(TelepagosWebhookRequest $request, string $tenantCodigo, TelepagosWebhookService $service): JsonResponse
+    public function handle(TelepagosWebhookRequest $request, Client $client, TelepagosWebhookService $service): JsonResponse
     {
         try {
             $cashinId = $request->validated('id');
 
-            $service->handleWebhook($tenantCodigo, $cashinId);
+            $service->handleWebhook($client, $cashinId);
 
             return response()->json(['status' => 'success']);
         } catch (\Exception $e) {

app/Domains/Integration/Controllers/TenantIntegrationController.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Controllers;
-
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\StoreTenantIntegrationRequest;
-use App\Domains\Integration\Services\TenantIntegrationService;
-use Illuminate\Routing\Controller;
-
-class TenantIntegrationController extends Controller
-{
-    protected TenantIntegrationService $tenantIntegrationService;
-
-    public function __construct(TenantIntegrationService $tenantIntegrationService)
-    {
-        $this->tenantIntegrationService = $tenantIntegrationService;
-    }
-
-    public function index(string $tenantCode)
-    {
-        return response()->json($this->tenantIntegrationService->getAllForTenant($tenantCode));
-    }
-
-    public function show(string $tenantCode, string $integrationCode)
-    {
-        $integration = $this->tenantIntegrationService->getTenantIntegration($tenantCode, $integrationCode);
-
-        if (! $integration) {
-            return response()->json([
-                'code' => 'integration.not_configured',
-                'message' => __('api.integration.not_configured'),
-            ], 404);
-        }
-
-        return response()->json($integration);
-    }
-
-    public function store(StoreTenantIntegrationRequest $request, string $tenantCode, string $integrationCode)
-    {
-        $integration = Integration::where('integration_code', $integrationCode)->firstOrFail();
-
-        try {
-            $this->tenantIntegrationService->updateOrCreateIntegration(
-                $tenantCode,
-                $integration,
-                $request->input('integration_data', [])
-            );
-
-            return response()->json([
-                'code' => 'integration.configured',
-                'message' => __('api.integration.configured'),
-            ]);
-        } catch (\Exception $e) {
-            return response()->json([
-                'code' => 'integration.validation_failed',
-                'message' => __('api.integration.validation_failed', ['error' => $e->getMessage()]),
-            ], 400);
-        }
-    }
-}

app/Domains/Integration/Models/ClientIntegration.php

@@ -2,16 +2,18 @@
 
 namespace App\Domains\Integration\Models;
 
+use App\Domains\Client\Models\Client;
 use App\Domains\Integration\Casts\EncryptedIntegrationData;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class TenantIntegration extends Model
+class ClientIntegration extends Model
 {
-    protected $table = 'tenant_integration';
+    protected $hidden = ['integration_data'];
 
     protected $fillable = [
+        'client_id',
         'integration_code',
-        'tenant_code',
         'integration_data',
     ];
 
@@ -19,7 +21,14 @@ class TenantIntegration extends Model
         'integration_data' => EncryptedIntegrationData::class,
     ];
 
-    public function integration()
+    /** @return BelongsTo<Client, $this> */
+    public function client(): BelongsTo
+    {
+        return $this->belongsTo(Client::class);
+    }
+
+    /** @return BelongsTo<Integration, $this> */
+    public function integration(): BelongsTo
     {
         return $this->belongsTo(Integration::class, 'integration_code', 'integration_code');
     }

app/Domains/Integration/Models/Integration.php

@@ -13,16 +13,16 @@ class Integration extends Model
         'name',
         'url',
         'integration_data_schema',
-        'requires_tenant_configuration',
+        'requires_client_configuration',
     ];
 
     protected $casts = [
         'integration_data_schema' => 'array',
-        'requires_tenant_configuration' => 'boolean',
+        'requires_client_configuration' => 'boolean',
     ];
 
-    public function tenantIntegrations()
+    public function clientIntegrations()
     {
-        return $this->hasMany(TenantIntegration::class, 'integration_code', 'integration_code');
+        return $this->hasMany(ClientIntegration::class, 'integration_code', 'integration_code');
     }
 }

app/Domains/Integration/Requests/StoreClientIntegrationRequest.php

@@ -6,7 +6,7 @@ use App\Domains\Integration\Models\Integration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\ValidationException;
 
-class StoreTenantIntegrationRequest extends FormRequest
+class StoreClientIntegrationRequest extends FormRequest
 {
     protected ?Integration $integrationModel = null;
 
@@ -15,10 +15,12 @@ class StoreTenantIntegrationRequest extends FormRequest
         return true;
     }
 
-    protected function prepareForValidation()
+    protected function prepareForValidation(): void
     {
         $integrationCode = $this->route('integration_code');
-        $this->integrationModel = Integration::where('integration_code', $integrationCode)->first();
+        $this->integrationModel = Integration::query()
+            ->where('integration_code', $integrationCode)
+            ->first();
 
         if (! $this->integrationModel) {
             throw ValidationException::withMessages([
@@ -31,12 +33,9 @@ class StoreTenantIntegrationRequest extends FormRequest
     {
         $rules = [];
 
-        // Dynamic validation rules based on the integration data schema
+        foreach ($this->integrationModel?->integration_data_schema ?? [] as $field => $rule) {
-        if ($this->integrationModel && $this->integrationModel->integration_data_schema) {
-            foreach ($this->integrationModel->integration_data_schema as $field => $rule) {
             $rules['integration_data.'.$field] = $rule;
         }
-        }
 
         return $rules;
     }

app/Domains/Integration/Requests/StoreIntegrationRequest.php

@@ -18,7 +18,7 @@ class StoreIntegrationRequest extends FormRequest
             'name' => ['required', 'string', 'max:255'],
             'url' => ['nullable', 'url', 'max:255'],
             'integration_data_schema' => ['nullable', 'array'],
-            'requires_tenant_configuration' => ['sometimes', 'boolean'],
+            'requires_client_configuration' => ['sometimes', 'boolean'],
         ];
     }
 }

app/Domains/Integration/Requests/UpdateIntegrationRequest.php

@@ -19,9 +19,9 @@ class UpdateIntegrationRequest extends FormRequest
             'name' => ['sometimes', 'required', 'string', 'max:255'],
             'url' => ['nullable', 'url', 'max:255'],
             'integration_data_schema' => ['nullable', 'array'],
-            'requires_tenant_configuration' => ['sometimes', 'boolean'],
+            '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 ?? '')],
+            'integration_code' => ['sometimes', 'required', 'string', 'unique:integrations,integration_code,'.($integration->id ?? '')],
         ];
     }
 }

app/Domains/Integration/Services/BaseIntegrationService.php

@@ -2,58 +2,54 @@
 
 namespace App\Domains\Integration\Services;
 
+use App\Domains\Client\Models\Client;
+use App\Domains\Integration\Models\ClientIntegration;
 use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\TenantIntegration;
+use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Http\Client\PendingRequest;
 use Exception;
+use Illuminate\Http\Client\PendingRequest;
+use Illuminate\Support\Facades\Http;
 
 abstract class BaseIntegrationService
 {
     /**
      * The unique code of the integration.
-     *
-     * @var string
      */
     protected string $integrationCode;
 
     /**
      * The current tenant code.
-     *
-     * @var string
      */
     protected string $tenantCode;
 
+    protected ?Tenant $tenant = null;
+
+    protected ?Client $clientContext = null;
+
     /**
      * The integration model instance.
-     *
-     * @var Integration|null
      */
     protected ?Integration $integration = null;
 
     /**
-     * The tenant-specific integration model instance.
+     * The client-owned integration configuration.
-     *
-     * @var TenantIntegration|null
      */
-    protected ?TenantIntegration $tenantIntegration = null;
+    protected ?ClientIntegration $clientIntegration = null;
 
     /**
      * Set the integration code.
      *
-     * @param string $integrationCode
      * @return $this
      */
     public function setIntegrationCode(string $integrationCode): self
     {
         $this->integrationCode = $integrationCode;
+
         return $this;
     }
 
     /**
      * Get the integration code.
-     *
-     * @return string
      */
     public function getIntegrationCode(): string
     {
@@ -63,53 +59,69 @@ abstract class BaseIntegrationService
     /**
      * Set the tenant code and load the integration models.
      *
-     * @param string $tenantCode
      * @return $this
+     *
      * @throws Exception
      */
     public function forTenant(string $tenantCode): self
     {
         $this->tenantCode = $tenantCode;
+        $this->tenant = Tenant::query()->with('client')->where('codigo', $tenantCode)->firstOrFail();
+        $this->clientContext = $this->tenant->client;
         $this->loadIntegration();
+
+        return $this;
+    }
+
+    public function forClient(Client|string $client): self
+    {
+        $this->clientContext = $client instanceof Client
+            ? $client
+            : Client::query()->where('code', $client)->firstOrFail();
+        $this->tenant = null;
+        $this->loadIntegration();
+
         return $this;
     }
 
     /**
-     * Load the Integration and TenantIntegration models.
+     * Load the integration definition and its client-owned configuration.
      *
      * @throws Exception
      */
     protected function loadIntegration(): void
     {
         if (empty($this->integrationCode)) {
-            throw new Exception("Integration code is not set.");
+            throw new Exception('Integration code is not set.');
         }
 
         $this->integration = Integration::where('integration_code', $this->integrationCode)->first();
-        if (!$this->integration) {
+        if (! $this->integration) {
             throw new Exception("Integration with code '{$this->integrationCode}' not found.");
         }
 
-        $this->tenantIntegration = TenantIntegration::where('tenant_code', $this->tenantCode)
+        if (! $this->clientContext) {
+            throw new Exception('Client context is not set.');
+        }
+
+        $this->clientIntegration = ClientIntegration::where('client_id', $this->clientContext->id)
             ->where('integration_code', $this->integrationCode)
             ->first();
 
-        if (!$this->tenantIntegration && $this->integration->requires_tenant_configuration) {
+        if (! $this->clientIntegration && $this->integration->requires_client_configuration) {
-            throw new Exception("Tenant '{$this->tenantCode}' does not have integration '{$this->integrationCode}' configured.");
+            throw new Exception("Client '{$this->clientContext->code}' does not have integration '{$this->integrationCode}' configured.");
         }
     }
 
     /**
      * Build the request URL.
      *
-     * @param string $path
-     * @return string
      * @throws Exception
      */
     public function getUrl(string $path = ''): string
     {
-        if (!$this->integration) {
+        if (! $this->integration) {
-            throw new Exception("Integration is not loaded. Call forTenant() first.");
+            throw new Exception('Integration is not loaded. Call forTenant() or forClient() first.');
         }
 
         $baseUrl = rtrim($this->integration->url, '/');
@@ -119,25 +131,20 @@ abstract class BaseIntegrationService
     }
 
     /**
-     * Get integration setting by key from tenant's integration data.
+     * Get an integration setting from the client-owned configuration.
-     *
-     * @param string $key
-     * @param mixed $default
-     * @return mixed
      */
     protected function getIntegrationSetting(string $key, mixed $default = null): mixed
     {
-        if (!$this->tenantIntegration || !$this->tenantIntegration->integration_data) {
+        if (! $this->clientIntegration || ! $this->clientIntegration->integration_data) {
             return $default;
         }
 
-        return $this->tenantIntegration->integration_data[$key] ?? $default;
+        return $this->clientIntegration->integration_data[$key] ?? $default;
     }
 
     /**
      * Get a pre-configured HTTP client builder.
      *
-     * @return PendingRequest
      * @throws Exception
      */
     public function client(): PendingRequest
@@ -148,17 +155,13 @@ abstract class BaseIntegrationService
 
     /**
      * Get the headers for the integration.
-     *
-     * @return array
      */
     abstract public function getHeaders(): array;
 
     /**
-     * Hook called after the integration is configured for the tenant.
+     * Hook called after the integration is configured for the client.
      * Can be used to validate credentials or perform initial setups.
      * Throw an Exception on failure.
-     *
-     * @return void
      */
     public function onSetup(): void
     {

app/Domains/Integration/Services/ClientIntegrationService.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Domains\Integration\Services;
+
+use App\Domains\Client\Models\Client;
+use App\Domains\Integration\Models\ClientIntegration;
+use App\Domains\Integration\Models\Integration;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\DB;
+
+class ClientIntegrationService
+{
+    public function getClientIntegration(Client $client, string $integrationCode): ?ClientIntegration
+    {
+        return $client->integrations()
+            ->where('integration_code', $integrationCode)
+            ->first();
+    }
+
+    /** @return Collection<int, ClientIntegration> */
+    public function getAllForClient(Client $client): Collection
+    {
+        return $client->integrations()->with('integration')->get();
+    }
+
+    public function updateOrCreateIntegration(
+        Client $client,
+        Integration $integration,
+        array $data,
+    ): ClientIntegration {
+        return DB::transaction(function () use ($client, $integration, $data): ClientIntegration {
+            $clientIntegration = ClientIntegration::query()->updateOrCreate(
+                [
+                    'client_id' => $client->id,
+                    'integration_code' => $integration->integration_code,
+                ],
+                ['integration_data' => $data],
+            );
+
+            $service = $this->resolveService($integration->integration_code);
+            $service?->forClient($client)->onSetup();
+
+            return $clientIntegration;
+        });
+    }
+
+    protected function resolveService(string $integrationCode): ?BaseIntegrationService
+    {
+        return match ($integrationCode) {
+            'email' => new MailService,
+            'telepagos', 'telepagos_homo' => new TelepagosIntegrationService($integrationCode),
+            default => null,
+        };
+    }
+}

app/Domains/Integration/Services/MailService.php

@@ -2,7 +2,9 @@
 
 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;
@@ -27,9 +29,7 @@ class MailService extends BaseIntegrationService
 
     private ?Mailer $mailer = null;
 
-    private ?Tenant $tenant = null;
+    private bool $usesClientMailer = false;
-
-    private bool $usesTenantMailer = false;
 
     public function __construct(?MailFactory $mailFactory = null)
     {
@@ -40,16 +40,28 @@ class MailService extends BaseIntegrationService
     {
         parent::forTenant($tenantCode);
 
-        $this->tenant = Tenant::query()
+        if ($this->clientIntegration) {
-            ->where('codigo', $tenantCode)
-            ->firstOrFail();
-
-        if ($this->tenantIntegration) {
             $this->mailer = $this->resolveMailer();
-            $this->usesTenantMailer = true;
+            $this->usesClientMailer = true;
         } else {
             $this->mailer = $this->mailFactory->mailer();
-            $this->usesTenantMailer = false;
+            $this->usesClientMailer = false;
+        }
+
+        return $this;
+    }
+
+    public function forClient(Client|string $client): self
+    {
+        parent::forClient($client);
+        $this->tenant = $this->clientContext?->tenants()->first();
+
+        if ($this->clientIntegration) {
+            $this->mailer = $this->resolveMailer();
+            $this->usesClientMailer = true;
+        } else {
+            $this->mailer = $this->mailFactory->mailer();
+            $this->usesClientMailer = false;
         }
 
         return $this;
@@ -60,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() primero.');
+            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,
+                'branding' => $branding,
-                'headerLogoUrl' => $this->tenant->headerLogo?->getTemporaryUrl(1440),
+                'headerLogoUrl' => $brand instanceof WebsiteType
-                'footerLogoUrl' => $this->tenant->footerLogo?->getTemporaryUrl(1440),
+                    ? $brand->siteLogo?->getTemporaryUrl(1440)
+                    : $brand->headerLogo?->getTemporaryUrl(1440),
+                'footerLogoUrl' => $brand->footerLogo?->getTemporaryUrl(1440),
                 'content' => $content,
             ],
         );
@@ -86,48 +109,93 @@ 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);
     }
 
     public function mailerName(): string
     {
-        return $this->usesTenantMailer
+        return $this->usesClientMailer
-            ? 'tenant-smtp'
+            ? 'client-smtp'
             : (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->tenant) {
+        if (! $this->mailer || ! $this->clientContext) {
-            throw new Exception('MailService no está configurado. Llamá a forTenant() primero.');
+            throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
         }
 
         $recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
 
         if (! is_string($recipient) || $recipient === '') {
-            throw new InvalidArgumentException('Falta MAIL_FROM_ADDRESS en la configuración SMTP del tenant.');
+            throw new InvalidArgumentException('Falta MAIL_FROM_ADDRESS en la configuración SMTP del cliente.');
         }
 
-        $this->send(
+        $subject = 'Configuración de correo validada';
-            $recipient,
+        $content = '<h1 style="margin: 0 0 20px;">Configuración de correo validada</h1>'
-            'Configuración de correo validada',
+            .'<p>La integración SMTP de '.e($this->clientContext->name).' fue configurada correctamente.</p>'
-            '<h1 style="margin: 0 0 20px;">Configuración de correo validada</h1>'
+            .'<p style="color: #64748b; font-size: 13px;">Este mensaje fue enviado automáticamente para validar las credenciales de correo.</p>';
-                .'<p>La integración SMTP de '.e($this->tenant->nombre).' fue configurada correctamente.</p>'
+
-                .'<p style="color: #64748b; font-size: 13px;">Este mensaje fue enviado automáticamente para validar las credenciales de correo.</p>',
+        if ($this->tenant) {
+            $this->send($recipient, $subject, $content);
+
+            return;
+        }
+
+        $this->mailer->to($recipient)->send(
+            (new Mailable)->subject($subject)->html($content)
         );
     }
 
     private function resolveMailer(): Mailer
     {
-        $data = $this->tenantIntegration?->integration_data;
+        $data = $this->clientIntegration?->integration_data;
 
         if (! is_array($data)) {
-            throw new InvalidArgumentException('La configuración SMTP del tenant no es válida.');
+            throw new InvalidArgumentException('La configuración SMTP del cliente no es válida.');
         }
 
         foreach (self::REQUIRED_SMTP_FIELDS as $field) {
             if (! array_key_exists($field, $data) || $data[$field] === null || $data[$field] === '') {
-                throw new InvalidArgumentException("Falta {$field} en la configuración SMTP del tenant.");
+                throw new InvalidArgumentException("Falta {$field} en la configuración SMTP del cliente.");
             }
         }
 
@@ -137,7 +205,7 @@ class MailService extends BaseIntegrationService
         }
 
         $mailer = $this->mailFactory->build([
-            'name' => "tenant-smtp-{$this->tenantCode}",
+            'name' => 'client-smtp-'.$this->clientContext?->id,
             'transport' => 'smtp',
             'scheme' => $data['MAIL_SCHEME'] ?? null,
             'host' => $data['MAIL_HOST'],
@@ -150,7 +218,7 @@ class MailService extends BaseIntegrationService
 
         $mailer->alwaysFrom(
             $data['MAIL_FROM_ADDRESS'],
-            $data['MAIL_FROM_NAME'] ?? $this->tenant?->nombre,
+            $data['MAIL_FROM_NAME'] ?? $this->clientContext?->name,
         );
 
         return $mailer;

app/Domains/Integration/Services/TelepagosIntegrationService.php

@@ -2,23 +2,22 @@
 
 namespace App\Domains\Integration\Services;
 
+use Carbon\Carbon;
 use Exception;
+use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
-use Carbon\Carbon;
 
 class TelepagosIntegrationService extends BaseIntegrationService
 {
     /**
      * TelepagosIntegrationService constructor.
-     *
-     * @param string $integrationCode
      */
     public function __construct(string $integrationCode = 'telepagos')
     {
         // Force homologation code if not in production and using default
-        if ($integrationCode === 'telepagos' && !app()->environment('production')) {
+        if ($integrationCode === 'telepagos' && ! app()->environment('production')) {
             $integrationCode = 'telepagos_homo';
         }
 
@@ -28,13 +27,12 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Get the headers for Telepagos integration.
      *
-     * @return array
      * @throws Exception
      */
     public function getHeaders(): array
     {
         return [
-            'Authorization' => 'Bearer ' . $this->getToken(),
+            'Authorization' => 'Bearer '.$this->getToken(),
             'Content-Type' => 'application/json',
             'Accept' => 'application/json',
         ];
@@ -43,16 +41,15 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Get a valid token, either from cache or by performing a login.
      *
-     * @return string
      * @throws Exception
      */
     public function getToken(): string
     {
-        if (!$this->tenantIntegration) {
+        if (! $this->clientIntegration || ! $this->clientContext) {
-            throw new Exception("Tenant integration is not loaded. Call forTenant() first.");
+            throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
         }
 
-        $cacheKey = "integration_token:{$this->tenantCode}:{$this->integrationCode}";
+        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
 
         $token = Cache::get($cacheKey);
 
@@ -66,7 +63,6 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Authenticate with Telepagos and cache the returned token.
      *
-     * @return string
      * @throws Exception
      */
     public function login(): string
@@ -75,7 +71,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
         $password = $this->getIntegrationSetting('password');
 
         if (empty($username) || empty($password)) {
-            throw new Exception("Missing username or password in Telepagos integration settings.");
+            throw new Exception('Missing username or password in Telepagos integration settings.');
         }
 
         $url = $this->getUrl('/v2/auth/token');
@@ -85,22 +81,20 @@ class TelepagosIntegrationService extends BaseIntegrationService
             'password' => $password,
         ]);
 
-        $data = $this->handleResponse($response, 'authentication', [
+        $data = $this->handleResponse($response, 'authentication');
-            'username' => $username,
-        ]);
 
         $token = $data['token'] ?? null;
         $expiresAtStr = $data['expires_at'] ?? null;
 
-        if (!$token || !$expiresAtStr) {
+        if (! $token || ! $expiresAtStr) {
-            throw new Exception("Telepagos authentication response is missing token or expires_at.");
+            throw new Exception('Telepagos authentication response is missing token or expires_at.');
         }
 
         $expiresAt = Carbon::parse($expiresAtStr);
         // Calculate TTL and subtract a buffer of 60 seconds
         $ttlSeconds = max(1, $expiresAt->diffInSeconds(now()) - 60);
 
-        $cacheKey = "integration_token:{$this->tenantCode}:{$this->integrationCode}";
+        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
         Cache::put($cacheKey, $token, $ttlSeconds);
 
         return $token;
@@ -108,18 +102,18 @@ class TelepagosIntegrationService extends BaseIntegrationService
 
     /**
      * Send a request to Telepagos, handling 401 Unauthorized for token refresh.
-     *
-     * @param string $method
-     * @param string $endpoint
-     * @param array $data
-     * @return \Illuminate\Http\Client\Response
      */
-    protected function sendRequest(string $method, string $endpoint, array $data = []): \Illuminate\Http\Client\Response
+    protected function sendRequest(string $method, string $endpoint, array $data = []): Response
     {
         $response = $this->client()->$method($endpoint, $data);
 
         if ($response->status() === 401) {
-            Log::info("Telepagos 401 Unauthorized. Refreshing token and retrying...");
+            Log::channel('telepagos')->info('Telepagos request returned 401; refreshing token and retrying.', [
+                'method' => strtoupper($method),
+                'endpoint' => $endpoint,
+                'client_id' => $this->clientContext?->id,
+                'integration_code' => $this->integrationCode,
+            ]);
 
             $this->clearToken();
 
@@ -132,10 +126,6 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Generate a QR code for cash-in.
      *
-     * @param float $amount
-     * @param string $concept
-     * @param string $description
-     * @return array
      * @throws Exception
      */
     public function generateQr(float $amount, string $concept, string $description): array
@@ -155,7 +145,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
      * Get the details of a cash-in payment.
      *
      * @param  int  $cashinId
-     * @return array
+     *
      * @throws Exception
      */
     public function getCashinDetails(string $cashinId): array
@@ -170,31 +160,29 @@ class TelepagosIntegrationService extends BaseIntegrationService
     /**
      * Get the account info.
      *
-     * @return array
      * @throws Exception
      */
     public function getAccountInfo(): array
     {
         $response = $this->sendRequest('get', '/v2/account/info');
+
         return $this->handleResponse($response, 'get account info');
     }
 
     /**
      * Handle the Telepagos API response, logging any failures and throwing Exceptions.
      *
-     * @param \Illuminate\Http\Client\Response $response
-     * @param string $actionDescription
-     * @param array $context
-     * @return array
      * @throws Exception
      */
-    protected function handleResponse(\Illuminate\Http\Client\Response $response, string $actionDescription, array $context = []): array
+    protected function handleResponse(Response $response, string $actionDescription, array $context = []): array
     {
         if ($response->failed() || $response->json('status') !== 'ok') {
             $errorMessage = $response->json('message') ?? $response->body();
-            Log::error("Telepagos {$actionDescription} failed: {$errorMessage}", array_merge([
+            Log::channel('telepagos')->error("Telepagos {$actionDescription} failed: {$errorMessage}", array_merge([
                 'response_status' => $response->status(),
-                'response_body' => $response->json() ?? $response->body(),
+                'response_body' => $this->sanitizeForLog($response->json() ?? $response->body()),
+                'client_id' => $this->clientContext?->id,
+                'integration_code' => $this->integrationCode,
             ], $context));
 
             throw new Exception("Telepagos {$actionDescription} failed: {$errorMessage}");
@@ -203,21 +191,46 @@ class TelepagosIntegrationService extends BaseIntegrationService
         return $response->json() ?? [];
     }
 
+    /**
+     * Remove credentials and tokens before serializing provider responses.
+     */
+    protected function sanitizeForLog(mixed $value): mixed
+    {
+        if (! is_array($value)) {
+            return $value;
+        }
+
+        $sensitiveKeys = ['authorization', 'password', 'token', 'access_token', 'refresh_token'];
+
+        foreach ($value as $key => $item) {
+            if (in_array(strtolower((string) $key), $sensitiveKeys, true)) {
+                $value[$key] = '[REDACTED]';
+
+                continue;
+            }
+
+            $value[$key] = $this->sanitizeForLog($item);
+        }
+
+        return $value;
+    }
+
     /**
      * Clear the cached token.
-     *
-     * @return void
      */
     public function clearToken(): void
     {
-        $cacheKey = "integration_token:{$this->tenantCode}:{$this->integrationCode}";
+        if (! $this->clientContext) {
+            return;
+        }
+
+        $cacheKey = "integration_token:{$this->clientContext->id}:{$this->integrationCode}";
         Cache::forget($cacheKey);
     }
 
     /**
      * Perform initial setup validation for Telepagos.
      *
-     * @return void
      * @throws Exception
      */
     public function onSetup(): void

app/Domains/Integration/Services/TelepagosWebhookService.php

@@ -2,11 +2,11 @@
 
 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 App\Domains\Tenant\Models\Tenant;
 use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -22,12 +22,15 @@ class TelepagosWebhookService
      *
      * @throws Exception
      */
-    public function handleWebhook(string $tenantCodigo, string $cashinId): void
+    public function handleWebhook(Client $client, string $cashinId): void
     {
-        $tenant = Tenant::where('codigo', $tenantCodigo)->firstOrFail();
+        Log::channel('telepagos')->info('Telepagos webhook received.', [
+            'client_code' => $client->code,
+            'cashin_id' => $cashinId,
+        ]);
 
         $telepagosService = new TelepagosIntegrationService;
-        $telepagosService->forTenant($tenant->codigo);
+        $telepagosService->forClient($client);
 
         try {
             $details = $telepagosService->getCashinDetails($cashinId);
@@ -36,84 +39,9 @@ class TelepagosWebhookService
             $amount = $this->normalizeAmount($details['data']['amount'] ?? $details['amount'] ?? 0);
             $operationId = $details['data']['operation_id'] ?? $details['operation_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::warning("Telepagos webhook: CUIT not found for Transferencia cashin {$cashinId}");
-
-                    return;
-                }
-
-                $dni = substr($cuit, 2, -1);
-
-                $compra = Purchase::where('tenant_codigo', $tenantCodigo)
-                    ->where('transfer_payer_dni', $dni)
-                    ->whereIn('status', [
-                        Purchase::STATUS_CREATED,
-                        Purchase::STATUS_PENDING_PAYMENT,
-                    ])
-                    ->where('payment_method', 'transfer')
-                    ->where('total', $amount)
-                    ->latest()
-                    ->first();
-
-                if (! $compra) {
-                    Log::warning("Telepagos webhook: No matching purchase found for DNI {$dni} and amount {$amount} for cashin {$cashinId}");
-
-                    return;
-                }
-            } elseif (in_array((int) $operationId, $qrOperationIds, true)) {
-                if (! $qrOrderId) {
-                    Log::warning("Telepagos webhook: qr_order_id not found for QR cashin {$cashinId}");
-
-                    return;
-                }
-
-                $telepagosQr = TelepagosQr::where('qr_order_id', $qrOrderId)->first();
-
-                if (! $telepagosQr) {
-                    Log::warning("Telepagos webhook: QR {$qrOrderId} not found in database for cashin {$cashinId}");
-
-                    return;
-                }
-
-                $compra = $telepagosQr->compra;
-
-                if (! $compra) {
-                    Log::warning("Telepagos webhook: Purchase not found for QR {$qrOrderId}");
-
-                    return;
-                }
-
-                if (! in_array($compra->status, [
-                    Purchase::STATUS_PENDING_PAYMENT,
-                ], true)) {
-                    Log::warning("Telepagos webhook: Purchase {$compra->id} is not awaiting payment confirmation");
-
-                    return;
-                }
-
-                $totalAmount = $this->normalizeAmount($compra->getTotalAmount());
-
-                if ($amount !== $totalAmount) {
-                    Log::warning("Telepagos webhook: Amount mismatch. Cashin amount: {$amount}, Purchase amount: {$totalAmount}");
-
-                    return;
-                }
-            } else {
-                Log::warning("Telepagos webhook: Unknown operation_id {$operationId} for cashin {$cashinId}");
-
-                return;
-            }
-
             $paymentData = [
-                'compra_id' => $compra->id,
+                '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,
@@ -125,14 +53,154 @@ class TelepagosWebhookService
                 '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,
+                        Purchase::STATUS_IN_REVIEW,
+                    ])
+                    ->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::info("Telepagos webhook: Successfully processed cashin {$cashinId} for purchase {$compra->id}");
+            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::error('Telepagos webhook error: '.$e->getMessage());
+            Log::channel('telepagos')->error('Telepagos webhook processing failed.', [
+                'client_code' => $client->code,
+                'cashin_id' => $cashinId,
+                'error' => $e->getMessage(),
+            ]);
             throw $e;
         }
     }

app/Domains/Integration/Services/TenantIntegrationService.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Domains\Integration\Services;
-
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\TenantIntegration;
-use Illuminate\Support\Facades\DB;
-
-class TenantIntegrationService
-{
-    public function getTenantIntegration(string $tenantCode, string $integrationCode): ?TenantIntegration
-    {
-        return TenantIntegration::where('tenant_code', $tenantCode)
-            ->where('integration_code', $integrationCode)
-            ->first();
-    }
-
-    public function getAllForTenant(string $tenantCode)
-    {
-        return TenantIntegration::with('integration')
-            ->where('tenant_code', $tenantCode)
-            ->get();
-    }
-
-    public function updateOrCreateIntegration(string $tenantCode, Integration $integration, array $data): TenantIntegration
-    {
-        return DB::transaction(function () use ($tenantCode, $integration, $data) {
-            $tenantIntegration = TenantIntegration::updateOrCreate(
-                [
-                    'tenant_code' => $tenantCode,
-                    'integration_code' => $integration->integration_code,
-                ],
-                [
-                    'integration_data' => $data,
-                ]
-            );
-
-            $service = $this->resolveService($integration->integration_code);
-            if ($service) {
-                $service->forTenant($tenantCode)->onSetup();
-            }
-
-            return $tenantIntegration;
-        });
-    }
-
-    protected function resolveService(string $integrationCode): ?BaseIntegrationService
-    {
-        switch ($integrationCode) {
-            case 'email':
-                return new MailService;
-            case 'telepagos':
-            case 'telepagos_homo':
-                return new TelepagosIntegrationService($integrationCode);
-            default:
-                return null;
-        }
-    }
-}

app/Domains/Integration/documentacion/README.md

@@ -2,18 +2,18 @@
 
 ## Propósito
 
-Gestiona integraciones externas disponibles y su configuración por tenant. Incluye correo y pagos mediante Telepagos.
+Gestiona integraciones externas disponibles y su configuración por cliente. Un cliente puede agrupar múltiples tenants que comparten las mismas credenciales. Incluye correo y pagos mediante Telepagos.
 
 ## Modelo y seguridad
 
 - `Integration`: definición global de una integración.
-- `TenantIntegration`: configuración y credenciales de una integración para un tenant.
+- `ClientIntegration`: configuración y credenciales de una integración para un cliente.
 - `EncryptedIntegrationData`: cast que protege los datos sensibles persistidos.
-- `TenantIntegrationService`: consulta y configura integraciones del tenant.
+- `ClientIntegrationService`: consulta y configura integraciones del cliente.
 
 ## Servicios externos
 
-- `BaseIntegrationService`: base para resolver configuración, URL y cliente del tenant.
+- `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.
@@ -21,9 +21,13 @@ Gestiona integraciones externas disponibles y su configuración por tenant. Incl
 ## Endpoints
 
 - CRUD global bajo `/integrations`.
-- Consulta y configuración por tenant bajo `/{tenant_code}/integrations`.
+- Consulta y configuración por cliente bajo `/clients/{client}/integrations`.
-- `POST /webhooks/telepagos/{tenant_codigo}` para notificaciones del proveedor.
+- `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.
 
 ## Dependencias y reglas
 
-Se integra con `Tenant` y con el checkout de `Purchase`. `Notification` utiliza `MailService`. Las credenciales no deben exponerse 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; los webhooks deben validar su contrato antes de alterar una compra.

app/Domains/Integration/routes/api.php

@@ -1,7 +1,8 @@
 <?php
 
+use App\Domains\Integration\Controllers\ClientIntegrationController;
 use App\Domains\Integration\Controllers\IntegrationController;
-use App\Domains\Integration\Controllers\TenantIntegrationController;
+use App\Domains\Integration\Controllers\TelepagosWebhookController;
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'integrations'], function () {
@@ -12,10 +13,10 @@ Route::group(['prefix' => 'integrations'], function () {
     Route::delete('/{integration}', [IntegrationController::class, 'destroy']);
 });
 
-Route::group(['prefix' => '{tenant_code}/integrations'], function () {
+Route::group(['prefix' => 'clients/{client}/integrations'], function () {
-    Route::get('/', [TenantIntegrationController::class, 'index']);
+    Route::get('/', [ClientIntegrationController::class, 'index']);
-    Route::get('/{integration_code}', [TenantIntegrationController::class, 'show']);
+    Route::get('/{integration_code}', [ClientIntegrationController::class, 'show']);
-    Route::post('/{integration_code}', [TenantIntegrationController::class, 'store']);
+    Route::put('/{integration_code}', [ClientIntegrationController::class, 'store']);
 });
 
-Route::post('webhooks/telepagos/{tenant_codigo}', [\App\Domains\Integration\Controllers\TelepagosWebhookController::class, 'handle']);
+Route::post('webhooks/telepagos/{client}', [TelepagosWebhookController::class, 'handle']);

app/Domains/MailTest/Mailables/TestMail.php

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

app/Domains/Notification/Events/TicketsAvailable.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Notification\Events;
 
-use App\Domains\Purchase\Models\Purchase;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -14,7 +13,7 @@ class TicketsAvailable
      * @param  array<int, int>  $ticketIds
      */
     public function __construct(
-        public readonly Purchase $purchase,
+        public readonly int $purchaseId,
         public readonly array $ticketIds,
     ) {}
 }

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/Domains/Notification/Listeners/SendPurchasePaidEmail.php

@@ -20,6 +20,6 @@ class SendPurchasePaidEmail implements ShouldQueueAfterCommit
 
     public function handle(PurchasePaid $event): void
     {
-        app(NotificationMailService::class)->sendPurchasePaid($event->purchase->getKey());
+        app(NotificationMailService::class)->sendPurchasePaid($event->purchaseId);
     }
 }

app/Domains/Notification/Listeners/SendTicketsAvailableEmail.php

@@ -20,6 +20,6 @@ class SendTicketsAvailableEmail implements ShouldQueueAfterCommit
 
     public function handle(TicketsAvailable $event): void
     {
-        app(NotificationMailService::class)->sendTicketsAvailable($event->purchase->getKey(), $event->ticketIds);
+        app(NotificationMailService::class)->sendTicketsAvailable($event->purchaseId, $event->ticketIds);
     }
 }

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();
+        $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}",
+                    "Bienvenido a {$brand->nombre}",
-                view('mail.notifications.welcome', compact('tenant', 'user'))->render(),
+                    view('mail.notifications.welcome', compact('brand', 'user'))->render(),
+                    $brand,
                 );
+
+            return [
+                'brand_type' => $tenant->websiteType === null ? 'tenant' : 'website_type',
+            ];
+        });
     }
 
     public function sendPasswordResetCode(
@@ -38,6 +53,13 @@ class NotificationMailService
         string $tenantCode,
         string $channel = PasswordResetRequested::CHANNEL_STOREFRONT,
     ): void {
+        $context = [
+            'attempt_id' => $attemptId,
+            'tenant_code' => $tenantCode,
+            'channel' => $channel,
+        ];
+
+        $this->sendLogged('password_reset', $context, function () use ($attemptId, $tenantCode, $channel, $context): ?array {
             $tenant = Tenant::query()
                 ->with('websiteType')
                 ->where('codigo', $tenantCode)
@@ -47,13 +69,13 @@ class NotificationMailService
                 ->findOrFail($attemptId);
 
             if ($attempt->status !== ResetPasswordAttempt::STATUS_PENDING) {
-            Log::warning('Password reset email was skipped because the attempt is no longer pending.', [
+                $this->logSkipped('password_reset', array_merge($context, [
-                'attempt_id' => $attemptId,
+                    'reason' => 'attempt_not_pending',
-                'tenant_code' => $tenantCode,
                     'attempt_status' => $attempt->status,
-            ]);
+                    'user_id' => $attempt->user_id,
+                ]));
 
-            return;
+                return null;
             }
 
             $recoveryDomain = match ($channel) {
@@ -61,6 +83,10 @@ class NotificationMailService
                 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
@@ -70,22 +96,46 @@ class NotificationMailService
             }
             $recoveryUrl = $recoveryDomain === null
                 ? null
-            : 'https://'.$recoveryDomain.'/recuperar-contrasena/codigo?'.http_build_query($recoveryQuery);
+                : '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 - {$tenant->nombre}",
+                    "Código para recuperar tu contraseña - {$brand->nombre}",
-                view('mail.notifications.password-reset', compact('tenant', 'attempt', 'recoveryUrl'))->render(),
+                    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
     {
+        $context = ['purchase_id' => $purchaseId];
+
+        $this->sendLogged('purchase_paid', $context, function () use ($purchaseId, $context): ?array {
             $purchase = Purchase::query()
                 ->with(['tenant', 'user', 'items'])
-            ->findOrFail($purchaseId);
+                ->find($purchaseId);
+
+            if ($purchase === null) {
+                $this->logSkipped('purchase_paid', array_merge($context, [
+                    'reason' => 'purchase_not_found',
+                    'missing_model' => Purchase::class,
+                ]));
+
+                return null;
+            }
 
             $this->mailService
                 ->forTenant($purchase->tenant_codigo)
@@ -94,12 +144,37 @@ class NotificationMailService
                     "Pago confirmado - Compra #{$purchase->getKey()}",
                     view('mail.notifications.purchase-paid', compact('purchase'))->render(),
                 );
+
+            return [
+                'tenant_code' => $purchase->tenant_codigo,
+                'user_id' => $purchase->user_id,
+                'purchase_status' => $purchase->status,
+                'purchase_item_count' => $purchase->items->count(),
+            ];
+        });
     }
 
     /** @param array<int, int> $ticketIds */
     public function sendTicketsAvailable(int $purchaseId, array $ticketIds): void
     {
-        $purchase = Purchase::query()->with(['tenant', 'user'])->findOrFail($purchaseId);
+        $context = [
+            'purchase_id' => $purchaseId,
+            'requested_ticket_count' => count($ticketIds),
+            'requested_ticket_ids' => $ticketIds,
+        ];
+
+        $this->sendLogged('tickets_available', $context, function () use ($purchaseId, $ticketIds, $context): ?array {
+            $purchase = Purchase::query()->with(['tenant', 'user'])->find($purchaseId);
+
+            if ($purchase === null) {
+                $this->logSkipped('tickets_available', array_merge($context, [
+                    'reason' => 'purchase_not_found',
+                    'missing_model' => Purchase::class,
+                ]));
+
+                return null;
+            }
+
             /** @var Collection<int, Ticket> $tickets */
             $tickets = Ticket::query()
                 ->where('tenant_code', $purchase->tenant_codigo)
@@ -109,7 +184,14 @@ class NotificationMailService
                 ->get();
 
             if ($tickets->isEmpty()) {
-            return;
+                $this->logSkipped('tickets_available', array_merge($context, [
+                    'reason' => 'tickets_not_found',
+                    'missing_model' => Ticket::class,
+                    'tenant_code' => $purchase->tenant_codigo,
+                    'user_id' => $purchase->user_id,
+                ]));
+
+                return null;
             }
 
             $this->mailService
@@ -118,11 +200,59 @@ class NotificationMailService
                     $this->recipientFor($purchase),
                     'Tus tickets ya están disponibles',
                     view('mail.notifications.tickets-available', compact('purchase', 'tickets'))->render(),
+                    attachments: [[
+                        'data' => $this->ticketPdfService->contents($purchase->tenant, $tickets),
+                        'name' => $this->ticketPdfService->filename($tickets),
+                        'mime' => 'application/pdf',
+                    ]],
                 );
+
+            return [
+                'tenant_code' => $purchase->tenant_codigo,
+                'user_id' => $purchase->user_id,
+                'sent_ticket_count' => $tickets->count(),
+                'sent_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,
+        ]));
+    }
 }

app/Domains/Notification/documentacion/README.md

@@ -23,4 +23,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.
+- Los correos transaccionales (pago confirmado y tickets disponibles) usan la identidad visual del tenant/evento de la compra.
 - Los handlers deben permanecer idempotentes o tolerantes a reintentos de cola.

app/Domains/Purchase/Controllers/PurchaseController.php

@@ -4,13 +4,13 @@ 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\UpdatePurchaseItemQuantityRequest;
 use App\Domains\Purchase\Resources\PurchaseResource;
+use App\Domains\Purchase\Services\Checkout\PurchaseResponseLoader;
 use App\Domains\Purchase\Services\CheckoutService;
+use App\Domains\Purchase\Services\PurchaseStateGuard;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
@@ -24,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) {
+                ->when($statuses !== [], fn ($query) => $query->whereIn('status', $statuses))
-                    $query->where('status', $status);
+                ->orderBy('status')
-                })
                 ->latest()
                 ->paginateFromRequest()
         )->response();
@@ -52,12 +62,16 @@ class PurchaseController extends Controller
         return PurchaseResource::make($purchase)->response()->setStatusCode(201);
     }
 
-    public function show(Request $request, Tenant $tenant, Purchase $compra): PurchaseResource
+    public function show(
-    {
+        Request $request,
+        Tenant $tenant,
+        Purchase $compra,
+        PurchaseResponseLoader $responses,
+    ): PurchaseResource {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
 
         $compra->loadMissing('items')->loadCount('tickets');
-        $compra->items->load('imageAttachment');
+        $responses->load($compra);
 
         return PurchaseResource::make($compra);
     }
@@ -75,86 +89,77 @@ class PurchaseController extends Controller
         );
     }
 
-    public function updateItemQuantity(
+    public function paymentIntent(
-        UpdatePurchaseItemQuantityRequest $request,
+        PaymentIntentRequest $request,
-        Tenant $tenant,
-        Purchase $compra,
-        PurchaseItem $item,
-        CheckoutService $checkoutService,
-    ): PurchaseResource {
-        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
-
-        return PurchaseResource::make(
-            $checkoutService->updateItemQuantity(
-                $compra,
-                $item,
-                (int) $request->validated('quantity'),
-            ),
-        );
-    }
-
-    public function prepareItemEditing(
-        Request $request,
         Tenant $tenant,
         Purchase $compra,
         CheckoutService $checkoutService,
-    ): PurchaseResource {
+        PurchaseStateGuard $purchaseState,
-        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
+    ): JsonResponse {
-
-        return PurchaseResource::make(
-            $checkoutService->prepareItemEditing($compra),
-        );
-    }
-
-    public function paymentIntent(PaymentIntentRequest $request, Tenant $tenant, Purchase $compra): JsonResponse
-    {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
         $method = $request->validated('method');
-        $totalAmount = $compra->calculateCurrentTotalAmount();
+        $transferPayerDni = $method === 'transfer'
+            ? preg_replace('/\D+/', '', (string) $request->validated('transfer_payer_dni'))
+            : null;
 
-        $purchaseUpdate = [
+        $updated = DB::transaction(function () use (
-            'payment_method' => $method,
+            $checkoutService,
-            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            $compra,
-            'expires_at' => now()->addMinutes(
+            $method,
-                max(1, (int) config("purchase.payment_expiration_minutes.{$method}", 30))
+            $purchaseState,
-            ),
+            $transferPayerDni,
-            'total' => $totalAmount,
+        ): bool {
-        ];
-
-        if ($method === 'transfer') {
-            $purchaseUpdate['transfer_payer_dni'] = preg_replace('/\D+/', '', (string) $request->validated('transfer_payer_dni'));
-        }
-
-        $updated = DB::transaction(function () use ($compra, $purchaseUpdate): bool {
             /** @var Purchase|null $purchase */
             $purchase = Purchase::query()
                 ->whereKey($compra->getKey())
                 ->lockForUpdate()
                 ->first();
 
+            if ($purchase === null) {
+                return false;
+            }
+
+            $purchaseState->assertNotExpired($purchase);
+
             if (
-                $purchase === null
+                ! in_array($purchase->status, [
-                || ! in_array($purchase->status, [
                     Purchase::STATUS_CREATED,
                     Purchase::STATUS_PENDING_PAYMENT,
                 ], true)
-                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
             ) {
                 return false;
             }
 
+            $purchaseState->lockCurrentCart($purchase);
+
+            $purchaseUpdate = [
+                'payment_method' => $method,
+                'status' => Purchase::STATUS_PENDING_PAYMENT,
+                'total' => $purchase->calculateCurrentTotalAmount(),
+            ];
+
+            if ($transferPayerDni !== null) {
+                $purchaseUpdate['transfer_payer_dni'] = $transferPayerDni;
+            }
             $purchase->update($purchaseUpdate);
+            $checkoutService->refreshReservationExpiration(
+                $purchase,
+                now()->addMinutes(
+                    max(1, (int) config("purchase.payment_expiration_minutes.{$method}", 30)),
+                ),
+            );
 
             return true;
         });
 
-        if ($updated === 0) {
+        if (! $updated) {
             throw ValidationException::withMessages([
                 'purchase' => __('api.purchase.not_available_for_payment'),
             ]);
         }
 
         $compra->refresh();
+        $totalAmount = (float) $compra->total;
 
         if ($method === 'transfer') {
             $telepagosService = new TelepagosIntegrationService;
@@ -163,6 +168,11 @@ class PurchaseController extends Controller
             try {
                 $accountInfo = $telepagosService->getAccountInfo();
 
+                Log::channel('telepagos')->info('Telepagos account information retrieved.', [
+                    'tenant_code' => $tenant->codigo,
+                    'purchase_id' => $compra->id,
+                ]);
+
                 return response()->json([
                     'payment_method' => 'transfer',
                     'transfer_data' => [
@@ -174,9 +184,10 @@ class PurchaseController extends Controller
                     ],
                 ]);
             } catch (\Exception $e) {
-                Log::error('Unable to retrieve TelePagos account information.', [
+                Log::channel('telepagos')->error('Unable to retrieve TelePagos account information.', [
+                    'tenant_code' => $tenant->codigo,
                     'purchase_id' => $compra->id,
-                    'exception' => $e,
+                    'error' => $e->getMessage(),
                 ]);
 
                 return response()->json([
@@ -191,7 +202,11 @@ class PurchaseController extends Controller
             $telepagosService->forTenant($tenant->codigo);
 
             try {
-                Log::info("Generating QR for purchase ID: {$compra->id}, amount: {$totalAmount}");
+                Log::channel('telepagos')->info('Generating Telepagos QR.', [
+                    'tenant_code' => $tenant->codigo,
+                    'purchase_id' => $compra->id,
+                    'amount' => $totalAmount,
+                ]);
                 $qrResponse = $telepagosService->generateQr(
                     $totalAmount,
                     'Compra',
@@ -202,10 +217,17 @@ class PurchaseController extends Controller
                     'qr_order_id' => (string) ($qrResponse['qr_order_id'] ?? ''),
                     'qr_code' => $qrResponse['qr_code'] ?? '',
                 ]);
-            } catch (\Exception $e) {
+
-                Log::error('Unable to generate TelePagos QR code.', [
+                Log::channel('telepagos')->info('Telepagos QR generated successfully.', [
+                    'tenant_code' => $tenant->codigo,
                     'purchase_id' => $compra->id,
-                    'exception' => $e,
+                    'qr_order_id' => $telepagosQr->qr_order_id,
+                ]);
+            } catch (\Exception $e) {
+                Log::channel('telepagos')->error('Unable to generate TelePagos QR code.', [
+                    'tenant_code' => $tenant->codigo,
+                    'purchase_id' => $compra->id,
+                    'error' => $e->getMessage(),
                 ]);
 
                 return response()->json([

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) {}
 }

app/Domains/Purchase/Exceptions/PurchaseExpiredException.php

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

app/Domains/Purchase/Exceptions/PurchaseLimitExceededException.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Domains\Purchase\Exceptions;
+
+use App\Domains\Catalog\Models\CatalogItem;
+use Illuminate\Validation\ValidationException;
+
+class PurchaseLimitExceededException extends ValidationException
+{
+    public readonly int $catalogItemId;
+
+    public readonly string $catalogItemName;
+
+    public readonly int $maximumAddableQuantity;
+
+    public function __construct(CatalogItem $catalogItem, int $maximumAddableQuantity, string $field)
+    {
+        $this->catalogItemId = (int) $catalogItem->getKey();
+        $this->catalogItemName = $catalogItem->nombre;
+        $this->maximumAddableQuantity = $maximumAddableQuantity;
+
+        parent::__construct(validator([], []));
+
+        $message = trans_choice('api.purchase_limit.exceeded', $maximumAddableQuantity, [
+            'max' => $maximumAddableQuantity,
+            'product' => $this->catalogItemName,
+        ]);
+        $this->message = $message;
+        $this->validator->errors()->add($field, $message);
+    }
+}

app/Domains/Purchase/Models/Purchase.php

@@ -4,6 +4,7 @@ namespace App\Domains\Purchase\Models;
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Cart\Models\Cart;
+use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Logging\Models\Concerns\LogsValueChanges;
 use App\Domains\Purchase\Events\PurchasePaid;
 use App\Domains\Tenant\Models\Tenant;
@@ -18,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',
@@ -38,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';
@@ -46,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,
         ];
     }
 
@@ -70,8 +77,8 @@ class Purchase extends Model
     {
         return [
             'cart_id' => 'integer',
+            'stock_reservation_id' => 'integer',
             'user_id' => 'integer',
-            'expires_at' => 'datetime',
             'total' => 'decimal:2',
         ];
     }
@@ -116,6 +123,12 @@ class Purchase extends Model
         return $this->hasMany(Ticket::class, 'source_purchase_id');
     }
 
+    /** @return BelongsTo<StockReservation, $this> */
+    public function stockReservation(): BelongsTo
+    {
+        return $this->belongsTo(StockReservation::class);
+    }
+
     /**
      * @return HasOne<TelepagosQr, $this>
      */
@@ -143,7 +156,7 @@ class Purchase extends Model
 
     public function calculateCurrentTotalAmount(): float
     {
-        if ($this->relationLoaded('items')) {
+        if ($this->relationLoaded('items') && $this->getRelation('items')->isNotEmpty()) {
             return (float) $this->getRelation('items')->sum('total');
         }
 
@@ -180,7 +193,7 @@ class Purchase extends Model
                 'status' => self::STATUS_PAID,
             ]);
 
-            PurchasePaid::dispatch($this);
+            PurchasePaid::dispatch($this->getKey());
         });
     }
 }

app/Domains/Purchase/Models/PurchaseItem.php

@@ -3,6 +3,8 @@
 namespace App\Domains\Purchase\Models;
 
 use App\Domains\Attachable\Models\Attachment;
+use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Catalog\Models\Variant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -23,18 +25,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
     'discount_total',
     'tax_total',
     'total',
-    'reservation_status',
 ])]
 class PurchaseItem extends Model
 {
     use HasFactory;
 
-    public const RESERVATION_ACTIVE = 'active';
-
-    public const RESERVATION_COMMITTED = 'committed';
-
-    public const RESERVATION_RELEASED = 'released';
-
     protected $table = 'compra_items';
 
     protected function casts(): array
@@ -66,4 +61,16 @@ class PurchaseItem extends Model
     {
         return $this->belongsTo(Attachment::class, 'image_attachment_id');
     }
+
+    /** @return BelongsTo<CatalogItem, $this> */
+    public function sourceCatalogItem(): BelongsTo
+    {
+        return $this->belongsTo(CatalogItem::class, 'source_catalog_item_id')->withTrashed();
+    }
+
+    /** @return BelongsTo<Variant, $this> */
+    public function sourceVariant(): BelongsTo
+    {
+        return $this->belongsTo(Variant::class, 'source_variant_id')->withTrashed();
+    }
 }

app/Domains/Purchase/Models/TelepagosPayment.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 #[Fillable([
     'compra_id',
+    'matched_purchase_ids',
     'cuit_buyer',
     'cvu_buyer',
     'amount',
@@ -29,6 +30,7 @@ class TelepagosPayment extends Model
     {
         return [
             'compra_id' => 'integer',
+            'matched_purchase_ids' => 'array',
             'amount' => 'decimal:2',
         ];
     }

app/Domains/Purchase/Requests/UpdatePurchaseItemQuantityRequest.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Domains\Purchase\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UpdatePurchaseItemQuantityRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return $this->user() !== null;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'quantity' => ['required', 'integer', 'min:1', 'max:100'],
-        ];
-    }
-}

app/Domains/Purchase/Resources/PurchaseItemResource.php

@@ -2,22 +2,23 @@
 
 namespace App\Domains\Purchase\Resources;
 
-use App\Domains\Cart\Models\CartItem;
-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> */
     public function toArray(Request $request): array
     {
-        if ($this->resource instanceof PurchaseItem) {
+        $tenant = $request->route('tenant');
-            $imageUrl = $this->imageAttachment?->getTemporaryUrl(1440);
+        $displayImage = ! $tenant instanceof Tenant || $tenant->display_cart_item_images;
-            $attributes = $this->variant_attributes ?? [];
+
+        $imageUrl = $displayImage
+            ? $this->imageAttachment?->getTemporaryUrl(1440)
+            : null;
 
         return [
             'id' => $this->id,
@@ -31,105 +32,11 @@ class PurchaseItemResource extends JsonResource
                 'descripcion' => $this->descripcion,
                 'slug' => $this->slug,
                 'imagen' => $imageUrl,
-                    'attributes' => $attributes,
+                'attributes' => $this->variant_attributes ?? [],
             ],
         ];
     }
 
-        $selectedItem = $this->selectedItem();
-        $catalogItem = $this->catalogItem;
-        $variant = $this->variant;
-        $quantity = (int) ($this->cantidad ?? 0);
-        $unitPrice = $this->resolveUnitPrice($selectedItem);
-        $lineTotal = $unitPrice * $quantity;
-        $imageUrl = $this->resolveImageUrl($selectedItem, $catalogItem);
-
-        return [
-            'id' => $this->id,
-            'quantity' => $quantity,
-            'unit_price' => $this->formatMoney($unitPrice),
-            'line_total' => $this->formatMoney($lineTotal),
-            'catalog_item_id' => $this->catalog_item_id,
-            'variant_id' => $this->variant_id,
-            'product' => $catalogItem === null ? null : [
-                'id' => $catalogItem->id,
-                'nombre' => $catalogItem->nombre,
-                'descripcion' => $catalogItem->descripcion,
-                'slug' => $catalogItem->slug,
-                'imagen' => $imageUrl,
-            ],
-            'variant' => $variant === null ? null : [
-                'id' => $variant->id,
-                'attributes' => $this->resolveAttributes($variant),
-            ],
-            'item_details' => $selectedItem === null ? null : [
-                'nombre' => $selectedItem->getName(),
-                'descripcion' => $selectedItem->getDescription(),
-                'imagen' => $imageUrl,
-                'attributes' => $variant === null ? [] : $this->resolveAttributes($variant),
-            ],
-        ];
-    }
-
-    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, '.', '');

app/Domains/Purchase/Resources/PurchaseResource.php

@@ -31,12 +31,14 @@ class PurchaseResource extends JsonResource
             )
             : (float) ($this->total ?? 0);
 
-        $total = $items->isNotEmpty()
+        $total = $this->status === Purchase::STATUS_PAID && $this->total !== null
+            ? (float) $this->total
+            : ($items->isNotEmpty()
                 ? $items->reduce(
                     fn (float $carry, PurchaseItem $item): float => $carry + $this->resolveItemTotal($item),
                     0.0,
                 )
-            : (float) ($this->total ?? 0);
+                : (float) ($this->total ?? 0));
 
         return [
             'id' => $this->id,
@@ -46,7 +48,7 @@ class PurchaseResource extends JsonResource
             'created_at' => $this->created_at,
             'status' => $this->status,
             'payment_method' => $this->payment_method,
-            'expires_at' => $this->expires_at,
+            'expires_at' => $this->stockReservation?->expires_at,
             'dni' => $this->dni,
             'transfer_payer_dni' => $this->transfer_payer_dni,
             'telefono' => $this->telefono,

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

@@ -5,7 +5,6 @@ namespace App\Domains\Purchase\Services\Checkout;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Inventory;
 use App\Domains\Catalog\Models\Variant;
-use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -79,13 +78,4 @@ class CatalogSelectionResolver
 
         return $variant;
     }
-
-    public function resolvePurchaseItem(Tenant $tenant, PurchaseItem $item): CatalogItem|Variant
-    {
-        return $this->resolve(
-            $tenant,
-            (int) $item->source_catalog_item_id,
-            $item->source_variant_id === null ? null : (int) $item->source_variant_id,
-        );
-    }
 }

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

@@ -2,24 +2,27 @@
 
 namespace App\Domains\Purchase\Services\Checkout;
 
-use App\Domains\Catalog\Services\CatalogInventoryService;
+use App\Domains\Cart\Models\CartItem;
+use App\Domains\Catalog\Services\StockReservationService;
 use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
+use App\Domains\Purchase\Services\PurchaseStateGuard;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 
 class CompleteCheckoutService
 {
     public function __construct(
-        private readonly CatalogInventoryService $inventory,
+        private readonly StockReservationService $reservations,
-        private readonly CatalogSelectionResolver $selections,
         private readonly SourceCartService $sourceCart,
+        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([
@@ -31,6 +34,8 @@ class CompleteCheckoutService
                 return $this->loadPurchase($purchase);
             }
 
+            $this->purchaseState->lockCurrentCart($purchase);
+
             $purchase->update([
                 'status' => Purchase::STATUS_PENDING_PAYMENT,
                 'total' => $purchase->calculateCurrentTotalAmount(),
@@ -44,21 +49,28 @@ class CompleteCheckoutService
     {
         return DB::transaction(function () use ($purchase): Purchase {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
 
             if ($purchase->status === Purchase::STATUS_PAID) {
                 return $this->loadPurchase($purchase);
             }
 
-            if (
+            if ($purchase->status === Purchase::STATUS_IN_REVIEW) {
-                $purchase->status !== Purchase::STATUS_PENDING_PAYMENT
+                return $this->loadPurchase($purchase);
-                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
+            }
-            ) {
+
+            $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]);
+            $purchase->update([
+                'status' => Purchase::STATUS_IN_REVIEW,
+            ]);
+            $this->reservations->refreshForPurchase($purchase, null);
 
             return $this->loadPurchase($purchase);
         });
@@ -68,6 +80,7 @@ class CompleteCheckoutService
     {
         DB::transaction(function () use ($purchase): void {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
 
             if ($purchase->status === Purchase::STATUS_PAID) {
                 return;
@@ -77,30 +90,80 @@ class CompleteCheckoutService
                 Purchase::STATUS_CANCELLED,
                 Purchase::STATUS_REJECTED,
                 Purchase::STATUS_EXPIRED,
+                Purchase::STATUS_SUPERSEDED,
             ], true)) {
                 throw ValidationException::withMessages([
                     'purchase' => __('api.purchase.cannot_confirm'),
                 ]);
             }
 
-            $items = $purchase->items()
+            if (! $purchase->items()->exists()) {
-                ->where('reservation_status', PurchaseItem::RESERVATION_ACTIVE)
-                ->lockForUpdate()
-                ->get();
-
-            foreach ($items as $item) {
-                $selection = $this->selections->resolvePurchaseItem($purchase->tenant, $item);
-
-                try {
-                    $this->inventory->commit($selection, (int) $item->cantidad);
-                } catch (\InvalidArgumentException) {
                 throw ValidationException::withMessages([
                     'items' => __('api.purchase.inconsistent_reservation'),
                 ]);
             }
 
-                $item->update([
+            $cart = $this->purchaseState->lockCurrentCart($purchase);
-                    'reservation_status' => PurchaseItem::RESERVATION_COMMITTED,
+
+            if ($cart->status === 'converted' && $cart->trashed()) {
+                return;
+            }
+
+            if (! in_array($cart->status, ['active', 'checkout'], true)) {
+                throw ValidationException::withMessages([
+                    'items' => __('api.purchase.inconsistent_reservation'),
+                ]);
+            }
+
+            $cartItems = $cart->items()->orderBy('id')->lockForUpdate()->get();
+            if ($cartItems->isEmpty()) {
+                throw ValidationException::withMessages([
+                    'items' => __('api.purchase.inconsistent_reservation'),
+                ]);
+            }
+
+            $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);
+
+            foreach ($cartItems as $cartItem) {
+                $selection = $cartItem->selectedItem();
+                if ($selection === null) {
+                    throw ValidationException::withMessages([
+                        'items' => __('api.purchase.inconsistent_reservation'),
+                    ]);
+                }
+
+            }
+
+            try {
+                $this->reservations->commit($purchase);
+            } catch (\InvalidArgumentException) {
+                throw ValidationException::withMessages([
+                    'items' => __('api.purchase.inconsistent_reservation'),
                 ]);
             }
 
@@ -112,9 +175,11 @@ class CompleteCheckoutService
     {
         return in_array($purchase->status, [
             Purchase::STATUS_PAID,
+            Purchase::STATUS_IN_REVIEW,
             Purchase::STATUS_CANCELLED,
             Purchase::STATUS_REJECTED,
             Purchase::STATUS_EXPIRED,
+            Purchase::STATUS_SUPERSEDED,
         ], true);
     }
 
@@ -126,6 +191,26 @@ class CompleteCheckoutService
 
     private function loadPurchase(Purchase $purchase): Purchase
     {
-        return $purchase->load(['items.imageAttachment']);
+        return $purchase->load(['items.imageAttachment', 'stockReservation']);
+    }
+
+    private function itemKey(int $catalogItemId, ?int $variantId): string
+    {
+        return $catalogItemId.':'.($variantId ?? 'none');
+    }
+
+    /** @param Collection<int, CartItem> $cartItems */
+    private function loadCartItems(Collection $cartItems): void
+    {
+        $cartItems->load([
+            'catalogItem.inventory',
+            'catalogItem.attachments',
+            'variant.inventory',
+            'variant.attachments',
+            'variant.catalogItem',
+            'variant.definitions.itemAttribute.attribute',
+            'variant.eventDates',
+            'variant.eventDate',
+        ]);
     }
 }

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

@@ -2,174 +2,40 @@
 
 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 PurchaseResponseLoader $responses,
-        private readonly UserPurchaseLimitService $purchaseLimits,
+        private readonly PurchaseStateGuard $purchaseState,
-        private readonly CatalogSelectionResolver $selections,
-        private readonly SourceCartService $sourceCart,
     ) {}
 
     /** @param array<string, string> $customerData */
     public function updateCustomer(Purchase $purchase, array $customerData): Purchase
     {
         return DB::transaction(function () use ($purchase, $customerData): Purchase {
-            $purchase = $this->lockPurchase($purchase);
+            /** @var Purchase $purchase */
-            $this->assertEditable($purchase);
+            $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
+            $this->purchaseState->assertNotExpired($purchase);
+
+            if (! in_array($purchase->status, [
+                Purchase::STATUS_CREATED,
+                Purchase::STATUS_PENDING_PAYMENT,
+            ], true)) {
+                throw ValidationException::withMessages([
+                    'purchase' => __('api.purchase.not_editable'),
+                ]);
+            }
+
+            $this->purchaseState->lockCurrentCart($purchase);
 
             $purchase->update($customerData);
 
-            return $this->loadPurchase($purchase);
+            return $this->responses->load($purchase);
         });
     }
-
-    public function updateItemQuantity(
-        Purchase $purchase,
-        PurchaseItem $purchaseItem,
-        int $quantity,
-    ): Purchase {
-        return DB::transaction(function () use ($purchase, $purchaseItem, $quantity): Purchase {
-            $purchase = $this->lockPurchase($purchase);
-
-            if ($purchase->status !== Purchase::STATUS_CREATED || $this->hasExpired($purchase)) {
-                throw ValidationException::withMessages([
-                    'purchase' => __('api.purchase.not_editable'),
-                ]);
-            }
-
-            $purchaseItem = $this->lockPurchaseItem($purchase, $purchaseItem);
-            $difference = $quantity - (int) $purchaseItem->cantidad;
-
-            if ($difference !== 0) {
-                $this->adjustReservation($purchase, $purchaseItem, $quantity, $difference);
-
-                $purchaseItem->update([
-                    'cantidad' => $quantity,
-                    'total' => (float) $purchaseItem->precio_unitario * $quantity,
-                ]);
-                $this->sourceCart->syncItemQuantity($purchase, $purchaseItem, $quantity);
-            }
-
-            $purchase->update([
-                'total' => $purchase->calculateCurrentTotalAmount(),
-            ]);
-
-            return $this->loadPurchase($purchase);
-        });
-    }
-
-    public function prepareItemEditing(Purchase $purchase): Purchase
-    {
-        return DB::transaction(function () use ($purchase): Purchase {
-            $purchase = $this->lockPurchase($purchase);
-            $this->assertEditable($purchase);
-
-            $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);
-        });
-    }
-
-    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 $purchase->load(['items.imageAttachment']);
-    }
 }

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

@@ -5,7 +5,6 @@ namespace App\Domains\Purchase\Services\Checkout;
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Models\Variant;
-use App\Domains\Purchase\Models\PurchaseItem;
 use Illuminate\Support\Collection;
 
 class PurchaseItemSnapshotFactory
@@ -38,7 +37,6 @@ class PurchaseItemSnapshotFactory
                     'discount_total' => null,
                     'tax_total' => null,
                     'total' => $unitPrice * $quantity,
-                    'reservation_status' => PurchaseItem::RESERVATION_ACTIVE,
                 ];
             })
             ->all();

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Domains\Purchase\Services\Checkout;
+
+use App\Domains\Purchase\Models\Purchase;
+
+class PurchaseResponseLoader
+{
+    public function load(Purchase $purchase): Purchase
+    {
+        return $purchase->load(['tenant', 'items.imageAttachment', 'stockReservation']);
+    }
+}

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

@@ -2,60 +2,52 @@
 
 namespace App\Domains\Purchase\Services\Checkout;
 
-use App\Domains\Catalog\Services\CatalogInventoryService;
+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\Models\PurchaseItem;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 
 class ReleaseCheckoutService
 {
     public function __construct(
-        private readonly CatalogInventoryService $inventory,
+        private readonly StockReservationService $reservations,
-        private readonly CatalogSelectionResolver $selections,
-        private readonly SourceCartService $sourceCart,
     ) {}
 
     public function cancel(Purchase $purchase): Purchase
     {
-        return $this->release($purchase, Purchase::STATUS_CANCELLED, restoreCart: true);
+        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, restoreCart: false);
+        return $this->release($purchase, Purchase::STATUS_CANCELLED, allowInReviewCancellation: true);
     }
 
     public function expire(Purchase $purchase): Purchase
     {
-        return $this->release($purchase, Purchase::STATUS_EXPIRED, restoreCart: true);
+        return $this->release($purchase, Purchase::STATUS_EXPIRED);
     }
 
-    public function expireOverdue(): int
+    private function release(
-    {
+        Purchase $purchase,
-        $expiredCount = 0;
+        string $targetStatus,
-
+        bool $allowInReviewCancellation = false,
-        Purchase::query()
+    ): Purchase {
-            ->whereIn('status', [Purchase::STATUS_CREATED, Purchase::STATUS_PENDING_PAYMENT])
+        return DB::transaction(function () use (
-            ->whereNotNull('expires_at')
+            $purchase,
-            ->where('expires_at', '<=', now())
+            $targetStatus,
-            ->orderBy('id')
+            $allowInReviewCancellation,
-            ->eachById(function (Purchase $purchase) use (&$expiredCount): void {
+        ): Purchase {
-                $purchase = $this->expire($purchase);
-
-                if ($purchase->status === Purchase::STATUS_EXPIRED) {
-                    $expiredCount++;
-                }
-            });
-
-        return $expiredCount;
-    }
-
-    private function release(Purchase $purchase, string $targetStatus, bool $restoreCart): Purchase
-    {
-        return DB::transaction(function () use ($purchase, $targetStatus, $restoreCart): Purchase {
             $purchase = $this->lockPurchase($purchase);
 
+            if ($purchase->status === Purchase::STATUS_EXPIRED
+                && $targetStatus !== Purchase::STATUS_EXPIRED) {
+                throw new PurchaseExpiredException;
+            }
+
             if ($purchase->status === Purchase::STATUS_PAID) {
                 if ($targetStatus === Purchase::STATUS_EXPIRED) {
                     return $this->loadPurchase($purchase);
@@ -66,32 +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);
             }
 
-            $items = $purchase->items()
+            $this->releasePurchaseReservations($purchase, $targetStatus, $cart);
-                ->where('reservation_status', PurchaseItem::RESERVATION_ACTIVE)
-                ->lockForUpdate()
-                ->get();
-            $reservationReturnedToCart = $restoreCart && $this->sourceCart->restore($purchase);
-
-            foreach ($items as $item) {
-                if (! $reservationReturnedToCart) {
-                    $this->releaseInventory($purchase, $item);
-                }
-
-                $item->update([
-                    'reservation_status' => PurchaseItem::RESERVATION_RELEASED,
-                ]);
-            }
 
             $purchase->update(['status' => $targetStatus]);
 
@@ -99,17 +102,96 @@ class ReleaseCheckoutService
         });
     }
 
-    private function releaseInventory(Purchase $purchase, PurchaseItem $item): void
+    private function releasePurchaseReservations(
-    {
+        Purchase $purchase,
-        $selection = $this->selections->resolvePurchaseItem($purchase->tenant, $item);
+        string $targetStatus,
-
+        ?Cart $cart,
+    ): void {
         try {
-            $this->inventory->release($selection, (int) $item->cantidad);
+            $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;
+        }
+
+        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' => 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
@@ -118,6 +200,7 @@ class ReleaseCheckoutService
             Purchase::STATUS_CANCELLED,
             Purchase::STATUS_REJECTED,
             Purchase::STATUS_EXPIRED,
+            Purchase::STATUS_SUPERSEDED,
         ], true);
     }
 
@@ -129,6 +212,17 @@ class ReleaseCheckoutService
 
     private function loadPurchase(Purchase $purchase): Purchase
     {
-        return $purchase->load(['items.imageAttachment']);
+        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();
     }
 }

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

@@ -3,74 +3,10 @@
 namespace App\Domains\Purchase\Services\Checkout;
 
 use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
 use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
 
 class SourceCartService
 {
-    public function restore(Purchase $purchase): bool
-    {
-        $sourceCart = $this->findSourceCart($purchase);
-
-        if ($sourceCart === null) {
-            return false;
-        }
-
-        /** @var Cart|null $activeCart */
-        $activeCart = Cart::query()
-            ->where('tenant_codigo', $purchase->tenant_codigo)
-            ->where('user_id', $purchase->user_id)
-            ->where('status', 'active')
-            ->where('id', '!=', $sourceCart->getKey())
-            ->lockForUpdate()
-            ->first();
-
-        if ($activeCart !== null) {
-            $this->mergeIntoActiveCart($sourceCart, $activeCart);
-
-            $sourceCart->update([
-                'status' => 'converted',
-                'guest_token' => null,
-            ]);
-
-            if (! $sourceCart->trashed()) {
-                $sourceCart->delete();
-            }
-
-            return true;
-        }
-
-        if ($sourceCart->trashed()) {
-            $sourceCart->restore();
-        }
-
-        $sourceCart->update([
-            'status' => 'active',
-            'user_id' => $purchase->user_id,
-            'guest_token' => null,
-        ]);
-
-        return true;
-    }
-
-    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 finalize(Purchase $purchase): void
     {
         $sourceCart = $this->findSourceCart($purchase);
@@ -98,28 +34,4 @@ class SourceCartService
             ->lockForUpdate()
             ->first();
     }
-
-    private function mergeIntoActiveCart(Cart $sourceCart, Cart $activeCart): void
-    {
-        $sourceItems = $sourceCart->items()->lockForUpdate()->get();
-
-        foreach ($sourceItems as $sourceItem) {
-            /** @var CartItem|null $activeItem */
-            $activeItem = $activeCart->items()
-                ->where('catalog_item_id', $sourceItem->catalog_item_id)
-                ->where('variant_id', $sourceItem->variant_id)
-                ->lockForUpdate()
-                ->first();
-
-            if ($activeItem === null) {
-                $activeCart->items()->create([
-                    'catalog_item_id' => $sourceItem->catalog_item_id,
-                    'variant_id' => $sourceItem->variant_id,
-                    'cantidad' => $sourceItem->cantidad,
-                ]);
-            } else {
-                $activeItem->increment('cantidad', (int) $sourceItem->cantidad);
-            }
-        }
-    }
 }

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

@@ -4,13 +4,16 @@ 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;
+use App\Domains\Catalog\Services\StockReservationService;
 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;
@@ -20,10 +23,12 @@ class StartCheckoutService
 {
     public function __construct(
         private readonly CatalogInventoryService $inventory,
+        private readonly StockReservationService $reservations,
         private readonly UserPurchaseLimitService $purchaseLimits,
         private readonly CatalogSelectionResolver $selections,
-        private readonly PurchaseItemSnapshotFactory $snapshots,
         private readonly InsufficientStockMessageBuilder $stockMessages,
+        private readonly PurchaseResponseLoader $responses,
+        private readonly PurchaseItemSnapshotFactory $snapshots,
     ) {}
 
     /** @param array<string, mixed> $purchaseData */
@@ -118,10 +123,16 @@ class StartCheckoutService
             ->each(function (Collection $catalogLines) use ($userId): void {
                 /** @var CatalogItem $catalogItem */
                 $catalogItem = $catalogLines->first()['catalog_item'];
+                $availableQuantities = $catalogLines
+                    ->map(fn (array $line): ?int => $this->inventory->availableQuantity($line['selection']));
+                $maximumAddableCeiling = $availableQuantities->contains(null)
+                    ? null
+                    : (int) $availableQuantities->sum();
                 $this->purchaseLimits->assertCanPurchase(
                     $catalogItem,
                     $userId,
                     (int) $catalogLines->sum('quantity'),
+                    maximumAddableCeiling: $maximumAddableCeiling,
                     field: 'direct_items',
                 );
             });
@@ -144,16 +155,45 @@ class StartCheckoutService
             throw new InsufficientStockException($unavailableItems);
         }
 
-        foreach ($resolvedLines as $line) {
+        $cart = Cart::query()->create([
-            try {
+            'tenant_codigo' => $tenant->codigo,
-                $this->inventory->reserve($line['selection'], $line['quantity']);
+            'user_id' => $userId,
-            } catch (\InvalidArgumentException) {
+            'guest_token' => null,
-                $availableQuantity = $this->inventory->availableQuantity($line['selection']) ?? 0;
+            'status' => 'checkout',
-
+            'origin' => Cart::ORIGIN_DIRECT_CHECKOUT,
-                throw new InsufficientStockException([
-                    $this->unavailableItem($line, $availableQuantity),
         ]);
+
+        $cartItems = collect();
+        foreach ($resolvedLines as $line) {
+            $cartItem = $cart->items()->create([
+                'catalog_item_id' => $line['catalog_item_id'],
+                'variant_id' => $line['variant_id'],
+                'cantidad' => $line['quantity'],
+            ]);
+
+            $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(
@@ -163,19 +203,14 @@ class StartCheckoutService
             (float) $resolvedLines->sum(
                 fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
             ),
-            null,
+            $cart->getKey(),
         );
+        $cart->update(['current_purchase_id' => $purchase->getKey()]);
+        $this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
 
-        $directCartItems = $resolvedLines->map(fn (array $line): CartItem => $this->makeDirectCartItem(
+        $cartItems = $cart->items()->orderBy('id')->lockForUpdate()->get();
-            $line['selection'],
+        $this->loadCartItems($cartItems);
-            $line['catalog_item_id'],
+        $purchase->items()->createMany($this->snapshots->fromCartItems($cartItems));
-            $line['variant_id'],
-            $line['quantity'],
-        ));
-
-        $purchase->items()->createMany(
-            $this->snapshots->fromCartItems($directCartItems),
-        );
 
         return $this->loadPurchase($purchase);
     }
@@ -225,8 +260,9 @@ class StartCheckoutService
 
         $this->loadCartItems($cartItems);
         $this->verifyTenantItems($tenant, $cartItems);
-        $this->assertCartPurchaseLimits($tenant, $userId, $cartItems);
+        $this->assertCartPurchaseLimits($tenant, $userId, $cartItems, $cart->getKey());
         $cart->setRelation('items', $cartItems);
+        $this->reservations->syncCart($cart);
 
         $purchase = $this->createPurchase(
             $tenant,
@@ -235,36 +271,76 @@ class StartCheckoutService
             $cart->getTotalAmount(),
             $cart->getKey(),
         );
+        $cart->update(['current_purchase_id' => $purchase->getKey()]);
+        $this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
         $purchase->items()->createMany($this->snapshots->fromCartItems($cartItems));
 
-        // 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,
-        ]);
-
         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) {
+        $this->assertCartCanCheckout($cart, $tenant, $userId);
-            throw new NotFoundHttpException('Cart not found for tenant.');
+
+        if ($cart->current_purchase_id !== $candidatePurchaseId) {
+            if ($cart->current_purchase_id !== null) {
+                throw ValidationException::withMessages([
+                    'cart_id' => __('api.purchase.checkout_in_progress'),
+                ]);
             }
 
-        if ($cart->status !== 'active') {
+            $currentPurchase = null;
+        }
+
+        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
     {
@@ -288,6 +364,7 @@ class StartCheckoutService
         Tenant $tenant,
         int $userId,
         Collection $cartItems,
+        int $cartId,
     ): void {
         $quantities = $cartItems
             ->groupBy('catalog_item_id')
@@ -309,6 +386,8 @@ class StartCheckoutService
                 $catalogItem,
                 $userId,
                 $quantity,
+                excludedCartId: $cartId,
+                heldQuantity: $quantity,
                 field: 'cart_id',
             );
         }
@@ -329,40 +408,15 @@ 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 makeDirectCartItem(
+    private function checkoutExpiration(): Carbon
-        CatalogItem|Variant $selection,
+    {
-        int $catalogItemId,
+        return now()->addMinutes(
-        ?int $variantId,
+            max(1, (int) config('purchase.checkout_expiration_minutes', 30)),
-        int $quantity,
+        );
-    ): CartItem {
-        $catalogItem = $selection instanceof Variant ? $selection->catalogItem : $selection;
-        $catalogItem->loadMissing(['inventory', 'attachments']);
-
-        if ($selection instanceof Variant) {
-            $selection->loadMissing([
-                'inventory',
-                'attachments',
-                'catalogItem',
-                'definitions.itemAttribute.attribute',
-            ]);
-        }
-
-        $item = new CartItem([
-            'catalog_item_id' => $catalogItemId,
-            'variant_id' => $variantId,
-            'cantidad' => $quantity,
-        ]);
-        $item->setRelation('catalogItem', $catalogItem);
-        $item->setRelation('variant', $selection instanceof Variant ? $selection : null);
-
-        return $item;
     }
 
     /** @param Collection<int, CartItem> $cartItems */
@@ -382,6 +436,6 @@ class StartCheckoutService
 
     private function loadPurchase(Purchase $purchase): Purchase
     {
-        return $purchase->load(['items.imageAttachment']);
+        return $this->responses->load($purchase);
     }
 }

app/Domains/Purchase/Services/CheckoutService.php

@@ -2,13 +2,14 @@
 
 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;
 use App\Domains\Purchase\Services\Checkout\StartCheckoutService;
 use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -23,6 +24,7 @@ class CheckoutService
         private readonly EditCheckoutService $editor,
         private readonly CompleteCheckoutService $completer,
         private readonly ReleaseCheckoutService $releaser,
+        private readonly StockReservationService $reservations,
     ) {}
 
     /** @param array<string, mixed> $purchaseData */
@@ -47,19 +49,6 @@ class CheckoutService
         return $this->editor->updateCustomer($purchase, $customerData);
     }
 
-    public function updateItemQuantity(
-        Purchase $purchase,
-        PurchaseItem $purchaseItem,
-        int $quantity,
-    ): Purchase {
-        return $this->editor->updateItemQuantity($purchase, $purchaseItem, $quantity);
-    }
-
-    public function prepareItemEditing(Purchase $purchase): Purchase
-    {
-        return $this->editor->prepareItemEditing($purchase);
-    }
-
     public function confirmPurchase(Purchase $purchase): void
     {
         $this->completer->confirm($purchase);
@@ -80,9 +69,9 @@ 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
@@ -90,8 +79,8 @@ class CheckoutService
         return $this->releaser->expire($purchase);
     }
 
-    public function expireOverduePurchases(): int
+    public function refreshReservationExpiration(Purchase $purchase, ?Carbon $expiresAt): void
     {
-        return $this->releaser->expireOverdue();
+        $this->reservations->refreshForPurchase($purchase, $expiresAt);
     }
 }

app/Domains/Purchase/Services/PurchaseStateGuard.php

@@ -0,0 +1,58 @@
+<?php
+
+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
+    {
+        if ($purchase->status === Purchase::STATUS_EXPIRED) {
+            throw new PurchaseExpiredException;
+        }
+
+        if (! in_array($purchase->status, [
+            Purchase::STATUS_CREATED,
+            Purchase::STATUS_PENDING_PAYMENT,
+        ], true)) {
+            return;
+        }
+
+        /** @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;
+    }
+}

app/Domains/Purchase/Services/TenantTransactionResetService.php

@@ -0,0 +1,159 @@
+<?php
+
+namespace App\Domains\Purchase\Services;
+
+use App\Domains\Purchase\Models\Purchase;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use InvalidArgumentException;
+
+class TenantTransactionResetService
+{
+    /** @return array<string, int> */
+    public function preview(string $tenantCode): array
+    {
+        $this->ensureTenantExists($tenantCode);
+        $scope = $this->scope($tenantCode);
+
+        return [
+            'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
+            'purchases' => $scope['purchase_ids']->count(),
+            'purchase_items' => DB::table('compra_items')->whereIn('compra_id', $scope['purchase_ids'])->count(),
+            'telepagos_payments' => DB::table('telepagos_payments')->whereIn('compra_id', $scope['purchase_ids'])->count(),
+            'telepagos_qr' => DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count(),
+            'carts' => $scope['cart_ids']->count(),
+            'cart_items' => $scope['cart_item_ids']->count(),
+            'tickets' => DB::table('tickets')->where('tenant_code', $tenantCode)->count(),
+            'stock_reservations' => $this->reservationQuery($scope)->count(),
+            'purchase_changes' => DB::table('value_changes')
+                ->where('tenant_code', $tenantCode)
+                ->where('trackable_type', Purchase::class)
+                ->count(),
+            'inventories' => $scope['inventory_ids']->count(),
+        ];
+    }
+
+    /** @return array<string, int> */
+    public function reset(string $tenantCode): array
+    {
+        $this->ensureTenantExists($tenantCode);
+
+        return DB::transaction(function () use ($tenantCode): array {
+            $scope = $this->scope($tenantCode);
+            $purchaseItems = DB::table('compra_items')->whereIn('compra_id', $scope['purchase_ids'])->count();
+            $cartItems = $scope['cart_item_ids']->count();
+            $telepagosPayments = DB::table('telepagos_payments')->whereIn('compra_id', $scope['purchase_ids'])->count();
+            $telepagosQr = DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count();
+            $summary = [
+                'stock_reservations_deleted' => $this->reservationQuery($scope)->delete(),
+                'tickets_deleted' => DB::table('tickets')->where('tenant_code', $tenantCode)->delete(),
+                'purchase_changes_deleted' => DB::table('value_changes')
+                    ->where('tenant_code', $tenantCode)
+                    ->where('trackable_type', Purchase::class)
+                    ->delete(),
+                'purchases_deleted' => DB::table('compras')->whereIn('id', $scope['purchase_ids'])->delete(),
+                'purchase_items_deleted' => $purchaseItems,
+                'telepagos_payments_deleted' => $telepagosPayments,
+                'telepagos_qr_deleted' => $telepagosQr,
+                'carts_deleted' => DB::table('carritos')->whereIn('id', $scope['cart_ids'])->delete(),
+                'cart_items_deleted' => $cartItems,
+                'inventories_reset' => $scope['inventory_ids']->count(),
+                'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
+            ];
+
+            DB::table('inventories')
+                ->whereIn('id', $scope['inventory_ids'])
+                ->update([
+                    'real_stock' => DB::raw('real_stock + sold_units'),
+                    'reserved_stock' => 0,
+                    'sold_units' => 0,
+                ]);
+
+            return $summary;
+        });
+    }
+
+    private function ensureTenantExists(string $tenantCode): void
+    {
+        if (! DB::table('tenants')->where('codigo', $tenantCode)->exists()) {
+            throw new InvalidArgumentException("El tenant {$tenantCode} no existe.");
+        }
+    }
+
+    /**
+     * @return array{
+     *     purchase_ids: Collection<int, int>,
+     *     cart_ids: Collection<int, int>,
+     *     cart_item_ids: Collection<int, int>,
+     *     inventory_ids: Collection<int, int>
+     * }
+     */
+    private function scope(string $tenantCode): array
+    {
+        $catalogItemIds = DB::table('catalog_items')
+            ->where('tenant_code', $tenantCode)
+            ->pluck('id');
+        $purchaseIds = DB::table('compras')
+            ->where('tenant_codigo', $tenantCode)
+            ->pluck('id');
+        $cartIds = DB::table('carritos')
+            ->where('tenant_codigo', $tenantCode)
+            ->pluck('id');
+        $cartItemIds = DB::table('carrito_items')
+            ->whereIn('cart_id', $cartIds)
+            ->pluck('id');
+        $inventoryIds = DB::table('variantes')
+            ->whereIn('catalog_item_id', $catalogItemIds)
+            ->whereNotNull('inventory_id')
+            ->pluck('inventory_id')
+            ->merge(
+                DB::table('catalog_items')
+                    ->whereIn('id', $catalogItemIds)
+                    ->whereNotNull('inventory_id')
+                    ->pluck('inventory_id'),
+            )
+            ->map(fn ($id): int => (int) $id)
+            ->unique()
+            ->values();
+
+        return [
+            'purchase_ids' => $purchaseIds->map(fn ($id): int => (int) $id),
+            'cart_ids' => $cartIds->map(fn ($id): int => (int) $id),
+            'cart_item_ids' => $cartItemIds->map(fn ($id): int => (int) $id),
+            'inventory_ids' => $inventoryIds,
+        ];
+    }
+
+    /**
+     * @param array{
+     *     purchase_ids: Collection<int, int>,
+     *     cart_ids: Collection<int, int>,
+     *     cart_item_ids: Collection<int, int>,
+     *     inventory_ids: Collection<int, int>
+     * } $scope
+     */
+    private function reservationQuery(array $scope): Builder
+    {
+        $reservationIds = DB::table('carritos')
+            ->whereIn('id', $scope['cart_ids'])
+            ->whereNotNull('current_stock_reservation_id')
+            ->pluck('current_stock_reservation_id')
+            ->merge(
+                DB::table('compras')
+                    ->whereIn('id', $scope['purchase_ids'])
+                    ->whereNotNull('stock_reservation_id')
+                    ->pluck('stock_reservation_id'),
+            )
+            ->merge(
+                DB::table('stock_reservation_lines')
+                    ->whereIn('inventory_id', $scope['inventory_ids'])
+                    ->pluck('stock_reservation_id'),
+            )
+            ->unique()
+            ->values();
+
+        return DB::table('stock_reservations')
+            ->whereIn('id', $reservationIds);
+    }
+}

app/Domains/Purchase/Services/UserPurchaseLimitService.php

@@ -2,11 +2,13 @@
 
 namespace App\Domains\Purchase\Services;
 
+use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Purchase\Exceptions\PurchaseLimitExceededException;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
 
 class UserPurchaseLimitService
 {
@@ -15,6 +17,9 @@ class UserPurchaseLimitService
         int $userId,
         int $requestedQuantity,
         ?int $excludedPurchaseId = null,
+        ?int $excludedCartId = null,
+        int $heldQuantity = 0,
+        ?int $maximumAddableCeiling = null,
         string $field = 'quantity',
     ): void {
         DB::transaction(function () use (
@@ -22,6 +27,9 @@ class UserPurchaseLimitService
             $userId,
             $requestedQuantity,
             $excludedPurchaseId,
+            $excludedCartId,
+            $heldQuantity,
+            $maximumAddableCeiling,
             $field,
         ): void {
             /** @var CatalogItem $catalogItem */
@@ -43,6 +51,7 @@ class UserPurchaseLimitService
                         ->whereIn('status', [
                             Purchase::STATUS_CREATED,
                             Purchase::STATUS_PENDING_PAYMENT,
+                            Purchase::STATUS_IN_REVIEW,
                             Purchase::STATUS_PAID,
                         ])
                         ->when(
@@ -52,11 +61,122 @@ class UserPurchaseLimitService
                 })
                 ->sum('cantidad');
 
-            if ($purchasedQuantity + $requestedQuantity > $limit) {
+            $checkoutQuantity = (int) CartItem::query()
-                throw ValidationException::withMessages([
+                ->where('catalog_item_id', $catalogItem->getKey())
-                    $field => __('api.purchase_limit.exceeded', ['max' => $limit]),
+                ->whereHas('cart.purchases', function ($query) use ($userId, $excludedPurchaseId): void {
-                ]);
+                    $query
+                        ->where('user_id', $userId)
+                        ->whereIn('status', [
+                            Purchase::STATUS_CREATED,
+                            Purchase::STATUS_PENDING_PAYMENT,
+                            Purchase::STATUS_IN_REVIEW,
+                        ])
+                        ->whereDoesntHave('items')
+                        ->when(
+                            $excludedPurchaseId !== null,
+                            fn ($query) => $query->whereKeyNot($excludedPurchaseId),
+                        );
+                })
+                ->sum('cantidad');
+
+            $reservedCartQuantity = (int) CartItem::query()
+                ->where('catalog_item_id', $catalogItem->getKey())
+                ->whereHas('cart', fn ($query) => $query
+                    ->where('user_id', $userId)
+                    ->where('status', 'active')
+                    ->when(
+                        $excludedCartId !== null,
+                        fn ($query) => $query->whereKeyNot($excludedCartId),
+                    ))
+                ->whereHas('cart.currentStockReservation', fn ($query) => $query
+                    ->where('status', 'active')
+                    ->whereDoesntHave('purchase'))
+                ->sum('cantidad');
+
+            if ($purchasedQuantity + $checkoutQuantity + $reservedCartQuantity + $requestedQuantity > $limit) {
+                $remainingQuota = max(
+                    0,
+                    $limit - $purchasedQuantity - $checkoutQuantity - $reservedCartQuantity,
+                );
+
+                $maximumAddableQuantity = max(0, $remainingQuota - $heldQuantity);
+
+                throw new PurchaseLimitExceededException(
+                    $catalogItem,
+                    $maximumAddableCeiling === null
+                        ? $maximumAddableQuantity
+                        : min($maximumAddableQuantity, $maximumAddableCeiling),
+                    $field,
+                );
             }
         });
     }
+
+    /**
+     * @param  Collection<int, CatalogItem>  $catalogItems
+     * @return Collection<int, int|null>
+     */
+    public function remainingByCatalogItem(Collection $catalogItems, ?int $userId): Collection
+    {
+        $limits = $catalogItems
+            ->unique('id')
+            ->mapWithKeys(fn (CatalogItem $item): array => [$item->getKey() => $item->max_units_per_user]);
+
+        if ($userId === null || $limits->filter(fn ($limit) => $limit !== null)->isEmpty()) {
+            return $limits->map(fn (): ?int => null);
+        }
+
+        $ids = $limits->keys();
+        $purchased = PurchaseItem::query()
+            ->selectRaw('source_catalog_item_id, SUM(cantidad) AS quantity')
+            ->whereIn('source_catalog_item_id', $ids)
+            ->whereHas('purchase', fn ($query) => $query
+                ->where('user_id', $userId)
+                ->whereIn('status', [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                    Purchase::STATUS_IN_REVIEW,
+                    Purchase::STATUS_PAID,
+                ]))
+            ->groupBy('source_catalog_item_id')
+            ->pluck('quantity', 'source_catalog_item_id');
+
+        $checkout = CartItem::query()
+            ->selectRaw('catalog_item_id, SUM(cantidad) AS quantity')
+            ->whereIn('catalog_item_id', $ids)
+            ->whereHas('cart.purchases', fn ($query) => $query
+                ->where('user_id', $userId)
+                ->whereIn('status', [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                    Purchase::STATUS_IN_REVIEW,
+                ])
+                ->whereDoesntHave('items'))
+            ->groupBy('catalog_item_id')
+            ->pluck('quantity', 'catalog_item_id');
+
+        $reserved = CartItem::query()
+            ->selectRaw('catalog_item_id, SUM(cantidad) AS quantity')
+            ->whereIn('catalog_item_id', $ids)
+            ->whereHas('cart', fn ($query) => $query
+                ->where('user_id', $userId)
+                ->where('status', 'active'))
+            ->whereHas('cart.currentStockReservation', fn ($query) => $query
+                ->where('status', 'active')
+                ->whereDoesntHave('purchase'))
+            ->groupBy('catalog_item_id')
+            ->pluck('quantity', 'catalog_item_id');
+
+        return $limits->map(function (?int $limit, int $catalogItemId) use ($purchased, $checkout, $reserved): ?int {
+            if ($limit === null) {
+                return null;
+            }
+
+            $used = (int) ($purchased[$catalogItemId] ?? 0)
+                + (int) ($checkout[$catalogItemId] ?? 0)
+                + (int) ($reserved[$catalogItemId] ?? 0);
+
+            return max(0, $limit - $used);
+        });
+    }
 }

app/Domains/Purchase/documentacion/README.md

@@ -2,12 +2,12 @@
 
 ## Propósito
 
-Implementa el ciclo de compra y checkout: crea una compra desde el carrito, toma una instantánea de sus ítems, reserva inventario, permite ediciones, inicia el pago y confirma, cancela o vence la operación.
+Implementa el ciclo de compra y checkout: crea la cabecera de compra desde un carrito, mantiene sus líneas vivas contra catálogo durante el checkout, inicia el pago y materializa el snapshot definitivo al confirmar, o cancela y vence la operación.
 
 ## 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 del producto o variante, cantidad, precio y total al comprar.
+- `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,13 +15,17 @@ Implementa el ciclo de compra y checkout: crea una compra desde el carrito, toma
 
 `CheckoutService` es la fachada estable. Delega en:
 
-- `StartCheckoutService`: inicia la compra desde el carrito.
+- `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 cliente o cantidades antes del cierre.
+- `EditCheckoutService`: modifica los datos del comprador antes del cierre.
-- `CompleteCheckoutService`: completa, envía a revisión o confirma el pago.
+- `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, restaura o finaliza el carrito fuente.
+- `SourceCartService`: sincroniza o finaliza el carrito de checkout asociado a la compra.
 - `CatalogSelectionResolver` y `PurchaseItemSnapshotFactory`: resuelven selecciones y generan snapshots.
 
+Al iniciar checkout o elegir un medio de pago se refresca directamente `StockReservation.expires_at`, que es la única fuente de verdad y se expone como `expires_at` en la respuesta pública de la compra. El refresco sólo se permite mientras la reserva siga vigente; una fecha vencida bloquea todas las mutaciones aun antes de que corra el scheduler. Al materializar la expiración, la compra pagable, su carrito y la reserva pasan a `expired` dentro de la misma transacción. Al cancelar o reemplazar una compra recuperable, ésta se desvincula y el carrito conserva la misma reserva activa. Al informar una transferencia, la compra pasa de `pending_payment` a `in_review` y ese vencimiento se limpia. Si el comprador abandona el checkout durante la revisión, la compra y sus reservas permanecen intactas y se crea un carrito activo nuevo para que pueda seguir comprando. Adminapp puede confirmar o anular explícitamente la compra en revisión.
+
+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.
 
 ## Endpoints

app/Domains/Purchase/routes/api.php

@@ -7,8 +7,6 @@ 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, 'updateItemQuantity']);
     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']);

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

@@ -3,22 +3,27 @@
 namespace App\Domains\Sale\Controllers\AdminApp;
 
 use App\Domains\Sale\Requests\AdminAppSaleIndexRequest;
+use App\Domains\Sale\Requests\AdminAppSaleModificationPdfRequest;
+use App\Domains\Sale\Requests\AdminAppSalePdfRequest;
 use App\Domains\Sale\Resources\AdminApp\SaleDetailResource;
 use App\Domains\Sale\Resources\AdminApp\SaleModificationResource;
 use App\Domains\Sale\Resources\AdminApp\SaleResource;
 use App\Domains\Sale\Resources\AdminApp\SaleTicketResource;
+use App\Domains\Sale\Services\AdminAppSaleExcelService;
 use App\Domains\Sale\Services\AdminAppSalePdfService;
 use App\Domains\Sale\Services\AdminAppSaleService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Http\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class SaleController extends Controller
 {
     public function __construct(
         protected AdminAppSaleService $saleService,
         protected AdminAppSalePdfService $salePdfService,
+        protected AdminAppSaleExcelService $saleExcelService,
     ) {}
 
     public function index(AdminAppSaleIndexRequest $request): AnonymousResourceCollection
@@ -71,23 +76,48 @@ class SaleController extends Controller
         );
     }
 
-    public function downloadPdf(AdminAppSaleIndexRequest $request): Response
+    public function downloadPdf(AdminAppSalePdfRequest $request): Response
     {
         $tenant = $request->user()->tenant()->firstOrFail();
 
         return $this->salePdfService->downloadSales(
             $tenant,
             $this->saleService->salesForExport($tenant, $request->validated()),
+            $request->validated('timezone'),
         );
     }
 
-    public function downloadModificationsPdf(Request $request): Response
+    public function downloadModificationsPdf(AdminAppSaleModificationPdfRequest $request): Response
     {
         $tenant = $request->user()->tenant()->firstOrFail();
 
         return $this->salePdfService->downloadModifications(
             $tenant,
             $this->saleService->modificationsForExport($tenant),
+            $request->validated('timezone'),
+        );
+    }
+
+    public function downloadExcel(AdminAppSalePdfRequest $request): StreamedResponse
+    {
+        $tenant = $request->user()->tenant()->firstOrFail();
+
+        return $this->saleExcelService->downloadSales(
+            $tenant,
+            $this->saleService->salesForExport($tenant, $request->validated()),
+            $request->validated('timezone'),
+        );
+    }
+
+    public function downloadModificationsExcel(
+        AdminAppSaleModificationPdfRequest $request,
+    ): StreamedResponse {
+        $tenant = $request->user()->tenant()->firstOrFail();
+
+        return $this->saleExcelService->downloadModifications(
+            $tenant,
+            $this->saleService->modificationsForExport($tenant),
+            $request->validated('timezone'),
         );
     }
 }

app/Domains/Sale/Requests/AdminAppSaleModificationPdfRequest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Sale\Requests;
+
+use App\Domains\Shared\Rules\ValidTimezone;
+use Illuminate\Foundation\Http\FormRequest;
+
+class AdminAppSaleModificationPdfRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /** @return array<string, list<string>> */
+    public function rules(): array
+    {
+        return [
+            'timezone' => ['required', 'string', new ValidTimezone],
+        ];
+    }
+}

app/Domains/Sale/Requests/AdminAppSalePdfRequest.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Domains\Sale\Requests;
+
+use App\Domains\Shared\Rules\ValidTimezone;
+
+class AdminAppSalePdfRequest extends AdminAppSaleIndexRequest
+{
+    /** @return array<string, list<string>> */
+    public function rules(): array
+    {
+        return [
+            ...parent::rules(),
+            'timezone' => ['required', 'string', new ValidTimezone],
+        ];
+    }
+}

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

@@ -23,6 +23,7 @@ class SaleModificationResource extends JsonResource
             'attribute' => $this->attribute,
             'old_value' => $this->old_value,
             'new_value' => $this->new_value,
+            'changed_at' => $this->changed_at->utc()->toIso8601String(),
             'date' => $this->changed_at->format('Y-m-d'),
             'time' => $this->changed_at->format('H:i:s'),
             'actor_type' => $this->actor_type->value,

app/Domains/Sale/Services/AdminAppSaleExcelService.php

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

app/Domains/Sale/Services/AdminAppSalePdfService.php

@@ -13,12 +13,14 @@ use Illuminate\Support\Collection;
 class AdminAppSalePdfService
 {
     /** @param Collection<int, Purchase> $sales */
-    public function downloadSales(Tenant $tenant, Collection $sales): Response
+    public function downloadSales(Tenant $tenant, Collection $sales, string $timeZone): Response
     {
+        $generatedAt = now();
         $pdf = Pdf::loadView('pdf.adminapp.sales', [
             'tenant' => $tenant,
             'sales' => $sales,
-            'generatedAt' => now(),
+            'generatedAt' => $generatedAt,
+            'timeZone' => $timeZone,
             'confirmedSalesTotal' => number_format(
                 (float) $sales->where('status', Purchase::STATUS_PAID)->sum('total'),
                 2,
@@ -30,23 +32,30 @@ class AdminAppSalePdfService
         $this->addPageNumbers($pdf);
 
         return $pdf->download(
-            'ventas_'.$tenant->codigo.'_'.now()->format('Ymd_His').'.pdf'
+            'ventas_'.$tenant->codigo.'_'
+            .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.pdf'
         );
     }
 
     /** @param Collection<int, ValueChange> $modifications */
-    public function downloadModifications(Tenant $tenant, Collection $modifications): Response
+    public function downloadModifications(
-    {
+        Tenant $tenant,
+        Collection $modifications,
+        string $timeZone,
+    ): Response {
+        $generatedAt = now();
         $pdf = Pdf::loadView('pdf.adminapp.sale-modifications', [
             'tenant' => $tenant,
             'modifications' => $modifications,
-            'generatedAt' => now(),
+            'generatedAt' => $generatedAt,
+            'timeZone' => $timeZone,
         ])->setPaper('a4', 'landscape');
 
         $this->addPageNumbers($pdf);
 
         return $pdf->download(
-            'historial_modificaciones_'.$tenant->codigo.'_'.now()->format('Ymd_His').'.pdf'
+            'historial_modificaciones_'.$tenant->codigo.'_'
+            .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.pdf'
         );
     }
 

app/Domains/Sale/Services/AdminAppSaleService.php

@@ -79,7 +79,7 @@ class AdminAppSaleService
         $sale = $this->findForTenant($tenant, $saleId);
 
         return $this->saleForResponse(
-            $this->checkoutService->cancelPurchaseWithoutRestoringCart($sale)
+            $this->checkoutService->cancelPurchaseFromAdmin($sale)
         );
     }
 
@@ -126,6 +126,7 @@ class AdminAppSaleService
 
         return Purchase::query()
             ->where('tenant_codigo', $tenant->codigo)
+            ->where('status', '!=', Purchase::STATUS_SUPERSEDED)
             ->when($filters['q'] ?? null, function (Builder $query, string $search): void {
                 $term = trim($search);
 
@@ -143,9 +144,19 @@ class AdminAppSaleService
             )
             ->when(
                 $filters['status'] ?? null,
-                fn (Builder $query, string $status): Builder => $query->where('status', $status)
+                fn (Builder $query, string $status): Builder => $status === Purchase::STATUS_PENDING_PAYMENT
+                    ? $query->whereIn('status', [
+                        Purchase::STATUS_PENDING_PAYMENT,
+                        Purchase::STATUS_IN_REVIEW,
+                    ])
+                    : $query->where('status', $status)
+            )
+            ->select('compras.*')
+            ->selectRaw(
+                '(SELECT COALESCE(SUM(purchase_items.cantidad), 0) '
+                .'FROM compra_items AS purchase_items '
+                .'WHERE purchase_items.compra_id = compras.id) AS quantity',
             )
-            ->withSum('items as quantity', 'cantidad')
             ->withCount('tickets')
             ->orderBy($sortColumns[$sortBy], $sortDirection)
             ->when($sortBy !== 'id', fn (Builder $query): Builder => $query->orderByDesc('id'));
@@ -171,8 +182,23 @@ class AdminAppSaleService
 
     protected function saleForResponse(Purchase $sale): Purchase
     {
-        return $sale->refresh()
+        /** @var Purchase */
-            ->loadSum('items as quantity', 'cantidad')
+        return Purchase::query()
-            ->loadCount('tickets');
+            ->select('compras.*')
+            ->selectRaw($this->quantityExpression())
+            ->withCount('tickets')
+            ->findOrFail($sale->getKey());
+    }
+
+    protected function quantityExpression(): string
+    {
+        return <<<'SQL'
+            COALESCE(
+                (SELECT SUM(compra_items.cantidad)
+                 FROM compra_items
+                 WHERE compra_items.compra_id = compras.id),
+                0
+            ) AS quantity
+            SQL;
     }
 }

app/Domains/Sale/documentacion/README.md

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