feat(checkout): return event purchase summary

feat(event): include catalog items in event resource and update event service
test(seeder): add FiestaTradicionArrufoSeeder for event and catalog item setup
config: set event timezone for local event dates

.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
+PURCHASE_TRANSFER_CANDIDATE_AMOUNT_TOLERANCE_PERCENTAGE=5
 STOCK_RESERVATION_EXPIRATION_MINUTES=30
 FRONTEND_URLS=http://localhost:4200
 
@@ -44,6 +45,7 @@ COMMANDS_LOG_LEVEL=info
 COMMANDS_LOG_DAYS=30
 EMAILS_LOG_LEVEL=info
 EMAILS_LOG_DAYS=30
+EMAIL_DELIVERY_LEASE_SECONDS=300
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

AGENTS.md

@@ -1,19 +1,29 @@
 # Project Conventions
 
+## Test database safety
+
+- Tests must use SQLite `:memory:` through `tests/bootstrap.php` and `Tests\TestCase`.
+- Never run tests, `migrate:fresh`, `migrate:refresh`, or `db:wipe` against a persistent database, including the developer's `shopit` database.
+- Never bypass the connection safety guard to resolve test failures. Use `php tests/verify-database-safety.php` to verify isolation without queries or migrations.
+
 ## Architecture
 
-This project uses a domain-oriented structure under `app/Domains`.
+This project uses a domain-oriented structure grouped by business area under
+`app/Domains`. Cross-cutting modules live under `app/Shared`.
 
-Each domain must live in:
+Business domains must live in:
 
 ```text
-app/Domains/<DomainName>/
+app/Domains/<Area>/<DomainName>/
 ```
 
+The current areas are `Core`, `Commerce`, and `Ticketing`. Cross-cutting
+modules live in `app/Shared/<ModuleName>/`.
+
 Supported folders inside each domain:
 
 ```text
-app/Domains/<DomainName>/
+app/Domains/<Area>/<DomainName>/
 ├── Models/
 ├── Controllers/
 ├── Requests/
@@ -28,22 +38,28 @@ app/Domains/<DomainName>/
 
 - Root API routes live in `routes/api.php`.
 - `routes/api.php` should act as an aggregator only.
-- Each domain defines its own routes in `app/Domains/<DomainName>/routes/api.php`.
+- Each business domain defines its own routes in
+  `app/Domains/<Area>/<DomainName>/routes/api.php`.
+- Shared modules that expose routes define them in
+  `app/Shared/<ModuleName>/routes/api.php`.
 
 ## Namespaces
 
 Use this namespace pattern:
 
 ```php
