fix(checkout): redirect expired purchases from checkout

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">
-            <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
-            <span>Av. San Lorenzo 1542, Rosario</span>
-          </div>
-          <div class="d-flex align-items-center gap-2">
-            <i class="fa-solid fa-phone" aria-hidden="true"></i>
-            <span>54 9 (0341) 6658247</span>
-          </div>
+          @if (address) {
+            <div class="d-flex align-items-center gap-2">
+              <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
+              <span>{{ address }}</span>
+            </div>
+          }
+          @if (phone) {
+            <div class="d-flex align-items-center gap-2">
+              <i class="fa-solid fa-phone" aria-hidden="true"></i>
+              <span>{{ 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);
-  height: 2.75rem;
+  width: min(100%, 230px);
+  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;
-    border-top: 1px solid rgba(255, 255, 255, 0.3);
+    width: 100%;
+    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);
-    height: 2.5rem;
+    width: min(100%, 150px);
+    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">
-          <hr class="store-layout__mobile-separator">
-        </div>
-
-        <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>
-            }
+        @if (displaySeachBar()) {
+          <div class="col-12 px-0 d-md-none order-3">
+            <hr class="store-layout__mobile-separator" />
           </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,14 @@
             </app-button>
           }
 
-          <app-cart-icon
-            [quantity]="cartQuantity()"
-            ariaLabel="Carrito de compras"
-            title="Carrito"
-            (click)="cartClick.emit()"
-          />
+          @if (displayCart()) {
+            <app-cart-icon
+              [quantity]="cartQuantity()"
+              ariaLabel="Carrito de compras"
+              title="Carrito"
+              (click)="cartClick.emit()"
+            />
+          }
 
           <div class="store-layout__user-menu d-none d-md-inline-flex position-relative">
             <app-icon-button
@@ -108,24 +117,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">
-                <a 
-                  class="dropdown-item d-flex align-items-center gap-2 px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item" 
+              <div
+                id="store-mobile-menu"
+                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) {
-                  <a 
-                    class="dropdown-item px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item" 
-                    (click)="onCategorySelect(category)"
-                  >
-                    <span class="fw-medium">{{ category.nombre }}</span>
-                  </a>
+                  @for (category of categories(); track category.id) {
+                    <a
+                      class="dropdown-item px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item"
+                      (click)="onCategorySelect(category)"
+                    >
+                      <span class="fw-medium">{{ category.nombre }}</span>
+                    </a>
+                  }
                 }
               </div>
             }
@@ -135,28 +149,30 @@
     </div>
   </div>
 
