Merge pull request 'homologacion' (#1 ) from homologacion into main

Reviewed-on: https://gitea.quo.ar/tbianchini/shopit-front/pulls/1
2026-08-26 18:10:12 +00:00
18 changed files with 76 additions and 455 deletions
--- a/src/app/app.routes.spec.ts
+++ b/src/app/app.routes.spec.ts
@@ -7,7 +7,6 @@ import { of } from 'rxjs';
 import { App } from './app';
 import { AuthService } from './core/services/auth/auth.service';
 import { CartService } from './core/services/cart/cart.service';
-import { CheckoutService } from './core/services/checkout.service';
 import { Tenant } from './core/services/tenant.interface';
 import { TenantService } from './core/services/tenant.service';
 import { routes } from './app.routes';
@@ -98,21 +97,6 @@ async function renderAppAt(
      {
        provide: AuthService,
        useValue: authService
-      },
-      {
-        provide: CheckoutService,
-        useValue: {
-          withCustomLoading() {
-            return this;
-          },
-          getPurchase: vi.fn().mockResolvedValue({
-            id: 25,
-            status: 'created',
-            items: [],
-            subtotal: '0.00',
-            total: '0.00'
-          })
-        }
      }
    ]
  }).compileComponents();
@@ -262,33 +246,15 @@ describe('app routes', () => {
    expect(compiled.textContent).toContain('No encontramos una tienda para este dominio');
  });

-  it('redirects unauthenticated users from /checkout/:id to /login', async () => {
-    const { router } = await renderAppAt('/checkout/25', createTenantServiceStub(), createAuthServiceStub(false));
+  it('redirects unauthenticated users from /checkout to /login', async () => {
+    const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(false));

-    expect(router.url).toBe('/login?returnUrl=%2Fcheckout%2F25');
+    expect(router.url).toBe('/login?returnUrl=%2Fcheckout');
  });

-  it('allows authenticated users to access /checkout/:id', async () => {
-    const checkoutTenant = {
-      ...tenant,
-      menues: [
-        {
-          id: 1,
-          code: 'checkout',
-          label: 'Checkout',
-          parent_menu_code: null,
-          content_type: 'dynamic' as const,
-          route: '/checkout',
-          submenues: []
-        }
-      ]
-    };
-    const { router } = await renderAppAt(
-      '/checkout/25',
-      createTenantServiceStub('ready', checkoutTenant),
-      createAuthServiceStub(true)
-    );
+  it('allows authenticated users to access /checkout', async () => {
+    const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(true));

-    expect(router.url).toBe('/checkout/25');
+    expect(router.url).toBe('/checkout');
  });
 });
