test(catalog): cover global availability behavior

src/app/core/layout/store-layout/store-footer/store-footer.component.html

@@ -22,14 +22,18 @@
 
       <div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start store-layout__contact">
         <div class="d-grid gap-2 store-layout__contact-details">
+          @if (address) {
             <div class="d-flex align-items-center gap-2">
               <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
-            <span>Av. San Lorenzo 1542, Rosario</span>
+              <span>{{ address }}</span>
             </div>
+          }
+          @if (phone) {
             <div class="d-flex align-items-center gap-2">
               <i class="fa-solid fa-phone" aria-hidden="true"></i>
-            <span>54 9 (0341) 6658247</span>
+              <span>{{ phone }}</span>
             </div>
+          }
         </div>
 
         <p class="mb-0 small store-layout__muted-text store-layout__copyright">

src/app/core/layout/store-layout/store-footer/store-footer.component.ts

@@ -27,5 +27,7 @@ export class StoreFooterComponent {
   @Input() logoUrl: string | null = null;
   @Input() backgroundImageUrl: string | null = null;
   @Input() storeName: string | null = null;
+  @Input() address: string | null = null;
+  @Input() phone: string | null = null;
   readonly logoutClick = output<void>();
 }

src/app/core/layout/store-layout/store-header/store-header.component.html

@@ -79,10 +79,13 @@
 
           @if (displayCart()) {
             <app-cart-icon
-              [quantity]="cartQuantity()"
+              [quantity]="cartDisabled() ? null : cartQuantity()"
-              ariaLabel="Carrito de compras"
+              [disabled]="cartDisabled()"
-              title="Carrito"
+              [ariaLabel]="
-              (click)="cartClick.emit()"
+                cartDisabled() ? 'Carrito no disponible durante el checkout' : 'Carrito de compras'
+              "
+              [title]="cartDisabled() ? 'Carrito no disponible durante el checkout' : 'Carrito'"
+              (click)="onCartClick()"
             />
           }
 

src/app/core/layout/store-layout/store-header/store-header.component.ts