-App\Domains\<DomainName>\Models
-App\Domains\<DomainName>\Controllers
-App\Domains\<DomainName>\Requests
-App\Domains\<DomainName>\Resources
-App\Domains\<DomainName>\Services
-App\Domains\<DomainName>\Policies
-App\Domains\<DomainName>\Exceptions
+App\Domains\<Area>\<DomainName>\Models
+App\Domains\<Area>\<DomainName>\Controllers
+App\Domains\<Area>\<DomainName>\Requests
+App\Domains\<Area>\<DomainName>\Resources
+App\Domains\<Area>\<DomainName>\Services
+App\Domains\<Area>\<DomainName>\Policies
+App\Domains\<Area>\<DomainName>\Exceptions
 ```
 
+For cross-cutting modules, use `App\Shared\<ModuleName>\...`. Reusable enums
+and rules live directly under `App\Shared`.
+
 ## Responsibilities
 
 - `Models/`: Eloquent models and model relationships.
@@ -74,13 +90,19 @@ App\Domains\<DomainName>\Exceptions
 - Namespace, folder, and class names must stay aligned.
 - Route files should be named `api.php`.
 
-## Current Domains
+## Current Areas and Modules
 
-- `Tenant`
-- `Product`
+- `Core`: `Administrator`, `Auth`, `Authorization`, `Bootstrap`, `Client`,
+  `Menu`, `Staff`, `Tenant`.
+- `Commerce`: `Cart`, `Catalog`, `Purchase`, `Sale`.
+- `Ticketing`: `Desfile`, `Event`, `FiestaFutbolInfantil`, `Ticket`.
+- `Shared`: `Attachable`, `Forms`, `Integration`, `Logging`, `MailTest`,
+  `Notification`, `StorageTest`, plus shared enums and rules.
 
 ## Notes For Future Changes
 
 - New features should be added inside the corresponding domain first.
-- If a concern does not belong to an existing domain, create a new domain under `app/Domains`.
+- Add new business features to the appropriate area under `app/Domains`.
+- Keep generic reusable code in `app/Shared`; do not use it as a catch-all for
+  business features.
 - Avoid placing new business code in `app/Http/Controllers` or `app/Models`.

app/Domains/Catalog/Requests/StoreCatalogItemRequest.php

@@ -1,145 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Requests;
-
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StoreCatalogItemRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /** @return array<string, mixed> */
-    public function rules(): array
-    {
-        $tenantCode = $this->route('tenant')?->codigo;
-        $type = $this->input('type', CatalogItemType::Standard->value);
-        $isBundle = $type === CatalogItemType::Bundle->value;
-
-        return [
-            'tenant_code' => ['prohibited'],
-            'type' => ['sometimes', Rule::enum(CatalogItemType::class)],
-            'category_id' => [
-                'sometimes',
-                'nullable',
-                'integer',
-                Rule::exists('categorias', 'id')->where(
-                    fn ($query) => $query->where('tenant_code', $tenantCode)
-                ),
-            ],
-            'brand_id' => [
-                'sometimes',
-                'nullable',
-                'integer',
-                Rule::exists('brands', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $tenantCode)
-                ),
-            ],
-            'slug' => [
-                'required',
-                'string',
-                'max:255',
-                Rule::unique('catalog_items', 'slug')->where(
-                    fn ($query) => $query->where('tenant_code', $tenantCode)
-                ),
-            ],
-            '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)],
-            'inventory_subject' => ['sometimes', Rule::enum(InventorySubject::class)],
-            'max_units_per_user' => ['sometimes', 'nullable', 'integer', 'min:1'],
-            'has_tickets' => [Rule::prohibitedIf($isBundle), 'sometimes', 'boolean'],
-            'real_stock' => [Rule::prohibitedIf($isBundle), 'sometimes', 'integer', 'min:0'],
-            'inventory_id' => ['prohibited'],
-            'reserved_stock' => ['prohibited'],
-            'sold_units' => ['prohibited'],
-            'attribute_codes' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],
-            'attribute_codes.*' => [
-                'required',
-                'string',
-                'distinct',
-                Rule::exists('attribute', 'codigo')->where(
-                    fn ($query) => $query->where('tenant_codigo', $tenantCode)
-                ),
-            ],
-            'multi_select_attribute_codes' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],
-            'multi_select_attribute_codes.*' => [
-                'required',
-                'string',
-                'distinct',
-                Rule::exists('attribute', 'codigo')->where(
-                    fn ($query) => $query->where('tenant_codigo', $tenantCode)
-                ),
-            ],
-            'hidden_attribute_codes' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],
-            'hidden_attribute_codes.*' => [
-                'required',
-                'string',
-                'distinct',
-                Rule::exists('attribute', 'codigo')->where(
-                    fn ($query) => $query->where('tenant_codigo', $tenantCode)
-                ),
-            ],
-            'images' => ['sometimes', 'array'],
-            'images.*' => ['required', new ImageOrBase64Rule],
-            'variants' => [Rule::prohibitedIf($isBundle), 'sometimes', 'array'],
-            'variants.*.real_stock' => ['sometimes', 'integer', 'min:0'],
-            'variants.*.descripcion' => ['sometimes', 'nullable', 'string'],
-            'variants.*.precio' => ['sometimes', 'nullable', 'numeric', 'min:0', 'max:99999999.99'],
-            'variants.*.event_date_id' => [
-                'sometimes',
-                'nullable',
-                'integer',
-                Rule::exists('event_dates', 'id')->where(
-                    fn ($query) => $query->where('tenant_code', $tenantCode)
-                ),
-            ],
-            'variants.*.event_date_ids' => ['sometimes', 'array', 'min:1'],
-            'variants.*.event_date_ids.*' => [
-                'required',
-                'integer',
-                'distinct',
-                Rule::exists('event_dates', 'id')->where(
-                    fn ($query) => $query->where('tenant_code', $tenantCode)
-                ),
-            ],
-            'variants.*.inventory_id' => ['prohibited'],
-            'variants.*.reserved_stock' => ['prohibited'],
-            'variants.*.sold_units' => ['prohibited'],
-            'variants.*.values' => ['sometimes', 'array'],
-            'variants.*.values.*' => ['nullable'],
-            'variants.*.values.*.*' => ['required', 'string'],
-            'variants.*.images' => ['sometimes', 'array'],
-            'variants.*.images.*' => ['required', new ImageOrBase64Rule],
-            'components' => [
-                Rule::requiredIf($isBundle),
-                Rule::prohibitedIf(! $isBundle),
-                'array',
-                'min:1',
-            ],
-            'components.*.catalog_item_id' => [
-                'required',
-                'integer',
-                Rule::exists('catalog_items', 'id')->where(
-                    fn ($query) => $query->where('tenant_code', $tenantCode)
-                ),
-            ],
-            'components.*.variant_id' => [
-                'sometimes',
-                'nullable',
-                'integer',
-                Rule::exists('variantes', 'id'),
-            ],
-            'components.*.quantity' => ['required', 'integer', 'min:1'],
-        ];
-    }
-}

app/Domains/Catalog/Resources/CatalogItemResource.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Resources;
-
-use App\Domains\Catalog\Models\CatalogItem;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/** @mixin CatalogItem */
-class CatalogItemResource extends JsonResource
-{
-    /** @return array<string, mixed> */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'type' => $this->type->value,
-            'category_id' => $this->category_id,
-            'brand_id' => $this->brand_id,
-            'slug' => $this->slug,
-            'nombre' => $this->nombre,
-            'descripcion' => $this->descripcion,
-            'precio' => $this->precio,
-            'inventory_policy' => $this->inventory_policy?->value,
-            'inventory_subject' => $this->inventory_subject->value,
-            'max_units_per_user' => $this->max_units_per_user,
-            'has_tickets' => $this->has_tickets,
-            'real_stock' => $this->whenLoaded('inventory', fn () => $this->inventory?->real_stock),
-            'images' => $this->whenLoaded('attachments', fn () => $this->attachments
-                ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
-                ->values()),
-            'variants' => $this->whenLoaded('variants', fn () => $this->variants
-                ->map(fn ($variant) => [
-                    'id' => $variant->id,
-                    'event_date_id' => $variant->event_date_id,
-                    'event_date' => $variant->eventDate?->date?->format('Y-m-d'),
-                    'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
-                    'event_dates' => $variant->selectedEventDates()->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))->values(),
-                    'descripcion' => $variant->getDescription(),
-                    'precio' => number_format($variant->getPrice(), 2, '.', ''),
-                    'real_stock' => $variant->inventory?->real_stock,
-                    'values' => $variant->selectorOptions($this->itemAttributes),
-                    'images' => $variant->attachments
-                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
-                        ->values(),
-                ])
-                ->values()),
-        ];
-    }
-}

app/Domains/Commerce/Cart/Controllers/CartController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Cart\Controllers;
+namespace App\Domains\Commerce\Cart\Controllers;
 
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Cart\Requests\AddCartItemRequest;
-use App\Domains\Cart\Requests\UpdateCartItemQuantityRequest;
-use App\Domains\Cart\Resources\CartResource;
-use App\Domains\Cart\Services\CartService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Cart\Requests\AddCartItemRequest;
+use App\Domains\Commerce\Cart\Requests\UpdateCartItemQuantityRequest;
+use App\Domains\Commerce\Cart\Resources\CartResource;
+use App\Domains\Commerce\Cart\Services\CartService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

app/Domains/Commerce/Cart/Models/Cart.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\Cart\Models;
+namespace App\Domains\Commerce\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 App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\UserPurchaseLimitService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -375,7 +375,7 @@ class Cart extends Model
     ): CatalogItem|Variant {
         $catalogItemQuery = CatalogItem::query()
             ->whereKey($catalogItemId)
-            ->where('tenant_code', $this->tenant_codigo);
+            ->forTenantCatalog($this->tenant()->firstOrFail());
 
         if ($lockForUpdate) {
             $catalogItemQuery->lockForUpdate();
@@ -400,6 +400,17 @@ class Cart extends Model
                 ]);
             }
 
+            if ($catalogItem->bundleComponents()
+                ->whereNotNull('component_variant_id')
+                ->whereHas('variant', fn ($query) => $query
+                    ->whereNotNull('sales_disabled_at')
+                    ->orWhereNotNull('replaced_by_variant_id'))
+                ->exists()) {
+                throw ValidationException::withMessages([
+                    'catalog_item_id' => [__('api.cart.bundle_component_unavailable')],
+                ]);
+            }
+
             return $catalogItem;
         }
 
@@ -430,6 +441,12 @@ class Cart extends Model
             throw new NotFoundHttpException('Variant not found for catalog item.');
         }
 
+        if (! $variant->isSellable()) {
+            throw ValidationException::withMessages([
+                'variant_id' => [__('api.cart.variant_unavailable')],
+            ]);
+        }
+
         $inventory = $this->resolveInventory($variant->inventory_id, $lockForUpdate);
         $variant->setRelation('catalogItem', $catalogItem);
         $variant->setRelation('inventory', $inventory);

app/Domains/Commerce/Cart/Models/CartItem.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Cart\Models;
+namespace App\Domains\Commerce\Cart\Models;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

app/Domains/Commerce/Cart/Requests/AddCartItemRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Cart\Requests;
+namespace App\Domains\Commerce\Cart\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;

app/Domains/Commerce/Cart/Requests/UpdateCartItemQuantityRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Cart\Requests;
+namespace App\Domains\Commerce\Cart\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Domains/Commerce/Cart/Resources/CartItemResource.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Cart\Resources;
+namespace App\Domains\Commerce\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 App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Domains/Commerce/Cart/Resources/CartResource.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Cart\Resources;
+namespace App\Domains\Commerce\Cart\Resources;
 
-use App\Domains\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\Cart;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Domains/Commerce/Cart/Services/CartService.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Cart\Services;
+namespace App\Domains\Commerce\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 App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Commerce\Catalog\Services\ExpireStockReservationsService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;

app/Domains/Commerce/Cart/Services/CartVariantReplacementService.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Domains\Commerce\Cart\Services;
+
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use Illuminate\Validation\ValidationException;
+
+class CartVariantReplacementService
+{
+    public function __construct(private readonly CatalogInventoryService $inventory) {}
+
+    public function replaceHistoricalVariants(Cart $cart): void
+    {
+        $items = $cart->items()
+            ->whereNotNull('variant_id')
+            ->orderBy('id')
+            ->lockForUpdate()
+            ->get();
+
+        foreach ($items as $item) {
+            $variant = Variant::query()->lockForUpdate()->find($item->variant_id);
+
+            if ($variant === null) {
+                throw $this->unavailableVariant();
+            }
+
+            $replacement = $this->latestReplacement($variant);
+
+            if ($replacement->is($variant)) {
+                if (! $variant->isSellable()) {
+                    throw $this->unavailableVariant();
+                }
+
+                continue;
+            }
+
+            if (! $replacement->isSellable()) {
+                throw $this->unavailableVariant();
+            }
+
+            /** @var CartItem|null $targetItem */
+            $targetItem = $cart->items()
+                ->whereKeyNot($item->getKey())
+                ->where('catalog_item_id', $item->catalog_item_id)
+                ->where('variant_id', $replacement->getKey())
+                ->lockForUpdate()
+                ->first();
+
+            $replacementQuantity = $item->cantidad + ($targetItem?->cantidad ?? 0);
+            if ($replacement->inventory_id !== $variant->inventory_id) {
+                $available = $this->inventory->availableQuantity($replacement);
+
+                if ($available !== null && $available < $replacementQuantity) {
+                    throw $this->unavailableVariant();
+                }
+            }
+
+            if ($targetItem !== null) {
+                $targetItem->cantidad += $item->cantidad;
+                $targetItem->save();
+                $item->delete();
+
+                continue;
+            }
+
+            $item->update(['variant_id' => $replacement->getKey()]);
+        }
+    }
+
+    private function latestReplacement(Variant $variant): Variant
+    {
+        $current = $variant;
+        $visited = [];
+
+        while ($current->replaced_by_variant_id !== null) {
+            if (isset($visited[$current->getKey()])) {
+                throw $this->unavailableVariant();
+            }
+
+            $visited[$current->getKey()] = true;
+            $current = Variant::query()
+                ->lockForUpdate()
+                ->find($current->replaced_by_variant_id)
+                ?? throw $this->unavailableVariant();
+        }
+
+        return $current;
+    }
+
+    private function unavailableVariant(): ValidationException
+    {
+        return ValidationException::withMessages([
+            'cart_id' => [__('api.cart.cart_variant_unavailable')],
+        ]);
+    }
+}

app/Domains/Commerce/Cart/Services/GuestCartMergeService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Cart\Services;
+namespace App\Domains\Commerce\Cart\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
 use Illuminate\Support\Facades\DB;
 
 class GuestCartMergeService

app/Domains/Commerce/Cart/Services/InvalidateEventDateCartsService.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Domains\Commerce\Cart\Services;
+
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+
+class InvalidateEventDateCartsService
+{
+    public function __construct(private readonly StockReservationService $reservations) {}
+
+    /** @param Collection<int, int> $eventDateIds */
+    public function invalidate(
+        Tenant $tenant,
+        Collection $eventDateIds,
+        string $reason = StockReservationService::REASON_EVENT_DATE_RESCHEDULED,
+    ): void {
+        DB::transaction(function () use ($tenant, $eventDateIds, $reason): void {
+            $carts = Cart::query()
+                ->where('tenant_codigo', $tenant->codigo)
+                ->where('status', Cart::STATUS_ACTIVE)
+                ->whereNull('current_purchase_id')
+                ->whereHas('currentStockReservation', fn ($reservation) => $reservation
+                    ->where('status', StockReservation::STATUS_ACTIVE))
+                ->whereHas('items.variant', fn ($variant) => $variant
+                    ->withTrashed()
+                    ->where(fn ($dates) => $dates
+                        ->whereIn('event_date_id', $eventDateIds)
+                        ->orWhereHas('eventDates', fn ($date) => $date
+                            ->whereIn('event_dates.id', $eventDateIds))))
+                ->orderBy('id')
+                ->lockForUpdate()
+                ->get();
+
+            foreach ($carts as $cart) {
+                // Checkout keeps the cart and purchase attached to the same reservation.
+                if (Purchase::query()
+                    ->where('stock_reservation_id', $cart->current_stock_reservation_id)
+                    ->exists()) {
+                    continue;
+                }
+
+                $this->reservations->releaseCurrentCartReservation(
+                    $cart,
+                    $reason,
+                );
+
+                // Reuse the existing expired-cart flow: stale mutations receive the
+                // expiration response and the next GET replaces the whole cart.
+                $cart->update(['status' => Cart::STATUS_EXPIRED]);
+            }
+        });
+    }
+}

app/Domains/Commerce/Cart/routes/api.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Cart\Controllers\CartController;
+use App\Domains\Commerce\Cart\Controllers\CartController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')

app/Domains/Commerce/Catalog/Controllers/AdminApp/OnTicketFeaturedGroupController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Catalog\Controllers\AdminApp;
+namespace App\Domains\Commerce\Catalog\Controllers\AdminApp;
 
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Requests\AdminApp\UpsertOnTicketFeaturedGroupRequest;
-use App\Domains\Catalog\Resources\AdminApp\OnTicketFeaturedGroupResource;
-use App\Domains\Catalog\Services\OnTicketFeaturedGroupService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Requests\AdminApp\UpsertOnTicketFeaturedGroupRequest;
+use App\Domains\Commerce\Catalog\Resources\AdminApp\OnTicketFeaturedGroupResource;
+use App\Domains\Commerce\Catalog\Services\OnTicketFeaturedGroupService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -58,7 +58,7 @@ class OnTicketFeaturedGroupController extends Controller
     {
         $tenant = $request->user()->tenant()->firstOrFail();
 
-        abort_unless($tenant->website_type_code === 'onticket', 404);
+        abort_unless(in_array($tenant->storefront_website_type_code, ['onticket', 'onticket_multi_event'], true), 404);
 
         return $tenant;
     }

app/Domains/Commerce/Catalog/Controllers/CatalogController.php

@@ -1,27 +1,25 @@
 <?php
 
-namespace App\Domains\Catalog\Controllers;
+namespace App\Domains\Commerce\Catalog\Controllers;
 
-use App\Domains\Cart\Services\CartService;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Requests\CatalogItemDetailRequest;
-use App\Domains\Catalog\Requests\CatalogVariantOptionsRequest;
-use App\Domains\Catalog\Requests\CategoryPageRequest;
-use App\Domains\Catalog\Requests\FeaturedGroupPageRequest;
-use App\Domains\Catalog\Requests\SearchCatalogItemsRequest;
-use App\Domains\Catalog\Requests\StoreCatalogItemRequest;
-use App\Domains\Catalog\Resources\CatalogFeaturedGroupResource;
-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\Domains\Commerce\Cart\Services\CartService;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Requests\CatalogItemDetailRequest;
+use App\Domains\Commerce\Catalog\Requests\CatalogVariantOptionsRequest;
+use App\Domains\Commerce\Catalog\Requests\CategoryPageRequest;
+use App\Domains\Commerce\Catalog\Requests\FeaturedGroupPageRequest;
+use App\Domains\Commerce\Catalog\Requests\SearchCatalogItemsRequest;
+use App\Domains\Commerce\Catalog\Resources\CatalogFeaturedGroupResource;
+use App\Domains\Commerce\Catalog\Resources\CatalogItemDetailResource;
+use App\Domains\Commerce\Catalog\Resources\CatalogSearchItemResource;
+use App\Domains\Commerce\Catalog\Resources\CatalogVariantOptionsResource;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Commerce\Catalog\Services\FeaturedGroupService;
+use App\Domains\Commerce\Catalog\Services\VariantSelectionService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -40,7 +38,7 @@ class CatalogController extends Controller
         return response()->json($featuredGroups->map(
             fn (FeaturedGroup $featuredGroup): array => (new CatalogFeaturedGroupResource(
                 $featuredGroup,
-                $featuredGroupService->itemsResponse($featuredGroup, 1, $this->userId($request)),
+                $featuredGroupService->itemsResponse($featuredGroup, $tenant, 1, $this->userId($request)),
             ))->resolve()
         ));
     }
@@ -102,6 +100,7 @@ class CatalogController extends Controller
 
         return response()->json($featuredGroupService->itemsResponse(
             $featuredGroup,
+            $tenant,
             $page,
             $this->userId($request),
         ));
@@ -114,7 +113,8 @@ class CatalogController extends Controller
         CatalogService $catalogService,
         CatalogItemAllowanceService $allowances,
     ): CatalogItemDetailResource {
-        abort_unless($catalogItem->tenant_code === $tenant->codigo, 404);
+        abort_unless($catalogItem->tenant_code === $tenant->codigo
+            && ($tenant->active_event_id === null || $catalogItem->event_id === $tenant->active_event_id), 404);
 
         $variantId = $request->validated('variant_id');
 
@@ -134,7 +134,8 @@ class CatalogController extends Controller
         VariantSelectionService $variantSelectionService,
         CartService $cartService,
     ): CatalogVariantOptionsResource {
-        abort_unless($catalogItem->tenant_code === $tenant->codigo, 404);
+        abort_unless($catalogItem->tenant_code === $tenant->codigo
+            && ($tenant->active_event_id === null || $catalogItem->event_id === $tenant->active_event_id), 404);
 
         $includedVariantId = null;
         $cartItemId = $request->validated('cart_item_id');
@@ -163,21 +164,6 @@ class CatalogController extends Controller
         );
     }
 
-    public function store(
-        StoreCatalogItemRequest $request,
-        Tenant $tenant,
-        CatalogService $catalogService,
-    ): JsonResponse {
-        $catalogItem = $catalogService->create([
-            ...$request->validated(),
-            'tenant_code' => $tenant->codigo,
-        ]);
-
-        return CatalogItemResource::make($catalogItem)
-            ->response()
-            ->setStatusCode(201);
-    }
-
     private function userId(Request $request): ?int
     {
         $userId = $request->user()?->getAuthIdentifier() ?? Auth::guard('sanctum')->id();

app/Domains/Commerce/Catalog/Enums/CatalogItemType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum CatalogItemType: string
 {

app/Domains/Commerce/Catalog/Enums/FeaturedGroupSource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum FeaturedGroupSource: string
 {

app/Domains/Commerce/Catalog/Enums/GroupLayout.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum GroupLayout: string
 {

app/Domains/Commerce/Catalog/Enums/InventoryPolicy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum InventoryPolicy: string
 {

app/Domains/Commerce/Catalog/Enums/InventorySubject.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum InventorySubject: string
 {

app/Domains/Commerce/Catalog/Enums/ProductLayout.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum ProductLayout: string
 {

app/Domains/Commerce/Catalog/Exceptions/StockReservationExpiredException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Exceptions;
+namespace App\Domains\Commerce\Catalog\Exceptions;
 
 use RuntimeException;
 

app/Domains/Commerce/Catalog/Models/Attribute.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -59,6 +59,8 @@ class Attribute extends Model
     public function eventDates(): HasMany
     {
         return $this->hasMany(EventDate::class, 'tenant_code', 'tenant_codigo')
+            ->whereNull('rescheduled_to_event_date_id')
+            ->whereNull('suspended_at')
             ->orderBy('date')
             ->orderBy('time_start');
     }

app/Domains/Commerce/Catalog/Models/AttributeOption.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

app/Domains/Commerce/Catalog/Models/Brand.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

app/Domains/Commerce/Catalog/Models/BundleComponent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Domains/Commerce/Catalog/Models/CatalogItem.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Services\CatalogInventoryService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Models\Event;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -30,6 +31,7 @@ use Illuminate\Support\Collection;
     'group_order',
     'descripcion',
     'precio',
+    'sales_end_at',
     'inventory_policy',
     'inventory_subject',
     'max_units_per_user',
@@ -51,15 +53,30 @@ class CatalogItem extends Model
         'group_order' => 0,
     ];
 
+    protected static function booted(): void
+    {
+        static::creating(function (CatalogItem $item): void {
+            if ($item->event_id !== null || $item->tenant_code === null) {
+                return;
+            }
+
+            $item->event_id = Tenant::query()
+                ->where('codigo', $item->tenant_code)
+                ->value('active_event_id');
+        });
+    }
+
     protected function casts(): array
     {
         return [
+            'event_id' => 'integer',
             'category_id' => 'integer',
             'brand_id' => 'integer',
             'inventory_id' => 'integer',
             'type' => CatalogItemType::class,
             'group_order' => 'integer',
             'precio' => 'decimal:2',
+            'sales_end_at' => 'datetime',
             'inventory_policy' => InventoryPolicy::class,
             'inventory_subject' => InventorySubject::class,
             'max_units_per_user' => 'integer',
@@ -73,6 +90,21 @@ class CatalogItem extends Model
         return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
     }
 
+    /** @return BelongsTo<Event, $this> */
+    public function event(): BelongsTo
+    {
+        return $this->belongsTo(Event::class);
+    }
+
+    /** @param Builder<CatalogItem> $query */
+    public function scopeForTenantCatalog(Builder $query, Tenant $tenant): Builder
+    {
+        return $query
+            ->where('catalog_items.tenant_code', $tenant->codigo)
+            ->when($tenant->active_event_id !== null, fn (Builder $query): Builder => $query
+                ->where('catalog_items.event_id', $tenant->active_event_id));
+    }
+
     /** @return BelongsTo<Category, $this> */
     public function category(): BelongsTo
     {
@@ -161,6 +193,10 @@ class CatalogItem extends Model
 
     public function isAvailable(): bool
     {
+        if (! $this->isSaleOpen()) {
+            return false;
+        }
+
         if ($this->type === CatalogItemType::Bundle) {
             $availableStock = $this->availableStock();
 
@@ -178,12 +214,31 @@ class CatalogItem extends Model
     public function scopeWhereAvailable(Builder $query): Builder
     {
         return $query->where(function (Builder $query): void {
+            $query->whereNull('catalog_items.sales_end_at')
+                ->orWhere('catalog_items.sales_end_at', '>', now());
+        })->where(function (Builder $query): void {
             $query
-                ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
+                ->where(function (Builder $unlimitedQuery): void {
+                    $unlimitedQuery
+                        ->where('catalog_items.inventory_policy', InventoryPolicy::Unlimited->value)
+                        ->where(function (Builder $selectionQuery): void {
+                            $selectionQuery
+                                ->whereDoesntHave('variants')
+                                ->orWhereHas('variants', fn (Builder $variantQuery): Builder => $variantQuery
+                                    ->whereNull('sales_disabled_at')
+                                    ->whereNull('replaced_by_variant_id'));
+                        });
+                })
                 ->orWhereHas(
-                    'variants.inventory',
-                    fn (Builder $inventoryQuery): Builder => $inventoryQuery
-                        ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
+                    'variants',
+                    fn (Builder $variantQuery): Builder => $variantQuery
+                        ->whereNull('sales_disabled_at')
+                        ->whereNull('replaced_by_variant_id')
+                        ->whereHas(
+                            'inventory',
+                            fn (Builder $inventoryQuery): Builder => $inventoryQuery
+                                ->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
+                        )
                 )
                 ->orWhere(function (Builder $directItemQuery): void {
                     $directItemQuery
@@ -201,13 +256,22 @@ class CatalogItem extends Model
         });
     }
 
+    public function isSaleOpen(): bool
+    {
+        return $this->sales_end_at === null || now()->lt($this->sales_end_at);
+    }
+
     /** @return Collection<int, Variant> */
     public function visibleVariants(?int $includedVariantId = null): Collection
     {
         return $this->variants
-            ->filter(fn (Variant $variant): bool => ($includedVariantId !== null && $variant->id === $includedVariantId)
-                || $this->inventory_policy === InventoryPolicy::Unlimited
-                || ($variant->inventory?->availableStock() ?? 0) > 0)
+            ->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $this))
+            ->filter(fn (Variant $variant): bool => $variant->hasOnlyActiveEventDates()
+                && (($includedVariantId !== null && $variant->id === $includedVariantId)
+                    || ($variant->isSellable() && (
+                        $this->inventory_policy === InventoryPolicy::Unlimited
+                        || ($variant->inventory?->availableStock() ?? 0) > 0
+                    ))))
             ->values();
     }
 

app/Domains/Commerce/Catalog/Models/Category.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

app/Domains/Commerce/Catalog/Models/FeaturedGroup.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

app/Domains/Commerce/Catalog/Models/FeaturedItem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Domains/Commerce/Catalog/Models/Inventory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 
 #[Fillable([
     'sold_units',
+    'refunded_units',
     'reserved_stock',
     'real_stock',
 ])]
@@ -23,6 +24,7 @@ class Inventory extends Model
 
     protected $attributes = [
         'sold_units' => 0,
+        'refunded_units' => 0,
         'reserved_stock' => 0,
         'real_stock' => 0,
     ];
@@ -31,6 +33,7 @@ class Inventory extends Model
     {
         return [
             'sold_units' => 'integer',
+            'refunded_units' => 'integer',
             'reserved_stock' => 'integer',
             'real_stock' => 'integer',
         ];
@@ -42,10 +45,10 @@ class Inventory extends Model
         return $this->hasOne(CatalogItem::class);
     }
 
-    /** @return HasOne<Variant, $this> */
-    public function variant(): HasOne
+    /** @return HasMany<Variant, $this> */
+    public function variants(): HasMany
     {
-        return $this->hasOne(Variant::class);
+        return $this->hasMany(Variant::class);
     }
 
     /** @return HasMany<StockReservationLine, $this> */

app/Domains/Commerce/Catalog/Models/ItemAttribute.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Domains/Commerce/Catalog/Models/StockReservation.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;

app/Domains/Commerce/Catalog/Models/StockReservationLine.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;

app/Domains/Commerce/Catalog/Models/Variant.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -20,6 +20,8 @@ use Illuminate\Support\Str;
     'catalog_item_id',
     'event_date_id',
     'inventory_id',
+    'replaced_by_variant_id',
+    'sales_disabled_at',
     'descripcion',
     'precio',
 ])]
@@ -37,6 +39,8 @@ class Variant extends Model
             'catalog_item_id' => 'integer',
             'event_date_id' => 'integer',
             'inventory_id' => 'integer',
+            'replaced_by_variant_id' => 'integer',
+            'sales_disabled_at' => 'datetime',
             'precio' => 'decimal:2',
         ];
     }
@@ -76,6 +80,40 @@ class Variant extends Model
         return $this->belongsTo(Inventory::class);
     }
 
+    /** @return BelongsTo<Variant, $this> */
+    public function replacement(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'replaced_by_variant_id');
+    }
+
+    /** @return HasMany<Variant, $this> */
+    public function replacedVariants(): HasMany
+    {
+        return $this->hasMany(self::class, 'replaced_by_variant_id');
+    }
+
+    public function isSellable(): bool
+    {
+        return $this->sales_disabled_at === null
+            && $this->replaced_by_variant_id === null
+            && $this->catalogItem->isSaleOpen()
+            && $this->hasOnlyActiveEventDates();
+    }
+
+    public function hasOnlyActiveEventDates(): bool
+    {
+        if (! $this->exists
+            && $this->event_date_id === null
+            && ! $this->relationLoaded('eventDates')) {
+            return true;
+        }
+
+        return $this->selectedEventDates()->every(
+            fn (EventDate $eventDate): bool => $eventDate->rescheduled_to_event_date_id === null
+                && $eventDate->suspended_at === null,
+        );
+    }
+
     /** @return HasMany<VariantDefinition, $this> */
     public function definitions(): HasMany
     {

app/Domains/Commerce/Catalog/Models/VariantDefinition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Domains/Commerce/Catalog/Requests/AdminApp/UpsertOnTicketFeaturedGroupRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests\AdminApp;
+namespace App\Domains\Commerce\Catalog\Requests\AdminApp;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Domains/Commerce/Catalog/Requests/CatalogItemDetailRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Domains/Commerce/Catalog/Requests/CatalogVariantOptionsRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Domains/Commerce/Catalog/Requests/CategoryPageRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Domains/Commerce/Catalog/Requests/FeaturedGroupPageRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Domains/Commerce/Catalog/Requests/SearchCatalogItemsRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

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

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Resources\AdminApp;
+namespace App\Domains\Commerce\Catalog\Resources\AdminApp;
 
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Domains/Commerce/Catalog/Resources/CatalogFeaturedGroupResource.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-use App\Domains\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Domains/Commerce/Catalog/Resources/CatalogFeaturedItemResource.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-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 App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Domains/Commerce/Catalog/Resources/CatalogItemDetailResource.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-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 App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
+use App\Shared\Enums\FieldType;
+use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;

app/Domains/Commerce/Catalog/Resources/CatalogSearchItemResource.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\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 App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Domains/Commerce/Catalog/Resources/CatalogVariantOptionsResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;

app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\BundleComponent;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\BundleComponent;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Support\Facades\DB;
 
 class CatalogInventoryService
@@ -63,9 +63,14 @@ class CatalogInventoryService
 
             $selection->loadMissing('variants.inventory');
 
-            return $selection->variants->sum(
-                fn (Variant $variant): int => $variant->inventory->availableStock(),
-            );
+            return $selection->variants
+                ->filter(fn (Variant $variant): bool => $variant->isSellable())
+                ->unique(fn (Variant $variant): string => $variant->inventory_id === null
+                    ? 'object:'.spl_object_id($variant->inventory)
+                    : 'id:'.$variant->inventory_id)
+                ->sum(
+                    fn (Variant $variant): int => $variant->inventory->availableStock(),
+                );
         }
 
         $requirements = $this->inventoryRequirements($selection);

app/Domains/Commerce/Catalog/Services/CatalogItemAllowanceService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Purchase\Services\UserPurchaseLimitService;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Purchase\Services\UserPurchaseLimitService;
 use Illuminate\Support\Collection;
 
 class CatalogItemAllowanceService

app/Domains/Commerce/Catalog/Services/CatalogService.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\DB;
@@ -207,7 +207,8 @@ class CatalogService
         $visibleVariants = $catalogItem->visibleVariants();
         if ($catalogItem->type === CatalogItemType::Standard
             && ($catalogItem->inventory_id !== null || $catalogItem->variants->isNotEmpty())
-            && ! $catalogItem->isAvailable()) {
+            && (($catalogItem->variants->isNotEmpty() && $visibleVariants->isEmpty())
+                || ! $catalogItem->isAvailable())) {
             throw new NotFoundHttpException('Catalog item is out of stock.');
         }
 
@@ -237,7 +238,7 @@ class CatalogService
         $startsWithPattern = "{$normalizedTerm}%";
 
         $paginator = CatalogItem::query()
-            ->where('tenant_code', $tenant->codigo)
+            ->forTenantCatalog($tenant)
             ->whereAvailable()
             ->where(function (Builder $query) use ($containsPattern): void {
                 $query
@@ -286,7 +287,7 @@ class CatalogService
         int $page,
     ): LengthAwarePaginator {
         return CatalogItem::query()
-            ->where('tenant_code', $tenant->codigo)
+            ->forTenantCatalog($tenant)
             ->where('category_id', $category->id)
             ->whereAvailable()
             ->with([
@@ -324,9 +325,13 @@ class CatalogService
                 ->findOrFail($variant->catalog_item_id);
             $variant->delete();
 
-            if (! $catalogItem->variants()->exists()) {
+            $sellableVariants = $catalogItem->variants()
+                ->whereNull('sales_disabled_at')
+                ->whereNull('replaced_by_variant_id');
+
+            if (! (clone $sellableVariants)->exists()) {
                 $this->delete($catalogItem);
-            } elseif (($minimumPrice = $catalogItem->variants()->min('precio')) !== null) {
+            } elseif (($minimumPrice = (clone $sellableVariants)->min('precio')) !== null) {
                 $catalogItem->update(['precio' => $minimumPrice]);
             }
 
@@ -364,6 +369,8 @@ class CatalogService
             $componentItem = CatalogItem::query()
                 ->whereKey($catalogItemId)
                 ->where('tenant_code', $bundle->tenant_code)
+                ->when($bundle->event_id !== null, fn (Builder $query): Builder => $query
+                    ->where('event_id', $bundle->event_id))
                 ->first();
 
             if ($componentItem === null) {
@@ -399,7 +406,11 @@ class CatalogService
                 ]);
             }
 
-            if ($variantId !== null && ! $componentItem->variants()->whereKey($variantId)->exists()) {
+            if ($variantId !== null && ! $componentItem->variants()
+                ->whereKey($variantId)
+                ->whereNull('sales_disabled_at')
+                ->whereNull('replaced_by_variant_id')
+                ->exists()) {
                 throw ValidationException::withMessages([
                     "components.{$index}.variant_id" => [
                         __('api.catalog.component_variant_invalid'),

app/Domains/Commerce/Catalog/Services/ExpireStockReservationsService.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\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 App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\Checkout\ReleaseCheckoutService;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use RuntimeException;

app/Domains/Commerce/Catalog/Services/FeaturedGroupService.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Resources\CatalogFeaturedItemResource;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Resources\CatalogFeaturedItemResource;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 
@@ -19,10 +20,10 @@ class FeaturedGroupService
         private readonly CatalogItemAllowanceService $allowances,
     ) {}
 
-    public function itemsResponse(FeaturedGroup $featuredGroup, int $page, ?int $userId = null): array
+    public function itemsResponse(FeaturedGroup $featuredGroup, Tenant $tenant, int $page, ?int $userId = null): array
     {
         if ($featuredGroup->group_layout !== GroupLayout::Paginated) {
-            $query = $this->itemsQuery($featuredGroup);
+            $query = $this->itemsQuery($featuredGroup, $tenant);
 
             if ($featuredGroup->group_layout === GroupLayout::Single) {
                 $query->limit(1);
@@ -35,7 +36,7 @@ class FeaturedGroupService
             return CatalogFeaturedItemResource::collection($items)->resolve();
         }
 
-        $paginator = $this->paginateItems($featuredGroup, $page);
+        $paginator = $this->paginateItems($featuredGroup, $tenant, $page);
         $this->attachGroup($paginator->getCollection(), $featuredGroup);
         $this->allowances->attach($paginator->getCollection(), $userId);
 
@@ -45,10 +46,10 @@ class FeaturedGroupService
     }
 
     /** @return Builder<CatalogItem> */
-    private function itemsQuery(FeaturedGroup $featuredGroup): Builder
+    private function itemsQuery(FeaturedGroup $featuredGroup, Tenant $tenant): Builder
     {
         $query = CatalogItem::query()
-            ->where('catalog_items.tenant_code', $featuredGroup->tenant_code)
+            ->forTenantCatalog($tenant)
             ->whereAvailable()
             ->where(function (Builder $query): void {
                 $query
@@ -90,9 +91,10 @@ class FeaturedGroupService
 
     private function paginateItems(
         FeaturedGroup $featuredGroup,
+        Tenant $tenant,
         int $page,
     ): LengthAwarePaginator {
-        $paginator = $this->itemsQuery($featuredGroup)->paginate(
+        $paginator = $this->itemsQuery($featuredGroup, $tenant)->paginate(
             perPage: self::ITEMS_PER_PAGE,
             pageName: 'page',
             page: $page,

app/Domains/Commerce/Catalog/Services/OnTicketFeaturedGroupService.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\DB;
 

app/Domains/Commerce/Catalog/Services/StockReservationService.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\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 App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\StockReservationLine;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -19,6 +19,10 @@ class StockReservationService
 
     public const REASON_CART_CHANGED = 'cart_changed';
 
+    public const REASON_EVENT_DATE_RESCHEDULED = 'event_date_rescheduled';
+
+    public const REASON_EVENT_DATE_SUSPENDED = 'event_date_suspended';
+
     public const REASON_PURCHASE_SUPERSEDED = 'purchase_superseded';
 
     public const REASON_PURCHASE_CANCELLED = 'purchase_cancelled';
@@ -343,9 +347,9 @@ class StockReservationService
         });
     }
 
-    public function refreshForPurchase(Purchase $purchase, ?Carbon $expiresAt): void
+    public function clearExpirationForReview(Purchase $purchase): void
     {
-        DB::transaction(function () use ($purchase, $expiresAt): void {
+        DB::transaction(function () use ($purchase): void {
             /** @var Purchase $purchase */
             $purchase = Purchase::query()->lockForUpdate()->findOrFail($purchase->getKey());
             if ($purchase->stock_reservation_id === null) {
@@ -363,7 +367,7 @@ class StockReservationService
                 throw new StockReservationExpiredException;
             }
 
-            $reservation->update(['expires_at' => $expiresAt]);
+            $reservation->update(['expires_at' => null]);
         });
     }
 

app/Domains/Commerce/Catalog/Services/VariantReplacementService.php

@@ -0,0 +1,263 @@
+<?php
+
+namespace App\Domains\Commerce\Catalog\Services;
+
+use App\Domains\Commerce\Catalog\Models\BundleComponent;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\StockReservationLine;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use Illuminate\Support\Collection;
+
+class VariantReplacementService
+{
+    /** @return Collection<int, Variant> */
+    public function replaceEventDate(EventDate $source, EventDate $destination): Collection
+    {
+        $variants = Variant::query()
+            ->whereNull('sales_disabled_at')
+            ->whereNull('replaced_by_variant_id')
+            ->where(function ($query) use ($source): void {
+                $query->where('event_date_id', $source->getKey())
+                    ->orWhereHas('eventDates', fn ($eventDates) => $eventDates
+                        ->where('event_dates.id', $source->getKey()));
+            })
+            ->with(['eventDates', 'eventDate', 'definitions', 'allAttachments'])
+            ->orderBy('id')
+            ->lockForUpdate()
+            ->get();
+
+        return $variants->map(function (Variant $variant) use ($source, $destination): Variant {
+            $destinationDateIds = $variant->selectedEventDates()
+                ->pluck('id')
+                ->map(fn ($id): int => (int) $id === (int) $source->getKey()
+                    ? (int) $destination->getKey()
+                    : (int) $id)
+                ->unique()
+                ->sort()
+                ->values();
+
+            $replacement = $this->findEquivalent($variant, $destinationDateIds)
+                ?? $this->cloneWithDates($variant, $destinationDateIds);
+
+            $variant->update([
+                'replaced_by_variant_id' => $replacement->getKey(),
+                'sales_disabled_at' => now(),
+            ]);
+
+            BundleComponent::query()
+                ->where('component_variant_id', $variant->getKey())
+                ->update(['component_variant_id' => $replacement->getKey()]);
+
+            return $replacement;
+        })->values();
+    }
+
+    public function disableForSuspension(EventDate $eventDate): void
+    {
+        $variants = Variant::query()
+            ->whereNull('sales_disabled_at')
+            ->whereNull('replaced_by_variant_id')
+            ->where(function ($query) use ($eventDate): void {
+                $query->where('event_date_id', $eventDate->getKey())
+                    ->orWhereHas('eventDates', fn ($eventDates) => $eventDates
+                        ->where('event_dates.id', $eventDate->getKey()));
+            })
+            ->with(['eventDates', 'eventDate', 'definitions', 'allAttachments'])
+            ->orderBy('id')
+            ->lockForUpdate()
+            ->get();
+
+        foreach ($variants as $variant) {
+            $remainingDateIds = $variant->selectedEventDates()
+                ->filter(fn (EventDate $date): bool => $date->suspended_at === null
+                    && $date->rescheduled_to_event_date_id === null)
+                ->pluck('id')
+                ->map(fn ($id): int => (int) $id)
+                ->unique()
+                ->sort()
+                ->values();
+
+            if ($remainingDateIds->isEmpty()) {
+                $variant->update(['sales_disabled_at' => now()]);
+
+                continue;
+            }
+
+            $replacement = $this->findEquivalent($variant, $remainingDateIds);
+            if ($replacement === null) {
+                $replacement = $this->cloneWithDates($variant, $remainingDateIds);
+            } else {
+                $this->mergeInventoryInto($variant, $replacement);
+            }
+
+            $variant->update([
+                'replaced_by_variant_id' => $replacement->getKey(),
+                'sales_disabled_at' => now(),
+            ]);
+
+            BundleComponent::query()
+                ->where('component_variant_id', $variant->getKey())
+                ->update(['component_variant_id' => $replacement->getKey()]);
+        }
+    }
+
+    /** @param Collection<int, int> $eventDateIds */
+    private function findEquivalent(Variant $source, Collection $eventDateIds): ?Variant
+    {
+        $definitionSignature = $this->definitionSignature($source);
+        $dateSignature = $eventDateIds->map(fn ($id): int => (int) $id)->sort()->values()->all();
+
+        return Variant::query()
+            ->where('catalog_item_id', $source->catalog_item_id)
+            ->whereKeyNot($source->getKey())
+            ->whereNull('sales_disabled_at')
+            ->whereNull('replaced_by_variant_id')
+            ->with(['eventDates', 'eventDate', 'definitions'])
+            ->orderBy('id')
+            ->lockForUpdate()
+            ->get()
+            ->first(fn (Variant $candidate): bool => $this->definitionSignature($candidate) === $definitionSignature
+                && $candidate->selectedEventDates()
+                    ->pluck('id')
+                    ->map(fn ($id): int => (int) $id)
+                    ->sort()
+                    ->values()
+                    ->all() === $dateSignature
+            );
+    }
+
+    /** @param Collection<int, int> $eventDateIds */
+    private function cloneWithDates(Variant $source, Collection $eventDateIds): Variant
+    {
+        $replacementInventory = $this->cloneInventory($source);
+        $replacement = $source->replicate([
+            'event_date_id',
+            'inventory_id',
+            'replaced_by_variant_id',
+            'sales_disabled_at',
+        ]);
+        $replacement->inventory_id = $replacementInventory->getKey();
+        $replacement->event_date_id = $eventDateIds->count() === 1
+            ? $eventDateIds->first()
+            : null;
+        $replacement->save();
+        $replacement->eventDates()->sync($eventDateIds->all());
+
+        $replacement->definitions()->createMany(
+            $source->definitions
+                ->map(fn ($definition): array => [
+                    'item_attribute_id' => $definition->item_attribute_id,
+                    'value' => $definition->value,
+                ])
+                ->all(),
+        );
+
+        $attachments = $source->allAttachments
+            ->mapWithKeys(fn ($attachment): array => [
+                $attachment->getKey() => [
+                    'orden' => $attachment->pivot->orden,
+                    'is_enabled' => $attachment->pivot->is_enabled,
+                ],
+            ])
+            ->all();
+        $replacement->allAttachments()->sync($attachments);
+
+        return $replacement->load(['eventDates', 'eventDate', 'definitions', 'allAttachments']);
+    }
+
+    private function cloneInventory(Variant $source): Inventory
+    {
+        $activeLines = StockReservationLine::query()
+            ->where('inventory_id', $source->inventory_id)
+            ->whereHas('reservation', fn ($reservation) => $reservation
+                ->where('status', StockReservation::STATUS_ACTIVE))
+            ->orderBy('id')
+            ->lockForUpdate()
+            ->get();
+        $sourceInventory = Inventory::query()
+            ->whereKey($source->inventory_id)
+            ->lockForUpdate()
+            ->firstOrFail();
+        $reservedStock = (int) $activeLines->sum('quantity');
+
+        if ($sourceInventory->reserved_stock !== $reservedStock) {
+            throw new \LogicException('El inventario reservado de la variante es inconsistente.');
+        }
+
+        $replacementInventory = Inventory::query()->create([
+            'sold_units' => $sourceInventory->sold_units,
+            'refunded_units' => $sourceInventory->refunded_units,
+            'reserved_stock' => $reservedStock,
+            'real_stock' => $sourceInventory->real_stock,
+        ]);
+
+        if ($activeLines->isNotEmpty()) {
+            StockReservationLine::query()
+                ->whereKey($activeLines->modelKeys())
+                ->update(['inventory_id' => $replacementInventory->getKey()]);
+        }
+        $sourceInventory->update(['reserved_stock' => 0]);
+
+        return $replacementInventory;
+    }
+
+    private function mergeInventoryInto(Variant $source, Variant $destination): void
+    {
+        if ($source->inventory_id === $destination->inventory_id) {
+            return;
+        }
+
+        $inventories = Inventory::query()
+            ->whereKey([$source->inventory_id, $destination->inventory_id])
+            ->orderBy('id')
+            ->lockForUpdate()
+            ->get()
+            ->keyBy('id');
+        $sourceInventory = $inventories->get($source->inventory_id);
+        $destinationInventory = $inventories->get($destination->inventory_id);
+        if ($sourceInventory === null || $destinationInventory === null) {
+            throw new \LogicException('No se encontró el inventario de una variante.');
+        }
+
+        $activeLines = StockReservationLine::query()
+            ->where('inventory_id', $source->inventory_id)
+            ->whereHas('reservation', fn ($reservation) => $reservation
+                ->where('status', StockReservation::STATUS_ACTIVE))
+            ->orderBy('id')
+            ->lockForUpdate()
+            ->get();
+        if ($sourceInventory->reserved_stock !== (int) $activeLines->sum('quantity')) {
+            throw new \LogicException('El inventario reservado de la variante es inconsistente.');
+        }
+
+        $destinationInventory->update([
+            'real_stock' => $destinationInventory->real_stock + $sourceInventory->real_stock,
+            'reserved_stock' => $destinationInventory->reserved_stock + $sourceInventory->reserved_stock,
+            'sold_units' => $destinationInventory->sold_units + $sourceInventory->sold_units,
+            'refunded_units' => $destinationInventory->refunded_units + $sourceInventory->refunded_units,
+        ]);
+        if ($activeLines->isNotEmpty()) {
+            StockReservationLine::query()
+                ->whereKey($activeLines->modelKeys())
+                ->update(['inventory_id' => $destinationInventory->getKey()]);
+        }
+        $sourceInventory->update([
+            'real_stock' => 0,
+            'reserved_stock' => 0,
+            'sold_units' => 0,
+            'refunded_units' => 0,
+        ]);
+    }
+
+    /** @return list<string> */
+    private function definitionSignature(Variant $variant): array
+    {
+        return $variant->definitions
+            ->map(fn ($definition): string => $definition->item_attribute_id.'\0'.$definition->value)
+            ->sort()
+            ->values()
+            ->all();
+    }
+}

app/Domains/Commerce/Catalog/Services/VariantSelectionService.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-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\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Support\Collection;
 
 class VariantSelectionService

app/Domains/Commerce/Catalog/routes/adminapp.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Controllers\AdminApp\OnTicketFeaturedGroupController;
+use App\Domains\Commerce\Catalog\Controllers\AdminApp\OnTicketFeaturedGroupController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')

app/Domains/Commerce/Catalog/routes/api.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Controllers\CatalogController;
+use App\Domains\Commerce\Catalog\Controllers\CatalogController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
@@ -13,7 +13,6 @@ Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
         ->name('categories.show');
     Route::get('catalog-items/{catalogItem}', [CatalogController::class, 'show']);
     Route::post('catalog-items/{catalogItem}/variant-options', [CatalogController::class, 'variantOptions']);
-    Route::post('catalog-items', [CatalogController::class, 'store']);
 });
 
 require __DIR__.'/adminapp.php';

app/Domains/Commerce/Purchase/Controllers/PurchaseController.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\Purchase\Controllers;
+namespace App\Domains\Commerce\Purchase\Controllers;
 
-use App\Domains\Integration\Services\TelepagosIntegrationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Requests\PaymentIntentRequest;
-use App\Domains\Purchase\Requests\StartCheckoutRequest;
-use App\Domains\Purchase\Requests\UpdatePurchaseCustomerRequest;
-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\Shared\Integration\Services\TelepagosIntegrationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
+use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
+use App\Domains\Commerce\Purchase\Requests\UpdatePurchaseCustomerRequest;
+use App\Domains\Commerce\Purchase\Resources\PurchaseResource;
+use App\Domains\Commerce\Purchase\Services\Checkout\PurchaseResponseLoader;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -93,7 +93,6 @@ class PurchaseController extends Controller
         PaymentIntentRequest $request,
         Tenant $tenant,
         Purchase $compra,
-        CheckoutService $checkoutService,
         PurchaseStateGuard $purchaseState,
     ): JsonResponse {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
@@ -103,7 +102,6 @@ class PurchaseController extends Controller
             : null;
 
         $updated = DB::transaction(function () use (
-            $checkoutService,
             $compra,
             $method,
             $purchaseState,
@@ -142,12 +140,6 @@ class PurchaseController extends Controller
                 $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;
         });

app/Domains/Commerce/Purchase/Events/PurchasePaid.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Events;
+namespace App\Domains\Commerce\Purchase\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;

app/Domains/Commerce/Purchase/Exceptions/InsufficientStockException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Exceptions;
+namespace App\Domains\Commerce\Purchase\Exceptions;
 
 use RuntimeException;
 

app/Domains/Commerce/Purchase/Exceptions/PurchaseExpiredException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Exceptions;
+namespace App\Domains\Commerce\Purchase\Exceptions;
 
 use RuntimeException;
 

app/Domains/Commerce/Purchase/Exceptions/PurchaseLimitExceededException.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Purchase\Exceptions;
+namespace App\Domains\Commerce\Purchase\Exceptions;
 
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use Illuminate\Validation\ValidationException;
 
 class PurchaseLimitExceededException extends ValidationException

app/Domains/Commerce/Purchase/Models/Purchase.php

@@ -1,19 +1,20 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\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;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Shared\Logging\Models\Concerns\LogsValueChanges;
+use App\Domains\Commerce\Purchase\Events\PurchasePaid;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\DB;
 
@@ -51,6 +52,14 @@ class Purchase extends Model
 
     public const STATUS_SUPERSEDED = 'superseded';
 
+    public const ADMIN_STATUS_INCOMPLETE = 'incomplete';
+
+    public const ADMIN_STATUS_AWAITING_PAYMENT = 'awaiting_payment';
+
+    public const ADMIN_STATUS_CONFIRMED = 'confirmed';
+
+    public const ADMIN_STATUS_CANCELLED = 'cancelled';
+
     /** @return list<string> */
     public static function statuses(): array
     {
@@ -66,6 +75,68 @@ class Purchase extends Model
         ];
     }
 
+    /**
+     * @return array<string, array{name: string, statuses: list<string>}>
+     */
+    public static function adminStatuses(): array
+    {
+        return [
+            self::ADMIN_STATUS_INCOMPLETE => [
+                'name' => 'Por completar datos',
+                'statuses' => [self::STATUS_CREATED],
+            ],
+            self::ADMIN_STATUS_AWAITING_PAYMENT => [
+                'name' => 'Esperando pago',
+                'statuses' => [self::STATUS_PENDING_PAYMENT, self::STATUS_IN_REVIEW],
+            ],
+            self::ADMIN_STATUS_CONFIRMED => [
+                'name' => 'Confirmado',
+                'statuses' => [self::STATUS_PAID],
+            ],
+            self::ADMIN_STATUS_CANCELLED => [
+                'name' => 'Anulado',
+                'statuses' => [
+                    self::STATUS_CANCELLED,
+                    self::STATUS_REJECTED,
+                    self::STATUS_EXPIRED,
+                    self::STATUS_SUPERSEDED,
+                ],
+            ],
+        ];
+    }
+
+    /** @return list<string> */
+    public static function adminStatusCodes(): array
+    {
+        return array_keys(self::adminStatuses());
+    }
+
+    /** @return list<string> */
+    public static function realStatusesForAdminStatus(string $adminStatus): array
+    {
+        return self::adminStatuses()[$adminStatus]['statuses'] ?? [];
+    }
+
+    public static function adminStatusFor(string $realStatus): ?string
+    {
+        foreach (self::adminStatuses() as $adminStatus => $definition) {
+            if (in_array($realStatus, $definition['statuses'], true)) {
+                return $adminStatus;
+            }
+        }
+
+        return null;
+    }
+
+    public static function adminStatusNameFor(string $realStatus): ?string
+    {
+        $adminStatus = self::adminStatusFor($realStatus);
+
+        return $adminStatus === null
+            ? null
+            : self::adminStatuses()[$adminStatus]['name'];
+    }
+
     protected $table = 'compras';
 
     /** @var array<int, string> */
@@ -115,12 +186,15 @@ class Purchase extends Model
         return $this->hasMany(PurchaseItem::class, 'compra_id');
     }
 
-    /**
-     * @return HasMany<Ticket, $this>
-     */
-    public function tickets(): HasMany
+    /** @return HasManyThrough<Ticket, PurchaseItem, $this> */
+    public function tickets(): HasManyThrough
     {
-        return $this->hasMany(Ticket::class, 'source_purchase_id');
+        return $this->hasManyThrough(
+            Ticket::class,
+            PurchaseItem::class,
+            'compra_id',
+            'source_purchase_item_id',
+        );
     }
 
     /** @return BelongsTo<StockReservation, $this> */
@@ -145,6 +219,12 @@ class Purchase extends Model
         return $this->hasMany(TelepagosPayment::class, 'compra_id');
     }
 
+    /** @return HasMany<TelepagosPaymentCandidate, $this> */
+    public function telepagosPaymentCandidates(): HasMany
+    {
+        return $this->hasMany(TelepagosPaymentCandidate::class, 'compra_id');
+    }
+
     public function getTotalAmount(): float
     {
         if ($this->total !== null) {

app/Domains/Commerce/Purchase/Models/PurchaseItem.php

@@ -1,14 +1,17 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'compra_id',
@@ -56,6 +59,18 @@ class PurchaseItem extends Model
         return $this->belongsTo(Purchase::class, 'compra_id');
     }
 
+    /** @return HasMany<Ticket, $this> */
+    public function tickets(): HasMany
+    {
+        return $this->hasMany(Ticket::class, 'source_purchase_item_id');
+    }
+
+    /** @return HasMany<TicketRefund, $this> */
+    public function ticketRefunds(): HasMany
+    {
+        return $this->hasMany(TicketRefund::class);
+    }
+
     /** @return BelongsTo<Attachment, $this> */
     public function imageAttachment(): BelongsTo
     {

app/Domains/Commerce/Purchase/Models/TelepagosPayment.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'compra_id',
-    'matched_purchase_ids',
     'cuit_buyer',
     'cvu_buyer',
     'amount',
@@ -30,7 +30,6 @@ class TelepagosPayment extends Model
     {
         return [
             'compra_id' => 'integer',
-            'matched_purchase_ids' => 'array',
             'amount' => 'decimal:2',
         ];
     }
@@ -42,4 +41,10 @@ class TelepagosPayment extends Model
     {
         return $this->belongsTo(Purchase::class, 'compra_id');
     }
+
+    /** @return HasMany<TelepagosPaymentCandidate, $this> */
+    public function candidates(): HasMany
+    {
+        return $this->hasMany(TelepagosPaymentCandidate::class, 'telepagos_payment_id');
+    }
 }

app/Domains/Commerce/Purchase/Models/TelepagosPaymentCandidate.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Domains\Commerce\Purchase\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'telepagos_payment_id',
+    'compra_id',
+    'dni_matches',
+    'dni_distance',
+    'payment_dni',
+    'purchase_dni',
+    'amount_matches',
+    'payment_amount',
+    'purchase_amount',
+    'amount_difference',
+    'match_reason',
+    'confidence',
+])]
+class TelepagosPaymentCandidate extends Model
+{
+    protected $table = 'telepagos_payment_candidates';
+
+    protected function casts(): array
+    {
+        return [
+            'telepagos_payment_id' => 'integer',
+            'compra_id' => 'integer',
+            'dni_matches' => 'boolean',
+            'dni_distance' => 'integer',
+            'amount_matches' => 'boolean',
+            'payment_amount' => 'decimal:2',
+            'purchase_amount' => 'decimal:2',
+            'amount_difference' => 'decimal:2',
+        ];
+    }
+
+    public function payment(): BelongsTo
+    {
+        return $this->belongsTo(TelepagosPayment::class, 'telepagos_payment_id');
+    }
+
+    public function purchase(): BelongsTo
+    {
+        return $this->belongsTo(Purchase::class, 'compra_id');
+    }
+}

app/Domains/Commerce/Purchase/Models/TelepagosQr.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Domains/Commerce/Purchase/Requests/PaymentIntentRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Requests;
+namespace App\Domains\Commerce\Purchase\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;

app/Domains/Commerce/Purchase/Requests/StartCheckoutRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Requests;
+namespace App\Domains\Commerce\Purchase\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;

app/Domains/Commerce/Purchase/Requests/UpdatePurchaseCustomerRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Requests;
+namespace App\Domains\Commerce\Purchase\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Domains/Commerce/Purchase/Resources/PurchaseItemResource.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Domains\Purchase\Resources;
+namespace App\Domains\Commerce\Purchase\Resources;
 
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -14,7 +15,11 @@ class PurchaseItemResource extends JsonResource
     public function toArray(Request $request): array
     {
         $tenant = $request->route('tenant');
-        $displayImage = ! $tenant instanceof Tenant || $tenant->display_cart_item_images;
+        $usesEventSummary = $tenant instanceof Tenant
+            && $tenant->storefrontWebsiteType?->checkout_summary_type
+                === StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
+        $displayImage = ! $tenant instanceof Tenant
+            || (! $usesEventSummary && $tenant->display_cart_item_images);
 
         $imageUrl = $displayImage
             ? $this->imageAttachment?->getTemporaryUrl(1440)
@@ -31,7 +36,7 @@ class PurchaseItemResource extends JsonResource
                 'nombre' => $this->item_nombre,
                 'descripcion' => $this->descripcion,
                 'slug' => $this->slug,
-                'imagen' => $imageUrl,
+                'imagen' => $this->when(! $usesEventSummary, $imageUrl),
                 'attributes' => $this->variant_attributes ?? [],
             ],
         ];

app/Domains/Commerce/Purchase/Resources/PurchaseResource.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace App\Domains\Commerce\Purchase\Resources;
+
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Purchase\Models\TelepagosPaymentCandidate;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Models\Event;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin Purchase
+ */
+class PurchaseResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        $serverTime = now();
+        $expiresAt = $this->stockReservation?->expires_at;
+        $items = $this->resource->relationLoaded('items')
+            ? $this->resource->getRelation('items')
+            : collect();
+        $ticketsCount = array_key_exists('tickets_count', $this->resource->getAttributes())
+            ? (int) $this->resource->getAttribute('tickets_count')
+            : null;
+        $paymentVerification = $this->resolvePaymentVerification();
+        $tenant = $request->route('tenant');
+        $usesEventSummary = $tenant instanceof Tenant
+            && $tenant->storefrontWebsiteType?->checkout_summary_type
+                === StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
+        /** @var Event|null $checkoutEvent */
+        $checkoutEvent = $usesEventSummary
+            ? $items
+                ->map(fn (PurchaseItem $item) => $item->sourceCatalogItem?->event)
+                ->filter()
+                ->unique('id')
+                ->first()
+            : null;
+
+        $subtotal = $items->isNotEmpty()
+            ? $items->reduce(
+                fn (float $carry, PurchaseItem $item): float => $carry + $this->resolveItemSubtotal($item),
+                0.0,
+            )
+            : (float) ($this->total ?? 0);
+
+        $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));
+
+        return [
+            'id' => $this->id,
+            'cart_id' => $this->cart_id,
+            'tenant_codigo' => $this->tenant_codigo,
+            'user_id' => $this->user_id,
+            'created_at' => $this->created_at,
+            'status' => $this->status,
+            'payment_method' => $this->payment_method,
+            'expires_at' => $expiresAt,
+            'expires_in_seconds' => $expiresAt === null
+                ? null
+                : max(0, $expiresAt->getTimestamp() - $serverTime->getTimestamp()),
+            'server_time' => $serverTime,
+            'dni' => $this->dni,
+            'transfer_payer_dni' => $this->transfer_payer_dni,
+            'telefono' => $this->telefono,
+            'nombre_apellido' => $this->nombre_apellido,
+            'email' => $this->email,
+            'items_source' => $items->isNotEmpty() ? 'purchase' : null,
+            'items' => PurchaseItemResource::collection($items),
+            'event' => $this->when($usesEventSummary, fn () => $checkoutEvent === null
+                ? null
+                : [
+                    'id' => $checkoutEvent->id,
+                    'title' => $checkoutEvent->title,
+                    'image' => $checkoutEvent->attachment?->getTemporaryUrl(1440),
+                ]),
+            'tickets_count' => $this->when($ticketsCount !== null, $ticketsCount),
+            'has_generated_tickets' => $this->when($ticketsCount !== null, $ticketsCount > 0),
+            'payment_verification' => $this->when($paymentVerification !== null, $paymentVerification),
+            'subtotal' => $this->formatMoney($subtotal),
+            'total' => $this->formatMoney($total),
+        ];
+    }
+
+    protected function resolveItemSubtotal(PurchaseItem $item): float
+    {
+        return (float) $item->precio_unitario * $item->cantidad;
+    }
+
+    protected function resolveItemTotal(PurchaseItem $item): float
+    {
+        return (float) ($item->total ?? 0);
+    }
+
+    protected function formatMoney(float|int|string|null $amount): string
+    {
+        return number_format((float) ($amount ?? 0), 2, '.', '');
+    }
+
+    /** @return array<string, mixed>|null */
+    private function resolvePaymentVerification(): ?array
+    {
+        if (
+            $this->status !== Purchase::STATUS_IN_REVIEW
+            || $this->payment_method !== 'transfer'
+            || ! $this->resource->relationLoaded('telepagosPaymentCandidates')
+        ) {
+            return null;
+        }
+
+        $candidates = $this->resource
+            ->getRelation('telepagosPaymentCandidates')
+            ->sort(fn (TelepagosPaymentCandidate $left, TelepagosPaymentCandidate $right): int => $this->comparePaymentCandidates($left, $right))
+            ->values();
+        /** @var TelepagosPaymentCandidate|null $primary */
+        $primary = $candidates->first();
+
+        return [
+            'status' => $primary === null ? 'pending' : 'candidate',
+            'candidate_count' => $candidates->count(),
+            'primary' => $primary === null ? null : [
+                'reason' => $primary->match_reason,
+                'dni_distance' => $primary->dni_distance,
+                'payment_amount' => $this->formatMoney($primary->payment_amount),
+                'purchase_amount' => $this->formatMoney($primary->purchase_amount),
+                'amount_difference' => $this->formatMoney($primary->amount_difference),
+                'confidence' => $primary->confidence,
+                'detected_at' => $primary->payment?->created_at?->toIso8601String(),
+            ],
+            'reasons' => $candidates
+                ->pluck('match_reason')
+                ->unique()
+                ->values()
+                ->all(),
+        ];
+    }
+
+    private function comparePaymentCandidates(
+        TelepagosPaymentCandidate $left,
+        TelepagosPaymentCandidate $right,
+    ): int {
+        $reasonComparison = $this->paymentCandidateRank($left->match_reason)
+            <=> $this->paymentCandidateRank($right->match_reason);
+
+        if ($reasonComparison !== 0) {
+            return $reasonComparison;
+        }
+
+        $differenceComparison = (float) $left->amount_difference <=> (float) $right->amount_difference;
+
+        if ($differenceComparison !== 0) {
+            return $differenceComparison;
+        }
+
+        $leftTimestamp = $left->payment?->created_at?->getTimestamp() ?? 0;
+        $rightTimestamp = $right->payment?->created_at?->getTimestamp() ?? 0;
+
+        return ($rightTimestamp <=> $leftTimestamp) ?: ($right->id <=> $left->id);
+    }
+
+    private function paymentCandidateRank(string $reason): int
+    {
+        return match ($reason) {
+            'ambiguous_exact_match' => 0,
+            'exact_dni_near_amount' => 1,
+            'exact_amount_near_dni' => 2,
+            default => 3,
+        };
+    }
+}

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

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -20,7 +20,7 @@ class CatalogSelectionResolver
         /** @var CatalogItem|null $catalogItem */
         $catalogItem = CatalogItem::query()
             ->whereKey($catalogItemId)
-            ->where('tenant_code', $tenant->codigo)
+            ->forTenantCatalog($tenant)
             ->lockForUpdate()
             ->first();
 
@@ -28,6 +28,12 @@ class CatalogSelectionResolver
             throw new NotFoundHttpException('Catalog item not found for tenant.');
         }
 
+        if (! $catalogItem->isSaleOpen()) {
+            throw ValidationException::withMessages([
+                "{$fieldPrefix}.catalog_item_id" => ['La venta de este producto finalizó.'],
+            ]);
+        }
+
         if ($catalogItem->isBundle()) {
             if ($variantId !== null) {
                 throw ValidationException::withMessages([
@@ -41,6 +47,17 @@ class CatalogSelectionResolver
                 ]);
             }
 
+            if ($catalogItem->bundleComponents()
+                ->whereNotNull('component_variant_id')
+                ->whereHas('variant', fn ($query) => $query
+                    ->whereNotNull('sales_disabled_at')
+                    ->orWhereNotNull('replaced_by_variant_id'))
+                ->exists()) {
+                throw ValidationException::withMessages([
+                    "{$fieldPrefix}.catalog_item_id" => [__('api.cart.bundle_component_unavailable')],
+                ]);
+            }
+
             return $catalogItem;
         }
 
@@ -70,6 +87,12 @@ class CatalogSelectionResolver
             throw new NotFoundHttpException('Variant not found for catalog item.');
         }
 
+        if (! $variant->isSellable()) {
+            throw ValidationException::withMessages([
+                "{$fieldPrefix}.variant_id" => [__('api.cart.variant_unavailable')],
+            ]);
+        }
+
         $variant->setRelation('catalogItem', $catalogItem);
         $variant->setRelation(
             'inventory',

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

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -70,7 +70,7 @@ class CompleteCheckoutService
             $purchase->update([
                 'status' => Purchase::STATUS_IN_REVIEW,
             ]);
-            $this->reservations->refreshForPurchase($purchase, null);
+            $this->reservations->clearExpirationForReview($purchase);
 
             return $this->loadPurchase($purchase);
         });

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

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 

app/Domains/Commerce/Purchase/Services/Checkout/InsufficientStockMessageBuilder.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
 
 class InsufficientStockMessageBuilder
 {

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

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Support\Collection;
 
 class PurchaseItemSnapshotFactory

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
+
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
+
+class PurchaseResponseLoader
+{
+    public function load(Purchase $purchase): Purchase
+    {
+        $purchase->loadMissing('tenant.storefrontWebsiteType');
+        $usesEventSummary = $purchase->tenant?->storefrontWebsiteType?->checkout_summary_type
+            === StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
+        $relations = [
+            'tenant',
+            'items.sourceCatalogItem.event.attachment',
+            'stockReservation',
+        ];
+
+        if (! $usesEventSummary) {
+            $relations[] = 'items.imageAttachment';
+        }
+
+        if (
+            $purchase->status === Purchase::STATUS_IN_REVIEW
+            && $purchase->payment_method === 'transfer'
+        ) {
+            $relations[] = 'telepagosPaymentCandidates.payment';
+        }
+
+        return $purchase->load($relations);
+    }
+}

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

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 
@@ -43,6 +44,11 @@ class ReleaseCheckoutService
         ): Purchase {
             $purchase = $this->lockPurchase($purchase);
 
+            if ($purchase->status === Purchase::STATUS_EXPIRED
+                && $targetStatus === Purchase::STATUS_CANCELLED) {
+                return $this->loadPurchase($purchase);
+            }
+
             if ($purchase->status === Purchase::STATUS_EXPIRED
                 && $targetStatus !== Purchase::STATUS_EXPIRED) {
                 throw new PurchaseExpiredException;
@@ -72,13 +78,30 @@ class ReleaseCheckoutService
 
             $cart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
 
+            // Leaving checkout is allowed at the exact instant the reservation
+            // expires. Finish the expiration while holding the purchase lock so
+            // the request is idempotent with the scheduled expiration job.
+            if ($targetStatus === Purchase::STATUS_CANCELLED
+                && $this->hasOverdueActiveReservation($purchase)) {
+                $targetStatus = Purchase::STATUS_EXPIRED;
+            }
+
             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);
+                if ($this->hasUnavailableVariants($cart)) {
+                    $this->releasePurchaseReservations($purchase, $targetStatus, $cart);
+                    $cart->update([
+                        'status' => Cart::STATUS_EXPIRED,
+                        'current_purchase_id' => null,
+                        'current_stock_reservation_id' => null,
+                    ]);
+                } else {
+                    $this->reservations->returnToCart($purchase, $cart);
+                }
                 $purchase->update(['status' => Purchase::STATUS_CANCELLED]);
 
                 return $this->loadPurchase($purchase);
@@ -102,6 +125,17 @@ class ReleaseCheckoutService
         });
     }
 
+    private function hasUnavailableVariants(Cart $cart): bool
+    {
+        return $cart->items()
+            ->whereNotNull('variant_id')
+            ->with(['variant.eventDate', 'variant.eventDates'])
+            ->lockForUpdate()
+            ->get()
+            ->contains(fn (CartItem $item): bool => $item->variant === null
+                || ! $item->variant->isSellable());
+    }
+
     private function releasePurchaseReservations(
         Purchase $purchase,
         string $targetStatus,

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

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 
 class SourceCartService
 {

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

@@ -1,18 +1,19 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\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 App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Cart\Services\CartVariantReplacementService;
+use App\Domains\Commerce\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Exceptions\InsufficientStockException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\UserPurchaseLimitService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -29,6 +30,7 @@ class StartCheckoutService
         private readonly InsufficientStockMessageBuilder $stockMessages,
         private readonly PurchaseResponseLoader $responses,
         private readonly PurchaseItemSnapshotFactory $snapshots,
+        private readonly CartVariantReplacementService $variantReplacements,
     ) {}
 
     /** @param array<string, mixed> $purchaseData */
@@ -250,6 +252,7 @@ class StartCheckoutService
         int $cartId,
     ): Purchase {
         $cart = $this->resolveCart($tenant, $userId, $cartId);
+        $this->variantReplacements->replaceHistoricalVariants($cart);
         $cartItems = $cart->items()->lockForUpdate()->get();
 
         if ($cartItems->isEmpty()) {
@@ -356,6 +359,13 @@ class StartCheckoutService
                     'cart_id' => __('api.purchase.catalog_item_wrong_tenant'),
                 ]);
             }
+
+            if ($tenant->active_event_id !== null
+                && $item->catalogItem->event_id !== $tenant->active_event_id) {
+                throw ValidationException::withMessages([
+                    'cart_id' => __('api.purchase.catalog_item_missing'),
+                ]);
+            }
         }
     }
 

app/Domains/Commerce/Purchase/Services/CheckoutService.php

@@ -1,15 +1,13 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\Checkout\CompleteCheckoutService;
-use App\Domains\Purchase\Services\Checkout\EditCheckoutService;
-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 App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\Checkout\CompleteCheckoutService;
+use App\Domains\Commerce\Purchase\Services\Checkout\EditCheckoutService;
+use App\Domains\Commerce\Purchase\Services\Checkout\ReleaseCheckoutService;
+use App\Domains\Commerce\Purchase\Services\Checkout\StartCheckoutService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -24,7 +22,6 @@ class CheckoutService
         private readonly EditCheckoutService $editor,
         private readonly CompleteCheckoutService $completer,
         private readonly ReleaseCheckoutService $releaser,
-        private readonly StockReservationService $reservations,
     ) {}
 
     /** @param array<string, mixed> $purchaseData */
@@ -78,9 +75,4 @@ class CheckoutService
     {
         return $this->releaser->expire($purchase);
     }
-
-    public function refreshReservationExpiration(Purchase $purchase, ?Carbon $expiresAt): void
-    {
-        $this->reservations->refreshForPurchase($purchase, $expiresAt);
-    }
 }

app/Domains/Commerce/Purchase/Services/DniDistanceService.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Domains\Commerce\Purchase\Services;
+
+/**
+ * Measures likely DNI typing errors using the optimal-string-alignment
+ * variant of the Damerau-Levenshtein distance.
+ *
+ * The returned value is the minimum number of single-character edits needed
+ * to transform one DNI into the other. Supported edits are insertion,
+ * deletion, substitution and transposition of two adjacent digits.
+ */
+class DniDistanceService
+{
+    /**
+     * Calculate the edit distance between two normalized DNI strings.
+     *
+     * Each matrix cell [row][column] stores the minimum edits required to
+     * transform the first $row digits of $left into the first $column digits
+     * of $right. The bottom-right cell therefore contains the final distance.
+     */
+    public function distance(string $left, string $right): int
+    {
+        $left = $this->normalize($left);
+        $right = $this->normalize($right);
+        $leftLength = strlen($left);
+        $rightLength = strlen($right);
+        $matrix = [];
+
+        // Transforming a prefix into an empty string requires deleting every digit.
+        for ($row = 0; $row <= $leftLength; $row++) {
+            $matrix[$row] = [$row];
+        }
+
+        // Transforming an empty string into a prefix requires inserting every digit.
+        for ($column = 0; $column <= $rightLength; $column++) {
+            $matrix[0][$column] = $column;
+        }
+
+        for ($row = 1; $row <= $leftLength; $row++) {
+            for ($column = 1; $column <= $rightLength; $column++) {
+                $substitutionCost = $left[$row - 1] === $right[$column - 1] ? 0 : 1;
+                $deletionDistance = $matrix[$row - 1][$column] + 1;
+                $insertionDistance = $matrix[$row][$column - 1] + 1;
+                $substitutionDistance = $matrix[$row - 1][$column - 1] + $substitutionCost;
+
+                // Keep the cheapest way to align the two prefixes at this position.
+                $matrix[$row][$column] = min(
+                    $deletionDistance,
+                    $insertionDistance,
+                    $substitutionDistance,
+                );
+
+                // Count two adjacent inverted digits as one edit instead of two substitutions.
+                if (
+                    $row > 1
+                    && $column > 1
+                    && $left[$row - 1] === $right[$column - 2]
+                    && $left[$row - 2] === $right[$column - 1]
+                ) {
+                    $matrix[$row][$column] = min(
+                        $matrix[$row][$column],
+                        $matrix[$row - 2][$column - 2] + 1,
+                    );
+                }
+            }
+        }
+
+        return $matrix[$leftLength][$rightLength];
+    }
+
+    /**
+     * Keep only digits and left-pad seven-digit DNIs so comparisons preserve
+     * the leading zero that is present when the DNI is extracted from a CUIT.
+     */
+    public function normalize(string $dni): string
+    {
+        $digits = preg_replace('/\D+/', '', $dni) ?? '';
+
+        return str_pad($digits, 8, '0', STR_PAD_LEFT);
+    }
+}

app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Commerce\Purchase\Services;
+
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
+use Illuminate\Database\Eloquent\Builder;
+
+class PurchaseRefundSummaryService
+{
+    public function totalForTenant(Tenant $tenant): string
+    {
+        $total = TicketRefund::query()
+            ->whereHas(
+                'purchaseItem.purchase',
+                fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo)
+            )
+            ->sum('amount');
+
+        return number_format((float) $total, 2, '.', '');
+    }
+}

app/Domains/Commerce/Purchase/Services/PurchaseStateGuard.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\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 App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Validation\ValidationException;
 
 class PurchaseStateGuard

app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -65,9 +65,10 @@ class TenantTransactionResetService
             DB::table('inventories')
                 ->whereIn('id', $scope['inventory_ids'])
                 ->update([
-                    'real_stock' => DB::raw('real_stock + sold_units'),
+                    'real_stock' => DB::raw('real_stock + sold_units - refunded_units'),
                     'reserved_stock' => 0,
                     'sold_units' => 0,
+                    'refunded_units' => 0,
                 ]);
 
             return $summary;

app/Domains/Commerce/Purchase/Services/UserPurchaseLimitService.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\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 App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseLimitExceededException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 

app/Domains/Commerce/Purchase/routes/api.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Purchase\Controllers\PurchaseController;
+use App\Domains\Commerce\Purchase\Controllers\PurchaseController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')->middleware('auth:sanctum')->group(function (): void {

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

@@ -1,17 +1,18 @@
 <?php
 
-namespace App\Domains\Sale\Controllers\AdminApp;
+namespace App\Domains\Commerce\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\Domains\Commerce\Sale\Requests\AdminAppSaleIndexRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSaleModificationIndexRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSaleModificationPdfRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSalePdfRequest;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleDetailResource;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleModificationResource;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleResource;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleTicketResource;
+use App\Domains\Commerce\Sale\Services\AdminAppSaleExcelService;
+use App\Domains\Commerce\Sale\Services\AdminAppSalePdfService;
+use App\Domains\Commerce\Sale\Services\AdminAppSaleService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -34,6 +35,7 @@ class SaleController extends Controller
             $this->saleService->sales($tenant, $request->validated())
         )->additional([
             'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant),
+            'refunded_total' => $this->saleService->refundedTotal($tenant),
         ]);
     }
 
@@ -67,11 +69,13 @@ class SaleController extends Controller
         return new SaleResource($this->saleService->cancel($tenant, $sale));
     }
 
-    public function modifications(Request $request): AnonymousResourceCollection
-    {
+    public function modifications(
+        AdminAppSaleModificationIndexRequest $request,
+    ): AnonymousResourceCollection {
         return SaleModificationResource::collection(
             $this->saleService->modifications(
-                $request->user()->tenant()->firstOrFail()
+                $request->user()->tenant()->firstOrFail(),
+                $request->validated(),
             )
         );
     }
@@ -93,7 +97,7 @@ class SaleController extends Controller
 
         return $this->salePdfService->downloadModifications(
             $tenant,
-            $this->saleService->modificationsForExport($tenant),
+            $this->saleService->modificationsForExport($tenant, $request->validated()),
             $request->validated('timezone'),
         );
     }
@@ -116,7 +120,7 @@ class SaleController extends Controller
 
         return $this->saleExcelService->downloadModifications(
             $tenant,
-            $this->saleService->modificationsForExport($tenant),
+            $this->saleService->modificationsForExport($tenant, $request->validated()),
             $request->validated('timezone'),
         );
     }

app/Domains/Commerce/Sale/Requests/AdminAppSaleIndexRequest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Sale\Requests;
+namespace App\Domains\Commerce\Sale\Requests;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -20,7 +20,7 @@ class AdminAppSaleIndexRequest extends FormRequest
             'q' => ['sometimes', 'nullable', 'string', 'max:255'],
             'id' => ['sometimes', 'nullable', 'integer', 'min:1'],
             'sale_date' => ['sometimes', 'nullable', 'date_format:Y-m-d'],
-            'status' => ['sometimes', 'nullable', 'string', Rule::in(Purchase::statuses())],
+            'status' => ['sometimes', 'nullable', 'string', Rule::in(Purchase::adminStatusCodes())],
             'sort_by' => ['sometimes', 'string', 'in:id,date,customer_name,quantity,status,total'],
             'sort_direction' => ['sometimes', 'string', 'in:asc,desc'],
             'page' => ['sometimes', 'integer', 'min:1'],

app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationIndexRequest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Domains\Commerce\Sale\Requests;
+
+class AdminAppSaleModificationIndexRequest extends AdminAppSaleIndexRequest
+{
+    /** @return array<string, list<string>> */
+    public function rules(): array
+    {
+        $rules = parent::rules();
+
+        unset($rules['sort_by'], $rules['sort_direction']);
+
+        return $rules;
+    }
+}