--- a/src/app/core/guards/menu.guard.spec.ts
+++ b/src/app/core/guards/menu.guard.spec.ts
@@ -62,7 +62,7 @@ describe('hasMenuGuard', () => {
  });

  it('redirects a missing menu route to the store root', () => {
-    const result = runGuard('checkout', '/checkout/25', tenant);
+    const result = runGuard('checkout', '/checkout', tenant);

    expect(result instanceof UrlTree).toBe(true);
    expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe('/');
--- a/src/app/core/layout/store-layout/store-layout.component.spec.ts
+++ b/src/app/core/layout/store-layout/store-layout.component.spec.ts
@@ -1,6 +1,5 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { signal } from '@angular/core';
-import { HttpErrorResponse } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import {
@@ -247,7 +246,7 @@ describe('StoreLayoutComponent', () => {
  it('disables the cart icon and prevents opening the popup during checkout with a tenant base path', () => {
    tenantState.set({ ...tenant, base_path: 'fiesta' });
    const router = TestBed.inject(Router);
-    vi.spyOn(router, 'url', 'get').mockReturnValue('/fiesta/checkout/25');
+    vi.spyOn(router, 'url', 'get').mockReturnValue('/fiesta/checkout?purchase=25');

    const fixture = TestBed.createComponent(StoreLayoutComponent);
    fixture.detectChanges();
@@ -588,7 +587,7 @@ describe('StoreLayoutComponent', () => {
    const authService = TestBed.inject(AuthService);
    const cartService = TestBed.inject(CartService);
    const router = TestBed.inject(Router);
-    vi.spyOn(router, 'url', 'get').mockReturnValue('/checkout/25');
+    vi.spyOn(router, 'url', 'get').mockReturnValue('/checkout?purchase=25');
    const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);

    const fixture = TestBed.createComponent(StoreLayoutComponent);
@@ -675,44 +674,12 @@ describe('StoreLayoutComponent', () => {
    expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('test', {
      cart_id: 1,
    });
-    expect(router.navigate).toHaveBeenCalledWith(['/checkout', 55]);
+    expect(router.navigate).toHaveBeenCalledWith(['/checkout'], {
+      queryParams: { purchase: 55 },
+    });
    expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
  });

-  it('shows the backend message and refreshes the cart when its reservation expired', async () => {
-    const message = 'La reserva de stock venció. Usá el carrito activo para continuar.';
-    checkoutServiceStub.startCheckout.mockRejectedValue(
-      new HttpErrorResponse({
-        status: 422,
-        error: { code: 'stock_reservation.expired', message },
-      }),
-    );
-    cartState.set({
-      id: 1,
-      tenant_codigo: tenant.codigo,
-      status: 'active',
-      subtotal: '100.00',
-      items: [],
-    });
-    authUserState.set({
-      id: 7,
-      nombre_apellido: 'Juan Perez',
-      email: 'juan@example.com',
-      dni: '12345678',
-      telefono: '3415555555',
-    });
-
-    const fixture = TestBed.createComponent(StoreLayoutComponent);
-    const loadCart = vi.spyOn(TestBed.inject(CartService), 'loadCart');
-    fixture.detectChanges();
-    loadCart.mockClear();
-
-    await (fixture.componentInstance as any).onCheckoutClick();
-
-    expect(TestBed.inject(ToastService).danger).toHaveBeenCalledWith(message);
-    expect(loadCart).toHaveBeenCalledOnce();
-  });
-
  it('allows modifying quantities directly in the regular cart without a toggle', () => {
    cartState.set({
      id: 1,
--- a/src/app/core/layout/store-layout/store-layout.component.ts
+++ b/src/app/core/layout/store-layout/store-layout.component.ts
@@ -1,4 +1,3 @@
-import { HttpErrorResponse } from '@angular/common/http';
 import { Component, computed, DestroyRef, inject, OnInit, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import {
@@ -18,10 +17,7 @@ import { ButtonComponent } from '../../../shared/components/button/button.compon
 import { CartItem, CartItemVariantValue } from '../../services/cart/cart.interface';
 import { AuthService } from '../../services/auth/auth.service';
 import { findMenu } from '../../services/menu.utils';
-import {
-  CheckoutService,
-  isExpiredStockReservationResponse,
-} from '../../services/checkout.service';
+import { CheckoutService } from '../../services/checkout.service';
 import { ToastService } from '../../services/toast.service';
 import { Category } from '../../services/tenant.interface';

@@ -277,20 +273,12 @@ export class StoreLayoutComponent implements OnInit {
      });

      this.isCartOpen.set(false);
-      await this.router.navigate(['/checkout', purchase.id]);
+      await this.router.navigate(['/checkout'], {
+        queryParams: { purchase: purchase.id },
+      });
    } catch (error) {
      console.error('Failed to create cart purchase:', error);
-      const message =
-        error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
-          ? error.error.message
-          : 'No se pudo iniciar la compra.';
-      this.toastService.danger(message);
-
-      if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
-        this.cartService.loadCart().subscribe({
-          error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
-        });
-      }
+      this.toastService.danger('No se pudo iniciar la compra.');
    } finally {
      this.isCreatingPurchase.set(false);
    }
--- a/src/app/core/services/auth/auth.guards.spec.ts
+++ b/src/app/core/services/auth/auth.guards.spec.ts
@@ -24,12 +24,12 @@ describe('auth guards', () => {
    });

    const result = TestBed.runInInjectionContext(() =>
-      authGuard(null as never, { url: '/checkout/25' } as never),
+      authGuard(null as never, { url: '/checkout?mode=direct' } as never),
    );

    expect(result instanceof UrlTree).toBe(true);
    expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe(
-      '/login?returnUrl=%2Fcheckout%2F25',
+      '/login?returnUrl=%2Fcheckout%3Fmode%3Ddirect',
    );
  });

@@ -39,7 +39,7 @@ describe('auth guards', () => {
    });

    const result = TestBed.runInInjectionContext(() =>
-      authGuard(null as never, { url: '/checkout/25' } as never),
+      authGuard(null as never, { url: '/checkout' } as never),
    );

    expect(result).toBe(true);
--- a/src/app/core/services/checkout.service.ts
+++ b/src/app/core/services/checkout.service.ts
@@ -45,21 +45,6 @@ export function isInsufficientStockResponse(value: unknown): value is Insufficie
  );
 }

-export interface ExpiredStockReservationResponse {
-  code: 'stock_reservation.expired';
-  message: string;
-}
-
-export function isExpiredStockReservationResponse(
-  value: unknown,
-): value is ExpiredStockReservationResponse {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    (value as Partial<ExpiredStockReservationResponse>).code === 'stock_reservation.expired'
-  );
-}
-
 export type StartCheckoutPayload =
  | {
      cart_id: number;
--- a/src/app/features/store/pages/category-items-page/category-items-page.component.ts
+++ b/src/app/features/store/pages/category-items-page/category-items-page.component.ts
@@ -23,10 +23,7 @@ import {

 import { AuthService } from '../../../../core/services/auth/auth.service';
 import { CartService } from '../../../../core/services/cart/cart.service';
-import {
-  CheckoutService,
-  isExpiredStockReservationResponse,
-} from '../../../../core/services/checkout.service';
+import { CheckoutService } from '../../../../core/services/checkout.service';
 import {
  CatalogGroupLayout,
  CategoryItemsResponse,
@@ -170,20 +167,10 @@ export class CategoryItemsPageComponent {
              ],
            },
      );
-      await this.router.navigate(['/checkout', purchase.id]);
+      await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
    } catch (error) {
      console.error('Failed to create direct purchase:', error);
-      const message =
-        error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
-          ? error.error.message
-          : 'No se pudo iniciar la compra directa.';
-      this.toastService.danger(message);
-
-      if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
-        this.cartService.loadCart().subscribe({
-          error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
-        });
-      }
+      this.toastService.danger('No se pudo iniciar la compra directa.');
    } finally {
      this.creatingDirectPurchase.set(false);
    }
--- a/src/app/features/store/pages/checkout-page/checkout-page.component.spec.ts
+++ b/src/app/features/store/pages/checkout-page/checkout-page.component.spec.ts
@@ -33,7 +33,7 @@ describe('CheckoutPageComponent payment validation', () => {
    stop: ReturnType<typeof vi.fn>;
  };
  let cartServiceStub: { loadCart: ReturnType<typeof vi.fn> };
-  let routeParamMap: ReturnType<typeof convertToParamMap>;
+  let routeQueryParamMap: ReturnType<typeof convertToParamMap>;
  let authUserState: ReturnType<typeof signal>;
  let tenantState: ReturnType<
    typeof signal<{
@@ -76,7 +76,7 @@ describe('CheckoutPageComponent payment validation', () => {
    cartServiceStub = {
      loadCart: vi.fn().mockReturnValue(of({ id: 30, items: [], subtotal: '0.00' })),
    };
-    routeParamMap = convertToParamMap({});
+    routeQueryParamMap = convertToParamMap({});
    authUserState = signal(null);
    tenantState = signal({
      codigo: 'tenant-test',
@@ -103,8 +103,8 @@ describe('CheckoutPageComponent payment validation', () => {
          provide: ActivatedRoute,
          useValue: {
            snapshot: {
-              get paramMap() {
-                return routeParamMap;
+              get queryParamMap() {
+                return routeQueryParamMap;
              },
            },
          },
@@ -317,7 +317,7 @@ describe('CheckoutPageComponent payment validation', () => {
      subtotal: '2501.00',
      total: '2501.00',
    };
-    routeParamMap = convertToParamMap({ id: 25 });
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
    checkoutServiceStub.getPurchase.mockResolvedValue(purchase);
    authUserState.set({
      id: 7,
@@ -354,7 +354,7 @@ describe('CheckoutPageComponent payment validation', () => {

  it('keeps the checkout hidden while the purchase is loading', async () => {
    let resolvePurchase!: (purchase: any) => void;
-    routeParamMap = convertToParamMap({ id: 25 });
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
    checkoutServiceStub.getPurchase.mockReturnValue(
      new Promise((resolve) => {
        resolvePurchase = resolve;
@@ -375,13 +375,12 @@ describe('CheckoutPageComponent payment validation', () => {
    });
    await Promise.resolve();

-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
    expect(component.isLoadingPurchase()).toBe(false);
    expect(component.checkoutStepIndex()).toBe(0);
  });

  it('opens a pending purchase on the payment step and restores its payment method', async () => {
-    routeParamMap = convertToParamMap({ id: 25 });
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
    checkoutServiceStub.getPurchase.mockResolvedValue({
      id: 25,
      status: 'pending_payment',
@@ -401,7 +400,7 @@ describe('CheckoutPageComponent payment validation', () => {
  });

  it('generates a new QR when reopening a pending QR purchase', async () => {
-    routeParamMap = convertToParamMap({ id: 25 });
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
    checkoutServiceStub.getPurchase.mockResolvedValue({
      id: 25,
      status: 'pending_payment',
@@ -425,7 +424,7 @@ describe('CheckoutPageComponent payment validation', () => {
  it.each(['paid', 'cancelled', 'rejected', 'expired'])(
    'redirects a %s purchase to its status page',
    async (status) => {
-      routeParamMap = convertToParamMap({ id: 25 });
+      routeQueryParamMap = convertToParamMap({ purchase: 25 });
      checkoutServiceStub.getPurchase.mockResolvedValue({
        id: 25,
        status,
@@ -443,7 +442,7 @@ describe('CheckoutPageComponent payment validation', () => {
  );

  it('redirects a submitted pending payment purchase to its status page', async () => {
-    routeParamMap = convertToParamMap({ id: 25 });
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
    checkoutServiceStub.getPurchase.mockResolvedValue({
      id: 25,
      status: 'pending_payment',
@@ -461,7 +460,7 @@ describe('CheckoutPageComponent payment validation', () => {
    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
  });

-  it('shows the API error and redirects to status when cancellation finds an expired purchase', async () => {
+  it('shows the API error in a toast when cancelling the purchase fails', async () => {
    const message = 'La compra venció. Iniciá una nueva compra.';
    checkoutServiceStub.cancelPurchase.mockRejectedValue({
      error: { code: 'purchase.expired', message },
@@ -471,9 +470,7 @@ describe('CheckoutPageComponent payment validation', () => {
    await component.onModifyPurchase();

    expect(toastServiceStub.danger).toHaveBeenCalledWith(message);
-    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
-      queryParams: { status: 'expired' },
-    });
+    expect(routerStub.navigate).not.toHaveBeenCalled();
    expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
    expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
    expect(component.isCancellingPurchase()).toBe(false);
@@ -590,24 +587,7 @@ describe('CheckoutPageComponent payment validation', () => {
    expect(component.createdPurchaseId()).toBe(25);
  });

-  it('allows leaving checkout when cancellation finds an expired stock reservation', async () => {
-    const message = 'La reserva de stock venció. Usá el carrito activo para continuar.';
-    checkoutServiceStub.cancelPurchase.mockRejectedValue({
-      error: { code: 'stock_reservation.expired', message },
-    });
-    const { component } = createComponent();
-
-    await expect(component.canDeactivate()).resolves.toBe(true);
-
-    expect(toastServiceStub.danger).toHaveBeenCalledWith(message);
-    expect(cartServiceStub.loadCart).toHaveBeenCalledOnce();
-    expect(component.createdPurchaseId()).toBeNull();
-    expect(component.createdPurchase()).toBeNull();
-    expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
-    expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
-  });
-
-  it('shows the API message and redirects to status when a checkout operation finds an expired purchase', async () => {
+  it('shows the API message and redirects home when a checkout operation finds an expired purchase', async () => {
    checkoutServiceStub.generatePaymentIntent.mockRejectedValue(
      new HttpErrorResponse({
        status: 422,
@@ -624,35 +604,10 @@ describe('CheckoutPageComponent payment validation', () => {
    expect(toastServiceStub.danger).toHaveBeenCalledWith(
      'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
    );
-    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
-      queryParams: { status: 'expired' },
-    });
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
    expect(component.isGeneratingIntent()).toBe(false);
  });

-  it('redirects to status when QR polling receives a purchase-expired response', async () => {
-    checkoutServiceStub.getPurchase.mockRejectedValue(
-      new HttpErrorResponse({
-        status: 422,
-        error: {
-          code: 'purchase.expired',
-          message: 'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
-        },
-      }),
-    );
-    const { component } = createComponent();
-
-    await component.selectPaymentMethod('qr');
-    await vi.advanceTimersByTimeAsync(5_000);
-
-    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
-      queryParams: { status: 'expired' },
-    });
-    expect(toastServiceStub.danger).toHaveBeenCalledWith(
-      'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
-    );
-  });
-
  it('treats a generic customer-data error as expired when the local deadline passed', () => {
    const { component } = createComponent();
    component.createdPurchase.set({
@@ -680,8 +635,6 @@ describe('CheckoutPageComponent payment validation', () => {
    expect(toastServiceStub.danger).toHaveBeenCalledWith(
      'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
    );
-    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
-      queryParams: { status: 'expired' },
-    });
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
  });
 });
--- a/src/app/features/store/pages/checkout-page/checkout-page.component.ts
+++ b/src/app/features/store/pages/checkout-page/checkout-page.component.ts
@@ -161,7 +161,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
  }

  ngOnInit(): void {
-    const purchaseId = Number(this.route.snapshot.paramMap.get('id'));
+    const purchaseId = Number(this.route.snapshot.queryParamMap.get('purchase'));
    if (!Number.isInteger(purchaseId) || purchaseId <= 0) {
      void this.router.navigate(['/']);
      return;
@@ -296,18 +296,6 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
      return true;
    } catch (error) {
      console.error('Failed to cancel the current purchase:', error);
-
-      if (this.isStockReservationExpiredError(error)) {
-        this.showRequestError(error, 'La reserva de stock venció.');
-        this.cartService.loadCart().subscribe({
-          error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
-        });
-        this.createdPurchaseId.set(null);
-        this.createdPurchase.set(null);
-        this.navigationStarted = true;
-        return true;
-      }
-
      this.showRequestError(error, 'No se pudo cancelar la compra.');
      return false;
    } finally {
@@ -504,17 +492,8 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
        this.navigateToPurchaseStatus(purchaseId);
        return;
      }
-
-      if (purchase.status === 'expired') {
-        this.navigateToPurchaseStatus(purchaseId);
-        return;
-      }
    } catch (error) {
      console.error('Failed to validate transfer payment:', error);
-      if (this.isPurchaseExpiredError(error)) {
-        this.showRequestError(error, 'La compra venció. Iniciá una nueva compra.');
-        return;
-      }
    }

    if (runId !== this.transferPollingRunId) {
@@ -596,17 +575,8 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
        this.qrPaymentStatus.set('failed');
        return;
      }
-
-      if (purchase.status === 'expired') {
-        this.navigateToPurchaseStatus(purchaseId);
-        return;
-      }
    } catch (error) {
      console.error('Failed to validate QR payment:', error);
-      if (this.isPurchaseExpiredError(error)) {
-        this.showRequestError(error, 'La compra venció. Iniciá una nueva compra.');
-        return;
-      }
    } finally {
      if (runId === this.qrPollingRunId) {
        this.isCheckingQrPayment.set(false);
@@ -713,17 +683,15 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
      }
    } catch (error) {
      console.error('Failed to load purchase:', error);
-      const expired = this.showRequestError(error, 'No se pudo cargar la compra.');
-      if (!expired) {
-        void this.router.navigate(['/']);
-      }
+      this.showRequestError(error, 'No se pudo cargar la compra.');
+      void this.router.navigate(['/']);
    }
  }

-  private showRequestError(error: unknown, fallbackMessage: string): boolean {
+  private showRequestError(error: unknown, fallbackMessage: string): void {
    const payload =
      typeof error === 'object' && error !== null && 'error' in error
-        ? (error as { error?: ApiErrorResponse }).error
+        ? (error as { error?: { message?: unknown } }).error
        : undefined;
    const message =
      typeof payload?.message === 'string' && payload.message.trim()
@@ -731,13 +699,6 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
        : fallbackMessage;

    this.toastService.danger(message);
-
-    if (payload?.code === 'purchase.expired') {
-      this.navigateToExpiredPurchaseStatus();
-      return true;
-    }
-
-    return false;
  }

  private handleCheckoutError(error: unknown, fallbackMessage: string): boolean {
@@ -756,7 +717,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
          ? response.message
          : 'La compra venció. Iniciá una nueva compra.',
      );
-      this.navigateToExpiredPurchaseStatus();
+      void this.router.navigate(['/']);
      return true;
    }

@@ -768,42 +729,6 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
    return false;
  }

-  private navigateToExpiredPurchaseStatus(): void {
-    const purchaseId = this.createdPurchaseId() ?? this.createdPurchase()?.id;
-
-    if (purchaseId) {
-      if (this.navigationStarted) {
-        return;
-      }
-
-      this.navigationStarted = true;
-      this.stopQrPolling();
-      this.stopTransferPolling();
-      void this.router.navigate(['/checkout/status', purchaseId], {
-        queryParams: { status: 'expired' },
-      });
-      return;
-    }
-
-    void this.router.navigate(['/']);
-  }
-
-  private isPurchaseExpiredError(error: unknown): boolean {
-    if (typeof error !== 'object' || error === null || !('error' in error)) {
-      return false;
-    }
-
-    return (error as { error?: ApiErrorResponse }).error?.code === 'purchase.expired';
-  }
-
-  private isStockReservationExpiredError(error: unknown): boolean {
-    if (typeof error !== 'object' || error === null || !('error' in error)) {
-      return false;
-    }
-
-    return (error as { error?: ApiErrorResponse }).error?.code === 'stock_reservation.expired';
-  }
-
  private hasExpiredPurchase(): boolean {
    const purchase = this.createdPurchase();

--- a/src/app/features/store/pages/product-detail-page/product-detail-page.component.spec.ts
+++ b/src/app/features/store/pages/product-detail-page/product-detail-page.component.spec.ts
@@ -507,7 +507,9 @@ describe('ProductDetailPageComponent', () => {
        },
      ],
    });
-    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout', 44]);
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout'], {
+      queryParams: { purchase: 44 },
+    });
  });

  it('shows the backend purchase-limit message for a direct checkout', async () => {
--- a/src/app/features/store/pages/product-detail-page/product-detail-page.component.ts
+++ b/src/app/features/store/pages/product-detail-page/product-detail-page.component.ts
@@ -358,7 +358,9 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
        ],
      });

-      await this.router.navigate(['/checkout', purchase.id]);
+      await this.router.navigate(['/checkout'], {
+        queryParams: { purchase: purchase.id },
+      });
    } catch (error) {
      console.error('Failed to create direct purchase:', error);
      const message =
--- a/src/app/features/store/pages/purchase-status-page/purchase-status-page.component.spec.ts
+++ b/src/app/features/store/pages/purchase-status-page/purchase-status-page.component.spec.ts
@@ -5,7 +5,6 @@ import {
  CheckoutService,
  PurchaseDetailResponse,
 } from '../../../../core/services/checkout.service';
-import { CartService } from '../../../../core/services/cart/cart.service';
 import { Tenant } from '../../../../core/services/tenant.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { PurchaseStatusPageComponent } from './purchase-status-page.component';
@@ -67,7 +66,7 @@ describe('PurchaseStatusPageComponent', () => {
    TestBed.resetTestingModule();
  });

-  async function render(hasGeneratedTickets: boolean, forcedStatus?: string) {
+  async function render(hasGeneratedTickets: boolean) {
    const checkoutService = {
      getPurchase: vi.fn().mockResolvedValue(purchase(hasGeneratedTickets)),
      withCustomLoading() {
@@ -78,24 +77,15 @@ describe('PurchaseStatusPageComponent', () => {
      navigate: vi.fn().mockResolvedValue(true),
      navigateByUrl: vi.fn().mockResolvedValue(true),
    };
-    const cartService = { clearCart: vi.fn() };

    await TestBed.configureTestingModule({
      imports: [PurchaseStatusPageComponent],
      providers: [
        { provide: CheckoutService, useValue: checkoutService },
-        { provide: CartService, useValue: cartService },
        { provide: TenantService, useValue: { tenant: () => tenant } },
        {
          provide: ActivatedRoute,
-          useValue: {
-            snapshot: {
-              paramMap: convertToParamMap({ id: '42' }),
-              queryParamMap: convertToParamMap(
-                forcedStatus ? { status: forcedStatus } : {},
-              ),
-            },
-          },
+          useValue: { snapshot: { paramMap: convertToParamMap({ id: '42' }) } },
        },
        { provide: Router, useValue: router },
      ],
@@ -110,22 +100,15 @@ describe('PurchaseStatusPageComponent', () => {
      fixture,
      element: fixture.nativeElement as HTMLElement,
      checkoutService,
-      cartService,
      router,
    };
  }

-  it('clears the cart when the purchase is approved', async () => {
-    const { cartService } = await render(true);
-
-    expect(cartService.clearCart).toHaveBeenCalledOnce();
-  });
-
  it('shows the tickets action when this purchase generated tickets', async () => {
    const { element, checkoutService, router } = await render(true);

    expect(checkoutService.getPurchase).toHaveBeenCalledOnce();
-    expect(element.textContent).toContain('Mis tickets');
+    expect(element.textContent).toContain('Ver mis tickets');
    expect(element.textContent).not.toContain('WhatsApp');

    element.querySelector<HTMLButtonElement>('app-button button')?.click();
@@ -151,14 +134,6 @@ describe('PurchaseStatusPageComponent', () => {
    openSpy.mockRestore();
  });

-  it('shows the expired result without polling when checkout redirects after expiration', async () => {
-    const { element, checkoutService } = await render(false, 'expired');
-
-    expect(element.textContent).toContain('LA COMPRA VENCIÓ');
-    expect(element.textContent).not.toContain('ESTAMOS VERIFICANDO TU PAGO');
-    expect(checkoutService.getPurchase).not.toHaveBeenCalled();
-  });
-
  it('polls every five seconds while the payment is pending and shows the confirmation', async () => {
    vi.useFakeTimers();

@@ -172,13 +147,11 @@ describe('PurchaseStatusPageComponent', () => {
          return this;
        },
      };
-      const cartService = { clearCart: vi.fn() };

      await TestBed.configureTestingModule({
        imports: [PurchaseStatusPageComponent],
        providers: [
          { provide: CheckoutService, useValue: checkoutService },
-          { provide: CartService, useValue: cartService },
          { provide: TenantService, useValue: { tenant: () => tenant } },
          {
            provide: ActivatedRoute,
@@ -201,7 +174,6 @@ describe('PurchaseStatusPageComponent', () => {

      expect(checkoutService.getPurchase).toHaveBeenCalledTimes(2);
      expect(fixture.nativeElement.textContent).toContain('COMPRA REALIZADA!');
-      expect(cartService.clearCart).toHaveBeenCalledOnce();

      await vi.advanceTimersByTimeAsync(10_000);
      expect(checkoutService.getPurchase).toHaveBeenCalledTimes(2);
@@ -225,7 +197,6 @@ describe('PurchaseStatusPageComponent', () => {
        imports: [PurchaseStatusPageComponent],
        providers: [
          { provide: CheckoutService, useValue: checkoutService },
-          { provide: CartService, useValue: { clearCart: vi.fn() } },
          { provide: TenantService, useValue: { tenant: () => tenant } },
          {
            provide: ActivatedRoute,
--- a/src/app/features/store/pages/purchase-status-page/purchase-status-page.component.ts
+++ b/src/app/features/store/pages/purchase-status-page/purchase-status-page.component.ts
@@ -15,7 +15,6 @@ import {
  CheckoutService,
  PurchaseStatusResponse,
 } from '../../../../core/services/checkout.service';
-import { CartService } from '../../../../core/services/cart/cart.service';
 import { findMenu } from '../../../../core/services/menu.utils';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ButtonComponent } from '../../../../shared/components/button/button.component';
@@ -36,7 +35,6 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
  private readonly route = inject(ActivatedRoute);
  private readonly router = inject(Router);
  private readonly checkoutService = inject(CheckoutService);
-  private readonly cartService = inject(CartService);
  private readonly tenantService = inject(TenantService);
  private readonly isBrowser = isPlatformBrowser(inject(PLATFORM_ID));

@@ -74,12 +72,6 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
    this.purchaseId = purchaseId;
    this.tenantCode = tenant.codigo;

-    if (this.route.snapshot.queryParamMap?.get('status') === 'expired') {
-      this.status.set('expired');
-      this.isLoading.set(false);
-      return;
-    }
-
    void this.loadStatus();
  }

@@ -106,10 +98,6 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
      this.status.set(status);
      this.hasGeneratedTickets.set(purchase.has_generated_tickets === true);

-      if (status === 'approved') {
-        this.cartService.clearCart();
-      }
-
      if (status === 'pending') {
        this.schedulePolling();
      } else {
@@ -119,10 +107,7 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
      console.error('Failed to fetch purchase status:', error);

      if (!this.isDestroyed) {
-        if (this.isPurchaseExpiredError(error)) {
-          this.status.set('expired');
-          this.stopPolling();
-        } else if (isPolling) {
+        if (isPolling) {
          this.schedulePolling();
        } else {
          this.status.set('error');
@@ -169,14 +154,6 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
    return 'pending';
  }

-  private isPurchaseExpiredError(error: unknown): boolean {
-    if (typeof error !== 'object' || error === null || !('error' in error)) {
-      return false;
-    }
-
-    return (error as { error?: { code?: string } }).error?.code === 'purchase.expired';
-  }
-
  protected goToTickets(): void {
    const route = this.ticketsRoute();

--- a/src/app/features/store/pages/search-page/search-page.component.ts
+++ b/src/app/features/store/pages/search-page/search-page.component.ts
@@ -24,10 +24,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';

 import { CartService } from '../../../../core/services/cart/cart.service';
 import { AuthService } from '../../../../core/services/auth/auth.service';
-import {
-  CheckoutService,
-  isExpiredStockReservationResponse,
-} from '../../../../core/services/checkout.service';
+import { CheckoutService } from '../../../../core/services/checkout.service';
 import {
  CatalogFeaturedItem,
  CatalogFeaturedItems,
@@ -202,20 +199,10 @@ export class SearchPageComponent {
              ],
            },
      );
-      await this.router.navigate(['/checkout', purchase.id]);
+      await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
    } catch (error) {
      console.error('Failed to create direct purchase:', error);
-      const message =
-        error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
-          ? error.error.message
-          : 'No se pudo iniciar la compra directa.';
-      this.toastService.danger(message);
-
-      if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
-        this.cartService.loadCart().subscribe({
-          error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
-        });
-      }
+      this.toastService.danger('No se pudo iniciar la compra directa.');
    } finally {
      this.creatingDirectPurchase.set(false);
    }
--- a/src/app/features/store/pages/store-home-page/store-home-page.component.ts
+++ b/src/app/features/store/pages/store-home-page/store-home-page.component.ts
@@ -21,7 +21,6 @@ import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import {
  CheckoutService,
-  isExpiredStockReservationResponse,
  isInsufficientStockResponse,
 } from '../../../../core/services/checkout.service';
 import {
@@ -218,18 +217,10 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
        tenant.codigo,
        reservedCartId !== null ? { cart_id: reservedCartId } : { direct_items: directItems },
      );
-      await this.router.navigate(['/checkout', purchase.id]);
+      await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
    } catch (error) {
      console.error('Failed to create direct purchase:', error);

-      if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
-        this.toastService.danger(error.error.message);
-        this.cartService.loadCart().subscribe({
-          error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
-        });
-        return;
-      }
-
      if (error instanceof HttpErrorResponse && isInsufficientStockResponse(error.error)) {
        const unavailableIds = error.error.unavailable_items
          .map((item) => item.variant_id)
--- a/src/app/features/store/store.routes.ts
+++ b/src/app/features/store/store.routes.ts
@@ -91,6 +91,15 @@ export const routes: Routes = [
            (m) => m.ProductDetailPageComponent,
          ),
      },
+      {
+        path: 'checkout',
+        canActivate: [authGuard, hasMenuGuard('checkout')],
+        canDeactivate: [checkoutPendingPurchaseGuard],
+        loadComponent: () =>
+          import('./pages/checkout-page/checkout-page.component').then(
+            (m) => m.CheckoutPageComponent,
+          ),
+      },
      {
        path: 'checkout/status',
        component: SimpleLayoutComponent,
@@ -104,15 +113,6 @@ export const routes: Routes = [
          },
        ],
      },
-      {
-        path: 'checkout/:id',
-        canActivate: [authGuard, hasMenuGuard('checkout')],
-        canDeactivate: [checkoutPendingPurchaseGuard],
-        loadComponent: () =>
-          import('./pages/checkout-page/checkout-page.component').then(
-            (m) => m.CheckoutPageComponent,
-          ),
-      },
      {
        path: 'ayuda',
        canActivate: [hasMenuGuard('help')],
--- a/src/app/shared/components/cart/cart.component.spec.ts
+++ b/src/app/shared/components/cart/cart.component.spec.ts
@@ -175,63 +175,6 @@ describe('CartComponent', () => {
    expect(removeItem).not.toHaveBeenCalled();
  });

-  it('notifies the user and refreshes the cart when a mutation reports expiration', async () => {
-    const expirationMessage = 'La reserva de stock venció. Usá el carrito activo para continuar.';
-    const removeItem = vi.fn().mockReturnValue(
-      throwError(() => ({
-        error: {
-          code: 'stock_reservation.expired',
-          message: expirationMessage,
-        },
-      })),
-    );
-    const loadCart = vi.fn().mockReturnValue(of({}));
-    const danger = vi.fn();
-
-    await TestBed.configureTestingModule({
-      imports: [CartComponent],
-      providers: [
-        {
-          provide: CartService,
-          useValue: {
-            cart: signal(null).asReadonly(),
-            loadCart,
-            updateItemQuantity: vi.fn(),
-            removeItem,
-          },
-        },
-        {
-          provide: ModalService,
-          useValue: { openConfirmDelete: vi.fn().mockReturnValue(of(true)) },
-        },
-        {
-          provide: ToastService,
-          useValue: { success: vi.fn(), info: vi.fn(), danger },
-        },
-      ],
-    }).compileComponents();
-
-    const fixture = TestBed.createComponent(CartComponent);
-    fixture.componentRef.setInput('items', [
-      {
-        cartItemId: 10,
-        imageUrl: null,
-        product: 'Producto vencido',
-        originalPrice: null,
-        discountedPrice: 1000,
-        discountPercentage: null,
-        attributes: [],
-        quantity: 1,
-      },
-    ]);
-    fixture.detectChanges();
-
-    fixture.debugElement.query(By.css('app-cart-item')).triggerEventHandler('remove');
-
-    expect(danger).toHaveBeenCalledWith(expirationMessage);
-    expect(loadCart).toHaveBeenCalledOnce();
-  });
-
  it('optimistically updates quantity and rolls back on error', async () => {
    vi.useFakeTimers();
    const updateItemQuantity = vi.fn().mockReturnValue(throwError(() => new Error('Error')));
--- a/src/app/shared/components/cart/cart.component.ts
+++ b/src/app/shared/components/cart/cart.component.ts
@@ -98,12 +98,11 @@ export class CartComponent {
                    this.clearOverride(update.cartItemId);
                  },
                  error: (err: HttpErrorResponse) => {
+                    console.error('Error updating cart quantity', err);
+                    const msg =
+                      err.error?.message || 'Error al actualizar la cantidad del producto.';
+                    this.toastService.danger(msg);
                    this.clearOverride(update.cartItemId);
-                    this.handleMutationError(
-                      err,
-                      'Error al actualizar la cantidad del producto.',
-                      'Error updating cart quantity',
-                    );
                  },
                }),
                catchError(() => EMPTY),
@@ -206,12 +205,9 @@ export class CartComponent {
          this.toastService.success(response.message || 'Variante actualizada.');
        },
        error: (error: HttpErrorResponse) => {
+          console.error('Error updating cart item variant', error);
          this.clearVariantOverride(cartItemId);
-          this.handleMutationError(
-            error,
-            'No se pudo actualizar la variante.',
-            'Error updating cart item variant',
-          );
+          this.toastService.danger(error.error?.message || 'No se pudo actualizar la variante.');
        },
      });
  }
@@ -309,29 +305,10 @@ export class CartComponent {
        this.toastService.info(msg);
      },
      error: (err: HttpErrorResponse) => {
-        this.handleMutationError(
-          err,
-          'Error al eliminar el producto del carrito.',
-          'Error removing item from cart',
-        );
+        console.error('Error removing item from cart', err);
+        const msg = err.error?.message || 'Error al eliminar el producto del carrito.';
+        this.toastService.danger(msg);
      },
    });
  }
-
-  private handleMutationError(
-    error: HttpErrorResponse,
-    fallbackMessage: string,
-    logMessage: string,
-  ): void {
-    console.error(logMessage, error);
-    this.toastService.danger(error.error?.message || fallbackMessage);
-
-    if (error.error?.code !== 'stock_reservation.expired') {
-      return;
-    }
-
-    this.cartService.loadCart().subscribe({
-      error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
-    });
-  }
 }