test(catalog): cover global availability behavior

feat(cart): enhance editing logic and add tests for editable state
feat(tenant): modify HeroConfig to include responsive image type

.vscode/launch.json

@@ -7,7 +7,7 @@
       "type": "chrome",
       "request": "launch",
       "preLaunchTask": "npm: start",
-      "url": "http://localhost:4200/"
+      "url": "http://localhost:4300/"
     },
     {
       "name": "ng test",

angular.json

@@ -34,7 +34,12 @@
             "server": "src/main.server.ts",
             "outputMode": "server",
             "security": {
-              "allowedHosts": ["localhost", "127.0.0.1"]
+              "allowedHosts": [
+                "localhost",
+                "localhost:4300",
+                "127.0.0.1",
+                "127.0.0.1:4300"
+              ]
             },
             "ssr": {
               "entry": "src/server.ts"
@@ -42,6 +47,9 @@
           },
           "configurations": {
             "production": {
+              "optimization": true,
+              "extractLicenses": true,
+              "sourceMap": false,
               "budgets": [
                 {
                   "type": "initial",
@@ -54,7 +62,13 @@
                   "maximumError": "8kB"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.production.ts"
+                }
+              ]
             },
             "development": {
               "optimization": true,
@@ -64,9 +78,18 @@
             "local": {
               "optimization": false,
               "extractLicenses": false,
-              "sourceMap": true
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.local.ts"
+                }
+              ]
             },
             "homo": {
+              "optimization": true,
+              "extractLicenses": true,
+              "sourceMap": false,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -79,6 +102,9 @@
         },
         "serve": {
           "builder": "@angular/build:dev-server",
+          "options": {
+            "port": 4300
+          },
           "configurations": {
             "production": {
               "buildTarget": "shopit-front:build:production"
@@ -93,7 +119,7 @@
               "buildTarget": "shopit-front:build:homo"
             }
           },
-          "defaultConfiguration": "development"
+          "defaultConfiguration": "local"
         },
         "test": {
           "builder": "@angular/build:unit-test"

src/app/app.config.spec.ts

@@ -0,0 +1,28 @@
+import { HttpRequest } from '@angular/common/http';
+
+import { isStoreCatalogRequest } from './app.config';
+
+describe('isStoreCatalogRequest', () => {
+  it.each([
+    'http://localhost:8000/api/tenants/demo/catalog',
+    'http://localhost:8000/api/tenants/demo/catalog?currency=ARS',
+    'http://localhost:8000/api/tenants/demo/catalog/featured-groups/7/items?page=2',
+    'http://localhost:8000/api/tenants/demo/catalog-items?q=remera&page=1',
+    'http://localhost:8000/api/tenants/demo/catalog-items/42?variant_id=3',
+  ])('includes GET %s in the hydration transfer cache', (url) => {
+    expect(isStoreCatalogRequest(new HttpRequest('GET', url))).toBe(true);
+  });
+
+  it.each([
+    ['POST', 'http://localhost:8000/api/tenants/demo/catalog-items'],
+    ['GET', 'http://localhost:8000/api/tenants/demo/productos'],
+    ['GET', 'http://localhost:8000/api/tenants/demo/categories/7'],
+    ['GET', 'http://localhost:8000/api/tenants/demo/catalog-items/42/variant-options'],
+    ['GET', 'http://localhost:8000/api/tenants/demo/catalogue'],
+  ])('excludes %s %s from the hydration transfer cache', (method, url) => {
+    const request =
+      method === 'GET' ? new HttpRequest('GET', url) : new HttpRequest('POST', url, null);
+
+    expect(isStoreCatalogRequest(request)).toBe(false);
+  });
+});

src/app/app.config.ts

@@ -4,7 +4,7 @@ import {
   provideAppInitializer,
   provideBrowserGlobalErrorListeners,
 } from '@angular/core';
-import { provideRouter } from '@angular/router';
+import { provideRouter, UrlSerializer } from '@angular/router';
 import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/platform-browser';
 
 import { routes } from './app.routes';
@@ -12,11 +12,14 @@ import { authBootstrap } from './core/services/auth/auth-bootstrap';
 import { authInterceptor } from './core/services/auth/auth.interceptor';
 import { globalLoadingInterceptor } from './core/services/global-loading/global-loading.interceptor';
 import { tenantBootstrap } from './core/services/tenant-bootstrap';
+import { TenantUrlSerializer } from './core/services/tenant-url.serializer';
 
-function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
+export function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
   return (
     request.method === 'GET' &&
-    /\/api\/tenants\/[^/]+\/productos(?:\/\d+)?(?:\?|$)/.test(request.urlWithParams)
+    /\/api\/tenants\/[^/?#]+\/(?:catalog(?:\/featured-groups\/\d+\/items)?|catalog-items(?:\/\d+)?)\/?(?:[?#]|$)/.test(
+      request.urlWithParams,
+    )
   );
 }
 
@@ -24,6 +27,7 @@ export const appConfig: ApplicationConfig = {
   providers: [
     provideBrowserGlobalErrorListeners(),
     provideRouter(routes),
+    { provide: UrlSerializer, useClass: TenantUrlSerializer },
     provideClientHydration(
       withHttpTransferCacheOptions({
         includeRequestsWithAuthHeaders: true,

src/app/app.routes.spec.ts

@@ -233,6 +233,19 @@ describe('app routes', () => {
     expect(compiled.textContent).toContain('No encontramos una tienda para este dominio');
   });
 
+  it('renders the tenant not found screen at / without redirecting to itself', async () => {
+    const { fixture, router } = await renderAppAt(
+      '/',
+      createTenantServiceStub('not-found', null),
+      createAuthServiceStub()
+    );
+    const compiled = fixture.nativeElement as HTMLElement;
+
+    expect(router.url).toBe('/');
+    expect(compiled.querySelector('.tenant-status')).not.toBeNull();
+    expect(compiled.textContent).toContain('No encontramos una tienda para este dominio');
+  });
+
   it('redirects unauthenticated users from /checkout to /login', async () => {
     const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(false));
 

src/app/app.routes.ts

@@ -14,5 +14,12 @@ export const routes: Routes = [
   {
     path: '',
     loadChildren: () => import('./features/store/store.routes').then((m) => m.routes)
+  },
+  {
+    path: '**',
+    loadComponent: () =>
+      import('./shared/pages/route-not-found-page.component').then(
+        (m) => m.RouteNotFoundPageComponent,
+      )
   }
 ];

src/app/app.scss

@@ -17,7 +17,7 @@
 .tenant-status__card {
   width: min(100%, 34rem);
   padding: 2rem;
-  border: 1px solid rgba(32, 32, 32, 0.1);
+  border: 1px solid var(--border-color);
   border-radius: 1.5rem;
   background-color: rgba(255, 255, 255, 0.92);
   box-shadow: 0 1.25rem 3rem rgba(0, 0, 0, 0.1);
@@ -55,7 +55,7 @@
 .tenant-status__spinner {
   width: 3rem;
   height: 3rem;
-  border: 0.25rem solid rgba(32, 32, 32, 0.08);
+  border: 0.25rem solid var(--border-color);
   border-top-color: var(--tenant-primary);
   border-radius: 999px;
   animation: tenant-status-spin 0.8s linear infinite;

src/app/app.spec.ts

@@ -17,6 +17,8 @@ const tenant: Tenant = {
   codigo: 'test',
   nombre: 'Test Tenant',
   dominio: 'localhost',
+  site_title: 'Test Store',
+  favicon: 'https://example.com/favicon.png',
   primary_color: '#6376F3',
   secondary_color: '#A0A0A0',
   danger_color: '#FF8888',
@@ -90,6 +92,9 @@ describe('App', () => {
     expect(fixture.nativeElement.style.getPropertyValue('--tenant-danger-rgb')).toBe(
       '255, 136, 136'
     );
+    expect(document.title).toBe(tenant.site_title);
+    expect(document.head.querySelector<HTMLLinkElement>('link[rel~="icon"]')?.getAttribute('href'))
+      .toBe(tenant.favicon);
   });
 
   it('renders the tenant not found screen when the tenant is missing', async () => {
@@ -108,5 +113,8 @@ describe('App', () => {
     fixture.detectChanges();
 
     expect(fixture.nativeElement.textContent).toContain('No encontramos una tienda para este dominio');
+    expect(document.title).toBe('ShopitFront');
+    expect(document.head.querySelector<HTMLLinkElement>('link[rel~="icon"]')?.getAttribute('href'))
+      .toBe('favicon.ico');
   });
 });

src/app/app.ts

@@ -1,4 +1,6 @@
-import { Component, computed, inject } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { Component, computed, effect, inject } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { RouterOutlet } from '@angular/router';
 
 import { TenantService } from './core/services/tenant.service';
@@ -57,6 +59,28 @@ function hexToRgb(hex: string): string {
 })
 export class App {
   private readonly tenantService = inject(TenantService);
+  private readonly document = inject(DOCUMENT);
+  private readonly title = inject(Title);
+
+  constructor() {
+    effect(() => {
+      const tenant = this.tenantService.tenant();
+      const siteTitle = tenant?.site_title?.trim() || 'ShopitFront';
+      const faviconHref = tenant?.favicon || 'favicon.ico';
+
+      this.title.setTitle(siteTitle);
+
+      let favicon = this.document.head.querySelector<HTMLLinkElement>('link[rel~="icon"]');
+
+      if (!favicon) {
+        favicon = this.document.createElement('link');
+        favicon.setAttribute('rel', 'icon');
+        this.document.head.appendChild(favicon);
+      }
+
+      favicon.setAttribute('href', faviconHref);
+    });
+  }
 
   protected readonly status = this.tenantService.status;
 

src/app/core/guards/menu.guard.spec.ts

@@ -0,0 +1,76 @@
+import { TestBed } from '@angular/core/testing';
+import { provideRouter, Router, UrlTree } from '@angular/router';
+
+import { Tenant } from '../services/tenant.interface';
+import { TenantService } from '../services/tenant.service';
+import { hasMenuGuard } from './menu.guard';
+
+const tenant: Tenant = {
+  id: 1,
+  codigo: 'test',
+  nombre: 'Test Tenant',
+  dominio: 'localhost',
+  primary_color: '#6376F3',
+  secondary_color: '#A0A0A0',
+  danger_color: '#FF8888',
+  success_color: '#198754',
+  header_bg_color: '#313131',
+  footer_bg_color: '#313131',
+  header_logo: 'https://example.com/header.png',
+  footer_logo: 'https://example.com/footer.png',
+  categories: [],
+  menues: [
+    {
+      id: 1,
+      code: 'index',
+      label: 'Inicio',
+      parent_menu_code: null,
+      content_type: 'dynamic',
+      route: '/',
+      submenues: [],
+    },
+  ],
+};
+
+function runGuard(menuCode: string, url: string, currentTenant: Tenant | null) {
+  TestBed.configureTestingModule({
+    providers: [
+      provideRouter([]),
+      {
+        provide: TenantService,
+        useValue: { tenant: () => currentTenant },
+      },
+    ],
+  });
+
+  return TestBed.runInInjectionContext(() =>
+    hasMenuGuard(menuCode)(null as never, { url } as never),
+  );
+}
+
+describe('hasMenuGuard', () => {
+  beforeEach(() => {
+    TestBed.resetTestingModule();
+  });
+
+  it('allows a route exposed by the tenant menu', () => {
+    expect(runGuard('index', '/', tenant)).toBe(true);
+  });
+
+  it('cancels navigation when the tenant is missing', () => {
+    expect(runGuard('index', '/', null)).toBe(false);
+  });
+
+  it('redirects a missing menu route to the store root', () => {
+    const result = runGuard('checkout', '/checkout', tenant);
+
+    expect(result instanceof UrlTree).toBe(true);
+    expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe('/');
+  });
+
+  it('allows the store root when its menu is missing to avoid a self-redirect', () => {
+    const tenantWithoutMenus = { ...tenant, menues: [] };
+
+    expect(runGuard('index', '/', tenantWithoutMenus)).toBe(true);
+  });
+});

src/app/core/guards/menu.guard.ts

@@ -4,19 +4,19 @@ import { findMenu } from '../services/menu.utils';
 import { TenantService } from '../services/tenant.service';
 
 export const hasMenuGuard = (menuCode: string): CanActivateFn => {
-  return () => {
+  return (_route, state) => {
     const tenantService = inject(TenantService);
     const router = inject(Router);
 
     const tenant = tenantService.tenant();
 
     if (!tenant) {
-      return router.createUrlTree(['/']);
+      return false;
     }
 
     const hasMenu = findMenu(tenant.menues ?? [], menuCode) !== undefined;
 
-    if (hasMenu) {
+    if (hasMenu || state.url === '/') {
       return true;
     }
 

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

@@ -1,4 +1,7 @@
-<footer class="store-layout__footer mt-auto text-light">
+<footer
+  class="store-layout__footer mt-auto text-light"
+  [style.background-image]="backgroundImageUrl ? 'url(' + backgroundImageUrl + ')' : null"
+>
   <div class="container-xl px-3 px-md-4 py-4 py-md-5 store-layout__footer-content">
     <div class="row g-4 store-layout__footer-grid">
       <div class="col-12 store-layout__brand-column">
@@ -19,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">
-          <div class="d-flex align-items-center gap-2">
+          @if (address) {
-            <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
+            <div class="d-flex align-items-center gap-2">
-            <span>Av. San Lorenzo 1542, Rosario</span>
+              <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
-          </div>
+              <span>{{ address }}</span>
-          <div class="d-flex align-items-center gap-2">
+            </div>
-            <i class="fa-solid fa-phone" aria-hidden="true"></i>
+          }
-            <span>54 9 (0341) 6658247</span>
+          @if (phone) {
-          </div>
+            <div class="d-flex align-items-center gap-2">
+              <i class="fa-solid fa-phone" aria-hidden="true"></i>
+              <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.scss

@@ -1,5 +1,8 @@
 .store-layout__footer {
   background-color: var(--tenant-footer-bg);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
 }
 
 .store-layout__mobile-divider {
@@ -7,21 +10,21 @@
 }
 
 .store-layout__brand-slot {
-  width: min(100%, 12rem);
+  width: min(100%, 230px);
   min-width: 10rem;
 }
 
 .store-layout__brand-logo-shell {
   position: relative;
-  width: min(100%, 12rem);
+  width: min(100%, 230px);
-  height: 2.75rem;
+  height: 65px;
 }
 
 .store-layout__brand-logo {
   display: block;
   width: 100%;
   height: 100%;
-  max-height: 2.75rem;
+  max-height: 65px;
   object-fit: contain;
   object-position: left center;
 }
@@ -46,7 +49,7 @@
   place-items: center;
   width: 2.75rem;
   height: 2.75rem;
-  border: 1px dashed rgba(255, 255, 255, 0.35);
+  border: 1px dashed var(--border-color);
   border-radius: 999px;
   font-size: 1.05rem;
   font-weight: 700;
@@ -67,7 +70,7 @@
 
 .store-layout__footer-link {
   width: fit-content;
-  color: rgba(255, 255, 255, 0.72);
+  color: #ffffff;
   text-decoration: none;
 
   &:hover,
@@ -98,6 +101,7 @@
 @media (max-width: 767.98px) {
   .store-layout__footer-content {
     padding: 1.45rem 2.5rem 1.8rem !important;
+    font-size: 13px;
   }
 
   .store-layout__footer-grid {
@@ -117,7 +121,6 @@
     order: 1;
     width: auto;
     padding-bottom: 1.65rem;
-    font-size: 0.72rem;
     line-height: 1.25;
 
     &:nth-of-type(even) {
@@ -133,8 +136,8 @@
     display: block;
     order: 2;
     grid-column: 1 / -1;
-    width: 100vw;
+    width: 100%;
-    border-top: 1px solid rgba(255, 255, 255, 0.3);
+    border-top: 1px solid var(--border-color);
   }
 
   .store-layout__brand-column,
@@ -145,21 +148,21 @@
   }
 
   .store-layout__brand-slot {
-    width: min(100%, 7.75rem);
+    width: min(100%, 150px);
     min-width: 0;
   }
 
   .store-layout__brand-logo {
-    max-height: 2.5rem;
+    max-height: 55px;
   }
 
   .store-layout__brand-logo-shell {
-    width: min(100%, 7.75rem);
+    width: min(100%, 150px);
-    height: 2.5rem;
+    height: 55px;
   }
 
   .store-layout__brand-text {
-    font-size: 1.45rem;
+    font-size: 13px;
   }
 
   .store-layout__social-column {
@@ -183,11 +186,10 @@
   .store-layout__contact-details {
     justify-items: center;
     gap: 0.4rem !important;
-    font-size: 0.7rem;
   }
 
   .store-layout__copyright {
-    font-size: 0.6rem;
+    font-size: 11px;
     line-height: 1.3;
   }
 }

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

@@ -25,6 +25,9 @@ export class StoreFooterComponent {
   @Input({ required: true }) footerSections: StoreFooterSection[] = [];
   @Input({ required: true }) socialMedia: SocialMedia[] = [];
   @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

@@ -1,4 +1,7 @@
-<header class="store-layout__header">
+<header
+  class="store-layout__header"
+  [style.background-image]="backgroundImageUrl() ? 'url(' + backgroundImageUrl() + ')' : null"
+>
   <div class="store-layout__header-main">
     <div class="container-xl px-3 px-md-4 py-3 py-lg-4">
       <div class="row align-items-center gy-3 gy-md-0">
@@ -19,46 +22,50 @@
           </a>
         </div>
 
-        <div class="col-12 px-0 d-md-none order-3">
+        @if (displaySeachBar()) {
-          <hr class="store-layout__mobile-separator">
+          <div class="col-12 px-0 d-md-none order-3">
-        </div>
+            <hr class="store-layout__mobile-separator" />
-
-        <div class="col-12 col-md order-4 order-md-2">
-          <div class="store-layout__search-wrapper ms-md-auto">
-            <div class="input-group store-layout__search" role="search">
-              <label class="visually-hidden" for="store-search-input">Buscar productos</label>
-              <input
-                id="store-search-input"
-                type="search"
-                class="form-control store-layout__search-input border-end-0 rounded-start"
-                placeholder="Buscar productos"
-                autocomplete="off"
-                [attr.aria-describedby]="showSearchError() ? 'store-search-error' : null"
-                [attr.aria-invalid]="showSearchError()"
-                [minlength]="minSearchLength"
-                [formControl]="searchControl"
-                (input)="clearSearchError()"
-                (keydown.enter)="submitSearch($event)"
-              />
-              <button
-                type="button"
-                class="btn store-layout__search-button border-start-0 rounded-end px-3"
-                aria-label="Buscar"
-                (click)="submitSearch()"
-              >
-                <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
-              </button>
-            </div>
-
-            @if (showSearchError()) {
-              <p id="store-search-error" class="store-layout__search-error mb-0" role="alert">
-                Ingresá al menos {{ minSearchLength }} caracteres para buscar.
-              </p>
-            }
           </div>
-        </div>
 
-        <div class="store-layout__actions-column col-auto col-md-auto order-2 order-md-3 ms-auto d-flex flex-row align-items-center justify-content-end gap-2 gap-md-3">
+          <div class="col-12 col-md order-4 order-md-2">
+            <div class="store-layout__search-wrapper ms-md-auto">
+              <div class="input-group store-layout__search" role="search">
+                <label class="visually-hidden" for="store-search-input">Buscar productos</label>
+                <input
+                  id="store-search-input"
+                  type="search"
+                  class="form-control store-layout__search-input border-end-0 rounded-start"
+                  placeholder="Buscar productos"
+                  autocomplete="off"
+                  [attr.aria-describedby]="showSearchError() ? 'store-search-error' : null"
+                  [attr.aria-invalid]="showSearchError()"
+                  [minlength]="minSearchLength"
+                  [formControl]="searchControl"
+                  (input)="clearSearchError()"
+                  (keydown.enter)="submitSearch($event)"
+                />
+                <button
+                  type="button"
+                  class="btn store-layout__search-button border-start-0 rounded-end px-3"
+                  aria-label="Buscar"
+                  (click)="submitSearch()"
+                >
+                  <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+                </button>
+              </div>
+
+              @if (showSearchError()) {
+                <p id="store-search-error" class="store-layout__search-error mb-0" role="alert">
+                  Ingresá al menos {{ minSearchLength }} caracteres para buscar.
+                </p>
+              }
+            </div>
+          </div>
+        }
+
+        <div
+          class="store-layout__actions-column col-auto col-md-auto order-2 order-md-3 ms-auto d-flex flex-row align-items-center justify-content-end gap-2 gap-md-3"
+        >
           @if (ticketsMenu(); as menu) {
             <app-button
               variant="primary"
@@ -70,12 +77,17 @@
             </app-button>
           }
 
-          <app-cart-icon
+          @if (displayCart()) {
-            [quantity]="cartQuantity()"
+            <app-cart-icon
-            ariaLabel="Carrito de compras"
+              [quantity]="cartDisabled() ? null : cartQuantity()"
-            title="Carrito"
+              [disabled]="cartDisabled()"
-            (click)="cartClick.emit()"
+              [ariaLabel]="
-          />
+                cartDisabled() ? 'Carrito no disponible durante el checkout' : 'Carrito de compras'
+              "
+              [title]="cartDisabled() ? 'Carrito no disponible durante el checkout' : 'Carrito'"
+              (click)="onCartClick()"
+            />
+          }
 
           <div class="store-layout__user-menu d-none d-md-inline-flex position-relative">
             <app-icon-button
@@ -108,24 +120,29 @@
             />
 
             @if (isMobileMenuOpen()) {
-              <div id="store-mobile-menu" class="position-absolute end-0 bg-white rounded shadow mt-2 py-2 store-layout__mobile-dropdown-menu">
+              <div
-                <a 
+                id="store-mobile-menu"
-                  class="dropdown-item d-flex align-items-center gap-2 px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item" 
+                class="position-absolute end-0 bg-white rounded shadow mt-2 py-2 store-layout__mobile-dropdown-menu"
+              >
+                <a
+                  class="dropdown-item d-flex align-items-center gap-2 px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item"
                   (click)="onMobileAccountClick()"
                 >
                   <i class="fa-regular fa-circle-user fa-lg"></i>
                   <span class="fw-medium">Mi cuenta</span>
                 </a>
 
-                <hr class="my-1 border-secondary opacity-25">
+                @if (displayCategories()) {
+                  <hr class="my-1 border-secondary opacity-25" />
 
-                @for (category of categories(); track category.id) {
+                  @for (category of categories(); track category.id) {
-                  <a 
+                    <a
-                    class="dropdown-item px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item" 
+                      class="dropdown-item px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item"
-                    (click)="onCategorySelect(category)"
+                      (click)="onCategorySelect(category)"
-                  >
+                    >
-                    <span class="fw-medium">{{ category.nombre }}</span>
+                      <span class="fw-medium">{{ category.nombre }}</span>
-                  </a>
+                    </a>
+                  }
                 }
               </div>
             }
@@ -135,28 +152,30 @@
     </div>
   </div>
 
-  <div class="store-layout__categories d-none d-md-block">
+  @if (displayCategories()) {
-    <div class="container-xl px-3 px-md-4">
+    <div class="store-layout__categories d-none d-md-block">
-      <div class="store-layout__category-menu">
+      <div class="container-xl px-3 px-md-4">
-        <button
+        <div class="store-layout__category-menu">
-          type="button"
+          <button
-          class="btn btn-link d-inline-flex align-items-center gap-2 px-0 py-2 text-uppercase fw-bold text-decoration-none store-layout__category-trigger"
+            type="button"
-          aria-label="Categorias"
+            class="btn btn-link d-inline-flex align-items-center gap-2 px-0 py-3 text-uppercase fw-bold text-decoration-none store-layout__category-trigger"
-          aria-controls="store-category-dropdown"
+            aria-label="Categorias"
-          [attr.aria-expanded]="isCategoryDropdownOpen()"
+            aria-controls="store-category-dropdown"
-          (click)="toggleCategoryDropdown()"
+            [attr.aria-expanded]="isCategoryDropdownOpen()"
-        >
+            (click)="toggleCategoryDropdown()"
-          <span>Categorias</span>
+          >
-          <i class="fa-solid fa-chevron-down" aria-hidden="true"></i>
+            <span>Categorias</span>
-        </button>
+            <i class="fa-solid fa-chevron-down" aria-hidden="true"></i>
+          </button>
 
-        <app-category-dropdown
+          <app-category-dropdown
-          id="store-category-dropdown"
+            id="store-category-dropdown"
-          [categories]="categories()"
+            [categories]="categories()"
-          [open]="isCategoryDropdownOpen()"
+            [open]="isCategoryDropdownOpen()"
-          (categorySelect)="onCategorySelect($event)"
+            (categorySelect)="onCategorySelect($event)"
-        />
+          />
+        </div>
       </div>
     </div>
-  </div>
+  }
 </header>

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

@@ -1,11 +1,13 @@
 .store-layout__header {
   color: #ffffff;
   background-color: var(--tenant-header-bg);
-  box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.08);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
 }
 
 .store-layout__header-main {
-  border-bottom: 1px solid rgba(255, 255, 255, 0.08);
+  border-bottom: 1px solid var(--border-color);
 }
 
 .store-layout__brand-slot {
@@ -77,7 +79,7 @@
 
 .store-layout__search-input {
   color: #666666;
-  border-color: #cccccc;
+  border-color: var(--border-color);
   background-color: rgba(255, 255, 255, 0.96);
 }
 
@@ -86,21 +88,21 @@
 }
 
 .store-layout__search-input:focus {
-  border-color: #cccccc;
+  border-color: var(--border-color);
   box-shadow: none;
   outline: none;
 }
 
 .store-layout__search-button {
   color: #a0a0a0;
-  border-color: #cccccc;
+  border-color: var(--border-color);
   background-color: rgba(255, 255, 255, 0.96);
 }
 
 .store-layout__search-button:hover,
 .store-layout__search-button:focus-visible {
   color: #8a8a8a;
-  border-color: #cccccc;
+  border-color: var(--border-color);
   background-color: #ffffff;
 }
 
@@ -158,8 +160,21 @@
     max-width: 150px;
   }
 
+  .store-layout__actions-column {
+    flex: 1 1 auto;
+    width: auto;
+    min-width: 0;
+  }
+
+  ::ng-deep .store-layout__tickets-btn-host {
+    flex: 1 1 0;
+    width: auto;
+    min-width: 0;
+    max-width: 50vw;
+  }
+
   .store-layout__mobile-separator {
-    border-color: #DDDDDD;
+    border-color: var(--border-color);
     opacity: 1;
     margin: 0 -1rem;
   }
@@ -180,8 +195,9 @@
   }
 
   .store-layout__actions-column {
-    flex: 0 0 auto;
+    flex: 1 1 auto;
     width: auto;
+    min-width: 0;
     margin-left: 0 !important;
     padding-left: 0.25rem;
     gap: 0.25rem !important;

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

@@ -29,12 +29,17 @@ export class StoreHeaderComponent {
   private readonly router = inject(Router);
 
   readonly logoUrl = input<string | null>(null);
+  readonly backgroundImageUrl = input<string | null>(null);
   readonly cartQuantity = input<number>(0);
   readonly user = input<AuthUser | null>(null);
   readonly isAuthenticated = input<boolean>(false);
   readonly accountNavigationMenus = input<readonly Menu[]>([]);
   readonly ticketsMenu = input<Menu | null>(null);
   readonly categories = input<readonly Category[]>([]);
+  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>();
@@ -49,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-header/user-dropdown/user-dropdown.component.scss

@@ -10,7 +10,7 @@
 .user-dropdown {
   display: grid;
   background: #ffffff;
-  border: 1px solid rgba(32, 32, 32, 0.1);
+  border: 1px solid var(--border-color);
   border-radius: 8px;
   box-shadow: 0 18px 44px rgba(0, 0, 0, 0.16);
   padding: 0.75rem;

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

@@ -1,13 +1,19 @@
 <div class="store-layout d-flex flex-column flex-grow-1">
   <app-store-header
+    ngSkipHydration
     [cartQuantity]="cartQuantity()"
     [logoUrl]="tenant()?.header_logo ?? null"
+    [backgroundImageUrl]="tenant()?.header_bg_image ?? null"
     [user]="user()"
     [isAuthenticated]="isAuthenticated()"
     [accountNavigationMenus]="accountNavigationMenus()"
     [ticketsMenu]="ticketsMenu() ?? null"
     [categories]="tenant()?.categories ?? []"
-    (cartClick)="isCartOpen.set(!isCartOpen())"
+    [displayCategories]="tenant()?.display_categories ?? true"
+    [displaySeachBar]="tenant()?.display_seach_bar ?? true"
+    [displayCart]="displayCart()"
+    [cartDisabled]="isCheckoutRoute()"
+    (cartClick)="onCartClick()"
     (ticketsClick)="onTicketsClick()"
     (loginClick)="onLoginClick()"
     (logoutClick)="onLogoutClick()"
@@ -15,11 +21,8 @@
     (categorySelect)="onCategorySelect($event)"
   />
 
-  @if (isCartOpen()) {
+  @if (displayCart() && !isCheckoutRoute() && isCartOpen()) {
-    <div
+    <div class="store-layout__cart-overlay" (click)="isCartOpen.set(false)"></div>
-      class="store-layout__cart-overlay"
-      (click)="isCartOpen.set(false)"
-    ></div>
     <div class="store-layout__cart-dropdown card border-0 shadow-lg">
       <app-cart
         [showClose]="true"
@@ -27,13 +30,15 @@
         [subtotal]="cartSubtotal()"
         [discount]="cartDiscount()"
         [total]="cartTotal()"
+        [readonly]="!canModifyCart()"
+        [allowModify]="canModifyCart()"
+        [allowUpdateQuantity]="canUpdateCartQuantity()"
+        [allowUpdateVariant]="canUpdateCartVariant()"
+        [allowDelete]="canDeleteCartItems()"
         [backgroundColor]="'#ffffff'"
         (closed)="isCartOpen.set(false)"
       >
-        <app-button
+        <app-button variant="secondary" class="flex-grow-1" (click)="isCartOpen.set(false)"
-          variant="secondary"
-          class="flex-grow-1"
-          (click)="isCartOpen.set(false)"
           >Seguir comprando</app-button
         >
         <app-button
@@ -61,7 +66,10 @@
     [footerSections]="footerSections()"
     [socialMedia]="tenant()?.social_media ?? []"
     [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.scss

@@ -21,18 +21,25 @@
 
 .store-layout__cart-dropdown {
   position: absolute;
-  top: 76px;
+  display: flex;
+  flex-direction: column;
+  top: 100px;
   right: calc((100% - 1320px) / 2 + 1.5rem);
- 
+  width: 100%;
+  max-width: 400px;
   max-height: calc(100vh - 120px);
   z-index: 1050;
   background-color: #ffffff;
   border-radius: 8px;
-  border: 1px solid rgba(0, 0, 0, 0.08);
+  border: 1px solid var(--border-color);
   box-shadow: 0 10px 25px rgba(0, 0, 0, 0.08);
   overflow: hidden;
   animation: store-layout-slide-down 0.2s ease-out;
 
+  > app-cart {
+    min-height: 0;
+  }
+
   @media (max-width: 1400px) {
     right: 1.5rem;
   }
@@ -40,6 +47,7 @@
     right: 1rem;
     left: 1rem;
     width: auto;
+    max-width: none;
   }
 }
 

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',
@@ -30,6 +40,15 @@ const tenant: Tenant = {
   footer_bg_color: '#313131',
   header_logo: 'https://example.com/header.png',
   footer_logo: 'https://example.com/footer.png',
+  header_bg_image: 'https://example.com/header-background.png',
+  footer_bg_image: 'https://example.com/footer-background.png',
+  cart_editing_policy: {
+    code: 'full',
+    allow_modify: true,
+    allow_delete: true,
+    allow_update_quantity: true,
+    allow_update_variant: true,
+  },
   categories: [],
   menues: [
     {
@@ -131,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 }),
@@ -145,6 +166,11 @@ describe('StoreLayoutComponent', () => {
       imports: [StoreLayoutComponent],
       providers: [
         provideRouter([]),
+        { provide: UrlSerializer, useClass: TenantUrlSerializer },
+        {
+          provide: ActivatedRoute,
+          useValue: { queryParamMap: queryParamMapState.asObservable() },
+        },
         {
           provide: TenantService,
           useValue: {
@@ -204,6 +230,77 @@ 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,
+      categories: [{ id: 1, nombre: 'Remeras', subcategories: [] }],
+      display_categories: false,
+      display_seach_bar: false,
+      display_cart: false,
+    });
+
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+
+    const compiled = fixture.nativeElement as HTMLElement;
+
+    expect(compiled.querySelector('#store-search-input')).toBeNull();
+    expect(compiled.querySelector('.store-layout__category-trigger')).toBeNull();
+    expect(compiled.querySelector('app-cart-icon')).toBeNull();
+
+    (fixture.componentInstance as any).isCartOpen.set(true);
+    fixture.detectChanges();
+
+    expect(compiled.querySelector('app-cart')).toBeNull();
+    expect(compiled.querySelector('.store-layout__cart-overlay')).toBeNull();
+
+    const header = fixture.debugElement.query(By.directive(StoreHeaderComponent));
+    (header.componentInstance as any).toggleMobileMenu();
+    fixture.detectChanges();
+
+    expect(compiled.querySelectorAll('.store-layout__mobile-dropdown-item')).toHaveLength(1);
+  });
+
   it('renders the tenant branding and action icons', () => {
     const fixture = TestBed.createComponent(StoreLayoutComponent);
     fixture.detectChanges();
@@ -222,12 +319,24 @@ describe('StoreLayoutComponent', () => {
         `app-store-footer img.store-layout__brand-logo[src="${tenant.footer_logo}"]`,
       ),
     ).not.toBeNull();
+    expect(
+      (compiled.querySelector('.store-layout__header') as HTMLElement).style.backgroundImage,
+    ).toContain(tenant.header_bg_image!);
+    expect(
+      (compiled.querySelector('.store-layout__footer') as HTMLElement).style.backgroundImage,
+    ).toContain(tenant.footer_bg_image!);
     expect(compiled.querySelector('.fa-cart-shopping')).not.toBeNull();
     expect(compiled.querySelector('.fa-circle-user')).not.toBeNull();
     expect(compiled.querySelector('.fa-instagram')).not.toBeNull();
     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', () => {
@@ -532,10 +641,9 @@ describe('StoreLayoutComponent', () => {
           precio_unitario: '100.00',
           catalog_item_id: 1,
           variant_id: null,
-          product: {
+          nombre: 'Producto',
-            nombre: 'Producto',
+          imagen: null,
-            imagen: null,
+          variant: null,
-          },
         },
       ],
     });
@@ -585,10 +693,9 @@ describe('StoreLayoutComponent', () => {
           precio_unitario: '100.00',
           catalog_item_id: 1,
           variant_id: null,
-          product: {
+          nombre: 'Producto',
-            nombre: 'Producto',
+          imagen: null,
-            imagen: null,
+          variant: null,
-          },
         },
       ],
     });
@@ -608,4 +715,102 @@ describe('StoreLayoutComponent', () => {
     expect(cartItem.componentInstance.quantityDisabled()).toBe(false);
     expect(buyButton).toBeDefined();
   });
+
+  it('hides quantity selectors when the tenant disables cart editing', () => {
+    tenantState.set({
+      ...tenant,
+      cart_editing_policy: {
+        code: 'disabled',
+        allow_modify: false,
+        allow_delete: false,
+        allow_update_quantity: false,
+        allow_update_variant: false,
+      },
+    });
+    cartState.set({
+      id: 1,
+      tenant_codigo: tenant.codigo,
+      status: 'active',
+      subtotal: '100.00',
+      items: [
+        {
+          id: 1,
+          cantidad: 1,
+          precio_unitario: '100.00',
+          catalog_item_id: 1,
+          variant_id: null,
+          nombre: 'Producto',
+          imagen: null,
+          variant: null,
+        },
+      ],
+    });
+
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+    (fixture.componentInstance as any).isCartOpen.set(true);
+    fixture.detectChanges();
+
+    const cartItem = fixture.debugElement.query(By.css('app-cart-item'));
+    expect(cartItem.componentInstance.readonly()).toBe(true);
+    expect(cartItem.nativeElement.querySelector('app-quantity-selector')).toBeNull();
+  });
+
+  it('shows variant selectors only for the full cart editing policy', () => {
+    const variantCart: Cart = {
+      id: 1,
+      tenant_codigo: tenant.codigo,
+      status: 'active',
+      subtotal: '100.00',
+      items: [
+        {
+          id: 1,
+          cantidad: 1,
+          precio_unitario: '100.00',
+          catalog_item_id: 1,
+          variant_id: 10,
+          nombre: 'Producto',
+          imagen: null,
+          variant: { id: 10, precio: '100.00', stock_tecnico: 5, values: { talle: 'M' } },
+          variants: [
+            { id: 10, precio: '100.00', stock_tecnico: 5, values: { talle: 'M' } },
+            { id: 11, precio: '100.00', stock_tecnico: 5, values: { talle: 'L' } },
+          ],
+        },
+      ],
+    };
+    tenantState.set({
+      ...tenant,
+      cart_editing_policy: {
+        code: 'quantity_and_remove',
+        allow_modify: true,
+        allow_delete: true,
+        allow_update_quantity: true,
+        allow_update_variant: false,
+      },
+    });
+    cartState.set(variantCart);
+
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+    (fixture.componentInstance as any).isCartOpen.set(true);
+    fixture.detectChanges();
+
+    expect(fixture.nativeElement.querySelector('app-variant-selector')).toBeNull();
+    expect(fixture.nativeElement.querySelector('app-quantity-selector')).not.toBeNull();
+
+    tenantState.set({
+      ...tenant,
+      cart_editing_policy: {
+        code: 'full',
+        allow_modify: true,
+        allow_delete: true,
+        allow_update_quantity: true,
+        allow_update_variant: true,
+      },
+    });
+    fixture.detectChanges();
+
+    expect(fixture.nativeElement.querySelector('app-variant-selector')).not.toBeNull();
+  });
 });

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

@@ -1,12 +1,20 @@
-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';
 import { StoreHeaderComponent } from './store-header/store-header.component';
 import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component';
 import { ButtonComponent } from '../../../shared/components/button/button.component';
-import { CartItem } from '../../services/cart/cart.interface';
+import { CartItem, CartItemVariantValue } from '../../services/cart/cart.interface';
 import { AuthService } from '../../services/auth/auth.service';
 import { findMenu } from '../../services/menu.utils';
 import { CheckoutService } from '../../services/checkout.service';
@@ -32,9 +40,26 @@ 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);
+  protected readonly canModifyCart = computed(
+    () => this.cartEditingPolicy()?.allow_modify ?? false,
+  );
+  protected readonly canDeleteCartItems = computed(
+    () => this.cartEditingPolicy()?.allow_delete ?? false,
+  );
+  protected readonly canUpdateCartQuantity = computed(
+    () => this.cartEditingPolicy()?.allow_update_quantity ?? false,
+  );
+  protected readonly canUpdateCartVariant = computed(
+    () => this.cartEditingPolicy()?.allow_update_variant ?? false,
+  );
 
   protected readonly cartSubtotal = computed(() => {
     const cart = this.cartService.cart();
@@ -52,7 +77,7 @@ export class StoreLayoutComponent implements OnInit {
   });
 
   private mapCartItemToMock(item: CartItem): CartItemMock {
-    const fullName = item.product?.nombre ?? '';
+    const fullName = item.nombre ?? '';
     let product = fullName;
     let attributes: { label: string; value: string }[] = [];
 
@@ -69,18 +94,39 @@ export class StoreLayoutComponent implements OnInit {
       });
     }
 
+    const selectedVariant = item.variant;
+
+    if (selectedVariant) {
+      attributes = Object.entries(selectedVariant.values).map(([label, value]) => ({
+        label: this.formatAttributeLabel(label),
+        value: this.formatAttributeValue(value),
+      }));
+    }
+
     return {
       cartItemId: item.id,
-      imageUrl: item.product?.imagen ?? null,
+      imageUrl: item.imagen,
       product,
       originalPrice: null,
       discountedPrice: parseFloat(item.precio_unitario),
       discountPercentage: null,
       attributes,
       quantity: item.cantidad,
+      variantId: item.variant_id,
+      variants: item.variants,
     };
   }
 
+  private formatAttributeLabel(value: string): string {
+    const label = value.replace(/[_-]+/g, ' ');
+    return label.charAt(0).toUpperCase() + label.slice(1);
+  }
+
+  private formatAttributeValue(value: CartItemVariantValue): string {
+    const values = Array.isArray(value) ? value : [value];
+    return values.map((item) => (typeof item === 'string' ? item : item.label)).join(', ');
+  }
+
   protected readonly currentYear = new Date().getFullYear();
   protected readonly tenant = this.tenantService.tenant;
   protected readonly user = this.authService.user;
@@ -111,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 },
@@ -143,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(['/']);
 
@@ -192,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/auth/auth.service.spec.ts

@@ -2,8 +2,10 @@ import { PLATFORM_ID, TransferState } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClient } from '@angular/common/http';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import { TimeoutError } from 'rxjs';
 
 import { environment } from '../../../../environments/environment';
+import { BOOTSTRAP_REQUEST_TIMEOUT_MS } from '../bootstrap-request-timeout';
 import { AuthService } from './auth.service';
 import { CookieService } from '../cookie/cookie.service';
 import { TenantService } from '../tenant.service';
@@ -72,13 +74,13 @@ describe('AuthService', () => {
     expect(service.token()).toBe('plain-text-token');
     expect(service.user()?.email).toBe('ada@example.com');
     expect(service.isAuthenticated()).toBe(true);
-    expect(cookieStore['shopit.auth.token']).toBe('plain-text-token');
+    expect(cookieStore['shopit.front.auth.token']).toBe('plain-text-token');
 
     httpController.verify();
   });
 
   it('hydrates token from cookies and loads the current user during bootstrap', async () => {
-    cookieStore['shopit.auth.token'] = 'persisted-token';
+    cookieStore['shopit.front.auth.token'] = 'persisted-token';
 
     TestBed.configureTestingModule({
       providers: [
@@ -152,7 +154,7 @@ describe('AuthService', () => {
   });
 
   it('clears an expired session when /me returns 401', async () => {
-    cookieStore['shopit.auth.token'] = 'expired-token';
+    cookieStore['shopit.front.auth.token'] = 'expired-token';
 
     TestBed.configureTestingModule({
       providers: [
@@ -176,11 +178,48 @@ describe('AuthService', () => {
     expect(service.user()).toBeNull();
     expect(service.token()).toBeNull();
     expect(service.isAuthenticated()).toBe(false);
-    expect(cookieStore['shopit.auth.token']).toBeUndefined();
+    expect(cookieStore['shopit.front.auth.token']).toBeUndefined();
 
     httpController.verify();
   });
 
+  it('propagates a /me timeout without clearing the local session', async () => {
+    cookieStore['shopit.front.auth.token'] = 'valid-token';
+    vi.useFakeTimers();
+
+    try {
+      TestBed.configureTestingModule({
+        providers: [
+          provideHttpClient(),
+          provideHttpClientTesting(),
+          AuthService,
+          { provide: CookieService, useValue: createCookieServiceStub() },
+          { provide: BOOTSTRAP_REQUEST_TIMEOUT_MS, useValue: 25 },
+          TransferState,
+        ],
+      });
+
+      const service = TestBed.inject(AuthService);
+      const httpController = TestBed.inject(HttpTestingController);
+
+      const bootstrapPromise = service.bootstrap();
+      const rejection = expect(bootstrapPromise).rejects.toBeInstanceOf(TimeoutError);
+      const request = httpController.expectOne(`${environment.url}me`);
+
+      await vi.advanceTimersByTimeAsync(25);
+      await rejection;
+
+      expect(request.cancelled).toBe(true);
+      expect(service.user()).toBeNull();
+      expect(service.token()).toBe('valid-token');
+      expect(cookieStore['shopit.front.auth.token']).toBe('valid-token');
+
+      httpController.verify();
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
   it('registers without creating a session', () => {
     TestBed.configureTestingModule({
       providers: [
@@ -384,7 +423,7 @@ describe('AuthService', () => {
 
     expect(service.token()).toBe('plain-text-token');
     expect(service.user()?.email).toBe('ada@example.com');
-    expect(cookieStore['shopit.auth.token']).toBe('plain-text-token');
+    expect(cookieStore['shopit.front.auth.token']).toBe('plain-text-token');
 
     httpController.verify();
   });

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

@@ -2,7 +2,7 @@ import { DOCUMENT } from '@angular/common';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
 import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core';
-import { firstValueFrom, map, Observable, of, tap } from 'rxjs';
+import { firstValueFrom, map, Observable, of, tap, timeout } from 'rxjs';
 
 import { environment } from '../../../../environments/environment';
 import { BaseApiService } from '../base-api.service';
@@ -20,8 +20,9 @@ import {
 } from './auth.interfaces';
 import { CookieService } from '../cookie/cookie.service';
 import { TenantService } from '../tenant.service';
+import { BOOTSTRAP_REQUEST_TIMEOUT_MS } from '../bootstrap-request-timeout';
 
-const AUTH_TOKEN_COOKIE_KEY = 'shopit.auth.token';
+const AUTH_TOKEN_COOKIE_KEY = 'shopit.front.auth.token';
 const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
 
 @Injectable({
@@ -33,6 +34,7 @@ export class AuthService extends BaseApiService {
   private readonly cookieService = inject(CookieService);
   private readonly transferState = inject(TransferState);
   private readonly tenantService = inject(TenantService);
+  private readonly bootstrapRequestTimeoutMs = inject(BOOTSTRAP_REQUEST_TIMEOUT_MS);
 
   private readonly userState = signal<AuthUser | null>(null);
   private readonly tokenState = signal<string | null>(null);
@@ -117,8 +119,12 @@ export class AuthService extends BaseApiService {
 
     const apiUrl = new URL(environment.url);
     const authorizationUrl = new URL('/auth/google/redirect', apiUrl.origin);
+    const basePath = tenant.base_path && tenant.base_path !== '/' ? tenant.base_path : '';
     authorizationUrl.searchParams.set('tenant', tenant.codigo);
-    authorizationUrl.searchParams.set('return_url', this.document.location.origin);
+    authorizationUrl.searchParams.set(
+      'return_url',
+      `${this.document.location.origin}${basePath}`,
+    );
 
     this.document.location.assign(authorizationUrl.toString());
   }
@@ -175,7 +181,9 @@ export class AuthService extends BaseApiService {
     }
 
     try {
-      const user = await firstValueFrom(this.loadCurrentUser());
+      const user = await firstValueFrom(
+        this.loadCurrentUser().pipe(timeout(this.bootstrapRequestTimeoutMs)),
+      );
 
       if (isPlatformServer(this.platformId)) {
         this.transferState.set(AUTH_USER_SSR_STATE_KEY, user);

src/app/core/services/bootstrap-request-timeout.ts

@@ -0,0 +1,9 @@
+import { InjectionToken } from '@angular/core';
+
+export const BOOTSTRAP_REQUEST_TIMEOUT_MS = new InjectionToken<number>(
+  'BOOTSTRAP_REQUEST_TIMEOUT_MS',
+  {
+    providedIn: 'root',
+    factory: () => 10_000,
+  },
+);

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

@@ -1,6 +1,18 @@
-export interface CartItemProduct {
+export interface CartItemVariantOption {
-  nombre: string;
+  value: string;
-  imagen: string | null;
+  label: string;
+}
+
+export type CartItemVariantValue =
+  | string
+  | CartItemVariantOption
+  | Array<string | CartItemVariantOption>;
+
+export interface CartItemVariant {
+  id: number;
+  precio: string;
+  stock_tecnico: number | null;
+  values: Record<string, CartItemVariantValue>;
 }
 
 export interface CartItem {
@@ -9,7 +21,10 @@ export interface CartItem {
   precio_unitario: string;
   catalog_item_id: number;
   variant_id: number | null;
-  product: CartItemProduct | null;
+  nombre: string | null;
+  imagen: string | null;
+  variant: CartItemVariant | null;
+  variants?: CartItemVariant[];
 }
 
 export interface Cart {

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,
@@ -24,9 +26,13 @@ describe('CartService', () => {
         precio_unitario: '10.00',
         catalog_item_id: 5,
         variant_id: 10,
-        product: {
+        nombre: 'Test Product (Size: M)',
-          nombre: 'Test Product (Size: M)',
+        imagen: null,
-          imagen: null,
+        variant: {
+          id: 10,
+          precio: '10.00',
+          stock_tecnico: 1,
+          values: { size: 'M' },
         },
       },
     ],
@@ -49,6 +55,7 @@ describe('CartService', () => {
     });
 
     service = TestBed.inject(CartService);
+    catalogAvailabilityService = TestBed.inject(CatalogAvailabilityService);
     httpMock = TestBed.inject(HttpTestingController);
   });
 
@@ -97,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);
@@ -111,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;
 
@@ -127,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',
@@ -147,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);
@@ -50,9 +52,7 @@ export class CartService extends BaseApiService {
   ): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .post<
+      .post<ApiResponse<Cart>>(
-        ApiResponse<Cart>
-      >(
         `${this.tenantApiUrl}/cart/items`,
         { catalog_item_id: catalogItemId, variant_id: variantId, cantidad },
         {
@@ -62,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) => {
@@ -71,24 +72,31 @@ export class CartService extends BaseApiService {
       );
   }
 
-  updateItemQuantity(
+  updateItemQuantity(cartItemId: number, cantidad: number): Observable<ApiResponse<Cart>> {
+    return this.updateItem(cartItemId, { cantidad });
+  }
+
+  updateItemVariant(
     cartItemId: number,
     cantidad: number,
+    variantId: number,
+  ): Observable<ApiResponse<Cart>> {
+    return this.updateItem(cartItemId, { cantidad, variant_id: variantId });
+  }
+
+  private updateItem(
+    cartItemId: number,
+    payload: { cantidad: number; variant_id?: number },
   ): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .patch<
+      .patch<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, payload, {
-        ApiResponse<Cart>
+        withCredentials: true,
-      >(
+      })
-        `${this.tenantApiUrl}/cart/items/${cartItemId}`,
-        { cantidad },
-        {
-          withCredentials: true,
-        },
-      )
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
+          this.catalogAvailabilityService.notifyAvailabilityChanged();
           this.isUpdatingState.set(false);
         }),
         catchError((error) => {
@@ -101,14 +109,13 @@ export class CartService extends BaseApiService {
   removeItem(cartItemId: number): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .delete<
+      .delete<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
-        ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
         withCredentials: true,
       })
       .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

@@ -1,7 +1,10 @@
 import { ApiPaginatedResponse } from '../api-paginated-response.interface';
 
+export type CatalogItemType = 'product' | 'bundle';
+
 export interface Product {
   id: number;
+  type: CatalogItemType;
   category_id: number;
   brand_id: number | null;
   slug: string;
@@ -15,32 +18,79 @@ export interface Product {
 
 export interface ProductAttributeOption {
   id: number;
+  validity_time_id?: number | null;
   value: string;
   label: string;
   sort_order: number;
   metadata: Record<string, unknown> | null;
 }
 
+export type ProductAttributeType =
+  | 'string'
+  | 'number'
+  | 'boolean'
+  | 'select'
+  | 'multiselect'
+  | 'color'
+  | 'image'
+  | 'event_date';
+
 export interface ProductAttribute {
   id: number;
   codigo: string;
   nombre: string;
   is_required: boolean;
+  allow_multi_select?: boolean;
+  show_in_selector?: boolean;
   metadata_schema: Record<string, unknown> | null;
-  type: string;
+  type: ProductAttributeType;
   options: ProductAttributeOption[];
 }
 
 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;
+}
+
+export type CatalogVariantValue =
+  | string
+  | CatalogVariantOption
+  | Array<string | CatalogVariantOption>;
+
 export interface CatalogItemVariant {
   id: number;
-  stock_tecnico: number | null;
+  descripcion?: string | null;
+  precio?: string;
+  event_date_id?: number | null;
+  event_date_ids?: number[];
+  event_dates?: string[];
+  availability: CatalogAvailability;
   minimum_use_date?: string | null;
   maximum_use_date?: string | null;
   effective_minimum_use_date?: string | null;
   effective_maximum_use_date?: string | null;
-  values: Record<string, string>;
+  values: Record<string, string | string[]>;
 }
 
 export interface SelectedCatalogItemVariant extends CatalogItemVariant {
@@ -49,6 +99,8 @@ export interface SelectedCatalogItemVariant extends CatalogItemVariant {
 
 export interface CatalogItemDetail {
   id: number;
+  type: CatalogItemType;
+  purpose?: 'product' | 'entry';
   category_id: number | null;
   brand_id: number | null;
   slug: string;
@@ -58,32 +110,61 @@ export interface CatalogItemDetail {
   category: string | null;
   brand: string | null;
   inventory_policy: InventoryPolicy;
+  max_units_per_user?: number | null;
   has_tickets: boolean;
   minimum_use_date: string | null;
   maximum_use_date: string | null;
   attributes: ProductAttribute[];
   variants: CatalogItemVariant[];
   selected_variant?: SelectedCatalogItemVariant;
-  stock_tecnico?: number | null;
+  availability: CatalogAvailability;
   images?: string[];
 }
 
-export type CatalogProductLayout = 'row' | 'column_with_image' | 'column_with_cart';
+export type CatalogProductLayout =
-export type CatalogGroupLayout = 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
+  | 'row'
+  | 'column_with_image'
+  | 'column_with_cart'
+  | 'ticket_selector';
+export type CatalogGroupLayout = 'paginated' | 'simple' | 'simple_vertical' | 'carousel' | 'single';
 
 export interface CatalogFeaturedItemVariant {
   id: number;
-  stock_tecnico: number | null;
+  descripcion?: string | null;
-  values: Record<string, string>;
+  precio?: string;
+  availability: CatalogAvailability;
+  values: Record<string, CatalogVariantValue>;
+}
+
+export interface CatalogVariantOptionsResponse {
+  variants: CatalogFeaturedItemVariant[];
+  selectors: CatalogVariantSelector[];
+  selected_values: Record<string, string | string[]>;
+  resolved_variant: CatalogFeaturedItemVariant | null;
+  valid: boolean;
+  available_variant_count: number;
+  matching_variant_count: number;
+  price_range: {
+    minimum: string;
+    maximum: string;
+  };
+}
+
+export interface CatalogVariantSelector {
+  key: string;
+  label: string;
+  options: CatalogVariantValue[];
+  enabled: boolean;
 }
 
 export interface CatalogFeaturedItem {
   id: number;
+  type: CatalogItemType;
   nombre: string;
   descripcion?: string | null;
   precio: number | string;
   image?: string | null;
-  stock_tecnico?: number | null;
+  availability: CatalogAvailability;
   variants?: CatalogFeaturedItemVariant[];
 }
 
@@ -93,6 +174,7 @@ export type CatalogFeaturedItems =
 
 export interface CatalogFeaturedGroup {
   id: number;
+  code: string;
   title: string;
   layout: CatalogProductLayout;
   group_layout: CatalogGroupLayout;

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

@@ -12,6 +12,7 @@ import {
   CatalogFeaturedItem,
   CatalogFeaturedItems,
   CatalogItemDetail,
+  CatalogVariantOptionsResponse,
   CategoryItemsResponse,
   Product,
 } from './catalog.interface';
@@ -74,10 +75,7 @@ export class CatalogService extends BaseApiService {
     );
   }
 
-  getCatalogItem(
+  getCatalogItem(id: number, variantId?: number): Observable<CatalogItemDetail> {
-    id: number,
-    variantId?: number,
-  ): Observable<CatalogItemDetail> {
     let params = new HttpParams();
     if (variantId) {
       params = params.set('variant_id', variantId);
@@ -90,6 +88,20 @@ export class CatalogService extends BaseApiService {
       .pipe(map((response) => response.data));
   }
 
+  getVariantOptions(
+    catalogItemId: number,
+    payload: {
+      selected_values: Record<string, string | string[]>;
+      cart_item_id?: number | null;
+    },
+  ): Observable<CatalogVariantOptionsResponse> {
+    return this.http
+      .post<
+        ApiResponse<CatalogVariantOptionsResponse>
+      >(`${this.tenantApiUrl}/catalog-items/${catalogItemId}/variant-options`, payload, { withCredentials: true })
+      .pipe(map((response) => response.data));
+  }
+
   private buildHttpParams(params?: ApiPaginationQueryParams): HttpParams {
     if (!params) {
       return new HttpParams();

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

@@ -0,0 +1,41 @@
+import { provideHttpClient } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
+import { environment } from '../../../environments/environment';
+import { CheckoutService } from './checkout.service';
+
+describe('CheckoutService', () => {
+  let service: CheckoutService;
+  let httpMock: HttpTestingController;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [CheckoutService, provideHttpClient(), provideHttpClientTesting()],
+    });
+
+    service = TestBed.inject(CheckoutService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => httpMock.verify());
+
+  it('starts one direct checkout with all selected variants', async () => {
+    const payload = {
+      direct_items: [
+        { catalog_item_id: 10, variant_id: 101, cantidad: 1 },
+        { catalog_item_id: 10, variant_id: 102, cantidad: 1 },
+      ],
+    };
+    const purchasePromise = service.startCheckout('desfile', payload);
+    const request = httpMock.expectOne(`${environment.url}tenants/desfile/compras/start-checkout`);
+
+    expect(request.request.method).toBe('POST');
+    expect(request.request.body).toEqual(payload);
+
+    request.flush({ data: { id: 55 } });
+
+    await expect(purchasePromise).resolves.toMatchObject({ id: 55 });
+  });
+});

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 {
@@ -11,16 +13,44 @@ export interface UpdatePurchaseCustomerPayload {
   email: string;
 }
 
+export interface DirectCheckoutItem {
+  catalog_item_id: number;
+  variant_id: number | null;
+  cantidad: number;
+}
+
+export interface UnavailableCheckoutItem {
+  index: number;
+  catalog_item_id: number;
+  variant_id: number | null;
+  requested_quantity: number;
+  available_quantity: number;
+  message: string;
+}
+
+export interface InsufficientStockResponse {
+  code: 'purchase.insufficient_stock';
+  message: string;
+  errors: Record<string, string[]>;
+  unavailable_items: UnavailableCheckoutItem[];
+}
+
+export function isInsufficientStockResponse(value: unknown): value is InsufficientStockResponse {
+  if (typeof value !== 'object' || value === null) return false;
+
+  const response = value as Partial<InsufficientStockResponse>;
+
+  return (
+    response.code === 'purchase.insufficient_stock' && Array.isArray(response.unavailable_items)
+  );
+}
+
 export type StartCheckoutPayload =
   | {
       cart_id: number;
     }
   | {
-      direct_item: {
+      direct_items: DirectCheckoutItem[];
-        catalog_item_id: number;
-        variant_id: number | null;
-        cantidad: number;
-      };
     };
 
 export interface PurchaseStatusResponse {
@@ -61,6 +91,7 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
   user_id: number;
   created_at: string | null;
   payment_method: string | null;
+  expires_at: string | null;
   dni: string | null;
   transfer_payer_dni: string | null;
   telefono: string | null;
@@ -101,7 +132,7 @@ export class CheckoutService extends BaseApiService {
   async generatePaymentIntent(
     tenantCode: string,
     purchaseId: number,
-    method: 'qr' | 'transfer' | 'telepagos',
+    method: 'qr' | 'transfer',
     payerDni?: string,
   ): Promise<any> {
     const payload: any = { method };
@@ -140,50 +171,7 @@ export class CheckoutService extends BaseApiService {
     return purchase;
   }
 
-  async updateItemQuantity(
+  async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
-    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>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`,
@@ -221,10 +209,7 @@ export class CheckoutService extends BaseApiService {
     return { status: purchase.status ?? null };
   }
 
-  async cancelPurchase(
+  async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
-    tenantCode: string,
-    purchaseId: number,
-  ): Promise<PurchaseStatusResponse> {
     const response = await firstValueFrom(
       this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/cancel`,
@@ -243,13 +228,19 @@ 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;
+    if (pagination.page) params['page'] = pagination.page;
+    if (pagination.per_page) params['per_page'] = pagination.per_page;
+
     const response = await firstValueFrom(
-      this.http.get<{ data: PurchaseSummaryResponse[] }>(url),
+      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/modal.service.spec.ts

@@ -163,6 +163,8 @@ describe('ModalService', () => {
     const activeModal = service.activeModal();
     const resultPromise = firstValueFrom(result$);
 
+    expect(activeModal?.config.size).toBe('sm');
+
     activeModal?.ref.dismiss('escape');
 
     await expect(resultPromise).resolves.toBe(false);

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

@@ -166,7 +166,10 @@ export class ModalService {
   }
 
   openConfirmDeleteRef(config: ConfirmModalConfig): ModalRef<boolean> {
-    return this.open(ConfirmDeleteModalComponent, this.buildConfirmModalConfig(config));
+    return this.open(
+      ConfirmDeleteModalComponent,
+      this.buildConfirmModalConfig({ size: 'sm', ...config }),
+    );
   }
 
   openSimple(config: SimpleModalConfig): Observable<void> {

src/app/core/services/tenant-url.serializer.spec.ts

@@ -0,0 +1,50 @@
+import '@angular/compiler';
+import { DefaultUrlSerializer } from '@angular/router';
+import { describe, expect, it } from 'vitest';
+
+import { Tenant } from './tenant.interface';
+import { TenantService } from './tenant.service';
+import { TenantUrlSerializer } from './tenant-url.serializer';
+
+describe('TenantUrlSerializer', () => {
+  const defaultSerializer = new DefaultUrlSerializer();
+
+  function createSerializer(basePath: string): TenantUrlSerializer {
+    const tenantService = {
+      getTenant: () => ({ base_path: basePath }) as Tenant,
+    } as TenantService;
+
+    return new TenantUrlSerializer(tenantService);
+  }
+
+  it('keeps root tenants unchanged', () => {
+    const serializer = createSerializer('/');
+    const tree = serializer.parse('/producto/123?ref=home');
+
+    expect(defaultSerializer.serialize(tree)).toBe('/producto/123?ref=home');
+    expect(serializer.serialize(tree)).toBe('/producto/123?ref=home');
+  });
+
+  it('removes the tenant base path when parsing and restores it when serializing', () => {
+    const serializer = createSerializer('/desfile');
+    const tree = serializer.parse('/desfile/producto/123?ref=home#detalle');
+
+    expect(defaultSerializer.serialize(tree)).toBe('/producto/123?ref=home#detalle');
+    expect(serializer.serialize(tree)).toBe('/desfile/producto/123?ref=home#detalle');
+  });
+
+  it('maps the tenant base path to the application root', () => {
+    const serializer = createSerializer('/desfile/');
+    const tree = serializer.parse('/desfile');
+
+    expect(defaultSerializer.serialize(tree)).toBe('/');
+    expect(serializer.serialize(tree)).toBe('/desfile');
+  });
+
+  it('does not strip partial path segment matches', () => {
+    const serializer = createSerializer('/desfile');
+    const tree = serializer.parse('/desfile-shop/producto/123');
+
+    expect(defaultSerializer.serialize(tree)).toBe('/desfile-shop/producto/123');
+  });
+});

src/app/core/services/tenant-url.serializer.ts

@@ -0,0 +1,66 @@
+import { Injectable } from '@angular/core';
+import { DefaultUrlSerializer, UrlSerializer, UrlTree } from '@angular/router';
+
+import { TenantService } from './tenant.service';
+
+@Injectable()
+export class TenantUrlSerializer extends UrlSerializer {
+  private readonly defaultSerializer = new DefaultUrlSerializer();
+
+  constructor(private readonly tenantService: TenantService) {
+    super();
+  }
+
+  override parse(url: string): UrlTree {
+    return this.defaultSerializer.parse(this.removeBasePath(url));
+  }
+
+  override serialize(tree: UrlTree): string {
+    const url = this.defaultSerializer.serialize(tree);
+    const basePath = this.basePath();
+
+    if (basePath === '/') {
+      return url;
+    }
+
+    return url === '/' ? basePath : `${basePath}${url}`;
+  }
+
+  private removeBasePath(url: string): string {
+    const basePath = this.basePath();
+
+    if (basePath === '/' || !this.startsWithCompletePathSegment(url, basePath)) {
+      return url;
+    }
+
+    const remainder = url.slice(basePath.length);
+
+    if (remainder === '') {
+      return '/';
+    }
+
+    return remainder.startsWith('?') || remainder.startsWith('#')
+      ? `/${remainder}`
+      : remainder;
+  }
+
+  private basePath(): string {
+    const configuredPath = this.tenantService.getTenant()?.base_path?.trim() ?? '/';
+
+    if (configuredPath === '' || configuredPath === '/') {
+      return '/';
+    }
+
+    return `/${configuredPath.replace(/^\/+|\/+$/g, '')}`;
+  }
+
+  private startsWithCompletePathSegment(url: string, basePath: string): boolean {
+    if (!url.startsWith(basePath)) {
+      return false;
+    }
+
+    const boundary = url.charAt(basePath.length);
+
+    return boundary === '' || boundary === '/' || boundary === '?' || boundary === '#';
+  }
+}

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

@@ -1,5 +1,15 @@
 import { ApiResponse } from './api-response.interface';
 
+export type CartEditingPolicyCode = 'disabled' | 'quantity_and_remove' | 'full';
+
+export interface CartEditingPolicy {
+  code: CartEditingPolicyCode;
+  allow_modify: boolean;
+  allow_delete: boolean;
+  allow_update_quantity: boolean;
+  allow_update_variant: boolean;
+}
+
 export interface BankAccount {
   id: number;
   tenant_code: string;
@@ -9,18 +19,67 @@ export interface BankAccount {
   cvu: string;
 }
 
+export interface WebsiteType {
+  codigo: string;
+  nombre: string;
+  primary_color: string | null;
+  secondary_color: string | null;
+  danger_color: string | null;
+  success_color: string | null;
+  site_logo: string | null;
+}
+
 export interface HeroConfig {
-  background_image?: string | null;
+  background_image_id?: string | ResponsiveImage | null;
   title_html?: string | null;
   description_html?: string | null;
   button_text?: string | null;
   button_href?: string | null;
 }
 
+export interface ResponsiveImage {
+  desktop: string;
+  mobile: string;
+}
+
+export interface AdditionalInfoConfig {
+  description?: string | null;
+}
+
+export interface EventDate {
+  id?: number;
+  date: string;
+  start_time: string;
+  end_time: string;
+}
+
 export interface EventConfig {
+  id?: number;
   title?: string | null;
   location?: string | null;
-  dates?: string[] | null;
+  dates_text?: string | null;
+  dates?: EventDate[] | null;
+  contact?: SocialMedia[];
+}
+
+export interface ActiveEventDate {
+  id: number;
+  date: string;
+  time_start: string;
+  time_end: string;
+}
+
+export interface TenantEvent {
+  title: string;
+  location: string;
+  dates: ActiveEventDate[];
+}
+
+export interface WebsiteExtras {
+  carousel?: string[];
+  heroConfig?: HeroConfig | null;
+  additionalInfoConfig?: AdditionalInfoConfig | null;
+  [extraName: string]: unknown;
 }
 
 export interface Menu {
@@ -52,6 +111,11 @@ export interface Tenant {
   codigo: string;
   nombre: string;
   dominio: string;
+  base_path?: string;
+  site_title?: string | null;
+  address?: string | null;
+  phone?: string | null;
+  favicon?: string | null;
   primary_color: string;
   secondary_color: string;
   danger_color: string;
@@ -60,14 +124,24 @@ export interface Tenant {
   footer_bg_color: string;
   header_logo: string;
   footer_logo: string;
+  header_bg_image?: string | null;
+  footer_bg_image?: string | null;
+  website_type_code?: string | null;
+  website_type?: WebsiteType | null;
+  event_date_text?: string | null;
+  extras?: WebsiteExtras;
+  event?: TenantEvent | null;
   selected_bank_account_id?: number | null;
   selected_bank_account?: BankAccount | null;
-  hero_config?: HeroConfig | null;
+  search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart' | 'ticket_selector';
-  event_config?: EventConfig | null;
+  search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel' | 'single';
-  search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart';
-  search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
   search_items_per_page?: number;
-  main_carousel_images?: string[];
+  display_categories?: boolean;
+  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[];
   categories: Category[];

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

@@ -2,8 +2,10 @@ import { PLATFORM_ID, REQUEST, RESPONSE_INIT, TransferState } from '@angular/cor
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClient } from '@angular/common/http';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import { TimeoutError } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
+import { BOOTSTRAP_REQUEST_TIMEOUT_MS } from './bootstrap-request-timeout';
 import { Tenant, TenantBootstrapResponse } from './tenant.interface';
 import { TENANT_SSR_STATE_KEY } from './tenant-ssr-cache.store';
 import { TenantService } from './tenant.service';
@@ -29,15 +31,15 @@ const tenant: Tenant = {
         {
           id: 2,
           nombre: 'Manga corta',
-          subcategories: []
+          subcategories: [],
-        }
+        },
-      ]
+      ],
-    }
+    },
-  ]
+  ],
 };
 
 const tenantResponse: TenantBootstrapResponse = {
-  data: tenant
+  data: tenant,
 };
 
 describe('TenantService', () => {
@@ -51,14 +53,16 @@ describe('TenantService', () => {
 
   it('requests the tenant bootstrap endpoint using the current hostname and stores the response', async () => {
     TestBed.configureTestingModule({
-      providers: [provideHttpClient(), provideHttpClientTesting(), TenantService]
+      providers: [provideHttpClient(), provideHttpClientTesting(), TenantService],
     });
 
     const service = TestBed.inject(TenantService);
     const httpController = TestBed.inject(HttpTestingController);
 
     const bootstrapPromise = service.bootstrap();
-    const request = httpController.expectOne(`${environment.url}tenants/bootstrap/localhost`);
+    const request = httpController.expectOne(
+      `${environment.url}tenants/bootstrap?dominio=localhost&path=/`,
+    );
 
     expect(request.request.method).toBe('GET');
 
@@ -74,7 +78,7 @@ describe('TenantService', () => {
 
   it('hydrates the tenant from TransferState without performing HTTP on the browser', async () => {
     TestBed.configureTestingModule({
-      providers: [provideHttpClient(), provideHttpClientTesting(), TenantService]
+      providers: [provideHttpClient(), provideHttpClientTesting(), TenantService],
     });
 
     const service = TestBed.inject(TenantService);
@@ -83,7 +87,7 @@ describe('TenantService', () => {
 
     transferState.set(TENANT_SSR_STATE_KEY, {
       status: 'ready',
-      tenant
+      tenant,
     });
 
     await expect(service.bootstrap()).resolves.toBeUndefined();
@@ -109,12 +113,12 @@ describe('TenantService', () => {
           useValue: new Request('https://internal.example/render', {
             headers: {
               'x-forwarded-host': 'STORE.EXAMPLE.COM:443, proxy.internal',
-              host: 'ignored.example.com'
+              host: 'ignored.example.com',
-            }
+            },
-          })
+          }),
         },
-        { provide: RESPONSE_INIT, useValue: responseInit }
+        { provide: RESPONSE_INIT, useValue: responseInit },
-      ]
+      ],
     });
 
     const service = TestBed.inject(TenantService);
@@ -122,7 +126,9 @@ describe('TenantService', () => {
     const httpController = TestBed.inject(HttpTestingController);
 
     const bootstrapPromise = service.bootstrap();
-    const request = httpController.expectOne(`${environment.url}tenants/bootstrap/store.example.com`);
+    const request = httpController.expectOne(
+      `${environment.url}tenants/bootstrap?dominio=store.example.com&path=/render`,
+    );
 
     request.flush(tenantResponse);
 
@@ -131,7 +137,7 @@ describe('TenantService', () => {
     expect(service.tenant()).toEqual(tenant);
     expect(transferState.get(TENANT_SSR_STATE_KEY, null)).toEqual({
       status: 'ready',
-      tenant
+      tenant,
     });
     expect(responseInit.status).toBeUndefined();
 
@@ -151,12 +157,12 @@ describe('TenantService', () => {
           provide: REQUEST,
           useValue: new Request('https://internal.example/render', {
             headers: {
-              host: 'missing.example.com:8443'
+              host: 'missing.example.com:8443',
-            }
+            },
-          })
+          }),
         },
-        { provide: RESPONSE_INIT, useValue: responseInit }
+        { provide: RESPONSE_INIT, useValue: responseInit },
-      ]
+      ],
     });
 
     const service = TestBed.inject(TenantService);
@@ -164,7 +170,9 @@ describe('TenantService', () => {
     const httpController = TestBed.inject(HttpTestingController);
 
     const bootstrapPromise = service.bootstrap();
-    const request = httpController.expectOne(`${environment.url}tenants/bootstrap/missing.example.com`);
+    const request = httpController.expectOne(
+      `${environment.url}tenants/bootstrap?dominio=missing.example.com&path=/render`,
+    );
 
     request.flush({ message: 'Not Found' }, { status: 404, statusText: 'Not Found' });
 
@@ -173,7 +181,7 @@ describe('TenantService', () => {
     expect(service.tenant()).toBeNull();
     expect(service.getTenant()).toBeNull();
     expect(transferState.get(TENANT_SSR_STATE_KEY, null)).toEqual({
-      status: 'not-found'
+      status: 'not-found',
     });
     expect(responseInit.status).toBe(404);
 
@@ -182,14 +190,16 @@ describe('TenantService', () => {
 
   it('rejects when the bootstrap response does not contain tenant data', async () => {
     TestBed.configureTestingModule({
-      providers: [provideHttpClient(), provideHttpClientTesting(), TenantService]
+      providers: [provideHttpClient(), provideHttpClientTesting(), TenantService],
     });
 
     const service = TestBed.inject(TenantService);
     const httpController = TestBed.inject(HttpTestingController);
 
     const bootstrapPromise = service.bootstrap();
-    const request = httpController.expectOne(`${environment.url}tenants/bootstrap/localhost`);
+    const request = httpController.expectOne(
+      `${environment.url}tenants/bootstrap?dominio=localhost&path=/`,
+    );
 
     request.flush({});
 
@@ -213,19 +223,21 @@ describe('TenantService', () => {
           provide: REQUEST,
           useValue: new Request('https://internal.example/render', {
             headers: {
-              host: 'broken.example.com'
+              host: 'broken.example.com',
-            }
+            },
-          })
+          }),
         },
-        { provide: RESPONSE_INIT, useValue: responseInit }
+        { provide: RESPONSE_INIT, useValue: responseInit },
-      ]
+      ],
     });
 
     const service = TestBed.inject(TenantService);
     const httpController = TestBed.inject(HttpTestingController);
 
     const bootstrapPromise = service.bootstrap();
-    const request = httpController.expectOne(`${environment.url}tenants/bootstrap/broken.example.com`);
+    const request = httpController.expectOne(
+      `${environment.url}tenants/bootstrap?dominio=broken.example.com&path=/render`,
+    );
 
     request.flush({ message: 'Boom' }, { status: 500, statusText: 'Server Error' });
 
@@ -235,4 +247,39 @@ describe('TenantService', () => {
 
     httpController.verify();
   });
+
+  it('rejects and cancels a tenant bootstrap request that exceeds the configured timeout', async () => {
+    vi.useFakeTimers();
+
+    try {
+      TestBed.configureTestingModule({
+        providers: [
+          provideHttpClient(),
+          provideHttpClientTesting(),
+          TenantService,
+          { provide: BOOTSTRAP_REQUEST_TIMEOUT_MS, useValue: 25 },
+        ],
+      });
+
+      const service = TestBed.inject(TenantService);
+      const httpController = TestBed.inject(HttpTestingController);
+
+      const bootstrapPromise = service.bootstrap();
+      const rejection = expect(bootstrapPromise).rejects.toBeInstanceOf(TimeoutError);
+      const request = httpController.expectOne(
+        `${environment.url}tenants/bootstrap?dominio=localhost&path=/`,
+      );
+
+      await vi.advanceTimersByTimeAsync(25);
+      await rejection;
+
+      expect(request.cancelled).toBe(true);
+      expect(service.status()).toBe('idle');
+      expect(service.tenant()).toBeNull();
+
+      httpController.verify();
+    } finally {
+      vi.useRealTimers();
+    }
+  });
 });

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

@@ -7,22 +7,23 @@ import {
   REQUEST,
   RESPONSE_INIT,
   signal,
-  TransferState
+  TransferState,
 } from '@angular/core';
 import { IS_DISCOVERING_ROUTES } from '@angular/ssr';
-import { firstValueFrom } from 'rxjs';
+import { firstValueFrom, timeout } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
 import { BaseApiService } from './base-api.service';
+import { BOOTSTRAP_REQUEST_TIMEOUT_MS } from './bootstrap-request-timeout';
 import { Tenant, TenantBootstrapResponse } from './tenant.interface';
 import {
   TENANT_SSR_STATE_KEY,
   TenantBootstrapStatus,
-  TenantSsrState
+  TenantSsrState,
 } from './tenant-ssr-cache.store';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class TenantService extends BaseApiService {
   private readonly platformId = inject(PLATFORM_ID);
@@ -30,6 +31,7 @@ export class TenantService extends BaseApiService {
   private readonly responseInit = inject(RESPONSE_INIT, { optional: true });
   private readonly transferState = inject(TransferState);
   private readonly isDiscoveringRoutes = inject(IS_DISCOVERING_ROUTES, { optional: true }) ?? false;
+  private readonly bootstrapRequestTimeoutMs = inject(BOOTSTRAP_REQUEST_TIMEOUT_MS);
   private readonly tenantState = signal<Tenant | null>(null);
   private readonly statusState = signal<TenantBootstrapStatus>('idle');
 
@@ -48,7 +50,6 @@ export class TenantService extends BaseApiService {
     return `${environment.url}tenants/${tenant.codigo}`;
   }
 
-
   async bootstrap(): Promise<void> {
     if (this.statusState() !== 'idle') {
       return;
@@ -69,13 +70,18 @@ export class TenantService extends BaseApiService {
       return;
     }
 
-    const domain = this.resolveDomain();
+    const { domain, path } = this.resolveRequestContext();
 
     try {
       const response = await firstValueFrom(
-        this.http.get<TenantBootstrapResponse>(
+        this.http
-          `${environment.url}tenants/bootstrap/${domain}`
+          .get<TenantBootstrapResponse>(`${environment.url}tenants/bootstrap`, {
-        )
+            params: {
+              dominio: domain,
+              path,
+            },
+          })
+          .pipe(timeout(this.bootstrapRequestTimeoutMs)),
       );
 
       if (!response?.data) {
@@ -85,7 +91,7 @@ export class TenantService extends BaseApiService {
       this.setReady(response.data);
       this.persistSsrState({
         status: 'ready',
-        tenant: response.data
+        tenant: response.data,
       });
     } catch (error) {
       if (this.isNotFoundError(error)) {
@@ -103,7 +109,7 @@ export class TenantService extends BaseApiService {
     }
   }
 
-  private resolveDomain(): string {
+  private resolveRequestContext(): { domain: string; path: string } {
     if (isPlatformBrowser(this.platformId)) {
       const domain = window.location.hostname;
 
@@ -111,7 +117,10 @@ export class TenantService extends BaseApiService {
         throw new Error('Tenant bootstrap could not resolve the current domain.');
       }
 
-      return this.normalizeHost(domain);
+      return {
+        domain: this.normalizeHost(domain),
+        path: this.normalizePath(window.location.pathname),
+      };
     }
 
     const requestHost =
@@ -123,7 +132,14 @@ export class TenantService extends BaseApiService {
       throw new Error('Tenant bootstrap could not resolve the current domain.');
     }
 
-    return this.normalizeHost(requestHost);
+    const forwardedPath =
+      this.request?.headers.get('x-forwarded-uri') ?? this.request?.headers.get('x-original-uri');
+    const requestPath = forwardedPath ?? (this.request ? new URL(this.request.url).pathname : '/');
+
+    return {
+      domain: this.normalizeHost(requestHost),
+      path: this.normalizePath(requestPath),
+    };
   }
 
   private normalizeHost(host: string): string {
@@ -145,6 +161,16 @@ export class TenantService extends BaseApiService {
     return normalizedHost.replace(/:\d+$/, '');
   }
 
+  private normalizePath(path: string): string {
+    const pathname = path.split(/[?#]/, 1)[0]?.trim() ?? '';
+
+    if (!pathname || pathname === '/') {
+      return '/';
+    }
+
+    return `/${pathname.replace(/^\/+|\/+$/g, '')}`;
+  }
+
   private applyState(state: TenantSsrState): void {
     if (state.status === 'ready') {
       this.setReady(state.tenant);

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

@@ -754,6 +754,29 @@
     </div>
   </section>
 
+  <section
+    class="component-demo component-demo--ticket-selector card shadow-sm mt-4"
+    data-testid="ticket-selector-demo"
+  >
+    <div class="card-body">
+      <span class="eyebrow">Reusable Component</span>
+      <h2 class="mb-2">Selector de entradas (Ticket Selector Layout)</h2>
+      <p class="text-muted mb-4">
+        Demo de selección encadenada por tipo, sector, fila y asiento. Las combinaciones sin stock
+        no aparecen como disponibles.
+      </p>
+
+      <app-product-ticket-selector
+        [productId]="1"
+        [title]="testTicketSelectorProduct.title"
+        [description]="testTicketSelectorProduct.description"
+        [price]="testTicketSelectorProduct.price"
+        [imageUrl]="testTicketSelectorProduct.imageUrl"
+        (buy)="onTicketBuy($event)"
+      />
+    </div>
+  </section>
+
   <app-store-section title="PRODUCTOS" class="component-demo store-section-demo mt-5">
     <div class="row">
       @for (product of testProducts; track product.title) {

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

@@ -15,6 +15,10 @@
   border: 0;
 }
 
+.component-demo--ticket-selector {
+  width: min(100%, 76rem);
+}
+
 .store-section-demo {
   width: min(100%, 64rem);
 }
@@ -77,7 +81,7 @@ h1 {
 
 .modal-showcase__result {
   padding: 0.875rem 1rem;
-  border: 1px dashed rgba(32, 32, 32, 0.14);
+  border: 1px dashed var(--border-color);
   border-radius: 0.875rem;
   background: linear-gradient(180deg, rgba(248, 248, 248, 0.92), rgba(255, 255, 255, 0.98));
   color: #495057;
@@ -231,7 +235,7 @@ h1 {
       justify-content: center;
       height: 120px;
       border-radius: 8px;
-      border: 1px solid #dee2e6;
+      border: 1px solid var(--border-color);
       padding: 1rem;
       overflow: hidden;
       box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
@@ -281,7 +285,7 @@ h1 {
     display: flex;
     flex-direction: column;
     border-radius: 8px;
-    border: 1px solid #dee2e6;
+    border: 1px solid var(--border-color);
     overflow: hidden;
     background-color: #ffffff;
     transition:
@@ -296,7 +300,7 @@ h1 {
     &__preview {
       height: 80px;
       width: 100%;
-      border-bottom: 1px solid #dee2e6;
+      border-bottom: 1px solid var(--border-color);
       transition: opacity 0.2s ease;
 
       &:hover {
@@ -337,7 +341,7 @@ h1 {
     background-color: #eaeaea;
     padding: 1.5rem;
     border-radius: 8px;
-    border: 1px solid #dee2e6;
+    border: 1px solid var(--border-color);
   }
 
   &__row {

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

@@ -7,11 +7,13 @@ import { InputComponent } from '../../../../shared/components/input/input.compon
 import { PaginatorComponent } from '../../../../shared/components/paginator/paginator.component';
 import { ProductColumnWithImageComponent } from '../../../../shared/components/product-column-with-image/product-column-with-image.component';
 import { ProductRowCardComponent } from '../../../../shared/components/product-row-card/product-row-card.component';
+import { ProductTicketSelectorComponent } from '../../../../shared/components/product-ticket-selector/product-ticket-selector.component';
 import { ProductVerticalWithCartCardComponent } from '../../../../shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component';
 import { StoreSectionComponent } from '../../../../shared/components/store-section/store-section.component';
 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';
@@ -32,6 +34,11 @@ interface CarouselProductMock {
   imageUrl: string;
 }
 
+const ticketOption = (value: string, label: string = value): { value: string; label: string } => ({
+  value,
+  label,
+});
+
 @Component({
   selector: 'app-reutilizables-test-page',
   imports: [
@@ -41,6 +48,7 @@ interface CarouselProductMock {
     PaginatorComponent,
     ProductColumnWithImageComponent,
     ProductRowCardComponent,
+    ProductTicketSelectorComponent,
     ProductVerticalWithCartCardComponent,
     StoreSectionComponent,
     IconButtonComponent,
@@ -204,8 +212,9 @@ export class ReutilizablesTestPageComponent {
       'Acceso total al predio. No incluye acceso a estacionamiento. Niños menores de 5 años ingresan gratis.',
     price: 10000,
     variants: [
-      { label: '10 de Octubre', value: '10-oct' },
+      { id: '10-oct-manana', values: { fecha: '10 de Octubre', turno: 'Mañana' } },
-      { label: '11 de Octubre', value: '11-oct' },
+      { id: '10-oct-tarde', values: { fecha: '10 de Octubre', turno: 'Tarde' } },
+      { id: '11-oct-tarde', values: { fecha: '11 de Octubre', turno: 'Tarde' } },
     ],
   };
 
@@ -215,6 +224,125 @@ export class ReutilizablesTestPageComponent {
     price: 11500,
   };
 
+  protected readonly testTicketSelectorProduct = {
+    title: 'ENTRADAS DESFILE PURA TENDENCIA',
+    description: '',
+    price: 40000,
+    imageUrl: '/images/ticket-selector-entrada-pasarela.png',
+    variants: [
+      {
+        id: 1001,
+        precio: 250000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
+          sector: ticketOption('a', 'Sector A'),
+          fila: ticketOption('1', 'Fila 1'),
+          asiento: ticketOption('1', 'Asiento 1'),
+        },
+      },
+      {
+        id: 1002,
+        precio: 250000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
+          sector: ticketOption('a', 'Sector A'),
+          fila: ticketOption('1', 'Fila 1'),
+          asiento: ticketOption('2', 'Asiento 2'),
+        },
+      },
+      {
+        id: 1003,
+        precio: 250000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
+          sector: ticketOption('c', 'Sector C'),
+          fila: ticketOption('1', 'Fila 1'),
+          asiento: ticketOption('1', 'Asiento 1'),
+        },
+      },
+      {
+        id: 1004,
+        precio: 200000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
+          sector: ticketOption('a', 'Sector A'),
+          fila: ticketOption('2', 'Fila 2'),
+          asiento: ticketOption('1', 'Asiento 1'),
+        },
+      },
+      {
+        id: 1005,
+        precio: 200000,
+        availability: createCatalogAvailability(0),
+        values: {
+          tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
+          sector: ticketOption('a', 'Sector A'),
+          fila: ticketOption('2', 'Fila 2'),
+          asiento: ticketOption('2', 'Asiento 2'),
+        },
+      },
+      {
+        id: 1006,
+        precio: 100000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('general', 'General'),
+          sector: ticketOption('b', 'Sector B'),
+          fila: ticketOption('3', 'Fila 3'),
+          asiento: ticketOption('1', 'Asiento 1'),
+        },
+      },
+      {
+        id: 1007,
+        precio: 100000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('general', 'General'),
+          sector: ticketOption('b', 'Sector B'),
+          fila: ticketOption('3', 'Fila 3'),
+          asiento: ticketOption('2', 'Asiento 2'),
+        },
+      },
+      {
+        id: 1008,
+        precio: 90000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('general', 'General'),
+          sector: ticketOption('d', 'Sector D'),
+          fila: ticketOption('3', 'Fila 3'),
+          asiento: ticketOption('1', 'Asiento 1'),
+        },
+      },
+      {
+        id: 1009,
+        precio: 65000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('general', 'General'),
+          sector: ticketOption('d', 'Sector D'),
+          fila: ticketOption('4', 'Fila 4'),
+          asiento: ticketOption('1', 'Asiento 1'),
+        },
+      },
+      {
+        id: 1010,
+        precio: 40000,
+        availability: createCatalogAvailability(1),
+        values: {
+          tipo: ticketOption('general', 'General'),
+          sector: ticketOption('d', 'Sector D'),
+          fila: ticketOption('5', 'Fila 5'),
+          asiento: ticketOption('1', 'Asiento 1'),
+        },
+      },
+    ],
+  };
+
   protected readonly cartMockItems: CartItemMock[] = [
     {
       imageUrl: null,
@@ -271,6 +399,12 @@ export class ReutilizablesTestPageComponent {
     alert(`Comprando: ${productTitle}`);
   }
 
+  protected onTicketBuy(variantIds: number[]): void {
+    this.toastService.success(
+      `Compra iniciada para ${variantIds.length} entrada/s: ${variantIds.join(', ')}.`,
+    );
+  }
+
   protected onFileChange(file: File | null): void {
     this.fileName = file?.name ?? '';
   }

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

@@ -1,5 +1,5 @@
 <div class="attribute-selector">
-  @for (attribute of attributes(); track attribute.id) {
+  @for (attribute of visibleAttributes(); track attribute.codigo) {
     <div class="attribute-selector__row">
       <span class="attribute-selector__label">{{ attribute.nombre }}:</span>
 
@@ -10,12 +10,14 @@
               type="button"
               class="attribute-selector__swatch"
               [class.attribute-selector__swatch--selected]="hasSelectedOption(attribute, option)"
-              [class.attribute-selector__swatch--disabled]="!availableOptions()[attribute.id][option.id]"
+              [class.attribute-selector__swatch--disabled]="
+                !availableOptions()[attribute.codigo][option.id]
+              "
               [style.background-color]="getOptionSwatchColor(option)"
               [attr.aria-label]="option.label"
               [attr.aria-pressed]="hasSelectedOption(attribute, option)"
               [title]="option.label"
-              [disabled]="!availableOptions()[attribute.id][option.id]"
+              [disabled]="disabled() || !availableOptions()[attribute.codigo][option.id]"
               (click)="selectAttributeOption(attribute, option)"
             >
               <span class="visually-hidden">{{ option.label }}</span>
@@ -24,10 +26,14 @@
             <button
               type="button"
               class="attribute-selector__text-option"
-              [class.attribute-selector__text-option--selected]="hasSelectedOption(attribute, option)"
+              [class.attribute-selector__text-option--selected]="
-              [class.attribute-selector__text-option--disabled]="!availableOptions()[attribute.id][option.id]"
+                hasSelectedOption(attribute, option)
+              "
+              [class.attribute-selector__text-option--disabled]="
+                !availableOptions()[attribute.codigo][option.id]
+              "
               [attr.aria-pressed]="hasSelectedOption(attribute, option)"
-              [disabled]="!availableOptions()[attribute.id][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.scss

@@ -54,7 +54,7 @@
   }
 
   &__text-option {
-    border: 1px solid #dcdcdc;
+    border: 1px solid var(--border-color);
     background: #ffffff;
     color: #666666;
     transition: border-color 0.2s ease, color 0.2s ease, background-color 0.2s ease;

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,
-        stock_tecnico: null,
+        availability: createCatalogAvailability(null),
         values: { size: 'S' },
       },
     ]);
@@ -51,12 +52,12 @@ describe('ProductAttributeSelectorComponent', () => {
     fixture.componentRef.setInput('variants', [
       {
         id: 1,
-        stock_tecnico: 0,
+        availability: createCatalogAvailability(0),
         values: { size: 'S' },
       },
       {
         id: 2,
-        stock_tecnico: 2,
+        availability: createCatalogAvailability(2),
         values: { size: 'M' },
       },
     ]);
@@ -68,4 +69,93 @@ describe('ProductAttributeSelectorComponent', () => {
     expect(buttons[0].disabled).toBe(true);
     expect(buttons[1].disabled).toBe(false);
   });
+
+  it('allows multiple event dates and emits the exact matching variant', () => {
+    const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
+    const emittedIds: Array<number | null> = [];
+    fixture.componentInstance.variantChange.subscribe((variant) =>
+      emittedIds.push(variant?.id ?? null),
+    );
+    fixture.componentRef.setInput('attributes', [
+      {
+        id: 2,
+        codigo: 'event_date',
+        nombre: 'Fecha',
+        is_required: true,
+        allow_multi_select: true,
+        metadata_schema: null,
+        type: 'event_date',
+        options: [
+          { id: 101, value: '1', label: '09/10/2026', sort_order: 0, metadata: null },
+          { id: 102, value: '2', label: '10/10/2026', sort_order: 1, metadata: null },
+        ],
+      } satisfies ProductAttribute,
+    ]);
+    fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
+    fixture.componentRef.setInput('variants', [
+      { id: 1, availability: createCatalogAvailability(null), values: { event_date: '1' } },
+      { id: 2, availability: createCatalogAvailability(null), values: { event_date: '2' } },
+      { id: 3, availability: createCatalogAvailability(null), values: { event_date: ['1', '2'] } },
+    ]);
+    fixture.detectChanges();
+
+    const buttons = Array.from(
+      fixture.nativeElement.querySelectorAll('.attribute-selector__text-option'),
+    ) as HTMLButtonElement[];
+    buttons[0].click();
+    fixture.detectChanges();
+    buttons[1].click();
+    fixture.detectChanges();
+
+    expect(buttons[0].getAttribute('aria-pressed')).toBe('true');
+    expect(buttons[1].getAttribute('aria-pressed')).toBe('true');
+    expect(emittedIds).toContain(3);
+  });
+
+  it('hides configured attributes and matches variants using only visible selections', () => {
+    const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
+    const emittedIds: Array<number | null> = [];
+    fixture.componentInstance.variantChange.subscribe((variant) =>
+      emittedIds.push(variant?.id ?? null),
+    );
+    fixture.componentRef.setInput('attributes', [
+      sizeAttribute,
+      {
+        id: 2,
+        codigo: 'internal_type',
+        nombre: 'Internal type',
+        is_required: true,
+        show_in_selector: false,
+        metadata_schema: null,
+        type: 'select',
+        options: [
+          { id: 30, value: 'adult', label: 'Adult', sort_order: 0, metadata: null },
+          { id: 40, value: 'child', label: 'Child', sort_order: 1, metadata: null },
+        ],
+      } satisfies ProductAttribute,
+    ]);
+    fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
+    fixture.componentRef.setInput('variants', [
+      {
+        id: 1,
+        availability: createCatalogAvailability(null),
+        values: { size: 'S', internal_type: 'adult' },
+      },
+      {
+        id: 2,
+        availability: createCatalogAvailability(null),
+        values: { size: 'M', internal_type: 'child' },
+      },
+    ]);
+    fixture.detectChanges();
+
+    const labels = fixture.nativeElement.querySelectorAll('.attribute-selector__label');
+    const buttons = fixture.nativeElement.querySelectorAll('.attribute-selector__text-option');
+
+    expect(labels).toHaveLength(1);
+    expect(labels[0].textContent).toContain('Size');
+    buttons[1].click();
+    fixture.detectChanges();
+    expect(emittedIds).toContain(2);
+  });
 });

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,51 +30,66 @@ 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>();
 
-  protected readonly selectedAttributeOptions = signal<Record<number, number>>({});
+  protected readonly visibleAttributes = computed(() =>
+    this.attributes().filter((attribute) => attribute.show_in_selector !== false),
+  );
+
+  protected readonly selectedAttributeOptions = signal<Record<string, number[]>>({});
 
   protected readonly availableOptions = computed(() => {
     const selections = this.selectedAttributeOptions();
     const variants = this.variants();
-    const attributes = this.attributes();
+    const attributes = this.visibleAttributes();
 
-    const availability: Record<number, Record<number, boolean>> = {};
+    const availability: Record<string, Record<number, boolean>> = {};
 
     for (const attribute of attributes) {
-      availability[attribute.id] = {};
+      availability[attribute.codigo] = {};
       for (const option of attribute.options) {
         const optionNormalized = this.normalizeText(option.value || option.label);
+        const selectedForAttribute = selections[attribute.codigo] ?? [];
 
         const isAvailable = variants.some((variant) => {
           if (!this.isVariantAvailable(variant)) return false;
 
-          const variantAttrValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
+          const variantAttrValues = this.getVariantAttributeValues(attribute, variant.values);
-          if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) {
+          const desiredOptionIds = attribute.allow_multi_select
+            ? selectedForAttribute.includes(option.id)
+              ? selectedForAttribute
+              : [...selectedForAttribute, option.id]
+            : [option.id];
+          const desiredValues = desiredOptionIds
+            .map((id) => attribute.options.find((candidate) => candidate.id === id))
+            .filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
+            .map((candidate) => this.normalizeText(candidate.value || candidate.label));
+
+          if (
+            !variantAttrValues.includes(optionNormalized) ||
+            !desiredValues.every((value) => variantAttrValues.includes(value))
+          ) {
             return false;
           }
 
           for (const otherAttr of attributes) {
-            if (otherAttr.id === attribute.id) continue;
+            if (otherAttr.codigo === attribute.codigo) continue;
-            const selectedOptionId = selections[otherAttr.id];
+            const selectedOptionIds = selections[otherAttr.codigo] ?? [];
-            if (selectedOptionId !== undefined) {
+            const selectedValues = selectedOptionIds
-              const selectedOption = otherAttr.options.find((o) => o.id === selectedOptionId);
+              .map((id) => otherAttr.options.find((candidate) => candidate.id === id))
-              if (selectedOption) {
+              .filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
-                const selectedNormalized = this.normalizeText(
+              .map((candidate) => this.normalizeText(candidate.value || candidate.label));
-                  selectedOption.value || selectedOption.label,
+            const variantValues = this.getVariantAttributeValues(otherAttr, variant.values);
-                );
+            if (!selectedValues.every((value) => variantValues.includes(value))) {
-                const vAttrValue = this.getDefaultVariantAttributeValue(otherAttr, variant.values);
+              return false;
-                if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) {
-                  return false;
-                }
-              }
             }
           }
           return true;
         });
 
-        availability[attribute.id][option.id] = isAvailable;
+        availability[attribute.codigo][option.id] = isAvailable;
       }
     }
 
@@ -86,7 +102,7 @@ export class ProductAttributeSelectorComponent {
 
   constructor() {
     effect(() => {
-      const attributes = this.attributes();
+      const attributes = this.visibleAttributes();
       const defaultVariant = this.selectedVariant();
 
       untracked(() => {
@@ -97,7 +113,7 @@ export class ProductAttributeSelectorComponent {
     effect(() => {
       const selections = this.selectedAttributeOptions();
       const variants = this.variants();
-      const attributes = this.attributes();
+      const attributes = this.visibleAttributes();
 
       untracked(() => {
         this.emitMatchingVariant(selections, variants, attributes);
@@ -109,17 +125,30 @@ export class ProductAttributeSelectorComponent {
     attribute: ProductAttribute,
     option: ProductAttributeOption,
   ): boolean {
-    return this.selectedAttributeOptions()[attribute.id] === option.id;
+    return (this.selectedAttributeOptions()[attribute.codigo] ?? []).includes(option.id);
   }
 
   protected selectAttributeOption(
     attribute: ProductAttribute,
     option: ProductAttributeOption,
   ): void {
-    this.selectedAttributeOptions.update((current) => ({
+    if (this.disabled()) return;
-      ...current,
+
-      [attribute.id]: option.id,
+    this.selectedAttributeOptions.update((current) => {
-    }));
+      const selected = current[attribute.codigo] ?? [];
+      const isMultiple = attribute.allow_multi_select ?? false;
+      let next: number[];
+
+      if (!isMultiple) {
+        next = [option.id];
+      } else if (selected.includes(option.id)) {
+        next = selected.filter((id) => id !== option.id);
+      } else {
+        next = [...selected, option.id];
+      }
+
+      return { ...current, [attribute.codigo]: next };
+    });
   }
 
   protected isColorOption(option: ProductAttributeOption): boolean {
@@ -134,51 +163,52 @@ export class ProductAttributeSelectorComponent {
     attributes: ProductAttribute[],
     defaultVariant: CatalogItemVariant | null,
   ): void {
-    const selections: Record<number, number> = {};
+    const selections: Record<string, number[]> = {};
 
     for (const attribute of attributes) {
-      const optionId = this.findDefaultOptionId(attribute, defaultVariant);
+      const optionIds = this.findDefaultOptionIds(attribute, defaultVariant);
-      if (optionId !== null) {
+      if (optionIds.length > 0) {
-        selections[attribute.id] = optionId;
+        selections[attribute.codigo] = optionIds;
       }
     }
 
     this.selectedAttributeOptions.set(selections);
   }
 
-  private findDefaultOptionId(
+  private findDefaultOptionIds(
     attribute: ProductAttribute,
     variant: CatalogItemVariant | null,
-  ): number | null {
+  ): number[] {
     if (!variant) {
-      return null;
+      return [];
     }
 
-    const defaultValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
+    const defaultValues =
-    if (!defaultValue) {
+      attribute.type === 'event_date'
-      return null;
+        ? (
+            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 [];
     }
 
-    const normalizedValue = this.normalizeText(defaultValue);
+    return attribute.options
-    const matchByValue = attribute.options.find(
+      .filter(
-      (option) => this.normalizeText(option.value) === normalizedValue,
+        (option) =>
-    );
+          defaultValues.includes(this.normalizeText(option.value)) ||
-
+          defaultValues.includes(this.normalizeText(option.label)),
-    if (matchByValue) {
+      )
-      return matchByValue.id;
+      .map((option) => option.id);
-    }
-
-    const matchByLabel = attribute.options.find(
-      (option) => this.normalizeText(option.label) === normalizedValue,
-    );
-
-    return matchByLabel?.id ?? null;
   }
 
-  private getDefaultVariantAttributeValue(
+  private getVariantAttributeValues(
     attribute: ProductAttribute,
-    variantAttributes: Record<string, string>,
+    variantAttributes: Record<string, string | string[]>,
-  ): string | null {
+  ): string[] {
     const normalizedCodigo = this.normalizeText(attribute.codigo);
     const normalizedNombre = this.normalizeText(attribute.nombre);
 
@@ -186,11 +216,22 @@ export class ProductAttributeSelectorComponent {
       const normalizedKey = this.normalizeText(key);
 
       if (normalizedKey === normalizedCodigo || normalizedKey === normalizedNombre) {
-        return value;
+        return (Array.isArray(value) ? value : [value]).map((item) => this.normalizeText(item));
       }
     }
 
-    return null;
+    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 [];
   }
 
   private normalizeText(value: string | null | undefined): string {
@@ -202,7 +243,7 @@ export class ProductAttributeSelectorComponent {
   }
 
   private isVariantAvailable(variant: CatalogItemVariant): boolean {
-    return this.inventoryPolicy() === 'unlimited' || (variant.stock_tecnico ?? 0) > 0;
+    return allowsCatalogAction(variant.availability, 'select_variant');
   }
 
   private findFirstHexValue(value: unknown): string | null {
@@ -234,7 +275,7 @@ export class ProductAttributeSelectorComponent {
   }
 
   private emitMatchingVariant(
-    selections: Record<number, number>,
+    selections: Record<string, number[]>,
     variants: CatalogItemVariant[],
     attributes: ProductAttribute[],
   ): void {
@@ -243,18 +284,22 @@ export class ProductAttributeSelectorComponent {
       return;
     }
 
-    const selectedValuesById: Record<number, string> = {};
+    const selectedValuesByCode: Record<string, string[]> = {};
     let allSelected = true;
     for (const attr of attributes) {
-      const selectedOptionId = selections[attr.id];
+      const selectedOptionIds = selections[attr.codigo] ?? [];
-      if (selectedOptionId === undefined) {
+      if (
+        selectedOptionIds.length === 0 ||
+        (!attr.allow_multi_select && selectedOptionIds.length !== 1)
+      ) {
         allSelected = false;
         break;
       }
-      const option = attr.options.find((o) => o.id === selectedOptionId);
+      selectedValuesByCode[attr.codigo] = selectedOptionIds
-      if (option) {
+        .map((id) => attr.options.find((option) => option.id === id))
-        selectedValuesById[attr.id] = this.normalizeText(option.value || option.label);
+        .filter((option): option is ProductAttributeOption => option !== undefined)
-      }
+        .map((option) => this.normalizeText(option.value || option.label))
+        .sort();
     }
 
     if (!allSelected) {
@@ -264,10 +309,12 @@ export class ProductAttributeSelectorComponent {
 
     const matchingVariant = variants.find((variant) => {
       return attributes.every((attr) => {
-        const selectedValue = selectedValuesById[attr.id];
+        const selectedValues = selectedValuesByCode[attr.codigo];
-        const variantValue = this.getDefaultVariantAttributeValue(attr, variant.values);
+        const variantValues = this.getVariantAttributeValues(attr, variant.values).sort();
-        if (!variantValue) return false;
+        return (
-        return this.normalizeText(variantValue) === selectedValue;
+          selectedValues.length === variantValues.length &&
+          selectedValues.every((value, index) => value === variantValues[index])
+        );
       });
     });
 

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

@@ -1,6 +1,6 @@
 :host {
   display: block;
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-color);
 }
 
 :host(:last-child) {
@@ -24,7 +24,7 @@
   aspect-ratio: 4 / 3;
   border-radius: 5px 0 0 5px;
   background-color: #ffffff;
-  border: 1px solid #eaeaea;
+  border: 1px solid var(--border-color);
   overflow: hidden;
 
   img {

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">
+  <div class="purchase-info">
-        <span class="purchase-id">Compra {{ purchase.id }}.</span>
+    <span class="purchase-id">Compra {{ purchase.id }}.</span>
-        <span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
+    <span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
-      </div>
+  </div>
-      <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">
+  @if (purchase.statusMessage) {
-          <path d="M1 1L7 7L1 13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <span class="purchase-status">{{ purchase.statusMessage }}</span>
-        </svg>
+  }
-      </div>
+
-    </div>
+  <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"
+    >
+      <path
+        d="M1 1L7 7L1 13"
+        stroke="currentColor"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+    </svg>
+  </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;
-  padding:  16px;
+  gap: 16px;
-  padding-left:0;
+  padding: 16px;
-  transition: box-shadow 0.2s, border-radius 0.2s;
+  padding-left: 0;
+  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-info">
-            <div class="skeleton-id"></div>
+          <div class="skeleton-id"></div>
-            <div class="skeleton-date"></div>
+          <div class="skeleton-date"></div>
-          </div>
-          <div class="skeleton-action"></div>
         </div>
-      </ng-container>
+        <div class="skeleton-action"></div>
+      </div>
+    }
+  } @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%;
 }
 
@@ -23,7 +28,7 @@
   justify-content: space-between;
   align-items: center;
   padding: 1rem 0;
-  border-bottom: 1px solid #DDDDDD;
+  border-bottom: 1px solid var(--border-color);
 }
 
 .skeleton-item:last-child {
@@ -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> {
+    await this.loadPurchases();
+  }
+
+  protected async onPageChange(page: number): Promise<void> {
+    await this.loadPurchases(page);
+  }
+
+  private async loadPurchases(page = 1): Promise<void> {
+    this.isLoading.set(true);
+
     try {
-      const tenantCode = this.tenantService.tenant()?.codigo || '';
-      
       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/account-page/pages/tickets-page/components/ticket/ticket.component.scss

@@ -74,6 +74,7 @@
 
 .ticket__actions {
   display: flex;
+  grid-column: 4;
   align-items: center;
   gap: 8px;
 }
@@ -91,6 +92,10 @@
   color: #8a8a8a;
 }
 
+.ticket--disabled .ticket__actions {
+  grid-column: 3;
+}
+
 :host ::ng-deep .ticket--disabled button.ticket__qr-button:disabled {
   --bs-btn-disabled-bg: #8a8a8a;
   --bs-btn-disabled-border-color: #8a8a8a;

src/app/features/store/pages/account-page/pages/tickets-page/tickets-page.scss

@@ -27,7 +27,7 @@
 .tickets-list__generating-spinner {
   width: 24px;
   height: 24px;
-  border: 3px solid #dce8e0;
+  border: 3px solid var(--border-color);
   border-top-color: var(--tenant-primary, #009933);
   border-radius: 50%;
   animation: tickets-spinner 0.75s linear infinite;
@@ -39,7 +39,7 @@
   align-items: center;
   justify-content: space-between;
   padding-bottom: 12px;
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-color);
 }
 
 .tickets-list__header--inactive {
@@ -89,7 +89,7 @@
 }
 
 .tickets-list app-ticket {
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-color);
 }
 
 .tickets-list__empty {
@@ -104,7 +104,7 @@
   align-items: center;
   justify-content: space-between;
   padding-bottom: 12px;
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-color);
 }
 
 .tickets-list__skeleton-selection,
@@ -130,7 +130,7 @@
   align-items: center;
   gap: 16px;
   padding: 16px 0;
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-color);
 }
 
 .tickets-list__skeleton-check,

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

@@ -17,6 +17,7 @@
         [layout]="categoryResults.layout"
         [groupLayout]="paginatedLayout"
         [items]="categoryResults"
+        [savingProductIds]="savingProductIds()"
         (buy)="onBuyProduct($event)"
         (addToCart)="onAddToCart($event)"
         (pageChange)="onPageChange($event)"

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

@@ -9,7 +9,17 @@ import {
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
-import { catchError, combineLatest, distinctUntilChanged, map, of, switchMap, tap } from 'rxjs';
+import {
+  catchError,
+  combineLatest,
+  distinctUntilChanged,
+  finalize,
+  map,
+  of,
+  startWith,
+  switchMap,
+  tap,
+} from 'rxjs';
 
 import { AuthService } from '../../../../core/services/auth/auth.service';
 import { CartService } from '../../../../core/services/cart/cart.service';
@@ -19,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 {
@@ -41,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);
@@ -52,25 +64,33 @@ export class CategoryItemsPageComponent {
   protected readonly results = signal<CategoryItemsResponse | null>(null);
   protected readonly error = signal<string | null>(null);
   protected readonly creatingDirectPurchase = signal(false);
+  protected readonly savingProductIds = signal<ReadonlySet<number>>(new Set<number>());
   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(
-        map(
+        ([params, queryParams]): CategoryRouteState => ({
-          ([params, queryParams]): CategoryRouteState => ({
+          categoryId: this.parsePositiveInteger(params.get('id')),
-            categoryId: this.parsePositiveInteger(params.get('id')),
+          page: this.parsePositiveInteger(queryParams.get('page'), 1),
-            page: this.parsePositiveInteger(queryParams.get('page'), 1),
-          }),
-        ),
-        distinctUntilChanged(
-          (previous, current) =>
-            previous.categoryId === current.categoryId && previous.page === current.page,
-        ),
-        tap(() => {
-          this.results.set(null);
-          this.error.set(null);
         }),
+      ),
+      distinctUntilChanged(
+        (previous, current) =>
+          previous.categoryId === current.categoryId && previous.page === current.page,
+      ),
+      tap(() => {
+        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.');
@@ -113,7 +133,9 @@ export class CategoryItemsPageComponent {
 
     if (!this.injector.get(AuthService).user()) {
       await this.router.navigate(['/login'], {
-        queryParams: { returnUrl: `/producto/${event.product.id}` },
+        queryParams: {
+          returnUrl: event.reservedInCart ? this.router.url : `/producto/${event.product.id}`,
+        },
       });
       return;
     }
@@ -126,13 +148,25 @@ export class CategoryItemsPageComponent {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
+      const reservedCartId = event.reservedInCart ? (this.cartService.cart()?.id ?? null) : null;
-        direct_item: {
+      if (event.reservedInCart && reservedCartId === null) {
-          catalog_item_id: event.product.id,
+        this.toastService.danger('No se pudo identificar el carrito reservado.');
-          variant_id: event.variant ?? null,
+        return;
-          cantidad: event.quantity,
+      }
-        },
+      const purchase = await this.injector.get(CheckoutService).startCheckout(
-      });
+        tenant.codigo,
+        reservedCartId !== null
+          ? { cart_id: reservedCartId }
+          : {
+              direct_items: [
+                {
+                  catalog_item_id: event.product.id,
+                  variant_id: event.variant ?? null,
+                  cantidad: event.quantity,
+                },
+              ],
+            },
+      );
       await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
     } catch (error) {
       console.error('Failed to create direct purchase:', error);
@@ -143,14 +177,31 @@ export class CategoryItemsPageComponent {
   }
 
   protected onAddToCart(event: ProductListCartEvent): void {
-    this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).subscribe({
+    const productId = event.product.id;
-      next: (response) => {
+    if (this.savingProductIds().has(productId)) {
-        this.toastService.success(response.message || 'Producto agregado al carrito');
+      return;
-      },
+    }
-      error: (error: HttpErrorResponse) => {
+
-        const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
+    this.setProductSaving(productId, true);
-        this.toastService.danger(message);
+    this.cartService
-      },
+      .addItem(productId, event.variant ?? null, event.quantity)
+      .pipe(finalize(() => this.setProductSaving(productId, false)))
+      .subscribe({
+        next: (response) => {
+          this.toastService.success(response.message || 'Producto agregado al carrito');
+        },
+        error: (error: HttpErrorResponse) => {
+          const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
+          this.toastService.danger(message);
+        },
+      });
+  }
+
+  private setProductSaving(productId: number, saving: boolean): void {
+    this.savingProductIds.update((current) => {
+      const updated = new Set(current);
+      saving ? updated.add(productId) : updated.delete(productId);
+      return updated;
     });
   }
 

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,16 +52,13 @@
         [subtotal]="cartSubtotal()"
         [discount]="cartDiscount()"
         [total]="cartTotal()"
-        [allowEditing]="
+        [readonly]="true"
-          createdPurchase()?.status === 'created' || createdPurchase()?.status === 'pending_payment'
+        [allowModify]="true"
-        "
+        [showModifyWhenReadonly]="true"
-        [allowRemove]="false"
+        [modifyAsAction]="true"
-        [persistQuantityChanges]="false"
+        [editingDisabled]="isPurchaseModificationDisabled()"
-        [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 {
@@ -64,7 +42,7 @@
 .checkout-page__spinner {
   width: 3rem;
   height: 3rem;
-  border: 0.25rem solid rgba(32, 32, 32, 0.08);
+  border: 0.25rem solid var(--border-color);
   border-top-color: var(--tenant-primary);
   border-radius: 50%;
   animation: checkout-page-spin 0.8s linear infinite;

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,33 +7,40 @@ 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';
 
 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>;
-    getPurchase: 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;
+      checkout_editing_policy?: CartEditingPolicy;
+    }>
+  >;
 
   beforeAll(() => {
     try {
@@ -53,50 +61,44 @@ 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' },
       }),
-      getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
       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',
+      checkout_editing_policy: {
+        code: 'full',
+        allow_modify: true,
+        allow_delete: true,
+        allow_update_quantity: true,
+        allow_update_variant: true,
+      },
+    });
 
     await TestBed.configureTestingModule({
       imports: [CheckoutPageComponent],
       providers: [
         { provide: CheckoutService, useValue: checkoutServiceStub },
         { provide: CatalogService, useValue: { getCatalogItem: vi.fn() } },
-        { provide: CartService, useValue: cartServiceStub },
+        { provide: TenantService, useValue: { tenant: tenantState } },
-        { provide: TenantService, useValue: { tenant: signal({ codigo: 'tenant-test' }) } },
         { provide: AuthService, useValue: { user: authUserState } },
+        { provide: GlobalLoadingService, useValue: globalLoadingServiceStub },
+        { provide: ToastService, useValue: toastServiceStub },
+        { provide: CartService, useValue: cartServiceStub },
         {
           provide: ActivatedRoute,
           useValue: {
@@ -142,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);
   });
@@ -194,21 +195,46 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
   });
 
-  it('checks a transfer once and redirects to purchase status while pending', 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).toHaveBeenCalledTimes(1);
+    expect(component.transferValidationStatus()).toBe('checking');
-    expect(component.transferValidationStatus()).toBe('pending');
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
+    expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
-    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
 
-    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(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
+
+    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 () => {
@@ -217,23 +243,47 @@ describe('CheckoutPageComponent payment validation', () => {
     component.selectedPaymentMethod.set('transfer');
 
     await component.onComplete();
+    await vi.advanceTimersByTimeAsync(3_000);
 
-    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
+    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(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');
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
+  });
-    expect(routerStub.navigate).not.toHaveBeenCalled();
+
+  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 () => {
@@ -366,16 +416,12 @@ describe('CheckoutPageComponent payment validation', () => {
 
     expect(component.checkoutStepIndex()).toBe(1);
     expect(component.selectedPaymentMethod()).toBe('qr');
-    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith(
+    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith('tenant-test', 25, 'qr');
-      'tenant-test',
-      25,
-      'qr',
-    );
     expect(component.qrData()).toBe('qr-value');
     expect(component.qrPaymentStatus()).toBe('waiting');
   });
 
-  it.each(['in_review', 'paid', 'cancelled', 'rejected', 'expired'])(
+  it.each(['paid', 'cancelled', 'rejected', 'expired'])(
     'redirects a %s purchase to its status page',
     async (status) => {
       routeQueryParamMap = convertToParamMap({ purchase: 25 });
@@ -395,62 +441,92 @@ describe('CheckoutPageComponent payment validation', () => {
     },
   );
 
-  it('updates a purchase item while editing and refreshes checkout totals', async () => {
+  it('redirects a submitted pending payment purchase to its status page', async () => {
-    const updatedPurchase = {
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockResolvedValue({
       id: 25,
-      items: [],
+      status: 'pending_payment',
-      subtotal: '300.00',
+      payment_method: 'transfer',
-      total: '300.00',
+      expires_at: null,
-    };
+      transfer_payer_dni: null,
-    checkoutServiceStub.updateItemQuantity.mockResolvedValue(updatedPurchase);
-    const { component } = createComponent();
-    component.isEditingItems.set(true);
-
-    await component.onPurchaseItemQuantityChange({
-      item: {
-        cartItemId: 91,
-        imageUrl: null,
-        product: 'Remera',
-        originalPrice: null,
-        discountedPrice: 100,
-        discountPercentage: null,
-        attributes: [],
-        quantity: 2,
-      },
-      quantity: 3,
-    });
-
-    expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith('tenant-test', 25, 91, 3);
-    expect(component.createdPurchase()).toBe(updatedPurchase);
-    expect(component.isUpdatingItem()).toBe(false);
-  });
-
-  it('keeps the payment step selected while editing and regenerates payment afterward', async () => {
-    const editablePurchase = {
-      id: 25,
-      status: 'created',
       items: [],
       subtotal: '100.00',
       total: '100.00',
-    };
+    });
-    checkoutServiceStub.prepareItemEditing.mockResolvedValue(editablePurchase);
+
+    createComponent();
+    await Promise.resolve();
+
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
+  });
+
+  it('shows the API error in a toast when cancelling the purchase fails', async () => {
+    const message = 'La compra venció. Iniciá una nueva compra.';
+    checkoutServiceStub.cancelPurchase.mockRejectedValue({
+      error: { code: 'purchase.expired', message },
+    });
     const { component } = createComponent();
-    component.stepper = { currentStepIndex: signal(1) };
-    const selectPaymentMethod = vi
-      .spyOn(component, 'selectPaymentMethod')
-      .mockResolvedValue(undefined);
 
-    await component.onEditingItemsChange(true);
+    await component.onModifyPurchase();
 
-    expect(checkoutServiceStub.prepareItemEditing).toHaveBeenCalledWith('tenant-test', 25);
+    expect(toastServiceStub.danger).toHaveBeenCalledWith(message);
-    expect(component.isEditingItems()).toBe(true);
+    expect(routerStub.navigate).not.toHaveBeenCalled();
-    expect(component.createdPurchase()).toBe(editablePurchase);
+    expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
+    expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
+    expect(component.isCancellingPurchase()).toBe(false);
+  });
 
-    await component.onEditingItemsChange(false);
+  it('cancels the current purchase and opens the active cart when Modificar is clicked', async () => {
+    let finishNavigation!: (navigated: boolean) => void;
+    routerStub.navigate.mockReturnValue(
+      new Promise<boolean>((resolve) => {
+        finishNavigation = resolve;
+      }),
+    );
+    const { component } = createComponent();
+    component.createdPurchase.set({
+      id: 25,
+      status: 'created',
+      items: [
+        {
+          id: 91,
+          quantity: 2,
+          unit_price: '100.00',
+          line_total: '200.00',
+          source_catalog_item_id: 8,
+          source_variant_id: null,
+          item_details: {
+            nombre: 'Remera',
+            descripcion: null,
+            slug: 'remera',
+            imagen: null,
+            attributes: [],
+          },
+        },
+      ],
+      subtotal: '200.00',
+      total: '200.00',
+    });
+    const modification = component.onModifyPurchase();
+    await Promise.resolve();
+    await Promise.resolve();
 
-    expect(component.stepper.currentStepIndex()).toBe(1);
+    expect(checkoutServiceStub.cancelPurchase).toHaveBeenCalledWith('tenant-test', 25);
-    expect(selectPaymentMethod).toHaveBeenCalledWith('qr');
+    expect(cartServiceStub.loadCart).toHaveBeenCalledOnce();
-    expect(component.isEditingItems()).toBe(false);
+    expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
+    expect(globalLoadingServiceStub.stop).not.toHaveBeenCalled();
+    expect(component.createdPurchaseId()).toBeNull();
+    expect(component.createdPurchase()).toBeNull();
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/'], {
+      queryParams: { openCart: true },
+    });
+
+    finishNavigation(true);
+    await modification;
+
+    expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
+
+    await component.canDeactivate();
   });
 
   it('updates customer data on the existing purchase before payment', async () => {
@@ -487,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,7 +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 cartSubtotal = computed(() => {
     const purchase = this.createdPurchase();
     return purchase ? parseFloat(purchase.subtotal) : 0;
@@ -101,7 +116,6 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   protected readonly paymentMethods: ReadonlyArray<PaymentMethodOption> = [
     { id: 'qr', label: 'QR' },
     { id: 'transfer', label: 'Transferencia' },
-    { id: 'telepagos', label: 'TelePagos' },
   ];
   protected readonly selectedPaymentMethod = signal<PaymentMethod>('qr');
   protected readonly copiedTransferField = signal<TransferField | null>(null);
@@ -109,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());
@@ -156,6 +172,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.stopQrPolling();
+    this.stopTransferPolling();
   }
 
   private mapPurchaseItemToMock(item: PurchaseDetailItemResponse): CartItemMock {
@@ -171,81 +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.globalLoadingService.start();
-      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 (!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();
@@ -269,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(['/']);
-      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);
@@ -331,7 +322,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     const purchaseId = this.createdPurchaseId();
     const tenant = this.tenantService.tenant();
 
-    if (!purchaseId || !tenant || method === 'telepagos') {
+    if (!purchaseId || !tenant) {
       return;
     }
 
@@ -358,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;
     }
 
@@ -376,6 +368,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     }
 
     this.transferDni.set(dni);
+    this.stopTransferPolling();
     this.transferValidationStatus.set('idle');
     this.isGeneratingIntent.set(true);
     try {
@@ -394,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);
     }
@@ -424,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()
         .submitPurchaseForReview(tenant.codigo, purchaseId);
 
+      if (runId !== this.transferPollingRunId) {
+        return;
+      }
+
       if (purchase.status === 'paid') {
         this.navigateToPurchaseStatus(purchaseId);
         return;
       }
 
-      this.transferValidationStatus.set('error');
+      this.scheduleTransferPoll(runId);
     } catch (error) {
-      console.error('Failed to submit purchase for review:', 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;
     }
   }
 
@@ -559,6 +628,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
     this.navigationStarted = true;
     this.stopQrPolling();
+    this.stopTransferPolling();
 
     void this.router.navigate(['/checkout/status', purchaseId]);
   }
@@ -570,12 +640,15 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       return;
     }
 
+    this.createdPurchaseId.set(purchaseId);
+
     try {
       const purchase = await this.checkoutService
         .withCustomLoading()
         .getPurchase(tenant.codigo, purchaseId);
 
       if (
+        (purchase.status === 'pending_payment' && purchase.expires_at === null) ||
         purchase.status === 'in_review' ||
         purchase.status === 'paid' ||
         purchase.status === 'cancelled' ||
@@ -610,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-page.models.ts

@@ -1,9 +1,9 @@
 import { FormControl, FormGroup } from '@angular/forms';
 
-export type PaymentMethod = 'qr' | 'transfer' | 'telepagos';
+export type PaymentMethod = 'qr' | 'transfer';
 export type TransferField = 'cvu' | 'alias';
 export type QrPaymentStatus = 'idle' | 'waiting' | 'timed_out' | 'failed';
-export type TransferValidationStatus = 'idle' | 'checking' | 'pending' | 'error';
+export type TransferValidationStatus = 'idle' | 'checking' | 'error';
 
 export interface PaymentMethodOption {
   id: PaymentMethod;

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

@@ -7,25 +7,23 @@
 
       <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)"
             />
 
             <span class="payment-method__label">
-              @if (method.id === 'telepagos') {
+              {{ method.label }}
-                <span class="telepagos-logo" aria-label="TelePagos">
-                  <span class="telepagos-logo__tele">tele</span
-                  ><span class="telepagos-logo__pagos">pagos</span>
-                </span>
-              } @else {
-                {{ method.label }}
-              }
             </span>
 
             <i class="fa-solid fa-angle-right payment-method__chevron" aria-hidden="true"></i>
@@ -59,8 +57,6 @@
           (submitDni)="generateTransferIntent.emit($event)"
           (completePurchase)="complete.emit()"
         />
-      } @else {
-        <app-checkout-payment-telepagos />
       }
     </section>
   </div>

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,36 +99,25 @@
     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);
   }
 }
 
-.telepagos-logo {
-  display: inline-block;
-  font-size: 1.45rem;
-  font-weight: 800;
-  line-height: 1;
-  letter-spacing: -0.03em;
-  background: linear-gradient(90deg, #0a69d8 0 78%, #f6a11a 78% 100%);
-  -webkit-background-clip: text;
-  background-clip: text;
-  color: transparent;
-}
-
 .payment-panel {
   display: flex;
   justify-content: flex-end;
   min-width: 0;
 
   > app-checkout-payment-qr,
-  > app-checkout-payment-transfer,
+  > app-checkout-payment-transfer {
-  > app-checkout-payment-telepagos {
     display: block;
     width: 100%;
     max-width: 320px;
@@ -153,6 +150,4 @@
     font-weight: 700;
     line-height: 1.35;
   }
-
 }
-

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

@@ -1,7 +1,6 @@
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
 import { CheckoutPaymentQrComponent } from './components/checkout-payment-qr/checkout-payment-qr.component';
-import { CheckoutPaymentTelepagosComponent } from './components/checkout-payment-telepagos/checkout-payment-telepagos.component';
 import { CheckoutPaymentTransferComponent } from './components/checkout-payment-transfer/checkout-payment-transfer.component';
 import {
   PaymentMethod,
@@ -15,14 +14,15 @@ import {
 @Component({
   selector: 'app-checkout-payment-step',
   standalone: true,
-  imports: [CheckoutPaymentQrComponent, CheckoutPaymentTelepagosComponent, CheckoutPaymentTransferComponent],
+  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>('');
@@ -41,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/checkout-page/components/checkout-payment-telepagos/checkout-payment-telepagos.component.html

@@ -1,22 +0,0 @@
-<div class="payment-panel__card">
-  <h3 class="payment-panel__title">Descarga la app de TelePagos para finalizar la compra</h3>
-  <div class="payment-panel__divider"></div>
-
-  <div class="store-badges" aria-label="Tiendas disponibles">
-    <div class="store-badge">
-      <i class="fa-brands fa-google-play" aria-hidden="true"></i>
-      <span class="store-badge__text">
-        <small>Disponible en</small>
-        <strong>Google Play</strong>
-      </span>
-    </div>
-
-    <div class="store-badge">
-      <i class="fa-brands fa-apple" aria-hidden="true"></i>
-      <span class="store-badge__text">
-        <small>Descargalo en</small>
-        <strong>App Store</strong>
-      </span>
-    </div>
-  </div>
-</div>

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

@@ -1,71 +0,0 @@
-.payment-panel__card {
-  width: 100%;
-  max-width: 320px;
-  min-height: 269px;
-  padding: 1.5rem 1.75rem;
-  border-radius: 5px;
-  background: #ffffff;
-  color: #666666;
-  box-shadow: 0 0 0 1px #f1f1f1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  text-align: center;
-}
-
-.payment-panel__title {
-  max-width: 18rem;
-  margin: 0;
-  color: #8a8a8a;
-  font-size: 13px;
-  font-weight: 700;
-  line-height: 1.35;
-}
-
-.payment-panel__divider {
-  width: 100%;
-  max-width: 220px;
-  height: 1px;
-  margin: 1.2rem 0 1.45rem;
-  background: #dddddd;
-}
-
-.store-badges {
-  width: 100%;
-  max-width: 210px;
-  display: grid;
-  gap: 0.8rem;
-}
-
-.store-badge {
-  display: flex;
-  align-items: center;
-  gap: 0.75rem;
-  padding: 0.75rem 0.95rem;
-  border-radius: 0.85rem;
-  background: #111111;
-  color: #ffffff;
-  box-shadow: 0 10px 24px rgba(17, 17, 17, 0.16);
-
-  i {
-    font-size: 1.35rem;
-  }
-
-  &__text {
-    display: grid;
-    text-align: left;
-    line-height: 1.1;
-
-    small {
-      font-size: 0.62rem;
-      letter-spacing: 0.05em;
-      text-transform: uppercase;
-      opacity: 0.8;
-    }
-
-    strong {
-      font-size: 1rem;
-      font-weight: 700;
-    }
-  }
-}

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

@@ -1,11 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-
-@Component({
-  selector: 'app-checkout-payment-telepagos',
-  standalone: true,
-  imports: [],
-  templateUrl: './checkout-payment-telepagos.component.html',
-  styleUrl: './checkout-payment-telepagos.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class CheckoutPaymentTelepagosComponent {}

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

@@ -1,5 +1,5 @@
 <div class="payment-panel__card">
-  @if (validationStatus() === 'pending' || validationStatus() === 'error') {
+  @if (validationStatus() === 'error') {
     <app-payment-verification-error
       [paymentAmount]="paymentAmount()"
       [whatsappUrl]="whatsappUrl()"
@@ -102,5 +102,12 @@
         </app-button>
       </div>
     }
+
+    @if (validationStatus() === 'checking') {
+      <div class="payment-verification" role="status" aria-live="polite">
+        <span class="payment-verification__spinner" aria-hidden="true"></span>
+        <span class="payment-verification__message">Verificando pago</span>
+      </div>
+    }
   }
 </div>

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

@@ -1,4 +1,5 @@
 .payment-panel__card {
+  position: relative;
   width: 100%;
   max-width: 320px;
   min-height: 400px;
@@ -13,6 +14,40 @@
   text-align: center;
 }
 
+.payment-verification {
+  position: absolute;
+  inset: 0;
+  z-index: 2;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 0.45rem;
+  border-radius: inherit;
+  background: rgba(255, 255, 255, 0.82);
+
+  &__spinner {
+    width: 30px;
+    height: 30px;
+    border: 4px solid rgba(17, 17, 17, 0.2);
+    border-top-color: #111111;
+    border-radius: 50%;
+    animation: payment-verification-spin 0.75s linear infinite;
+  }
+
+  &__message {
+    color: #111111;
+    font-size: 0.72rem;
+    font-weight: 700;
+  }
+}
+
+@keyframes payment-verification-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
 .payment-panel__title {
   max-width: 18rem;
   margin: 0;

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

@@ -0,0 +1,50 @@
+import { getTestBed, TestBed } from '@angular/core/testing';
+import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
+import { beforeAll, describe, expect, it } from 'vitest';
+
+import { CheckoutPaymentTransferComponent } from './checkout-payment-transfer.component';
+
+describe('CheckoutPaymentTransferComponent', () => {
+  beforeAll(() => {
+    try {
+      getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
+    } catch {
+      // Test environment may already be initialized by another setup entrypoint.
+    }
+  });
+
+  it('renders the payment verification overlay while checking the transfer', async () => {
+    await TestBed.configureTestingModule({
+      imports: [CheckoutPaymentTransferComponent],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(CheckoutPaymentTransferComponent);
+    fixture.componentRef.setInput('validationStatus', 'checking');
+    fixture.detectChanges();
+
+    const overlay = fixture.nativeElement.querySelector('.payment-verification') as HTMLElement;
+    expect(overlay).not.toBeNull();
+    expect(overlay.textContent).toContain('Verificando pago');
+    expect(overlay.querySelector('.payment-verification__spinner')).not.toBeNull();
+  });
+
+  it('shows the QR payment error and WhatsApp action when validation fails', async () => {
+    await TestBed.configureTestingModule({
+      imports: [CheckoutPaymentTransferComponent],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(CheckoutPaymentTransferComponent);
+    fixture.componentRef.setInput('validationStatus', 'error');
+    fixture.componentRef.setInput('paymentAmount', 300000);
+    fixture.componentRef.setInput('whatsappUrl', 'https://wa.me/543412602222');
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const whatsapp = Array.from(element.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('WhatsApp'),
+    );
+    expect(element.textContent).toMatch(/No pudimos verificar el pago de \$\s*300\.000\./);
+    expect(whatsapp).toBeDefined();
+    expect(element.querySelector('.payment-verification')).toBeNull();
+  });
+});

src/app/features/store/pages/help-page/pages/faq-page/faq-page.scss

@@ -15,7 +15,7 @@
 
 .faq-page__empty {
   padding: 1rem 0;
-  border-bottom: 1px solid #dedede;
+  border-bottom: 1px solid var(--border-color);
   color: #888888;
   font-size: 0.8125rem;
 }

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

@@ -31,6 +31,6 @@
 .login-page__divider-dot {
   width: 16px;
   height: 16px;
-  border-color: #d9d9d9 !important;
+  border-color: var(--border-color) !important;
   background-color: #ffffff;
 }

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

@@ -26,7 +26,7 @@
 
             <div class="product-detail__price-group">
               <span class="product-detail__price-current">
-                {{ getFormattedPrice(prod.precio) }}
+                {{ getFormattedPrice(effectivePrice()) }}
               </span>
 
               @if (oldPrice(); as oldPrice) {
@@ -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,17 +54,27 @@
 
           <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 (variantLoading() || addingToCart()) {
+                  @if (addingToCart()) {
+                    Guardando
+                  } @else if (variantLoading()) {
                     <div class="spinner-border spinner-border-sm" role="status"></div>
                   } @else {
                     Agregar al carrito
@@ -73,9 +84,7 @@
                 <app-button
                   class="product-detail__cta"
                   type="button"
-                  [disabled]="
+                  [disabled]="!canBuyNow() || variantLoading() || creatingDirectPurchase()"
-                    !selectedVariantAvailable() || variantLoading() || creatingDirectPurchase()
-                  "
                   (click)="buyNow()"
                 >
                   @if (variantLoading() || creatingDirectPurchase()) {
@@ -99,7 +108,7 @@
               [class.product-detail__description-body--expanded]="descriptionExpanded()"
               [style.max-height.px]="descriptionExpanded() ? descriptionMaxHeight() || null : null"
             >
-              {{ prod.descripcion }}
+              {{ effectiveDescription() }}
             </div>
 
             @if (showDescriptionToggle()) {

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

@@ -14,7 +14,7 @@
   }
 
   &__divider {
-    border-top: 1px solid #e6e6e6;
+    border-top: 1px solid var(--border-color);
   }
 
   &__title {
@@ -25,7 +25,7 @@
   }
 
   &__title-price-divider {
-    border-top: 1px solid #e6e6e6;
+    border-top: 1px solid var(--border-color);
   }
 
   &__price-group {

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

@@ -1,5 +1,6 @@
 import { TestBed, getTestBed } from '@angular/core/testing';
 import { signal } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
 import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { By } from '@angular/platform-browser';
@@ -8,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';
@@ -22,6 +25,7 @@ import {
 describe('ProductDetailPageComponent', () => {
   const mockProduct: CatalogItemDetail = {
     id: 1,
+    type: 'product',
     category_id: 10,
     brand_id: null,
     slug: 'auriculares-bluetooth',
@@ -35,7 +39,7 @@ describe('ProductDetailPageComponent', () => {
     has_tickets: false,
     minimum_use_date: null,
     maximum_use_date: null,
-    stock_tecnico: 10,
+    availability: createCatalogAvailability(10),
     attributes: [],
     variants: [],
   };
@@ -174,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();
@@ -189,10 +223,10 @@ describe('ProductDetailPageComponent', () => {
     const detailProduct: CatalogItemDetail = {
       ...mockProduct,
       images: ['https://example.com/product.png'],
-      variants: [{ id: 123, stock_tecnico: 10, values: {} }],
+      variants: [{ id: 123, availability: createCatalogAvailability(10), values: {} }],
       selected_variant: {
         id: 123,
-        stock_tecnico: 10,
+        availability: createCatalogAvailability(10),
         images: ['https://example.com/variant1.png', 'https://example.com/variant2.png'],
         values: {},
       },
@@ -293,10 +327,16 @@ describe('ProductDetailPageComponent', () => {
           ],
         },
       ],
-      variants: [{ id: 123, stock_tecnico: 10, values: { color: 'beige', material: 'Cuero' } }],
+      variants: [
+        {
+          id: 123,
+          availability: createCatalogAvailability(10),
+          values: { color: 'beige', material: 'Cuero' },
+        },
+      ],
       selected_variant: {
         id: 123,
-        stock_tecnico: 10,
+        availability: createCatalogAvailability(10),
         images: ['https://example.com/variant1.png'],
         values: {
           color: 'beige',
@@ -327,6 +367,82 @@ describe('ProductDetailPageComponent', () => {
     expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe('');
   });
 
+  it('renders event dates as a dynamic attribute and resolves their variants', async () => {
+    const detailProduct: CatalogItemDetail = {
+      ...mockProduct,
+      purpose: 'entry',
+      has_tickets: true,
+      variants: [
+        {
+          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: [
+        {
+          id: 99,
+          codigo: 'event_date',
+          nombre: 'Fecha',
+          is_required: true,
+          metadata_schema: null,
+          type: 'event_date',
+          options: [
+            {
+              id: 20,
+              value: '20',
+              label: '09/10/2026',
+              sort_order: 0,
+              metadata: null,
+            },
+            {
+              id: 21,
+              value: '21',
+              label: '10/10/2026',
+              sort_order: 1,
+              metadata: null,
+            },
+          ],
+        },
+      ],
+      selected_variant: {
+        id: 101,
+        event_date_id: 20,
+        availability: createCatalogAvailability(10),
+        images: [],
+        values: {},
+      },
+    };
+    resolveProduct(detailProduct);
+    catalogServiceStub.getCatalogItem.mockReturnValue(
+      of({ ...detailProduct, selected_variant: { ...detailProduct.selected_variant!, id: 102 } }),
+    );
+
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+
+    const options = fixture.nativeElement.querySelectorAll(
+      '.attribute-selector__text-option',
+    ) as NodeListOf<HTMLButtonElement>;
+    expect(options).toHaveLength(2);
+    expect(options[0].classList.contains('attribute-selector__text-option--selected')).toBe(true);
+
+    options[1].click();
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    expect(catalogServiceStub.getCatalogItem).toHaveBeenCalledWith(1, 102);
+  });
+
   it('hides the attributes block and its extra divider when no attributes are present', async () => {
     await configureTestingModule();
     const fixture = TestBed.createComponent(ProductDetailPageComponent);
@@ -345,7 +461,7 @@ describe('ProductDetailPageComponent', () => {
 
     fixture.componentInstance['selectedVariant'].set({
       id: 1,
-      stock_tecnico: 10,
+      availability: createCatalogAvailability(10),
       values: {},
     });
     fixture.detectChanges();
@@ -415,30 +531,58 @@ describe('ProductDetailPageComponent', () => {
     await Promise.resolve();
 
     expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('tenant-test', {
-      direct_item: {
+      direct_items: [
-        catalog_item_id: 1,
+        {
-        variant_id: null,
+          catalog_item_id: 1,
-        cantidad: 1,
+          variant_id: null,
-      },
+          cantidad: 1,
+        },
+      ],
     });
     expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout'], {
       queryParams: { purchase: 44 },
     });
   });
 
+  it('shows the backend purchase-limit message for a direct checkout', async () => {
+    checkoutServiceStub.startCheckout.mockRejectedValue(
+      new HttpErrorResponse({
+        status: 422,
+        error: {
+          code: 'purchase.limit_exceeded',
+          message: 'Podés agregar hasta 2 unidades más de “Auriculares Bluetooth”.',
+          availability: createCatalogAvailability(2),
+        },
+      }),
+    );
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+    const buyButton = Array.from(
+      fixture.nativeElement.querySelectorAll('app-button button') as NodeListOf<HTMLButtonElement>,
+    ).find((button) => button.textContent?.trim() === 'Comprar') as HTMLButtonElement;
+
+    buyButton.click();
+    await Promise.resolve();
+
+    expect(toastServiceStub.danger).toHaveBeenCalledWith(
+      'Podés agregar hasta 2 unidades más de “Auriculares Bluetooth”.',
+    );
+  });
+
   it('calls CartService.addItem when variant is selected and Add to Cart is clicked', async () => {
     const detailProduct: CatalogItemDetail = {
       ...mockProduct,
       variants: [
         {
           id: 123,
-          stock_tecnico: 5,
+          availability: createCatalogAvailability(5),
           values: {},
         },
       ],
       selected_variant: {
         id: 123,
-        stock_tecnico: 5,
+        availability: createCatalogAvailability(5),
         images: [],
         values: {},
       },
@@ -471,7 +615,7 @@ describe('ProductDetailPageComponent', () => {
     resolveProduct({
       ...mockProduct,
       variants: [],
-      stock_tecnico: 4,
+      availability: createCatalogAvailability(4),
     });
 
     await configureTestingModule();
@@ -497,13 +641,13 @@ describe('ProductDetailPageComponent', () => {
       variants: [
         {
           id: 123,
-          stock_tecnico: 5,
+          availability: createCatalogAvailability(5),
           values: {},
         },
       ],
       selected_variant: {
         id: 123,
-        stock_tecnico: 5,
+        availability: createCatalogAvailability(5),
         images: [],
         values: {},
       },
@@ -535,7 +679,7 @@ describe('ProductDetailPageComponent', () => {
   it('allows unlimited variants to increase quantity without a maximum', async () => {
     const unlimitedVariant = {
       id: 321,
-      stock_tecnico: null,
+      availability: createCatalogAvailability(null),
       values: {},
     };
     resolveProduct({
@@ -543,7 +687,7 @@ describe('ProductDetailPageComponent', () => {
       inventory_policy: 'unlimited',
       selected_variant: {
         id: 321,
-        stock_tecnico: null,
+        availability: createCatalogAvailability(null),
         images: [],
         values: {},
       },
@@ -564,17 +708,50 @@ describe('ProductDetailPageComponent', () => {
     expect(fixture.componentInstance['quantity']()).toBe(2);
   });
 
+  it('caps an unlimited variant at the per-user purchase limit', async () => {
+    const unlimitedVariant = {
+      id: 322,
+      availability: createCatalogAvailability(2),
+      values: {},
+    };
+    resolveProduct({
+      ...mockProduct,
+      inventory_policy: 'unlimited',
+      max_units_per_user: 2,
+      selected_variant: {
+        id: 322,
+        availability: createCatalogAvailability(2),
+        images: [],
+        values: { event_date: '20' },
+      },
+      variants: [unlimitedVariant],
+    });
+
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+
+    const increaseButton = fixture.nativeElement.querySelector(
+      'app-quantity-selector button:last-child',
+    ) as HTMLButtonElement;
+    increaseButton.click();
+    fixture.detectChanges();
+
+    expect(fixture.componentInstance['quantity']()).toBe(2);
+    expect(increaseButton.disabled).toBe(true);
+  });
+
   it('disables purchase actions for tracked variants without stock', async () => {
     const trackedVariant = {
       id: 654,
-      stock_tecnico: 0,
+      availability: createCatalogAvailability(0),
       values: {},
     };
     resolveProduct({
       ...mockProduct,
       selected_variant: {
         id: 654,
-        stock_tecnico: 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;
@@ -86,29 +96,55 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   protected readonly creatingDirectPurchase = signal(false);
   protected readonly error = signal<string | null>(null);
   protected readonly selectedVariant = signal<CatalogItemVariant | null>(null);
+  protected readonly effectiveDescription = computed(
+    () => this.selectedVariant()?.descripcion ?? this.product()?.descripcion ?? '',
+  );
+  protected readonly effectivePrice = computed(
+    () => 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 (variant) return variant.stock_tecnico;
+    if (!prod) return 0;
-    if (prod && prod.variants.length === 0) return prod.stock_tecnico ?? null;
+    if (!variant && prod.variants.length > 0) return 0;
-    return 0;
+
+    return maximumCatalogQuantity(this.effectiveAvailability());
   });
-  protected readonly selectedVariantAvailable = computed(() => {
+  protected readonly hasPurchasableSelection = computed(() => {
     const prod = this.product();
     if (!prod) return false;
 
-    const variant = this.selectedVariant();
+    return prod.variants.length === 0 || this.selectedVariant() !== null;
-    if (variant) return this.isVariantAvailable(variant, prod);
-    if (prod.variants.length > 0) return false;
-
-    return prod.inventory_policy === 'unlimited' || (prod.stock_tecnico ?? 0) > 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);
   protected readonly renderableAttributes = computed(() =>
-    (this.product()?.attributes ?? []).filter((attribute) => attribute.options.length > 0),
+    (this.product()?.attributes ?? []).filter(
+      (attribute) => attribute.show_in_selector !== false && attribute.options.length > 0,
+    ),
   );
   protected readonly hasRenderableAttributes = computed(
     () => this.renderableAttributes().length > 0,
@@ -123,6 +159,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       this.carouselHost();
       this.descriptionBody();
       this.product();
+      this.selectedVariant();
       this.descriptionExpanded();
 
       if (this.isBrowser) {
@@ -135,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;
 
@@ -145,6 +186,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.availabilityChangedSub?.unsubscribe();
     this.routeSub?.unsubscribe();
     this.productSub?.unsubscribe();
     this.carouselResizeObserver?.disconnect();
@@ -159,26 +201,56 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       .withCustomLoading()
       .getCatalogItem(productId, variantId)
       .subscribe({
-      next: (prod) => {
+        next: (prod) => {
-        this.applyProduct(prod, false);
+          this.applyProduct(prod, false);
-        this.variantLoading.set(false);
+          this.variantLoading.set(false);
-      },
+        },
-      error: (err: HttpErrorResponse) => {
+        error: (err: HttpErrorResponse) => {
-        const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
+          const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
-        this.toastService.danger(errorMessage);
+          this.toastService.danger(errorMessage);
-        this.variantLoading.set(false);
+          this.variantLoading.set(false);
 
-        this.product.update((currentProduct) => {
+          this.product.update((currentProduct) => {
-          if (!currentProduct) return null;
+            if (!currentProduct) return null;
-          return {
+            return {
-            ...currentProduct,
+              ...currentProduct,
-            variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
+              variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
-          };
+            };
-        });
+          });
 
-        this.attributeSelector()?.reset();
+          this.attributeSelector()?.reset();
-      },
+        },
-    });
+      });
+  }
+
+  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 {
@@ -230,8 +302,11 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     }
 
     this.selectedVariant.set(variant);
-    if (variant && variant.stock_tecnico !== null && this.quantity() > variant.stock_tecnico) {
+    this.descriptionExpanded.set(false);
-      this.quantity.set(Math.max(1, variant.stock_tecnico));
+    this.descriptionHasOverflow.set(false);
+    const maximum = this.selectedVariantMax();
+    if (maximum !== null && this.quantity() > maximum) {
+      this.quantity.set(Math.max(1, maximum));
     }
 
     const currentProduct = this.product();
@@ -243,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;
     }
 
@@ -253,17 +330,17 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       .withCustomLoading()
       .addItem(currentProduct.id, variant?.id ?? null, this.quantity())
       .subscribe({
-      next: (res) => {
+        next: (res) => {
-        const msg = res.message || 'Producto agregado al carrito';
+          const msg = res.message || 'Producto agregado al carrito';
-        this.toastService.success(msg);
+          this.toastService.success(msg);
-        this.addingToCart.set(false);
+          this.addingToCart.set(false);
-      },
+        },
-      error: (err: HttpErrorResponse) => {
+        error: (err: HttpErrorResponse) => {
-        const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
+          const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
-        this.toastService.danger(errorMessage);
+          this.toastService.danger(errorMessage);
-        this.addingToCart.set(false);
+          this.addingToCart.set(false);
-      },
+        },
-    });
+      });
   }
 
   protected async buyNow(): Promise<void> {
@@ -274,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;
     }
 
@@ -297,11 +376,13 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     this.creatingDirectPurchase.set(true);
     try {
       const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
-        direct_item: {
+        direct_items: [
-          catalog_item_id: currentProduct.id,
+          {
-          variant_id: variant?.id ?? null,
+            catalog_item_id: currentProduct.id,
-          cantidad: this.quantity(),
+            variant_id: variant?.id ?? null,
-        },
+            cantidad: this.quantity(),
+          },
+        ],
       });
 
       await this.router.navigate(['/checkout'], {
@@ -309,16 +390,16 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       });
     } catch (error) {
       console.error('Failed to create direct purchase:', error);
-      this.toastService.danger('No se pudo iniciar la compra directa.');
+      const message =
+        error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
+          ? error.error.message
+          : 'No se pudo iniciar la compra directa.';
+      this.toastService.danger(message);
     } finally {
       this.creatingDirectPurchase.set(false);
     }
   }
 
-  private isVariantAvailable(variant: CatalogItemVariant, product: CatalogItemDetail): boolean {
-    return product.inventory_policy === 'unlimited' || (variant.stock_tecnico ?? 0) > 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,
-    stock_tecnico: 0,
+    availability: createCatalogAvailability(0),
     attributes: [],
     variants: [],
   };

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

@@ -1,7 +1,10 @@
 import { TestBed } from '@angular/core/testing';
 import { ActivatedRoute, convertToParamMap, Router } from '@angular/router';
 
-import { CheckoutService, PurchaseDetailResponse } from '../../../../core/services/checkout.service';
+import {
+  CheckoutService,
+  PurchaseDetailResponse,
+} from '../../../../core/services/checkout.service';
 import { Tenant } from '../../../../core/services/tenant.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { PurchaseStatusPageComponent } from './purchase-status-page.component';
@@ -130,4 +133,89 @@ describe('PurchaseStatusPageComponent', () => {
 
     openSpy.mockRestore();
   });
+
+  it('polls every five seconds while the payment is pending and shows the confirmation', async () => {
+    vi.useFakeTimers();
+
+    try {
+      const checkoutService = {
+        getPurchase: vi
+          .fn()
+          .mockResolvedValueOnce({ status: 'pending_payment' } as PurchaseDetailResponse)
+          .mockResolvedValueOnce(purchase(true)),
+        withCustomLoading() {
+          return this;
+        },
+      };
+
+      await TestBed.configureTestingModule({
+        imports: [PurchaseStatusPageComponent],
+        providers: [
+          { provide: CheckoutService, useValue: checkoutService },
+          { provide: TenantService, useValue: { tenant: () => tenant } },
+          {
+            provide: ActivatedRoute,
+            useValue: { snapshot: { paramMap: convertToParamMap({ id: '42' }) } },
+          },
+          { provide: Router, useValue: { navigate: vi.fn(), navigateByUrl: vi.fn() } },
+        ],
+      }).compileComponents();
+
+      const fixture = TestBed.createComponent(PurchaseStatusPageComponent);
+      fixture.detectChanges();
+      await Promise.resolve();
+      fixture.detectChanges();
+
+      expect(checkoutService.getPurchase).toHaveBeenCalledOnce();
+      expect(fixture.nativeElement.textContent).toContain('ESTAMOS VERIFICANDO TU PAGO');
+
+      await vi.advanceTimersByTimeAsync(5_000);
+      fixture.detectChanges();
+
+      expect(checkoutService.getPurchase).toHaveBeenCalledTimes(2);
+      expect(fixture.nativeElement.textContent).toContain('COMPRA REALIZADA!');
+
+      await vi.advanceTimersByTimeAsync(10_000);
+      expect(checkoutService.getPurchase).toHaveBeenCalledTimes(2);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it('stops polling when the page is destroyed', async () => {
+    vi.useFakeTimers();
+
+    try {
+      const checkoutService = {
+        getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
+        withCustomLoading() {
+          return this;
+        },
+      };
+
+      await TestBed.configureTestingModule({
+        imports: [PurchaseStatusPageComponent],
+        providers: [
+          { provide: CheckoutService, useValue: checkoutService },
+          { provide: TenantService, useValue: { tenant: () => tenant } },
+          {
+            provide: ActivatedRoute,
+            useValue: { snapshot: { paramMap: convertToParamMap({ id: '42' }) } },
+          },
+          { provide: Router, useValue: { navigate: vi.fn(), navigateByUrl: vi.fn() } },
+        ],
+      }).compileComponents();
+
+      const fixture = TestBed.createComponent(PurchaseStatusPageComponent);
+      fixture.detectChanges();
+      await Promise.resolve();
+      fixture.destroy();
+
+      await vi.advanceTimersByTimeAsync(5_000);
+
+      expect(checkoutService.getPurchase).toHaveBeenCalledOnce();
+    } finally {
+      vi.useRealTimers();
+    }
+  });
 });

src/app/features/store/pages/purchase-status-page/purchase-status-page.component.ts

@@ -1,29 +1,47 @@
-import { ChangeDetectionStrategy, Component, OnInit, computed, inject, signal } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+  computed,
+  inject,
+  signal,
+} from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { CheckoutService, PurchaseStatusResponse } from '../../../../core/services/checkout.service';
+import {
+  CheckoutService,
+  PurchaseStatusResponse,
+} from '../../../../core/services/checkout.service';
 import { findMenu } from '../../../../core/services/menu.utils';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ButtonComponent } from '../../../../shared/components/button/button.component';
 
 type PurchaseStatusView = 'approved' | 'pending' | 'rejected' | 'expired' | 'error';
 
+const PAYMENT_STATUS_POLL_INTERVAL_MS = 5_000;
+
 @Component({
   selector: 'app-purchase-status-page',
   standalone: true,
   imports: [ButtonComponent],
   templateUrl: './purchase-status-page.component.html',
   styleUrl: './purchase-status-page.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PurchaseStatusPageComponent implements OnInit {
+export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
   private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
   private readonly checkoutService = inject(CheckoutService);
   private readonly tenantService = inject(TenantService);
+  private readonly isBrowser = isPlatformBrowser(inject(PLATFORM_ID));
 
   private purchaseId: string | null = null;
   private tenantCode: string | null = null;
+  private pollingTimeout: ReturnType<typeof setTimeout> | null = null;
+  private isDestroyed = false;
 
   protected readonly isLoading = signal(true);
   protected readonly status = signal<PurchaseStatusView>('pending');
@@ -57,7 +75,12 @@ export class PurchaseStatusPageComponent implements OnInit {
     void this.loadStatus();
   }
 
-  private async loadStatus(): Promise<void> {
+  ngOnDestroy(): void {
+    this.isDestroyed = true;
+    this.stopPolling();
+  }
+
+  private async loadStatus(isPolling = false): Promise<void> {
     if (!this.purchaseId || !this.tenantCode) {
       return;
     }
@@ -66,13 +89,52 @@ export class PurchaseStatusPageComponent implements OnInit {
       const purchase = await this.checkoutService
         .withCustomLoading()
         .getPurchase(this.tenantCode, this.purchaseId);
-      this.status.set(this.resolveStatus(purchase));
+
+      if (this.isDestroyed) {
+        return;
+      }
+
+      const status = this.resolveStatus(purchase);
+      this.status.set(status);
       this.hasGeneratedTickets.set(purchase.has_generated_tickets === true);
+
+      if (status === 'pending') {
+        this.schedulePolling();
+      } else {
+        this.stopPolling();
+      }
     } catch (error) {
       console.error('Failed to fetch purchase status:', error);
-      this.status.set('error');
+
+      if (!this.isDestroyed) {
+        if (isPolling) {
+          this.schedulePolling();
+        } else {
+          this.status.set('error');
+        }
+      }
     } finally {
-      this.isLoading.set(false);
+      if (!this.isDestroyed) {
+        this.isLoading.set(false);
+      }
+    }
+  }
+
+  private schedulePolling(): void {
+    if (!this.isBrowser || this.isDestroyed || this.pollingTimeout) {
+      return;
+    }
+
+    this.pollingTimeout = setTimeout(() => {
+      this.pollingTimeout = null;
+      void this.loadStatus(true);
+    }, PAYMENT_STATUS_POLL_INTERVAL_MS);
+  }
+
+  private stopPolling(): void {
+    if (this.pollingTimeout) {
+      clearTimeout(this.pollingTimeout);
+      this.pollingTimeout = null;
     }
   }
 

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

@@ -20,6 +20,7 @@
         [layout]="productLayout()"
         [groupLayout]="groupLayout()"
         [items]="displayItems()"
+        [savingProductIds]="savingProductIds()"
         (buy)="onBuyProduct($event)"
         (addToCart)="onAddToCart($event)"
         (pageChange)="onPageChange($event)"

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, 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);
@@ -58,6 +70,7 @@ export class SearchPageComponent {
   protected readonly results = signal<ApiPaginatedResponse<CatalogFeaturedItem[]> | null>(null);
   protected readonly error = signal<string | null>(null);
   protected readonly creatingDirectPurchase = signal(false);
+  protected readonly savingProductIds = signal<ReadonlySet<number>>(new Set<number>());
 
   protected readonly productLayout = computed<CatalogProductLayout>(
     () => this.tenantService.tenant()?.search_product_layout ?? 'column_with_image',
@@ -85,26 +98,33 @@ export class SearchPageComponent {
   });
 
   constructor() {
-    this.route.queryParamMap
+    const routeState$ = this.route.queryParamMap.pipe(
-      .pipe(
+      map(
-        map(
+        (params): SearchRouteState => ({
-          (params): SearchRouteState => ({
+          query: params.get('q')?.trim() ?? '',
-            query: params.get('q')?.trim() ?? '',
+          page: this.parsePage(params.get('page')),
-            page: this.parsePage(params.get('page')),
-          }),
-        ),
-        distinctUntilChanged(
-          (previous, current) => previous.query === current.query && previous.page === current.page,
-        ),
-        tap(({ query }) => {
-          this.query.set(query);
-          this.results.set(null);
-          this.error.set(
-            query.length >= this.minSearchLength
-              ? null
-              : `Ingresá al menos ${this.minSearchLength} caracteres para buscar.`,
-          );
         }),
+      ),
+      distinctUntilChanged(
+        (previous, current) => previous.query === current.query && previous.page === current.page,
+      ),
+      tap(({ query }) => {
+        this.query.set(query);
+        this.results.set(null);
+        this.error.set(
+          query.length >= this.minSearchLength
+            ? null
+            : `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);
@@ -145,7 +165,9 @@ export class SearchPageComponent {
 
     if (!this.injector.get(AuthService).user()) {
       await this.router.navigate(['/login'], {
-        queryParams: { returnUrl: `/producto/${event.product.id}` },
+        queryParams: {
+          returnUrl: event.reservedInCart ? this.router.url : `/producto/${event.product.id}`,
+        },
       });
       return;
     }
@@ -158,13 +180,25 @@ export class SearchPageComponent {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
+      const reservedCartId = event.reservedInCart ? (this.cartService.cart()?.id ?? null) : null;
-        direct_item: {
+      if (event.reservedInCart && reservedCartId === null) {
-          catalog_item_id: event.product.id,
+        this.toastService.danger('No se pudo identificar el carrito reservado.');
-          variant_id: event.variant ?? null,
+        return;
-          cantidad: event.quantity,
+      }
-        },
+      const purchase = await this.injector.get(CheckoutService).startCheckout(
-      });
+        tenant.codigo,
+        reservedCartId !== null
+          ? { cart_id: reservedCartId }
+          : {
+              direct_items: [
+                {
+                  catalog_item_id: event.product.id,
+                  variant_id: event.variant ?? null,
+                  cantidad: event.quantity,
+                },
+              ],
+            },
+      );
       await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
     } catch (error) {
       console.error('Failed to create direct purchase:', error);
@@ -175,14 +209,31 @@ export class SearchPageComponent {
   }
 
   protected onAddToCart(event: ProductListCartEvent): void {
-    this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).subscribe({
+    const productId = event.product.id;
-      next: (response) => {
+    if (this.savingProductIds().has(productId)) {
-        this.toastService.success(response.message || 'Producto agregado al carrito');
+      return;
-      },
+    }
-      error: (error: HttpErrorResponse) => {
+
-        const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
+    this.setProductSaving(productId, true);
-        this.toastService.danger(message);
+    this.cartService
-      },
+      .addItem(productId, event.variant ?? null, event.quantity)
+      .pipe(finalize(() => this.setProductSaving(productId, false)))
+      .subscribe({
+        next: (response) => {
+          this.toastService.success(response.message || 'Producto agregado al carrito');
+        },
+        error: (error: HttpErrorResponse) => {
+          const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
+          this.toastService.danger(message);
+        },
+      });
+  }
+
+  private setProductSaving(productId: number, saving: boolean): void {
+    this.savingProductIds.update((current) => {
+      const updated = new Set(current);
+      saving ? updated.add(productId) : updated.delete(productId);
+      return updated;
     });
   }
 

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

@@ -1,19 +1,16 @@
-@if (tenant()?.main_carousel_images; as mainCarouselImages) {
+@if (mainCarouselImages(); as images) {
-  @if (mainCarouselImages.length) {
+  @if (images.length) {
     <app-main-carousel
       class="store-home__main-carousel"
-      [images]="mainCarouselImages"
+      [images]="images"
       ariaLabel="Imágenes destacadas de la tienda"
       (firstImageReady)="mainCarouselReady.set(true)"
     />
   }
 }
 
-@if (tenant()?.hero_config || tenant()?.event_config) {
+@if (heroConfig() || eventConfig()) {
-  <app-hero-banner
+  <app-hero-banner [heroConfig]="heroConfig()" [eventConfig]="eventConfig()" />
-    [heroConfig]="tenant()?.hero_config"
-    [eventConfig]="tenant()?.event_config"
-  ></app-hero-banner>
 }
 
 @if (error()) {
@@ -26,13 +23,15 @@
   </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"
         [items]="group.items"
         [loading]="isGroupLoading(group.id)"
         [loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
+        [unavailableVariantIds]="unavailableVariantIds()"
+        [savingProductIds]="savingProductIds()"
         (buy)="onBuyProduct($event)"
         (addToCart)="onAddToCart($event)"
         (pageChange)="onPageChange(group.id, $event)"
@@ -40,3 +39,9 @@
     </app-store-section>
   }
 }
+
+@if (additionalInfo(); as content) {
+  <app-store-section class="store-home__additional-info" title="Información adicional">
+    <div class="store-home__additional-info-content" [innerHTML]="content"></div>
+  </app-store-section>
+}

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

@@ -11,6 +11,36 @@ 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);
+}
+
+.store-home__additional-info-content {
+  width: 100%;
+  text-align: center;
+}
+
+::ng-deep .store-home__additional-info-content img {
+  display: block;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+::ng-deep .store-home__additional-info-content > :last-child {
+  margin-bottom: 0;
+}
+
+@media (max-width: 767.98px) {
+  :host > app-hero-banner:first-child {
+    display: block;
+    margin-top: -3rem;
+  }
+}
+
 .store-home__alert-error {
   margin: 0;
   border-color: rgba(var(--tenant-danger-rgb, 220, 53, 69), 0.18);

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

@@ -12,10 +12,13 @@ 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';
 import { ProductListComponent } from '../../../../shared/components/product-list/product-list.component';
+import { HeroBannerComponent } from '../../../../shared/components/hero-banner/hero-banner.component';
 import { StoreHomePageComponent } from './store-home-page.component';
 import {
   STORE_HOME_PRODUCTS_ERROR_MESSAGE,
@@ -57,6 +60,7 @@ function createCatalog(
   return [
     {
       id: 7,
+      code: 'destacados',
       title: 'Destacados',
       layout: 'column_with_image',
       group_layout: 'paginated',
@@ -76,19 +80,23 @@ 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),
   },
 ];
 
-function createTenant(mainCarouselImages?: string[]): Tenant {
+function createTenant(extras: Tenant['extras'] = {}): Tenant {
   return {
     id: 1,
     codigo: 'acme',
@@ -102,8 +110,18 @@ function createTenant(mainCarouselImages?: string[]): Tenant {
     footer_bg_color: '#ffffff',
     header_logo: '/header.png',
     footer_logo: '/footer.png',
+    website_type_code: 'shopit',
+    website_type: {
+      codigo: 'shopit',
+      nombre: 'ShopIt',
+      primary_color: null,
+      secondary_color: null,
+      danger_color: null,
+      success_color: null,
+      site_logo: null,
+    },
+    extras,
     categories: [],
-    main_carousel_images: mainCarouselImages,
   };
 }
 
@@ -138,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');
@@ -146,11 +165,32 @@ describe('StoreHomePageComponent', () => {
     );
   });
 
-  it('renders the tenant main carousel images at the beginning of the home page', async () => {
+  it('reloads the catalog when availability changes', async () => {
-    const mainCarouselImages = [
+    const refreshedCatalog = createCatalog();
-      'https://example.com/carousel-1.webp',
+    const catalogServiceStub = {
-      'https://example.com/carousel-2.webp',
+      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'];
 
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
@@ -162,7 +202,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant(mainCarouselImages)),
+          useValue: createTenantServiceStub(createTenant({ carousel })),
         },
       ],
     }).compileComponents();
@@ -171,25 +211,60 @@ describe('StoreHomePageComponent', () => {
     fixture.detectChanges();
 
     const element = fixture.nativeElement as HTMLElement;
-    const carousel = element.querySelector('app-main-carousel');
+    const carouselElement = element.querySelector('app-main-carousel');
-    const images = carousel?.querySelectorAll('.main-carousel__image');
+    const images = carouselElement?.querySelectorAll('.main-carousel__image');
 
-    expect(element.firstElementChild).toBe(carousel);
+    expect(element.firstElementChild).toBe(carouselElement);
     expect(images).toHaveLength(2);
-    expect(images?.[0].getAttribute('src')).toBe(mainCarouselImages[0]);
+    expect(images?.[0].getAttribute('src')).toBe(carousel[0]);
-    expect(images?.[1].getAttribute('src')).toBeNull();
-    expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(0);
-
-    images?.[0].dispatchEvent(new Event('load'));
-    fixture.detectChanges();
-
-    expect(images?.[1].getAttribute('src')).toBe(mainCarouselImages[1]);
-    expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(1);
-
-    fixture.destroy();
   });
 
-  it('does not render the main carousel when the tenant has no images', async () => {
+  it('renders the hero extra and the active tenant event', async () => {
+    const tenant = createTenant({
+      heroConfig: {
+        title_html: '<h1>Fiesta Fútbol Infantil</h1>',
+        description_html: '<p>Viví una jornada inolvidable de fútbol infantil.</p>',
+        background_image_id: 'https://example.com/hero.jpg',
+      },
+    });
+    tenant.event = {
+      title: 'Fiesta Fútbol Infantil',
+      location: 'Rosario, Santa Fe',
+      dates: [
+        {
+          id: 20,
+          date: '2026-12-05',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+        {
+          id: 21,
+          date: '2026-12-06',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+      ],
+    };
+    tenant.event_date_text = '5 y 6 de Diciembre 2026';
+    tenant.website_type_code = 'onticket';
+    tenant.social_media = [
+      {
+        code: 'whatsapp',
+        icon: 'fa-brands fa-whatsapp',
+        name: 'WhatsApp',
+        url: 'https://wa.me/5493410000000',
+      },
+    ];
+    tenant.website_type = {
+      codigo: 'onticket',
+      nombre: 'OnTicket',
+      primary_color: null,
+      secondary_color: null,
+      danger_color: null,
+      success_color: null,
+      site_logo: null,
+    };
+
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
       providers: [
@@ -200,7 +275,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant([])),
+          useValue: createTenantServiceStub(tenant),
         },
       ],
     }).compileComponents();
@@ -208,11 +283,141 @@ describe('StoreHomePageComponent', () => {
     const fixture = TestBed.createComponent(StoreHomePageComponent);
     fixture.detectChanges();
 
-    expect((fixture.nativeElement as HTMLElement).querySelector('app-main-carousel')).toBeNull();
+    const hero = (fixture.nativeElement as HTMLElement).querySelector(
+      'app-hero-banner .hero-banner',
+    ) as HTMLElement;
+    const heroImage = hero.querySelector('img');
+
+    expect(hero).not.toBeNull();
+    expect(heroImage?.getAttribute('src')).toBe('https://example.com/hero.jpg');
+    expect(hero.textContent).toContain('Fiesta Fútbol Infantil');
+    expect(hero.textContent).toContain('Viví una jornada inolvidable de fútbol infantil.');
+    expect(hero.textContent).toContain('Rosario, Santa Fe');
+    expect(hero.textContent).toContain('5 y 6 de Diciembre 2026');
+    const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
+      .componentInstance as HeroBannerComponent;
+    expect(heroComponent.eventConfig?.contact).toEqual(tenant.social_media);
+  });
+
+  it('renders additional information as an HTML section', async () => {
+    const description =
+      '<p>Consultá los <strong>términos del evento</strong>.</p><ul><li>Ingreso con DNI</li></ul>';
+
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(
+            createTenant({ additionalInfoConfig: { description } }),
+          ),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const section = element.querySelector('.store-home__additional-info');
+    const sections = element.querySelectorAll(':scope > app-store-section');
+
+    expect(sections[sections.length - 1]).toBe(section);
+    expect(section?.querySelector('.store-section__title')?.textContent?.trim()).toBe(
+      'Información adicional',
+    );
+    expect(section?.querySelector('strong')?.textContent).toBe('términos del evento');
+    expect(section?.querySelector('li')?.textContent).toBe('Ingreso con DNI');
+  });
+
+  it('does not render the additional information section without content', async () => {
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(
+            createTenant({ additionalInfoConfig: { description: '   ' } }),
+          ),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    expect(
+      (fixture.nativeElement as HTMLElement).querySelector('.store-home__additional-info'),
+    ).toBeNull();
+  });
+
+  it('renders only the active event data when the tenant does not have the hero extra', async () => {
+    const tenant = createTenant();
+    tenant.event = {
+      title: 'Fiesta Fútbol Infantil',
+      location: 'Sunchales, Santa Fe',
+      dates: [
+        {
+          id: 25,
+          date: '2026-10-09',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+      ],
+    };
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(tenant),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
+      .componentInstance as HeroBannerComponent;
+
+    expect(heroComponent.heroConfig).toBeNull();
+    expect(element.querySelector('.hero-banner')).toBeNull();
+    expect(element.querySelector('.hero-banner-container')).toBeNull();
+    expect(element.querySelector('.hero-content')).toBeNull();
+    expect(element.querySelector('.event-card')).not.toBeNull();
+    expect(element.textContent).toContain('Fiesta Fútbol Infantil');
+    expect(element.textContent).toContain('Sunchales, Santa Fe');
+    expect(element.textContent).toContain('2026-10-09');
   });
 
   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))),
@@ -323,9 +528,9 @@ describe('StoreHomePageComponent', () => {
   it('adds a product-list cart event to the cart', async () => {
     const catalogServiceStub = { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() };
     const cartServiceStub = {
-      addItem: vi.fn().mockReturnValue(
+      addItem: vi
-        of({ data: {}, message: 'Producto agregado correctamente' }),
+        .fn()
-      ),
+        .mockReturnValue(of({ data: {}, message: 'Producto agregado correctamente' })),
     };
     const toastServiceStub = { success: vi.fn(), danger: vi.fn() };
 

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

@@ -10,15 +10,19 @@ import {
 } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Subscription } from 'rxjs';
+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';
-import { CheckoutService } from '../../../../core/services/checkout.service';
+import {
+  CheckoutService,
+  isInsufficientStockResponse,
+} from '../../../../core/services/checkout.service';
 import {
   ProductListComponent,
   ProductListCartEvent,
@@ -46,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);
@@ -60,14 +65,46 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   protected readonly error = signal<string | null>(null);
   protected readonly mainCarouselReady = signal(false);
   protected readonly creatingDirectPurchase = signal(false);
-  protected readonly hasMainCarouselImages = computed(
+  protected readonly unavailableVariantIds = signal<ReadonlySet<number>>(new Set<number>());
-    () => (this.tenant()?.main_carousel_images?.length ?? 0) > 0,
+  protected readonly savingProductIds = signal<ReadonlySet<number>>(new Set<number>());
+  protected readonly mainCarouselImages = computed(() => this.tenant()?.extras?.carousel ?? []);
+  protected readonly heroConfig = computed(() => this.tenant()?.extras?.heroConfig ?? null);
+  protected readonly additionalInfo = computed(
+    () => this.tenant()?.extras?.additionalInfoConfig?.description?.trim() || null,
   );
+  protected readonly eventConfig = computed(() => {
+    const tenant = this.tenant();
+    const contact = tenant?.social_media ?? [];
+    const event = tenant?.event;
+
+    if (event) {
+      return {
+        id: tenant.id,
+        title: event.title,
+        location: event.location,
+        dates_text: tenant.event_date_text,
+        dates: event.dates.map((eventDate) => ({
+          id: eventDate.id,
+          date: eventDate.date,
+          start_time: eventDate.time_start,
+          end_time: eventDate.time_end,
+        })),
+        contact,
+      };
+    }
+
+    return null;
+  });
+  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;
@@ -81,6 +118,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.availabilityChangedSubscription?.unsubscribe();
     this.catalogRequestSubscription?.unsubscribe();
     this.groupRequestSubscriptions.forEach((subscription) => subscription.unsubscribe());
   }
@@ -109,20 +147,20 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
       .withCustomLoading()
       .getFeaturedGroupItems(groupId, { page })
       .subscribe({
-      next: (items) => {
+        next: (items) => {
-        this.catalog.update((groups) =>
+          this.catalog.update((groups) =>
-          groups.map((candidate) =>
+            groups.map((candidate) =>
-            candidate.id === groupId ? { ...candidate, items } : candidate,
+              candidate.id === groupId ? { ...candidate, items } : candidate,
-          ),
+            ),
-        );
+          );
-        this.error.set(null);
+          this.error.set(null);
-      },
+        },
-      error: () => {
+        error: () => {
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+          this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
-        this.setGroupLoading(groupId, false);
+          this.setGroupLoading(groupId, false);
-      },
+        },
-      complete: () => this.setGroupLoading(groupId, false),
+        complete: () => this.setGroupLoading(groupId, false),
-    });
+      });
 
     this.groupRequestSubscriptions.set(groupId, subscription);
   }
@@ -139,7 +177,9 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
 
     if (!this.injector.get(AuthService).user()) {
       await this.router.navigate(['/login'], {
-        queryParams: { returnUrl: `/producto/${event.product.id}` },
+        queryParams: {
+          returnUrl: event.reservedInCart ? this.router.url : `/producto/${event.product.id}`,
+        },
       });
       return;
     }
@@ -152,16 +192,50 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
+      const checkoutService = this.injector.get(CheckoutService);
-        direct_item: {
+      const reservedCartId = event.reservedInCart ? (this.cartService.cart()?.id ?? null) : null;
-          catalog_item_id: event.product.id,
+      if (event.reservedInCart && reservedCartId === null) {
-          variant_id: event.variant ?? null,
+        this.toastService.danger('No se pudo identificar el carrito reservado.');
-          cantidad: event.quantity,
+        return;
-        },
+      }
-      });
+      const variantIds = event.variantIds ?? [];
+      const directItems =
+        variantIds.length > 0
+          ? variantIds.map((variantId) => ({
+              catalog_item_id: event.product.id,
+              variant_id: variantId,
+              cantidad: 1,
+            }))
+          : [
+              {
+                catalog_item_id: event.product.id,
+                variant_id: event.variant ?? null,
+                cantidad: event.quantity,
+              },
+            ];
+      const purchase = await checkoutService.startCheckout(
+        tenant.codigo,
+        reservedCartId !== null ? { cart_id: reservedCartId } : { direct_items: directItems },
+      );
       await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
     } catch (error) {
       console.error('Failed to create direct purchase:', error);
+
+      if (error instanceof HttpErrorResponse && isInsufficientStockResponse(error.error)) {
+        const unavailableIds = error.error.unavailable_items
+          .map((item) => item.variant_id)
+          .filter((variantId): variantId is number => variantId !== null);
+
+        this.unavailableVariantIds.update((current) => new Set([...current, ...unavailableIds]));
+        this.toastService.danger(error.error.message);
+        return;
+      }
+
+      if (error instanceof HttpErrorResponse && typeof error.error?.message === 'string') {
+        this.toastService.danger(error.error.message);
+        return;
+      }
+
       this.toastService.danger('No se pudo iniciar la compra directa.');
     } finally {
       this.creatingDirectPurchase.set(false);
@@ -169,34 +243,58 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   }
 
   protected onAddToCart(event: ProductListCartEvent): void {
-    this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).subscribe({
+    const productId = event.product.id;
-      next: (response) => {
+    if (this.savingProductIds().has(productId)) {
-        this.toastService.success(response.message || 'Producto agregado al carrito');
+      return;
-      },
+    }
-      error: (error: HttpErrorResponse) => {
+
-        const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
+    this.setProductSaving(productId, true);
-        this.toastService.danger(message);
+    this.cartService
-      },
+      .addItem(productId, event.variant ?? null, event.quantity)
+      .pipe(finalize(() => this.setProductSaving(productId, false)))
+      .subscribe({
+        next: (response) => {
+          this.toastService.success(response.message || 'Producto agregado al carrito');
+        },
+        error: (error: HttpErrorResponse) => {
+          const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
+          this.toastService.danger(message);
+        },
+      });
+  }
+
+  private setProductSaving(productId: number, saving: boolean): void {
+    this.savingProductIds.update((current) => {
+      const updated = new Set(current);
+      saving ? updated.add(productId) : updated.delete(productId);
+      return updated;
     });
   }
 
-  private loadCatalog(): void {
+  private loadCatalog(silent = false): void {
-    this.loading.set(true);
+    if (!silent) {
-    this.error.set(null);
+      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) => {
-      error: () => {
+          this.catalog.set(catalog);
-        this.catalog.set([]);
+          this.error.set(null);
-        this.loading.set(false);
+        },
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+        error: () => {
-      },
+          if (!silent) {
-      complete: () => this.loading.set(false),
+            this.catalog.set([]);
-    });
+            this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+          }
+          this.loading.set(false);
+        },
+        complete: () => this.loading.set(false),
+      });
   }
 
   private applyResolvedData(resolvedData: StoreHomeCatalogResolvedData): void {

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

@@ -4,7 +4,7 @@
 }
 
 .accordion {
-  --bs-accordion-border-color: #dedede;
+  --bs-accordion-border-color: var(--border-color);
   --bs-accordion-border-radius: 0;
   --bs-accordion-inner-border-radius: 0;
   --bs-accordion-bg: transparent;

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', () => {