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

This reverts commit 5ad18694e1.

app/Domains/Cart/Services/CartService.php

@@ -7,6 +7,7 @@ use App\Domains\Cart\Models\Cart;
 use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Services\StockReservationService;
 use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Services\PurchaseStateGuard;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -20,6 +21,7 @@ class CartService
 {
     public function __construct(
         private readonly StockReservationService $reservations,
+        private readonly PurchaseStateGuard $purchaseState,
     ) {}
 
     public function show(Tenant $tenant, Request $request): Cart
@@ -116,10 +118,6 @@ class CartService
                 ->where('cart_id', $cart->getKey())
                 ->where('tenant_codigo', $tenant->codigo)
                 ->where('user_id', $user->getKey())
-                ->whereIn('status', [
-                    Purchase::STATUS_CREATED,
-                    Purchase::STATUS_PENDING_PAYMENT,
-                ])
                 ->whereDoesntHave('items')
                 ->lockForUpdate()
                 ->first();
@@ -128,10 +126,13 @@ class CartService
                 throw new NotFoundHttpException('Checkout cart not found.');
             }
 
-            if ($purchase->expires_at !== null && $purchase->expires_at->isPast()) {
+            $this->purchaseState->assertNotExpired($purchase);
-                throw ValidationException::withMessages([
+
-                    'cart' => __('api.purchase.not_editable'),
+            if (! in_array($purchase->status, [
-                ]);
+                Purchase::STATUS_CREATED,
+                Purchase::STATUS_PENDING_PAYMENT,
+            ], true)) {
+                throw new NotFoundHttpException('Checkout cart not found.');
             }
 
             /** @var Cart|null $checkoutCart */
@@ -246,10 +247,6 @@ class CartService
                 ->where('cart_id', $cart->getKey())
                 ->where('tenant_codigo', $tenant->codigo)
                 ->where('user_id', $user->getKey())
-                ->whereIn('status', [
-                    Purchase::STATUS_CREATED,
-                    Purchase::STATUS_PENDING_PAYMENT,
-                ])
                 ->whereDoesntHave('items')
                 ->lockForUpdate()
                 ->first();
@@ -258,10 +255,13 @@ class CartService
                 throw new NotFoundHttpException('Checkout cart not found.');
             }
 