-  <div class="store-layout__categories d-none d-md-block">
-    <div class="container-xl px-3 px-md-4">
-      <div class="store-layout__category-menu">
-        <button
-          type="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"
-          aria-label="Categorias"
-          aria-controls="store-category-dropdown"
-          [attr.aria-expanded]="isCategoryDropdownOpen()"
-          (click)="toggleCategoryDropdown()"
-        >
-          <span>Categorias</span>
-          <i class="fa-solid fa-chevron-down" aria-hidden="true"></i>
-        </button>
+  @if (displayCategories()) {
+    <div class="store-layout__categories d-none d-md-block">
+      <div class="container-xl px-3 px-md-4">
+        <div class="store-layout__category-menu">
+          <button
+            type="button"
+            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-label="Categorias"
+            aria-controls="store-category-dropdown"
+            [attr.aria-expanded]="isCategoryDropdownOpen()"
+            (click)="toggleCategoryDropdown()"
+          >
+            <span>Categorias</span>
+            <i class="fa-solid fa-chevron-down" aria-hidden="true"></i>
+          </button>
 
-        <app-category-dropdown
-          id="store-category-dropdown"
-          [categories]="categories()"
-          [open]="isCategoryDropdownOpen()"
-          (categorySelect)="onCategorySelect($event)"
-        />
+          <app-category-dropdown
+            id="store-category-dropdown"
+            [categories]="categories()"
+            [open]="isCategoryDropdownOpen()"
+            (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,16 @@ 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 cartClick = output<void>();
   readonly ticketsClick = output<void>();
   readonly loginClick = output<void>();

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,12 +1,17 @@
 <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 ?? []"
+    [displayCategories]="tenant()?.display_categories ?? true"
+    [displaySeachBar]="tenant()?.display_seach_bar ?? true"
+    [displayCart]="displayCart()"
     (cartClick)="isCartOpen.set(!isCartOpen())"
     (ticketsClick)="onTicketsClick()"
     (loginClick)="onLoginClick()"
@@ -15,11 +20,8 @@
     (categorySelect)="onCategorySelect($event)"
   />
 
-  @if (isCartOpen()) {
-    <div
-      class="store-layout__cart-overlay"
-      (click)="isCartOpen.set(false)"
-    ></div>
+  @if (displayCart() && isCartOpen()) {
+    <div class="store-layout__cart-overlay" (click)="isCartOpen.set(false)"></div>
     <div class="store-layout__cart-dropdown card border-0 shadow-lg">
       <app-cart
         [showClose]="true"
@@ -27,13 +29,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
-          variant="secondary"
-          class="flex-grow-1"
-          (click)="isCartOpen.set(false)"
+        <app-button variant="secondary" class="flex-grow-1" (click)="isCartOpen.set(false)"
           >Seguir comprando</app-button
         >
         <app-button
@@ -61,7 +65,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,15 @@ 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,
+} from '@angular/router';
 
-import { of } from 'rxjs';
+import { BehaviorSubject, of } from 'rxjs';
 
 import { Tenant } from '../../services/tenant.interface';
 import { TenantService } from '../../services/tenant.service';
@@ -22,6 +28,8 @@ const tenant: Tenant = {
   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 +38,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 +148,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 +164,10 @@ describe('StoreLayoutComponent', () => {
       imports: [StoreLayoutComponent],
       providers: [
         provideRouter([]),
+        {
+          provide: ActivatedRoute,
+          useValue: { queryParamMap: queryParamMapState.asObservable() },
+        },
         {
           provide: TenantService,
           useValue: {
@@ -204,6 +227,50 @@ 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('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 +289,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 +611,9 @@ describe('StoreLayoutComponent', () => {
           precio_unitario: '100.00',
           catalog_item_id: 1,
           variant_id: null,
-          product: {
-            nombre: 'Producto',
-            imagen: null,
-          },
+          nombre: 'Producto',
+          imagen: null,
+          variant: null,
         },
       ],
     });
@@ -585,10 +663,9 @@ describe('StoreLayoutComponent', () => {
           precio_unitario: '100.00',
           catalog_item_id: 1,
           variant_id: null,
-          product: {
-            nombre: 'Producto',
-            imagen: null,
-          },
+          nombre: 'Producto',
+          imagen: null,
+          variant: null,
         },
       ],
     });
@@ -608,4 +685,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,13 @@
-import { Component, computed, inject, OnInit, signal } from '@angular/core';
-import { Router, RouterOutlet } from '@angular/router';
+import { Component, computed, DestroyRef, inject, OnInit, signal } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 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 +33,25 @@ 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 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 +69,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 +86,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,6 +149,12 @@ export class StoreLayoutComponent implements OnInit {
   });
 
   ngOnInit(): void {
+    this.route.queryParamMap.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
+      if (params.get('openCart') === 'true') {
+        this.isCartOpen.set(true);
+      }
+    });
+
     this.cartService.loadCart().subscribe({
       error: (err) => console.error('Error loading cart', err),
     });
@@ -143,8 +187,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
-    // its CanDeactivate guard can cancel the pending purchase.
+    // Leave checkout before closing the authenticated session so its component
+    // can stop payment polling cleanly. The checkout itself remains pending.
     if (isLeavingCheckout) {
       const navigationSucceeded = await this.router.navigate(['/']);
 

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 {
-  nombre: string;
-  imagen: string | null;
+export interface CartItemVariantOption {
+  value: string;
+  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

@@ -24,9 +24,13 @@ describe('CartService', () => {
         precio_unitario: '10.00',
         catalog_item_id: 5,
         variant_id: 10,
-        product: {
-          nombre: 'Test Product (Size: M)',
-          imagen: null,
+        nombre: 'Test Product (Size: M)',
+        imagen: null,
+        variant: {
+          id: 10,
+          precio: '10.00',
+          stock_tecnico: 1,
+          values: { size: 'M' },
         },
       },
     ],

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

@@ -50,9 +50,7 @@ export class CartService extends BaseApiService {
   ): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .post<
-        ApiResponse<Cart>
-      >(
+      .post<ApiResponse<Cart>>(
         `${this.tenantApiUrl}/cart/items`,
         { catalog_item_id: catalogItemId, variant_id: variantId, cantidad },
         {
@@ -71,21 +69,27 @@ 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<
-        ApiResponse<Cart>
-      >(
-        `${this.tenantApiUrl}/cart/items/${cartItemId}`,
-        { cantidad },
-        {
-          withCredentials: true,
-        },
-      )
+      .patch<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, payload, {
+        withCredentials: true,
+      })
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
@@ -101,9 +105,7 @@ export class CartService extends BaseApiService {
   removeItem(cartItemId: number): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .delete<
-        ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
+      .delete<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
         withCredentials: true,
       })
       .pipe(

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,60 @@ 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 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[];
+  maximum_addable_quantity?: number | null;
   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 +80,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 +91,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;
+  maximum_addable_quantity?: number | null;
   images?: string[];
 }
 
-export type CatalogProductLayout = 'row' | 'column_with_image' | 'column_with_cart';
-export type CatalogGroupLayout = 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
+export type CatalogProductLayout =
+  | '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;
-  values: Record<string, string>;
+  descripcion?: string | null;
+  precio?: string;
+  maximum_addable_quantity?: number | null;
+  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;
+  maximum_addable_quantity?: number | null;
   variants?: CatalogFeaturedItemVariant[];
 }
 
@@ -93,6 +155,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(
-    id: number,
-    variantId?: number,
-  ): Observable<CatalogItemDetail> {
+  getCatalogItem(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

@@ -3,6 +3,7 @@ import { firstValueFrom } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
 import { BaseApiService } from './base-api.service';
+import { CartItemVariant } from './cart/cart.interface';
 
 export interface UpdatePurchaseCustomerPayload {
   dni: string;
@@ -11,16 +12,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: {
-        catalog_item_id: number;
-        variant_id: number | null;
-        cantidad: number;
-      };
+      direct_items: DirectCheckoutItem[];
     };
 
 export interface PurchaseStatusResponse {
@@ -45,6 +74,7 @@ export interface PurchaseDetailItemResponse {
   line_total: string;
   source_catalog_item_id: number | null;
   source_variant_id: number | null;
+  variants?: CartItemVariant[];
   item_details: {
     nombre: string;
     descripcion: string | null;
@@ -61,12 +91,13 @@ 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;
   nombre_apellido: string | null;
   email: string | null;
-  items_source: 'purchase';
+  items_source: 'purchase' | 'cart';
   items: PurchaseDetailItemResponse[];
   tickets_count?: number;
   has_generated_tickets?: boolean;
@@ -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 };
@@ -145,7 +176,20 @@ export class CheckoutService extends BaseApiService {
     purchaseId: number,
     itemId: number,
     quantity: number,
+    cartId: number | null = null,
+    itemsSource: 'purchase' | 'cart' = 'purchase',
   ): Promise<PurchaseDetailResponse> {
+    if (itemsSource === 'cart' && cartId !== null) {
+      await firstValueFrom(
+        this.http.patch(
+          `${environment.url}tenants/${tenantCode}/checkout-carts/${cartId}/items/${itemId}`,
+          { cantidad: quantity },
+        ),
+      );
+
+      return this.getPurchase(tenantCode, purchaseId);
+    }
+
     const response = await firstValueFrom(
       this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`,
@@ -161,6 +205,51 @@ export class CheckoutService extends BaseApiService {
     return purchase;
   }
 
+  async updateItemVariant(
+    tenantCode: string,
+    purchaseId: number,
+    itemId: number,
+    variantId: number,
+    quantity: number,
+    cartId: number | null = null,
+    itemsSource: 'purchase' | 'cart' = 'purchase',
+  ): Promise<PurchaseDetailResponse> {
+    if (itemsSource === 'cart' && cartId !== null) {
+      await firstValueFrom(
+        this.http.patch(
+          `${environment.url}tenants/${tenantCode}/checkout-carts/${cartId}/items/${itemId}`,
+          { cantidad: quantity, variant_id: variantId },
+        ),
+      );
+    } else {
+      await firstValueFrom(
+        this.http.patch(
+          `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`,
+          { quantity, variant_id: variantId },
+        ),
+      );
+    }
+
+    return this.getPurchase(tenantCode, purchaseId);
+  }
+
+  async removeItem(
+    tenantCode: string,
+    purchaseId: number,
+    itemId: number,
+    cartId: number | null = null,
+    itemsSource: 'purchase' | 'cart' = 'purchase',
+  ): Promise<PurchaseDetailResponse> {
+    const url =
+      itemsSource === 'cart' && cartId !== null
+        ? `${environment.url}tenants/${tenantCode}/checkout-carts/${cartId}/items/${itemId}`
+        : `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`;
+
+    await firstValueFrom(this.http.delete(url));
+
+    return this.getPurchase(tenantCode, purchaseId);
+  }
+
   async prepareItemEditing(
     tenantCode: string,
     purchaseId: number,
@@ -180,10 +269,7 @@ export class CheckoutService extends BaseApiService {
     return purchase;
   }
 
-  async completePurchase(
-    tenantCode: string,
-    purchaseId: number,
-  ): Promise<PurchaseStatusResponse> {
+  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 +307,7 @@ export class CheckoutService extends BaseApiService {
     return { status: purchase.status ?? null };
   }
 
-  async cancelPurchase(
-    tenantCode: string,
-    purchaseId: number,
-  ): Promise<PurchaseStatusResponse> {
+  async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
     const response = await firstValueFrom(
       this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/cancel`,
@@ -248,9 +331,7 @@ export class CheckoutService extends BaseApiService {
     if (status) {
       url += `?status=${status}`;
     }
-    const response = await firstValueFrom(
-      this.http.get<{ data: PurchaseSummaryResponse[] }>(url),
-    );
+    const response = await firstValueFrom(this.http.get<{ data: PurchaseSummaryResponse[] }>(url));
     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;
-  event_config?: EventConfig | null;
-  search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart';
-  search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
+  search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart' | 'ticket_selector';
+  search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel' | 'single';
   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>(
-          `${environment.url}tenants/bootstrap/${domain}`
-        )
+        this.http
+          .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,6 +7,7 @@ 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';
@@ -32,6 +33,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 +47,7 @@ interface CarouselProductMock {
     PaginatorComponent,
     ProductColumnWithImageComponent,
     ProductRowCardComponent,
+    ProductTicketSelectorComponent,
     ProductVerticalWithCartCardComponent,
     StoreSectionComponent,
     IconButtonComponent,
@@ -204,8 +211,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' },
-      { label: '11 de Octubre', value: '11-oct' },
+      { id: '10-oct-manana', values: { fecha: '10 de Octubre', turno: 'Mañana' } },
+      { id: '10-oct-tarde', values: { fecha: '10 de Octubre', turno: 'Tarde' } },
+      { id: '11-oct-tarde', values: { fecha: '11 de Octubre', turno: 'Tarde' } },
     ],
   };
 
@@ -215,6 +223,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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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 +398,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/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]="!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--disabled]="!availableOptions()[attribute.id][option.id]"
+              [class.attribute-selector__text-option--selected]="
+                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]="!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

@@ -31,7 +31,7 @@ describe('ProductAttributeSelectorComponent', () => {
     fixture.componentRef.setInput('variants', [
       {
         id: 1,
-        stock_tecnico: null,
+        maximum_addable_quantity: null,
         values: { size: 'S' },
       },
     ]);
@@ -51,12 +51,12 @@ describe('ProductAttributeSelectorComponent', () => {
     fixture.componentRef.setInput('variants', [
       {
         id: 1,
-        stock_tecnico: 0,
+        maximum_addable_quantity: 0,
         values: { size: 'S' },
       },
       {
         id: 2,
-        stock_tecnico: 2,
+        maximum_addable_quantity: 2,
         values: { size: 'M' },
       },
     ]);
@@ -68,4 +68,85 @@ 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, maximum_addable_quantity: null, values: { event_date: '1' } },
+      { id: 2, maximum_addable_quantity: null, values: { event_date: '2' } },
+      { id: 3, maximum_addable_quantity: 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, maximum_addable_quantity: null, values: { size: 'S', internal_type: 'adult' } },
+      { id: 2, maximum_addable_quantity: 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

@@ -32,48 +32,69 @@ export class ProductAttributeSelectorComponent {
 
   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] ?? [];
+
+        if (
+          !attribute.allow_multi_select &&
+          selectedForAttribute.length >= 1 &&
+          !selectedForAttribute.includes(option.id)
+        ) {
+          availability[attribute.codigo][option.id] = false;
+          continue;
+        }
 
         const isAvailable = variants.some((variant) => {
           if (!this.isVariantAvailable(variant)) return false;
 
-          const variantAttrValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
-          if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) {
+          const variantAttrValues = this.getVariantAttributeValues(attribute, variant.values);
+          const desiredOptionIds = selectedForAttribute.includes(option.id)
+            ? selectedForAttribute
+            : [...selectedForAttribute, 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;
-            const selectedOptionId = selections[otherAttr.id];
-            if (selectedOptionId !== undefined) {
-              const selectedOption = otherAttr.options.find((o) => o.id === selectedOptionId);
-              if (selectedOption) {
-                const selectedNormalized = this.normalizeText(
-                  selectedOption.value || selectedOption.label,
-                );
-                const vAttrValue = this.getDefaultVariantAttributeValue(otherAttr, variant.values);
-                if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) {
-                  return false;
-                }
-              }
+            if (otherAttr.codigo === attribute.codigo) continue;
+            const selectedOptionIds = selections[otherAttr.codigo] ?? [];
+            const selectedValues = selectedOptionIds
+              .map((id) => otherAttr.options.find((candidate) => candidate.id === id))
+              .filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
+              .map((candidate) => this.normalizeText(candidate.value || candidate.label));
+            const variantValues = this.getVariantAttributeValues(otherAttr, variant.values);
+            if (!selectedValues.every((value) => variantValues.includes(value))) {
+              return false;
             }
           }
           return true;
         });
 
-        availability[attribute.id][option.id] = isAvailable;
+        availability[attribute.codigo][option.id] = isAvailable;
       }
     }
 
@@ -86,7 +107,7 @@ export class ProductAttributeSelectorComponent {
 
   constructor() {
     effect(() => {
-      const attributes = this.attributes();
+      const attributes = this.visibleAttributes();
       const defaultVariant = this.selectedVariant();
 
       untracked(() => {
@@ -97,7 +118,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 +130,28 @@ 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) => ({
-      ...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 +166,44 @@ 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);
-      if (optionId !== null) {
-        selections[attribute.id] = optionId;
+      const optionIds = this.findDefaultOptionIds(attribute, defaultVariant);
+      if (optionIds.length > 0) {
+        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);
-    if (!defaultValue) {
-      return null;
+    const defaultValues = this.getVariantAttributeValues(attribute, variant.values);
+    if (defaultValues.length === 0) {
+      return [];
     }
 
-    const normalizedValue = this.normalizeText(defaultValue);
-    const matchByValue = attribute.options.find(
-      (option) => this.normalizeText(option.value) === normalizedValue,
-    );
-
-    if (matchByValue) {
-      return matchByValue.id;
-    }
-
-    const matchByLabel = attribute.options.find(
-      (option) => this.normalizeText(option.label) === normalizedValue,
-    );
-
-    return matchByLabel?.id ?? null;
+    return attribute.options
+      .filter(
+        (option) =>
+          defaultValues.includes(this.normalizeText(option.value)) ||
+          defaultValues.includes(this.normalizeText(option.label)),
+      )
+      .map((option) => option.id);
   }
 
-  private getDefaultVariantAttributeValue(
+  private getVariantAttributeValues(
     attribute: ProductAttribute,
-    variantAttributes: Record<string, string>,
-  ): string | null {
+    variantAttributes: Record<string, string | string[]>,
+  ): string[] {
     const normalizedCodigo = this.normalizeText(attribute.codigo);
     const normalizedNombre = this.normalizeText(attribute.nombre);
 
@@ -186,11 +211,11 @@ 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;
+    return [];
   }
 
   private normalizeText(value: string | null | undefined): string {
@@ -202,7 +227,7 @@ export class ProductAttributeSelectorComponent {
   }
 
   private isVariantAvailable(variant: CatalogItemVariant): boolean {
-    return this.inventoryPolicy() === 'unlimited' || (variant.stock_tecnico ?? 0) > 0;
+    return variant.maximum_addable_quantity !== 0;
   }
 
   private findFirstHexValue(value: unknown): string | null {
@@ -234,7 +259,7 @@ export class ProductAttributeSelectorComponent {
   }
 
   private emitMatchingVariant(
-    selections: Record<number, number>,
+    selections: Record<string, number[]>,
     variants: CatalogItemVariant[],
     attributes: ProductAttribute[],
   ): void {
@@ -243,18 +268,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];
-      if (selectedOptionId === undefined) {
+      const selectedOptionIds = selections[attr.codigo] ?? [];
+      if (
+        selectedOptionIds.length === 0 ||
+        (!attr.allow_multi_select && selectedOptionIds.length !== 1)
+      ) {
         allSelected = false;
         break;
       }
-      const option = attr.options.find((o) => o.id === selectedOptionId);
-      if (option) {
-        selectedValuesById[attr.id] = this.normalizeText(option.value || option.label);
-      }
+      selectedValuesByCode[attr.codigo] = selectedOptionIds
+        .map((id) => attr.options.find((option) => option.id === id))
+        .filter((option): option is ProductAttributeOption => option !== undefined)
+        .map((option) => this.normalizeText(option.value || option.label))
+        .sort();
     }
 
     if (!allSelected) {
@@ -264,10 +293,12 @@ export class ProductAttributeSelectorComponent {
 
     const matchingVariant = variants.find((variant) => {
       return attributes.every((attr) => {
-        const selectedValue = selectedValuesById[attr.id];
-        const variantValue = this.getDefaultVariantAttributeValue(attr, variant.values);
-        if (!variantValue) return false;
-        return this.normalizeText(variantValue) === selectedValue;
+        const selectedValues = selectedValuesByCode[attr.codigo];
+        const variantValues = this.getVariantAttributeValues(attr, variant.values).sort();
+        return (
+          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/purchase-list.scss

@@ -23,7 +23,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 {

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.ts

@@ -9,7 +9,16 @@ 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,
+  switchMap,
+  tap,
+} from 'rxjs';
 
 import { AuthService } from '../../../../core/services/auth/auth.service';
 import { CartService } from '../../../../core/services/cart/cart.service';
@@ -52,6 +61,7 @@ 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() {
@@ -113,7 +123,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 +138,25 @@ export class CategoryItemsPageComponent {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
-        direct_item: {
-          catalog_item_id: event.product.id,
-          variant_id: event.variant ?? null,
-          cantidad: event.quantity,
-        },
-      });
+      const reservedCartId = event.reservedInCart ? (this.cartService.cart()?.id ?? null) : null;
+      if (event.reservedInCart && reservedCartId === null) {
+        this.toastService.danger('No se pudo identificar el carrito reservado.');
+        return;
+      }
+      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 +167,31 @@ export class CategoryItemsPageComponent {
   }
 
   protected onAddToCart(event: ProductListCartEvent): void {
-    this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).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);
-      },
+    const productId = event.product.id;
+    if (this.savingProductIds().has(productId)) {
+      return;
+    }
+
+    this.setProductSaving(productId, true);
+    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

@@ -58,16 +58,23 @@
         [subtotal]="cartSubtotal()"
         [discount]="cartDiscount()"
         [total]="cartTotal()"
-        [allowEditing]="
-          createdPurchase()?.status === 'created' || createdPurchase()?.status === 'pending_payment'
-        "
-        [allowRemove]="false"
+        [readonly]="!canModifyCart()"
+        [allowModify]="true"
+        [showModifyWhenReadonly]="true"
+        [allowUpdateQuantity]="canUpdateCartQuantity()"
+        [allowUpdateVariant]="canUpdateCartVariant()"
+        [requireEditingMode]="true"
+        [allowDelete]="canDeleteCartItems()"
         [persistQuantityChanges]="false"
+        [persistVariantChanges]="false"
+        [persistDeleteChanges]="false"
         [editing]="isEditingItems()"
         [editingDisabled]="isUpdatingItem() || isPreparingItemEdit()"
         backgroundColor="transparent"
         (editingChange)="onEditingItemsChange($event)"
         (itemQuantityChange)="onPurchaseItemQuantityChange($event)"
+        (itemVariantChange)="onPurchaseItemVariantChange($event)"
+        (itemRemove)="onPurchaseItemRemove($event)"
       />
     </div>
   </div>

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

@@ -64,7 +64,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';
@@ -10,6 +11,8 @@ import { CartService } from '../../../../core/services/cart/cart.service';
 import { CheckoutService } from '../../../../core/services/checkout.service';
 import { CatalogService } from '../../../../core/services/catalog/catalog.service';
 import { TenantService } from '../../../../core/services/tenant.service';
+import { ToastService } from '../../../../core/services/toast.service';
+import { CartEditingPolicy } from '../../../../core/services/tenant.interface';
 import { CheckoutPageComponent } from './checkout-page.component';
 
 describe('CheckoutPageComponent payment validation', () => {
@@ -17,11 +20,13 @@ describe('CheckoutPageComponent payment validation', () => {
     startCheckout: ReturnType<typeof vi.fn>;
     updateCustomerData: ReturnType<typeof vi.fn>;
     updateItemQuantity: ReturnType<typeof vi.fn>;
+    updateItemVariant: ReturnType<typeof vi.fn>;
+    removeItem: 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: {
@@ -31,8 +36,15 @@ describe('CheckoutPageComponent payment validation', () => {
     clearCart: ReturnType<typeof vi.fn>;
   };
   let routerStub: { navigate: ReturnType<typeof vi.fn> };
+  let toastServiceStub: { danger: 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 {
@@ -54,13 +66,15 @@ describe('CheckoutPageComponent payment validation', () => {
       }),
       updateCustomerData: vi.fn(),
       updateItemQuantity: vi.fn(),
+      updateItemVariant: vi.fn(),
+      removeItem: vi.fn(),
       prepareItemEditing: vi.fn(),
       cancelPurchase: vi.fn().mockResolvedValue({ status: 'cancelled' }),
       generatePaymentIntent: vi.fn().mockResolvedValue({
         qr_data: { qr_code: 'qr-value' },
       }),
+      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
       getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
-      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'in_review' }),
       withCustomLoading: vi.fn(),
     };
     checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
@@ -86,8 +100,19 @@ describe('CheckoutPageComponent payment validation', () => {
       });
     });
     routerStub = { navigate: vi.fn() };
+    toastServiceStub = { danger: vi.fn() };
     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],
@@ -95,8 +120,9 @@ describe('CheckoutPageComponent payment validation', () => {
         { provide: CheckoutService, useValue: checkoutServiceStub },
         { provide: CatalogService, useValue: { getCatalogItem: vi.fn() } },
         { provide: CartService, useValue: cartServiceStub },
-        { provide: TenantService, useValue: { tenant: signal({ codigo: 'tenant-test' }) } },
+        { provide: TenantService, useValue: { tenant: tenantState } },
         { provide: AuthService, useValue: { user: authUserState } },
+        { provide: ToastService, useValue: toastServiceStub },
         {
           provide: ActivatedRoute,
           useValue: {
@@ -194,21 +220,28 @@ 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('pending');
+    expect(component.transferValidationStatus()).toBe('checking');
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
+    expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
+
+    for (let attempt = 1; attempt <= 3; attempt += 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(cartServiceStub.clearCart).not.toHaveBeenCalled();
-    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
-
-    await vi.advanceTimersByTimeAsync(30_000);
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
-
-    await component.onComplete();
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
+    expect(routerStub.navigate).not.toHaveBeenCalled();
   });
 
   it('navigates after a transfer is confirmed as paid', async () => {
@@ -217,23 +250,57 @@ 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(cartServiceStub.clearCart).not.toHaveBeenCalled();
+    expect(routerStub.navigate).not.toHaveBeenCalled();
+  });
+
+  it('does not poll when submitting a transfer for review fails', async () => {
     vi.spyOn(console, 'error').mockImplementation(() => undefined);
     checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error'));
     const { component } = createComponent();
     component.selectedPaymentMethod.set('transfer');
 
     await component.onComplete();
+    await vi.advanceTimersByTimeAsync(12_000);
 
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
+    expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
     expect(component.transferValidationStatus()).toBe('error');
-    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
-    expect(routerStub.navigate).not.toHaveBeenCalled();
+  });
+
+  it('cancels transfer polling when the payment method changes or the component is destroyed', async () => {
+    const first = createComponent();
+    first.component.selectedPaymentMethod.set('transfer');
+    first.component.onComplete();
+    checkoutServiceStub.generatePaymentIntent.mockResolvedValueOnce({});
+    await first.component.selectPaymentMethod('qr');
+    await vi.advanceTimersByTimeAsync(12_000);
+    expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
+
+    const second = createComponent();
+    second.component.selectedPaymentMethod.set('transfer');
+    second.component.onComplete();
+    second.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 +433,12 @@ describe('CheckoutPageComponent payment validation', () => {
 
     expect(component.checkoutStepIndex()).toBe(1);
     expect(component.selectedPaymentMethod()).toBe('qr');
-    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith(
-      'tenant-test',
-      25,
-      'qr',
-    );
+    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith('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,6 +458,25 @@ describe('CheckoutPageComponent payment validation', () => {
     },
   );
 
+  it('redirects a submitted pending payment purchase to its status page', async () => {
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockResolvedValue({
+      id: 25,
+      status: 'pending_payment',
+      payment_method: 'transfer',
+      expires_at: null,
+      transfer_payer_dni: null,
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    });
+
+    createComponent();
+    await Promise.resolve();
+
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
+  });
+
   it('updates a purchase item while editing and refreshes checkout totals', async () => {
     const updatedPurchase = {
       id: 25,
@@ -420,7 +502,14 @@ describe('CheckoutPageComponent payment validation', () => {
       quantity: 3,
     });
 
-    expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith('tenant-test', 25, 91, 3);
+    expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith(
+      'tenant-test',
+      25,
+      91,
+      3,
+      null,
+      'purchase',
+    );
     expect(component.createdPurchase()).toBe(updatedPurchase);
     expect(component.isUpdatingItem()).toBe(false);
   });
@@ -453,6 +542,60 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(component.isEditingItems()).toBe(false);
   });
 
+  it('shows Modificar and returns to the home cart when checkout editing is disabled', async () => {
+    tenantState.set({
+      codigo: 'tenant-test',
+      checkout_editing_policy: {
+        code: 'disabled',
+        allow_modify: false,
+        allow_delete: false,
+        allow_update_quantity: false,
+        allow_update_variant: false,
+      },
+    });
+    const { fixture, 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',
+    });
+    fixture.detectChanges();
+
+    const modifyButton = (fixture.nativeElement as HTMLElement).querySelector('.cart-edit-btn');
+    expect(modifyButton?.textContent?.trim()).toBe('Modificar');
+    expect(
+      (fixture.nativeElement as HTMLElement).querySelector('app-quantity-selector'),
+    ).toBeNull();
+
+    await component.onEditingItemsChange(true);
+
+    expect(component.canUpdateCartQuantity()).toBe(false);
+    expect(component.canModifyCart()).toBe(false);
+    expect(component.isEditingItems()).toBe(false);
+    expect(checkoutServiceStub.prepareItemEditing).not.toHaveBeenCalled();
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/'], {
+      queryParams: { openCart: true },
+    });
+  });
+
   it('updates customer data on the existing purchase before payment', async () => {
     const updatedPurchase = {
       id: 25,
@@ -487,14 +630,65 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(component.stepper.next).toHaveBeenCalledOnce();
   });
 
-  it('cancels the pending purchase before allowing navigation away', async () => {
+  it('keeps the checkout purchase intact when navigating away', async () => {
     const { component } = createComponent();
 
     await expect(component.canDeactivate()).resolves.toBe(true);
 
-    expect(checkoutServiceStub.cancelPurchase).toHaveBeenCalledWith('tenant-test', 25);
+    expect(checkoutServiceStub.cancelPurchase).not.toHaveBeenCalled();
     expect(cartServiceStub.loadCart).toHaveBeenCalled();
     expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
-    expect(component.createdPurchaseId()).toBeNull();
+    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';
@@ -20,6 +21,7 @@ import {
 } from '../../../../core/services/checkout.service';
 import { AuthService } from '../../../../core/services/auth/auth.service';
 import { CartService } from '../../../../core/services/cart/cart.service';
+import { ToastService } from '../../../../core/services/toast.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';
@@ -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,
@@ -59,11 +67,17 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   private readonly authService = inject(AuthService);
   private readonly cartService = inject(CartService);
   private readonly qrPollingIntervalMs = 5_000;
+  private readonly toastService = inject(ToastService);
   private readonly qrPollingMaxAttempts = 9;
+  private readonly transferPollingIntervalMs = 3_000;
+  private readonly transferPollingMaxAttempts = 4;
 
   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;
 
@@ -79,6 +93,18 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   protected readonly createdPurchase = signal<PurchaseDetailResponse | null>(null);
   protected readonly isLoadingPurchase = signal(true);
   protected readonly checkoutStepIndex = signal(0);
+  protected readonly canUpdateCartQuantity = computed(
+    () => this.tenantService.tenant()?.checkout_editing_policy?.allow_update_quantity ?? false,
+  );
+  protected readonly canUpdateCartVariant = computed(
+    () => this.tenantService.tenant()?.checkout_editing_policy?.allow_update_variant ?? false,
+  );
+  protected readonly canDeleteCartItems = computed(
+    () => this.tenantService.tenant()?.checkout_editing_policy?.allow_delete ?? false,
+  );
+  protected readonly canModifyCart = computed(
+    () => this.tenantService.tenant()?.checkout_editing_policy?.allow_modify ?? false,
+  );
 
   protected readonly cartSubtotal = computed(() => {
     const purchase = this.createdPurchase();
@@ -101,7 +127,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);
@@ -156,6 +181,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.stopQrPolling();
+    this.stopTransferPolling();
   }
 
   private mapPurchaseItemToMock(item: PurchaseDetailItemResponse): CartItemMock {
@@ -171,6 +197,8 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
         value: attribute.value === null ? '' : String(attribute.value),
       })),
       quantity: item.quantity,
+      variantId: item.source_variant_id,
+      variants: item.variants,
     };
   }
 
@@ -179,6 +207,32 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       return;
     }
 
+    if (editing && !this.canModifyCart()) {
+      const tenant = this.tenantService.tenant();
+      const purchaseId = this.createdPurchaseId();
+
+      if (!tenant || !purchaseId) {
+        return;
+      }
+
+      this.isPreparingItemEdit.set(true);
+      try {
+        await this.checkoutService.cancelPurchase(tenant.codigo, purchaseId);
+        this.createdPurchaseId.set(null);
+        this.createdPurchase.set(null);
+        await firstValueFrom(this.cartService.loadCart());
+        await this.router.navigate(['/'], {
+          queryParams: { openCart: true },
+        });
+      } catch (error) {
+        this.handleCheckoutError(error, 'No se pudo restaurar el carrito para editarlo.');
+      } finally {
+        this.isPreparingItemEdit.set(false);
+      }
+
+      return;
+    }
+
     if (!editing) {
       this.isEditingItems.set(false);
 
@@ -191,6 +245,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
     this.isEditingItems.set(true);
     this.stopQrPolling();
+    this.stopTransferPolling();
     this.qrData.set(null);
     this.qrPaymentStatus.set('idle');
     this.transferAccount.set(null);
@@ -209,7 +264,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       const purchase = await this.checkoutService.prepareItemEditing(tenant.codigo, purchaseId);
       this.createdPurchase.set(purchase);
     } catch (error) {
-      console.error('Failed to prepare purchase item editing:', error);
+      this.handleCheckoutError(error, 'No se pudo preparar la compra para editarla.');
       this.isEditingItems.set(false);
     } finally {
       this.isPreparingItemEdit.set(false);
@@ -224,7 +279,14 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     const purchaseId = this.createdPurchaseId();
     const itemId = event.item.cartItemId;
 
-    if (!tenant || !purchaseId || !itemId || this.isUpdatingItem() || !this.isEditingItems()) {
+    if (
+      !this.canUpdateCartQuantity() ||
+      !tenant ||
+      !purchaseId ||
+      !itemId ||
+      this.isUpdatingItem() ||
+      !this.isEditingItems()
+    ) {
       return;
     }
 
@@ -235,10 +297,85 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
         purchaseId,
         itemId,
         event.quantity,
+        this.createdPurchase()?.cart_id ?? null,
+        this.createdPurchase()?.items_source ?? 'purchase',
       );
       this.createdPurchase.set(purchase);
     } catch (error) {
-      console.error('Failed to update purchase item quantity:', error);
+      this.handleCheckoutError(error, 'No se pudo actualizar la cantidad del producto.');
+    } finally {
+      this.isUpdatingItem.set(false);
+    }
+  }
+
+  protected async onPurchaseItemVariantChange(event: {
+    item: CartItemMock;
+    variantId: number;
+  }): Promise<void> {
+    const tenant = this.tenantService.tenant();
+    const purchase = this.createdPurchase();
+    const itemId = event.item.cartItemId;
+
+    if (
+      !this.canUpdateCartVariant() ||
+      !tenant ||
+      !purchase ||
+      !itemId ||
+      this.isUpdatingItem() ||
+      !this.isEditingItems()
+    ) {
+      return;
+    }
+
+    this.isUpdatingItem.set(true);
+    try {
+      this.createdPurchase.set(
+        await this.checkoutService.updateItemVariant(
+          tenant.codigo,
+          purchase.id,
+          itemId,
+          event.variantId,
+          event.item.quantity,
+          purchase.cart_id,
+          purchase.items_source,
+        ),
+      );
+    } catch (error) {
+      this.handleCheckoutError(error, 'No se pudo actualizar la variante del producto.');
+    } finally {
+      this.isUpdatingItem.set(false);
+    }
+  }
+
+  protected async onPurchaseItemRemove(event: { item: CartItemMock }): Promise<void> {
+    const tenant = this.tenantService.tenant();
+    const purchase = this.createdPurchase();
+    const itemId = event.item.cartItemId;
+
+    if (
+      !this.canDeleteCartItems() ||
+      !tenant ||
+      !purchase ||
+      !itemId ||
+      this.isUpdatingItem() ||
+      !this.isEditingItems()
+    ) {
+      return;
+    }
+
+    this.isUpdatingItem.set(true);
+    try {
+      this.createdPurchase.set(
+        await this.checkoutService.removeItem(
+          tenant.codigo,
+          purchase.id,
+          itemId,
+          purchase.cart_id,
+          purchase.items_source,
+        ),
+      );
+    } catch (error) {
+      this.handleCheckoutError(error, 'No se pudo eliminar el producto de la compra.');
     } finally {
       this.isUpdatingItem.set(false);
     }
@@ -268,8 +405,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       // Auto trigger intent for default option
       void this.selectPaymentMethod(this.selectedPaymentMethod());
     } catch (error) {
-      console.error('Failed to create purchase:', error);
-      // Here we could show an alert or toast
+      this.handleCheckoutError(error, 'No se pudieron actualizar los datos de la compra.');
     } finally {
       this.isUpdatingPurchase.set(false);
     }
@@ -283,34 +419,21 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
   public async canDeactivate(): Promise<boolean> {
     this.stopQrPolling();
+    this.stopTransferPolling();
 
     if (this.navigationStarted) {
       return true;
     }
 
-    const purchaseId = this.createdPurchaseId();
-    const tenant = this.tenantService.tenant();
-
-    if (!purchaseId || !tenant) {
-      return true;
-    }
-
+    // The checkout cart remains attached to its purchase. Once the user adds a
+    // new item, the cart API creates a separate active cart automatically.
     try {
-      await this.checkoutService.cancelPurchase(tenant.codigo, purchaseId);
-      this.createdPurchaseId.set(null);
-      this.createdPurchase.set(null);
-
-      try {
-        await firstValueFrom(this.cartService.loadCart());
-      } catch (error) {
-        console.error('Failed to restore cart after cancelling checkout:', error);
-      }
-
-      return true;
+      await firstValueFrom(this.cartService.loadCart());
     } catch (error) {
-      console.error('Failed to cancel purchase:', error);
-      return false;
+      console.error('Failed to load the active cart after leaving checkout:', error);
     }
+
+    return true;
   }
 
   protected async selectPaymentMethod(method: PaymentMethod): Promise<void> {
@@ -319,6 +442,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     }
 
     this.stopQrPolling();
+    this.stopTransferPolling();
     this.qrPaymentStatus.set('idle');
     this.transferValidationStatus.set('idle');
     this.selectedPaymentMethod.set(method);
@@ -331,7 +455,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;
     }
 
@@ -357,7 +481,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
         this.startQrPolling();
       }
     } catch (error) {
-      console.error('Failed to generate payment intent:', error);
+      this.handleCheckoutError(error, 'No se pudo generar la intenci\u00f3n de pago.');
     } finally {
       this.isGeneratingIntent.set(false);
     }
@@ -376,6 +500,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     }
 
     this.transferDni.set(dni);
+    this.stopTransferPolling();
     this.transferValidationStatus.set('idle');
     this.isGeneratingIntent.set(true);
     try {
@@ -393,7 +518,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
         });
       }
     } catch (error) {
-      console.error('Failed to generate transfer payment intent:', error);
+      this.handleCheckoutError(error, 'No se pudo generar la intenci\u00f3n de transferencia.');
     } finally {
       this.isGeneratingIntent.set(false);
     }
@@ -430,22 +555,97 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       return;
     }
 
+    this.stopTransferPolling();
     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 la compra a revisi\u00f3n.',
+      );
+
+      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 +759,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
 
     this.navigationStarted = true;
     this.stopQrPolling();
+    this.stopTransferPolling();
 
     void this.router.navigate(['/checkout/status', purchaseId]);
   }
@@ -576,7 +777,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
         .getPurchase(tenant.codigo, purchaseId);
 
       if (
-        purchase.status === 'in_review' ||
+        (purchase.status === 'pending_payment' && purchase.expires_at === null) ||
         purchase.status === 'paid' ||
         purchase.status === 'cancelled' ||
         purchase.status === 'rejected' ||
@@ -613,4 +814,54 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       void this.router.navigate(['/']);
     }
   }
+
+  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.navigationStarted = true;
+      this.stopQrPolling();
+      this.stopTransferPolling();
+      this.toastService.danger(
+        response?.code === 'purchase.expired' && response.message
+          ? response.message
+          : 'La compra venci\u00f3. Inici\u00e1 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

@@ -18,14 +18,7 @@
             />
 
             <span class="payment-method__label">
-              @if (method.id === 'telepagos') {
-                <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 }}
-              }
+              {{ method.label }}
             </span>
 
             <i class="fa-solid fa-angle-right payment-method__chevron" aria-hidden="true"></i>
@@ -59,8 +52,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

@@ -101,26 +101,13 @@
   }
 }
 
-.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-telepagos {
+  > app-checkout-payment-transfer {
     display: block;
     width: 100%;
     max-width: 320px;

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,7 +14,7 @@ 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

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) {
@@ -63,7 +63,9 @@
                   [disabled]="!selectedVariantAvailable() || 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
@@ -99,7 +101,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';
@@ -22,6 +23,7 @@ import {
 describe('ProductDetailPageComponent', () => {
   const mockProduct: CatalogItemDetail = {
     id: 1,
+    type: 'product',
     category_id: 10,
     brand_id: null,
     slug: 'auriculares-bluetooth',
@@ -35,7 +37,7 @@ describe('ProductDetailPageComponent', () => {
     has_tickets: false,
     minimum_use_date: null,
     maximum_use_date: null,
-    stock_tecnico: 10,
+    maximum_addable_quantity: 10,
     attributes: [],
     variants: [],
   };
@@ -189,10 +191,10 @@ describe('ProductDetailPageComponent', () => {
     const detailProduct: CatalogItemDetail = {
       ...mockProduct,
       images: ['https://example.com/product.png'],
-      variants: [{ id: 123, stock_tecnico: 10, values: {} }],
+      variants: [{ id: 123, maximum_addable_quantity: 10, values: {} }],
       selected_variant: {
         id: 123,
-        stock_tecnico: 10,
+        maximum_addable_quantity: 10,
         images: ['https://example.com/variant1.png', 'https://example.com/variant2.png'],
         values: {},
       },
@@ -293,10 +295,12 @@ describe('ProductDetailPageComponent', () => {
           ],
         },
       ],
-      variants: [{ id: 123, stock_tecnico: 10, values: { color: 'beige', material: 'Cuero' } }],
+      variants: [
+        { id: 123, maximum_addable_quantity: 10, values: { color: 'beige', material: 'Cuero' } },
+      ],
       selected_variant: {
         id: 123,
-        stock_tecnico: 10,
+        maximum_addable_quantity: 10,
         images: ['https://example.com/variant1.png'],
         values: {
           color: 'beige',
@@ -327,6 +331,70 @@ 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, maximum_addable_quantity: 10, values: { event_date: '20' } },
+        { id: 102, event_date_id: 21, maximum_addable_quantity: 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,
+        maximum_addable_quantity: 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();
+
+    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 +413,7 @@ describe('ProductDetailPageComponent', () => {
 
     fixture.componentInstance['selectedVariant'].set({
       id: 1,
-      stock_tecnico: 10,
+      maximum_addable_quantity: 10,
       values: {},
     });
     fixture.detectChanges();
@@ -415,30 +483,58 @@ describe('ProductDetailPageComponent', () => {
     await Promise.resolve();
 
     expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('tenant-test', {
-      direct_item: {
-        catalog_item_id: 1,
-        variant_id: null,
-        cantidad: 1,
-      },
+      direct_items: [
+        {
+          catalog_item_id: 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”.',
+          maximum_addable_quantity: 2,
+        },
+      }),
+    );
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+    const buyButton = Array.from(fixture.nativeElement.querySelectorAll('app-button button')).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,
+          maximum_addable_quantity: 5,
           values: {},
         },
       ],
       selected_variant: {
         id: 123,
-        stock_tecnico: 5,
+        maximum_addable_quantity: 5,
         images: [],
         values: {},
       },
@@ -471,7 +567,7 @@ describe('ProductDetailPageComponent', () => {
     resolveProduct({
       ...mockProduct,
       variants: [],
-      stock_tecnico: 4,
+      maximum_addable_quantity: 4,
     });
 
     await configureTestingModule();
@@ -497,13 +593,13 @@ describe('ProductDetailPageComponent', () => {
       variants: [
         {
           id: 123,
-          stock_tecnico: 5,
+          maximum_addable_quantity: 5,
           values: {},
         },
       ],
       selected_variant: {
         id: 123,
-        stock_tecnico: 5,
+        maximum_addable_quantity: 5,
         images: [],
         values: {},
       },
@@ -535,7 +631,7 @@ describe('ProductDetailPageComponent', () => {
   it('allows unlimited variants to increase quantity without a maximum', async () => {
     const unlimitedVariant = {
       id: 321,
-      stock_tecnico: null,
+      maximum_addable_quantity: null,
       values: {},
     };
     resolveProduct({
@@ -543,7 +639,7 @@ describe('ProductDetailPageComponent', () => {
       inventory_policy: 'unlimited',
       selected_variant: {
         id: 321,
-        stock_tecnico: null,
+        maximum_addable_quantity: null,
         images: [],
         values: {},
       },
@@ -564,17 +660,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,
+      maximum_addable_quantity: 2,
+      values: {},
+    };
+    resolveProduct({
+      ...mockProduct,
+      inventory_policy: 'unlimited',
+      max_units_per_user: 2,
+      selected_variant: {
+        id: 322,
+        maximum_addable_quantity: 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,
+      maximum_addable_quantity: 0,
       values: {},
     };
     resolveProduct({
       ...mockProduct,
       selected_variant: {
         id: 654,
-        stock_tecnico: 0,
+        maximum_addable_quantity: 0,
         images: [],
         values: {},
       },

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

@@ -86,29 +86,43 @@ 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 selectedVariantMax = computed<number | null>(() => {
     const prod = this.product();
     const variant = this.selectedVariant();
-    if (variant) return variant.stock_tecnico;
-    if (prod && prod.variants.length === 0) return prod.stock_tecnico ?? null;
-    return 0;
+    if (!prod) return 0;
+
+    return variant
+      ? (variant.maximum_addable_quantity ?? null)
+      : prod.variants.length === 0
+        ? (prod.maximum_addable_quantity ?? null)
+        : 0;
   });
   protected readonly selectedVariantAvailable = computed(() => {
     const prod = this.product();
     if (!prod) return false;
+    if (this.selectedVariantMax() === 0) return false;
 
     const variant = this.selectedVariant();
-    if (variant) return this.isVariantAvailable(variant, prod);
+    if (variant) return this.isVariantAvailable(variant);
+    if (prod.purpose === 'entry') return false;
     if (prod.variants.length > 0) return false;
 
-    return prod.inventory_policy === 'unlimited' || (prod.stock_tecnico ?? 0) > 0;
+    return this.selectedVariantMax() !== 0;
   });
   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 +137,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       this.carouselHost();
       this.descriptionBody();
       this.product();
+      this.selectedVariant();
       this.descriptionExpanded();
 
       if (this.isBrowser) {
@@ -159,26 +174,26 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       .withCustomLoading()
       .getCatalogItem(productId, variantId)
       .subscribe({
-      next: (prod) => {
-        this.applyProduct(prod, false);
-        this.variantLoading.set(false);
-      },
-      error: (err: HttpErrorResponse) => {
-        const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
-        this.toastService.danger(errorMessage);
-        this.variantLoading.set(false);
+        next: (prod) => {
+          this.applyProduct(prod, false);
+          this.variantLoading.set(false);
+        },
+        error: (err: HttpErrorResponse) => {
+          const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
+          this.toastService.danger(errorMessage);
+          this.variantLoading.set(false);
 
-        this.product.update((currentProduct) => {
-          if (!currentProduct) return null;
-          return {
-            ...currentProduct,
-            variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
-          };
-        });
+          this.product.update((currentProduct) => {
+            if (!currentProduct) return null;
+            return {
+              ...currentProduct,
+              variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
+            };
+          });
 
-        this.attributeSelector()?.reset();
-      },
-    });
+          this.attributeSelector()?.reset();
+        },
+      });
   }
 
   private applyResolvedData(resolvedData: ProductDetailResolvedData): void {
@@ -230,8 +245,11 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     }
 
     this.selectedVariant.set(variant);
-    if (variant && variant.stock_tecnico !== null && this.quantity() > variant.stock_tecnico) {
-      this.quantity.set(Math.max(1, variant.stock_tecnico));
+    this.descriptionExpanded.set(false);
+    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();
@@ -253,17 +271,17 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
       .withCustomLoading()
       .addItem(currentProduct.id, variant?.id ?? null, this.quantity())
       .subscribe({
-      next: (res) => {
-        const msg = res.message || 'Producto agregado al carrito';
-        this.toastService.success(msg);
-        this.addingToCart.set(false);
-      },
-      error: (err: HttpErrorResponse) => {
-        const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
-        this.toastService.danger(errorMessage);
-        this.addingToCart.set(false);
-      },
-    });
+        next: (res) => {
+          const msg = res.message || 'Producto agregado al carrito';
+          this.toastService.success(msg);
+          this.addingToCart.set(false);
+        },
+        error: (err: HttpErrorResponse) => {
+          const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
+          this.toastService.danger(errorMessage);
+          this.addingToCart.set(false);
+        },
+      });
   }
 
   protected async buyNow(): Promise<void> {
@@ -297,11 +315,13 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     this.creatingDirectPurchase.set(true);
     try {
       const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
-        direct_item: {
-          catalog_item_id: currentProduct.id,
-          variant_id: variant?.id ?? null,
-          cantidad: this.quantity(),
-        },
+        direct_items: [
+          {
+            catalog_item_id: currentProduct.id,
+            variant_id: variant?.id ?? null,
+            cantidad: this.quantity(),
+          },
+        ],
       });
 
       await this.router.navigate(['/checkout'], {
@@ -309,14 +329,18 @@ 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;
+  private isVariantAvailable(variant: CatalogItemVariant): boolean {
+    return variant.maximum_addable_quantity !== 0;
   }
 
   protected toggleDescription(): void {

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

@@ -28,7 +28,7 @@ describe('productDetailResolver', () => {
     has_tickets: false,
     minimum_use_date: null,
     maximum_use_date: null,
-    stock_tecnico: 0,
+    maximum_addable_quantity: 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.ts

@@ -9,7 +9,7 @@ import {
   signal,
 } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { catchError, distinctUntilChanged, map, of, switchMap, tap } from 'rxjs';
+import { catchError, distinctUntilChanged, finalize, map, of, switchMap, tap } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 import { CartService } from '../../../../core/services/cart/cart.service';
@@ -58,6 +58,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',
@@ -145,7 +146,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 +161,25 @@ export class SearchPageComponent {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
-        direct_item: {
-          catalog_item_id: event.product.id,
-          variant_id: event.variant ?? null,
-          cantidad: event.quantity,
-        },
-      });
+      const reservedCartId = event.reservedInCart ? (this.cartService.cart()?.id ?? null) : null;
+      if (event.reservedInCart && reservedCartId === null) {
+        this.toastService.danger('No se pudo identificar el carrito reservado.');
+        return;
+      }
+      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 +190,31 @@ export class SearchPageComponent {
   }
 
   protected onAddToCart(event: ProductListCartEvent): void {
-    this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).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);
-      },
+    const productId = event.product.id;
+    if (this.savingProductIds().has(productId)) {
+      return;
+    }
+
+    this.setProductSaving(productId, true);
+    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.length) {
+@if (mainCarouselImages(); as images) {
+  @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) {
-  <app-hero-banner
-    [heroConfig]="tenant()?.hero_config"
-    [eventConfig]="tenant()?.event_config"
-  ></app-hero-banner>
+@if (heroConfig() || eventConfig()) {
+  <app-hero-banner [heroConfig]="heroConfig()" [eventConfig]="eventConfig()" />
 }
 
 @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

@@ -16,6 +16,7 @@ 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 +58,7 @@ function createCatalog(
   return [
     {
       id: 7,
+      code: 'destacados',
       title: 'Destacados',
       layout: 'column_with_image',
       group_layout: 'paginated',
@@ -88,7 +90,7 @@ const pageOneItems: CatalogFeaturedItem[] = [
   },
 ];
 
-function createTenant(mainCarouselImages?: string[]): Tenant {
+function createTenant(extras: Tenant['extras'] = {}): Tenant {
   return {
     id: 1,
     codigo: 'acme',
@@ -102,8 +104,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 +150,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 +159,8 @@ describe('StoreHomePageComponent', () => {
     );
   });
 
-  it('renders the tenant main carousel images at the beginning of the home page', async () => {
-    const mainCarouselImages = [
-      'https://example.com/carousel-1.webp',
-      'https://example.com/carousel-2.webp',
-    ];
+  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 +172,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant(mainCarouselImages)),
+          useValue: createTenantServiceStub(createTenant({ carousel })),
         },
       ],
     }).compileComponents();
@@ -171,25 +181,60 @@ describe('StoreHomePageComponent', () => {
     fixture.detectChanges();
 
     const element = fixture.nativeElement as HTMLElement;
-    const carousel = element.querySelector('app-main-carousel');
-    const images = carousel?.querySelectorAll('.main-carousel__image');
+    const carouselElement = element.querySelector('app-main-carousel');
+    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?.[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();
+    expect(images?.[0].getAttribute('src')).toBe(carousel[0]);
   });
 
-  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 +245,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant([])),
+          useValue: createTenantServiceStub(tenant),
         },
       ],
     }).compileComponents();
@@ -208,7 +253,128 @@ 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 () => {
@@ -323,9 +489,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(
-        of({ data: {}, message: 'Producto agregado correctamente' }),
-      ),
+      addItem: vi
+        .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,7 +10,7 @@ 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';
@@ -18,7 +18,10 @@ import { CatalogFeaturedGroup } from '../../../../core/services/catalog/catalog.
 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,
@@ -60,9 +63,37 @@ 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(
-    () => (this.tenant()?.main_carousel_images?.length ?? 0) > 0,
+  protected readonly unavailableVariantIds = signal<ReadonlySet<number>>(new Set<number>());
+  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 readonly groupRequestSubscriptions = new Map<number, Subscription>();
@@ -109,20 +140,20 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
       .withCustomLoading()
       .getFeaturedGroupItems(groupId, { page })
       .subscribe({
-      next: (items) => {
-        this.catalog.update((groups) =>
-          groups.map((candidate) =>
-            candidate.id === groupId ? { ...candidate, items } : candidate,
-          ),
-        );
-        this.error.set(null);
-      },
-      error: () => {
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
-        this.setGroupLoading(groupId, false);
-      },
-      complete: () => this.setGroupLoading(groupId, false),
-    });
+        next: (items) => {
+          this.catalog.update((groups) =>
+            groups.map((candidate) =>
+              candidate.id === groupId ? { ...candidate, items } : candidate,
+            ),
+          );
+          this.error.set(null);
+        },
+        error: () => {
+          this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+          this.setGroupLoading(groupId, false);
+        },
+        complete: () => this.setGroupLoading(groupId, false),
+      });
 
     this.groupRequestSubscriptions.set(groupId, subscription);
   }
@@ -139,7 +170,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 +185,50 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
-        direct_item: {
-          catalog_item_id: event.product.id,
-          variant_id: event.variant ?? null,
-          cantidad: event.quantity,
-        },
-      });
+      const checkoutService = this.injector.get(CheckoutService);
+      const reservedCartId = event.reservedInCart ? (this.cartService.cart()?.id ?? null) : null;
+      if (event.reservedInCart && reservedCartId === null) {
+        this.toastService.danger('No se pudo identificar el carrito reservado.');
+        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,14 +236,31 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   }
 
   protected onAddToCart(event: ProductListCartEvent): void {
-    this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).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);
-      },
+    const productId = event.product.id;
+    if (this.savingProductIds().has(productId)) {
+      return;
+    }
+
+    this.setProductSaving(productId, true);
+    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;
     });
   }
 
@@ -189,14 +273,14 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
       .withCustomLoading()
       .getCatalog()
       .subscribe({
-      next: (catalog) => this.catalog.set(catalog),
-      error: () => {
-        this.catalog.set([]);
-        this.loading.set(false);
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
-      },
-      complete: () => this.loading.set(false),
-    });
+        next: (catalog) => this.catalog.set(catalog),
+        error: () => {
+          this.catalog.set([]);
+          this.loading.set(false);
+          this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+        },
+        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-item/cart-item.component.html

@@ -1,11 +1,10 @@
-<article
-  class="w-100 p-3 rounded-0 cart-item"
-  [class.cart-item-with-media]="imageUrl()"
->
+<article class="w-100 p-3 rounded-0 cart-item" [class.cart-item-with-media]="imageUrl()">
   @if (imageUrl()) {
     <div class="position-relative overflow-hidden cart-item-media">
       @if (discountPercentage() && discountPercentage()! > 0) {
-        <span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge">-{{ discountPercentage() }}%</span>
+        <span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge"
+          >-{{ discountPercentage() }}%</span
+        >
       }
 
       <img class="w-100 h-100 object-fit-cover d-block" [src]="imageUrl()" [alt]="product()" />
@@ -18,21 +17,33 @@
 
       <div class="text-nowrap cart-item-prices">
         @if (formattedOriginalPrice(); as originalPrice) {
-          <span class="text-decoration-line-through mb-1 fw-light cart-item-original-price">{{ originalPrice }}</span>
+          <span class="text-decoration-line-through mb-1 fw-light cart-item-original-price">{{
+            originalPrice
+          }}</span>
         }
 
         <span class="fw-bold cart-item-discounted-price">{{ formattedDiscountedPrice() }}</span>
       </div>
     </div>
 
-    <div class="d-grid cart-item-attributes">
-      @for (attribute of attributes(); track attribute.label + attribute.value) {
-        <div class="cart-item-attribute">
-          <span class="fw-normal cart-item-attribute-label">{{ attribute.label }}: </span>
-          <span class="fw-bold">{{ attribute.value }}</span>
-        </div>
-      }
-    </div>
+    @if (hasVariantSelectors() && !variantDisabled()) {
+      <app-variant-selector
+        class="cart-item-variant-selector"
+        [variants]="variants()"
+        [selectedVariant]="selectedVariant()"
+        [compact]="true"
+        (selectedVariantChange)="onVariantChange($event)"
+      />
+    } @else {
+      <div class="d-grid cart-item-attributes">
+        @for (attribute of attributes(); track attribute.label + attribute.value) {
+          <div class="cart-item-attribute">
+            <span class="fw-normal cart-item-attribute-label">{{ attribute.label }}: </span>
+            <span class="fw-bold">{{ attribute.value }}</span>
+          </div>
+        }
+      </div>
+    }
 
     @if (!readonly()) {
       <div class="d-flex justify-content-end align-items-center mt-auto cart-item-actions">
@@ -44,16 +55,10 @@
           (increase)="onIncrease()"
           (decrease)="onDecrease()"
         />
-        @if (!quantityDisabled() && showRemove()) {
-          <app-icon-button
-            variant="trash"
-            class="cart-item-remove-btn"
-            (click)="onRemove()"
-          />
+        @if (!removeDisabled() && allowDelete()) {
+          <app-icon-button variant="trash" class="cart-item-remove-btn" (click)="onRemove()" />
         }
       </div>
     }
   </div>
 </article>
-
-

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

@@ -11,7 +11,7 @@
 
 :host(:first-child) .cart-item::before,
 :host .cart-item::after {
-  content: "";
+  content: '';
   position: absolute;
   right: var(--item-divider-inset);
   left: var(--item-divider-inset);
@@ -43,7 +43,7 @@
   aspect-ratio: 1 / 1;
   border-radius: 5px 0 0 5px;
   background-color: #ffffff;
-  border: 1px solid #eaeaea;
+  border: 1px solid var(--border-color);
   overflow: hidden;
 
   img {
@@ -119,6 +119,11 @@
   gap: 0.125rem;
 }
 
+.cart-item-variant-selector {
+  display: block;
+  width: 100%;
+}
+
 .cart-item-remove-btn {
   margin-left: 0.35rem;
 }

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

@@ -1,6 +1,10 @@
 import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
 import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
 import { IconButtonComponent } from '../icon-button/icon-button.component';
+import {
+  VariantSelectorComponent,
+  VariantSelectorVariant,
+} from '../variant-selector/variant-selector.component';
 
 export interface CartItemAttribute {
   label: string;
@@ -10,10 +14,10 @@ export interface CartItemAttribute {
 @Component({
   selector: 'app-cart-item',
   standalone: true,
-  imports: [QuantitySelectorComponent, IconButtonComponent],
+  imports: [QuantitySelectorComponent, IconButtonComponent, VariantSelectorComponent],
   templateUrl: './cart-item.component.html',
   styleUrl: './cart-item.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CartItemComponent {
   readonly imageUrl = input<string | null>(null);
@@ -22,15 +26,24 @@ export class CartItemComponent {
   readonly discountedPrice = input<number>(0);
   readonly discountPercentage = input<number | null>(null);
   readonly attributes = input<CartItemAttribute[]>([]);
+  readonly variants = input<VariantSelectorVariant[]>([]);
+  readonly selectedVariant = input<unknown>(null);
   readonly quantity = input<number>(1);
   readonly readonly = input<boolean>(false);
   readonly quantityDisabled = input<boolean>(false);
-  readonly showRemove = input<boolean>(true);
+  readonly variantDisabled = input<boolean>(false);
+  readonly removeDisabled = input<boolean>(false);
+  readonly allowDelete = input<boolean>(true);
 
   readonly quantityChange = output<number>();
   readonly remove = output<void>();
   readonly increase = output<void>();
   readonly decrease = output<void>();
+  readonly variantChange = output<number>();
+
+  protected readonly hasVariantSelectors = computed(() =>
+    this.variants().some((variant) => Object.keys(variant.values).length > 0),
+  );
 
   protected onQuantityChange(newQuantity: number): void {
     if (this.quantityDisabled()) return;
@@ -49,12 +62,20 @@ export class CartItemComponent {
     this.decrease.emit();
   }
 
+  protected onVariantChange(variant: unknown): void {
+    if (!this.variantDisabled() && typeof variant === 'number') {
+      this.variantChange.emit(variant);
+    }
+  }
+
   protected readonly formattedOriginalPrice = computed(() => {
     const price = this.originalPrice();
     return price === null ? null : this.formatCurrency(price);
   });
 
-  protected readonly formattedDiscountedPrice = computed(() => this.formatCurrency(this.discountedPrice()));
+  protected readonly formattedDiscountedPrice = computed(() =>
+    this.formatCurrency(this.discountedPrice()),
+  );
 
   private formatCurrency(value: number): string {
     const rounded = Math.round(value);

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

@@ -1,12 +1,17 @@
 <section
-  class="d-flex flex-column h-100 overflow-hidden text-secondary"
+  class="d-flex flex-column overflow-hidden text-secondary cart-shell"
   [style.background-color]="backgroundColor()"
 >
   <header class="d-flex align-items-center p-3 justify-content-between bg-transparent cart-header">
     <h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2>
 
     <div class="d-flex align-items-center cart-header-actions">
-      @if (!readonly() && allowEditing() && items().length > 0) {
+      @if (
+        allowModify() &&
+        (!readonly() || showModifyWhenReadonly()) &&
+        requireEditingMode() &&
+        items().length > 0
+      ) {
         <button
           class="btn btn-link p-0 border-0 cart-edit-btn"
           type="button"
@@ -44,11 +49,28 @@
         [discountedPrice]="item.discountedPrice"
         [discountPercentage]="item.discountPercentage"
         [attributes]="item.attributes"
+        [variants]="item.variants ?? []"
+        [selectedVariant]="getItemVariant(item)"
         [quantity]="getItemQuantity(item)"
         [readonly]="readonly()"
-        [quantityDisabled]="editingDisabled() || (allowEditing() && !editing())"
-        [showRemove]="allowRemove()"
+        [quantityDisabled]="
+          readonly() ||
+          !allowUpdateQuantity() ||
+          editingDisabled() ||
+          (requireEditingMode() && !editing())
+        "
+        [variantDisabled]="
+          readonly() ||
+          !allowUpdateVariant() ||
+          editingDisabled() ||
+          (requireEditingMode() && !editing())
+        "
+        [removeDisabled]="
+          readonly() || !allowDelete() || editingDisabled() || (requireEditingMode() && !editing())
+        "
+        [allowDelete]="allowDelete()"
         (quantityChange)="onItemQuantityChange(idx, $event)"
+        (variantChange)="onItemVariantChange(idx, $event)"
         (remove)="onItemRemove(idx)"
       />
     } @empty {

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

@@ -1,7 +1,15 @@
 :host {
-  display: block;
+  display: flex;
   width: 100%;
-  height: 100%;
+  min-height: 0;
+  max-height: 100%;
+  overflow: hidden;
+}
+
+.cart-shell {
+  flex: 1 1 auto;
+  min-height: 0;
+  max-height: 100%;
 }
 
 .cart-header {

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

@@ -115,7 +115,7 @@ describe('CartComponent', () => {
 
     expect(openConfirmDelete).toHaveBeenCalledWith({
       title: 'Eliminar producto',
-      content: 'Se eliminara "Producto de prueba" del carrito. Esta accion no se puede deshacer.',
+      content: 'Se eliminará “Producto de prueba” del carrito. Esta acción no se puede deshacer.',
       confirmLabel: 'Eliminar',
       cancelLabel: 'Cancelar',
     });
@@ -340,7 +340,7 @@ describe('CartComponent', () => {
         quantity: 1,
       },
     ]);
-    fixture.componentRef.setInput('allowEditing', true);
+    fixture.componentRef.setInput('requireEditingMode', true);
     const editingChange = vi.fn();
     fixture.componentInstance.editing.subscribe(editingChange);
     fixture.detectChanges();
@@ -407,4 +407,106 @@ describe('CartComponent', () => {
       fixture.debugElement.query(By.css('app-cart-item')).componentInstance.quantityDisabled(),
     ).toBe(false);
   });
+
+  it('hides the edit toggle and disables quantity changes when quantity updates are false', async () => {
+    await TestBed.configureTestingModule({
+      imports: [CartComponent],
+      providers: [
+        {
+          provide: CartService,
+          useValue: {
+            cart: signal(null).asReadonly(),
+            updateItemQuantity: vi.fn(),
+            removeItem: vi.fn(),
+          },
+        },
+        { provide: ModalService, useValue: {} },
+        {
+          provide: ToastService,
+          useValue: { success: vi.fn(), info: vi.fn(), danger: vi.fn() },
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(CartComponent);
+    fixture.componentRef.setInput('items', [
+      {
+        cartItemId: 10,
+        imageUrl: null,
+        product: 'Producto de prueba',
+        originalPrice: null,
+        discountedPrice: 1000,
+        discountPercentage: null,
+        attributes: [],
+        quantity: 1,
+      },
+    ]);
+    fixture.componentRef.setInput('requireEditingMode', true);
+    fixture.componentRef.setInput('allowModify', false);
+    fixture.componentRef.setInput('allowUpdateQuantity', false);
+    const quantityChange = vi.fn();
+    fixture.componentInstance.itemQuantityChange.subscribe(quantityChange);
+    fixture.detectChanges();
+
+    expect(fixture.debugElement.query(By.css('.cart-edit-btn'))).toBeNull();
+    const cartItem = fixture.debugElement.query(By.css('app-cart-item'));
+    expect(cartItem.componentInstance.quantityDisabled()).toBe(true);
+
+    cartItem.triggerEventHandler('quantityChange', 2);
+
+    expect(quantityChange).not.toHaveBeenCalled();
+  });
+
+  it('persists a variant selected from a cart row', async () => {
+    const updateItemVariant = vi.fn().mockReturnValue(
+      of({
+        message: 'Variante actualizada.',
+        data: {},
+      }),
+    );
+
+    await TestBed.configureTestingModule({
+      imports: [CartComponent],
+      providers: [
+        {
+          provide: CartService,
+          useValue: {
+            cart: signal(null).asReadonly(),
+            updateItemQuantity: vi.fn(),
+            updateItemVariant,
+            removeItem: vi.fn(),
+          },
+        },
+        { provide: ModalService, useValue: {} },
+        {
+          provide: ToastService,
+          useValue: { success: vi.fn(), info: vi.fn(), danger: vi.fn() },
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(CartComponent);
+    fixture.componentRef.setInput('items', [
+      {
+        cartItemId: 10,
+        imageUrl: null,
+        product: 'Comida',
+        originalPrice: null,
+        discountedPrice: 1000,
+        discountPercentage: null,
+        attributes: [{ label: 'Servicio', value: 'Almuerzo' }],
+        quantity: 2,
+        variantId: 20,
+        variants: [
+          { id: 20, values: { servicio: 'Almuerzo' } },
+          { id: 21, values: { servicio: 'Cena' } },
+        ],
+      },
+    ]);
+    fixture.detectChanges();
+
+    fixture.debugElement.query(By.css('app-cart-item')).triggerEventHandler('variantChange', 21);
+
+    expect(updateItemVariant).toHaveBeenCalledWith(10, 2, 21);
+  });
 });

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

@@ -16,6 +16,7 @@ import { CartItemAttribute, CartItemComponent } from '../cart-item/cart-item.com
 import { ModalService } from '../../../core/services/modal.service';
 import { CartService } from '../../../core/services/cart/cart.service';
 import { ToastService } from '../../../core/services/toast.service';
+import { VariantSelectorVariant } from '../variant-selector/variant-selector.component';
 
 export interface CartItemMock {
   cartItemId?: number;
@@ -26,6 +27,8 @@ export interface CartItemMock {
   discountPercentage: number | null;
   attributes: CartItemAttribute[];
   quantity: number;
+  variantId?: number | null;
+  variants?: VariantSelectorVariant[];
 }
 
 @Component({
@@ -50,9 +53,15 @@ export class CartComponent {
   readonly total = input<number>(0);
   readonly backgroundColor = input<string>('#ffffff');
   readonly readonly = input<boolean>(false);
-  readonly allowEditing = input<boolean>(false);
-  readonly allowRemove = input<boolean>(true);
+  readonly allowUpdateQuantity = input<boolean>(true);
+  readonly allowModify = input<boolean>(true);
+  readonly showModifyWhenReadonly = input<boolean>(false);
+  readonly requireEditingMode = input<boolean>(false);
+  readonly allowUpdateVariant = input<boolean>(true);
+  readonly allowDelete = input<boolean>(true);
   readonly persistQuantityChanges = input<boolean>(true);
+  readonly persistVariantChanges = input<boolean>(true);
+  readonly persistDeleteChanges = input<boolean>(true);
   readonly editingDisabled = input<boolean>(false);
   readonly editing = model<boolean>(false);
 
@@ -62,8 +71,15 @@ export class CartComponent {
     index: number;
     quantity: number;
   }>();
+  readonly itemVariantChange = output<{
+    item: CartItemMock;
+    index: number;
+    variantId: number;
+  }>();
+  readonly itemRemove = output<{ item: CartItemMock; index: number }>();
 
   protected readonly quantityOverrides = signal<Record<number, number>>({});
+  protected readonly variantOverrides = signal<Record<number, number>>({});
   constructor() {
     this.quantityUpdates$
       .pipe(
@@ -104,6 +120,13 @@ export class CartComponent {
     return item.quantity;
   }
 
+  protected getItemVariant(item: CartItemMock): number | null {
+    if (item.cartItemId !== undefined && this.variantOverrides()[item.cartItemId] !== undefined) {
+      return this.variantOverrides()[item.cartItemId];
+    }
+    return item.variantId ?? null;
+  }
+
   private clearOverride(cartItemId: number): void {
     this.quantityOverrides.update((overrides) => {
       const copy = { ...overrides };
@@ -113,6 +136,10 @@ export class CartComponent {
   }
 
   protected onItemQuantityChange(index: number, newQuantity: number): void {
+    if (!this.allowUpdateQuantity()) {
+      return;
+    }
+
     const mockItem = this.items()[index];
     if (!mockItem) {
       return;
@@ -153,7 +180,47 @@ export class CartComponent {
     }
   }
 
+  protected onItemVariantChange(index: number, variantId: number): void {
+    if (this.readonly() || !this.allowUpdateVariant() || this.editingDisabled()) return;
+
+    const item = this.items()[index];
+    const cartItemId = item?.cartItemId;
+
+    if (!item || !cartItemId || variantId === this.getItemVariant(item)) return;
+
+    this.itemVariantChange.emit({ item, index, variantId });
+
+    if (!this.persistVariantChanges()) {
+      return;
+    }
+
+    this.variantOverrides.update((overrides) => ({ ...overrides, [cartItemId]: variantId }));
+    this.cartService
+      .updateItemVariant(cartItemId, this.getItemQuantity(item), variantId)
+      .subscribe({
+        next: (response) => {
+          this.clearVariantOverride(cartItemId);
+          this.toastService.success(response.message || 'Variante actualizada.');
+        },
+        error: (error: HttpErrorResponse) => {
+          console.error('Error updating cart item variant', error);
+          this.clearVariantOverride(cartItemId);
+          this.toastService.danger(error.error?.message || 'No se pudo actualizar la variante.');
+        },
+      });
+  }
+
+  private clearVariantOverride(cartItemId: number): void {
+    this.variantOverrides.update((overrides) => {
+      const copy = { ...overrides };
+      delete copy[cartItemId];
+      return copy;
+    });
+  }
+
   protected onItemRemove(index: number): void {
+    if (this.readonly() || !this.allowDelete() || this.editingDisabled()) return;
+
     const target = this.resolveRemoveTarget(index);
 
     if (!target) {
@@ -163,13 +230,20 @@ export class CartComponent {
     this.modalService
       .openConfirmDelete({
         title: 'Eliminar producto',
-        content: `Se eliminara "${target.productName}" del carrito. Esta accion no se puede deshacer.`,
+        content: `Se eliminará “${target.productName}” del carrito. Esta acción no se puede deshacer.`,
         confirmLabel: 'Eliminar',
         cancelLabel: 'Cancelar',
       })
       .subscribe((confirmed) => {
         if (confirmed) {
-          this.removeItem(target.cartItemId);
+          const item = this.items()[index];
+          if (item) {
+            this.itemRemove.emit({ item, index });
+          }
+
+          if (this.persistDeleteChanges()) {
+            this.removeItem(target.cartItemId);
+          }
         }
       });
   }
@@ -179,7 +253,7 @@ export class CartComponent {
   protected readonly formattedTotal = computed(() => this.formatCurrency(this.total()));
 
   protected toggleEditing(): void {
-    if (this.editingDisabled()) {
+    if (!this.allowModify() || this.editingDisabled()) {
       return;
     }
 
@@ -213,7 +287,7 @@ export class CartComponent {
 
     return {
       cartItemId: item.id,
-      productName: item.product?.nombre ?? 'este producto',
+      productName: item.nombre ?? 'este producto',
     };
   }
 

src/app/shared/components/confirm-delete-modal/confirm-delete-modal.component.scss

@@ -1,19 +1,25 @@
 .confirm-modal {
   display: grid;
-  gap: 1.5rem;
-  justify-items: center;
+  width: 100%;
+  gap: 1.25rem;
   text-align: center;
 }
 
 .confirm-modal__content {
   margin: 0;
-  color: #666666;
-  line-height: 1.5;
+  color: #5f6368;
+  line-height: 1.55;
 }
 
 .confirm-modal__actions {
-  display: flex;
-  justify-content: center;
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  width: 100%;
   gap: 0.75rem;
-  flex-wrap: wrap;
+}
+
+@media (max-width: 380px) {
+  .confirm-modal__actions {
+    grid-template-columns: 1fr;
+  }
 }

src/app/shared/components/global-loading/global-loading.component.scss

@@ -12,7 +12,7 @@
 .global-loading__spinner {
   width: 3rem;
   height: 3rem;
-  border: 0.25rem solid rgba(32, 32, 32, 0.12);
+  border: 0.25rem solid var(--border-color);
   border-top-color: var(--tenant-primary, #6376f3);
   border-radius: 50%;
   animation: global-loading-spin 0.75s linear infinite;

src/app/shared/components/hero-banner/hero-banner.component.html

@@ -1,15 +1,18 @@
 <div class="hero-banner-container">
-  <div
-    class="hero-banner position-relative rounded"
-  >
-    <div
-      class="hero-media"
-      aria-hidden="true"
-      [ngStyle]="{'background-image': heroConfig?.background_image ? 'url(' + heroConfig.background_image + ')' : 'none'}"
-    ></div>
-    
+  <div class="hero-banner position-relative rounded">
+    @if (desktopImageUrl) {
+      <picture class="hero-media" aria-hidden="true">
+        @if (mobileImageUrl) {
+          <source media="(max-width: 767.98px)" [srcset]="mobileImageUrl" />
+        }
+        <img [src]="desktopImageUrl" alt="" />
+      </picture>
+    }
+
     @if (heroConfig) {
-      <div class="hero-content d-flex justify-content-end p-4 p-md-5 w-100 h-100 align-items-center">
+      <div
+        class="hero-content d-flex justify-content-end p-4 p-md-5 w-100 h-100 align-items-center"
+      >
         <div class="hero-text-box">
           @if (heroConfig.title_html) {
             <div class="hero-title" [innerHTML]="heroConfig.title_html"></div>
@@ -18,7 +21,10 @@
             <div class="hero-description" [innerHTML]="heroConfig.description_html"></div>
           }
           @if (heroConfig.button_text) {
-            <a [href]="heroConfig.button_href || '#'" class="hero-action text-decoration-none mt-3 d-inline-block">
+            <a
+              [href]="heroConfig.button_href || '#'"
+              class="hero-action text-decoration-none mt-3 d-inline-block"
+            >
               <app-button variant="primary">
                 {{ heroConfig.button_text }}
               </app-button>
@@ -27,35 +33,78 @@
         </div>
       </div>
     }
-
-    @if (eventConfig) {
-      <div class="event-card-container position-absolute w-100 d-flex justify-content-center">
-        <div id="event-details" class="event-card bg-white shadow rounded p-3 p-md-4 text-center">
-          @if (eventConfig.title) {
-            <h3 class="event-title text-primary fw-bold mb-3">{{ eventConfig.title }}</h3>
-          }
-          
-          <div class="event-details d-flex flex-column flex-md-row justify-content-center align-items-center gap-3 gap-md-5 text-muted">
-            @if (eventConfig.dates && eventConfig.dates.length > 0) {
-              <div class="d-flex align-items-center gap-2">
-                <i class="fa-regular fa-calendar event-icon"></i>
-                <span class="event-info-text">{{ formattedDates }}</span>
-              </div>
-            }
-            @if (eventConfig.location) {
-              <div class="d-flex align-items-center gap-2">
-                <i class="fa-solid fa-location-dot event-icon"></i>
-                <span class="event-info-text">{{ eventConfig.location }}</span>
-              </div>
-            }
-          </div>
-
-          <div class="event-schedule-label" aria-hidden="true">
-            <i class="fa-solid fa-chevron-down"></i>
-            <span>Ver horarios</span>
-          </div>
-        </div>
-      </div>
-    }
   </div>
+
+  @if (eventConfig) {
+    <div class="event-card-container w-100 d-flex justify-content-center">
+      <div id="event-details" class="event-card bg-white shadow rounded p-3 p-md-4 text-center">
+        @if (eventConfig.title) {
+          <h3 class="event-title text-primary fw-bold mb-3">{{ eventConfig.title }}</h3>
+        }
+
+        <div
+          class="event-details d-flex flex-column flex-md-row justify-content-center align-items-center gap-3 gap-md-5 text-muted"
+        >
+          @if (eventConfig.dates && eventConfig.dates.length > 0) {
+            <div class="d-flex align-items-center gap-2">
+              <i class="fa-regular fa-calendar event-icon"></i>
+              <span class="event-info-text">{{ formattedDates }}</span>
+            </div>
+          }
+          @if (eventConfig.location) {
+            <div class="d-flex align-items-center gap-2">
+              <i class="fa-solid fa-location-dot event-icon"></i>
+              <span class="event-info-text">{{ eventConfig.location }}</span>
+            </div>
+          }
+        </div>
+
+        @if (eventConfig.dates && eventConfig.dates.length > 0) {
+          <button
+            type="button"
+            class="event-schedule-toggle"
+            [attr.aria-expanded]="schedulesExpanded"
+            aria-controls="event-schedules"
+            (click)="toggleSchedules()"
+          >
+            <i
+              class="fa-solid"
+              [class.fa-chevron-down]="!schedulesExpanded"
+              [class.fa-chevron-up]="schedulesExpanded"
+              aria-hidden="true"
+            ></i>
+            <span>{{ schedulesExpanded ? 'Ocultar horarios' : 'Ver horarios' }}</span>
+          </button>
+
+          @if (schedulesExpanded) {
+            <div id="event-schedules" class="event-schedules">
+              <table class="table table-striped table-borderless mb-0">
+                <tbody>
+                  @for (eventDate of eventConfig.dates; track eventDate.id ?? eventDate.date) {
+                    <tr>
+                      <td>
+                        <span class="event-schedule-value">
+                          <i class="fa-regular fa-calendar" aria-hidden="true"></i>
+                          <span>{{ formatScheduleDate(eventDate.date) }}</span>
+                        </span>
+                      </td>
+                      <td>
+                        <span class="event-schedule-value">
+                          <i class="fa-regular fa-clock" aria-hidden="true"></i>
+                          <span>
+                            {{ formatScheduleTime(eventDate.start_time) }} -
+                            {{ formatScheduleTime(eventDate.end_time) }}
+                          </span>
+                        </span>
+                      </td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </div>
+          }
+        }
+      </div>
+    </div>
+  }
 </div>

src/app/shared/components/hero-banner/hero-banner.component.scss

@@ -1,5 +1,4 @@
 .hero-banner-container {
-  padding-bottom: 4rem; /* Spacing to accommodate the overlapping card */
   margin-bottom: 1rem;
 }
 
@@ -13,16 +12,30 @@
 .hero-media {
   position: absolute;
   inset: 0;
+  display: block;
+  overflow: hidden;
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
   border-radius: inherit;
 
+  img {
+    display: block;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+
   &::after {
-    content: "";
+    content: '';
     position: absolute;
     inset: 0;
-    background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.7) 50%, rgba(255, 255, 255, 0.95) 100%);
+    background: linear-gradient(
+      to right,
+      rgba(255, 255, 255, 0) 0%,
+      rgba(255, 255, 255, 0.7) 50%,
+      rgba(255, 255, 255, 0.95) 100%
+    );
     border-radius: inherit;
   }
 }
@@ -39,8 +52,8 @@
   flex-grow: 1;
 }
 
-
-::ng-deep .hero-title, .hero-title {
+::ng-deep .hero-title,
+.hero-title {
   color: #666666;
   font-size: 1.5rem;
   margin-bottom: 1rem;
@@ -49,7 +62,16 @@
   }
 }
 
-::ng-deep .hero-description, .hero-description {
+::ng-deep .hero-title h1 {
+  margin: 0;
+  color: inherit;
+  font-size: inherit;
+  font-weight: 700;
+  line-height: inherit;
+}
+
+::ng-deep .hero-description,
+.hero-description {
   color: #666666;
   font-size: 1.1rem;
   line-height: 1.5;
@@ -59,8 +81,8 @@
 }
 
 .event-card-container {
-  bottom: -40px; /* Negative margin to pull it down and overlap */
-  left: 0;
+  position: relative;
+  margin-top: -40px;
   z-index: 10;
 }
 
@@ -70,12 +92,14 @@
 }
 
 .event-title {
-  font-size: 1.4rem;
+  font-size: 25px;
+  font-weight: 700;
   letter-spacing: 0.5px;
+  text-transform: uppercase;
 }
 
 .event-details {
-  font-size: 1.1rem;
+  font-size: 21px;
 }
 
 .event-icon {
@@ -85,11 +109,54 @@
 
 .event-info-text {
   color: #8a8a8a;
-  font-weight: 500;
+  font-weight: 400;
 }
 
-.event-schedule-label {
-  display: none;
+.event-schedule-toggle {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.55rem;
+  margin-top: 1.75rem;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: var(--tenant-primary, #009d4f);
+  font-size: 15px;
+  font-weight: 700;
+
+  &:focus-visible {
+    outline: 2px solid currentColor;
+    outline-offset: 0.25rem;
+  }
+
+  i {
+    font-size: 0.7rem;
+  }
+}
+
+.event-schedules {
+  margin-top: 1.25rem;
+
+  td {
+    width: 50%;
+    padding: 0.65rem 1rem;
+    vertical-align: middle;
+  }
+}
+
+.event-schedule-value {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.75rem;
+  color: #8a8a8a;
+  font-size: 19px;
+  font-weight: 400;
+
+  i {
+    width: 1rem;
+    color: #c9ccce;
+  }
 }
 
 @media (max-width: 767.98px) {
@@ -99,9 +166,12 @@
   }
 
   .hero-banner {
+    width: 100vw;
     min-height: 0;
+    margin-inline: calc(50% - 50vw);
     overflow: hidden;
     background-color: #f5f5f5;
+    border-radius: 0 !important;
   }
 
   .hero-media {
@@ -109,7 +179,7 @@
     inset: auto;
     flex: 0 0 auto;
     width: 100%;
-    height: clamp(8.75rem, 44vw, 10.5rem);
+    height: clamp(8.75rem, 44vw, 211px);
     background-position: center center;
     background-size: 140% auto;
     border-radius: 0;
@@ -168,39 +238,33 @@
   }
 
   .hero-action ::ng-deep .btn {
-    min-height: 1.875rem;
-    padding: 0.4rem 1.35rem;
-    border-radius: 0.25rem;
-    font-size: 0.625rem;
+    font-size: 11px;
   }
 
   .event-card-container {
-    position: relative !important;
-    bottom: auto;
-    left: auto;
-    padding: 0 1.25rem 1.2rem;
+    margin-top: 0;
+    padding: 0 0 1.2rem;
   }
 
   .event-card {
     width: 100%;
-    max-width: 22rem;
+    max-width: none;
     min-height: 11.4rem;
-    padding: 1.75rem 1rem 0.8rem !important;
+    padding: 2.5rem 1.5rem !important;
     border-radius: 0 !important;
     box-shadow: 0 1px 5px rgba(0, 0, 0, 0.04) !important;
   }
 
   .event-title {
-    max-width: 16rem;
     margin: 0 auto 0.85rem !important;
-    font-size: 1rem;
+    font-size: 22px;
     line-height: 1.1;
     letter-spacing: 0;
   }
 
   .event-details {
     gap: 0.45rem !important;
-    font-size: 0.7rem;
+    font-size: 15px;
     line-height: 1.25;
   }
 
@@ -213,22 +277,25 @@
     font-size: 0.85rem;
   }
 
-  .event-info-text {
-    font-weight: 400;
-  }
-
-  .event-schedule-label {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    gap: 0.55rem;
+  .event-schedule-toggle {
     margin-top: 1.9rem;
-    color: var(--tenant-primary, #009d4f);
-    font-size: 0.625rem;
-    font-weight: 700;
+    font-size: 13px;
   }
 
-  .event-schedule-label i {
+  .event-schedule-toggle i {
     font-size: 0.65rem;
   }
+
+  .event-schedules {
+    margin-top: 1rem;
+
+    td {
+      padding: 0.55rem 0.4rem;
+    }
+  }
+
+  .event-schedule-value {
+    gap: 0.4rem;
+    font-size: 14px;
+  }
 }

src/app/shared/components/hero-banner/hero-banner.component.spec.ts

@@ -0,0 +1,72 @@
+import { TestBed } from '@angular/core/testing';
+import { HeroBannerComponent } from './hero-banner.component';
+
+describe('HeroBannerComponent', () => {
+  it('renders desktop and mobile crop variants', async () => {
+    await TestBed.configureTestingModule({ imports: [HeroBannerComponent] }).compileComponents();
+
+    const fixture = TestBed.createComponent(HeroBannerComponent);
+    fixture.componentRef.setInput('heroConfig', {
+      background_image_id: {
+        desktop: 'https://example.com/desktop.jpg',
+        mobile: 'https://example.com/mobile.jpg',
+      },
+    });
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+
+    expect(element.querySelector('source')?.getAttribute('srcset')).toBe(
+      'https://example.com/mobile.jpg',
+    );
+    expect(element.querySelector('img')?.getAttribute('src')).toBe(
+      'https://example.com/desktop.jpg',
+    );
+  });
+
+  it('expands and collapses the event schedules', async () => {
+    await TestBed.configureTestingModule({ imports: [HeroBannerComponent] }).compileComponents();
+
+    const fixture = TestBed.createComponent(HeroBannerComponent);
+    fixture.componentRef.setInput('eventConfig', {
+      title: 'Fiesta Nacional del Fútbol Infantil',
+      location: 'Sunchales, Santa Fe',
+      dates: [
+        {
+          id: 1,
+          date: '2026-10-09',
+          start_time: '10:00:00',
+          end_time: '20:30:00',
+        },
+        {
+          id: 2,
+          date: '2026-10-10',
+          start_time: '10:00:00',
+          end_time: '22:00:00',
+        },
+      ],
+    });
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const toggle = element.querySelector<HTMLButtonElement>('.event-schedule-toggle');
+
+    expect(toggle?.textContent).toContain('Ver horarios');
+    expect(toggle?.getAttribute('aria-expanded')).toBe('false');
+    expect(element.querySelector('.event-schedules')).toBeNull();
+
+    toggle?.click();
+    fixture.detectChanges();
+
+    expect(toggle?.textContent).toContain('Ocultar horarios');
+    expect(toggle?.getAttribute('aria-expanded')).toBe('true');
+    expect(element.querySelectorAll('.event-schedules tbody tr')).toHaveLength(2);
+    expect(element.querySelector('.event-schedules')?.textContent).toContain('9 de Octubre 2026');
+    expect(element.querySelector('.event-schedules')?.textContent).toContain('10:00 - 20:30');
+
+    toggle?.click();
+    fixture.detectChanges();
+
+    expect(element.querySelector('.event-schedules')).toBeNull();
+  });
+});

src/app/shared/components/hero-banner/hero-banner.component.ts

@@ -1,7 +1,7 @@
 import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { HeroConfig, EventConfig } from '../../../core/services/tenant.interface';
+import { EventConfig, HeroConfig } from '../../../core/services/tenant.interface';
 import { ButtonComponent } from '../button/button.component';
 
 @Component({
@@ -16,26 +16,53 @@ export class HeroBannerComponent {
   @Input() heroConfig?: HeroConfig | null;
   @Input() eventConfig?: EventConfig | null;
 
+  protected schedulesExpanded = false;
+
+  protected get desktopImageUrl(): string | null {
+    const image = this.heroConfig?.background_image_id;
+
+    return typeof image === 'string' ? image : (image?.desktop ?? null);
+  }
+
+  protected get mobileImageUrl(): string | null {
+    const image = this.heroConfig?.background_image_id;
+
+    return typeof image === 'string' ? image : (image?.mobile ?? image?.desktop ?? null);
+  }
+
   get formattedDates(): string {
+    if (this.eventConfig?.dates_text) {
+      return this.eventConfig.dates_text;
+    }
+
     if (!this.eventConfig?.dates || this.eventConfig.dates.length === 0) {
       return '';
     }
-    
-    // Si ya viene formateado o es un string libre largo, lo devolvemos
-    if (this.eventConfig.dates.length === 1 && this.eventConfig.dates[0].length > 10) {
-      return this.eventConfig.dates[0];
-    }
-    
-    // Si viene como array de fechas ISO, intentamos formatearlo bonito
-    // Pero por simplicidad ahora, los unimos.
-    // Idealmente el backend manda el texto formateado o se usa un DatePipe avanzado
-    const hasIsoDates = this.eventConfig.dates.some(d => d.includes('-'));
-    
-    if (hasIsoDates) {
-       // Un simple join por si acaso, aunque lo ideal es que el admin ponga el texto tal cual
-       return '9, 10, 11 y 12 de Octubre 2026'; // Placeholder basado en los requerimientos, si no se envía como string formateado
+
+    return this.eventConfig.dates.map(({ date }) => date).join(', ');
+  }
+
+  protected toggleSchedules(): void {
+    this.schedulesExpanded = !this.schedulesExpanded;
+  }
+
+  protected formatScheduleDate(date: string): string {
+    const [year, month, day] = date.split('-').map(Number);
+
+    if (!year || !month || !day) {
+      return date;
     }
 
-    return this.eventConfig.dates.join(', ');
+    const monthName = new Intl.DateTimeFormat('es-AR', {
+      month: 'long',
+      timeZone: 'UTC',
+    }).format(new Date(Date.UTC(year, month - 1, day)));
+    const capitalizedMonth = `${monthName.charAt(0).toUpperCase()}${monthName.slice(1)}`;
+
+    return `${day} de ${capitalizedMonth} ${year}`;
+  }
+
+  protected formatScheduleTime(time: string): string {
+    return time.match(/^\d{2}:\d{2}/)?.[0] ?? time;
   }
 }

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

@@ -48,6 +48,17 @@
   }
 }
 
+.icon-btn--bordered {
+  width: 38px;
+  height: 38px;
+  border: 1px solid var(--border-color);
+
+  &:hover:not(:disabled),
+  &:focus-visible:not(:disabled) {
+    border-color: currentcolor;
+  }
+}
+
 // Hover/Active/Focus colors (non-disabled)
 .icon-btn:hover:not(:disabled),
 .icon-btn:focus-visible:not(:disabled),

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

@@ -22,6 +22,7 @@ export type IconButtonVariant =
 })
 export class IconButtonComponent {
   readonly variant = input.required<IconButtonVariant>();
+  readonly bordered = input(false);
   readonly disabled = input(false);
   readonly ariaLabel = input<string>('');
   readonly ariaExpanded = input<boolean | null>(null);
@@ -45,6 +46,10 @@ export class IconButtonComponent {
   });
 
   protected readonly buttonClasses = computed(() => {
-    return ['icon-btn', `icon-btn--${this.variant()}`];
+    return {
+      'icon-btn': true,
+      [`icon-btn--${this.variant()}`]: true,
+      'icon-btn--bordered': this.bordered(),
+    };
   });
 }

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

@@ -23,7 +23,7 @@
   min-height: 40px;
   padding: 0.625rem 1rem;
   border-radius: 5px;
-  border-color: #cccccc;
+  border-color: var(--border-color);
   color: #666666;
   font-size: 15px;
   font-weight: 400;

src/app/shared/components/modal-host/modal-host.component.spec.ts

@@ -3,25 +3,10 @@ import { Component, inject } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { TestBed, getTestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import {
-  BrowserTestingModule,
-  platformBrowserTesting
-} from '@angular/platform-browser/testing';
-import {
-  afterEach,
-  beforeAll,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi
-} from 'vitest';
+import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import {
-  MODAL_DATA,
-  ModalRef,
-  ModalService
-} from '../../../core/services/modal.service';
+import { MODAL_DATA, ModalRef, ModalService } from '../../../core/services/modal.service';
 import { ModalHostComponent } from './modal-host.component';
 
 @Component({
@@ -31,7 +16,7 @@ import { ModalHostComponent } from './modal-host.component';
       <span class="modal-test-title">{{ data?.title }}</span>
       <button type="button" class="modal-test-close" (click)="close()">Cerrar</button>
     </div>
-  `
+  `,
 })
 class ModalContentTestComponent {
   readonly data = inject<{ title: string } | null>(MODAL_DATA);
@@ -48,10 +33,7 @@ describe('ModalHostComponent', () => {
 
   beforeAll(() => {
     try {
-      getTestBed().initTestEnvironment(
-        BrowserTestingModule,
-        platformBrowserTesting()
-      );
+      getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
     } catch {
       // Test environment may already be initialized by another setup entrypoint.
     }
@@ -59,7 +41,7 @@ describe('ModalHostComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ModalHostComponent]
+      imports: [ModalHostComponent],
     }).compileComponents();
 
     service = TestBed.inject(ModalService);
@@ -68,6 +50,7 @@ describe('ModalHostComponent', () => {
 
   afterEach(() => {
     doc.body.style.overflow = '';
+    doc.body.style.paddingRight = '';
     TestBed.resetTestingModule();
   });
 
@@ -84,7 +67,7 @@ describe('ModalHostComponent', () => {
 
     service.open(ModalContentTestComponent, {
       title: 'Editar producto',
-      data: { title: 'Contenido del modal' }
+      data: { title: 'Contenido del modal' },
     });
     fixture.detectChanges();
 
@@ -99,27 +82,30 @@ describe('ModalHostComponent', () => {
   it('closes with a result from the child component', () => {
     const fixture = TestBed.createComponent(ModalHostComponent);
     const ref = service.open(ModalContentTestComponent, {
-      data: { title: 'Cerrar' }
+      data: { title: 'Cerrar' },
     });
     const closedSpy = vi.fn();
 
     ref.afterClosed$.subscribe(closedSpy);
     fixture.detectChanges();
 
-    const closeButton = fixture.nativeElement.querySelector('.modal-test-close') as HTMLButtonElement;
+    const closeButton = fixture.nativeElement.querySelector(
+      '.modal-test-close',
+    ) as HTMLButtonElement;
     closeButton.click();
     fixture.detectChanges();
 
     expect(closedSpy).toHaveBeenCalledWith('accepted');
     expect(service.activeModal()).toBeNull();
     expect(doc.body.style.overflow).toBe('');
+    expect(doc.body.style.paddingRight).toBe('');
   });
 
   it('closes on backdrop click when enabled', () => {
     const fixture = TestBed.createComponent(ModalHostComponent);
     const ref = service.open(ModalContentTestComponent, {
       data: { title: 'Backdrop' },
-      closeOnBackdrop: true
+      closeOnBackdrop: true,
     });
 
     fixture.detectChanges();
@@ -136,7 +122,7 @@ describe('ModalHostComponent', () => {
     const fixture = TestBed.createComponent(ModalHostComponent);
     const ref = service.open(ModalContentTestComponent, {
       data: { title: 'Persistente' },
-      closeOnBackdrop: false
+      closeOnBackdrop: false,
     });
 
     fixture.detectChanges();
@@ -152,7 +138,7 @@ describe('ModalHostComponent', () => {
     const fixture = TestBed.createComponent(ModalHostComponent);
     const ref = service.open(ModalContentTestComponent, {
       data: { title: 'Escape' },
-      closeOnEscape: true
+      closeOnEscape: true,
     });
 
     fixture.detectChanges();
@@ -167,7 +153,7 @@ describe('ModalHostComponent', () => {
     const fixture = TestBed.createComponent(ModalHostComponent);
     const ref = service.open(ModalContentTestComponent, {
       data: { title: 'No Escape' },
-      closeOnEscape: false
+      closeOnEscape: false,
     });
 
     fixture.detectChanges();
@@ -181,12 +167,13 @@ describe('ModalHostComponent', () => {
     const fixture = TestBed.createComponent(ModalHostComponent);
     const ref = service.open(ModalContentTestComponent, {
       title: 'Con cierre',
-      data: { title: 'Boton' }
+      data: { title: 'Boton' },
     });
 
     fixture.detectChanges();
 
-    const closeButton = fixture.debugElement.query(By.css('.btn-close')).nativeElement as HTMLButtonElement;
+    const closeButton = fixture.debugElement.query(By.css('.btn-close'))
+      .nativeElement as HTMLButtonElement;
     closeButton.click();
     fixture.detectChanges();