@@ -39,6 +39,7 @@ export class StoreHeaderComponent {
   readonly displayCategories = input(true);
   readonly displaySeachBar = input(true);
   readonly displayCart = input(true);
+  readonly cartDisabled = input(false);
   readonly cartClick = output<void>();
   readonly ticketsClick = output<void>();
   readonly loginClick = output<void>();
@@ -53,6 +54,14 @@ export class StoreHeaderComponent {
   protected readonly showSearchError = signal(false);
   protected readonly searchControl = new FormControl('', { nonNullable: true });
 
+  protected onCartClick(): void {
+    if (this.cartDisabled()) {
+      return;
+    }
+
+    this.cartClick.emit();
+  }
+
   @HostListener('document:click', ['$event'])
   protected onDocumentClick(event: MouseEvent): void {
     if (!this.isUserDropdownOpen() && !this.isCategoryDropdownOpen() && !this.isMobileMenuOpen()) {

src/app/core/layout/store-layout/store-layout.component.html

@@ -12,7 +12,8 @@
     [displayCategories]="tenant()?.display_categories ?? true"
     [displaySeachBar]="tenant()?.display_seach_bar ?? true"
     [displayCart]="displayCart()"
-    (cartClick)="isCartOpen.set(!isCartOpen())"
+    [cartDisabled]="isCheckoutRoute()"
+    (cartClick)="onCartClick()"
     (ticketsClick)="onTicketsClick()"
     (loginClick)="onLoginClick()"
     (logoutClick)="onLogoutClick()"
@@ -20,7 +21,7 @@
     (categorySelect)="onCategorySelect($event)"
   />
 
-  @if (displayCart() && isCartOpen()) {
+  @if (displayCart() && !isCheckoutRoute() && isCartOpen()) {
     <div class="store-layout__cart-overlay" (click)="isCartOpen.set(false)"></div>
     <div class="store-layout__cart-dropdown card border-0 shadow-lg">
       <app-cart
@@ -67,6 +68,8 @@
     [logoUrl]="tenant()?.footer_logo ?? null"
     [backgroundImageUrl]="tenant()?.footer_bg_image ?? null"
     [storeName]="tenant()?.nombre ?? null"
+    [address]="tenant()?.address ?? null"
+    [phone]="tenant()?.phone ?? null"
     (logoutClick)="onLogoutClick()"
   />
 </div>

src/app/core/layout/store-layout/store-layout.component.spec.ts

@@ -2,9 +2,16 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { provideRouter, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  convertToParamMap,
+  ParamMap,
+  provideRouter,
+  Router,
+  UrlSerializer,
+} from '@angular/router';
 
-import { of } from 'rxjs';
+import { BehaviorSubject, of } from 'rxjs';
 
 import { Tenant } from '../../services/tenant.interface';
 import { TenantService } from '../../services/tenant.service';
@@ -16,12 +23,15 @@ import { AuthUser } from '../../services/auth/auth.interfaces';
 import { StoreLayoutComponent } from './store-layout.component';
 import { StoreHeaderComponent } from './store-header/store-header.component';
 import { CheckoutService } from '../../services/checkout.service';
+import { TenantUrlSerializer } from '../../services/tenant-url.serializer';
 
 const tenant: Tenant = {
   id: 1,
   codigo: 'test',
   nombre: 'Test Tenant',
   dominio: 'localhost',
+  address: 'Calle Test 123, Rosario',
+  phone: '+54 341 555 1234',
   primary_color: '#6376F3',
   secondary_color: '#A0A0A0',
   danger_color: '#FF8888',
@@ -140,11 +150,13 @@ describe('StoreLayoutComponent', () => {
   let cartState = signal<Cart | null>(null);
   let authUserState = signal<AuthUser | null>(null);
   let checkoutServiceStub: { startCheckout: ReturnType<typeof vi.fn> };
+  let queryParamMapState: BehaviorSubject<ParamMap>;
 
   beforeEach(async () => {
     tenantState = signal<Tenant | null>(tenant);
     cartState = signal<Cart | null>(null);
     authUserState = signal<AuthUser | null>(null);
+    queryParamMapState = new BehaviorSubject(convertToParamMap({}));
     const isAuthenticatedState = signal(false);
     checkoutServiceStub = {
       startCheckout: vi.fn().mockResolvedValue({ id: 55 }),
@@ -154,6 +166,11 @@ describe('StoreLayoutComponent', () => {
       imports: [StoreLayoutComponent],
       providers: [
         provideRouter([]),
+        { provide: UrlSerializer, useClass: TenantUrlSerializer },
+        {
+          provide: ActivatedRoute,
+          useValue: { queryParamMap: queryParamMapState.asObservable() },
+        },
         {
           provide: TenantService,
           useValue: {
@@ -213,6 +230,46 @@ describe('StoreLayoutComponent', () => {
     expect(compiled.querySelector('app-store-footer .store-layout__footer')).not.toBeNull();
   });
 
+  it('opens the cart when requested through the openCart query parameter', () => {
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+
+    expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
+
+    queryParamMapState.next(convertToParamMap({ openCart: 'true' }));
+    fixture.detectChanges();
+
+    expect((fixture.componentInstance as any).isCartOpen()).toBe(true);
+    expect((fixture.nativeElement as HTMLElement).querySelector('app-cart')).not.toBeNull();
+  });
+
+  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?purchase=25');
+
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const cartButton = element.querySelector<HTMLButtonElement>('app-cart-icon button');
+    const header = fixture.debugElement.query(By.directive(StoreHeaderComponent));
+
+    expect(cartButton?.disabled).toBe(true);
+    expect(cartButton?.getAttribute('aria-label')).toBe(
+      'Carrito no disponible durante el checkout',
+    );
+    expect(element.querySelector('[data-testid="cart-badge"]')).toBeNull();
+
+    header.componentInstance.cartClick.emit();
+    queryParamMapState.next(convertToParamMap({ openCart: 'true' }));
+    fixture.detectChanges();
+
+    expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
+    expect(element.querySelector('app-cart')).toBeNull();
+    expect(element.querySelector('.store-layout__cart-overlay')).toBeNull();
+  });
+
   it('hides the configured header elements when the tenant disables them', () => {
     tenantState.set({
       ...tenant,
@@ -274,6 +331,12 @@ describe('StoreLayoutComponent', () => {
     expect(compiled.querySelector('.fa-whatsapp')).not.toBeNull();
     expect(compiled.querySelector('.fa-facebook')).not.toBeNull();
     expect(compiled.querySelector('.fa-linkedin-in')).not.toBeNull();
+    expect(compiled.querySelector('.store-layout__contact-details')?.textContent).toContain(
+      tenant.address,
+    );
+    expect(compiled.querySelector('.store-layout__contact-details')?.textContent).toContain(
+      tenant.phone,
+    );
   });
 
   it('navigates to search results when the search button is clicked', () => {

src/app/core/layout/store-layout/store-layout.component.ts

@@ -1,5 +1,13 @@
-import { Component, computed, inject, OnInit, signal } from '@angular/core';
+import { Component, computed, DestroyRef, inject, OnInit, signal } from '@angular/core';
-import { Router, RouterOutlet } from '@angular/router';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  PRIMARY_OUTLET,
+  Router,
+  RouterOutlet,
+} from '@angular/router';
+import { filter } from 'rxjs';
 import { TenantService } from '../../services/tenant.service';
 import { CartService } from '../../services/cart/cart.service';
 import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-footer.component';
@@ -32,8 +40,11 @@ export class StoreLayoutComponent implements OnInit {
   private readonly checkoutService = inject(CheckoutService);
   private readonly toastService = inject(ToastService);
   private readonly router = inject(Router);
+  private readonly route = inject(ActivatedRoute);
+  private readonly destroyRef = inject(DestroyRef);
 
   protected readonly isCartOpen = signal(false);
+  protected readonly isCheckoutRoute = signal(this.isCheckoutUrl(this.router.url));
   protected readonly isCreatingPurchase = signal(false);
   protected readonly displayCart = computed(() => this.tenant()?.display_cart ?? true);
   protected readonly cartEditingPolicy = computed(() => this.tenant()?.cart_editing_policy ?? null);
@@ -146,15 +157,49 @@ export class StoreLayoutComponent implements OnInit {
   });
 
   ngOnInit(): void {
+    this.router.events
+      .pipe(
+        filter((event): event is NavigationEnd => event instanceof NavigationEnd),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe((event) => {
+        const isCheckoutRoute = this.isCheckoutUrl(event.urlAfterRedirects);
+        this.isCheckoutRoute.set(isCheckoutRoute);
+
+        if (isCheckoutRoute) {
+          this.isCartOpen.set(false);
+        }
+      });
+
+    this.route.queryParamMap.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
+      if (params.get('openCart') === 'true' && !this.isCheckoutRoute()) {
+        this.isCartOpen.set(true);
+      }
+    });
+
     this.cartService.loadCart().subscribe({
       error: (err) => console.error('Error loading cart', err),
     });
   }
 
+  private isCheckoutUrl(url: string): boolean {
+    const primarySegments = this.router.parseUrl(url).root.children[PRIMARY_OUTLET]?.segments ?? [];
+
+    return primarySegments[0]?.path === 'checkout';
+  }
+
   protected onLoginClick(): void {
     void this.router.navigate(['/login']);
   }
 
+  protected onCartClick(): void {
+    if (this.isCheckoutRoute()) {
+      return;
+    }
+
+    this.isCartOpen.update((isOpen) => !isOpen);
+  }
+
   protected onSearch(term: string): void {
     void this.router.navigate(['/buscar'], {
       queryParams: { q: term, page: 1 },
@@ -178,8 +223,8 @@ export class StoreLayoutComponent implements OnInit {
   protected async onLogoutClick(): Promise<void> {
     const isLeavingCheckout = this.router.url.startsWith('/checkout');
 
-    // Checkout must be left while the authenticated session is still valid so
+    // Leave checkout before closing the authenticated session so its component
-    // its CanDeactivate guard can cancel the pending purchase.
+    // can stop payment polling cleanly. The checkout itself remains pending.
     if (isLeavingCheckout) {
       const navigationSucceeded = await this.router.navigate(['/']);
 
@@ -227,7 +272,6 @@ export class StoreLayoutComponent implements OnInit {
         cart_id: cart.id,
       });
 
-      this.cartService.clearCart();
       this.isCartOpen.set(false);
       await this.router.navigate(['/checkout'], {
         queryParams: { purchase: purchase.id },

src/app/core/services/cart/cart.service.spec.ts

@@ -7,11 +7,13 @@ import { CartService } from './cart.service';
 import { TenantService } from '../tenant.service';
 import { Cart } from './cart.interface';
 import { LOADING_MODE } from '../global-loading/loading-mode';
+import { CatalogAvailabilityService } from '../catalog/catalog-availability.service';
 
 describe('CartService', () => {
   let service: CartService;
   let httpMock: HttpTestingController;
   let tenantServiceMock: any;
+  let catalogAvailabilityService: CatalogAvailabilityService;
 
   const mockCart: Cart = {
     id: 123,
@@ -53,6 +55,7 @@ describe('CartService', () => {
     });
 
     service = TestBed.inject(CartService);
+    catalogAvailabilityService = TestBed.inject(CatalogAvailabilityService);
     httpMock = TestBed.inject(HttpTestingController);
   });
 
@@ -101,6 +104,9 @@ describe('CartService', () => {
   });
 
   it('should add item and update signal', () => {
+    const availabilityChanged = vi.fn();
+    catalogAvailabilityService.availabilityChanged$.subscribe(availabilityChanged);
+
     service.addItem(5, 10, 2).subscribe((res) => {
       expect(res.data).toEqual(mockCart);
       expect(service.cart()).toEqual(mockCart);
@@ -115,9 +121,13 @@ describe('CartService', () => {
     });
     expect(req.request.withCredentials).toBe(true);
     req.flush({ data: mockCart });
+    expect(availabilityChanged).toHaveBeenCalledOnce();
   });
 
   it('should update item quantity and update signal', () => {
+    const availabilityChanged = vi.fn();
+    catalogAvailabilityService.availabilityChanged$.subscribe(availabilityChanged);
+
     const updatedCart = { ...mockCart, subtotal: '30.00' };
     updatedCart.items[0].cantidad = 3;
 
@@ -131,9 +141,13 @@ describe('CartService', () => {
     expect(req.request.body).toEqual({ cantidad: 3 });
     expect(req.request.withCredentials).toBe(true);
     req.flush({ data: updatedCart });
+    expect(availabilityChanged).toHaveBeenCalledOnce();
   });
 
   it('should remove item and update signal', () => {
+    const availabilityChanged = vi.fn();
+    catalogAvailabilityService.availabilityChanged$.subscribe(availabilityChanged);
+
     const emptyCart: Cart = {
       id: 123,
       tenant_codigo: 'acme',
@@ -151,5 +165,18 @@ describe('CartService', () => {
     expect(req.request.method).toBe('DELETE');
     expect(req.request.withCredentials).toBe(true);
     req.flush({ data: emptyCart });
+    expect(availabilityChanged).toHaveBeenCalledOnce();
+  });
+
+  it('does not notify an availability change when a cart mutation fails', () => {
+    const availabilityChanged = vi.fn();
+    catalogAvailabilityService.availabilityChanged$.subscribe(availabilityChanged);
+
+    service.removeItem(10).subscribe({ error: vi.fn() });
+
+    const req = httpMock.expectOne('http://api.test/tenants/acme/cart/items/10');
+    req.flush({ message: 'Error' }, { status: 500, statusText: 'Server Error' });
+
+    expect(availabilityChanged).not.toHaveBeenCalled();
   });
 });

src/app/core/services/cart/cart.service.ts

@@ -3,6 +3,7 @@ import { catchError, map, Observable, tap } from 'rxjs';
 
 import { ApiResponse } from '../api-response.interface';
 import { BaseApiService } from '../base-api.service';
+import { CatalogAvailabilityService } from '../catalog/catalog-availability.service';
 import { TenantService } from '../tenant.service';
 import { Cart } from './cart.interface';
 
@@ -10,6 +11,7 @@ import { Cart } from './cart.interface';
   providedIn: 'root',
 })
 export class CartService extends BaseApiService {
+  private readonly catalogAvailabilityService = inject(CatalogAvailabilityService);
   private readonly tenantService = inject(TenantService);
 
   private readonly cartState = signal<Cart | null>(null);
@@ -60,6 +62,7 @@ export class CartService extends BaseApiService {
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
+          this.catalogAvailabilityService.notifyAvailabilityChanged();
           this.isUpdatingState.set(false);
         }),
         catchError((error) => {
@@ -93,6 +96,7 @@ export class CartService extends BaseApiService {
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
+          this.catalogAvailabilityService.notifyAvailabilityChanged();
           this.isUpdatingState.set(false);
         }),
         catchError((error) => {
@@ -111,6 +115,7 @@ export class CartService extends BaseApiService {
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
+          this.catalogAvailabilityService.notifyAvailabilityChanged();
           this.isUpdatingState.set(false);
         }),
         catchError((error) => {

src/app/core/services/catalog/catalog-availability.service.ts

@@ -0,0 +1,15 @@
+import { Injectable } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class CatalogAvailabilityService {
+  private readonly availabilityChangedSubject = new Subject<void>();
+
+  readonly availabilityChanged$: Observable<void> = this.availabilityChangedSubject.asObservable();
+
+  notifyAvailabilityChanged(): void {
+    this.availabilityChangedSubject.next();
+  }
+}

src/app/core/services/catalog/catalog-availability.spec.ts

@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest';
+
+import { CatalogAvailability } from './catalog.interface';
+import {
+  allowsCatalogAction,
+  combineCatalogAvailability,
+  createCatalogAvailability,
+  maximumCatalogQuantity,
+} from './catalog-availability';
+
+describe('catalog availability', () => {
+  it('represents hidden items without irrelevant actions or quantities', () => {
+    const availability = createCatalogAvailability(0);
+
+    expect(availability).toEqual({
+      state: 'hidden',
+      reasons: [
+        {
+          code: 'out_of_stock',
+          message: 'Este producto no tiene stock disponible.',
+        },
+      ],
+    });
+    expect(allowsCatalogAction(availability, 'buy_now')).toBe(false);
+    expect(maximumCatalogQuantity(availability)).toBe(0);
+  });
+
+  it('intersects product and variant actions and quantities', () => {
+    const product: CatalogAvailability = {
+      state: 'visible',
+      maximum_quantity: 3,
+      allowed_actions: ['select_variant', 'change_quantity'],
+      reasons: [{ code: 'limited', message: 'Corregí la selección.' }],
+    };
+    const variant: CatalogAvailability = {
+      state: 'visible',
+      maximum_quantity: 2,
+      allowed_actions: ['change_quantity', 'add_to_cart'],
+      reasons: [],
+    };
+
+    expect(combineCatalogAvailability(product, variant)).toEqual({
+      state: 'visible',
+      maximum_quantity: 2,
+      allowed_actions: ['change_quantity'],
+      reasons: [{ code: 'limited', message: 'Corregí la selección.' }],
+    });
+  });
+
+  it('lets a hidden decision win composition', () => {
+    const availability = combineCatalogAvailability(
+      createCatalogAvailability(5),
+      createCatalogAvailability(0),
+    );
+
+    expect(availability.state).toBe('hidden');
+    expect(allowsCatalogAction(availability, 'add_to_cart')).toBe(false);
+  });
+});

src/app/core/services/catalog/catalog-availability.ts

@@ -0,0 +1,80 @@
+import { CatalogAction, CatalogAvailability } from './catalog.interface';
+
+const ALL_CATALOG_ACTIONS: CatalogAction[] = [
+  'select_variant',
+  'change_quantity',
+  'add_to_cart',
+  'buy_now',
+];
+
+export const AVAILABLE_CATALOG_AVAILABILITY: CatalogAvailability = {
+  state: 'visible',
+  maximum_quantity: null,
+  allowed_actions: ALL_CATALOG_ACTIONS,
+  reasons: [],
+};
+
+export function createCatalogAvailability(maximumQuantity: number | null): CatalogAvailability {
+  const unavailable = maximumQuantity === 0;
+
+  if (unavailable) {
+    return {
+      state: 'hidden',
+      reasons: [
+        {
+          code: 'out_of_stock',
+          message: 'Este producto no tiene stock disponible.',
+        },
+      ],
+    };
+  }
+
+  return {
+    state: 'visible',
+    maximum_quantity: maximumQuantity,
+    allowed_actions: [...ALL_CATALOG_ACTIONS],
+    reasons: [],
+  };
+}
+
+export function primaryAvailabilityMessage(availability: CatalogAvailability): string | null {
+  return availability.reasons[0]?.message ?? null;
+}
+
+export function allowsCatalogAction(
+  availability: CatalogAvailability,
+  action: CatalogAction,
+): boolean {
+  return availability.state === 'visible' && availability.allowed_actions.includes(action);
+}
+
+export function maximumCatalogQuantity(availability: CatalogAvailability): number | null {
+  return availability.state === 'visible' ? availability.maximum_quantity : 0;
+}
+
+export function combineCatalogAvailability(
+  product: CatalogAvailability,
+  variant?: CatalogAvailability | null,
+): CatalogAvailability {
+  if (!variant) return product;
+
+  const reasons = [...product.reasons, ...variant.reasons];
+  if (product.state === 'hidden' || variant.state === 'hidden') {
+    return { state: 'hidden', reasons };
+  }
+
+  return {
+    state: 'visible',
+    maximum_quantity: minimumNullable(product.maximum_quantity, variant.maximum_quantity),
+    allowed_actions: product.allowed_actions.filter((action) =>
+      variant.allowed_actions.includes(action),
+    ),
+    reasons,
+  };
+}
+
+function minimumNullable(left: number | null, right: number | null): number | null {
+  if (left === null) return right;
+  if (right === null) return left;
+  return Math.min(left, right);
+}

src/app/core/services/catalog/catalog.interface.ts

@@ -49,6 +49,25 @@ export interface ProductAttribute {
 
 export type InventoryPolicy = 'tracked' | 'unlimited';
 
+export interface CatalogRestriction {
+  code: 'out_of_stock' | 'user_quota_reached' | string;
+  message: string;
+}
+
+export type CatalogAction = 'select_variant' | 'change_quantity' | 'add_to_cart' | 'buy_now';
+
+export type CatalogAvailability =
+  | {
+      state: 'hidden';
+      reasons: CatalogRestriction[];
+    }
+  | {
+      state: 'visible';
+      maximum_quantity: number | null;
+      allowed_actions: CatalogAction[];
+      reasons: CatalogRestriction[];
+    };
+
 export interface CatalogVariantOption {
   value: string;
   label: string;
@@ -66,7 +85,7 @@ export interface CatalogItemVariant {
   event_date_id?: number | null;
   event_date_ids?: number[];
   event_dates?: string[];
-  maximum_addable_quantity?: number | null;
+  availability: CatalogAvailability;
   minimum_use_date?: string | null;
   maximum_use_date?: string | null;
   effective_minimum_use_date?: string | null;
@@ -98,7 +117,7 @@ export interface CatalogItemDetail {
   attributes: ProductAttribute[];
   variants: CatalogItemVariant[];
   selected_variant?: SelectedCatalogItemVariant;
-  maximum_addable_quantity?: number | null;
+  availability: CatalogAvailability;
   images?: string[];
 }
 
@@ -113,7 +132,7 @@ export interface CatalogFeaturedItemVariant {
   id: number;
   descripcion?: string | null;
   precio?: string;
-  maximum_addable_quantity?: number | null;
+  availability: CatalogAvailability;
   values: Record<string, CatalogVariantValue>;
 }
 
@@ -145,7 +164,7 @@ export interface CatalogFeaturedItem {
   descripcion?: string | null;
   precio: number | string;
   image?: string | null;
-  maximum_addable_quantity?: number | null;
+  availability: CatalogAvailability;
   variants?: CatalogFeaturedItemVariant[];
 }
 
@@ -155,6 +174,7 @@ export type CatalogFeaturedItems =
 
 export interface CatalogFeaturedGroup {
   id: number;
+  code: string;
   title: string;
   layout: CatalogProductLayout;
   group_layout: CatalogGroupLayout;

src/app/core/services/checkout.service.ts

@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
+import { ApiPaginatedResponse } from './api-paginated-response.interface';
+import { ApiPaginationQueryParams } from './api-pagination-query-params.interface';
 import { BaseApiService } from './base-api.service';
 
 export interface UpdatePurchaseCustomerPayload {
@@ -169,46 +171,6 @@ export class CheckoutService extends BaseApiService {
     return purchase;
   }
 
-  async updateItemQuantity(
-    tenantCode: string,
-    purchaseId: number,
-    itemId: number,
-    quantity: number,
-  ): Promise<PurchaseDetailResponse> {
-    const response = await firstValueFrom(
-      this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
-        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`,
-        { quantity },
-      ),
-    );
-
-    const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
-    if (!purchase) {
-      throw new Error('Error al actualizar la cantidad del producto.');
-    }
-
-    return purchase;
-  }
-
-  async prepareItemEditing(
-    tenantCode: string,
-    purchaseId: number,
-  ): Promise<PurchaseDetailResponse> {
-    const response = await firstValueFrom(
-      this.http.post<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
-        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/edit-items`,
-        {},
-      ),
-    );
-
-    const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
-    if (!purchase) {
-      throw new Error('Error al preparar la compra para editarla.');
-    }
-
-    return purchase;
-  }
-
   async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
     const response = await firstValueFrom(
       this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
@@ -266,12 +228,20 @@ export class CheckoutService extends BaseApiService {
   async getPurchases(
     tenantCode: string,
     status?: string,
-  ): Promise<{ data: PurchaseSummaryResponse[] }> {
+    pagination: ApiPaginationQueryParams = {},
-    let url = `${environment.url}tenants/${tenantCode}/compras`;
+  ): Promise<ApiPaginatedResponse<PurchaseSummaryResponse[]>> {
-    if (status) {
+    const params: Record<string, string | number> = {};
-      url += `?status=${status}`;
+
-    }
+    if (status) params['status'] = status;
-    const response = await firstValueFrom(this.http.get<{ data: PurchaseSummaryResponse[] }>(url));
+    if (pagination.page) params['page'] = pagination.page;
+    if (pagination.per_page) params['per_page'] = pagination.per_page;
+
+    const response = await firstValueFrom(
+      this.http.get<ApiPaginatedResponse<PurchaseSummaryResponse[]>>(
+        `${environment.url}tenants/${tenantCode}/compras`,
+        { params },
+      ),
+    );
     if (!response) {
       throw new Error('Error al obtener las compras.');
     }

src/app/core/services/tenant.interface.ts

@@ -113,6 +113,8 @@ export interface Tenant {
   dominio: string;
   base_path?: string;
   site_title?: string | null;
+  address?: string | null;
+  phone?: string | null;
   favicon?: string | null;
   primary_color: string;
   secondary_color: string;
@@ -138,6 +140,7 @@ export interface Tenant {
   display_seach_bar?: boolean;
   display_cart?: boolean;
   cart_editing_policy?: CartEditingPolicy;
+  checkout_editing_policy?: CartEditingPolicy;
   display_cart_item_images?: boolean;
   social_media?: SocialMedia[];
   menues?: Menu[];

src/app/features/componentes-test/pages/reutilizables-test-page/reutilizables-test-page.component.ts

@@ -13,6 +13,7 @@ import { StoreSectionComponent } from '../../../../shared/components/store-secti
 import { ModalService } from '../../../../core/services/modal.service';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
+import { createCatalogAvailability } from '../../../../core/services/catalog/catalog-availability';
 import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
 import { StepComponent } from '../../../../shared/components/stepper/step.component';
 import { CarouselComponent } from '../../../../shared/components/carousel/carousel.component';
@@ -232,7 +233,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1001,
         precio: 250000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
           sector: ticketOption('a', 'Sector A'),
@@ -243,7 +244,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1002,
         precio: 250000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
           sector: ticketOption('a', 'Sector A'),
@@ -254,7 +255,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1003,
         precio: 250000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
           sector: ticketOption('c', 'Sector C'),
@@ -265,7 +266,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1004,
         precio: 200000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
           sector: ticketOption('a', 'Sector A'),
@@ -276,7 +277,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1005,
         precio: 200000,
-        maximum_addable_quantity: 0,
+        availability: createCatalogAvailability(0),
         values: {
           tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
           sector: ticketOption('a', 'Sector A'),
@@ -287,7 +288,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1006,
         precio: 100000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('general', 'General'),
           sector: ticketOption('b', 'Sector B'),
@@ -298,7 +299,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1007,
         precio: 100000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('general', 'General'),
           sector: ticketOption('b', 'Sector B'),
@@ -309,7 +310,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1008,
         precio: 90000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('general', 'General'),
           sector: ticketOption('d', 'Sector D'),
@@ -320,7 +321,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1009,
         precio: 65000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('general', 'General'),
           sector: ticketOption('d', 'Sector D'),
@@ -331,7 +332,7 @@ export class ReutilizablesTestPageComponent {
       {
         id: 1010,
         precio: 40000,
-        maximum_addable_quantity: 1,
+        availability: createCatalogAvailability(1),
         values: {
           tipo: ticketOption('general', 'General'),
           sector: ticketOption('d', 'Sector D'),

src/app/features/store/components/menu-content-section/menu-content-section.component.scss

@@ -11,7 +11,7 @@
 .menu-content-section__header {
   display: flex;
   align-items: center;
-  gap: 0.75rem;
+  gap: var(--menu-content-prefix-gap, 0.75rem);
   margin-bottom: 1.25rem;
 }
 

src/app/features/store/components/product-attribute-selector/product-attribute-selector.component.html

@@ -17,7 +17,7 @@
               [attr.aria-label]="option.label"
               [attr.aria-pressed]="hasSelectedOption(attribute, option)"
               [title]="option.label"
-              [disabled]="!availableOptions()[attribute.codigo][option.id]"
+              [disabled]="disabled() || !availableOptions()[attribute.codigo][option.id]"
               (click)="selectAttributeOption(attribute, option)"
             >
               <span class="visually-hidden">{{ option.label }}</span>
@@ -33,7 +33,7 @@
                 !availableOptions()[attribute.codigo][option.id]
               "
               [attr.aria-pressed]="hasSelectedOption(attribute, option)"
-              [disabled]="!availableOptions()[attribute.codigo][option.id]"
+              [disabled]="disabled() || !availableOptions()[attribute.codigo][option.id]"
               (click)="selectAttributeOption(attribute, option)"
             >
               {{ option.label }}

src/app/features/store/components/product-attribute-selector/product-attribute-selector.component.spec.ts

@@ -2,6 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { beforeEach, describe, expect, it } from 'vitest';
 
 import { ProductAttribute } from '../../../../core/services/catalog/catalog.interface';
+import { createCatalogAvailability } from '../../../../core/services/catalog/catalog-availability';
 import { ProductAttributeSelectorComponent } from './product-attribute-selector.component';
 
 describe('ProductAttributeSelectorComponent', () => {
@@ -31,7 +32,7 @@ describe('ProductAttributeSelectorComponent', () => {
     fixture.componentRef.setInput('variants', [
       {
         id: 1,
-        maximum_addable_quantity: null,
+        availability: createCatalogAvailability(null),
         values: { size: 'S' },
       },
     ]);
@@ -51,12 +52,12 @@ describe('ProductAttributeSelectorComponent', () => {
     fixture.componentRef.setInput('variants', [
       {
         id: 1,
-        maximum_addable_quantity: 0,
+        availability: createCatalogAvailability(0),
         values: { size: 'S' },
       },
       {
         id: 2,
-        maximum_addable_quantity: 2,
+        availability: createCatalogAvailability(2),
         values: { size: 'M' },
       },
     ]);
@@ -92,9 +93,9 @@ describe('ProductAttributeSelectorComponent', () => {
     ]);
     fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
     fixture.componentRef.setInput('variants', [
-      { id: 1, maximum_addable_quantity: null, values: { event_date: '1' } },
+      { id: 1, availability: createCatalogAvailability(null), values: { event_date: '1' } },
-      { id: 2, maximum_addable_quantity: null, values: { event_date: '2' } },
+      { id: 2, availability: createCatalogAvailability(null), values: { event_date: '2' } },
-      { id: 3, maximum_addable_quantity: null, values: { event_date: ['1', '2'] } },
+      { id: 3, availability: createCatalogAvailability(null), values: { event_date: ['1', '2'] } },
     ]);
     fixture.detectChanges();
 
@@ -135,8 +136,16 @@ describe('ProductAttributeSelectorComponent', () => {
     ]);
     fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
     fixture.componentRef.setInput('variants', [
-      { id: 1, maximum_addable_quantity: null, values: { size: 'S', internal_type: 'adult' } },
+      {
-      { id: 2, maximum_addable_quantity: null, values: { size: 'M', internal_type: 'child' } },
+        id: 1,
+        availability: createCatalogAvailability(null),
+        values: { size: 'S', internal_type: 'adult' },
+      },
+      {
+        id: 2,
+        availability: createCatalogAvailability(null),
+        values: { size: 'M', internal_type: 'child' },
+      },
     ]);
     fixture.detectChanges();
 

src/app/features/store/components/product-attribute-selector/product-attribute-selector.component.ts

@@ -15,6 +15,7 @@ import {
   ProductAttribute,
   ProductAttributeOption,
 } from '../../../../core/services/catalog/catalog.interface';
+import { allowsCatalogAction } from '../../../../core/services/catalog/catalog-availability';
 
 @Component({
   selector: 'app-product-attribute-selector',
@@ -29,6 +30,7 @@ export class ProductAttributeSelectorComponent {
   public variants = input<CatalogItemVariant[]>([]);
   public selectedVariant = input<CatalogItemVariant | null>(null);
   public inventoryPolicy = input.required<InventoryPolicy>();
+  public disabled = input(false);
 
   public variantChange = output<CatalogItemVariant | null>();
 
@@ -51,22 +53,15 @@ export class ProductAttributeSelectorComponent {
         const optionNormalized = this.normalizeText(option.value || option.label);
         const selectedForAttribute = selections[attribute.codigo] ?? [];
 
-        if (
-          !attribute.allow_multi_select &&
-          selectedForAttribute.length >= 1 &&
-          !selectedForAttribute.includes(option.id)
-        ) {
-          availability[attribute.codigo][option.id] = false;
-          continue;
-        }
-
         const isAvailable = variants.some((variant) => {
           if (!this.isVariantAvailable(variant)) return false;
 
           const variantAttrValues = this.getVariantAttributeValues(attribute, variant.values);
-          const desiredOptionIds = selectedForAttribute.includes(option.id)
+          const desiredOptionIds = attribute.allow_multi_select
+            ? selectedForAttribute.includes(option.id)
               ? selectedForAttribute
-            : [...selectedForAttribute, option.id];
+              : [...selectedForAttribute, option.id]
+            : [option.id];
           const desiredValues = desiredOptionIds
             .map((id) => attribute.options.find((candidate) => candidate.id === id))
             .filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
@@ -137,6 +132,8 @@ export class ProductAttributeSelectorComponent {
     attribute: ProductAttribute,
     option: ProductAttributeOption,
   ): void {
+    if (this.disabled()) return;
+
     this.selectedAttributeOptions.update((current) => {
       const selected = current[attribute.codigo] ?? [];
       const isMultiple = attribute.allow_multi_select ?? false;
@@ -186,7 +183,15 @@ export class ProductAttributeSelectorComponent {
       return [];
     }
 
-    const defaultValues = this.getVariantAttributeValues(attribute, variant.values);
+    const defaultValues =
+      attribute.type === 'event_date'
+        ? (
+            variant.event_date_ids ??
+            (variant.event_date_id === null || variant.event_date_id === undefined
+              ? []
+              : [variant.event_date_id])
+          ).map(String)
+        : this.getVariantAttributeValues(attribute, variant.values);
     if (defaultValues.length === 0) {
       return [];
     }
@@ -215,6 +220,17 @@ export class ProductAttributeSelectorComponent {
       }
     }
 
+    if (attribute.type === 'event_date') {
+      const variant = this.variants().find((candidate) => candidate.values === variantAttributes);
+      const eventDateIds =
+        variant?.event_date_ids ??
+        (variant?.event_date_id === null || variant?.event_date_id === undefined
+          ? []
+          : [variant.event_date_id]);
+
+      return eventDateIds.map(String);
+    }
+
     return [];
   }
 
@@ -227,7 +243,7 @@ export class ProductAttributeSelectorComponent {
   }
 
   private isVariantAvailable(variant: CatalogItemVariant): boolean {
-    return variant.maximum_addable_quantity !== 0;
+    return allowsCatalogAction(variant.availability, 'select_variant');
   }
 
   private findFirstHexValue(value: unknown): string | null {

src/app/features/store/pages/account-page/components/purchase-list-item/purchase-list-item.html

@@ -1,11 +1,29 @@
-    <div class="purchase-item" [routerLink]="[purchase.id]" style="cursor: pointer;">
+<div class="purchase-item" [routerLink]="[purchase.id]">
   <div class="purchase-info">
     <span class="purchase-id">Compra {{ purchase.id }}.</span>
     <span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
   </div>
+
+  @if (purchase.statusMessage) {
+    <span class="purchase-status">{{ purchase.statusMessage }}</span>
+  }
+
   <div class="purchase-action">
-        <svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="arrow-icon">
+    <svg
-          <path d="M1 1L7 7L1 13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+      width="8"
+      height="14"
+      viewBox="0 0 8 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      class="arrow-icon"
+    >
+      <path
+        d="M1 1L7 7L1 13"
+        stroke="currentColor"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
     </svg>
   </div>
-    </div>
+</div>

src/app/features/store/pages/account-page/components/purchase-list-item/purchase-list-item.scss

@@ -2,33 +2,57 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  gap: 16px;
   padding: 16px;
-  padding-left:0;
+  padding-left: 0;
-  transition: box-shadow 0.2s, border-radius 0.2s;
+  transition:
+    box-shadow 0.2s,
+    border-radius 0.2s;
   cursor: pointer;
 }
+
 .purchase-item:hover {
   box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.07);
   border-radius: 8px;
 }
+
 .purchase-item:hover .arrow-icon {
-  color: #5b75ff; /* Blue on hover */
+  color: var(--color-primary, var(--tenant-primary, #5b75ff));
 }
+
 .purchase-info {
   display: flex;
   flex-direction: column;
   gap: 4px;
 }
+
 .purchase-id {
   font-weight: bold;
   color: #666666;
   font-size: 13px;
 }
+
 .purchase-date {
   font-weight: 325;
   color: #666666;
   font-size: 10px;
 }
+
+.purchase-status {
+  margin-left: auto;
+  margin-right: 20px;
+  color: var(--color-primary, var(--tenant-primary, #5b75ff));
+  font-size: 16px;
+  font-weight: 700;
+  text-align: right;
+}
+
+.purchase-action {
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+}
+
 .arrow-icon {
   width: 8px;
   height: 14px;

src/app/features/store/pages/account-page/components/purchase-list-item/purchase-list-item.ts

@@ -9,6 +9,5 @@ import { RouterLink } from '@angular/router';
   styleUrl: './purchase-list-item.scss',
 })
 export class PurchaseListItem {
-  @Input() purchase!: { id: number; date: string };
+  @Input() purchase!: { id: number; date: string; statusMessage?: string | null };
 }
-

src/app/features/store/pages/account-page/components/purchase-list/purchase-list.html

@@ -1,29 +1,36 @@
-    <div class="purchase-list-container">
+<div class="purchase-list-container">
-      <ng-container *ngIf="isLoading(); else contentTpl">
+  @if (isLoading()) {
-        <!-- Skeleton -->
+    @for (i of [1, 2, 3, 4]; track i) {
-        <div class="skeleton-item" *ngFor="let i of [1, 2, 3, 4]">
+      <div class="skeleton-item">
         <div class="skeleton-info">
           <div class="skeleton-id"></div>
           <div class="skeleton-date"></div>
         </div>
         <div class="skeleton-action"></div>
       </div>
-      </ng-container>
+    }
+  } @else {
+    @if (purchases().length > 0) {
+      @for (purchase of purchases(); track purchase.id; let last = $last) {
+        <app-purchase-list-item [purchase]="purchase"></app-purchase-list-item>
+        @if (!last) {
+          <div class="purchase-divider"></div>
+        }
+      }
+    } @else {
+      <div class="empty-state">Aún no hay compras realizadas</div>
+    }
 
-      <ng-template #contentTpl>
+    @if (pagination(); as paginationData) {
-        <ng-container *ngIf="purchases().length > 0; else emptyTpl">
+      @if (paginationData.last_page > 1) {
-          <ng-container *ngFor="let purchase of purchases(); let last = last">
+        <app-paginator
-            <app-purchase-list-item 
+          class="purchase-list__paginator"
-              [purchase]="purchase">
+          [page]="paginationData.current_page"
-            </app-purchase-list-item>
+          [totalPages]="paginationData.last_page"
-            <div class="purchase-divider" *ngIf="!last"></div>
+          [disabled]="isLoading()"
-          </ng-container>
+          (pageChange)="onPageChange($event)"
-        </ng-container>
+        ></app-paginator>
-      </ng-template>
+      }
-
+    }
-      <ng-template #emptyTpl>
+  }
-        <div class="empty-state">
+</div>
-          Aún no hay compras realizadas
-        </div>
-      </ng-template>
-    </div>

src/app/features/store/pages/account-page/components/purchase-list/purchase-list.scss

@@ -4,9 +4,14 @@
   width: 100%;
 }
 
+.purchase-list__paginator {
+  align-self: center;
+  margin-top: 1.5rem;
+}
+
 .purchase-divider {
   height: 1px;
-  background-color: #DDDDDD;
+  background-color: #dddddd;
   width: 100%;
 }
 
@@ -39,7 +44,7 @@
 .skeleton-id {
   width: 100px;
   height: 1rem;
-  background-color: #EEEEEE;
+  background-color: #eeeeee;
   border-radius: 4px;
   animation: pulse 1.5s infinite ease-in-out;
 }
@@ -47,7 +52,7 @@
 .skeleton-date {
   width: 150px;
   height: 0.8rem;
-  background-color: #EEEEEE;
+  background-color: #eeeeee;
   border-radius: 4px;
   animation: pulse 1.5s infinite ease-in-out;
 }
@@ -55,19 +60,19 @@
 .skeleton-action {
   width: 24px;
   height: 24px;
-  background-color: #EEEEEE;
+  background-color: #eeeeee;
   border-radius: 50%;
   animation: pulse 1.5s infinite ease-in-out;
 }
 
 @keyframes pulse {
   0% {
-    background-color: #EEEEEE;
+    background-color: #eeeeee;
   }
   50% {
-    background-color: #E0E0E0;
+    background-color: #e0e0e0;
   }
   100% {
-    background-color: #EEEEEE;
+    background-color: #eeeeee;
   }
 }

src/app/features/store/pages/account-page/components/purchase-list/purchase-list.ts

@@ -1,19 +1,24 @@
 import { Component, OnInit, inject, signal } from '@angular/core';
-import { CommonModule } from '@angular/common';
 import { PurchaseListItem } from '../purchase-list-item/purchase-list-item';
-import { CheckoutService, PurchaseSummaryResponse } from '../../../../../../core/services/checkout.service';
+import {
+  CheckoutService,
+  PurchaseSummaryResponse,
+} from '../../../../../../core/services/checkout.service';
 import { ToastService } from '../../../../../../core/services/toast.service';
 import { TenantService } from '../../../../../../core/services/tenant.service';
+import { ApiPaginationMeta } from '../../../../../../core/services/api-paginated-response.interface';
+import { PaginatorComponent } from '../../../../../../shared/components/paginator/paginator.component';
 
 type PurchaseListViewModel = {
   id: number;
   date: string;
+  statusMessage: string | null;
 };
 
 @Component({
   selector: 'app-purchase-list',
   standalone: true,
-  imports: [CommonModule, PurchaseListItem],
+  imports: [PurchaseListItem, PaginatorComponent],
   templateUrl: './purchase-list.html',
   styleUrl: './purchase-list.scss',
 })
@@ -22,21 +27,28 @@ export class PurchaseList implements OnInit {
   private readonly toastService = inject(ToastService);
   private readonly tenantService = inject(TenantService);
 
-  purchases = signal<PurchaseListViewModel[]>([]);
+  protected readonly purchases = signal<PurchaseListViewModel[]>([]);
-  isLoading = signal<boolean>(true);
+  protected readonly pagination = signal<ApiPaginationMeta | null>(null);
+  protected readonly isLoading = signal(true);
 
   async ngOnInit(): Promise<void> {
-    try {
+    await this.loadPurchases();
-      const tenantCode = this.tenantService.tenant()?.codigo || '';
+  }
 
+  protected async onPageChange(page: number): Promise<void> {
+    await this.loadPurchases(page);
+  }
+
+  private async loadPurchases(page = 1): Promise<void> {
+    this.isLoading.set(true);
+
+    try {
       const response = await this.checkoutService
         .withCustomLoading()
-        .getPurchases(tenantCode, 'paid');
+        .getPurchases(this.tenantCode(), 'paid,in_review', { page });
-      const mappedPurchases = response.data.map((purchase: PurchaseSummaryResponse) => ({
+
-        id: purchase.id,
+      this.purchases.set(this.mapPurchases(response.data));
-        date: this.formatDate(purchase.created_at),
+      this.pagination.set(response.meta);
-      }));
-      this.purchases.set(mappedPurchases);
     } catch (error) {
       this.toastService.danger('Hubo un error al cargar las compras');
     } finally {
@@ -44,6 +56,18 @@ export class PurchaseList implements OnInit {
     }
   }
 
+  private tenantCode(): string {
+    return this.tenantService.tenant()?.codigo || '';
+  }
+
+  private mapPurchases(purchases: PurchaseSummaryResponse[]): PurchaseListViewModel[] {
+    return purchases.map((purchase) => ({
+      id: purchase.id,
+      date: this.formatDate(purchase.created_at),
+      statusMessage: purchase.status === 'in_review' ? 'Esperando confirmación' : null,
+    }));
+  }
+
   private formatDate(value: string | null): string {
     if (!value) {
       return '-';

src/app/features/store/pages/account-page/pages/purchase-detail-page/purchase-detail-page.html

@@ -15,6 +15,27 @@
   @if (isLoading()) {
     <p class="purchase-loading">Cargando detalle de compra...</p>
   } @else if (purchase(); as purchase) {
+    @if (purchase.isInReview) {
+      <section class="purchase-review" aria-labelledby="purchase-review-title">
+        <h3 id="purchase-review-title" class="purchase-review__title">ESPERANDO CONFIRMACIÓN</h3>
+        <p class="purchase-review__message">
+          Tu compra aún no ha sido confirmada.<br />
+          Si no te contactaste con nosotros, podés hacerlo a través del siguiente WhatsApp
+        </p>
+
+        @if (whatsappUrl()) {
+          <app-button
+            type="button"
+            variant="primary"
+            hostClass="purchase-review__button"
+            (click)="openWhatsApp()"
+          >
+            WhatsApp
+          </app-button>
+        }
+      </section>
+    }
+
     <div
       class="d-flex justify-content-between align-items-center mb-4 pb-3"
       style="border-bottom: 1px solid #dddddd"

src/app/features/store/pages/account-page/pages/purchase-detail-page/purchase-detail-page.scss

@@ -4,6 +4,8 @@
 }
 
 .account-page {
+  --menu-content-prefix-gap: 0;
+
   display: block;
   width: 100%;
   max-width: 600px;
@@ -50,6 +52,32 @@
   font-size: 17px;
 }
 
+.purchase-review {
+  padding-bottom: 2rem;
+  margin-bottom: 2rem;
+  border-bottom: 1px solid #dddddd;
+}
+
+.purchase-review__title {
+  margin: 0 0 0.5rem;
+  color: var(--color-primary, var(--tenant-primary, #5b75ff));
+  font-size: 14px;
+  font-weight: 700;
+  line-height: 1.25;
+}
+
+.purchase-review__message {
+  margin: 0 0 1.5rem;
+  color: #777777;
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 1.4;
+}
+
+.purchase-review__button {
+  width: 185px;
+}
+
 .purchase-loading,
 .purchase-empty {
   color: #666666;

src/app/features/store/pages/account-page/pages/purchase-detail-page/purchase-detail-page.ts

@@ -1,5 +1,4 @@
-import { CommonModule } from '@angular/common';
+import { Component, OnInit, computed, inject, signal } from '@angular/core';
-import { Component, OnInit, inject, signal } from '@angular/core';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
 import {
@@ -8,6 +7,7 @@ import {
 } from '../../../../../../core/services/checkout.service';
 import { TenantService } from '../../../../../../core/services/tenant.service';
 import { ToastService } from '../../../../../../core/services/toast.service';
+import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
 import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { PurchaseItem, PurchaseItemViewModel } from '../../components/purchase-item/purchase-item';
 
@@ -16,12 +16,13 @@ type PurchaseDetailViewModel = {
   date: string;
   total: string;
   items: PurchaseItemViewModel[];
+  isInReview: boolean;
 };
 
 @Component({
   selector: 'app-purchase-detail-page',
   standalone: true,
-  imports: [CommonModule, RouterLink, PurchaseItem, MenuContentSectionComponent],
+  imports: [RouterLink, PurchaseItem, MenuContentSectionComponent, ButtonComponent],
   templateUrl: './purchase-detail-page.html',
   styleUrl: './purchase-detail-page.scss',
 })
@@ -34,6 +35,12 @@ export class PurchaseDetailPage implements OnInit {
 
   readonly isLoading = signal(true);
   readonly purchase = signal<PurchaseDetailViewModel | null>(null);
+  protected readonly whatsappUrl = computed(
+    () =>
+      this.tenantService
+        .tenant()
+        ?.social_media?.find((socialMedia) => socialMedia.code === 'whatsapp')?.url ?? null,
+  );
 
   async ngOnInit(): Promise<void> {
     const purchaseId = this.route.snapshot.paramMap.get('id');
@@ -54,6 +61,7 @@ export class PurchaseDetailPage implements OnInit {
         date: this.formatDate(response.created_at),
         total: response.total,
         items: this.mapItems(response),
+        isInReview: response.status === 'in_review',
       });
     } catch (error) {
       console.error('Failed to fetch purchase detail:', error);
@@ -64,6 +72,14 @@ export class PurchaseDetailPage implements OnInit {
     }
   }
 
+  protected openWhatsApp(): void {
+    const url = this.whatsappUrl();
+
+    if (url) {
+      window.open(url, '_blank', 'noopener,noreferrer');
+    }
+  }
+
   private formatDate(value: string | null): string {
     if (!value) {
       return '-';

src/app/features/store/pages/category-items-page/category-items-page.component.spec.ts

@@ -7,6 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { CartService } from '../../../../core/services/cart/cart.service';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
 import { Tenant } from '../../../../core/services/tenant.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
@@ -107,6 +108,16 @@ describe('CategoryItemsPageComponent', () => {
     expect(Array.isArray(productList.items())).toBe(false);
   });
 
+  it('reloads the current category page when catalog availability changes', () => {
+    const fixture = TestBed.createComponent(CategoryItemsPageComponent);
+    fixture.detectChanges();
+
+    TestBed.inject(CatalogAvailabilityService).notifyAvailabilityChanged();
+
+    expect(getCategoryItems).toHaveBeenCalledTimes(2);
+    expect(getCategoryItems).toHaveBeenLastCalledWith(7, { page: 1 });
+  });
+
   it('does not request the API when the category id is invalid', () => {
     TestBed.overrideProvider(ActivatedRoute, {
       useValue: {

src/app/features/store/pages/category-items-page/category-items-page.component.ts

@@ -16,6 +16,7 @@ import {
   finalize,
   map,
   of,
+  startWith,
   switchMap,
   tap,
 } from 'rxjs';
@@ -28,6 +29,7 @@ import {
   CategoryItemsResponse,
 } from '../../../../core/services/catalog/catalog.interface';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import {
@@ -50,6 +52,7 @@ interface CategoryRouteState {
 })
 export class CategoryItemsPageComponent {
   private readonly cartService = inject(CartService);
+  private readonly catalogAvailabilityService = inject(CatalogAvailabilityService);
   private readonly catalogService = inject(CatalogService);
   private readonly injector = inject(Injector);
   private readonly destroyRef = inject(DestroyRef);
@@ -65,8 +68,7 @@ export class CategoryItemsPageComponent {
   protected readonly paginatedLayout: CatalogGroupLayout = 'paginated';
 
   constructor() {
-    combineLatest([this.route.paramMap, this.route.queryParamMap])
+    const routeState$ = combineLatest([this.route.paramMap, this.route.queryParamMap]).pipe(
-      .pipe(
       map(
         ([params, queryParams]): CategoryRouteState => ({
           categoryId: this.parsePositiveInteger(params.get('id')),
@@ -81,6 +83,14 @@ export class CategoryItemsPageComponent {
         this.results.set(null);
         this.error.set(null);
       }),
+    );
+
+    combineLatest([
+      routeState$,
+      this.catalogAvailabilityService.availabilityChanged$.pipe(startWith(undefined)),
+    ])
+      .pipe(
+        map(([routeState]) => routeState),
         switchMap(({ categoryId, page }) => {
           if (categoryId === 0) {
             this.error.set('La categoría solicitada no es válida.');

src/app/features/store/pages/checkout-page/checkout-page.component.html

@@ -5,13 +5,12 @@
   </div>
 } @else {
   <div class="checkout-page">
-    <div
+    <div class="checkout-page__stepper-col">
-      class="checkout-page__stepper-col"
+      <app-stepper
-      [class.checkout-page__stepper-col--editing]="isEditingItems()"
+        #stepper
-      [attr.aria-hidden]="isEditingItems()"
+        [initialStepIndex]="checkoutStepIndex()"
-      [attr.inert]="isEditingItems() ? '' : null"
+        [disabled]="hasSubmittedTransfer()"
       >
-      <app-stepper #stepper [initialStepIndex]="checkoutStepIndex()">
         <app-step label="Datos" [isValid]="isStep1Valid()">
           <app-checkout-data-step
             [form]="form"
@@ -24,6 +23,7 @@
           <app-checkout-payment-step
             [paymentMethods]="paymentMethods"
             [selectedPaymentMethod]="selectedPaymentMethod()"
+            [paymentMethodDisabled]="hasSubmittedTransfer()"
             [copiedTransferField]="copiedTransferField()"
             [transferAccount]="transferAccount()"
             [transferDni]="transferDni()"
@@ -45,12 +45,6 @@
       </app-stepper>
     </div>
 
-    @if (isEditingItems()) {
-      <div class="checkout-page__editing-notice" role="status">
-        <p>Terminá de modificar las cantidades para continuar con el pago.</p>
-      </div>
-    }
-
     <div class="checkout-page__cart-col">
       <app-cart
         title="COMPRA"
@@ -58,19 +52,13 @@
         [subtotal]="cartSubtotal()"
         [discount]="cartDiscount()"
         [total]="cartTotal()"
-        [readonly]="!canModifyCart()"
+        [readonly]="true"
-        [allowModify]="canModifyCart()"
+        [allowModify]="true"
-        [allowUpdateQuantity]="canUpdateCartQuantity()"
+        [showModifyWhenReadonly]="true"
-        [requireEditingMode]="
+        [modifyAsAction]="true"
-          createdPurchase()?.status === 'created' || createdPurchase()?.status === 'pending_payment'
+        [editingDisabled]="isPurchaseModificationDisabled()"
-        "
-        [allowDelete]="false"
-        [persistQuantityChanges]="false"
-        [editing]="isEditingItems()"
-        [editingDisabled]="isUpdatingItem() || isPreparingItemEdit()"
         backgroundColor="transparent"
-        (editingChange)="onEditingItemsChange($event)"
+        (modify)="onModifyPurchase()"
-        (itemQuantityChange)="onPurchaseItemQuantityChange($event)"
       />
     </div>
   </div>

src/app/features/store/pages/checkout-page/checkout-page.component.scss

@@ -11,8 +11,7 @@
       order: 1;
     }
 
-    .checkout-page__stepper-col,
+    .checkout-page__stepper-col {
-    .checkout-page__editing-notice {
       order: 2;
     }
   }
@@ -21,27 +20,6 @@
     min-width: 0;
     border-radius: 4px;
     min-height: 420px;
-
-    &--editing {
-      display: none;
-    }
-  }
-
-  &__editing-notice {
-    display: grid;
-    min-height: 420px;
-    place-items: center;
-    padding: 2rem;
-    border-radius: 4px;
-    background: #f5f5f5;
-    color: #666666;
-    text-align: center;
-
-    p {
-      max-width: 360px;
-      margin: 0;
-      font-size: 14px;
-    }
   }
 
   &__cart-col {

src/app/features/store/pages/checkout-page/checkout-page.component.spec.ts

@@ -1,3 +1,4 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import { signal } from '@angular/core';
 import { getTestBed, TestBed } from '@angular/core/testing';
 import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
@@ -6,10 +7,12 @@ import { of } from 'rxjs';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { AuthService } from '../../../../core/services/auth/auth.service';
-import { CartService } from '../../../../core/services/cart/cart.service';
 import { CheckoutService } from '../../../../core/services/checkout.service';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { GlobalLoadingService } from '../../../../core/services/global-loading/global-loading.service';
 import { TenantService } from '../../../../core/services/tenant.service';
+import { ToastService } from '../../../../core/services/toast.service';
+import { CartService } from '../../../../core/services/cart/cart.service';
 import { CartEditingPolicy } from '../../../../core/services/tenant.interface';
 import { CheckoutPageComponent } from './checkout-page.component';
 
@@ -17,26 +20,25 @@ describe('CheckoutPageComponent payment validation', () => {
   let checkoutServiceStub: {
     startCheckout: ReturnType<typeof vi.fn>;
     updateCustomerData: ReturnType<typeof vi.fn>;
-    updateItemQuantity: ReturnType<typeof vi.fn>;
-    prepareItemEditing: ReturnType<typeof vi.fn>;
     cancelPurchase: ReturnType<typeof vi.fn>;
     generatePaymentIntent: ReturnType<typeof vi.fn>;
+    submitPurchaseForReview: ReturnType<typeof vi.fn>;
     getPurchase: ReturnType<typeof vi.fn>;
     withCustomLoading: ReturnType<typeof vi.fn>;
   };
-  let cartServiceStub: {
-    cart: ReturnType<typeof signal>;
-    isUpdating: ReturnType<typeof signal<boolean>>;
-    loadCart: ReturnType<typeof vi.fn>;
-    clearCart: ReturnType<typeof vi.fn>;
-  };
   let routerStub: { navigate: ReturnType<typeof vi.fn> };
+  let toastServiceStub: { danger: ReturnType<typeof vi.fn> };
+  let globalLoadingServiceStub: {
+    start: ReturnType<typeof vi.fn>;
+    stop: ReturnType<typeof vi.fn>;
+  };
+  let cartServiceStub: { loadCart: ReturnType<typeof vi.fn> };
   let routeQueryParamMap: ReturnType<typeof convertToParamMap>;
   let authUserState: ReturnType<typeof signal>;
   let tenantState: ReturnType<
     typeof signal<{
       codigo: string;
-      cart_editing_policy?: CartEditingPolicy;
+      checkout_editing_policy?: CartEditingPolicy;
     }>
   >;
 
@@ -59,43 +61,26 @@ describe('CheckoutPageComponent payment validation', () => {
         total: '0.00',
       }),
       updateCustomerData: vi.fn(),
-      updateItemQuantity: vi.fn(),
-      prepareItemEditing: vi.fn(),
       cancelPurchase: vi.fn().mockResolvedValue({ status: 'cancelled' }),
       generatePaymentIntent: vi.fn().mockResolvedValue({
         qr_data: { qr_code: 'qr-value' },
       }),
+      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'in_review' }),
       getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
       withCustomLoading: vi.fn(),
     };
     checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
-    cartServiceStub = {
-      cart: signal({
-        id: 10,
-        tenant_codigo: 'tenant-test',
-        status: 'active',
-        items: [],
-        subtotal: '0.00',
-      }),
-      isUpdating: signal(false),
-      loadCart: vi.fn().mockReturnValue(of({})),
-      clearCart: vi.fn(),
-    };
-    cartServiceStub.clearCart.mockImplementation(() => {
-      cartServiceStub.cart.set({
-        id: null,
-        tenant_codigo: 'tenant-test',
-        status: 'active',
-        items: [],
-        subtotal: '0.00',
-      });
-    });
     routerStub = { navigate: vi.fn() };
+    toastServiceStub = { danger: vi.fn() };
+    globalLoadingServiceStub = { start: vi.fn(), stop: vi.fn() };
+    cartServiceStub = {
+      loadCart: vi.fn().mockReturnValue(of({ id: 30, items: [], subtotal: '0.00' })),
+    };
     routeQueryParamMap = convertToParamMap({});
     authUserState = signal(null);
     tenantState = signal({
       codigo: 'tenant-test',
-      cart_editing_policy: {
+      checkout_editing_policy: {
         code: 'full',
         allow_modify: true,
         allow_delete: true,
@@ -109,9 +94,11 @@ describe('CheckoutPageComponent payment validation', () => {
       providers: [
         { provide: CheckoutService, useValue: checkoutServiceStub },
         { provide: CatalogService, useValue: { getCatalogItem: vi.fn() } },
-        { provide: CartService, useValue: cartServiceStub },
         { provide: TenantService, useValue: { tenant: tenantState } },
         { provide: AuthService, useValue: { user: authUserState } },
+        { provide: GlobalLoadingService, useValue: globalLoadingServiceStub },
+        { provide: ToastService, useValue: toastServiceStub },
+        { provide: CartService, useValue: cartServiceStub },
         {
           provide: ActivatedRoute,
           useValue: {
@@ -157,7 +144,6 @@ describe('CheckoutPageComponent payment validation', () => {
 
     await vi.advanceTimersByTimeAsync(5_000);
     expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(2);
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
     expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
     expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledTimes(1);
   });
@@ -209,19 +195,46 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
   });
 
-  it('checks the purchase detail once when the transfer was made', async () => {
+  it('polls a transfer every three seconds up to four attempts', async () => {
     checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'pending_payment' });
     const { component } = createComponent();
     component.selectedPaymentMethod.set('transfer');
 
     await component.onComplete();
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
+    expect(component.transferValidationStatus()).toBe('checking');
-    expect(component.transferValidationStatus()).toBe('error');
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
+    expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
-    expect(routerStub.navigate).not.toHaveBeenCalled();
 
-    await vi.advanceTimersByTimeAsync(30_000);
+    for (let attempt = 1; attempt <= 3; attempt += 1) {
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
+      await vi.advanceTimersByTimeAsync(3_000);
+      expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(attempt);
+      expect(component.transferValidationStatus()).toBe('checking');
+    }
+
+    await vi.advanceTimersByTimeAsync(3_000);
+    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(4);
+    expect(checkoutServiceStub.getPurchase).toHaveBeenLastCalledWith('tenant-test', 25);
+    expect(component.transferValidationStatus()).toBe('error');
+    expect(routerStub.navigate).not.toHaveBeenCalled();
+  });
+
+  it('prevents modifying the purchase after Ya transferí is clicked', async () => {
+    const { component } = createComponent();
+    component.selectedPaymentMethod.set('transfer');
+
+    await component.onComplete();
+
+    expect(component.hasSubmittedTransfer()).toBe(true);
+    expect(component.isPurchaseModificationDisabled()).toBe(true);
+
+    await component.selectPaymentMethod('qr');
+    await component.onModifyPurchase();
+
+    expect(component.selectedPaymentMethod()).toBe('transfer');
+    expect(checkoutServiceStub.generatePaymentIntent).not.toHaveBeenCalled();
+    expect(checkoutServiceStub.cancelPurchase).not.toHaveBeenCalled();
+    expect(globalLoadingServiceStub.start).not.toHaveBeenCalled();
+    expect(routerStub.navigate).not.toHaveBeenCalled();
   });
 
   it('navigates after a transfer is confirmed as paid', async () => {
@@ -230,25 +243,49 @@ describe('CheckoutPageComponent payment validation', () => {
     component.selectedPaymentMethod.set('transfer');
 
     await component.onComplete();
+    await vi.advanceTimersByTimeAsync(3_000);
 
     expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
     expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
   });
 
-  it('shows a retryable state when transfer validation fails', async () => {
+  it('keeps polling after transfer validation requests fail', async () => {
     vi.spyOn(console, 'error').mockImplementation(() => undefined);
     checkoutServiceStub.getPurchase.mockRejectedValue(new Error('network error'));
     const { component } = createComponent();
     component.selectedPaymentMethod.set('transfer');
 
     await component.onComplete();
+    await vi.advanceTimersByTimeAsync(12_000);
 
+    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(4);
     expect(component.transferValidationStatus()).toBe('error');
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
     expect(routerStub.navigate).not.toHaveBeenCalled();
   });
 
+  it('does not poll when submitting a transfer for review fails', async () => {
+    vi.spyOn(console, 'error').mockImplementation(() => undefined);
+    checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error'));
+    const { component } = createComponent();
+    component.selectedPaymentMethod.set('transfer');
+
+    await component.onComplete();
+    await vi.advanceTimersByTimeAsync(12_000);
+
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
+    expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
+    expect(component.transferValidationStatus()).toBe('error');
+  });
+
+  it('cancels transfer polling when the component is destroyed', async () => {
+    const checkout = createComponent();
+    checkout.component.selectedPaymentMethod.set('transfer');
+    await checkout.component.onComplete();
+    checkout.fixture.destroy();
+    await vi.advanceTimersByTimeAsync(12_000);
+    expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
+  });
+
   it('loads purchase items but prefills customer data from the user', async () => {
     const purchase = {
       id: 25,
@@ -423,83 +460,73 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
   });
 
-  it('updates a purchase item while editing and refreshes checkout totals', async () => {
+  it('shows the API error in a toast when cancelling the purchase fails', async () => {
-    const updatedPurchase = {
+    const message = 'La compra venció. Iniciá una nueva compra.';
-      id: 25,
+    checkoutServiceStub.cancelPurchase.mockRejectedValue({
-      items: [],
+      error: { code: 'purchase.expired', message },
-      subtotal: '300.00',
+    });
-      total: '300.00',
-    };
-    checkoutServiceStub.updateItemQuantity.mockResolvedValue(updatedPurchase);
     const { component } = createComponent();
-    component.isEditingItems.set(true);
 
-    await component.onPurchaseItemQuantityChange({
+    await component.onModifyPurchase();
-      item: {
+
-        cartItemId: 91,
+    expect(toastServiceStub.danger).toHaveBeenCalledWith(message);
-        imageUrl: null,
+    expect(routerStub.navigate).not.toHaveBeenCalled();
-        product: 'Remera',
+    expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
-        originalPrice: null,
+    expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
-        discountedPrice: 100,
+    expect(component.isCancellingPurchase()).toBe(false);
-        discountPercentage: null,
-        attributes: [],
-        quantity: 2,
-      },
-      quantity: 3,
   });
 
-    expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith('tenant-test', 25, 91, 3);
+  it('cancels the current purchase and opens the active cart when Modificar is clicked', async () => {
-    expect(component.createdPurchase()).toBe(updatedPurchase);
+    let finishNavigation!: (navigated: boolean) => void;
-    expect(component.isUpdatingItem()).toBe(false);
+    routerStub.navigate.mockReturnValue(
-  });
+      new Promise<boolean>((resolve) => {
-
+        finishNavigation = resolve;
-  it('keeps the payment step selected while editing and regenerates payment afterward', async () => {
+      }),
-    const editablePurchase = {
+    );
+    const { component } = createComponent();
+    component.createdPurchase.set({
       id: 25,
       status: 'created',
-      items: [],
+      items: [
-      subtotal: '100.00',
+        {
-      total: '100.00',
+          id: 91,
-    };
+          quantity: 2,
-    checkoutServiceStub.prepareItemEditing.mockResolvedValue(editablePurchase);
+          unit_price: '100.00',
-    const { component } = createComponent();
+          line_total: '200.00',
-    component.stepper = { currentStepIndex: signal(1) };
+          source_catalog_item_id: 8,
-    const selectPaymentMethod = vi
+          source_variant_id: null,
-      .spyOn(component, 'selectPaymentMethod')
+          item_details: {
-      .mockResolvedValue(undefined);
+            nombre: 'Remera',
-
+            descripcion: null,
-    await component.onEditingItemsChange(true);
+            slug: 'remera',
-
+            imagen: null,
-    expect(checkoutServiceStub.prepareItemEditing).toHaveBeenCalledWith('tenant-test', 25);
+            attributes: [],
-    expect(component.isEditingItems()).toBe(true);
-    expect(component.createdPurchase()).toBe(editablePurchase);
-
-    await component.onEditingItemsChange(false);
-
-    expect(component.stepper.currentStepIndex()).toBe(1);
-    expect(selectPaymentMethod).toHaveBeenCalledWith('qr');
-    expect(component.isEditingItems()).toBe(false);
-  });
-
-  it('does not allow item editing when the tenant disables cart editing', async () => {
-    tenantState.set({
-      codigo: 'tenant-test',
-      cart_editing_policy: {
-        code: 'disabled',
-        allow_modify: false,
-        allow_delete: false,
-        allow_update_quantity: false,
-        allow_update_variant: false,
           },
+        },
+      ],
+      subtotal: '200.00',
+      total: '200.00',
     });
-    const { component } = createComponent();
+    const modification = component.onModifyPurchase();
+    await Promise.resolve();
+    await Promise.resolve();
 
-    await component.onEditingItemsChange(true);
+    expect(checkoutServiceStub.cancelPurchase).toHaveBeenCalledWith('tenant-test', 25);
+    expect(cartServiceStub.loadCart).toHaveBeenCalledOnce();
+    expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
+    expect(globalLoadingServiceStub.stop).not.toHaveBeenCalled();
+    expect(component.createdPurchaseId()).toBeNull();
+    expect(component.createdPurchase()).toBeNull();
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/'], {
+      queryParams: { openCart: true },
+    });
 
-    expect(component.canUpdateCartQuantity()).toBe(false);
+    finishNavigation(true);
-    expect(component.canModifyCart()).toBe(false);
+    await modification;
-    expect(component.isEditingItems()).toBe(false);
+
-    expect(checkoutServiceStub.prepareItemEditing).not.toHaveBeenCalled();
+    expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
+
+    await component.canDeactivate();
   });
 
   it('updates customer data on the existing purchase before payment', async () => {
@@ -536,14 +563,78 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(component.stepper.next).toHaveBeenCalledOnce();
   });
 
-  it('cancels the pending purchase before allowing navigation away', async () => {
+  it('cancels the current purchase when navigating away from checkout', async () => {
     const { component } = createComponent();
 
     await expect(component.canDeactivate()).resolves.toBe(true);
 
     expect(checkoutServiceStub.cancelPurchase).toHaveBeenCalledWith('tenant-test', 25);
-    expect(cartServiceStub.loadCart).toHaveBeenCalled();
+    expect(cartServiceStub.loadCart).toHaveBeenCalledOnce();
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
     expect(component.createdPurchaseId()).toBeNull();
+    expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
+    expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
+  });
+
+  it('prevents leaving checkout when the purchase cannot be cancelled', async () => {
+    checkoutServiceStub.cancelPurchase.mockRejectedValue({
+      error: { message: 'No se pudo cancelar la compra.' },
+    });
+    const { component } = createComponent();
+
+    await expect(component.canDeactivate()).resolves.toBe(false);
+
+    expect(toastServiceStub.danger).toHaveBeenCalledWith('No se pudo cancelar la compra.');
+    expect(component.createdPurchaseId()).toBe(25);
+  });
+
+  it('shows the API message and redirects home when a checkout operation finds an expired purchase', async () => {
+    checkoutServiceStub.generatePaymentIntent.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');
+
+    expect(toastServiceStub.danger).toHaveBeenCalledWith(
+      'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
+    );
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
+    expect(component.isGeneratingIntent()).toBe(false);
+  });
+
+  it('treats a generic customer-data error as expired when the local deadline passed', () => {
+    const { component } = createComponent();
+    component.createdPurchase.set({
+      id: 25,
+      status: 'created',
+      expires_at: new Date(Date.now() - 1_000).toISOString(),
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    });
+
+    const handled = component.handleCheckoutError(
+      new HttpErrorResponse({
+        status: 422,
+        error: {
+          errors: {
+            purchase: ['La compra ya no se puede modificar.'],
+          },
+        },
+      }),
+      'No se pudieron actualizar los datos de la compra.',
+    );
+
+    expect(handled).toBe(true);
+    expect(toastServiceStub.danger).toHaveBeenCalledWith(
+      'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
+    );
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
   });
 });

src/app/features/store/pages/checkout-page/checkout-page.component.ts

@@ -8,6 +8,7 @@ import {
   signal,
   ViewChild,
 } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
 import { FormBuilder, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { firstValueFrom, startWith } from 'rxjs';
@@ -19,8 +20,9 @@ import {
   PurchaseDetailResponse,
 } from '../../../../core/services/checkout.service';
 import { AuthService } from '../../../../core/services/auth/auth.service';
+import { GlobalLoadingService } from '../../../../core/services/global-loading/global-loading.service';
+import { ToastService } from '../../../../core/services/toast.service';
 import { CartService } from '../../../../core/services/cart/cart.service';
-import { BankAccount } from '../../../../core/services/tenant.interface';
 import { CartComponent, CartItemMock } from '../../../../shared/components/cart/cart.component';
 import { StepComponent } from '../../../../shared/components/stepper/step.component';
 import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
@@ -36,6 +38,12 @@ import {
   TransferValidationStatus,
 } from './checkout-page.models';
 
+interface ApiErrorResponse {
+  code?: string;
+  message?: string;
+  errors?: Record<string, string[]>;
+}
+
 @Component({
   selector: 'app-checkout-page',
   standalone: true,
@@ -57,15 +65,23 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   private readonly tenantService = inject(TenantService);
   private readonly checkoutService = inject(CheckoutService);
   private readonly authService = inject(AuthService);
+  private readonly globalLoadingService = inject(GlobalLoadingService);
+  private readonly toastService = inject(ToastService);
   private readonly cartService = inject(CartService);
   private readonly qrPollingIntervalMs = 5_000;
-  private readonly qrPollingMaxAttempts = 9;
+  private readonly qrPollingMaxAttempts = 120;
+  private readonly transferPollingIntervalMs = 3_000;
+  private readonly transferPollingMaxAttempts = 209;
 
   private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
   private qrPollingAttempts = 0;
   private qrPollingRunId = 0;
+  private transferPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
+  private transferPollingAttempts = 0;
+  private transferPollingRunId = 0;
   private paymentMethodRequestId = 0;
   private navigationStarted = false;
+  private cancelPurchasePromise: Promise<boolean> | null = null;
 
   @ViewChild(StepperComponent) stepper!: StepperComponent;
 
@@ -79,13 +95,6 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   protected readonly createdPurchase = signal<PurchaseDetailResponse | null>(null);
   protected readonly isLoadingPurchase = signal(true);
   protected readonly checkoutStepIndex = signal(0);
-  protected readonly canUpdateCartQuantity = computed(
-    () => this.tenantService.tenant()?.cart_editing_policy?.allow_update_quantity ?? false,
-  );
-  protected readonly canModifyCart = computed(
-    () => this.tenantService.tenant()?.cart_editing_policy?.allow_modify ?? false,
-  );
-
   protected readonly cartSubtotal = computed(() => {
     const purchase = this.createdPurchase();
     return purchase ? parseFloat(purchase.subtotal) : 0;
@@ -114,9 +123,11 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   protected readonly transferDni = signal<string>('');
 
   protected readonly isUpdatingPurchase = signal(false);
-  protected readonly isEditingItems = signal(false);
+  protected readonly isCancellingPurchase = signal(false);
-  protected readonly isUpdatingItem = signal(false);
+  protected readonly hasSubmittedTransfer = signal(false);
-  protected readonly isPreparingItemEdit = signal(false);
+  protected readonly isPurchaseModificationDisabled = computed(
+    () => this.isCancellingPurchase() || this.hasSubmittedTransfer(),
+  );
   protected readonly createdPurchaseId = signal<number | null>(null);
   protected readonly isGeneratingIntent = signal(false);
   protected readonly isPaymentLoading = computed(() => this.isGeneratingIntent());
@@ -161,6 +172,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.stopQrPolling();
+    this.stopTransferPolling();
   }
 
   private mapPurchaseItemToMock(item: PurchaseDetailItemResponse): CartItemMock {
@@ -176,92 +188,30 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
         value: attribute.value === null ? '' : String(attribute.value),
       })),
       quantity: item.quantity,
+      variantId: item.source_variant_id,
     };
   }
 
-  protected async onEditingItemsChange(editing: boolean): Promise<void> {
+  protected async onModifyPurchase(): Promise<void> {
-    if (this.isUpdatingItem() || this.isPreparingItemEdit()) {
+    if (this.isPurchaseModificationDisabled()) {
       return;
     }
 
-    if (editing && !this.canModifyCart()) {
+    this.globalLoadingService.start();
-      return;
-    }
-
-    if (!editing) {
-      this.isEditingItems.set(false);
-
-      if (this.stepper?.currentStepIndex() === 1) {
-        void this.selectPaymentMethod(this.selectedPaymentMethod());
-      }
-
-      return;
-    }
-
-    this.isEditingItems.set(true);
-    this.stopQrPolling();
-    this.qrData.set(null);
-    this.qrPaymentStatus.set('idle');
-    this.transferAccount.set(null);
-    this.transferValidationStatus.set('idle');
-
-    const tenant = this.tenantService.tenant();
-    const purchaseId = this.createdPurchaseId();
-
-    if (!tenant || !purchaseId) {
-      this.isEditingItems.set(false);
-      return;
-    }
-
-    this.isPreparingItemEdit.set(true);
     try {
-      const purchase = await this.checkoutService.prepareItemEditing(tenant.codigo, purchaseId);
+      const cancelled = await this.cancelCurrentPurchase();
-      this.createdPurchase.set(purchase);
+      if (!cancelled) return;
-    } catch (error) {
+
-      console.error('Failed to prepare purchase item editing:', error);
+      await this.router.navigate(['/'], {
-      this.isEditingItems.set(false);
+        queryParams: { openCart: true },
+      });
     } finally {
-      this.isPreparingItemEdit.set(false);
+      this.globalLoadingService.stop();
-    }
-  }
-
-  protected async onPurchaseItemQuantityChange(event: {
-    item: CartItemMock;
-    quantity: number;
-  }): Promise<void> {
-    const tenant = this.tenantService.tenant();
-    const purchaseId = this.createdPurchaseId();
-    const itemId = event.item.cartItemId;
-
-    if (
-      !this.canUpdateCartQuantity() ||
-      !tenant ||
-      !purchaseId ||
-      !itemId ||
-      this.isUpdatingItem() ||
-      !this.isEditingItems()
-    ) {
-      return;
-    }
-
-    this.isUpdatingItem.set(true);
-    try {
-      const purchase = await this.checkoutService.updateItemQuantity(
-        tenant.codigo,
-        purchaseId,
-        itemId,
-        event.quantity,
-      );
-      this.createdPurchase.set(purchase);
-    } catch (error) {
-      console.error('Failed to update purchase item quantity:', error);
-    } finally {
-      this.isUpdatingItem.set(false);
     }
   }
 
   protected async onStep1Continue(): Promise<void> {
-    if (this.form.invalid || this.isUpdatingPurchase() || this.isEditingItems()) return;
+    if (this.form.invalid || this.isUpdatingPurchase()) return;
 
     const tenant = this.tenantService.tenant();
     const purchaseId = this.createdPurchaseId();
@@ -285,56 +235,81 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       void this.selectPaymentMethod(this.selectedPaymentMethod());
     } catch (error) {
       console.error('Failed to create purchase:', error);
-      // Here we could show an alert or toast
+      this.showRequestError(error, 'No se pudieron actualizar los datos de la compra.');
     } finally {
       this.isUpdatingPurchase.set(false);
     }
   }
 
   protected async onCancel(): Promise<void> {
-    if (await this.canDeactivate()) {
     void this.router.navigate(['/']);
   }
-  }
 
   public async canDeactivate(): Promise<boolean> {
     this.stopQrPolling();
+    this.stopTransferPolling();
+
+    if (this.cancelPurchasePromise) {
+      return this.cancelPurchasePromise;
+    }
 
     if (this.navigationStarted) {
       return true;
     }
 
-    const purchaseId = this.createdPurchaseId();
+    this.globalLoadingService.start();
-    const tenant = this.tenantService.tenant();
+    try {
+      return await this.cancelCurrentPurchase();
+    } finally {
+      this.globalLoadingService.stop();
+    }
+  }
 
-    if (!purchaseId || !tenant) {
+  private cancelCurrentPurchase(): Promise<boolean> {
+    if (this.cancelPurchasePromise) {
+      return this.cancelPurchasePromise;
+    }
+
+    this.cancelPurchasePromise = this.performPurchaseCancellation().finally(() => {
+      this.cancelPurchasePromise = null;
+    });
+
+    return this.cancelPurchasePromise;
+  }
+
+  private async performPurchaseCancellation(): Promise<boolean> {
+    const tenant = this.tenantService.tenant();
+    const purchaseId = this.createdPurchaseId();
+    if (!tenant || !purchaseId) {
       return true;
     }
 
+    this.isCancellingPurchase.set(true);
+
     try {
       await this.checkoutService.cancelPurchase(tenant.codigo, purchaseId);
+      await firstValueFrom(this.cartService.loadCart());
       this.createdPurchaseId.set(null);
       this.createdPurchase.set(null);
 
-      try {
+      this.navigationStarted = true;
-        await firstValueFrom(this.cartService.loadCart());
-      } catch (error) {
-        console.error('Failed to restore cart after cancelling checkout:', error);
-      }
-
       return true;
     } catch (error) {
-      console.error('Failed to cancel purchase:', error);
+      console.error('Failed to cancel the current purchase:', error);
+      this.showRequestError(error, 'No se pudo cancelar la compra.');
       return false;
+    } finally {
+      this.isCancellingPurchase.set(false);
     }
   }
 
   protected async selectPaymentMethod(method: PaymentMethod): Promise<void> {
-    if (this.navigationStarted || this.isEditingItems()) {
+    if (this.navigationStarted || this.hasSubmittedTransfer()) {
       return;
     }
 
     this.stopQrPolling();
+    this.stopTransferPolling();
     this.qrPaymentStatus.set('idle');
     this.transferValidationStatus.set('idle');
     this.selectedPaymentMethod.set(method);
@@ -374,13 +349,14 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       }
     } catch (error) {
       console.error('Failed to generate payment intent:', error);
+      this.showRequestError(error, 'No se pudo generar el pago.');
     } finally {
       this.isGeneratingIntent.set(false);
     }
   }
 
   protected async generateTransferIntent(dni: string): Promise<void> {
-    if (this.isEditingItems()) {
+    if (this.hasSubmittedTransfer()) {
       return;
     }
 
@@ -392,6 +368,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     }
 
     this.transferDni.set(dni);
+    this.stopTransferPolling();
     this.transferValidationStatus.set('idle');
     this.isGeneratingIntent.set(true);
     try {
@@ -410,6 +387,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       }
     } catch (error) {
       console.error('Failed to generate transfer payment intent:', error);
+      this.showRequestError(error, 'No se pudo generar el pago por transferencia.');
     } finally {
       this.isGeneratingIntent.set(false);
     }
@@ -440,28 +418,103 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       !purchaseId ||
       !tenant ||
       this.navigationStarted ||
-      this.isEditingItems() ||
       this.transferValidationStatus() === 'checking'
     ) {
       return;
     }
 
+    this.stopTransferPolling();
+    this.hasSubmittedTransfer.set(true);
     this.transferValidationStatus.set('checking');
+    this.transferPollingAttempts = 0;
+
+    const runId = this.transferPollingRunId;
 
     try {
       const purchase = await this.checkoutService
         .withCustomLoading()
-        .getPurchase(tenant.codigo, purchaseId);
+        .submitPurchaseForReview(tenant.codigo, purchaseId);
+
+      if (runId !== this.transferPollingRunId) {
+        return;
+      }
 
       if (purchase.status === 'paid') {
         this.navigateToPurchaseStatus(purchaseId);
         return;
       }
 
+      this.scheduleTransferPoll(runId);
+    } catch (error) {
+      const expired = this.handleCheckoutError(
+        error,
+        'No se pudo enviar el pago para su validación.',
+      );
+
+      if (!expired && runId === this.transferPollingRunId) {
         this.transferValidationStatus.set('error');
+      }
+    }
+  }
+
+  private scheduleTransferPoll(runId: number): void {
+    this.transferPollingTimeoutId = setTimeout(() => {
+      this.transferPollingTimeoutId = null;
+      void this.checkTransferPayment(runId);
+    }, this.transferPollingIntervalMs);
+  }
+
+  private async checkTransferPayment(runId: number): Promise<void> {
+    if (runId !== this.transferPollingRunId) {
+      return;
+    }
+
+    const purchaseId = this.createdPurchaseId();
+    const tenant = this.tenantService.tenant();
+
+    if (!purchaseId || !tenant || this.selectedPaymentMethod() !== 'transfer') {
+      this.stopTransferPolling();
+      return;
+    }
+
+    this.transferPollingAttempts += 1;
+
+    try {
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
+
+      if (runId !== this.transferPollingRunId) {
+        return;
+      }
+
+      if (purchase.status === 'paid') {
+        this.navigateToPurchaseStatus(purchaseId);
+        return;
+      }
     } catch (error) {
       console.error('Failed to validate transfer payment:', error);
+    }
+
+    if (runId !== this.transferPollingRunId) {
+      return;
+    }
+
+    if (this.transferPollingAttempts >= this.transferPollingMaxAttempts) {
+      this.stopTransferPolling();
       this.transferValidationStatus.set('error');
+      return;
+    }
+
+    this.scheduleTransferPoll(runId);
+  }
+
+  private stopTransferPolling(): void {
+    this.transferPollingRunId += 1;
+
+    if (this.transferPollingTimeoutId !== null) {
+      clearTimeout(this.transferPollingTimeoutId);
+      this.transferPollingTimeoutId = null;
     }
   }
 
@@ -575,6 +628,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
     this.navigationStarted = true;
     this.stopQrPolling();
+    this.stopTransferPolling();
 
     void this.router.navigate(['/checkout/status', purchaseId]);
   }
@@ -586,6 +640,8 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       return;
     }
 
+    this.createdPurchaseId.set(purchaseId);
+
     try {
       const purchase = await this.checkoutService
         .withCustomLoading()
@@ -593,6 +649,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
       if (
         (purchase.status === 'pending_payment' && purchase.expires_at === null) ||
+        purchase.status === 'in_review' ||
         purchase.status === 'paid' ||
         purchase.status === 'cancelled' ||
         purchase.status === 'rejected' ||
@@ -626,7 +683,67 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       }
     } catch (error) {
       console.error('Failed to load purchase:', error);
+      this.showRequestError(error, 'No se pudo cargar la compra.');
       void this.router.navigate(['/']);
     }
   }
+
+  private showRequestError(error: unknown, fallbackMessage: string): void {
+    const payload =
+      typeof error === 'object' && error !== null && 'error' in error
+        ? (error as { error?: { message?: unknown } }).error
+        : undefined;
+    const message =
+      typeof payload?.message === 'string' && payload.message.trim()
+        ? payload.message
+        : fallbackMessage;
+
+    this.toastService.danger(message);
+  }
+
+  private handleCheckoutError(error: unknown, fallbackMessage: string): boolean {
+    if (!(error instanceof HttpErrorResponse)) {
+      this.toastService.danger(fallbackMessage);
+      return false;
+    }
+
+    const response = error.error as ApiErrorResponse | null;
+
+    if (response?.code === 'purchase.expired' || this.hasExpiredPurchase()) {
+      this.stopQrPolling();
+      this.stopTransferPolling();
+      this.toastService.danger(
+        response?.code === 'purchase.expired' && response.message
+          ? response.message
+          : 'La compra venció. Iniciá una nueva compra.',
+      );
+      void this.router.navigate(['/']);
+      return true;
+    }
+
+    const validationMessage = response?.errors
+      ? Object.values(response.errors).flat().find(Boolean)
+      : undefined;
+
+    this.toastService.danger(validationMessage ?? response?.message ?? fallbackMessage);
+    return false;
+  }
+
+  private hasExpiredPurchase(): boolean {
+    const purchase = this.createdPurchase();
+
+    if (!purchase) {
+      return false;
+    }
+
+    if (purchase.status === 'expired') {
+      return true;
+    }
+
+    if (!purchase.expires_at) {
+      return false;
+    }
+
+    return Date.parse(purchase.expires_at) <= Date.now();
+  }
 }

src/app/features/store/pages/checkout-page/checkout-payment-step.component.html

@@ -7,13 +7,18 @@
 
       <div class="payment-methods__list" role="radiogroup" aria-label="Metodo de pago">
         @for (method of paymentMethods(); track method.id) {
-          <label class="payment-method" [class.is-selected]="selectedPaymentMethod() === method.id">
+          <label
+            class="payment-method"
+            [class.is-selected]="selectedPaymentMethod() === method.id"
+            [class.is-disabled]="paymentMethodDisabled()"
+          >
             <input
               class="payment-method__radio"
               type="radio"
               name="payment-method"
               [value]="method.id"
               [checked]="selectedPaymentMethod() === method.id"
+              [disabled]="paymentMethodDisabled()"
               (change)="selectPaymentMethod(method.id)"
             />
 

src/app/features/store/pages/checkout-page/checkout-payment-step.component.scss

@@ -63,10 +63,14 @@
   cursor: pointer;
   transition: color 0.2s ease;
 
-  &:hover {
+  &:not(.is-disabled):hover {
     color: #4f4f4f;
   }
 
+  &.is-disabled {
+    cursor: default;
+  }
+
   &.is-selected {
     color: var(--tenant-primary, #6376f3);
   }
@@ -79,6 +83,10 @@
     cursor: pointer;
   }
 
+  &.is-disabled &__radio {
+    cursor: default;
+  }
+
   &__label {
     min-width: 0;
     font-size: 13px;
@@ -91,11 +99,13 @@
     font-size: 0.95rem;
     opacity: 0;
     transform: translateX(-4px);
-    transition: opacity 0.2s ease, transform 0.2s ease;
+    transition:
+      opacity 0.2s ease,
+      transform 0.2s ease;
   }
 
   &.is-selected &__chevron,
-  &:hover &__chevron {
+  &:not(.is-disabled):hover &__chevron {
     opacity: 1;
     transform: translateX(0);
   }
@@ -140,6 +150,4 @@
     font-weight: 700;
     line-height: 1.35;
   }
-
 }
-

src/app/features/store/pages/checkout-page/checkout-payment-step.component.ts

@@ -17,11 +17,12 @@ import {
   imports: [CheckoutPaymentQrComponent, CheckoutPaymentTransferComponent],
   templateUrl: './checkout-payment-step.component.html',
   styleUrl: './checkout-payment-step.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CheckoutPaymentStepComponent {
   readonly paymentMethods = input.required<ReadonlyArray<PaymentMethodOption>>();
   readonly selectedPaymentMethod = input.required<PaymentMethod>();
+  readonly paymentMethodDisabled = input<boolean>(false);
   readonly copiedTransferField = input<TransferField | null>(null);
   readonly transferAccount = input<TransferAccount | null>(null);
   readonly transferDni = input<string>('');
@@ -40,6 +41,10 @@ export class CheckoutPaymentStepComponent {
   readonly generateTransferIntent = output<string>();
 
   protected selectPaymentMethod(method: PaymentMethod): void {
+    if (this.paymentMethodDisabled()) {
+      return;
+    }
+
     this.paymentMethodChange.emit(method);
   }
 

src/app/features/store/pages/product-detail-page/product-detail-page.component.html

@@ -44,6 +44,7 @@
                 [variants]="prod.variants"
                 [selectedVariant]="prod.selected_variant ?? null"
                 [inventoryPolicy]="prod.inventory_policy"
+                [disabled]="!allows(prod.availability, 'select_variant')"
                 (variantChange)="onVariantChange($event)"
               />
             </section>
@@ -53,14 +54,22 @@
 
           <section class="product-detail__section">
             <div class="product-detail__purchase">
-              <app-quantity-selector [(quantity)]="quantity" [max]="selectedVariantMax()" />
+              @if (restrictionMessage(); as message) {
+                <p class="mb-0 text-danger" role="status">{{ message }}</p>
+              }
+
+              <app-quantity-selector
+                [(quantity)]="quantity"
+                [max]="selectedVariantMax()"
+                [disabled]="!allows(effectiveAvailability(), 'change_quantity')"
+              />
 
               <div class="product-detail__actions">
                 <app-button
                   class="product-detail__cta"
                   variant="secondary"
                   type="button"
-                  [disabled]="!selectedVariantAvailable() || variantLoading() || addingToCart()"
+                  [disabled]="!canAddToCart() || variantLoading() || addingToCart()"
                   (click)="addToCart()"
                 >
                   @if (addingToCart()) {
@@ -75,9 +84,7 @@
                 <app-button
                   class="product-detail__cta"
                   type="button"
-                  [disabled]="
+                  [disabled]="!canBuyNow() || variantLoading() || creatingDirectPurchase()"
-                    !selectedVariantAvailable() || variantLoading() || creatingDirectPurchase()
-                  "
                   (click)="buyNow()"
                 >
                   @if (variantLoading() || creatingDirectPurchase()) {

src/app/features/store/pages/product-detail-page/product-detail-page.component.spec.ts

@@ -9,6 +9,8 @@ import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { CatalogItemDetail } from '../../../../core/services/catalog/catalog.interface';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
+import { createCatalogAvailability } from '../../../../core/services/catalog/catalog-availability';
 import { CartService } from '../../../../core/services/cart/cart.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import { ProductDetailPageComponent } from './product-detail-page.component';
@@ -37,7 +39,7 @@ describe('ProductDetailPageComponent', () => {
     has_tickets: false,
     minimum_use_date: null,
     maximum_use_date: null,
-    maximum_addable_quantity: 10,
+    availability: createCatalogAvailability(10),
     attributes: [],
     variants: [],
   };
@@ -176,6 +178,36 @@ describe('ProductDetailPageComponent', () => {
     expect(element.querySelector('.product-carousel__discount-badge')).toBeNull();
   });
 
+  it('reloads product availability when the cart changes', async () => {
+    catalogServiceStub.getCatalogItem.mockReturnValue(
+      of({ ...mockProduct, availability: createCatalogAvailability(4) }),
+    );
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+
+    TestBed.inject(CatalogAvailabilityService).notifyAvailabilityChanged();
+    fixture.detectChanges();
+
+    expect(catalogServiceStub.getCatalogItem).toHaveBeenCalledWith(1, undefined);
+    expect(fixture.componentInstance['selectedVariantMax']()).toBe(4);
+  });
+
+  it('stops presenting a product that becomes hidden during an availability refresh', async () => {
+    catalogServiceStub.getCatalogItem.mockReturnValue(
+      throwError(() => new HttpErrorResponse({ status: 404 })),
+    );
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+
+    TestBed.inject(CatalogAvailabilityService).notifyAvailabilityChanged();
+    fixture.detectChanges();
+
+    expect(fixture.componentInstance['product']()).toBeNull();
+    expect(fixture.nativeElement.textContent).toContain('Este producto ya no está disponible.');
+  });
+
   it('shows error message if the resolver cannot load the product', async () => {
     resolveProductError(PRODUCT_DETAIL_ERROR_MESSAGE);
     await configureTestingModule();
@@ -191,10 +223,10 @@ describe('ProductDetailPageComponent', () => {
     const detailProduct: CatalogItemDetail = {
       ...mockProduct,
       images: ['https://example.com/product.png'],
-      variants: [{ id: 123, maximum_addable_quantity: 10, values: {} }],
+      variants: [{ id: 123, availability: createCatalogAvailability(10), values: {} }],
       selected_variant: {
         id: 123,
-        maximum_addable_quantity: 10,
+        availability: createCatalogAvailability(10),
         images: ['https://example.com/variant1.png', 'https://example.com/variant2.png'],
         values: {},
       },
@@ -296,11 +328,15 @@ describe('ProductDetailPageComponent', () => {
         },
       ],
       variants: [
-        { id: 123, maximum_addable_quantity: 10, values: { color: 'beige', material: 'Cuero' } },
+        {
+          id: 123,
+          availability: createCatalogAvailability(10),
+          values: { color: 'beige', material: 'Cuero' },
+        },
       ],
       selected_variant: {
         id: 123,
-        maximum_addable_quantity: 10,
+        availability: createCatalogAvailability(10),
         images: ['https://example.com/variant1.png'],
         values: {
           color: 'beige',
@@ -337,8 +373,18 @@ describe('ProductDetailPageComponent', () => {
       purpose: 'entry',
       has_tickets: true,
       variants: [
-        { id: 101, event_date_id: 20, maximum_addable_quantity: 10, values: { event_date: '20' } },
+        {
-        { id: 102, event_date_id: 21, maximum_addable_quantity: 10, values: { event_date: '21' } },
+          id: 101,
+          event_date_id: 20,
+          availability: createCatalogAvailability(10),
+          values: { event_date: '20' },
+        },
+        {
+          id: 102,
+          event_date_id: 21,
+          availability: createCatalogAvailability(10),
+          values: { event_date: '21' },
+        },
       ],
       attributes: [
         {
@@ -369,7 +415,7 @@ describe('ProductDetailPageComponent', () => {
       selected_variant: {
         id: 101,
         event_date_id: 20,
-        maximum_addable_quantity: 10,
+        availability: createCatalogAvailability(10),
         images: [],
         values: {},
       },
@@ -391,6 +437,8 @@ describe('ProductDetailPageComponent', () => {
 
     options[1].click();
     fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
 
     expect(catalogServiceStub.getCatalogItem).toHaveBeenCalledWith(1, 102);
   });
@@ -413,7 +461,7 @@ describe('ProductDetailPageComponent', () => {
 
     fixture.componentInstance['selectedVariant'].set({
       id: 1,
-      maximum_addable_quantity: 10,
+      availability: createCatalogAvailability(10),
       values: {},
     });
     fixture.detectChanges();
@@ -503,16 +551,16 @@ describe('ProductDetailPageComponent', () => {
         error: {
           code: 'purchase.limit_exceeded',
           message: 'Podés agregar hasta 2 unidades más de “Auriculares Bluetooth”.',
-          maximum_addable_quantity: 2,
+          availability: createCatalogAvailability(2),
         },
       }),
     );
     await configureTestingModule();
     const fixture = TestBed.createComponent(ProductDetailPageComponent);
     fixture.detectChanges();
-    const buyButton = Array.from(fixture.nativeElement.querySelectorAll('app-button button')).find(
+    const buyButton = Array.from(
-      (button) => button.textContent?.trim() === 'Comprar',
+      fixture.nativeElement.querySelectorAll('app-button button') as NodeListOf<HTMLButtonElement>,
-    ) as HTMLButtonElement;
+    ).find((button) => button.textContent?.trim() === 'Comprar') as HTMLButtonElement;
 
     buyButton.click();
     await Promise.resolve();
@@ -528,13 +576,13 @@ describe('ProductDetailPageComponent', () => {
       variants: [
         {
           id: 123,
-          maximum_addable_quantity: 5,
+          availability: createCatalogAvailability(5),
           values: {},
         },
       ],
       selected_variant: {
         id: 123,
-        maximum_addable_quantity: 5,
+        availability: createCatalogAvailability(5),
         images: [],
         values: {},
       },
@@ -567,7 +615,7 @@ describe('ProductDetailPageComponent', () => {
     resolveProduct({
       ...mockProduct,
       variants: [],
-      maximum_addable_quantity: 4,
+      availability: createCatalogAvailability(4),
     });
 
     await configureTestingModule();
@@ -593,13 +641,13 @@ describe('ProductDetailPageComponent', () => {
       variants: [
         {
           id: 123,
-          maximum_addable_quantity: 5,
+          availability: createCatalogAvailability(5),
           values: {},
         },
       ],
       selected_variant: {
         id: 123,
-        maximum_addable_quantity: 5,
+        availability: createCatalogAvailability(5),
         images: [],
         values: {},
       },
@@ -631,7 +679,7 @@ describe('ProductDetailPageComponent', () => {
   it('allows unlimited variants to increase quantity without a maximum', async () => {
     const unlimitedVariant = {
       id: 321,
-      maximum_addable_quantity: null,
+      availability: createCatalogAvailability(null),
       values: {},
     };
     resolveProduct({
@@ -639,7 +687,7 @@ describe('ProductDetailPageComponent', () => {
       inventory_policy: 'unlimited',
       selected_variant: {
         id: 321,
-        maximum_addable_quantity: null,
+        availability: createCatalogAvailability(null),
         images: [],
         values: {},
       },
@@ -663,7 +711,7 @@ describe('ProductDetailPageComponent', () => {
   it('caps an unlimited variant at the per-user purchase limit', async () => {
     const unlimitedVariant = {
       id: 322,
-      maximum_addable_quantity: 2,
+      availability: createCatalogAvailability(2),
       values: {},
     };
     resolveProduct({
@@ -672,7 +720,7 @@ describe('ProductDetailPageComponent', () => {
       max_units_per_user: 2,
       selected_variant: {
         id: 322,
-        maximum_addable_quantity: 2,
+        availability: createCatalogAvailability(2),
         images: [],
         values: { event_date: '20' },
       },
@@ -696,14 +744,14 @@ describe('ProductDetailPageComponent', () => {
   it('disables purchase actions for tracked variants without stock', async () => {
     const trackedVariant = {
       id: 654,
-      maximum_addable_quantity: 0,
+      availability: createCatalogAvailability(0),
       values: {},
     };
     resolveProduct({
       ...mockProduct,
       selected_variant: {
         id: 654,
-        maximum_addable_quantity: 0,
+        availability: createCatalogAvailability(0),
         images: [],
         values: {},
       },

src/app/features/store/pages/product-detail-page/product-detail-page.component.ts

@@ -17,6 +17,7 @@ import { ActivatedRoute, Router, RouterModule } from '@angular/router';
 import { Subscription } from 'rxjs';
 
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import { CartService } from '../../../../core/services/cart/cart.service';
 import {
@@ -31,6 +32,13 @@ import { ProductDetailResolvedData } from './product-detail-page.resolver';
 import { CheckoutService } from '../../../../core/services/checkout.service';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { AuthService } from '../../../../core/services/auth/auth.service';
+import {
+  AVAILABLE_CATALOG_AVAILABILITY,
+  allowsCatalogAction,
+  combineCatalogAvailability,
+  maximumCatalogQuantity,
+  primaryAvailabilityMessage,
+} from '../../../../core/services/catalog/catalog-availability';
 
 @Component({
   selector: 'app-product-detail-page',
@@ -51,6 +59,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
   private readonly catalogService = inject(CatalogService);
+  private readonly catalogAvailabilityService = inject(CatalogAvailabilityService);
   private readonly toastService = inject(ToastService);
   private readonly cartService = inject(CartService);
   private readonly checkoutService = inject(CheckoutService);
@@ -64,6 +73,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
 
   private routeSub: Subscription | null = null;
   private productSub: Subscription | null = null;
+  private availabilityChangedSub: Subscription | null = null;
   private carouselResizeObserver: ResizeObserver | null = null;
   private observedCarouselPreview: HTMLElement | null = null;
   private measurementTimer: ReturnType<typeof setTimeout> | null = null;
@@ -93,29 +103,41 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     () => this.selectedVariant()?.precio ?? this.product()?.precio,
   );
   protected readonly quantity = signal(1);
+  protected readonly effectiveAvailability = computed(() => {
+    const prod = this.product();
+    const variant = this.selectedVariant();
+    if (!prod) return AVAILABLE_CATALOG_AVAILABILITY;
+
+    return combineCatalogAvailability(prod.availability, variant?.availability);
+  });
   protected readonly selectedVariantMax = computed<number | null>(() => {
     const prod = this.product();
     const variant = this.selectedVariant();
     if (!prod) return 0;
+    if (!variant && prod.variants.length > 0) return 0;
 
-    return variant
+    return maximumCatalogQuantity(this.effectiveAvailability());
-      ? (variant.maximum_addable_quantity ?? null)
-      : prod.variants.length === 0
-        ? (prod.maximum_addable_quantity ?? null)
-        : 0;
   });
-  protected readonly selectedVariantAvailable = computed(() => {
+  protected readonly hasPurchasableSelection = computed(() => {
     const prod = this.product();
     if (!prod) return false;
-    if (this.selectedVariantMax() === 0) return false;
 
-    const variant = this.selectedVariant();
+    return prod.variants.length === 0 || this.selectedVariant() !== null;
-    if (variant) return this.isVariantAvailable(variant);
-    if (prod.purpose === 'entry') return false;
-    if (prod.variants.length > 0) return false;
-
-    return this.selectedVariantMax() !== 0;
   });
+  protected readonly canAddToCart = computed(
+    () =>
+      this.hasPurchasableSelection() &&
+      allowsCatalogAction(this.effectiveAvailability(), 'add_to_cart'),
+  );
+  protected readonly canBuyNow = computed(
+    () =>
+      this.hasPurchasableSelection() &&
+      allowsCatalogAction(this.effectiveAvailability(), 'buy_now'),
+  );
+  protected readonly restrictionMessage = computed(() =>
+    primaryAvailabilityMessage(this.effectiveAvailability()),
+  );
+  protected readonly allows = allowsCatalogAction;
   protected readonly descriptionExpanded = signal(false);
   protected readonly descriptionMaxHeight = signal(0);
   protected readonly descriptionHasOverflow = signal(false);
@@ -150,6 +172,10 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
+    this.availabilityChangedSub = this.catalogAvailabilityService.availabilityChanged$.subscribe(
+      () => this.refreshProductAvailability(),
+    );
+
     this.routeSub = this.route.data.subscribe((data) => {
       const resolvedData = data['productDetailData'] as ProductDetailResolvedData | undefined;
 
@@ -160,6 +186,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.availabilityChangedSub?.unsubscribe();
     this.routeSub?.unsubscribe();
     this.productSub?.unsubscribe();
     this.carouselResizeObserver?.disconnect();
@@ -196,6 +223,36 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       });
   }
 
+  private refreshProductAvailability(): void {
+    const currentProduct = this.product();
+    if (!currentProduct) {
+      return;
+    }
+
+    const variantId = this.selectedVariant()?.id;
+    this.productSub?.unsubscribe();
+    this.productSub = this.catalogService
+      .withCustomLoading()
+      .getCatalogItem(currentProduct.id, variantId)
+      .subscribe({
+        next: (product) => {
+          this.applyProduct(product, false);
+
+          const maximum = this.selectedVariantMax();
+          if (maximum !== null && this.quantity() > maximum) {
+            this.quantity.set(Math.max(1, maximum));
+          }
+        },
+        error: (error: HttpErrorResponse) => {
+          if (error.status === 404) {
+            this.product.set(null);
+            this.selectedVariant.set(null);
+            this.error.set('Este producto ya no está disponible.');
+          }
+        },
+      });
+  }
+
   private applyResolvedData(resolvedData: ProductDetailResolvedData): void {
     this.productSub?.unsubscribe();
     this.loading.set(false);
@@ -261,8 +318,10 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   protected addToCart(): void {
     const currentProduct = this.product();
     const variant = this.selectedVariant();
-    if (!currentProduct || !this.selectedVariantAvailable()) {
+    if (!currentProduct || !this.canAddToCart()) {
-      this.toastService.danger('Por favor, selecciona una variante.');
+      this.toastService.danger(
+        this.effectiveAvailability().reasons[0]?.message ?? 'Por favor, selecciona una variante.',
+      );
       return;
     }
 
@@ -292,8 +351,10 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       return;
     }
 
-    if (!currentProduct || !this.selectedVariantAvailable()) {
+    if (!currentProduct || !this.canBuyNow()) {
-      this.toastService.danger('Por favor, selecciona una variante.');
+      this.toastService.danger(
+        this.effectiveAvailability().reasons[0]?.message ?? 'Por favor, selecciona una variante.',
+      );
       return;
     }
 
@@ -339,10 +400,6 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     }
   }
 
-  private isVariantAvailable(variant: CatalogItemVariant): boolean {
-    return variant.maximum_addable_quantity !== 0;
-  }
-
   protected toggleDescription(): void {
     this.descriptionExpanded.update((current) => !current);
   }

src/app/features/store/pages/product-detail-page/product-detail-page.resolver.spec.ts

@@ -5,6 +5,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { CatalogItemDetail } from '../../../../core/services/catalog/catalog.interface';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { createCatalogAvailability } from '../../../../core/services/catalog/catalog-availability';
 import {
   PRODUCT_DETAIL_ERROR_MESSAGE,
   PRODUCT_DETAIL_INVALID_ID_MESSAGE,
@@ -15,6 +16,7 @@ import {
 describe('productDetailResolver', () => {
   const product: CatalogItemDetail = {
     id: 1,
+    type: 'product',
     category_id: 10,
     brand_id: null,
     slug: 'auriculares-bluetooth',
@@ -28,7 +30,7 @@ describe('productDetailResolver', () => {
     has_tickets: false,
     minimum_use_date: null,
     maximum_use_date: null,
-    maximum_addable_quantity: 0,
+    availability: createCatalogAvailability(0),
     attributes: [],
     variants: [],
   };

src/app/features/store/pages/search-page/search-page.component.spec.ts

@@ -7,6 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { CartService } from '../../../../core/services/cart/cart.service';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
 import { Tenant } from '../../../../core/services/tenant.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
@@ -108,6 +109,16 @@ describe('SearchPageComponent', () => {
     );
   });
 
+  it('repeats the current search when catalog availability changes', () => {
+    const fixture = TestBed.createComponent(SearchPageComponent);
+    fixture.detectChanges();
+
+    TestBed.inject(CatalogAvailabilityService).notifyAvailabilityChanged();
+
+    expect(searchCatalog).toHaveBeenCalledTimes(2);
+    expect(searchCatalog).toHaveBeenLastCalledWith({ q: 'running', page: 1 });
+  });
+
   it('renders the search title and query subtitle with the category header layout', () => {
     const fixture = TestBed.createComponent(SearchPageComponent);
     fixture.detectChanges();

src/app/features/store/pages/search-page/search-page.component.ts

@@ -9,7 +9,17 @@ import {
   signal,
 } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { catchError, distinctUntilChanged, finalize, map, of, switchMap, tap } from 'rxjs';
+import {
+  catchError,
+  combineLatest,
+  distinctUntilChanged,
+  finalize,
+  map,
+  of,
+  startWith,
+  switchMap,
+  tap,
+} from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 import { CartService } from '../../../../core/services/cart/cart.service';
@@ -22,6 +32,7 @@ import {
   CatalogProductLayout,
 } from '../../../../core/services/catalog/catalog.interface';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
 import { ApiPaginatedResponse } from '../../../../core/services/api-paginated-response.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
@@ -46,6 +57,7 @@ interface SearchRouteState {
 export class SearchPageComponent {
   private readonly minSearchLength = 3;
   private readonly cartService = inject(CartService);
+  private readonly catalogAvailabilityService = inject(CatalogAvailabilityService);
   private readonly catalogService = inject(CatalogService);
   private readonly injector = inject(Injector);
   private readonly destroyRef = inject(DestroyRef);
@@ -86,8 +98,7 @@ export class SearchPageComponent {
   });
 
   constructor() {
-    this.route.queryParamMap
+    const routeState$ = this.route.queryParamMap.pipe(
-      .pipe(
       map(
         (params): SearchRouteState => ({
           query: params.get('q')?.trim() ?? '',
@@ -106,6 +117,14 @@ export class SearchPageComponent {
             : `Ingresá al menos ${this.minSearchLength} caracteres para buscar.`,
         );
       }),
+    );
+
+    combineLatest([
+      routeState$,
+      this.catalogAvailabilityService.availabilityChanged$.pipe(startWith(undefined)),
+    ])
+      .pipe(
+        map(([routeState]) => routeState),
         switchMap(({ query, page }) => {
           if (query.length < this.minSearchLength) {
             return of(null);

src/app/features/store/pages/store-home-page/store-home-page.component.html

@@ -23,7 +23,7 @@
   </p>
 } @else {
   @for (group of catalog(); track group.id) {
-    <app-store-section [title]="group.title">
+    <app-store-section [attr.id]="group.code" [title]="group.title">
       <app-product-list
         [layout]="group.layout"
         [groupLayout]="group.group_layout"

src/app/features/store/pages/store-home-page/store-home-page.component.scss

@@ -11,6 +11,10 @@ app-store-section + app-store-section {
   margin-top: clamp(3rem, 6vw, 5rem);
 }
 
+app-store-section[id] {
+  scroll-margin-top: 8rem;
+}
+
 :host > .store-home__additional-info:not(:first-child) {
   margin-top: clamp(3rem, 6vw, 5rem);
 }

src/app/features/store/pages/store-home-page/store-home-page.component.spec.ts

@@ -12,6 +12,8 @@ import {
   CatalogFeaturedItem,
 } from '../../../../core/services/catalog/catalog.interface';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
+import { createCatalogAvailability } from '../../../../core/services/catalog/catalog-availability';
 import { Tenant } from '../../../../core/services/tenant.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
@@ -58,6 +60,7 @@ function createCatalog(
   return [
     {
       id: 7,
+      code: 'destacados',
       title: 'Destacados',
       layout: 'column_with_image',
       group_layout: 'paginated',
@@ -77,15 +80,19 @@ function provideActivatedRoute(catalogData: StoreHomeCatalogResolvedData) {
 const pageOneItems: CatalogFeaturedItem[] = [
   {
     id: 1,
+    type: 'product',
     nombre: 'Auriculares Bluetooth',
     precio: '24999.00',
     image: '/catalog/auriculares.jpg',
+    availability: createCatalogAvailability(null),
   },
   {
     id: 2,
+    type: 'product',
     nombre: 'Teclado Mecanico',
     precio: '18999.00',
     image: null,
+    availability: createCatalogAvailability(null),
   },
 ];
 
@@ -149,6 +156,7 @@ describe('StoreHomePageComponent', () => {
     const element = fixture.nativeElement as HTMLElement;
 
     expect(catalogServiceStub.getCatalog).not.toHaveBeenCalled();
+    expect(element.querySelector('app-store-section')?.id).toBe('destacados');
     expect(element.querySelector('.store-section__title')?.textContent?.trim()).toBe('Destacados');
     expect(element.querySelectorAll('app-product-column-with-image')).toHaveLength(2);
     expect(element.textContent).toContain('Auriculares Bluetooth');
@@ -157,6 +165,30 @@ describe('StoreHomePageComponent', () => {
     );
   });
 
+  it('reloads the catalog when availability changes', async () => {
+    const refreshedCatalog = createCatalog();
+    const catalogServiceStub = {
+      getCatalog: vi.fn().mockReturnValue(of(refreshedCatalog)),
+      getFeaturedGroupItems: vi.fn(),
+      withCustomLoading: vi.fn(),
+    };
+    catalogServiceStub.withCustomLoading.mockReturnValue(catalogServiceStub);
+
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        { provide: CatalogService, useValue: catalogServiceStub },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+    TestBed.inject(CatalogAvailabilityService).notifyAvailabilityChanged();
+
+    expect(catalogServiceStub.getCatalog).toHaveBeenCalledOnce();
+  });
+
   it('renders the carousel URLs received in tenant extras', async () => {
     const carousel = ['https://example.com/carousel-1.webp', 'https://example.com/carousel-2.webp'];
 
@@ -376,7 +408,16 @@ describe('StoreHomePageComponent', () => {
   });
 
   it('requests another page for the selected featured group', async () => {
-    const pageTwoItems = [{ id: 3, nombre: 'Mouse Gamer', precio: '15999.00', image: null }];
+    const pageTwoItems: CatalogFeaturedItem[] = [
+      {
+        id: 3,
+        type: 'product',
+        nombre: 'Mouse Gamer',
+        precio: '15999.00',
+        image: null,
+        availability: createCatalogAvailability(null),
+      },
+    ];
     const catalogServiceStub = {
       getCatalog: vi.fn(),
       getFeaturedGroupItems: vi.fn().mockReturnValue(of(createItemsPage(pageTwoItems, 2, 2))),

src/app/features/store/pages/store-home-page/store-home-page.component.ts

@@ -15,6 +15,7 @@ import { finalize, Subscription } from 'rxjs';
 import { CartService } from '../../../../core/services/cart/cart.service';
 import { AuthService } from '../../../../core/services/auth/auth.service';
 import { CatalogFeaturedGroup } from '../../../../core/services/catalog/catalog.interface';
+import { CatalogAvailabilityService } from '../../../../core/services/catalog/catalog-availability.service';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
@@ -49,6 +50,7 @@ import {
 })
 export class StoreHomePageComponent implements OnInit, OnDestroy {
   private readonly cartService = inject(CartService);
+  private readonly catalogAvailabilityService = inject(CatalogAvailabilityService);
   private readonly catalogService = inject(CatalogService);
   private readonly injector = inject(Injector);
   private readonly route = inject(ActivatedRoute);
@@ -96,9 +98,13 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   protected readonly hasMainCarouselImages = computed(() => this.mainCarouselImages().length > 0);
 
   private catalogRequestSubscription: Subscription | null = null;
+  private availabilityChangedSubscription: Subscription | null = null;
   private readonly groupRequestSubscriptions = new Map<number, Subscription>();
 
   ngOnInit(): void {
+    this.availabilityChangedSubscription =
+      this.catalogAvailabilityService.availabilityChanged$.subscribe(() => this.loadCatalog(true));
+
     const resolvedData = this.route.snapshot.data['catalogData'] as
       | StoreHomeCatalogResolvedData
       | undefined;
@@ -112,6 +118,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.availabilityChangedSubscription?.unsubscribe();
     this.catalogRequestSubscription?.unsubscribe();
     this.groupRequestSubscriptions.forEach((subscription) => subscription.unsubscribe());
   }
@@ -264,20 +271,27 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
     });
   }
 
-  private loadCatalog(): void {
+  private loadCatalog(silent = false): void {
+    if (!silent) {
       this.loading.set(true);
       this.error.set(null);
+    }
     this.catalogRequestSubscription?.unsubscribe();
 
     this.catalogRequestSubscription = this.catalogService
       .withCustomLoading()
       .getCatalog()
       .subscribe({
-        next: (catalog) => this.catalog.set(catalog),
+        next: (catalog) => {
+          this.catalog.set(catalog);
+          this.error.set(null);
+        },
         error: () => {
+          if (!silent) {
             this.catalog.set([]);
-          this.loading.set(false);
             this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+          }
+          this.loading.set(false);
         },
         complete: () => this.loading.set(false),
       });

src/app/shared/components/cart-icon/cart-icon.component.html

@@ -1,7 +1,9 @@
 <button
   type="button"
   [disabled]="disabled()"
+  [class.cart-icon--disabled]="disabled()"
   [attr.aria-label]="ariaLabel()"
+  [attr.aria-disabled]="disabled()"
   class="cart-icon"
 >
   <div class="cart-icon__container">

src/app/shared/components/cart-icon/cart-icon.component.scss

@@ -14,7 +14,9 @@
   color: #666666;
   cursor: pointer;
   outline: none;
-  transition: color 0.15s ease-in-out, transform 0.1s ease-in-out;
+  transition:
+    color 0.15s ease-in-out,
+    transform 0.1s ease-in-out;
   border-radius: 4px;
 
   // Active state subtle scale down
@@ -29,10 +31,12 @@
   }
 
   // Disabled state
-  &:disabled {
+  &:disabled,
-    color: #A0A0A0;
+  &.cart-icon--disabled {
+    color: #b8b8b8;
     cursor: not-allowed;
     pointer-events: none;
+    opacity: 0.45;
   }
 }
 
@@ -59,6 +63,11 @@
   line-height: 1;
 }
 
+.cart-icon:disabled .cart-icon__glyph,
+.cart-icon--disabled .cart-icon__glyph {
+  color: #b8b8b8;
+}
+
 .cart-icon__badge {
   position: absolute;
   top: -8px;

src/app/shared/components/cart-icon/cart-icon.component.spec.ts

@@ -6,7 +6,7 @@ import { CartIconComponent } from './cart-icon.component';
 describe('CartIconComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [CartIconComponent]
+      imports: [CartIconComponent],
     }).compileComponents();
   });
 
@@ -20,7 +20,7 @@ describe('CartIconComponent', () => {
 
     return {
       fixture,
-      element: fixture.nativeElement as HTMLElement
+      element: fixture.nativeElement as HTMLElement,
     };
   }
 
@@ -47,9 +47,11 @@ describe('CartIconComponent', () => {
   });
 
   it('disables the button when disabled is true', () => {
-    const { element } = setup(undefined, true);
+    const { element } = setup(3, true);
     const button = element.querySelector('button');
     expect(button?.disabled).toBe(true);
+    expect(button?.classList).toContain('cart-icon--disabled');
+    expect(element.querySelector('[data-testid="cart-badge"]')).toBeNull();
   });
 
   it('enables the button when disabled is false', () => {

src/app/shared/components/cart-icon/cart-icon.component.ts

@@ -5,7 +5,7 @@ import { ChangeDetectionStrategy, Component, computed, input } from '@angular/co
   imports: [],
   templateUrl: './cart-icon.component.html',
   styleUrl: './cart-icon.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CartIconComponent {
   readonly quantity = input<number | null | undefined>(undefined);
@@ -13,6 +13,10 @@ export class CartIconComponent {
   readonly ariaLabel = input<string>('Carrito de compras');
 
   protected readonly hasQuantity = computed(() => {
+    if (this.disabled()) {
+      return false;
+    }
+
     const q = this.quantity();
     return q !== null && q !== undefined && q > 0;
   });

src/app/shared/components/cart/cart.component.html

@@ -6,15 +6,20 @@
     <h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2>
 
     <div class="d-flex align-items-center cart-header-actions">
-      @if (!readonly() && allowModify() && requireEditingMode() && items().length > 0) {
+      @if (
+        allowModify() &&
+        (!readonly() || showModifyWhenReadonly()) &&
+        (requireEditingMode() || modifyAsAction()) &&
+        items().length > 0
+      ) {
         <button
           class="btn btn-link p-0 border-0 cart-edit-btn"
           type="button"
-          [attr.aria-pressed]="editing()"
+          [attr.aria-pressed]="modifyAsAction() ? null : editing()"
           [disabled]="editingDisabled()"
           (click)="toggleEditing()"
         >
-          {{ editing() ? 'Listo' : 'Modificar' }}
+          {{ !modifyAsAction() && editing() ? 'Listo' : 'Modificar' }}
         </button>
       }
 

src/app/shared/components/cart/cart.component.spec.ts

@@ -367,6 +367,57 @@ describe('CartComponent', () => {
     expect(editingChange).toHaveBeenLastCalledWith(false);
   });
 
+  it('emits Modificar as an action without toggling to Listo', async () => {
+    await TestBed.configureTestingModule({
+      imports: [CartComponent],
+      providers: [
+        {
+          provide: CartService,
+          useValue: {
+            cart: signal(null).asReadonly(),
+            updateItemQuantity: vi.fn(),
+            removeItem: vi.fn(),
+          },
+        },
+        { provide: ModalService, useValue: {} },
+        {
+          provide: ToastService,
+          useValue: { success: vi.fn(), info: vi.fn(), danger: vi.fn() },
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(CartComponent);
+    fixture.componentRef.setInput('items', [
+      {
+        cartItemId: 10,
+        imageUrl: null,
+        product: 'Producto de prueba',
+        originalPrice: null,
+        discountedPrice: 1000,
+        discountPercentage: null,
+        attributes: [],
+        quantity: 1,
+      },
+    ]);
+    fixture.componentRef.setInput('readonly', true);
+    fixture.componentRef.setInput('showModifyWhenReadonly', true);
+    fixture.componentRef.setInput('modifyAsAction', true);
+    const modify = vi.fn();
+    fixture.componentInstance.modify.subscribe(modify);
+    fixture.detectChanges();
+
+    const modifyButton = fixture.debugElement.query(By.css('.cart-edit-btn'));
+    expect(modifyButton.nativeElement.textContent.trim()).toBe('Modificar');
+
+    modifyButton.nativeElement.click();
+    fixture.detectChanges();
+
+    expect(modify).toHaveBeenCalledOnce();
+    expect(modifyButton.nativeElement.textContent.trim()).toBe('Modificar');
+    expect(fixture.componentInstance.editing()).toBe(false);
+  });
+
   it('allows editing directly when the optional Modificar toggle is disabled', async () => {
     await TestBed.configureTestingModule({
       imports: [CartComponent],

src/app/shared/components/cart/cart.component.ts

@@ -55,19 +55,30 @@ export class CartComponent {
   readonly readonly = input<boolean>(false);
   readonly allowUpdateQuantity = input<boolean>(true);
   readonly allowModify = input<boolean>(true);
+  readonly showModifyWhenReadonly = input<boolean>(false);
+  readonly modifyAsAction = input<boolean>(false);
   readonly requireEditingMode = input<boolean>(false);
   readonly allowUpdateVariant = input<boolean>(true);
   readonly allowDelete = input<boolean>(true);
   readonly persistQuantityChanges = input<boolean>(true);
+  readonly persistVariantChanges = input<boolean>(true);
+  readonly persistDeleteChanges = input<boolean>(true);
   readonly editingDisabled = input<boolean>(false);
   readonly editing = model<boolean>(false);
 
   readonly closed = output<void>();
+  readonly modify = output<void>();
   readonly itemQuantityChange = output<{
     item: CartItemMock;
     index: number;
     quantity: number;
   }>();
+  readonly itemVariantChange = output<{
+    item: CartItemMock;
+    index: number;
+    variantId: number;
+  }>();
+  readonly itemRemove = output<{ item: CartItemMock; index: number }>();
 
   protected readonly quantityOverrides = signal<Record<number, number>>({});
   protected readonly variantOverrides = signal<Record<number, number>>({});
@@ -179,6 +190,12 @@ export class CartComponent {
 
     if (!item || !cartItemId || variantId === this.getItemVariant(item)) return;
 
+    this.itemVariantChange.emit({ item, index, variantId });
+
+    if (!this.persistVariantChanges()) {
+      return;
+    }
+
     this.variantOverrides.update((overrides) => ({ ...overrides, [cartItemId]: variantId }));
     this.cartService
       .updateItemVariant(cartItemId, this.getItemQuantity(item), variantId)
@@ -221,8 +238,15 @@ export class CartComponent {
       })
       .subscribe((confirmed) => {
         if (confirmed) {
+          const item = this.items()[index];
+          if (item) {
+            this.itemRemove.emit({ item, index });
+          }
+
+          if (this.persistDeleteChanges()) {
             this.removeItem(target.cartItemId);
           }
+        }
       });
   }
 
@@ -235,6 +259,11 @@ export class CartComponent {
       return;
     }
 
+    if (this.modifyAsAction()) {
+      this.modify.emit();
+      return;
+    }
+
     const editing = !this.editing();
     this.editing.set(editing);
   }

src/app/shared/components/product-column-with-image/product-column-with-image.component.html

@@ -31,9 +31,16 @@
   <div
     class="product-column-with-image__body p-3 d-flex flex-column align-items-center text-center flex-grow-1"
   >
-    <h3 class="product-column-with-image__title text-uppercase text-black mb-4">{{ title() }}</h3>
+    <h3 class="product-column-with-image__title text-uppercase text-black mb-4">
+      {{ title() }}
+      @if (unavailableMessage(); as message) {
+        <app-tooltip [message]="message" />
+      }
+    </h3>
 
-    <div class="product-column-with-image__prices d-flex align-items-center justify-content-center gap-2">
+    <div
+      class="product-column-with-image__prices d-flex align-items-center justify-content-center gap-2"
+    >
       <span class="product-column-with-image__price-discounted text-primary">
         {{ formattedDiscountedPrice() }}
       </span>
@@ -53,7 +60,12 @@
     </div>
 
     <div class="product-column-with-image__action mt-auto w-100">
-      <app-button variant="primary" class="w-100" (click)="buy.emit()">
+      <app-button
+        variant="primary"
+        class="w-100"
+        [disabled]="!!unavailableMessage()"
+        (click)="onBuy()"
+      >
         {{ buttonText() }}
       </app-button>
     </div>

src/app/shared/components/product-column-with-image/product-column-with-image.component.ts

@@ -2,10 +2,11 @@ import { NgOptimizedImage } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
 
 import { ButtonComponent } from '../button/button.component';
+import { TooltipComponent } from '../tooltip/tooltip.component';
 
 @Component({
   selector: 'app-product-column-with-image',
-  imports: [ButtonComponent, NgOptimizedImage],
+  imports: [ButtonComponent, NgOptimizedImage, TooltipComponent],
   templateUrl: './product-column-with-image.component.html',
   styleUrl: './product-column-with-image.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -18,9 +19,16 @@ export class ProductColumnWithImageComponent {
   readonly transferPrice = input<number | null>(null);
   readonly buttonText = input<string>('Comprar');
   readonly imagePriority = input<boolean>(false);
+  readonly unavailableMessage = input<string | null>(null);
 
   readonly buy = output<void>();
 
+  protected onBuy(): void {
+    if (this.unavailableMessage()) return;
+
+    this.buy.emit();
+  }
+
   readonly discountedPrice = computed(() => {
     const original = this.originalPrice();
     const discount = this.discount();

src/app/shared/components/product-list/product-list.component.html

@@ -12,7 +12,7 @@
           [title]="item.nombre"
           [description]="item.descripcion ?? ''"
           [price]="price(item)"
-          [maximumAddableQuantity]="item.maximum_addable_quantity ?? null"
+          [availability]="itemAvailability(item)"
           [variants]="item.variants ?? []"
           [saving]="savingProductIds().has(item.id)"
           (buy)="emitRowBuy(item, $event)"
@@ -24,7 +24,7 @@
           [title]="item.nombre"
           [description]="item.descripcion ?? ''"
           [price]="price(item)"
-          [maximumAddableQuantity]="item.maximum_addable_quantity ?? null"
+          [availability]="itemAvailability(item)"
           [variants]="item.variants ?? []"
           [saving]="savingProductIds().has(item.id)"
           (buy)="emitColumnBuy(item, $event)"
@@ -38,7 +38,8 @@
           [description]="item.descripcion ?? ''"
           [price]="price(item)"
           [imageUrl]="loadImages() ? (item.image ?? null) : null"
-          [disabled]="loading()"
+          [unavailableMessage]="availabilityMessage(item)"
+          [disabled]="loading() || !allows(itemAvailability(item), 'buy_now')"
           (buy)="emitTicketBuy(item, $event)"
         />
       }
@@ -47,6 +48,7 @@
           [imageUrl]="loadImages() ? (item.image ?? null) : null"
           [title]="item.nombre"
           [originalPrice]="price(item)"
+          [unavailableMessage]="availabilityMessage(item)"
           [imagePriority]="loadImages() && index < 4"
           (buy)="emitProductDetailBuy(item)"
         />

src/app/shared/components/product-list/product-list.component.spec.ts

@@ -6,6 +6,7 @@ import { of } from 'rxjs';
 import { ApiPaginatedResponse } from '../../../core/services/api-paginated-response.interface';
 import { CartService } from '../../../core/services/cart/cart.service';
 import { CatalogService } from '../../../core/services/catalog/catalog.service';
+import { createCatalogAvailability } from '../../../core/services/catalog/catalog-availability';
 import {
   CatalogFeaturedItems,
   CatalogGroupLayout,
@@ -23,6 +24,7 @@ describe('ProductListComponent', () => {
       descripcion: 'Primera descripcion',
       precio: '100.00',
       image: '/images/one.png',
+      availability: createCatalogAvailability(null),
       variants: [],
     },
     {
@@ -32,6 +34,7 @@ describe('ProductListComponent', () => {
       descripcion: 'Segunda descripcion',
       precio: 200,
       image: null,
+      availability: createCatalogAvailability(null),
       variants: [],
     },
   ];
@@ -56,6 +59,20 @@ describe('ProductListComponent', () => {
   ) {
     const getVariantOptions = vi.fn().mockReturnValue(
       of({
+        variants: [
+          {
+            id: 401,
+            precio: '10000.00',
+            availability: createCatalogAvailability(1),
+            values: { tipo: '1', sector: '2', fila: '3', asiento: '4' },
+          },
+          {
+            id: 402,
+            precio: '12000.00',
+            availability: createCatalogAvailability(1),
+            values: { tipo: '1', sector: '2', fila: '3', asiento: '5' },
+          },
+        ],
         selectors: ['tipo', 'sector', 'fila', 'asiento'].map((key, index) => ({
           key,
           label: key,
@@ -73,7 +90,12 @@ describe('ProductListComponent', () => {
     await TestBed.configureTestingModule({
       imports: [ProductListComponent],
       providers: [
-        { provide: CatalogService, useValue: { getVariantOptions } },
+        {
+          provide: CatalogService,
+          useValue: {
+            withoutLoading: () => ({ getVariantOptions }),
+          },
+        },
         { provide: CartService, useValue: {} },
       ],
     }).compileComponents();
@@ -193,8 +215,8 @@ describe('ProductListComponent', () => {
     const itemWithVariants: ProductListItem = {
       ...items[0],
       variants: [
-        { id: 91, maximum_addable_quantity: 3, values: { fecha: '10 de octubre' } },
+        { id: 91, availability: createCatalogAvailability(3), values: { fecha: '10 de octubre' } },
-        { id: 92, maximum_addable_quantity: 4, values: { fecha: '11 de octubre' } },
+        { id: 92, availability: createCatalogAvailability(4), values: { fecha: '11 de octubre' } },
       ],
     };
     const fixture = await render('column_with_cart', [itemWithVariants]);
@@ -220,7 +242,7 @@ describe('ProductListComponent', () => {
       variants: [
         {
           id: 91,
-          maximum_addable_quantity: 2,
+          availability: createCatalogAvailability(2),
           values: { fecha: '10 de octubre' },
         },
       ],
@@ -248,7 +270,7 @@ describe('ProductListComponent', () => {
       variants: [
         {
           id: 91,
-          maximum_addable_quantity: 0,
+          availability: createCatalogAvailability(0),
           values: { fecha: '10 de octubre' },
         },
       ],
@@ -304,7 +326,7 @@ describe('ProductListComponent', () => {
         {
           id: 401,
           precio: '10000.00',
-          maximum_addable_quantity: 1,
+          availability: createCatalogAvailability(1),
           values: {
             tipo: { value: 'vip', label: 'VIP' },
             sector: { value: 'a', label: 'Sector A' },
@@ -315,7 +337,7 @@ describe('ProductListComponent', () => {
         {
           id: 402,
           precio: '12000.00',
-          maximum_addable_quantity: 1,
+          availability: createCatalogAvailability(1),
           values: {
             tipo: { value: 'vip', label: 'VIP' },
             sector: { value: 'a', label: 'Sector A' },

src/app/shared/components/product-list/product-list.component.ts

@@ -18,6 +18,11 @@ import {
   CatalogGroupLayout,
   CatalogProductLayout,
 } from '../../../core/services/catalog/catalog.interface';
+import {
+  AVAILABLE_CATALOG_AVAILABILITY,
+  allowsCatalogAction,
+  primaryAvailabilityMessage,
+} from '../../../core/services/catalog/catalog-availability';
 import { CarouselComponent } from '../carousel/carousel.component';
 import { PaginatorComponent } from '../paginator/paginator.component';
 import { ProductColumnWithImageComponent } from '../product-column-with-image/product-column-with-image.component';
@@ -74,6 +79,7 @@ export class ProductListComponent {
   readonly buy = output<ProductListBuyEvent>();
   readonly addToCart = output<ProductListCartEvent>();
   readonly pageChange = output<number>();
+  protected readonly allows = allowsCatalogAction;
 
   protected readonly effectiveLayout = computed<ProductListLayout>(() =>
     this.mobile() && this.layout() === 'row' ? 'column_with_cart' : this.layout(),
@@ -108,6 +114,14 @@ export class ProductListComponent {
     return Number.isFinite(price) ? price : 0;
   }
 
+  protected availabilityMessage(item: ProductListItem): string | null {
+    return primaryAvailabilityMessage(this.itemAvailability(item));
+  }
+
+  protected itemAvailability(item: ProductListItem) {
+    return item.availability ?? AVAILABLE_CATALOG_AVAILABILITY;
+  }
+
   protected emitRowCart(
     product: ProductListItem,
     event: { quantity: number; variant: unknown },

src/app/shared/components/product-row-card/product-row-card.component.html

@@ -3,6 +3,9 @@
   <div class="product-row-card__info d-flex flex-column justify-content-center flex-grow-1">
     <h3 class="product-row-card__title text-uppercase mb-1 m-0">
       {{ title() }}
+      @if (effectiveUnavailableMessage(); as message) {
+        <app-tooltip [message]="message" />
+      }
     </h3>
     @if (effectiveDescription()) {
       <p class="product-row-card__description m-0 mt-1">
@@ -18,13 +21,14 @@
         <app-variant-selector
           class="product-row-card__selectors"
           [variants]="variants()"
+          [disabled]="!allows(availability(), 'select_variant')"
           [(selectedVariant)]="selectedVariant"
         />
 
         <app-quantity-selector
           [(quantity)]="quantity"
           [max]="effectiveMaximum()"
-          [disabled]="unavailable()"
+          [disabled]="!allows(effectiveAvailability(), 'change_quantity')"
         />
       </div>
 
@@ -35,14 +39,22 @@
 
     <div class="product-row-card__buttons">
       <div class="product-row-card__btn-wrapper">
-        <app-button variant="primary" [disabled]="unavailable()" (click)="onBuy()">
+        <app-button
+          variant="primary"
+          [disabled]="!hasPurchasableSelection() || !allows(effectiveAvailability(), 'buy_now')"
+          (click)="onBuy()"
+        >
           Comprar
         </app-button>
       </div>
       <div class="product-row-card__btn-wrapper">
         <app-button
           variant="secondary"
-          [disabled]="saving() || unavailable()"
+          [disabled]="
+            saving() ||
+            !hasPurchasableSelection() ||
+            !allows(effectiveAvailability(), 'add_to_cart')
+          "
           (click)="onAddToCart()"
         >
           {{ saving() ? 'Guardando' : 'Agregar al carrito' }}

src/app/shared/components/product-row-card/product-row-card.component.ts

@@ -9,22 +9,31 @@ import {
 } from '@angular/core';
 import { ButtonComponent } from '../button/button.component';
 import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
+import { TooltipComponent } from '../tooltip/tooltip.component';
 import {
   VariantSelectorComponent,
   VariantSelectorVariant,
 } from '../variant-selector/variant-selector.component';
+import { CatalogAvailability } from '../../../core/services/catalog/catalog.interface';
+import {
+  AVAILABLE_CATALOG_AVAILABILITY,
+  allowsCatalogAction,
+  combineCatalogAvailability,
+  maximumCatalogQuantity,
+  primaryAvailabilityMessage,
+} from '../../../core/services/catalog/catalog-availability';
 
 export interface Variant extends VariantSelectorVariant {
   label?: string;
   descripcion?: string | null;
   precio?: string | number;
-  maximum_addable_quantity?: number | null;
+  availability?: CatalogAvailability;
 }
 
 @Component({
   selector: 'app-product-row-card',
   standalone: true,
-  imports: [ButtonComponent, QuantitySelectorComponent, VariantSelectorComponent],
+  imports: [ButtonComponent, QuantitySelectorComponent, TooltipComponent, VariantSelectorComponent],
   templateUrl: './product-row-card.component.html',
   styleUrl: './product-row-card.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -34,7 +43,7 @@ export class ProductRowCardComponent {
   readonly title = input<string>('');
   readonly description = input<string>('');
   readonly price = input<number>(0);
-  readonly maximumAddableQuantity = input<number | null>(null);
+  readonly availability = input<CatalogAvailability>(AVAILABLE_CATALOG_AVAILABILITY);
   readonly variants = input<Variant[]>([]);
   readonly saving = input(false);
 
@@ -57,12 +66,22 @@ export class ProductRowCardComponent {
 
     return Number.isFinite(variantPrice) ? variantPrice : this.price();
   });
-  protected readonly effectiveMaximum = computed(
+  protected readonly effectiveAvailability = computed(() =>
-    () => this.selectedVariantData()?.maximum_addable_quantity ?? this.maximumAddableQuantity(),
+    combineCatalogAvailability(this.availability(), this.selectedVariantData()?.availability),
+  );
+  protected readonly hasVariants = computed(() => this.variants().length > 0);
+  protected readonly hasPurchasableSelection = computed(
+    () => !this.hasVariants() || this.selectedVariantData() !== undefined,
+  );
+  protected readonly effectiveMaximum = computed(() =>
+    maximumCatalogQuantity(this.effectiveAvailability()),
+  );
+  protected readonly effectiveUnavailableMessage = computed(() =>
+    primaryAvailabilityMessage(this.effectiveAvailability()),
   );
-  protected readonly unavailable = computed(() => this.effectiveMaximum() === 0);
 
   readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice()));
+  protected readonly allows = allowsCatalogAction;
 
   constructor() {
     effect(() => {
@@ -75,7 +94,11 @@ export class ProductRowCardComponent {
   }
 
   protected onAddToCart(): void {
-    if (this.saving() || this.unavailable()) {
+    if (
+      this.saving() ||
+      !this.hasPurchasableSelection() ||
+      !this.allows(this.effectiveAvailability(), 'add_to_cart')
+    ) {
       return;
     }
 
@@ -86,7 +109,8 @@ export class ProductRowCardComponent {
   }
 
   protected onBuy(): void {
-    if (this.unavailable()) return;
+    if (!this.hasPurchasableSelection() || !this.allows(this.effectiveAvailability(), 'buy_now'))
+      return;
 
     this.buy.emit({
       quantity: this.quantity(),

src/app/shared/components/product-ticket-selector/product-ticket-selector.component.html

@@ -1,7 +1,12 @@
 <article class="ticket-selector">
   <header class="ticket-selector__header">
     <div>
-      <h3 class="ticket-selector__title">{{ title() }}</h3>
+      <h3 class="ticket-selector__title">
+        {{ title() }}
+        @if (unavailableMessage(); as message) {
+          <app-tooltip [message]="message" />
+        }
+      </h3>
       @if (description()) {
         <p class="ticket-selector__description">{{ description() }}</p>
       }

src/app/shared/components/product-ticket-selector/product-ticket-selector.component.ts

@@ -23,11 +23,16 @@ import {
   CatalogVariantSelector,
   CatalogVariantValue,
 } from '../../../core/services/catalog/catalog.interface';
+import {
+  allowsCatalogAction,
+  createCatalogAvailability,
+} from '../../../core/services/catalog/catalog-availability';
 import { CatalogService } from '../../../core/services/catalog/catalog.service';
 import { ModalService } from '../../../core/services/modal.service';
 import { ToastService } from '../../../core/services/toast.service';
 import { ButtonComponent } from '../button/button.component';
 import { IconButtonComponent } from '../icon-button/icon-button.component';
+import { TooltipComponent } from '../tooltip/tooltip.component';
 
 type TicketSelectionStatus =
   | 'selecting'
@@ -56,7 +61,7 @@ interface TicketSelectionRow {
 
 @Component({
   selector: 'app-product-ticket-selector',
-  imports: [ButtonComponent, IconButtonComponent],
+  imports: [ButtonComponent, IconButtonComponent, TooltipComponent],
   templateUrl: './product-ticket-selector.component.html',
   styleUrl: './product-ticket-selector.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -80,6 +85,7 @@ export class ProductTicketSelectorComponent {
   readonly price = input<number>(0);
   readonly imageUrl = input<string | null>(null);
   readonly disabled = input(false);
+  readonly unavailableMessage = input<string | null>(null);
 
   readonly buy = output<number[]>();
 
@@ -351,7 +357,11 @@ export class ProductTicketSelectorComponent {
     if (reservedVariant !== null && !variants.some(({ id }) => id === reservedVariant.id)) {
       variants.push(reservedVariant);
     }
-    return variants.filter(({ id }) => !reservedByOtherRows.has(id));
+    return variants.filter(
+      ({ id, availability }) =>
+        (availability === undefined || allowsCatalogAction(availability, 'select_variant')) &&
+        !reservedByOtherRows.has(id),
+    );
   }
 
   private reservedVariantData(row: TicketSelectionRow): CatalogFeaturedItemVariant | null {
@@ -361,7 +371,9 @@ export class ProductTicketSelectorComponent {
     return {
       id: item.variant.id,
       precio: item.variant.precio,
-      maximum_addable_quantity: item.variant.stock_tecnico,
+      availability: createCatalogAvailability(
+        item.variant.stock_tecnico === null ? null : item.variant.stock_tecnico + item.cantidad,
+      ),
       values: item.variant.values,
     };
   }

src/app/shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component.html

@@ -1,6 +1,11 @@
 <article class="product-vertical-with-cart-card">
   <div class="product-vertical-with-cart-card__content">
-    <h3 class="product-vertical-with-cart-card__title">{{ title() }}</h3>
+    <h3 class="product-vertical-with-cart-card__title">
+      {{ title() }}
+      @if (effectiveUnavailableMessage(); as message) {
+        <app-tooltip [message]="message" />
+      }
+    </h3>
 
     @if (effectiveDescription()) {
       <p class="product-vertical-with-cart-card__description">{{ effectiveDescription() }}</p>
@@ -14,7 +19,7 @@
         <app-quantity-selector
           [(quantity)]="quantity"
           [max]="effectiveMaximum()"
-          [disabled]="unavailable()"
+          [disabled]="!allows(effectiveAvailability(), 'change_quantity')"
         />
       </div>
     } @else {
@@ -24,12 +29,16 @@
           <app-quantity-selector
             [(quantity)]="quantity"
             [max]="effectiveMaximum()"
-            [disabled]="unavailable()"
+            [disabled]="!allows(effectiveAvailability(), 'change_quantity')"
           />
         </div>
 
         <div class="product-vertical-with-cart-card__variant-selectors">
-          <app-variant-selector [variants]="variants()" [(selectedVariant)]="selectedVariant" />
+          <app-variant-selector
+            [variants]="variants()"
+            [disabled]="!allows(availability(), 'select_variant')"
+            [(selectedVariant)]="selectedVariant"
+          />
         </div>
       </div>
     }
@@ -37,14 +46,21 @@
     <div class="product-vertical-with-cart-card__actions">
       <app-button
         variant="primary"
-        [disabled]="unavailable() || (hasVariants() && selectedVariant() === null)"
+        [disabled]="
+          !allows(effectiveAvailability(), 'buy_now') ||
+          (hasVariants() && selectedVariant() === null)
+        "
         (click)="onBuy()"
       >
         Comprar
       </app-button>
       <app-button
         variant="secondary"
-        [disabled]="saving() || unavailable() || (hasVariants() && selectedVariant() === null)"
+        [disabled]="
+          saving() ||
+          !allows(effectiveAvailability(), 'add_to_cart') ||
+          (hasVariants() && selectedVariant() === null)
+        "
         (click)="onAddToCart()"
       >
         {{ saving() ? 'Guardando' : 'Agregar al carrito' }}

src/app/shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component.spec.ts

@@ -56,6 +56,29 @@ describe('ProductVerticalWithCartCardComponent', () => {
     ).toBeNull();
   });
 
+  it('shows the backend availability message with the reusable tooltip', async () => {
+    const fixture = await createComponent();
+    fixture.componentRef.setInput('availability', {
+      state: 'visible',
+      maximum_quantity: 0,
+      reasons: [
+        {
+          code: 'user_quota_reached',
+          message: 'Alcanzaste el cupo máximo permitido para este producto.',
+        },
+      ],
+      allowed_actions: [],
+    });
+    fixture.detectChanges();
+
+    const tooltip = (fixture.nativeElement as HTMLElement).querySelector('app-tooltip');
+
+    expect(tooltip?.querySelector('i.fa-solid.fa-circle-info')).not.toBeNull();
+    expect(tooltip?.textContent).toContain(
+      'Alcanzaste el cupo máximo permitido para este producto.',
+    );
+  });
+
   it('updates the quantity with the reusable quantity selector', async () => {
     const fixture = await createComponent();
     const buttons = fixture.nativeElement.querySelectorAll(

src/app/shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component.ts

@@ -10,20 +10,29 @@ import {
 
 import { ButtonComponent } from '../button/button.component';
 import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
+import { TooltipComponent } from '../tooltip/tooltip.component';
 import {
   VariantSelectorComponent,
   VariantSelectorVariant,
 } from '../variant-selector/variant-selector.component';
+import { CatalogAvailability } from '../../../core/services/catalog/catalog.interface';
+import {
+  AVAILABLE_CATALOG_AVAILABILITY,
+  allowsCatalogAction,
+  combineCatalogAvailability,
+  maximumCatalogQuantity,
+  primaryAvailabilityMessage,
+} from '../../../core/services/catalog/catalog-availability';
 
 export interface VerticalCartVariant extends VariantSelectorVariant {
   descripcion?: string | null;
   precio?: string | number;
-  maximum_addable_quantity?: number | null;
+  availability?: CatalogAvailability;
 }
 
 @Component({
   selector: 'app-product-vertical-with-cart-card',
-  imports: [ButtonComponent, QuantitySelectorComponent, VariantSelectorComponent],
+  imports: [ButtonComponent, QuantitySelectorComponent, TooltipComponent, VariantSelectorComponent],
   templateUrl: './product-vertical-with-cart-card.component.html',
   styleUrl: './product-vertical-with-cart-card.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -32,7 +41,7 @@ export class ProductVerticalWithCartCardComponent {
   readonly title = input<string>('');
   readonly description = input<string>('');
   readonly price = input<number>(0);
-  readonly maximumAddableQuantity = input<number | null>(null);
+  readonly availability = input<CatalogAvailability>(AVAILABLE_CATALOG_AVAILABILITY);
   readonly variants = input<VerticalCartVariant[]>([]);
   readonly saving = input(false);
 
@@ -55,10 +64,16 @@ export class ProductVerticalWithCartCardComponent {
   });
   protected readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice()));
   protected readonly hasVariants = computed(() => this.variants().length > 0);
-  protected readonly effectiveMaximum = computed(
+  protected readonly effectiveAvailability = computed(() =>
-    () => this.selectedVariantData()?.maximum_addable_quantity ?? this.maximumAddableQuantity(),
+    combineCatalogAvailability(this.availability(), this.selectedVariantData()?.availability),
   );
-  protected readonly unavailable = computed(() => this.effectiveMaximum() === 0);
+  protected readonly effectiveMaximum = computed(() =>
+    maximumCatalogQuantity(this.effectiveAvailability()),
+  );
+  protected readonly effectiveUnavailableMessage = computed(() =>
+    primaryAvailabilityMessage(this.effectiveAvailability()),
+  );
+  protected readonly allows = allowsCatalogAction;
 
   constructor() {
     effect(() => {
@@ -71,7 +86,7 @@ export class ProductVerticalWithCartCardComponent {
   }
 
   protected onAddToCart(): void {
-    if (this.saving() || this.unavailable()) {
+    if (this.saving() || !this.allows(this.effectiveAvailability(), 'add_to_cart')) {
       return;
     }
 
@@ -79,7 +94,7 @@ export class ProductVerticalWithCartCardComponent {
   }
 
   protected onBuy(): void {
-    if (this.unavailable()) return;
+    if (!this.allows(this.effectiveAvailability(), 'buy_now')) return;
 
     this.buy.emit({ quantity: this.quantity(), variant: this.selectedVariant() });
   }

src/app/shared/components/stepper/stepper.component.html

@@ -1,25 +1,27 @@
 <div class="stepper-container">
-
   <!-- Horizontal indicator bar -->
-  <div class="stepper-header">
+  <div class="stepper-header" [class.is-disabled]="disabled()" [attr.aria-disabled]="disabled()">
     @for (step of steps(); track step; let i = $index; let last = $last) {
       <div
         class="stepper-header__item"
         [ngClass]="{
           'is-active': currentStepIndex() === i,
-          'is-completed': currentStepIndex() > i
+          'is-completed': currentStepIndex() > i,
         }"
       >
         <!-- Connecting line before (except first) -->
         @if (i > 0) {
-          <div class="stepper-header__line" [ngClass]="{ 'is-completed': currentStepIndex() > i - 1 }"></div>
+          <div
+            class="stepper-header__line"
+            [ngClass]="{ 'is-completed': currentStepIndex() > i - 1 }"
+          ></div>
         }
 
         <!-- Circle indicator -->
         <div
           class="stepper-header__circle"
           [attr.aria-label]="step.label()"
-          [class.is-clickable]="currentStepIndex() > i"
+          [class.is-clickable]="!disabled() && currentStepIndex() > i"
           (click)="goToStep(i)"
         ></div>
 
@@ -33,5 +35,4 @@
   <div class="stepper-body">
     <ng-content></ng-content>
   </div>
-
 </div>

src/app/shared/components/stepper/stepper.component.scss

@@ -13,6 +13,14 @@
   margin-bottom: 2rem;
   position: relative;
 
+  &.is-disabled {
+    opacity: 0.5;
+
+    .stepper-header__circle {
+      cursor: not-allowed;
+    }
+  }
+
   &__item {
     display: flex;
     flex-direction: column;

src/app/shared/components/stepper/stepper.component.spec.ts

@@ -6,7 +6,7 @@ import { StepComponent } from './step.component';
 @Component({
   imports: [StepperComponent, StepComponent],
   template: `
-    <app-stepper #stepper>
+    <app-stepper #stepper [disabled]="stepperDisabled()">
       <app-step label="Step 1" [isValid]="step1Valid()">
         <div id="content-1">Content 1</div>
       </app-step>
@@ -20,6 +20,7 @@ class TestHostComponent {
   @ViewChild('stepper') stepper!: StepperComponent;
   step1Valid = signal(true);
   step2Valid = signal(true);
+  stepperDisabled = signal(false);
 }
 
 describe('StepperComponent & StepComponent', () => {
@@ -137,4 +138,28 @@ describe('StepperComponent & StepComponent', () => {
     expect(component.stepper.currentStepIndex()).toBe(0);
     expect(fixture.nativeElement.querySelector('#content-1')).not.toBeNull();
   });
+
+  it('blocks all navigation and shows visual feedback while disabled', async () => {
+    const { fixture, component } = await setup();
+    component.stepperDisabled.set(true);
+    fixture.detectChanges();
+
+    component.stepper.next();
+    expect(component.stepper.currentStepIndex()).toBe(0);
+
+    component.stepperDisabled.set(false);
+    fixture.detectChanges();
+    component.stepper.next();
+    expect(component.stepper.currentStepIndex()).toBe(1);
+
+    component.stepperDisabled.set(true);
+    fixture.detectChanges();
+    component.stepper.previous();
+    component.stepper.goToStep(0);
+
+    expect(component.stepper.currentStepIndex()).toBe(1);
+    const header = fixture.nativeElement.querySelector('.stepper-header');
+    expect(header.classList.contains('is-disabled')).toBe(true);
+    expect(header.getAttribute('aria-disabled')).toBe('true');
+  });
 });

src/app/shared/components/stepper/stepper.component.ts

@@ -18,9 +18,12 @@ import { NgClass } from '@angular/common';
 export class StepperComponent {
   readonly steps = contentChildren(StepComponent);
   readonly initialStepIndex = input(0);
+  readonly disabled = input(false);
   readonly currentStepIndex = linkedSignal(() => this.initialStepIndex());
 
   next() {
+    if (this.disabled()) return;
+
     const currentSteps = this.steps();
     const currentIndex = this.currentStepIndex();
     if (currentIndex < currentSteps.length - 1) {
@@ -32,6 +35,8 @@ export class StepperComponent {
   }
 
   previous() {
+    if (this.disabled()) return;
+
     const currentIndex = this.currentStepIndex();
     if (currentIndex > 0) {
       this.currentStepIndex.set(currentIndex - 1);
@@ -39,6 +44,8 @@ export class StepperComponent {
   }
 
   goToStep(index: number) {
+    if (this.disabled()) return;
+
     const targetIndex = index;
     // Only allow navigating to completed steps or the current one
     if (targetIndex < this.currentStepIndex()) {

src/app/shared/components/tooltip/tooltip.component.html

@@ -0,0 +1,11 @@
+<button
+  type="button"
+  class="tooltip-trigger"
+  [attr.aria-describedby]="tooltipId"
+  [attr.aria-label]="message()"
+>
+  <i class="fa-solid fa-circle-info" aria-hidden="true"></i>
+  <span class="tooltip-message" [id]="tooltipId" role="tooltip">
+    {{ message() }}
+  </span>
+</button>

src/app/shared/components/tooltip/tooltip.component.scss

@@ -0,0 +1,62 @@
+:host {
+  display: inline-flex;
+  align-items: center;
+  margin-left: 0.25rem;
+  vertical-align: middle;
+}
+
+.tooltip-trigger {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: var(--tenant-primary, var(--color-primary, #0d6efd));
+  font-size: 1em;
+  line-height: inherit;
+
+  &:focus-visible {
+    border-radius: 50%;
+    outline: 2px solid currentColor;
+    outline-offset: 2px;
+  }
+
+  &:hover .tooltip-message,
+  &:focus-visible .tooltip-message {
+    visibility: visible;
+    opacity: 1;
+    transform: translate(-50%, -0.25rem);
+  }
+}
+
+.tooltip-message {
+  position: absolute;
+  z-index: 1100;
+  bottom: calc(100% + 0.625rem);
+  left: 50%;
+  width: max-content;
+  max-width: min(16rem, 75vw);
+  padding: 0.5rem 0.75rem;
+  border-radius: 0.375rem;
+  border: 1px solid var(--tenant-primary, var(--color-primary, #0d6efd));
+  background: #fff;
+  color: #212529;
+  font-family: inherit;
+  font-size: 0.75rem;
+  font-weight: 400;
+  line-height: 1.35;
+  text-align: center;
+  text-transform: none;
+  letter-spacing: normal;
+  white-space: normal;
+  visibility: hidden;
+  opacity: 0;
+  pointer-events: none;
+  transform: translate(-50%, 0);
+  transition:
+    opacity 0.15s ease,
+    transform 0.15s ease,
+    visibility 0.15s ease;
+}

src/app/shared/components/tooltip/tooltip.component.spec.ts

@@ -0,0 +1,32 @@
+import { TestBed, getTestBed } from '@angular/core/testing';
+import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
+import { afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+import { TooltipComponent } from './tooltip.component';
+
+describe('TooltipComponent', () => {
+  beforeAll(() => {
+    try {
+      getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
+    } catch {
+      // Test environment may already be initialized by another setup entrypoint.
+    }
+  });
+
+  afterEach(() => TestBed.resetTestingModule());
+
+  it('renders the reusable danger information tooltip', async () => {
+    await TestBed.configureTestingModule({ imports: [TooltipComponent] }).compileComponents();
+    const fixture = TestBed.createComponent(TooltipComponent);
+    fixture.componentRef.setInput('message', 'Este producto no tiene stock disponible.');
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const trigger = element.querySelector('.tooltip-trigger');
+    const message = element.querySelector('.tooltip-message');
+
+    expect(trigger?.querySelector('i.fa-solid.fa-circle-info')).not.toBeNull();
+    expect(message?.textContent?.trim()).toBe('Este producto no tiene stock disponible.');
+    expect(trigger?.getAttribute('aria-describedby')).toBe(message?.id);
+  });
+});

src/app/shared/components/tooltip/tooltip.component.ts

@@ -0,0 +1,14 @@
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
+
+let nextTooltipId = 0;
+
+@Component({
+  selector: 'app-tooltip',
+  templateUrl: './tooltip.component.html',
+  styleUrl: './tooltip.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class TooltipComponent {
+  readonly message = input.required<string>();
+  protected readonly tooltipId = `app-tooltip-${nextTooltipId++}`;
+}

src/app/shared/components/variant-selector/variant-selector.component.spec.ts

@@ -62,6 +62,8 @@ describe('VariantSelectorComponent', () => {
     ]);
     fixture.componentRef.setInput('selectedVariant', 2);
     fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
 
     const selects = Array.from(
       fixture.nativeElement.querySelectorAll('select'),
@@ -80,6 +82,28 @@ describe('VariantSelectorComponent', () => {
     expect(fixture.componentInstance.selectedVariant()).toBe(1);
   });
 
+  it('does not offer variants whose availability forbids selection', async () => {
+    await TestBed.configureTestingModule({
+      imports: [VariantSelectorComponent],
+    }).compileComponents();
+    const fixture = TestBed.createComponent(VariantSelectorComponent);
+    fixture.componentRef.setInput('variants', [
+      { id: 1, values: { talle: 'S' } },
+      {
+        id: 2,
+        values: { talle: 'M' },
+        availability: { state: 'visible', maximum_quantity: 0, allowed_actions: [], reasons: [] },
+      },
+    ]);
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    expect(fixture.nativeElement.textContent).toContain('S');
+    expect(fixture.nativeElement.textContent).not.toContain('M');
+    expect(fixture.componentInstance.selectedVariant()).toBe(1);
+  });
+
   it('requires manual selections when autoSelectFirst is disabled', async () => {
     await TestBed.configureTestingModule({
       imports: [VariantSelectorComponent],

src/app/shared/components/variant-selector/variant-selector.component.ts

@@ -10,6 +10,8 @@ import {
   untracked,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
+import { CatalogAvailability } from '../../../core/services/catalog/catalog.interface';
+import { allowsCatalogAction } from '../../../core/services/catalog/catalog-availability';
 
 export interface VariantAttributeOption {
   value: string;
@@ -22,6 +24,7 @@ export type VariantAttributeValue = VariantAttributeScalar | VariantAttributeSca
 export interface VariantSelectorVariant {
   id: unknown;
   values: Record<string, VariantAttributeValue>;
+  availability?: CatalogAvailability;
 }
 
 export interface VariantSelectorSelectionChange {
@@ -64,10 +67,12 @@ export class VariantSelectorComponent {
     right: VariantAttributeValue | null,
   ): boolean => left !== null && right !== null && this.sameValue(left, right);
   protected readonly attributeKeys = computed(() =>
-    Array.from(new Set(this.variants().flatMap((variant) => Object.keys(variant.values)))),
+    Array.from(
+      new Set(this.getSelectableVariants().flatMap((variant) => Object.keys(variant.values))),
+    ),
   );
   protected readonly selectors = computed<VariantSelectorGroup[]>(() => {
-    const variants = this.variants();
+    const variants = this.getSelectableVariants();
     const keys = this.attributeKeys();
     const selectedValues = this.selectedValues();
 
@@ -110,7 +115,7 @@ export class VariantSelectorComponent {
     });
 
     effect(() => {
-      const variants = this.variants();
+      const variants = this.getSelectableVariants();
       const selectedVariant = this.selectedVariant();
       const autoSelectFirst = this.autoSelectFirst();
 
@@ -139,7 +144,7 @@ export class VariantSelectorComponent {
   }
 
   protected onValueChange(key: string, value: VariantAttributeValue | null): void {
-    const variants = this.variants();
+    const variants = this.getSelectableVariants();
     const keys = this.attributeKeys();
     const changedIndex = keys.indexOf(key);
     const values = { ...this.selectedValues() };
@@ -198,6 +203,14 @@ export class VariantSelectorComponent {
     return Array.from(options.values());
   }
 
+  private getSelectableVariants(): VariantSelectorVariant[] {
+    return this.variants().filter(
+      (variant) =>
+        variant.availability === undefined ||
+        allowsCatalogAction(variant.availability, 'select_variant'),
+    );
+  }
+
   private reconcileManualSelection(
     selectedValues: Record<string, VariantAttributeValue>,
     variants: VariantSelectorVariant[],