-            if ($purchase->expires_at !== null && $purchase->expires_at->isPast()) {
+            $this->purchaseState->assertNotExpired($purchase);
-                throw ValidationException::withMessages([
+
-                    'cart' => __('api.purchase.not_editable'),
+            if (! in_array($purchase->status, [
-                ]);
+                Purchase::STATUS_CREATED,
+                Purchase::STATUS_PENDING_PAYMENT,
+            ], true)) {
+                throw new NotFoundHttpException('Checkout cart not found.');
             }
 
             /** @var Cart|null $checkoutCart */
@@ -296,16 +296,22 @@ class CartService
 
     public function makeGuestTokenCookie(string $guestToken): Cookie
     {
-        return cookie(
+        $secure = (bool) config('session.secure');
-            'guest_token',
+        $sameSite = config('session.same_site');
-            $guestToken,
+        $partitioned = (bool) config('session.partitioned')
-            60 * 24 * 180,
+            || ($secure && strtolower((string) $sameSite) === 'none');
-            '/',
+
-            config('session.domain'),
+        return Cookie::create(
-            (bool) config('session.secure'),
+            name: 'guest_token',
-            true,
+            value: $guestToken,
-            false,
+            expire: now()->addDays(180),
-            config('session.same_site'),
+            path: '/',
+            domain: config('session.domain'),
+            secure: $secure,
+            httpOnly: true,
+            raw: false,
+            sameSite: $sameSite,
+            partitioned: $partitioned,
         );
     }
 

app/Domains/Cart/routes/api.php

@@ -14,6 +14,6 @@ Route::prefix('tenants/{tenant:codigo}')
 Route::prefix('tenants/{tenant:codigo}')
     ->middleware('auth:sanctum')
     ->group(function (): void {
-        Route::patch('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'updateCheckoutItem']);
+        Route::patch('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'updateCheckoutItem'])->withTrashed();
-        Route::delete('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'removeCheckoutItem']);
+        Route::delete('checkout-carts/{cart}/items/{cartItem}', [CartController::class, 'removeCheckoutItem'])->withTrashed();
     });

app/Domains/Catalog/Models/FeaturedGroup.php

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

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

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

app/Domains/Catalog/Resources/CatalogFeaturedGroupResource.php

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

app/Domains/Purchase/Controllers/PurchaseController.php

@@ -12,6 +12,7 @@ use App\Domains\Purchase\Requests\UpdatePurchaseItemRequest;
 use App\Domains\Purchase\Resources\PurchaseResource;
 use App\Domains\Purchase\Services\Checkout\PurchaseResponseLoader;
 use App\Domains\Purchase\Services\CheckoutService;
+use App\Domains\Purchase\Services\PurchaseStateGuard;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
@@ -132,42 +133,48 @@ class PurchaseController extends Controller
         Tenant $tenant,
         Purchase $compra,
         CheckoutService $checkoutService,
+        PurchaseStateGuard $purchaseState,
     ): JsonResponse {
         $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
         $method = $request->validated('method');
-        $totalAmount = $compra->calculateCurrentTotalAmount();
+        $transferPayerDni = $method === 'transfer'
+            ? preg_replace('/\D+/', '', (string) $request->validated('transfer_payer_dni'))
+            : null;
 
-        $purchaseUpdate = [
+        $updated = DB::transaction(function () use ($compra, $method, $purchaseState, $transferPayerDni): bool {
-            'payment_method' => $method,
-            'status' => Purchase::STATUS_PENDING_PAYMENT,
-            'expires_at' => now()->addMinutes(
-                max(1, (int) config("purchase.payment_expiration_minutes.{$method}", 30))
-            ),
-            'total' => $totalAmount,
-        ];
-
-        if ($method === 'transfer') {
-            $purchaseUpdate['transfer_payer_dni'] = preg_replace('/\D+/', '', (string) $request->validated('transfer_payer_dni'));
-        }
-
-        $updated = DB::transaction(function () use ($compra, $purchaseUpdate): bool {
             /** @var Purchase|null $purchase */
             $purchase = Purchase::query()
                 ->whereKey($compra->getKey())
                 ->lockForUpdate()
                 ->first();
 
+            if ($purchase === null) {
+                return false;
+            }
+
+            $purchaseState->assertNotExpired($purchase);
+
             if (
-                $purchase === null
+                ! in_array($purchase->status, [
-                || ! in_array($purchase->status, [
                     Purchase::STATUS_CREATED,
                     Purchase::STATUS_PENDING_PAYMENT,
                 ], true)
-                || ($purchase->expires_at !== null && $purchase->expires_at->isPast())
             ) {
                 return false;
             }
 
+            $purchaseUpdate = [
+                'payment_method' => $method,
+                'status' => Purchase::STATUS_PENDING_PAYMENT,
+                'expires_at' => now()->addMinutes(
+                    max(1, (int) config("purchase.payment_expiration_minutes.{$method}", 30))
+                ),
+                'total' => $purchase->calculateCurrentTotalAmount(),
+            ];
+
+            if ($transferPayerDni !== null) {
+                $purchaseUpdate['transfer_payer_dni'] = $transferPayerDni;
+            }
             $purchase->update($purchaseUpdate);
 
             return true;
@@ -180,6 +187,7 @@ class PurchaseController extends Controller
         }
 
         $compra->refresh();
+        $totalAmount = (float) $compra->total;
         $checkoutService->syncReservationExpiration($compra);
 
         if ($method === 'transfer') {

app/Domains/Purchase/Exceptions/PurchaseExpiredException.php

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

app/Domains/Purchase/Resources/PurchaseResource.php

@@ -21,15 +21,18 @@ class PurchaseResource extends JsonResource
         $purchaseItems = $this->resource->relationLoaded('items')
             ? $this->resource->getRelation('items')
             : collect();
-        $cartItems = $purchaseItems->isEmpty()
+        $cartItems = $this->resource->relationLoaded('cart')
-            && $this->resource->relationLoaded('cart')
             && $this->resource->getRelation('cart')?->relationLoaded('items')
                 ? $this->resource->getRelation('cart')->getRelation('items')
-                : collect();
+                : null;
-        $items = $purchaseItems->isNotEmpty() ? $purchaseItems : $cartItems;
+        $usesCartItems = in_array($this->status, [
-        $itemsSource = $purchaseItems->isNotEmpty()
+            Purchase::STATUS_CREATED,
-            ? 'purchase'
+            Purchase::STATUS_PENDING_PAYMENT,
-            : ($cartItems->isNotEmpty() ? 'cart' : null);
+        ], true) && $cartItems !== null;
+        $items = $usesCartItems ? $cartItems : $purchaseItems;
+        $itemsSource = $usesCartItems
+            ? 'cart'
+            : ($purchaseItems->isNotEmpty() ? 'purchase' : null);
         $ticketsCount = array_key_exists('tickets_count', $this->resource->getAttributes())
             ? (int) $this->resource->getAttribute('tickets_count')
             : null;

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

@@ -5,6 +5,7 @@ namespace App\Domains\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 Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -15,12 +16,14 @@ class CompleteCheckoutService
         private readonly StockReservationService $reservations,
         private readonly SourceCartService $sourceCart,
         private readonly PurchaseItemSnapshotFactory $snapshots,
+        private readonly PurchaseStateGuard $purchaseState,
     ) {}
 
     public function complete(Purchase $purchase): Purchase
     {
         return DB::transaction(function () use ($purchase): Purchase {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
 
             if ($purchase->payment_method === null) {
                 throw ValidationException::withMessages([
@@ -45,6 +48,7 @@ class CompleteCheckoutService
     {
         return DB::transaction(function () use ($purchase): Purchase {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
 
             if ($purchase->status === Purchase::STATUS_PAID) {
                 return $this->loadPurchase($purchase);
@@ -70,6 +74,7 @@ class CompleteCheckoutService
     {
         DB::transaction(function () use ($purchase): void {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
 
             if ($purchase->status === Purchase::STATUS_PAID) {
                 return;

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

@@ -6,6 +6,7 @@ use App\Domains\Catalog\Models\Variant;
 use App\Domains\Catalog\Services\CatalogInventoryService;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
+use App\Domains\Purchase\Services\PurchaseStateGuard;
 use App\Domains\Purchase\Services\UserPurchaseLimitService;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -20,6 +21,7 @@ class EditCheckoutService
         private readonly SourceCartService $sourceCart,
         private readonly PurchaseItemSnapshotFactory $snapshots,
         private readonly PurchaseResponseLoader $responses,
+        private readonly PurchaseStateGuard $purchaseState,
     ) {}
 
     /** @param array<string, string> $customerData */
@@ -27,6 +29,7 @@ class EditCheckoutService
     {
         return DB::transaction(function () use ($purchase, $customerData): Purchase {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
             $this->assertEditable($purchase);
 
             $purchase->update($customerData);
@@ -50,6 +53,7 @@ class EditCheckoutService
             $updateVariant,
         ): Purchase {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
 
             if ($purchase->status !== Purchase::STATUS_CREATED || $this->hasExpired($purchase)) {
                 throw ValidationException::withMessages([
@@ -182,6 +186,7 @@ class EditCheckoutService
     {
         return DB::transaction(function () use ($purchase): Purchase {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
             $this->assertEditable($purchase);
 
             if (! $purchase->tenant()->firstOrFail()->checkout_editing_policy->allowsModification()) {
@@ -208,6 +213,7 @@ class EditCheckoutService
     {
         return DB::transaction(function () use ($purchase, $purchaseItem): Purchase {
             $purchase = $this->lockPurchase($purchase);
+            $this->purchaseState->assertNotExpired($purchase);
             $this->assertEditable($purchase);
 
             if (! $purchase->tenant()->firstOrFail()->checkout_editing_policy->allowsRemoval()) {

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

@@ -10,7 +10,16 @@ class PurchaseResponseLoader
     {
         $purchase->load(['tenant', 'items.imageAttachment']);
 
-        if ($purchase->items->isEmpty() && $purchase->cart_id !== null) {
+        if (
+            $purchase->cart_id !== null
+            && (
+                in_array($purchase->status, [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                ], true)
+                || $purchase->items->isEmpty()
+            )
+        ) {
             $purchase->load([
                 'cart.items.catalogItem.inventory',
                 'cart.items.catalogItem.attachments',

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

@@ -5,29 +5,33 @@ namespace App\Domains\Purchase\Services\Checkout;
 use App\Domains\Catalog\Models\StockReservation;
 use App\Domains\Catalog\Services\StockReservationService;
 use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Services\PurchaseStateGuard;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
+use Throwable;
 
 class ReleaseCheckoutService
 {
     public function __construct(
         private readonly StockReservationService $reservations,
         private readonly SourceCartService $sourceCart,
+        private readonly PurchaseStateGuard $purchaseState,
     ) {}
 
     public function cancel(Purchase $purchase): Purchase
     {
-        return $this->release($purchase, Purchase::STATUS_CANCELLED, restoreCart: true);
+        return $this->release($purchase, Purchase::STATUS_CANCELLED);
     }
 
     public function cancelWithoutRestoringCart(Purchase $purchase): Purchase
     {
-        return $this->release($purchase, Purchase::STATUS_CANCELLED, restoreCart: false);
+        return $this->release($purchase, Purchase::STATUS_CANCELLED);
     }
 
     public function expire(Purchase $purchase): Purchase
     {
-        return $this->release($purchase, Purchase::STATUS_EXPIRED, restoreCart: true);
+        return $this->release($purchase, Purchase::STATUS_EXPIRED);
     }
 
     public function expireOverdue(): int
@@ -40,7 +44,21 @@ class ReleaseCheckoutService
             ->where('expires_at', '<=', now())
             ->orderBy('id')
             ->eachById(function (Purchase $purchase) use (&$expiredCount): void {
-                $purchase = $this->expire($purchase);
+                try {
+                    $purchase = $this->expire($purchase);
+                } catch (Throwable $exception) {
+                    Log::channel('commands')->error('Failed to expire overdue purchase.', [
+                        'command' => 'reservations:expire',
+                        'purchase_id' => $purchase->getKey(),
+                        'tenant_codigo' => $purchase->tenant_codigo,
+                        'cart_id' => $purchase->cart_id,
+                        'status' => $purchase->status,
+                        'expires_at' => $purchase->expires_at,
+                        'exception' => $exception,
+                    ]);
+
+                    return;
+                }
 
                 if ($purchase->status === Purchase::STATUS_EXPIRED) {
                     $expiredCount++;
@@ -50,11 +68,15 @@ class ReleaseCheckoutService
         return $expiredCount;
     }
 
-    private function release(Purchase $purchase, string $targetStatus, bool $restoreCart): Purchase
+    private function release(Purchase $purchase, string $targetStatus): Purchase
     {
-        return DB::transaction(function () use ($purchase, $targetStatus, $restoreCart): Purchase {
+        return DB::transaction(function () use ($purchase, $targetStatus): Purchase {
             $purchase = $this->lockPurchase($purchase);
 
+            if ($targetStatus !== Purchase::STATUS_EXPIRED) {
+                $this->purchaseState->assertNotExpired($purchase);
+            }
+
             if ($purchase->status === Purchase::STATUS_PAID) {
                 if ($targetStatus === Purchase::STATUS_EXPIRED) {
                     return $this->loadPurchase($purchase);
@@ -82,8 +104,7 @@ class ReleaseCheckoutService
                 ]);
             }
 
-            $reservationReturnedToCart = $restoreCart && $this->sourceCart->restore($purchase);
+            $this->releaseCartReservations($purchase, $targetStatus);
-            $this->releaseCartReservations($purchase, $reservationReturnedToCart, $targetStatus);
 
             $purchase->update(['status' => $targetStatus]);
 
@@ -93,15 +114,8 @@ class ReleaseCheckoutService
 
     private function releaseCartReservations(
         Purchase $purchase,
-        bool $reservationReturnedToCart,
         string $targetStatus,
     ): void {
-        if ($reservationReturnedToCart) {
-            $this->reservations->detachFromPurchase($purchase);
-
-            return;
-        }
-
         $cart = $purchase->cart()->withTrashed()->lockForUpdate()->first();
         if ($cart === null) {
             return;

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

@@ -3,65 +3,10 @@
 namespace App\Domains\Purchase\Services\Checkout;
 
 use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Services\StockReservationService;
 use App\Domains\Purchase\Models\Purchase;
 
 class SourceCartService
 {
-    public function __construct(
-        private readonly StockReservationService $reservations,
-    ) {}
-
-    public function restore(Purchase $purchase): bool
-    {
-        $sourceCart = $this->findSourceCart($purchase);
-
-        if ($sourceCart === null) {
-            return false;
-        }
-
-        if ($sourceCart->origin === Cart::ORIGIN_DIRECT_CHECKOUT) {
-            return false;
-        }
-
-        /** @var Cart|null $activeCart */
-        $activeCart = Cart::query()
-            ->where('tenant_codigo', $purchase->tenant_codigo)
-            ->where('user_id', $purchase->user_id)
-            ->where('status', 'active')
-            ->where('id', '!=', $sourceCart->getKey())
-            ->lockForUpdate()
-            ->first();
-
-        if ($activeCart !== null) {
-            $this->mergeIntoActiveCart($sourceCart, $activeCart);
-
-            $sourceCart->update([
-                'status' => 'converted',
-                'guest_token' => null,
-            ]);
-
-            if (! $sourceCart->trashed()) {
-                $sourceCart->delete();
-            }
-
-            return true;
-        }
-
-        if ($sourceCart->trashed()) {
-            $sourceCart->restore();
-        }
-
-        $sourceCart->update([
-            'status' => 'active',
-            'user_id' => $purchase->user_id,
-            'guest_token' => null,
-        ]);
-
-        return true;
-    }
-
     public function syncItemQuantity(
         Purchase $purchase,
         PurchaseItem $purchaseItem,
@@ -171,30 +116,4 @@ class SourceCartService
             ->lockForUpdate()
             ->first();
     }
-
-    private function mergeIntoActiveCart(Cart $sourceCart, Cart $activeCart): void
-    {
-        $sourceItems = $sourceCart->items()->lockForUpdate()->get();
-
-        foreach ($sourceItems as $sourceItem) {
-            /** @var CartItem|null $activeItem */
-            $activeItem = $activeCart->items()
-                ->where('catalog_item_id', $sourceItem->catalog_item_id)
-                ->where('variant_id', $sourceItem->variant_id)
-                ->lockForUpdate()
-                ->first();
-
-            if ($activeItem === null) {
-                $activeItem = $activeCart->items()->create([
-                    'catalog_item_id' => $sourceItem->catalog_item_id,
-                    'variant_id' => $sourceItem->variant_id,
-                    'cantidad' => $sourceItem->cantidad,
-                ]);
-            } else {
-                $activeItem->increment('cantidad', (int) $sourceItem->cantidad);
-            }
-
-            $this->reservations->transfer($sourceItem, $activeItem);
-        }
-    }
 }

app/Domains/Purchase/Services/PurchaseStateGuard.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Domains\Purchase\Services;
+
+use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Purchase\Models\Purchase;
+
+class PurchaseStateGuard
+{
+    public function assertNotExpired(Purchase $purchase): void
+    {
+        $hasExpiredStatus = $purchase->status === Purchase::STATUS_EXPIRED;
+        $hasExpiredByTime = in_array($purchase->status, [
+            Purchase::STATUS_CREATED,
+            Purchase::STATUS_PENDING_PAYMENT,
+        ], true)
+            && $purchase->expires_at !== null
+            && $purchase->expires_at->isPast();
+
+        if ($hasExpiredStatus || $hasExpiredByTime) {
+            throw new PurchaseExpiredException;
+        }
+    }
+}

app/Domains/Purchase/documentacion/README.md

@@ -19,7 +19,7 @@ Implementa el ciclo de compra y checkout: crea la cabecera de compra desde un ca
 - `EditCheckoutService`: modifica los datos del comprador antes del cierre.
 - `CompleteCheckoutService`: completa, envía a revisión o materializa los `PurchaseItem` al confirmar el pago.
 - `ReleaseCheckoutService`: cancela, vence y procesa vencimientos pendientes.
-- `SourceCartService`: restaura o finaliza el carrito fuente.
+- `SourceCartService`: sincroniza o finaliza el carrito de checkout asociado a la compra.
 - `CatalogSelectionResolver` y `PurchaseItemSnapshotFactory`: resuelven selecciones y generan snapshots.
 
 Durante `created` y `pending_payment`, `PurchaseResource` publica las líneas del carrito con `items_source=cart`; una compra materializada publica `items_source=purchase`. Los datos descriptivos y económicos del checkout se resuelven siempre desde el catálogo vigente.

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

@@ -2,10 +2,12 @@
 
 namespace App\Domains\Sale\Resources\AdminApp;
 
+use App\Domains\Cart\Models\CartItem;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Collection;
 
 /** @mixin Purchase */
 class SaleDetailResource extends JsonResource
@@ -13,23 +15,44 @@ class SaleDetailResource extends JsonResource
     /** @return array<string, mixed> */
     public function toArray(Request $request): array
     {
+        $items = $this->saleItems();
+
         return [
             'id' => $this->id,
-            'items' => $this->items->map(fn (PurchaseItem $item): array => [
+            'items' => $items->map(fn (PurchaseItem|CartItem $item): array => [
                 'id' => $item->id,
-                'product' => $item->item_nombre,
+                'product' => $item instanceof PurchaseItem
+                    ? $item->item_nombre
+                    : $item->selectedItem()?->getName(),
                 'event_dates' => $this->eventDates($item),
                 'quantity' => (int) $item->cantidad,
-                'unit_price' => $this->formatMoney($item->precio_unitario),
+                'unit_price' => $this->formatMoney($this->unitPrice($item)),
-                'total' => $this->formatMoney($item->total),
+                'total' => $this->formatMoney($this->lineTotal($item)),
             ])->values(),
             'total' => $this->formatMoney($this->total),
         ];
     }
 
-    /** @return list<string> */
+    /** @return Collection<int, PurchaseItem|CartItem> */
-    private function eventDates(PurchaseItem $item): array
+    private function saleItems(): Collection
     {
+        if ($this->items->isNotEmpty()) {
+            return $this->items;
+        }
+
+        return $this->cart?->items ?? collect();
+    }
+
+    /** @return list<string> */
+    private function eventDates(PurchaseItem|CartItem $item): array
+    {
+        if ($item instanceof CartItem) {
+            return $item->variant?->selectedEventDates()
+                ->map(fn ($eventDate): string => $eventDate->date->format('Y-m-d'))
+                ->values()
+                ->all() ?? [];
+        }
+
         return collect($item->variant_attributes ?? [])
             ->filter(fn (mixed $attribute): bool => is_array($attribute)
                 && mb_strtolower(trim((string) ($attribute['name'] ?? ''))) === 'fecha')
@@ -43,6 +66,20 @@ class SaleDetailResource extends JsonResource
             ->all();
     }
 
+    private function unitPrice(PurchaseItem|CartItem $item): float|int|string|null
+    {
+        return $item instanceof PurchaseItem
+            ? $item->precio_unitario
+            : $item->selectedItem()?->getPrice();
+    }
+
+    private function lineTotal(PurchaseItem|CartItem $item): float|int|string|null
+    {
+        return $item instanceof PurchaseItem
+            ? $item->total
+            : ($item->selectedItem()?->getPrice() ?? 0) * $item->cantidad;
+    }
+
     private function formatMoney(float|int|string|null $amount): string
     {
         return number_format((float) ($amount ?? 0), 2, '.', '');

app/Domains/Sale/Services/AdminAppSaleService.php

@@ -51,7 +51,14 @@ class AdminAppSaleService
     {
         return Purchase::query()
             ->where('tenant_codigo', $tenant->codigo)
-            ->with('items')
+            ->with([
+                'items',
+                'cart' => fn ($query) => $query->withTrashed(),
+                'cart.items.catalogItem',
+                'cart.items.variant.catalogItem',
+                'cart.items.variant.eventDates',
+                'cart.items.variant.eventDate',
+            ])
             ->findOrFail($saleId);
     }
 
@@ -145,7 +152,18 @@ class AdminAppSaleService
                 $filters['status'] ?? null,
                 fn (Builder $query, string $status): Builder => $query->where('status', $status)
             )
-            ->withSum('items as quantity', 'cantidad')
+            ->select('compras.*')
+            ->selectRaw(
+                'CASE WHEN compras.status IN (?, ?) '
+                .'THEN (SELECT COALESCE(SUM(cart_items.cantidad), 0) FROM carrito_items AS cart_items '
+                .'WHERE cart_items.cart_id = compras.cart_id) '
+                .'ELSE (SELECT COALESCE(SUM(purchase_items.cantidad), 0) FROM compra_items AS purchase_items '
+                .'WHERE purchase_items.compra_id = compras.id) END AS quantity',
+                [
+                    Purchase::STATUS_CREATED,
+                    Purchase::STATUS_PENDING_PAYMENT,
+                ],
+            )
             ->withCount('tickets')
             ->orderBy($sortColumns[$sortBy], $sortDirection)
             ->when($sortBy !== 'id', fn (Builder $query): Builder => $query->orderByDesc('id'));
@@ -171,8 +189,28 @@ class AdminAppSaleService
 
     protected function saleForResponse(Purchase $sale): Purchase
     {
-        return $sale->refresh()
+        /** @var Purchase */
-            ->loadSum('items as quantity', 'cantidad')
+        return Purchase::query()
-            ->loadCount('tickets');
+            ->select('compras.*')
+            ->selectRaw($this->quantityExpression())
+            ->withCount('tickets')
+            ->findOrFail($sale->getKey());
+    }
+
+    protected function quantityExpression(): string
+    {
+        // El fallback se resuelve en SQL para poder ordenar por cantidad antes de paginar;
+        // los ítems consolidados de la compra tienen prioridad sobre los del carrito de origen.
+        return <<<'SQL'
+            COALESCE(
+                (SELECT SUM(compra_items.cantidad)
+                 FROM compra_items
+                 WHERE compra_items.compra_id = compras.id),
+                (SELECT SUM(carrito_items.cantidad)
+                 FROM carrito_items
+                 WHERE carrito_items.cart_id = compras.cart_id),
+                0
+            ) AS quantity
+            SQL;
     }
 }

app/Domains/Tenant/Models/Tenant.php

@@ -27,6 +27,8 @@ use Illuminate\Support\Facades\Schema;
     'dominio',
     'base_path',
     'site_title',
+    'address',
+    'phone',
     'primary_color',
     'secondary_color',
     'danger_color',

app/Domains/Tenant/Requests/StoreTenantRequest.php

@@ -82,6 +82,8 @@ class StoreTenantRequest extends FormRequest
                     ->where('dominio', $this->input('dominio')),
             ],
             'site_title' => ['sometimes', 'nullable', 'string', 'max:255'],
+            'address' => ['sometimes', 'nullable', 'string', 'max:255'],
+            'phone' => ['sometimes', 'nullable', 'string', 'max:255'],
             'primary_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
             'secondary_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
             'danger_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],

app/Domains/Tenant/Requests/UpdateTenantRequest.php

@@ -103,6 +103,8 @@ class UpdateTenantRequest extends FormRequest
                     ->ignore($tenant?->id),
             ],
             'site_title' => ['sometimes', 'nullable', 'string', 'max:255'],
+            'address' => ['sometimes', 'nullable', 'string', 'max:255'],
+            'phone' => ['sometimes', 'nullable', 'string', 'max:255'],
             'primary_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
             'secondary_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
             'danger_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],

app/Domains/Tenant/Resources/TenantResource.php

@@ -32,6 +32,8 @@ class TenantResource extends JsonResource
             'site_title' => $this->site_title
                 ?? $this->websiteType?->site_title
                 ?? 'ShopitFront',
+            'address' => $this->address,
+            'phone' => $this->phone,
             'favicon' => ($this->favicon ?? $this->websiteType?->favicon)
                 ?->getTemporaryUrl(1440),
             'primary_color' => $this->primary_color,

bootstrap/app.php

@@ -2,6 +2,7 @@
 
 use App\Domains\Auth\Exceptions\AccountLockedException;
 use App\Domains\Purchase\Exceptions\InsufficientStockException;
+use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
 use App\Domains\Purchase\Exceptions\PurchaseLimitExceededException;
 use App\Domains\Ticket\Exceptions\TicketNotAvailableException;
 use App\Http\Middleware\EnsureAdminAppTenant;
@@ -102,6 +103,16 @@ return Application::configure(basePath: dirname(__DIR__))
                 'maximum_addable_quantity' => $exception->maximumAddableQuantity,
             ], 422);
         });
+        $exceptions->render(function (PurchaseExpiredException $exception, Request $request) {
+            if (! $request->is('api/*')) {
+                return null;
+            }
+
+            return response()->json([
+                'code' => 'purchase.expired',
+                'message' => $exception->getMessage(),
+            ], 422);
+        });
         $exceptions->render(function (ModelNotFoundException $exception, Request $request) {
             if (! $request->is('api/*')) {
                 return null;

database/migrations/2026_08_20_000000_add_contact_fields_to_tenants_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('tenants', function (Blueprint $table): void {
+            $table->string('address')->nullable()->after('site_title');
+            $table->string('phone')->nullable()->after('address');
+        });
+
+        DB::table('tenants')->update([
+            'address' => 'Av. San Lorenzo 1542, Rosario',
+            'phone' => '54 9 (0341) 6658247',
+        ]);
+    }
+
+    public function down(): void
+    {
+        Schema::table('tenants', function (Blueprint $table): void {
+            $table->dropColumn(['address', 'phone']);
+        });
+    }
+};

database/migrations/2026_08_20_010000_add_code_to_featured_groups.php

@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('featured_groups', function (Blueprint $table): void {
+            $table->string('code')->nullable()->after('tenant_code');
+        });
+
+        $usedCodes = [];
+
+        DB::table('featured_groups')
+            ->select(['id', 'tenant_code', 'group_name'])
+            ->orderBy('id')
+            ->get()
+            ->each(function (object $group) use (&$usedCodes): void {
+                $baseCode = Str::slug($group->group_name) ?: "group-{$group->id}";
+                $code = $baseCode;
+                $suffix = 2;
+
+                while (isset($usedCodes[$group->tenant_code][$code])) {
+                    $code = "{$baseCode}-{$suffix}";
+                    $suffix++;
+                }
+
+                $usedCodes[$group->tenant_code][$code] = true;
+
+                DB::table('featured_groups')
+                    ->where('id', $group->id)
+                    ->update(['code' => $code]);
+            });
+
+        Schema::table('featured_groups', function (Blueprint $table): void {
+            $table->string('code')->nullable(false)->change();
+            $table->unique(['tenant_code', 'code']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('featured_groups', function (Blueprint $table): void {
+            $table->dropUnique(['tenant_code', 'code']);
+            $table->dropColumn('code');
+        });
+    }
+};

database/migrations/2026_08_20_020000_enable_full_cart_editing_for_desfile.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    private const TENANT_CODE = 'desfile_pura_tendencia';
+
+    public function up(): void
+    {
+        DB::table('tenants')
+            ->where('codigo', self::TENANT_CODE)
+            ->update(['cart_editing_policy' => 'full']);
+    }
+
+    public function down(): void
+    {
+        DB::table('tenants')
+            ->where('codigo', self::TENANT_CODE)
+            ->update(['cart_editing_policy' => 'disabled']);
+    }
+};

database/seeders/DesfilePuraTendenciaSeeder.php

@@ -74,7 +74,7 @@ class DesfilePuraTendenciaSeeder extends Seeder
             'display_categories' => false,
             'display_seach_bar' => false,
             'display_cart' => true,
-            'cart_editing_policy' => 'disabled',
+            'cart_editing_policy' => 'full',
             'checkout_editing_policy' => 'disabled',
             'display_cart_item_images' => false,
             'scanner_category_validation_enabled' => false,

lang/en/api.php

@@ -36,6 +36,7 @@ return [
         'variant_required' => 'You must select a variant for this item.',
     ],
     'purchase' => [
+        'expired' => 'The purchase has expired. Please start a new purchase.',
         'variant_change_disabled' => 'Variant changes are disabled for this purchase.',
         'source_required' => 'A cart or direct item is required.',
         'payment_method_required' => 'The purchase payment method must be selected before finalizing.',

lang/es/api.php

@@ -36,6 +36,7 @@ return [
         'variant_required' => 'Debe seleccionar una variante para este ítem.',
     ],
     'purchase' => [
+        'expired' => "La compra venci\u{00F3}. Inici\u{00E1} una nueva compra.",
         'variant_change_disabled' => 'El cambio de variante está deshabilitado para esta compra.',
         'source_required' => 'Se requiere un carrito o un producto directo.',
         'payment_method_required' => 'Debes seleccionar el método de pago antes de finalizar la compra.',

tests/Feature/Cart/CartControllerTest.php

@@ -63,6 +63,7 @@ class CartControllerTest extends TestCase
         $this->assertTrue($guestTokenCookie->isSecure());
         $this->assertTrue($guestTokenCookie->isHttpOnly());
         $this->assertSame('none', $guestTokenCookie->getSameSite());
+        $this->assertTrue($guestTokenCookie->isPartitioned());
 
         $this->assertDatabaseHas('carrito_items', [
             'catalog_item_id' => $item->id,

tests/Feature/Catalog/OnTicketFeaturedGroupControllerTest.php

@@ -81,6 +81,7 @@ class OnTicketFeaturedGroupControllerTest extends TestCase
             'is_featured' => true,
         ])
             ->assertCreated()
+            ->assertJsonPath('data.code', 'food')
             ->assertJsonPath('data.category_name', 'Food')
             ->assertJsonPath('data.group_name', 'Food')
             ->assertJsonPath('data.is_featured', true)
@@ -96,6 +97,7 @@ class OnTicketFeaturedGroupControllerTest extends TestCase
         ]);
         $this->assertDatabaseHas('featured_groups', [
             'tenant_code' => $tenant->codigo,
+            'code' => 'food',
             'source_type' => 'category',
             'category_id' => $categoryId,
             'product_layout' => 'row',
@@ -130,6 +132,7 @@ class OnTicketFeaturedGroupControllerTest extends TestCase
             'is_featured' => true,
         ])
             ->assertOk()
+            ->assertJsonPath('data.code', 'old-name')
             ->assertJsonPath('data.category_name', 'New name')
             ->assertJsonPath('data.group_name', 'New name')
             ->assertJsonPath('data.is_featured', true)
@@ -142,6 +145,7 @@ class OnTicketFeaturedGroupControllerTest extends TestCase
         ]);
         $this->assertDatabaseHas('featured_groups', [
             'id' => $group->id,
+            'code' => 'old-name',
             'group_name' => 'New name',
             'product_layout' => 'row',
             'group_layout' => 'paginated',

tests/Feature/Migrations/EnableFullCartEditingForDesfileTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature\Migrations;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class EnableFullCartEditingForDesfileTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_it_enables_quantity_variant_and_removal_changes_for_desfile(): void
+    {
+        $migration = require database_path(
+            'migrations/2026_08_20_020000_enable_full_cart_editing_for_desfile.php'
+        );
+
+        $migration->down();
+        $migration->up();
+
+        $this->assertDatabaseHas('tenants', [
+            'codigo' => 'desfile_pura_tendencia',
+            'cart_editing_policy' => 'full',
+        ]);
+    }
+}

tests/Feature/Purchase/PurchaseExpiredExceptionResponseTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Feature\Purchase;
+
+use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
+use Illuminate\Support\Facades\Route;
+use Tests\TestCase;
+
+class PurchaseExpiredExceptionResponseTest extends TestCase
+{
+    public function test_it_returns_a_stable_api_error_for_an_expired_purchase(): void
+    {
+        Route::get('/api/test/purchase-expired', function (): never {
+            throw new PurchaseExpiredException;
+        });
+
+        $this->getJson('/api/test/purchase-expired')
+            ->assertUnprocessable()
+            ->assertExactJson([
+                'code' => 'purchase.expired',
+                'message' => __('api.purchase.expired'),
+            ]);
+    }
+}

tests/Feature/Purchase/StorePurchaseTest.php

@@ -412,7 +412,7 @@ class StorePurchaseTest extends TestCase
         ]);
     }
 
-    public function test_it_restores_the_source_cart_when_checkout_is_cancelled(): void
+    public function test_it_releases_and_closes_the_checkout_cart_when_purchase_is_cancelled(): void
     {
         $this->createTenant('sonder', 'Sonder', 'sonder.com.ar');
         $user = User::factory()->create();
@@ -430,11 +430,10 @@ class StorePurchaseTest extends TestCase
             ->assertOk()
             ->assertJsonPath('data.status', Purchase::STATUS_CANCELLED);
 
-        $this->assertDatabaseHas('carritos', [
+        $this->assertSoftDeleted('carritos', [
             'id' => $purchase->cart_id,
             'user_id' => $user->id,
-            'status' => 'active',
+            'status' => 'converted',
-            'deleted_at' => null,
         ]);
         $this->assertDatabaseHas('carrito_items', [
             'cart_id' => $purchase->cart_id,
@@ -444,11 +443,16 @@ class StorePurchaseTest extends TestCase
         ]);
         $this->assertDatabaseHas('inventories', [
             'id' => $variant->inventory_id,
-            'reserved_stock' => 3,
+            'reserved_stock' => 0,
+        ]);
+        $this->assertDatabaseHas('stock_reservations', [
+            'purchase_id' => $purchase->id,
+            'quantity' => 0,
+            'status' => 'released',
         ]);
     }
 
-    public function test_it_merges_the_checkout_cart_when_the_user_created_another_active_cart(): void
+    public function test_it_keeps_a_new_active_cart_separate_when_checkout_is_cancelled(): void
     {
         $this->createTenant('sonder', 'Sonder', 'sonder.com.ar');
         $user = User::factory()->create();
@@ -480,11 +484,15 @@ class StorePurchaseTest extends TestCase
             'cart_id' => $activeCartId,
             'catalog_item_id' => $variant->catalog_item_id,
             'variant_id' => $variant->id,
-            'cantidad' => 3,
+            'cantidad' => 1,
+        ]);
+        $this->assertSoftDeleted('carritos', [
+            'id' => $purchase->cart_id,
+            'status' => 'converted',
         ]);
         $this->assertDatabaseHas('inventories', [
             'id' => $variant->inventory_id,
-            'reserved_stock' => 3,
+            'reserved_stock' => 1,
         ]);
     }
 
@@ -1069,7 +1077,7 @@ class StorePurchaseTest extends TestCase
         ]);
     }
 
-    public function test_it_expires_an_abandoned_purchase_and_restores_its_cart(): void
+    public function test_it_expires_an_abandoned_purchase_and_releases_its_checkout_cart(): void
     {
         $this->createTenant('sonder', 'Sonder', 'sonder.com.ar');
         $user = User::factory()->create();
@@ -1095,21 +1103,20 @@ class StorePurchaseTest extends TestCase
         ]);
         $this->assertDatabaseMissing('compra_items', ['compra_id' => $purchase->id]);
         $this->assertDatabaseHas('stock_reservations', [
-            'purchase_id' => null,
+            'purchase_id' => $purchase->id,
-            'quantity' => 3,
+            'quantity' => 0,
-            'status' => 'active',
+            'status' => 'expired',
         ]);
         $this->assertDatabaseHas('inventories', [
             'id' => $variant->inventory_id,
             'real_stock' => 10,
-            'reserved_stock' => 3,
+            'reserved_stock' => 0,
             'sold_units' => 0,
         ]);
-        $this->assertDatabaseHas('carritos', [
+        $this->assertSoftDeleted('carritos', [
             'id' => $purchase->cart_id,
             'user_id' => $user->id,
-            'status' => 'active',
+            'status' => 'converted',
-            'deleted_at' => null,
         ]);
 
         $this->artisan('reservations:expire')
@@ -1118,6 +1125,43 @@ class StorePurchaseTest extends TestCase
             ->assertSuccessful();
     }
 
+    public function test_it_continues_expiring_purchases_after_an_inconsistent_reservation(): void
+    {
+        $this->createTenant('sonder', 'Sonder', 'sonder.com.ar');
+        $user = User::factory()->create();
+        $variant = $this->createVariantForTenant('sonder', 10, '50.00');
+        $inconsistentPurchase = $this->createCheckoutPurchase($user, 'sonder', $variant, 1);
+        $validPurchase = $this->createCheckoutPurchase($user, 'sonder', $variant, 1);
+
+        $inconsistentPurchase->items()->create([
+            'source_catalog_item_id' => $variant->catalog_item_id,
+            'source_variant_id' => $variant->id,
+            'nombre' => 'Inconsistent item',
+            'slug' => 'inconsistent-item',
+            'cantidad' => 1,
+            'precio_unitario' => '50.00',
+            'discount_total' => '0.00',
+            'tax_total' => '0.00',
+            'total' => '50.00',
+        ]);
+
+        $this->travel(31)->minutes();
+
+        $this->artisan('reservations:expire')
+            ->expectsOutput('Expired purchases: 1')
+            ->expectsOutput('Expired cart items: 0')
+            ->assertSuccessful();
+
+        $this->assertDatabaseHas('compras', [
+            'id' => $inconsistentPurchase->id,
+            'status' => Purchase::STATUS_CREATED,
+        ]);
+        $this->assertDatabaseHas('compras', [
+            'id' => $validPurchase->id,
+            'status' => Purchase::STATUS_EXPIRED,
+        ]);
+    }
+
     public function test_purchase_detail_uses_cart_items_for_created_purchase(): void
     {
         $this->createTenant('sonder', 'Sonder', 'sonder.com.ar');
@@ -1200,6 +1244,42 @@ class StorePurchaseTest extends TestCase
             ->assertJsonPath('data.total', '100.00');
     }
 
+    public function test_created_and_pending_payment_purchase_details_use_the_current_cart_quantity(): void
+    {
+        $this->createTenant('sonder', 'Sonder', 'sonder.com.ar');
+        $user = User::factory()->create([
+            'email' => 'buyer@example.com',
+        ]);
+        $variant = $this->createVariantForTenant('sonder', 10, '50.00');
+
+        foreach ([Purchase::STATUS_CREATED, Purchase::STATUS_PENDING_PAYMENT] as $status) {
+            $purchase = $this->createCheckoutPurchase($user, 'sonder', $variant, 2);
+            $purchase->items()->create([
+                'source_catalog_item_id' => $variant->catalog_item_id,
+                'source_variant_id' => $variant->id,
+                'item_nombre' => $variant->catalogItem->nombre,
+                'descripcion' => $variant->catalogItem->descripcion,
+                'slug' => $variant->catalogItem->slug,
+                'variant_attributes' => [],
+                'cantidad' => 1,
+                'precio_unitario' => '50.00',
+                'total' => '50.00',
+            ]);
+            $purchase->cart->items()->update(['cantidad' => 3]);
+            $purchase->update(['status' => $status]);
+
+            $this->actingAs($user, 'sanctum')
+                ->getJson("/api/tenants/sonder/compras/{$purchase->id}")
+                ->assertOk()
+                ->assertJsonPath('data.status', $status)
+                ->assertJsonPath('data.items_source', 'cart')
+                ->assertJsonPath('data.items.0.quantity', 3)
+                ->assertJsonPath('data.items.0.line_total', '150.00')
+                ->assertJsonPath('data.subtotal', '150.00')
+                ->assertJsonPath('data.total', '150.00');
+        }
+    }
+
     public function test_purchase_detail_uses_purchase_items_for_paid_purchase_even_without_cart(): void
     {
         $this->createTenant('sonder', 'Sonder', 'sonder.com.ar');

tests/Feature/Sale/AdminAppSaleControllerTest.php

@@ -5,6 +5,7 @@ namespace Tests\Feature\Sale;
 use App\Domains\Auth\Models\User;
 use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Cart\Models\Cart;
+use App\Domains\Cart\Models\CartItem;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Purchase\Events\PurchasePaid;
 use App\Domains\Purchase\Models\Purchase;
@@ -30,6 +31,83 @@ class AdminAppSaleControllerTest extends TestCase
         WebsiteType::query()->create(['codigo' => 'onticket', 'nombre' => 'OnTicket']);
     }
 
+    public function test_sales_list_uses_cart_quantity_for_created_and_pending_payment_sales(): void
+    {
+        $tenant = $this->createTenant('acme');
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $catalogItem = CatalogItem::query()->create([
+            'tenant_code' => $tenant->codigo,
+            'slug' => 'entrada-general',
+            'nombre' => 'Entrada general',
+            'precio' => '10000.00',
+        ]);
+
+        $createdCart = Cart::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => 'checkout',
+        ]);
+        CartItem::query()->create([
+            'cart_id' => $createdCart->id,
+            'catalog_item_id' => $catalogItem->id,
+            'cantidad' => 3,
+        ]);
+        $createdPurchase = Purchase::query()->create([
+            'cart_id' => $createdCart->id,
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_CREATED,
+            'total' => '30000.00',
+        ]);
+        PurchaseItem::query()->create([
+            'compra_id' => $createdPurchase->id,
+            'source_catalog_item_id' => $catalogItem->id,
+            'item_nombre' => $catalogItem->nombre,
+            'cantidad' => 1,
+            'precio_unitario' => '10000.00',
+            'total' => '10000.00',
+        ]);
+
+        $pendingCart = Cart::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => 'checkout',
+        ]);
+        CartItem::query()->create([
+            'cart_id' => $pendingCart->id,
+            'catalog_item_id' => $catalogItem->id,
+            'cantidad' => 4,
+        ]);
+        $pendingPurchase = Purchase::query()->create([
+            'cart_id' => $pendingCart->id,
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'total' => '40000.00',
+        ]);
+
+        $paidPurchase = Purchase::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PAID,
+            'total' => '20000.00',
+        ]);
+        PurchaseItem::query()->create([
+            'compra_id' => $paidPurchase->id,
+            'source_catalog_item_id' => $catalogItem->id,
+            'item_nombre' => $catalogItem->nombre,
+            'cantidad' => 2,
+            'precio_unitario' => '10000.00',
+            'total' => '20000.00',
+        ]);
+
+        $this->getJson('/api/v1/adminapp/tenant/sales?sort_by=id&sort_direction=asc')
+            ->assertOk()
+            ->assertJsonCount(3, 'data')
+            ->assertJsonPath('data.0.id', $createdPurchase->id)
+            ->assertJsonPath('data.0.quantity', 3)
+            ->assertJsonPath('data.1.id', $pendingPurchase->id)
+            ->assertJsonPath('data.1.quantity', 4)
+            ->assertJsonPath('data.2.id', $paidPurchase->id)
+            ->assertJsonPath('data.2.quantity', 2);
+    }
+
     public function test_authentication_is_required_to_read_a_sale_detail(): void
     {
         $this->getJson('/api/v1/adminapp/tenant/sales/1')->assertUnauthorized();
@@ -71,6 +149,92 @@ class AdminAppSaleControllerTest extends TestCase
             ->assertJsonPath('data.total', '40000.00');
     }
 
+    public function test_an_adminapp_user_can_read_cart_items_from_an_unconfirmed_sale(): void
+    {
+        $tenant = $this->createTenant('acme');
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $catalogItem = CatalogItem::query()->create([
+            'tenant_code' => $tenant->codigo,
+            'slug' => 'entrada-general',
+            'nombre' => 'Entrada general',
+            'descripcion' => 'Acceso general',
+            'precio' => '12500.00',
+        ]);
+        $cart = Cart::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => 'checkout',
+        ]);
+        $cartItem = CartItem::query()->create([
+            'cart_id' => $cart->id,
+            'catalog_item_id' => $catalogItem->id,
+            'cantidad' => 2,
+        ]);
+        $purchase = Purchase::query()->create([
+            'cart_id' => $cart->id,
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'total' => '25000.00',
+        ]);
+
+        $this->getJson("/api/v1/adminapp/tenant/sales/{$purchase->id}")
+            ->assertOk()
+            ->assertJsonPath('data.items.0.id', $cartItem->id)
+            ->assertJsonPath('data.items.0.product', 'Entrada general')
+            ->assertJsonPath('data.items.0.event_dates', [])
+            ->assertJsonPath('data.items.0.quantity', 2)
+            ->assertJsonPath('data.items.0.unit_price', '12500.00')
+            ->assertJsonPath('data.items.0.total', '25000.00');
+    }
+
+    public function test_sales_list_uses_cart_quantity_until_purchase_items_exist(): void
+    {
+        $tenant = $this->createTenant('acme');
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $catalogItem = CatalogItem::query()->create([
+            'tenant_code' => $tenant->codigo,
+            'slug' => 'entrada-general',
+            'nombre' => 'Entrada general',
+            'descripcion' => 'Acceso general',
+            'precio' => '12500.00',
+        ]);
+        $cart = Cart::query()->create([
+            'tenant_codigo' => $tenant->codigo,
+            'status' => 'checkout',
+        ]);
+        CartItem::query()->create([
+            'cart_id' => $cart->id,
+            'catalog_item_id' => $catalogItem->id,
+            'cantidad' => 3,
+        ]);
+        $purchase = Purchase::query()->create([
+            'cart_id' => $cart->id,
+            'tenant_codigo' => $tenant->codigo,
+            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'total' => '37500.00',
+        ]);
+
+        $this->getJson('/api/v1/adminapp/tenant/sales')
+            ->assertOk()
+            ->assertJsonPath('data.0.id', $purchase->id)
+            ->assertJsonPath('data.0.quantity', 3);
+
+        PurchaseItem::query()->create([
+            'compra_id' => $purchase->id,
+            'source_catalog_item_id' => $catalogItem->id,
+            'nombre' => 'Entrada general',
+            'item_nombre' => 'Entrada general',
+            'cantidad' => 2,
+            'precio_unitario' => '12500.00',
+            'total' => '25000.00',
+        ]);
+
+        $this->getJson('/api/v1/adminapp/tenant/sales')
+            ->assertOk()
+            ->assertJsonPath('data.0.quantity', 2);
+    }
+
     public function test_an_adminapp_user_cannot_read_a_sale_from_another_tenant(): void
     {
         $tenant = $this->createTenant('acme');
@@ -202,6 +366,18 @@ class AdminAppSaleControllerTest extends TestCase
             'user_id' => $admin->id,
             'status' => 'converted',
         ]);
+        $catalogItem = CatalogItem::query()->create([
+            'tenant_code' => $tenant->codigo,
+            'slug' => 'entrada-general',
+            'nombre' => 'Entrada general',
+            'descripcion' => 'Acceso general',
+            'precio' => '10000.00',
+        ]);
+        CartItem::query()->create([
+            'cart_id' => $cart->id,
+            'catalog_item_id' => $catalogItem->id,
+            'cantidad' => 2,
+        ]);
         $cart->delete();
         $purchase = Purchase::query()->create([
             'cart_id' => $cart->id,
@@ -212,11 +388,17 @@ class AdminAppSaleControllerTest extends TestCase
 
         $this->postJson("/api/v1/adminapp/tenant/sales/{$purchase->id}/cancel")
             ->assertOk()
-            ->assertJsonPath('data.status', Purchase::STATUS_CANCELLED);
+            ->assertJsonPath('data.status', Purchase::STATUS_CANCELLED)
+            ->assertJsonPath('data.quantity', 2);
 
         $this->assertSame(Purchase::STATUS_CANCELLED, $purchase->fresh()->status);
         $this->assertSoftDeleted('carritos', ['id' => $cart->id]);
         $this->assertSame('converted', Cart::withTrashed()->findOrFail($cart->id)->status);
+
+        $this->getJson("/api/v1/adminapp/tenant/sales/{$purchase->id}")
+            ->assertOk()
+            ->assertJsonPath('data.items.0.product', 'Entrada general')
+            ->assertJsonPath('data.items.0.quantity', 2);
     }
 
     public function test_an_adminapp_user_cannot_change_a_sale_from_another_tenant(): void

tests/Feature/Seeders/DesfilePuraTendenciaSeederTest.php

@@ -44,7 +44,7 @@ class DesfilePuraTendenciaSeederTest extends TestCase
             'footer_bg_color' => '#D4441C',
             'display_categories' => false,
             'display_seach_bar' => false,
-            'cart_editing_policy' => 'disabled',
+            'cart_editing_policy' => 'full',
             'checkout_editing_policy' => 'disabled',
             'display_cart_item_images' => false,
             'site_title' => 'Desfile Pura Tendencia',

tests/Feature/Tenant/BootstrapTenantControllerTest.php

@@ -59,6 +59,8 @@ class BootstrapTenantControllerTest extends TestCase
             'codigo' => 'acme',
             'nombre' => 'Acme',
             'dominio' => 'acme.com',
+            'address' => 'Calle Test 123, Rosario',
+            'phone' => '+54 341 555 1234',
             'primary_color' => '#ff0000',
             'secondary_color' => '#00ff00',
             'danger_color' => '#0000ff',
@@ -84,6 +86,8 @@ class BootstrapTenantControllerTest extends TestCase
             ->assertOk()
             ->assertJsonPath('data.codigo', 'acme')
             ->assertJsonPath('data.dominio', 'acme.com')
+            ->assertJsonPath('data.address', 'Calle Test 123, Rosario')
+            ->assertJsonPath('data.phone', '+54 341 555 1234')
             ->assertJsonPath('data.primary_color', '#ff0000')
             ->assertJsonPath('data.secondary_color', '#00ff00')
             ->assertJsonPath('data.danger_color', '#0000ff')

tests/Unit/Purchase/PurchaseStateGuardTest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Unit\Purchase;
+
+use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Services\PurchaseStateGuard;
+use Tests\TestCase;
+
+class PurchaseStateGuardTest extends TestCase
+{
+    private PurchaseStateGuard $guard;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->guard = new PurchaseStateGuard;
+    }
+
+    public function test_it_rejects_a_purchase_with_expired_status(): void
+    {
+        $purchase = (new Purchase)->forceFill([
+            'status' => Purchase::STATUS_EXPIRED,
+            'expires_at' => null,
+        ]);
+
+        $this->expectException(PurchaseExpiredException::class);
+
+        $this->guard->assertNotExpired($purchase);
+    }
+
+    public function test_it_rejects_an_active_purchase_when_its_deadline_has_passed(): void
+    {
+        $purchase = (new Purchase)->forceFill([
+            'status' => Purchase::STATUS_PENDING_PAYMENT,
+            'expires_at' => now()->subMinute(),
+        ]);
+
+        $this->expectException(PurchaseExpiredException::class);
+
+        $this->guard->assertNotExpired($purchase);
+    }
+
+    public function test_it_does_not_treat_a_paid_purchase_as_expired_by_time(): void
+    {
+        $purchase = (new Purchase)->forceFill([
+            'status' => Purchase::STATUS_PAID,
+            'expires_at' => now()->subMinute(),
+        ]);
+
+        $this->guard->assertNotExpired($purchase);
+
+        $this->assertTrue(true);
+    }
+}

tests/Unit/Sale/SaleDetailResourceTest.php

@@ -2,6 +2,9 @@
 
 namespace Tests\Unit\Sale;
 
+use App\Domains\Cart\Models\Cart;
+use App\Domains\Cart\Models\CartItem;
+use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Purchase\Models\Purchase;
 use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Sale\Resources\AdminApp\SaleDetailResource;
@@ -38,4 +41,39 @@ class SaleDetailResourceTest extends TestCase
         $this->assertSame('30000.00', $data['items'][0]['total']);
         $this->assertSame('30000.00', $data['total']);
     }
+
+    public function test_it_uses_the_associated_cart_items_when_the_purchase_has_no_items(): void
+    {
+        $catalogItem = (new CatalogItem)->forceFill([
+            'id' => 21,
+            'nombre' => 'Entrada general',
+            'precio' => '12500.00',
+        ]);
+        $cartItem = (new CartItem)->forceFill([
+            'id' => 34,
+            'catalog_item_id' => $catalogItem->id,
+            'cantidad' => 2,
+        ]);
+        $cartItem->setRelation('catalogItem', $catalogItem);
+        $cartItem->setRelation('variant', null);
+
+        $cart = new Cart;
+        $cart->setRelation('items', collect([$cartItem]));
+
+        $purchase = (new Purchase)->forceFill([
+            'id' => 16,
+            'total' => '25000.00',
+        ]);
+        $purchase->setRelation('items', collect());
+        $purchase->setRelation('cart', $cart);
+
+        $data = (new SaleDetailResource($purchase))->resolve(Request::create('/'));
+
+        $this->assertSame(34, $data['items'][0]['id']);
+        $this->assertSame('Entrada general', $data['items'][0]['product']);
+        $this->assertSame([], $data['items'][0]['event_dates']);
+        $this->assertSame(2, $data['items'][0]['quantity']);
+        $this->assertSame('12500.00', $data['items'][0]['unit_price']);
+        $this->assertSame('25000.00', $data['items'][0]['total']);
+    }
 }