feat(tenant): add site_title and favicon properties to Tenant interface; update app to set document title and favicon dynamically

- Adjust modal padding to account for scrollbar width.
- Update modal background opacity for better visibility.

style(product-list): refine layout and spacing
- Remove gap in product list rows for a cleaner look.

feat(product-list): improve variant handling
- Update variant mapping to include description and price.

refactor(product-row-card): restructure HTML for better layout
- Simplify structure by combining price and quantity controls.
- Enhance button placement for better UX.

style(product-row-card): improve card styling
- Adjust flex properties for better alignment and spacing.
- Update button styles for consistency.

feat(product-vertical-with-cart-card): enhance variant selection
- Implement variant selector for better user interaction.
- Update price and description display based on selected variant.

test(product-vertical-with-cart-card): add tests for variant selection
- Ensure correct variant description and price are displayed.

fix(environment): update API URL for testing environment
- Change backend URL to point to the QA server.

style(global): update global styles for better readability
- Adjust table styles for improved visibility and aesthetics.

angular.json

@@ -64,7 +64,13 @@
             "local": {
               "optimization": false,
               "extractLicenses": false,
-              "sourceMap": true
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.local.ts"
+                }
+              ]
             },
             "homo": {
               "fileReplacements": [
@@ -79,6 +85,9 @@
         },
         "serve": {
           "builder": "@angular/build:dev-server",
+          "options": {
+            "port": 4300
+          },
           "configurations": {
             "production": {
               "buildTarget": "shopit-front:build:production"
@@ -93,7 +102,7 @@
               "buildTarget": "shopit-front:build:homo"
             }
           },
-          "defaultConfiguration": "development"
+          "defaultConfiguration": "local"
         },
         "test": {
           "builder": "@angular/build:unit-test"

src/app/app.config.ts

@@ -10,6 +10,7 @@ import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/p
 import { routes } from './app.routes';
 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';
 
 function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
@@ -29,7 +30,10 @@ export const appConfig: ApplicationConfig = {
         filter: isStoreCatalogRequest,
       }),
     ),
-    provideHttpClient(withFetch(), withInterceptors([authInterceptor])),
+    provideHttpClient(
+      withFetch(),
+      withInterceptors([authInterceptor, globalLoadingInterceptor])
+    ),
     provideAppInitializer(authBootstrap),
     provideAppInitializer(tenantBootstrap),
   ],

src/app/app.html

@@ -2,6 +2,7 @@
   <router-outlet />
   <app-toast-container />
   <app-modal-host />
+  <app-global-loading />
 } @else if (status() === 'not-found') {
   <section class="tenant-status">
     <div class="tenant-status__card">

src/app/app.routes.spec.ts

@@ -23,7 +23,8 @@ const tenant: Tenant = {
   header_bg_color: '#313131',
   footer_bg_color: '#313131',
   header_logo: 'https://example.com/header.png',
-  footer_logo: 'https://example.com/footer.png'
+  footer_logo: 'https://example.com/footer.png',
+  categories: []
 };
 
 function createTenantServiceStub(
@@ -165,6 +166,55 @@ describe('app routes', () => {
     ]);
   });
 
+  it('loads the recover password page inside the simple layout', async () => {
+    const { fixture, router } = await renderAppAt('/recuperar-contrasena');
+    const compiled = fixture.nativeElement as HTMLElement;
+    const recoverPasswordPage = compiled.querySelector('app-recover-password-page');
+
+    expect(router.url).toBe('/recuperar-contrasena');
+    expect(compiled.querySelector('.simple-layout')).not.toBeNull();
+    expect(recoverPasswordPage).not.toBeNull();
+    expect(recoverPasswordPage?.textContent).toContain('Recuperar contraseña');
+    expect(recoverPasswordPage?.querySelector('input')?.getAttribute('placeholder')).toBe('Email');
+    expect(recoverPasswordPage?.textContent).toContain('Recuperar acceso');
+    expect(recoverPasswordPage?.textContent).toContain('Volver');
+  });
+
+  it('loads the recovery code page and shows the entered email', async () => {
+    const { fixture, router } = await renderAppAt(
+      '/recuperar-contrasena/codigo?email=ada%40example.com'
+    );
+    const compiled = fixture.nativeElement as HTMLElement;
+    const codePage = compiled.querySelector('app-recover-password-code-page');
+
+    expect(router.url).toBe('/recuperar-contrasena/codigo?email=ada%40example.com');
+    expect(compiled.querySelector('.simple-layout')).not.toBeNull();
+    expect(codePage).not.toBeNull();
+    expect(codePage?.textContent).toContain('ada@example.com');
+    expect(codePage?.querySelectorAll('app-input')).toHaveLength(4);
+    expect(codePage?.textContent).toContain('Validar');
+  });
+
+  it('loads the reset password page with the shared password inputs', async () => {
+    const { fixture, router } = await renderAppAt(
+      '/recuperar-contrasena/restablecer?email=ada%40example.com&code=1234'
+    );
+    const compiled = fixture.nativeElement as HTMLElement;
+    const resetPage = compiled.querySelector('app-reset-password-page');
+    const placeholders = Array.from(resetPage?.querySelectorAll('input') ?? []).map((input) =>
+      input.getAttribute('placeholder')
+    );
+
+    expect(router.url).toBe(
+      '/recuperar-contrasena/restablecer?email=ada%40example.com&code=1234'
+    );
+    expect(compiled.querySelector('.simple-layout')).not.toBeNull();
+    expect(resetPage).not.toBeNull();
+    expect(resetPage?.textContent).toContain('Restablecer contraseña');
+    expect(placeholders).toEqual(['Nueva Contraseña', 'Repetir Nueva Contraseña']);
+    expect(resetPage?.textContent).toContain('Guardar');
+  });
+
   it('redirects authenticated users away from /login', async () => {
     const { router } = await renderAppAt('/login', createTenantServiceStub(), createAuthServiceStub(true));
 
@@ -186,7 +236,7 @@ describe('app routes', () => {
   it('redirects unauthenticated users from /checkout to /login', async () => {
     const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(false));
 
-    expect(router.url).toBe('/login');
+    expect(router.url).toBe('/login?returnUrl=%2Fcheckout');
   });
 
   it('allows authenticated users to access /checkout', async () => {

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',
@@ -24,7 +26,8 @@ const tenant: Tenant = {
   header_bg_color: '#313131',
   footer_bg_color: '#313131',
   header_logo: 'https://example.com/header.png',
-  footer_logo: 'https://example.com/footer.png'
+  footer_logo: 'https://example.com/footer.png',
+  categories: []
 };
 
 function createTenantServiceStub(status: 'ready' | 'not-found', currentTenant: Tenant | null) {
@@ -89,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 () => {
@@ -107,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,8 +1,11 @@
-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';
 import { DEFAULT_TENANT_BRANDING } from './core/services/tenant-ssr-cache.store';
+import { GlobalLoadingComponent } from './shared/components/global-loading/global-loading.component';
 import { ModalHostComponent } from './shared/components/modal-host/modal-host.component';
 import { ToastContainerComponent } from './shared/components/toast-container/toast-container.component';
 
@@ -23,7 +26,12 @@ function hexToRgb(hex: string): string {
 
 @Component({
   selector: 'app-root',
-  imports: [RouterOutlet, ToastContainerComponent, ModalHostComponent],
+  imports: [
+    RouterOutlet,
+    ToastContainerComponent,
+    ModalHostComponent,
+    GlobalLoadingComponent
+  ],
   templateUrl: './app.html',
   styleUrl: './app.scss',
   host: {
@@ -51,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;
 
@@ -88,4 +118,4 @@ export class App {
       this.tenantService.tenant()?.footer_bg_color ??
       DEFAULT_TENANT_BRANDING.footerBgColor
   );
-}
+}

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

@@ -1,7 +1,7 @@
 <footer class="store-layout__footer mt-auto text-light">
-  <div class="container-xl px-3 px-md-4 py-4 py-md-5">
+  <div class="container-xl px-3 px-md-4 py-4 py-md-5 store-layout__footer-content">
-    <div class="row g-4">
+    <div class="row g-4 store-layout__footer-grid">
-      <div class="col-12">
+      <div class="col-12 store-layout__brand-column">
         <div
           class="store-layout__brand-slot d-inline-flex align-items-center gap-3"
           data-testid="store-footer-brand-slot"
@@ -17,30 +17,29 @@
         </div>
       </div>
 
-      <div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start">
+      <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">
+        <div class="d-grid gap-2 store-layout__contact-details">
-          <div class="d-flex align-items-center gap-2  ">
+          <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  ">
+          <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>
         </div>
 
-        <p class="mb-0 small store-layout__muted-text">Copyright &copy; {{ currentYear }} - Sonder</p>
+        <p class="mb-0 small store-layout__muted-text store-layout__copyright">
+          Copyright &copy; {{ currentYear }} - {{ storeName || 'Sonder' }}
+        </p>
       </div>
 
       @for (section of footerSections; track section.heading) {
-        <div class="col-12 col-md-6 col-xl-2 d-grid align-content-start">
+        <div class="col-12 col-md-6 col-xl-2 d-grid align-content-start store-layout__links-column">
           <div class="d-grid gap-2">
             @for (link of section.links; track link.label) {
               @if (link.routerLink) {
-                <a
+                <a class="store-layout__footer-link" [routerLink]="link.routerLink">
-                  class="store-layout__footer-link"
-                  [routerLink]="link.routerLink"
-                >
                   {{ link.label }}
                 </a>
               } @else if (link.action === 'logout') {
@@ -59,8 +58,10 @@
         </div>
       }
 
-      <div class="col-12 col-md-6 col-xl-3 d-grid align-content-start">
+      <div class="store-layout__mobile-divider" aria-hidden="true"></div>
-        <div class="d-flex align-items-center gap-3">
+
+      <div class="col-12 col-md-6 col-xl-3 d-grid align-content-start store-layout__social-column">
+        <div class="d-flex align-items-center gap-3 store-layout__social-list">
           @for (social of socialMedia; track social.code) {
             <app-social-media
               class="text-white"

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

@@ -2,22 +2,26 @@
   background-color: var(--tenant-footer-bg);
 }
 
+.store-layout__mobile-divider {
+  display: none;
+}
+
 .store-layout__brand-slot {
-  width: min(100%, 12rem);
+  width: min(100%, 230px);
   min-width: 10rem;
 }
 
 .store-layout__brand-logo-shell {
   position: relative;
-  width: min(100%, 12rem);
+  width: min(100%, 230px);
-  height: 2.75rem;
+  height: 65px;
 }
 
 .store-layout__brand-logo {
   display: block;
   width: 100%;
   height: 100%;
-  max-height: 2.75rem;
+  max-height: 65px;
   object-fit: contain;
   object-position: left center;
 }
@@ -42,7 +46,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;
@@ -63,7 +67,7 @@
 
 .store-layout__footer-link {
   width: fit-content;
-  color: rgba(255, 255, 255, 0.72);
+  color: #ffffff;
   text-decoration: none;
 
   &:hover,
@@ -92,11 +96,97 @@
 }
 
 @media (max-width: 767.98px) {
+  .store-layout__footer-content {
+    padding: 1.45rem 2.5rem 1.8rem !important;
+    font-size: 13px;
+  }
+
+  .store-layout__footer-grid {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 0;
+    margin: 0;
+  }
+
+  .store-layout__footer-grid > * {
+    margin-top: 0;
+    padding-right: 0;
+    padding-left: 0;
+  }
+
+  .store-layout__links-column {
+    order: 1;
+    width: auto;
+    padding-bottom: 1.65rem;
+    line-height: 1.25;
+
+    &:nth-of-type(even) {
+      padding-left: 0.65rem;
+    }
+
+    > div {
+      gap: 0.5rem !important;
+    }
+  }
+
+  .store-layout__mobile-divider {
+    display: block;
+    order: 2;
+    grid-column: 1 / -1;
+    width: 100%;
+    border-top: 1px solid var(--border-color);
+  }
+
+  .store-layout__brand-column,
+  .store-layout__social-column {
+    order: 3;
+    width: auto;
+    padding-top: 2rem;
+  }
+
   .store-layout__brand-slot {
+    width: min(100%, 150px);
     min-width: 0;
   }
 
+  .store-layout__brand-logo {
+    max-height: 55px;
+  }
+
+  .store-layout__brand-logo-shell {
+    width: min(100%, 150px);
+    height: 55px;
+  }
+
   .store-layout__brand-text {
-    font-size: 1.45rem;
+    font-size: 13px;
+  }
+
+  .store-layout__social-column {
+    align-items: center;
+  }
+
+  .store-layout__social-list {
+    justify-content: flex-end;
+    gap: 0 !important;
+  }
+
+  .store-layout__contact {
+    order: 4;
+    grid-column: 1 / -1;
+    width: auto;
+    gap: 1.25rem !important;
+    padding-top: 0.9rem;
+    text-align: center;
+  }
+
+  .store-layout__contact-details {
+    justify-items: center;
+    gap: 0.4rem !important;
+  }
+
+  .store-layout__copyright {
+    font-size: 11px;
+    line-height: 1.3;
   }
 }

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

@@ -25,5 +25,6 @@ export class StoreFooterComponent {
   @Input({ required: true }) footerSections: StoreFooterSection[] = [];
   @Input({ required: true }) socialMedia: SocialMedia[] = [];
   @Input() logoUrl: string | null = null;
+  @Input() storeName: string | null = null;
   readonly logoutClick = output<void>();
 }

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

@@ -0,0 +1,39 @@
+@if (open() && categories().length) {
+  <section class="dropdown-menu show p-2 category-dropdown" role="menu" aria-label="Categorías">
+    @for (category of categories(); track category.id) {
+      <div class="dropdown-submenu">
+        <button
+          type="button"
+          class="dropdown-item d-flex align-items-center justify-content-between gap-3"
+          [class.active]="activeCategory()?.id === category.id"
+          role="menuitem"
+          [attr.aria-expanded]="category.subcategories.length ? activeCategory()?.id === category.id : null"
+          (click)="selectCategory(category)"
+        >
+          <span>{{ category.nombre }}</span>
+          @if (category.subcategories.length) {
+            <i class="fa-solid fa-chevron-right" aria-hidden="true"></i>
+          }
+        </button>
+
+        @if (activeCategory()?.id === category.id && subcategories().length) {
+          <div class="dropdown-menu show p-2 category-dropdown__submenu">
+            @for (subcategory of subcategories(); track subcategory.id) {
+              <button
+                type="button"
+                class="dropdown-item d-flex align-items-center justify-content-between gap-3"
+                role="menuitem"
+                (click)="categorySelect.emit(subcategory)"
+              >
+                <span>{{ subcategory.nombre }}</span>
+                @if (subcategory.subcategories.length) {
+                  <i class="fa-solid fa-chevron-right" aria-hidden="true"></i>
+                }
+              </button>
+            }
+          </div>
+        }
+      </div>
+    }
+  </section>
+}

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

@@ -0,0 +1,47 @@
+.category-dropdown {
+  min-width: 240px;
+  background-color: #ffffff;
+  border: 0;
+  box-shadow: 0 0 25px rgba(0, 0, 0, 0.05);
+}
+
+.category-dropdown .dropdown-item,
+.category-dropdown .dropdown-item:active {
+  display: flex;
+  align-items: center;
+  min-height: 2rem;
+  font-size: 14px;
+  font-weight: 700;
+  line-height: 1.25;
+  color: #8a8a8a;
+  background-color: #ffffff;
+}
+
+.category-dropdown .dropdown-item:hover,
+.category-dropdown .dropdown-item:focus,
+.category-dropdown .dropdown-item.active {
+  color: var(--tenant-primary, var(--bs-primary));
+  background-color: #ffffff;
+}
+
+.dropdown-submenu {
+  position: relative;
+}
+
+.category-dropdown__submenu {
+  top: -0.5rem;
+  left: calc(100% - 0.1rem);
+  min-width: 240px;
+  border: 0;
+  box-shadow: 0 0 25px rgba(0, 0, 0, 0.05);
+}
+
+@media (max-width: 575.98px) {
+  .category-dropdown__submenu {
+    position: static;
+    margin: 0;
+    border: 0;
+    border-radius: 0;
+    box-shadow: none;
+  }
+}

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

@@ -0,0 +1,46 @@
+import { ChangeDetectionStrategy, Component, computed, effect, input, output, signal } from '@angular/core';
+
+import { Category } from '../../../../services/tenant.interface';
+
+@Component({
+  selector: 'app-category-dropdown',
+  standalone: true,
+  templateUrl: './category-dropdown.component.html',
+  styleUrl: './category-dropdown.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CategoryDropdownComponent {
+  readonly categories = input<readonly Category[]>([]);
+  readonly open = input(false);
+  readonly categorySelect = output<Category>();
+
+  protected readonly activeCategory = signal<Category | null>(null);
+  protected readonly subcategories = computed(() => this.activeCategory()?.subcategories ?? []);
+
+  constructor() {
+    effect(() => {
+      const categories = this.categories();
+      const activeCategory = this.activeCategory();
+
+      if (!this.open()) {
+        this.activeCategory.set(null);
+        return;
+      }
+
+      if (activeCategory && !categories.some((category) => category.id === activeCategory.id)) {
+        this.activeCategory.set(null);
+      }
+    });
+  }
+
+  protected selectCategory(category: Category): void {
+    if (category.subcategories.length) {
+      this.activeCategory.update((activeCategory) =>
+        activeCategory?.id === category.id ? null : category,
+      );
+      return;
+    }
+
+    this.categorySelect.emit(category);
+  }
+}

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

@@ -1,81 +1,87 @@
 <header class="store-layout__header">
   <div class="store-layout__header-main">
-    <div
+    <div class="container-xl px-3 px-md-4 py-3 py-lg-4">
-      class="container-xl px-3 px-md-4 py-3 py-lg-4 d-flex flex-row flex-wrap align-items-center justify-content-between gap-3"
+      <div class="row align-items-center gy-3 gy-md-0">
-    >
+        <div class="col-auto col-md-auto order-1 store-layout__brand-column">
-      <a
+          <a
-        routerLink="/"
+            routerLink="/"
-        class="store-layout__brand-slot d-inline-flex align-items-center gap-3 flex-shrink-0 text-decoration-none"
+            class="store-layout__brand-slot d-inline-flex align-items-center gap-3 text-decoration-none"
-        data-testid="store-header-brand-slot"
+            data-testid="store-header-brand-slot"
-        aria-label="Logo del comercio"
+            aria-label="Logo del comercio"
-      >
+          >
-        @if (logoUrl()) {
+            @if (logoUrl()) {
-          <img class="store-layout__brand-logo" [src]="logoUrl()" alt="Logo del comercio" />
+              <img class="store-layout__brand-logo" [src]="logoUrl()" alt="Logo del comercio" />
-        } @else {
+            } @else {
-          <div class="store-layout__brand-logo-shell" aria-hidden="true">
+              <div class="store-layout__brand-logo-shell" aria-hidden="true">
-            <span class="store-layout__brand-logo-skeleton"></span>
+                <span class="store-layout__brand-logo-skeleton"></span>
-          </div>
+              </div>
-        }
+            }
-      </a>
+          </a>
-
-      <div
-        class="d-flex flex-row align-items-center gap-3 ms-auto flex-nowrap flex-grow-1 justify-content-between justify-content-md-end"
-      >
-        <div class="store-layout__search-wrapper">
-          <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>
 
-        @if (ticketsMenu(); as menu) {
+        @if (displaySeachBar()) {
-          <app-button
+          <div class="col-12 px-0 d-md-none order-3">
-            variant="primary"
+            <hr class="store-layout__mobile-separator" />
-            hostClass="flex-shrink-0"
+          </div>
-            data-testid="store-header-tickets"
+
-            (click)="ticketsClick.emit()"
+          <div class="col-12 col-md order-4 order-md-2">
-          >
+            <div class="store-layout__search-wrapper ms-md-auto">
-            {{ menu.label }}
+              <div class="input-group store-layout__search" role="search">
-          </app-button>
+                <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="d-flex align-items-center justify-content-end gap-1"
+          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"
-          aria-label="Acciones de usuario"
         >
+          @if (ticketsMenu(); as menu) {
+            <app-button
+              variant="primary"
+              hostClass="store-layout__tickets-btn-host"
+              data-testid="store-header-tickets"
+              (click)="ticketsClick.emit()"
+            >
+              {{ menu.label }}
+            </app-button>
+          }
+
           <app-cart-icon
             [quantity]="cartQuantity()"
             ariaLabel="Carrito de compras"
             title="Carrito"
             (click)="cartClick.emit()"
           />
-          <div class="store-layout__user-menu">
+
+          <div class="store-layout__user-menu d-none d-md-inline-flex position-relative">
             <app-icon-button
               variant="user"
               ariaLabel="Mi cuenta"
@@ -94,21 +100,74 @@
               />
             }
           </div>
+
+          <div class="store-layout__mobile-menu d-inline-flex d-md-none position-relative">
+            <app-icon-button
+              variant="bars"
+              ariaLabel="Menu"
+              ariaControls="store-mobile-menu"
+              [ariaExpanded]="isMobileMenuOpen()"
+              title="Menu"
+              (clicked)="toggleMobileMenu()"
+            />
+
+            @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"
+                  (click)="onMobileAccountClick()"
+                >
+                  <i class="fa-regular fa-circle-user fa-lg"></i>
+                  <span class="fw-medium">Mi cuenta</span>
+                </a>
+
+                @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>
+                  }
+                }
+              </div>
+            }
+          </div>
         </div>
       </div>
     </div>
   </div>
 
-  <div>
+  @if (displayCategories()) {
-    <div class="container-xl px-3 px-md-4">
+    <div class="store-layout__categories d-none d-md-block">
-      <button
+      <div class="container-xl px-3 px-md-4">
-        type="button"
+        <div class="store-layout__category-menu">
-        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"
+          <button
-        aria-label="Categorias"
+            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"
-        <span>Categorias</span>
+            aria-label="Categorias"
-        <i class="fa-solid fa-chevron-down" aria-hidden="true"></i>
+            aria-controls="store-category-dropdown"
-      </button>
+            [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)"
+          />
+        </div>
+      </div>
     </div>
-  </div>
+  }
 </header>

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

@@ -1,16 +1,18 @@
 .store-layout__header {
   color: #ffffff;
   background-color: var(--tenant-header-bg);
-  box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.08);
 }
 
 .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 {
   min-width: 150px;
-  max-width:40px;
+}
+
+.store-layout__brand-column {
+  max-width: 12rem;
 }
 
 .store-layout__brand-logo-shell {
@@ -42,10 +44,25 @@
 }
 
 .store-layout__search-wrapper {
-  width: min(100%, 260px);
+  width: 100%;
   min-width: 0;
 }
 
+@media (min-width: 768px) {
+  .store-layout__search-wrapper {
+    width: min(100%, 260px);
+  }
+
+  .store-layout__actions-column {
+    padding-left: 0;
+  }
+
+  ::ng-deep .store-layout__tickets-btn-host {
+    flex: 0 0 clamp(8rem, 15vw, 13.5rem);
+    width: clamp(8rem, 15vw, 13.5rem);
+  }
+}
+
 .store-layout__search {
   width: 100%;
 }
@@ -59,7 +76,7 @@
 
 .store-layout__search-input {
   color: #666666;
-  border-color: #cccccc;
+  border-color: var(--border-color);
   background-color: rgba(255, 255, 255, 0.96);
 }
 
@@ -68,21 +85,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;
 }
 
@@ -111,6 +128,19 @@
   color: #8a8a8a;
 }
 
+.store-layout__category-menu {
+  position: relative;
+  display: inline-flex;
+  flex-direction: column;
+}
+
+.store-layout__category-menu app-category-dropdown {
+  position: absolute;
+  z-index: 1050;
+  top: 100%;
+  left: 0;
+}
+
 @keyframes store-header-logo-skeleton {
   from {
     background-position: 200% 0;
@@ -124,5 +154,70 @@
 @media (max-width: 767.98px) {
   .store-layout__brand-slot {
     min-width: 0;
+    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: var(--border-color);
+    opacity: 1;
+    margin: 0 -1rem;
+  }
+}
+
+@media (max-width: 399.98px) {
+  .store-layout__brand-column {
+    flex: 1 1 0;
+    width: auto;
+    min-width: 0;
+    max-width: none;
+    padding-right: 0.25rem;
+  }
+
+  .store-layout__brand-slot {
+    width: 100%;
+    max-width: 6.5rem;
+  }
+
+  .store-layout__actions-column {
+    flex: 1 1 auto;
+    width: auto;
+    min-width: 0;
+    margin-left: 0 !important;
+    padding-left: 0.25rem;
+    gap: 0.25rem !important;
+  }
+
+  ::ng-deep .store-layout__tickets-btn-host .btn {
+    padding-inline: 0.75rem;
+    font-size: 0.875rem;
+  }
+}
+
+.store-layout__mobile-dropdown-menu {
+  top: 100%;
+  min-width: 220px;
+  z-index: 1050;
+}
+
+.store-layout__mobile-dropdown-item {
+  cursor: pointer;
+  color: #8a8a8a;
+
+  &:hover,
+  &:focus-visible {
+    color: #666666;
   }
 }

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

@@ -1,5 +1,5 @@
 import { Component, ElementRef, HostListener, inject, input, output, signal } from '@angular/core';
-import { RouterLink } from '@angular/router';
+import { Router, RouterLink } from '@angular/router';
 import { AuthUser } from '../../../services/auth/auth.interfaces';
 import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
 import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
@@ -7,6 +7,8 @@ import { UserDropdownComponent } from './user-dropdown/user-dropdown.component';
 import { Menu } from '../../../services/tenant.interface';
 import { ButtonComponent } from '../../../../shared/components/button/button.component';
 import { ReactiveFormsModule, FormControl } from '@angular/forms';
+import { Category } from '../../../services/tenant.interface';
+import { CategoryDropdownComponent } from './category-dropdown/category-dropdown.component';
 
 @Component({
   selector: 'app-store-header',
@@ -17,12 +19,14 @@ import { ReactiveFormsModule, FormControl } from '@angular/forms';
     RouterLink,
     ReactiveFormsModule,
     UserDropdownComponent,
+    CategoryDropdownComponent,
   ],
   templateUrl: './store-header.component.html',
   styleUrl: './store-header.component.scss',
 })
 export class StoreHeaderComponent {
   private readonly elementRef = inject(ElementRef<HTMLElement>);
+  private readonly router = inject(Router);
 
   readonly logoUrl = input<string | null>(null);
   readonly cartQuantity = input<number>(0);
@@ -30,32 +34,42 @@ export class StoreHeaderComponent {
   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 cartClick = output<void>();
   readonly ticketsClick = output<void>();
   readonly loginClick = output<void>();
   readonly logoutClick = output<void>();
   readonly searchSubmit = output<string>();
+  readonly categorySelect = output<Category>();
 
   protected readonly isUserDropdownOpen = signal(false);
+  protected readonly isCategoryDropdownOpen = signal(false);
+  protected readonly isMobileMenuOpen = signal(false);
   protected readonly minSearchLength = 3;
   protected readonly showSearchError = signal(false);
   protected readonly searchControl = new FormControl('', { nonNullable: true });
 
   @HostListener('document:click', ['$event'])
   protected onDocumentClick(event: MouseEvent): void {
-    if (!this.isUserDropdownOpen()) {
+    if (!this.isUserDropdownOpen() && !this.isCategoryDropdownOpen() && !this.isMobileMenuOpen()) {
       return;
     }
 
     const target = event.target;
     if (target instanceof Node && !this.elementRef.nativeElement.contains(target)) {
       this.isUserDropdownOpen.set(false);
+      this.isCategoryDropdownOpen.set(false);
+      this.isMobileMenuOpen.set(false);
     }
   }
 
   @HostListener('document:keydown.escape')
   protected onEscapeKey(): void {
     this.isUserDropdownOpen.set(false);
+    this.isCategoryDropdownOpen.set(false);
+    this.isMobileMenuOpen.set(false);
   }
 
   protected toggleUserDropdown(): void {
@@ -94,4 +108,32 @@ export class StoreHeaderComponent {
   protected clearSearchError(): void {
     this.showSearchError.set(false);
   }
+
+  protected toggleCategoryDropdown(): void {
+    this.isCategoryDropdownOpen.update((isOpen) => !isOpen);
+  }
+
+  protected onCategorySelect(category: Category): void {
+    this.isCategoryDropdownOpen.set(false);
+    this.isMobileMenuOpen.set(false);
+    this.categorySelect.emit(category);
+  }
+
+  protected toggleMobileMenu(): void {
+    this.isMobileMenuOpen.update((isOpen) => !isOpen);
+  }
+
+  protected onMobileAccountClick(): void {
+    this.isMobileMenuOpen.set(false);
+    if (!this.isAuthenticated()) {
+      this.loginClick.emit();
+    } else {
+      const menus = this.accountNavigationMenus();
+      if (menus.length > 0) {
+        this.router.navigate([menus[0].route]);
+      } else {
+        this.router.navigate(['/cuenta']);
+      }
+    }
+  }
 }

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,16 +1,21 @@
 <div class="store-layout d-flex flex-column flex-grow-1">
   <app-store-header
+    ngSkipHydration
     [cartQuantity]="cartQuantity()"
     [logoUrl]="tenant()?.header_logo ?? null"
     [user]="user()"
     [isAuthenticated]="isAuthenticated()"
     [accountNavigationMenus]="accountNavigationMenus()"
     [ticketsMenu]="ticketsMenu() ?? null"
+    [categories]="tenant()?.categories ?? []"
+    [displayCategories]="tenant()?.display_categories ?? true"
+    [displaySeachBar]="tenant()?.display_seach_bar ?? true"
     (cartClick)="isCartOpen.set(!isCartOpen())"
     (ticketsClick)="onTicketsClick()"
     (loginClick)="onLoginClick()"
     (logoutClick)="onLogoutClick()"
     (searchSubmit)="onSearch($event)"
+    (categorySelect)="onCategorySelect($event)"
   />
 
   @if (isCartOpen()) {
@@ -28,9 +33,14 @@
         <app-button variant="secondary" class="flex-grow-1" (click)="isCartOpen.set(false)"
           >Seguir comprando</app-button
         >
-        <app-button variant="primary" class="flex-grow-1" (click)="onCheckoutClick()"
+        <app-button
-          >Comprar</app-button
+          variant="primary"
+          class="flex-grow-1"
+          [disabled]="isCreatingPurchase()"
+          (click)="onCheckoutClick()"
         >
+          Comprar
+        </app-button>
       </app-cart>
     </div>
   }
@@ -48,6 +58,7 @@
     [footerSections]="footerSections()"
     [socialMedia]="tenant()?.social_media ?? []"
     [logoUrl]="tenant()?.footer_logo ?? null"
+    [storeName]="tenant()?.nombre ?? null"
     (logoutClick)="onLogoutClick()"
   />
 </div>

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

@@ -21,14 +21,15 @@
 
 .store-layout__cart-dropdown {
   position: absolute;
-  top: 76px;
+  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;
@@ -40,6 +41,7 @@
     right: 1rem;
     left: 1rem;
     width: auto;
+    max-width: none;
   }
 }
 

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

@@ -15,6 +15,7 @@ import { AuthService } from '../../services/auth/auth.service';
 import { AuthUser } from '../../services/auth/auth.interfaces';
 import { StoreLayoutComponent } from './store-layout.component';
 import { StoreHeaderComponent } from './store-header/store-header.component';
+import { CheckoutService } from '../../services/checkout.service';
 
 const tenant: Tenant = {
   id: 1,
@@ -29,6 +30,7 @@ const tenant: Tenant = {
   footer_bg_color: '#313131',
   header_logo: 'https://example.com/header.png',
   footer_logo: 'https://example.com/footer.png',
+  categories: [],
   menues: [
     {
       id: 4,
@@ -127,12 +129,17 @@ const tenant: Tenant = {
 describe('StoreLayoutComponent', () => {
   let tenantState = signal<Tenant | null>(tenant);
   let cartState = signal<Cart | null>(null);
+  let authUserState = signal<AuthUser | null>(null);
+  let checkoutServiceStub: { startCheckout: ReturnType<typeof vi.fn> };
 
   beforeEach(async () => {
     tenantState = signal<Tenant | null>(tenant);
     cartState = signal<Cart | null>(null);
-    const authUserState = signal<AuthUser | null>(null);
+    authUserState = signal<AuthUser | null>(null);
     const isAuthenticatedState = signal(false);
+    checkoutServiceStub = {
+      startCheckout: vi.fn().mockResolvedValue({ id: 55 }),
+    };
 
     await TestBed.configureTestingModule({
       imports: [StoreLayoutComponent],
@@ -156,6 +163,7 @@ describe('StoreLayoutComponent', () => {
               .fn()
               .mockReturnValue(of({ data: { id: 1, items: [], subtotal: '0' } })),
             removeItem: vi.fn().mockReturnValue(of({ data: { id: 1, items: [], subtotal: '0' } })),
+            clearCart: vi.fn(() => cartState.set(null)),
           },
         },
         {
@@ -176,6 +184,10 @@ describe('StoreLayoutComponent', () => {
             logout: vi.fn().mockReturnValue(of(void 0)),
           },
         },
+        {
+          provide: CheckoutService,
+          useValue: checkoutServiceStub,
+        },
       ],
     }).compileComponents();
   });
@@ -192,6 +204,29 @@ describe('StoreLayoutComponent', () => {
     expect(compiled.querySelector('app-store-footer .store-layout__footer')).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,
+    });
+
+    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();
+
+    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();
@@ -394,8 +429,9 @@ describe('StoreLayoutComponent', () => {
     expect(router.navigate).not.toHaveBeenCalled();
   });
 
-  it('logs out from the authenticated user dropdown', () => {
+  it('logs out from the authenticated user dropdown, clears the cart and returns home', () => {
     const authService = TestBed.inject(AuthService);
+    const cartService = TestBed.inject(CartService);
     const router = TestBed.inject(Router);
     vi.spyOn(router, 'navigate');
 
@@ -424,11 +460,13 @@ describe('StoreLayoutComponent', () => {
     fixture.detectChanges();
 
     expect(authService.logout).toHaveBeenCalled();
-    expect(router.navigate).toHaveBeenCalledWith(['/login']);
+    expect(cartService.clearCart).toHaveBeenCalled();
+    expect(router.navigate).toHaveBeenCalledWith(['/']);
   });
 
   it('provides account actions from the footer', () => {
     const authService = TestBed.inject(AuthService);
+    const cartService = TestBed.inject(CartService);
     const router = TestBed.inject(Router);
     vi.spyOn(router, 'navigate');
 
@@ -455,7 +493,28 @@ describe('StoreLayoutComponent', () => {
     fixture.detectChanges();
 
     expect(authService.logout).toHaveBeenCalled();
-    expect(router.navigate).toHaveBeenCalledWith(['/login']);
+    expect(cartService.clearCart).toHaveBeenCalled();
+    expect(router.navigate).toHaveBeenCalledWith(['/']);
+  });
+
+  it('leaves checkout before logging out so the pending purchase can be cancelled', async () => {
+    const authService = TestBed.inject(AuthService);
+    const cartService = TestBed.inject(CartService);
+    const router = TestBed.inject(Router);
+    vi.spyOn(router, 'url', 'get').mockReturnValue('/checkout?purchase=25');
+    const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
+
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+
+    await (fixture.componentInstance as any).onLogoutClick();
+
+    expect(navigateSpy).toHaveBeenCalledWith(['/']);
+    expect(authService.logout).toHaveBeenCalled();
+    expect(navigateSpy.mock.invocationCallOrder[0]).toBeLessThan(
+      (authService.logout as any).mock.invocationCallOrder[0],
+    );
+    expect(cartService.clearCart).toHaveBeenCalled();
   });
 
   it('renders only the help submenus assigned to the tenant in the footer', () => {
@@ -481,7 +540,7 @@ describe('StoreLayoutComponent', () => {
     expect(compiled.textContent).not.toContain('Medios de pago');
   });
 
-  it('redirects to /checkout when cart buy button is clicked', () => {
+  it('creates a purchase and redirects to checkout when cart buy is clicked', async () => {
     const router = TestBed.inject(Router);
     vi.spyOn(router, 'navigate');
     cartState.set({
@@ -503,23 +562,73 @@ describe('StoreLayoutComponent', () => {
         },
       ],
     });
+    authUserState.set({
+      id: 7,
+      nombre_apellido: 'Juan Perez',
+      email: 'juan@example.com',
+      dni: '12345678',
+      telefono: '3415555555',
+    });
+
+    const fixture = TestBed.createComponent(StoreLayoutComponent);
+    fixture.detectChanges();
+
+    (fixture.componentInstance as any).isCartOpen.set(true);
+    fixture.detectChanges();
+
+    const compiled = fixture.nativeElement as HTMLElement;
+    const buyButton = Array.from(compiled.querySelectorAll('app-button button')).find(
+      (button) => button.textContent?.trim() === 'Comprar',
+    ) as HTMLButtonElement | undefined;
+
+    expect(buyButton).toBeDefined();
+    buyButton!.click();
+    await Promise.resolve();
+    fixture.detectChanges();
+
+    expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('test', {
+      cart_id: 1,
+    });
+    expect(router.navigate).toHaveBeenCalledWith(['/checkout'], {
+      queryParams: { purchase: 55 },
+    });
+    expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
+  });
+
+  it('allows modifying quantities directly in the regular cart without a toggle', () => {
+    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,
+          product: {
+            nombre: 'Producto',
+            imagen: null,
+          },
+        },
+      ],
+    });
 
     const fixture = TestBed.createComponent(StoreLayoutComponent);
     fixture.detectChanges();
-
     (fixture.componentInstance as any).isCartOpen.set(true);
     fixture.detectChanges();
 
-    const compiled = fixture.nativeElement as HTMLElement;
+    const element = fixture.nativeElement as HTMLElement;
-    const buyButton = Array.from(compiled.querySelectorAll('app-button button')).find(
+    const cartItem = fixture.debugElement.query(By.css('app-cart-item'));
-      (button) => button.textContent?.trim() === 'Comprar',
+    const buyButton = Array.from(
-    ) as HTMLButtonElement | undefined;
+      element.querySelectorAll<HTMLButtonElement>('app-button button'),
+    ).find((button) => button.textContent?.trim() === 'Comprar');
 
+    expect(element.querySelector('.cart-edit-btn')).toBeNull();
+    expect(cartItem.componentInstance.quantityDisabled()).toBe(false);
     expect(buyButton).toBeDefined();
-    buyButton!.click();
-    fixture.detectChanges();
-
-    expect(router.navigate).toHaveBeenCalledWith(['/checkout']);
-    expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
   });
 });

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

@@ -6,9 +6,12 @@ import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-f
 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';
+import { ToastService } from '../../services/toast.service';
+import { Category } from '../../services/tenant.interface';
 
 @Component({
   selector: 'app-store-layout',
@@ -26,9 +29,12 @@ export class StoreLayoutComponent implements OnInit {
   private readonly tenantService = inject(TenantService);
   private readonly cartService = inject(CartService);
   private readonly authService = inject(AuthService);
+  private readonly checkoutService = inject(CheckoutService);
+  private readonly toastService = inject(ToastService);
   private readonly router = inject(Router);
 
   protected readonly isCartOpen = signal(false);
+  protected readonly isCreatingPurchase = signal(false);
 
   protected readonly cartSubtotal = computed(() => {
     const cart = this.cartService.cart();
@@ -63,6 +69,21 @@ export class StoreLayoutComponent implements OnInit {
       });
     }
 
+    const variants = (item.product?.variants ?? []).map((variant) => ({
+      value: variant.id,
+      values: variant.values,
+    }));
+    const selectedVariant = item.product?.variants?.find(
+      (variant) => variant.id === item.variant_id,
+    );
+
+    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,
@@ -72,9 +93,21 @@ export class StoreLayoutComponent implements OnInit {
       discountPercentage: null,
       attributes,
       quantity: item.cantidad,
+      variantId: item.variant_id,
+      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;
@@ -120,6 +153,12 @@ export class StoreLayoutComponent implements OnInit {
     });
   }
 
+  protected onCategorySelect(category: Category): void {
+    void this.router.navigate(['/categoria', category.id], {
+      queryParams: { page: 1 },
+    });
+  }
+
   protected onTicketsClick(): void {
     const route = this.ticketsMenu()?.route;
 
@@ -128,16 +167,69 @@ export class StoreLayoutComponent implements OnInit {
     }
   }
 
-  protected onLogoutClick(): void {
+  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.
+    if (isLeavingCheckout) {
+      const navigationSucceeded = await this.router.navigate(['/']);
+
+      if (!navigationSucceeded) {
+        return;
+      }
+    }
+
     this.authService.logout().subscribe({
-      next: () => void this.router.navigate(['/login']),
+      next: () => {
+        this.cartService.clearCart();
+        this.isCartOpen.set(false);
+
+        if (!isLeavingCheckout) {
+          void this.router.navigate(['/']);
+        }
+      },
       error: (err) => console.error('Error logging out', err),
     });
   }
 
-  protected onCheckoutClick(): void {
+  protected async onCheckoutClick(): Promise<void> {
-    this.isCartOpen.set(false);
+    if (this.isCreatingPurchase()) {
-    void this.router.navigate(['/checkout']);
+      return;
+    }
+
+    const cart = this.cartService.cart();
+    const tenant = this.tenantService.tenant();
+    const user = this.authService.user();
+
+    if (!user) {
+      this.isCartOpen.set(false);
+      void this.router.navigate(['/login'], { queryParams: { returnUrl: '/' } });
+      return;
+    }
+
+    if (!cart?.id || !tenant) {
+      this.toastService.danger('No hay un carrito activo para iniciar la compra.');
+      return;
+    }
+
+    this.isCreatingPurchase.set(true);
+    try {
+      const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
+        cart_id: cart.id,
+      });
+
+      this.cartService.clearCart();
+      this.isCartOpen.set(false);
+      await this.router.navigate(['/checkout'], {
+        queryParams: { purchase: purchase.id },
+      });
+    } catch (error) {
+      console.error('Failed to create cart purchase:', error);
+      this.toastService.danger('No se pudo iniciar la compra.');
+    } finally {
+      this.isCreatingPurchase.set(false);
+    }
   }
 
   protected readonly footerSections = computed<StoreFooterSection[]>(() => {

src/app/core/services/auth/auth.guards.spec.ts

@@ -23,10 +23,14 @@ describe('auth guards', () => {
       providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub() }]
     });
 
-    const result = TestBed.runInInjectionContext(() => authGuard(null as never, null as never));
+    const result = TestBed.runInInjectionContext(() =>
+      authGuard(null as never, { url: '/checkout?mode=direct' } as never),
+    );
 
     expect(result instanceof UrlTree).toBe(true);
-    expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe('/login');
+    expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe(
+      '/login?returnUrl=%2Fcheckout%3Fmode%3Ddirect',
+    );
   });
 
   it('allows authenticated users through authGuard', () => {
@@ -34,7 +38,9 @@ describe('auth guards', () => {
       providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub(true) }]
     });
 
-    const result = TestBed.runInInjectionContext(() => authGuard(null as never, null as never));
+    const result = TestBed.runInInjectionContext(() =>
+      authGuard(null as never, { url: '/checkout' } as never),
+    );
 
     expect(result).toBe(true);
   });

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

@@ -3,11 +3,15 @@ import { CanActivateFn, Router } from '@angular/router';
 
 import { AuthService } from './auth.service';
 
-export const authGuard: CanActivateFn = () => {
+export const authGuard: CanActivateFn = (_route, state) => {
   const authService = inject(AuthService);
   const router = inject(Router);
 
-  return authService.isAuthenticated() ? true : router.createUrlTree(['/login']);
+  return authService.isAuthenticated()
+    ? true
+    : router.createUrlTree(['/login'], {
+        queryParams: { returnUrl: state.url },
+      });
 };
 
 export const guestOnlyGuard: CanActivateFn = () => {

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

@@ -37,3 +37,25 @@ export interface RegisterResponse {
   message: string;
   data: AuthUser;
 }
+
+export interface ResetPasswordAttemptResponse {
+  message: string;
+  status: 'pending';
+}
+
+export interface ValidateResetPasswordAttemptResponse {
+  message: string;
+  status: 'validated';
+}
+
+export interface ResetPasswordPayload {
+  email: string;
+  codigo: string;
+  password: string;
+  password_confirmation: string;
+}
+
+export interface ResetPasswordResponse {
+  message: string;
+  status: 'used';
+}

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

@@ -19,8 +19,12 @@ describe('AuthService', () => {
   function createCookieServiceStub() {
     return {
       get: (name: string) => cookieStore[name] || null,
-      set: (name: string, value: string) => { cookieStore[name] = value; },
+      set: (name: string, value: string) => {
-      delete: (name: string) => { delete cookieStore[name]; }
+        cookieStore[name] = value;
+      },
+      delete: (name: string) => {
+        delete cookieStore[name];
+      }
     };
   }
 
@@ -31,6 +35,10 @@ describe('AuthService', () => {
         provideHttpClientTesting(),
         AuthService,
         { provide: CookieService, useValue: createCookieServiceStub() },
+        {
+          provide: TenantService,
+          useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
+        },
         TransferState
       ]
     });
@@ -44,6 +52,12 @@ describe('AuthService', () => {
 
     const request = httpController.expectOne(`${environment.url}login`);
     expect(request.request.method).toBe('POST');
+    expect(request.request.body).toEqual({
+      email: 'ada@example.com',
+      password: 'secret123',
+      tenant_codigo: 'tenant-test'
+    });
+    expect(request.request.withCredentials).toBe(true);
     request.flush({
       message: 'Sesion iniciada correctamente.',
       token: 'plain-text-token',
@@ -58,13 +72,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: [
@@ -96,8 +110,49 @@ describe('AuthService', () => {
     httpController.verify();
   });
 
+  it('sends tenant and credentials when completing Google login', () => {
+    TestBed.configureTestingModule({
+      providers: [
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        AuthService,
+        { provide: CookieService, useValue: createCookieServiceStub() },
+        {
+          provide: TenantService,
+          useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
+        },
+        TransferState
+      ]
+    });
+
+    const service = TestBed.inject(AuthService);
+    const httpController = TestBed.inject(HttpTestingController);
+
+    service.completeGoogleLogin('oauth-code').subscribe();
+
+    const request = httpController.expectOne(`${environment.url}auth/google/exchange`);
+    expect(request.request.method).toBe('POST');
+    expect(request.request.body).toEqual({
+      oauth_code: 'oauth-code',
+      tenant_codigo: 'tenant-test'
+    });
+    expect(request.request.withCredentials).toBe(true);
+    request.flush({
+      message: 'Sesion iniciada correctamente.',
+      token: 'google-token',
+      token_type: 'Bearer',
+      user: {
+        id: 1,
+        nombre_apellido: 'Ada Lovelace',
+        email: 'ada@example.com'
+      }
+    });
+
+    httpController.verify();
+  });
+
   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: [
@@ -121,7 +176,7 @@ 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();
   });
@@ -174,6 +229,121 @@ describe('AuthService', () => {
     httpController.verify();
   });
 
+  it('requests a password reset and exposes the final HTTP status', () => {
+    TestBed.configureTestingModule({
+      providers: [
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        AuthService,
+        { provide: CookieService, useValue: createCookieServiceStub() },
+        {
+          provide: TenantService,
+          useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
+        },
+        TransferState
+      ]
+    });
+
+    const service = TestBed.inject(AuthService);
+    const httpController = TestBed.inject(HttpTestingController);
+
+    service.requestPasswordReset('ada@example.com').subscribe((response) => {
+      expect(response.status).toBe(202);
+      expect(response.body?.status).toBe('pending');
+    });
+
+    const request = httpController.expectOne(`${environment.url}password/reset-attempts`);
+    expect(request.request.method).toBe('POST');
+    expect(request.request.body).toEqual({
+      email: 'ada@example.com',
+      tenant_codigo: 'tenant-test'
+    });
+    request.flush(
+      {
+        message: 'Si el email está registrado, recibirás un código.',
+        status: 'pending'
+      },
+      { status: 202, statusText: 'Accepted' }
+    );
+
+    httpController.verify();
+  });
+
+  it('validates a password reset code and exposes its final status', () => {
+    TestBed.configureTestingModule({
+      providers: [
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        AuthService,
+        { provide: CookieService, useValue: createCookieServiceStub() },
+        TransferState
+      ]
+    });
+
+    const service = TestBed.inject(AuthService);
+    const httpController = TestBed.inject(HttpTestingController);
+
+    service.validatePasswordResetCode('ada@example.com', '0123').subscribe((response) => {
+      expect(response.status).toBe(200);
+      expect(response.body?.status).toBe('validated');
+    });
+
+    const request = httpController.expectOne(`${environment.url}password/reset-attempts/validate`);
+    expect(request.request.method).toBe('POST');
+    expect(request.request.body).toEqual({
+      email: 'ada@example.com',
+      codigo: '0123'
+    });
+    request.flush(
+      {
+        message: 'Código validado correctamente.',
+        status: 'validated'
+      },
+      { status: 200, statusText: 'OK' }
+    );
+
+    httpController.verify();
+  });
+
+  it('resets the password and exposes the consumed attempt status', () => {
+    TestBed.configureTestingModule({
+      providers: [
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        AuthService,
+        { provide: CookieService, useValue: createCookieServiceStub() },
+        TransferState
+      ]
+    });
+
+    const service = TestBed.inject(AuthService);
+    const httpController = TestBed.inject(HttpTestingController);
+    const payload = {
+      email: 'ada@example.com',
+      codigo: '0123',
+      password: 'NewSecret!456',
+      password_confirmation: 'NewSecret!456'
+    };
+
+    service.resetPassword(payload).subscribe((response) => {
+      expect(response.status).toBe(200);
+      expect(response.body?.status).toBe('used');
+    });
+
+    const request = httpController.expectOne(`${environment.url}password/reset`);
+    expect(request.request.method).toBe('POST');
+    expect(request.request.body).toEqual(payload);
+    request.flush(
+      {
+        message: 'Contraseña modificada correctamente.',
+        status: 'used'
+      },
+      { status: 200, statusText: 'OK' }
+    );
+
+    httpController.verify();
+  });
+
   it('propagates logout errors without clearing the local session', () => {
     TestBed.configureTestingModule({
       providers: [
@@ -181,6 +351,10 @@ describe('AuthService', () => {
         provideHttpClientTesting(),
         AuthService,
         { provide: CookieService, useValue: createCookieServiceStub() },
+        {
+          provide: TenantService,
+          useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
+        },
         TransferState
       ]
     });
@@ -210,7 +384,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

@@ -1,29 +1,33 @@
 import { DOCUMENT } from '@angular/common';
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+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 { environment } from '../../../../environments/environment';
+import { BaseApiService } from '../base-api.service';
 import {
   AuthUser,
   LoginPayload,
   LoginResponse,
   RegisterPayload,
   RegisterResponse,
-  UpdateProfilePayload
+  ResetPasswordPayload,
+  ResetPasswordAttemptResponse,
+  ResetPasswordResponse,
+  UpdateProfilePayload,
+  ValidateResetPasswordAttemptResponse
 } from './auth.interfaces';
 import { CookieService } from '../cookie/cookie.service';
 import { TenantService } from '../tenant.service';
 
-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({
   providedIn: 'root'
 })
-export class AuthService {
+export class AuthService extends BaseApiService {
-  private readonly http = inject(HttpClient);
   private readonly document = inject(DOCUMENT);
   private readonly platformId = inject(PLATFORM_ID);
   private readonly cookieService = inject(CookieService);
@@ -38,18 +42,70 @@ export class AuthService {
   readonly isAuthenticated = computed(() => this.tokenState() !== null);
 
   login(payload: LoginPayload): Observable<AuthUser> {
-    return this.http.post<LoginResponse>(`${environment.url}login`, payload).pipe(
+    const tenant = this.tenantService.getTenant();
-      tap((response) => this.applyAuthenticatedState(response.token, response.user)),
+    if (!tenant) {
-      map((response) => response.user)
+      throw new Error('No se pudo resolver el tenant activo.');
-    );
+    }
+
+    return this.http
+      .post<LoginResponse>(
+        `${environment.url}login`,
+        { ...payload, tenant_codigo: tenant.codigo },
+        {
+          withCredentials: true
+        }
+      )
+      .pipe(
+        tap((response) => this.applyAuthenticatedState(response.token, response.user)),
+        map((response) => response.user)
+      );
   }
 
   register(payload: RegisterPayload): Observable<RegisterResponse> {
     const tenantCode = this.tenantService.getTenant()?.codigo;
 
-    return this.http.post<RegisterResponse>(`${environment.url}register`, {
+    return this.http.post<RegisterResponse>(
-      ...payload,
+      `${environment.url}register`,
-      ...(tenantCode ? { tenant_codigo: tenantCode } : {})
+      {
+        ...payload,
+        ...(tenantCode ? { tenant_codigo: tenantCode } : {})
+      },
+    );
+  }
+
+  requestPasswordReset(
+    email: string
+  ): Observable<HttpResponse<ResetPasswordAttemptResponse>> {
+    const tenantCode = this.tenantService.getTenant()?.codigo;
+
+    return this.http.post<ResetPasswordAttemptResponse>(
+      `${environment.url}password/reset-attempts`,
+      {
+        email,
+        ...(tenantCode ? { tenant_codigo: tenantCode } : {})
+      },
+      {
+        observe: 'response'
+      }
+    );
+  }
+
+  validatePasswordResetCode(
+    email: string,
+    codigo: string
+  ): Observable<HttpResponse<ValidateResetPasswordAttemptResponse>> {
+    return this.http.post<ValidateResetPasswordAttemptResponse>(
+      `${environment.url}password/reset-attempts/validate`,
+      { email, codigo },
+      {
+        observe: 'response'
+      }
+    );
+  }
+
+  resetPassword(payload: ResetPasswordPayload): Observable<HttpResponse<ResetPasswordResponse>> {
+    return this.http.post<ResetPasswordResponse>(`${environment.url}password/reset`, payload, {
+      observe: 'response'
     });
   }
 
@@ -68,16 +124,29 @@ export class AuthService {
   }
 
   completeGoogleLogin(oauthCode: string): Observable<AuthUser> {
-    return this.http.post<LoginResponse>(`${environment.url}auth/google/exchange`, { oauth_code: oauthCode }).pipe(
+    const tenant = this.tenantService.getTenant();
-      tap((response) => this.applyAuthenticatedState(response.token, response.user)),
+    if (!tenant) {
-      map((response) => response.user)
+      throw new Error('No se pudo resolver el tenant activo.');
-    );
+    }
+
+    return this.http
+      .post<LoginResponse>(
+        `${environment.url}auth/google/exchange`,
+        { oauth_code: oauthCode, tenant_codigo: tenant.codigo },
+        {
+          withCredentials: true
+        }
+      )
+      .pipe(
+        tap((response) => this.applyAuthenticatedState(response.token, response.user)),
+        map((response) => response.user)
+      );
   }
 
   updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
-    return this.http.put<AuthUser>(`${environment.url}me`, payload).pipe(
+    return this.http
-      tap((user) => this.userState.set(user))
+      .put<AuthUser>(`${environment.url}me`, payload)
-    );
+      .pipe(tap((user) => this.userState.set(user)));
   }
 
   logout(): Observable<void> {
@@ -86,9 +155,9 @@ export class AuthService {
       return of(void 0);
     }
 
-    return this.http.post<void>(`${environment.url}logout`, {}).pipe(
+    return this.http
-      tap(() => this.clearSession())
+      .post<void>(`${environment.url}logout`, {})
-    );
+      .pipe(tap(() => this.clearSession()));
   }
 
   async bootstrap(): Promise<void> {
@@ -127,9 +196,9 @@ export class AuthService {
   }
 
   loadCurrentUser(): Observable<AuthUser> {
-    return this.http.get<AuthUser>(`${environment.url}me`).pipe(
+    return this.http
-      tap((user) => this.userState.set(user))
+      .get<AuthUser>(`${environment.url}me`)
-    );
+      .pipe(tap((user) => this.userState.set(user)));
   }
 
   hydrateSession(): void {

src/app/core/services/base-api.service.spec.ts

@@ -0,0 +1,42 @@
+import '@angular/compiler';
+import { provideHttpClient } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { BaseApiService } from './base-api.service';
+import { LOADING_MODE } from './global-loading/loading-mode';
+
+class TestApiService extends BaseApiService {
+  contextFor() {
+    return this.loadingContext();
+  }
+}
+
+describe('BaseApiService', () => {
+  afterEach(() => {
+    TestBed.resetTestingModule();
+  });
+
+  it('uses global loading by default', () => {
+    TestBed.configureTestingModule({ providers: [provideHttpClient()] });
+    const service = TestBed.runInInjectionContext(() => new TestApiService());
+
+    expect(service.contextFor().get(LOADING_MODE)).toBe('global');
+  });
+
+  it('creates an isolated custom-loading scope', () => {
+    TestBed.configureTestingModule({ providers: [provideHttpClient()] });
+    const service = TestBed.runInInjectionContext(() => new TestApiService());
+
+    expect(service.withCustomLoading().contextFor().get(LOADING_MODE)).toBe('custom');
+    expect(service.contextFor().get(LOADING_MODE)).toBe('global');
+  });
+
+  it('creates an isolated scope without a loading indicator', () => {
+    TestBed.configureTestingModule({ providers: [provideHttpClient()] });
+    const service = TestBed.runInInjectionContext(() => new TestApiService());
+
+    expect(service.withoutLoading().contextFor().get(LOADING_MODE)).toBe('none');
+    expect(service.contextFor().get(LOADING_MODE)).toBe('global');
+  });
+});

src/app/core/services/base-api.service.ts

@@ -0,0 +1,79 @@
+import { HttpClient, HttpContext } from '@angular/common/http';
+import { inject } from '@angular/core';
+
+import {
+  LOADING_MODE,
+  LoadingMode
+} from './global-loading/loading-mode';
+
+const REQUEST_LOADING_MODE = Symbol('request-loading-mode');
+
+class LoadingHttpClient {
+  readonly get: HttpClient['get'];
+  readonly post: HttpClient['post'];
+  readonly put: HttpClient['put'];
+  readonly patch: HttpClient['patch'];
+  readonly delete: HttpClient['delete'];
+
+  constructor(
+    http: HttpClient,
+    private readonly buildContext: (context?: HttpContext) => HttpContext
+  ) {
+    this.get = ((url: string, options?: object) =>
+      http.get(url, this.withLoadingContext(options))) as HttpClient['get'];
+    this.post = ((url: string, body: unknown, options?: object) =>
+      http.post(url, body, this.withLoadingContext(options))) as HttpClient['post'];
+    this.put = ((url: string, body: unknown, options?: object) =>
+      http.put(url, body, this.withLoadingContext(options))) as HttpClient['put'];
+    this.patch = ((url: string, body: unknown, options?: object) =>
+      http.patch(url, body, this.withLoadingContext(options))) as HttpClient['patch'];
+    this.delete = ((url: string, options?: object) =>
+      http.delete(url, this.withLoadingContext(options))) as HttpClient['delete'];
+  }
+
+  private withLoadingContext(options?: object): object {
+    const requestOptions = options as { context?: HttpContext } | undefined;
+
+    return {
+      ...requestOptions,
+      context: this.buildContext(requestOptions?.context)
+    };
+  }
+}
+
+export abstract class BaseApiService {
+  private readonly rawHttp = inject(HttpClient);
+  private readonly [REQUEST_LOADING_MODE]: LoadingMode = 'global';
+
+  protected get http(): LoadingHttpClient {
+    return new LoadingHttpClient(
+      this.rawHttp,
+      (context) => this.loadingContext(context)
+    );
+  }
+
+  withLoading(loadingMode: LoadingMode): this {
+    const scopedService = Object.create(this) as this;
+
+    Object.defineProperty(scopedService, REQUEST_LOADING_MODE, {
+      configurable: false,
+      enumerable: false,
+      value: loadingMode,
+      writable: false
+    });
+
+    return scopedService;
+  }
+
+  withCustomLoading(): this {
+    return this.withLoading('custom');
+  }
+
+  withoutLoading(): this {
+    return this.withLoading('none');
+  }
+
+  protected loadingContext(context: HttpContext = new HttpContext()): HttpContext {
+    return context.set(LOADING_MODE, this[REQUEST_LOADING_MODE]);
+  }
+}

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

@@ -1,6 +1,24 @@
 export interface CartItemProduct {
   nombre: string;
   imagen: string | null;
+  variants?: CartItemVariant[];
+}
+
+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 {

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

@@ -6,6 +6,7 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { CartService } from './cart.service';
 import { TenantService } from '../tenant.service';
 import { Cart } from './cart.interface';
+import { LOADING_MODE } from '../global-loading/loading-mode';
 
 describe('CartService', () => {
   let service: CartService;
@@ -75,6 +76,14 @@ describe('CartService', () => {
     req.flush({ data: mockCart });
   });
 
+  it('propagates a custom loading mode to the request context', () => {
+    service.withCustomLoading().loadCart().subscribe();
+
+    const req = httpMock.expectOne('http://api.test/tenants/acme/cart');
+    expect(req.request.context.get(LOADING_MODE)).toBe('custom');
+    req.flush({ data: mockCart });
+  });
+
   it('should clear cart state locally', () => {
     service.clearCart();
 

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

@@ -1,16 +1,15 @@
 import { inject, Injectable, signal } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
 import { catchError, map, Observable, tap } from 'rxjs';
 
 import { ApiResponse } from '../api-response.interface';
+import { BaseApiService } from '../base-api.service';
 import { TenantService } from '../tenant.service';
 import { Cart } from './cart.interface';
 
 @Injectable({
   providedIn: 'root',
 })
-export class CartService {
+export class CartService extends BaseApiService {
-  private readonly http = inject(HttpClient);
   private readonly tenantService = inject(TenantService);
 
   private readonly cartState = signal<Cart | null>(null);
@@ -51,9 +50,13 @@ export class CartService {
   ): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .post<
+      .post<ApiResponse<Cart>>(
-        ApiResponse<Cart>
+        `${this.tenantApiUrl}/cart/items`,
-      >(`${this.tenantApiUrl}/cart/items`, { catalog_item_id: catalogItemId, variant_id: variantId, cantidad }, { withCredentials: true })
+        { catalog_item_id: catalogItemId, variant_id: variantId, cantidad },
+        {
+          withCredentials: true,
+        },
+      )
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
@@ -67,11 +70,26 @@ export class CartService {
   }
 
   updateItemQuantity(cartItemId: number, cantidad: number): Observable<ApiResponse<Cart>> {
+    return this.updateItem(cartItemId, { cantidad });
+  }
+
+  updateItemVariant(
+    cartItemId: number,
+    cantidad: number,
+    variantId: number,
+  ): Observable<ApiResponse<Cart>> {
+    return this.updateItem(cartItemId, { cantidad, variant_id: variantId });
+  }
+
+  private updateItem(
+    cartItemId: number,
+    payload: { cantidad: number; variant_id?: number },
+  ): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .patch<
+      .patch<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, payload, {
-        ApiResponse<Cart>
+        withCredentials: true,
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { cantidad }, { withCredentials: true })
+      })
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
@@ -87,9 +105,9 @@ export class CartService {
   removeItem(cartItemId: number): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
-      .delete<
+      .delete<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
-        ApiResponse<Cart>
+        withCredentials: true,
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { withCredentials: true })
+      })
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);

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,19 +18,32 @@ 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[];
 }
 
@@ -35,8 +51,17 @@ export type InventoryPolicy = 'tracked' | 'unlimited';
 
 export interface CatalogItemVariant {
   id: number;
+  descripcion?: string | null;
+  precio?: string;
+  event_date_id?: number | null;
+  event_date_ids?: number[];
+  event_dates?: string[];
   stock_tecnico: number | null;
-  values: Record<string, string>;
+  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 | string[]>;
 }
 
 export interface SelectedCatalogItemVariant extends CatalogItemVariant {
@@ -45,6 +70,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;
@@ -54,6 +81,7 @@ 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;
@@ -69,12 +97,15 @@ export type CatalogGroupLayout = 'paginated' | 'simple' | 'simple_vertical' | 'c
 
 export interface CatalogFeaturedItemVariant {
   id: number;
+  descripcion?: string | null;
+  precio?: string;
   stock_tecnico: number | null;
-  values: Record<string, string>;
+  values: Record<string, string | string[]>;
 }
 
 export interface CatalogFeaturedItem {
   id: number;
+  type: CatalogItemType;
   nombre: string;
   descripcion?: string | null;
   precio: number | string;
@@ -84,7 +115,8 @@ export interface CatalogFeaturedItem {
 }
 
 export type CatalogFeaturedItems =
-  ApiPaginatedResponse<CatalogFeaturedItem[]> | CatalogFeaturedItem[];
+  | ApiPaginatedResponse<CatalogFeaturedItem[]>
+  | CatalogFeaturedItem[];
 
 export interface CatalogFeaturedGroup {
   id: number;
@@ -94,3 +126,15 @@ export interface CatalogFeaturedGroup {
   group_order: number;
   items: CatalogFeaturedItems;
 }
+
+export interface CatalogCategory {
+  id: number;
+  nombre: string;
+  categoria_id: number | null;
+}
+
+export interface CategoryItemsResponse extends ApiPaginatedResponse<CatalogFeaturedItem[]> {
+  category: CatalogCategory;
+  layout: CatalogProductLayout;
+  group_layout: CatalogGroupLayout;
+}

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

@@ -1,16 +1,18 @@
+import { HttpParams } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
 import { map, Observable } from 'rxjs';
 
 import { ApiPaginationQueryParams } from '../api-pagination-query-params.interface';
 import { ApiPaginatedResponse } from '../api-paginated-response.interface';
 import { ApiResponse } from '../api-response.interface';
+import { BaseApiService } from '../base-api.service';
 import { TenantService } from '../tenant.service';
 import {
   CatalogFeaturedGroup,
   CatalogFeaturedItem,
   CatalogFeaturedItems,
   CatalogItemDetail,
+  CategoryItemsResponse,
   Product,
 } from './catalog.interface';
 
@@ -23,8 +25,7 @@ export interface CatalogSearchQueryParams extends ApiPaginationQueryParams {
 @Injectable({
   providedIn: 'root',
 })
-export class CatalogService {
+export class CatalogService extends BaseApiService {
-  private readonly http = inject(HttpClient);
   private readonly tenantService = inject(TenantService);
 
   private get tenantApiUrl(): string {
@@ -46,28 +47,46 @@ export class CatalogService {
   ): Observable<ApiPaginatedResponse<CatalogFeaturedItem[]>> {
     return this.http.get<ApiPaginatedResponse<CatalogFeaturedItem[]>>(
       `${this.tenantApiUrl}/catalog-items`,
-      { params: this.buildHttpParams(params) },
+      {
+        params: this.buildHttpParams(params),
+      },
     );
   }
 
+  getCategoryItems(
+    categoryId: number,
+    params?: ApiPaginationQueryParams,
+  ): Observable<CategoryItemsResponse> {
+    return this.http.get<CategoryItemsResponse>(`${this.tenantApiUrl}/categories/${categoryId}`, {
+      params: this.buildHttpParams(params),
+    });
+  }
+
   getFeaturedGroupItems(
     featuredGroupId: number,
     params?: ApiPaginationQueryParams,
   ): Observable<CatalogFeaturedItems> {
     return this.http.get<CatalogFeaturedItems>(
       `${this.tenantApiUrl}/catalog/featured-groups/${featuredGroupId}/items`,
-      { params: this.buildHttpParams(params) },
+      {
+        params: this.buildHttpParams(params),
+      },
     );
   }
 
-  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);
     }
 
     return this.http
-      .get<ApiResponse<CatalogItemDetail>>(`${this.tenantApiUrl}/catalog-items/${id}`, { params })
+      .get<ApiResponse<CatalogItemDetail>>(`${this.tenantApiUrl}/catalog-items/${id}`, {
+        params,
+      })
       .pipe(map((response) => response.data));
   }
 

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

@@ -1,17 +1,28 @@
-import { inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
 import { firstValueFrom } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
+import { BaseApiService } from './base-api.service';
 
-export interface CreatePurchasePayload {
+export interface UpdatePurchaseCustomerPayload {
-  cart_id: number;
   dni: string;
   telefono: string;
   nombre_apellido: string;
   email: string;
 }
 
+export type StartCheckoutPayload =
+  | {
+      cart_id: number;
+    }
+  | {
+      direct_item: {
+        catalog_item_id: number;
+        variant_id: number | null;
+        cantidad: number;
+      };
+    };
+
 export interface PurchaseStatusResponse {
   status: string | null;
 }
@@ -50,6 +61,7 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
   user_id: number;
   created_at: string | null;
   payment_method: string | null;
+  expires_at: string | null;
   dni: string | null;
   transfer_payer_dni: string | null;
   telefono: string | null;
@@ -57,22 +69,28 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
   email: string | null;
   items_source: 'purchase';
   items: PurchaseDetailItemResponse[];
+  tickets_count?: number;
+  has_generated_tickets?: boolean;
   subtotal: string;
   total: string;
 }
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
-export class CheckoutService {
+export class CheckoutService extends BaseApiService {
-  private readonly http = inject(HttpClient);
+  async startCheckout(
-
+    tenantCode: string,
-  async createPurchase(tenantCode: string, payload: CreatePurchasePayload): Promise<{ id: number }> {
+    payload: StartCheckoutPayload,
+  ): Promise<PurchaseDetailResponse> {
     const response = await firstValueFrom(
-      this.http.post<{ data?: { id: number }; id?: number }>(`${environment.url}tenants/${tenantCode}/compras`, payload)
+      this.http.post<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
+        `${environment.url}tenants/${tenantCode}/compras/start-checkout`,
+        payload,
+      ),
     );
 
-    const purchase = this.extractResponseData<{ id: number }>(response);
+    const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
 
     if (!purchase?.id) {
       throw new Error('Error al crear la compra.');
@@ -81,13 +99,21 @@ export class CheckoutService {
     return purchase;
   }
 
-  async generatePaymentIntent(tenantCode: string, purchaseId: number, method: 'qr' | 'transfer' | 'telepagos', payerDni?: string): Promise<any> {
+  async generatePaymentIntent(
+    tenantCode: string,
+    purchaseId: number,
+    method: 'qr' | 'transfer' | 'telepagos',
+    payerDni?: string,
+  ): Promise<any> {
     const payload: any = { method };
     if (payerDni) {
       payload.transfer_payer_dni = payerDni;
     }
     const response = await firstValueFrom(
-      this.http.post<any>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`, payload)
+      this.http.post<any>(
+        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`,
+        payload,
+      ),
     );
     if (!response) {
       throw new Error('Error al generar la intención de pago.');
@@ -95,9 +121,75 @@ export class CheckoutService {
     return response;
   }
 
-  async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
+  async updateCustomerData(
+    tenantCode: string,
+    purchaseId: number,
+    payload: UpdatePurchaseCustomerPayload,
+  ): Promise<PurchaseDetailResponse> {
     const response = await firstValueFrom(
-      this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`, {})
+      this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
+        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/customer-data`,
+        payload,
+      ),
+    );
+
+    const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
+    if (!purchase) {
+      throw new Error('Error al actualizar los datos de la compra.');
+    }
+
+    return purchase;
+  }
+
+  async updateItemQuantity(
+    tenantCode: string,
+    purchaseId: number,
+    itemId: number,
+    quantity: number,
+  ): Promise<PurchaseDetailResponse> {
+    const response = await firstValueFrom(
+      this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
+        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`,
+        { quantity },
+      ),
+    );
+
+    const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
+    if (!purchase) {
+      throw new Error('Error al actualizar la cantidad del producto.');
+    }
+
+    return purchase;
+  }
+
+  async prepareItemEditing(
+    tenantCode: string,
+    purchaseId: number,
+  ): Promise<PurchaseDetailResponse> {
+    const response = await firstValueFrom(
+      this.http.post<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
+        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/edit-items`,
+        {},
+      ),
+    );
+
+    const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
+    if (!purchase) {
+      throw new Error('Error al preparar la compra para editarla.');
+    }
+
+    return purchase;
+  }
+
+  async completePurchase(
+    tenantCode: string,
+    purchaseId: number,
+  ): Promise<PurchaseStatusResponse> {
+    const response = await firstValueFrom(
+      this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
+        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`,
+        {},
+      ),
     );
 
     const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
@@ -107,17 +199,58 @@ export class CheckoutService {
     }
 
     return {
-      status: purchase.status ?? null
+      status: purchase.status ?? null,
     };
   }
 
-  async getPurchases(tenantCode: string, status?: string): Promise<{ data: PurchaseSummaryResponse[] }> {
+  async submitPurchaseForReview(
+    tenantCode: string,
+    purchaseId: number,
+  ): Promise<PurchaseStatusResponse> {
+    const response = await firstValueFrom(
+      this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
+        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/review`,
+        {},
+      ),
+    );
+
+    const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
+    if (!purchase) {
+      throw new Error('Error al enviar la compra a revisi\u00f3n.');
+    }
+
+    return { status: purchase.status ?? null };
+  }
+
+  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`,
+        {},
+      ),
+    );
+
+    const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
+    if (!purchase) {
+      throw new Error('Error al cancelar la compra.');
+    }
+
+    return { status: purchase.status ?? null };
+  }
+
+  async getPurchases(
+    tenantCode: string,
+    status?: string,
+  ): Promise<{ data: PurchaseSummaryResponse[] }> {
     let url = `${environment.url}tenants/${tenantCode}/compras`;
     if (status) {
       url += `?status=${status}`;
     }
     const response = await firstValueFrom(
-      this.http.get<{ data: PurchaseSummaryResponse[] }>(url)
+      this.http.get<{ data: PurchaseSummaryResponse[] }>(url),
     );
     if (!response) {
       throw new Error('Error al obtener las compras.');
@@ -125,9 +258,14 @@ export class CheckoutService {
     return response;
   }
 
-  async getPurchase(tenantCode: string, purchaseId: string | number): Promise<PurchaseDetailResponse> {
+  async getPurchase(
+    tenantCode: string,
+    purchaseId: string | number,
+  ): Promise<PurchaseDetailResponse> {
     const response = await firstValueFrom(
-      this.http.get<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}`)
+      this.http.get<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
+        `${environment.url}tenants/${tenantCode}/compras/${purchaseId}`,
+      ),
     );
 
     const purchase = this.extractResponseData<PurchaseDetailResponse>(response);

src/app/core/services/global-loading/global-loading.interceptor.spec.ts

@@ -0,0 +1,80 @@
+import '@angular/compiler';
+import { HttpClient, HttpContext, provideHttpClient, withInterceptors } from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { globalLoadingInterceptor } from './global-loading.interceptor';
+import { GlobalLoadingService } from './global-loading.service';
+import { LOADING_MODE, LoadingMode } from './loading-mode';
+
+describe('globalLoadingInterceptor', () => {
+  let client: HttpClient;
+  let httpTesting: HttpTestingController;
+  let loadingService: GlobalLoadingService;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    TestBed.configureTestingModule({
+      providers: [
+        provideHttpClient(withInterceptors([globalLoadingInterceptor])),
+        provideHttpClientTesting()
+      ]
+    });
+
+    client = TestBed.inject(HttpClient);
+    httpTesting = TestBed.inject(HttpTestingController);
+    loadingService = TestBed.inject(GlobalLoadingService);
+  });
+
+  afterEach(() => {
+    httpTesting.verify();
+    TestBed.resetTestingModule();
+    vi.useRealTimers();
+  });
+
+  it('tracks concurrent requests until the last one completes', () => {
+    client.get('/api/first').subscribe();
+    client.get('/api/second').subscribe();
+    vi.advanceTimersByTime(150);
+
+    expect(loadingService.isLoading()).toBe(true);
+
+    httpTesting.expectOne('/api/first').flush({});
+    expect(loadingService.isLoading()).toBe(true);
+
+    httpTesting.expectOne('/api/second').flush({});
+    expect(loadingService.isLoading()).toBe(false);
+  });
+
+  it('stops loading when a request fails', () => {
+    client.get('/api/failing').subscribe({ error: () => undefined });
+    vi.advanceTimersByTime(150);
+
+    expect(loadingService.isLoading()).toBe(true);
+
+    httpTesting.expectOne('/api/failing').flush(
+      { message: 'Error' },
+      { status: 500, statusText: 'Server Error' }
+    );
+
+    expect(loadingService.isLoading()).toBe(false);
+  });
+
+  it.each<LoadingMode>(['custom', 'none'])(
+    'does not show the global loader for %s requests',
+    (loadingMode) => {
+      const context = new HttpContext().set(LOADING_MODE, loadingMode);
+
+      client.get(`/api/${loadingMode}`, { context }).subscribe();
+      vi.advanceTimersByTime(150);
+
+      expect(loadingService.isLoading()).toBe(false);
+
+      httpTesting.expectOne(`/api/${loadingMode}`).flush({});
+    }
+  );
+});

src/app/core/services/global-loading/global-loading.interceptor.ts

@@ -0,0 +1,20 @@
+import { HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest } from '@angular/common/http';
+import { inject } from '@angular/core';
+import { Observable, finalize } from 'rxjs';
+
+import { GlobalLoadingService } from './global-loading.service';
+import { LOADING_MODE } from './loading-mode';
+
+export const globalLoadingInterceptor: HttpInterceptorFn = (
+  request: HttpRequest<unknown>,
+  next: HttpHandlerFn
+): Observable<HttpEvent<unknown>> => {
+  if (request.context.get(LOADING_MODE) !== 'global') {
+    return next(request);
+  }
+
+  const loadingService = inject(GlobalLoadingService);
+  loadingService.start();
+
+  return next(request).pipe(finalize(() => loadingService.stop()));
+};

src/app/core/services/global-loading/global-loading.service.spec.ts

@@ -0,0 +1,65 @@
+import '@angular/compiler';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { GlobalLoadingService } from './global-loading.service';
+
+describe('GlobalLoadingService', () => {
+  let service: GlobalLoadingService;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(GlobalLoadingService);
+  });
+
+  afterEach(() => {
+    TestBed.resetTestingModule();
+    vi.useRealTimers();
+  });
+
+  it('delays the loading state to avoid flashes on fast operations', () => {
+    service.start();
+
+    expect(service.isLoading()).toBe(false);
+
+    service.stop();
+    vi.advanceTimersByTime(150);
+
+    expect(service.isLoading()).toBe(false);
+  });
+
+  it('shows the loading state for an operation that exceeds the delay', () => {
+    service.start();
+    vi.advanceTimersByTime(150);
+
+    expect(service.isLoading()).toBe(true);
+
+    service.stop();
+
+    expect(service.isLoading()).toBe(false);
+  });
+
+  it('stays visible until all concurrent operations finish', () => {
+    service.start();
+    service.start();
+    vi.advanceTimersByTime(150);
+
+    service.stop();
+    expect(service.isLoading()).toBe(true);
+
+    service.stop();
+    expect(service.isLoading()).toBe(false);
+  });
+
+  it('ignores extra stop calls without corrupting the counter', () => {
+    service.stop();
+    service.start();
+    vi.advanceTimersByTime(150);
+
+    expect(service.isLoading()).toBe(true);
+
+    service.stop();
+    expect(service.isLoading()).toBe(false);
+  });
+});

src/app/core/services/global-loading/global-loading.service.ts

@@ -0,0 +1,58 @@
+import { isPlatformBrowser } from '@angular/common';
+import { Injectable, PLATFORM_ID, inject, signal } from '@angular/core';
+
+const SHOW_DELAY_MS = 150;
+
+@Injectable({ providedIn: 'root' })
+export class GlobalLoadingService {
+  private readonly isBrowser = isPlatformBrowser(inject(PLATFORM_ID));
+  private readonly loadingState = signal(false);
+  private pendingOperations = 0;
+  private showTimer: ReturnType<typeof setTimeout> | undefined;
+
+  readonly isLoading = this.loadingState.asReadonly();
+
+  start(): void {
+    if (!this.isBrowser) {
+      return;
+    }
+
+    this.pendingOperations += 1;
+
+    if (this.pendingOperations > 1 || this.loadingState()) {
+      return;
+    }
+
+    this.showTimer = setTimeout(() => {
+      this.showTimer = undefined;
+
+      if (this.pendingOperations > 0) {
+        this.loadingState.set(true);
+      }
+    }, SHOW_DELAY_MS);
+  }
+
+  stop(): void {
+    if (!this.isBrowser || this.pendingOperations === 0) {
+      return;
+    }
+
+    this.pendingOperations -= 1;
+
+    if (this.pendingOperations > 0) {
+      return;
+    }
+
+    this.cancelShowTimer();
+    this.loadingState.set(false);
+  }
+
+  private cancelShowTimer(): void {
+    if (this.showTimer === undefined) {
+      return;
+    }
+
+    clearTimeout(this.showTimer);
+    this.showTimer = undefined;
+  }
+}

src/app/core/services/global-loading/loading-mode.ts

@@ -0,0 +1,5 @@
+import { HttpContextToken } from '@angular/common/http';
+
+export type LoadingMode = 'global' | 'custom' | 'none';
+
+export const LOADING_MODE = new HttpContextToken<LoadingMode>(() => 'global');

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

@@ -9,18 +9,62 @@ 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 | null;
   title_html?: string | null;
   description_html?: string | null;
   button_text?: string | null;
   button_href?: string | null;
 }
 
+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 {
@@ -41,11 +85,19 @@ export interface SocialMedia {
   url: string;
 }
 
+export interface Category {
+  id: number;
+  nombre: string;
+  subcategories: Category[];
+}
+
 export interface Tenant {
   id: number;
   codigo: string;
   nombre: string;
   dominio: string;
+  site_title?: string | null;
+  favicon?: string | null;
   primary_color: string;
   secondary_color: string;
   danger_color: string;
@@ -54,16 +106,21 @@ export interface Tenant {
   footer_bg_color: string;
   header_logo: string;
   footer_logo: string;
+  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_items_per_page?: number;
-  main_carousel_images?: string[];
+  display_categories?: boolean;
+  display_seach_bar?: boolean;
   social_media?: SocialMedia[];
   menues?: Menu[];
+  categories: Category[];
 }
 
 export type TenantBootstrapResponse = ApiResponse<Tenant>;

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

@@ -20,7 +20,20 @@ const tenant: Tenant = {
   header_bg_color: '#313131',
   footer_bg_color: '#313131',
   header_logo: 'https://example.com/header.png',
-  footer_logo: 'https://example.com/footer.png'
+  footer_logo: 'https://example.com/footer.png',
+  categories: [
+    {
+      id: 1,
+      nombre: 'Remeras',
+      subcategories: [
+        {
+          id: 2,
+          nombre: 'Manga corta',
+          subcategories: []
+        }
+      ]
+    }
+  ]
 };
 
 const tenantResponse: TenantBootstrapResponse = {

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

@@ -1,5 +1,5 @@
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { HttpErrorResponse } from '@angular/common/http';
 import {
   inject,
   Injectable,
@@ -13,6 +13,7 @@ import { IS_DISCOVERING_ROUTES } from '@angular/ssr';
 import { firstValueFrom } from 'rxjs';
 
 import { environment } from '../../../environments/environment';
+import { BaseApiService } from './base-api.service';
 import { Tenant, TenantBootstrapResponse } from './tenant.interface';
 import {
   TENANT_SSR_STATE_KEY,
@@ -23,8 +24,7 @@ import {
 @Injectable({
   providedIn: 'root'
 })
-export class TenantService {
+export class TenantService extends BaseApiService {
-  private readonly http = inject(HttpClient);
   private readonly platformId = inject(PLATFORM_ID);
   private readonly request = inject(REQUEST, { optional: true });
   private readonly responseInit = inject(RESPONSE_INIT, { optional: true });
@@ -73,7 +73,9 @@ export class TenantService {
 
     try {
       const response = await firstValueFrom(
-        this.http.get<TenantBootstrapResponse>(`${environment.url}tenants/bootstrap/${domain}`)
+        this.http.get<TenantBootstrapResponse>(
+          `${environment.url}tenants/bootstrap/${domain}`
+        )
       );
 
       if (!response?.data) {

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

@@ -77,7 +77,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 +231,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 +281,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 +296,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 +337,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.spec.ts

@@ -23,6 +23,7 @@ const tenant: Tenant = {
   footer_bg_color: '#313131',
   header_logo: 'https://example.com/header.png',
   footer_logo: 'https://example.com/footer.png',
+  categories: [],
 };
 
 function createTenantServiceStub(currentTenant: Tenant | null) {

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

@@ -204,8 +204,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' },
+      { value: '10-oct-manana', values: { fecha: '10 de Octubre', turno: 'Mañana' } },
-      { label: '11 de Octubre', value: '11-oct' },
+      { value: '10-oct-tarde', values: { fecha: '10 de Octubre', turno: 'Tarde' } },
+      { value: '11-oct-tarde', values: { fecha: '11 de Octubre', turno: 'Tarde' } },
     ],
   };
 

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

@@ -0,0 +1,15 @@
+<section class="menu-content-section" [attr.aria-labelledby]="titleId()">
+  <header class="menu-content-section__header">
+    <div class="menu-content-section__prefix">
+      <ng-content select="[menuContentPrefix]" />
+    </div>
+
+    <h2 class="menu-content-section__title" [id]="titleId()">
+      {{ title() | uppercase }}
+    </h2>
+  </header>
+
+  <div class="menu-content-section__body">
+    <ng-content />
+  </div>
+</section>

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

@@ -0,0 +1,53 @@
+:host {
+  display: block;
+  width: 100%;
+  min-width: 0;
+}
+
+.menu-content-section {
+  width: 100%;
+}
+
+.menu-content-section__header {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  margin-bottom: 1.25rem;
+}
+
+.menu-content-section__prefix:empty {
+  display: none;
+}
+
+.menu-content-section__title {
+  margin: 0;
+  color: #888888;
+  font-size: 1rem;
+  font-weight: 600;
+  line-height: 1.3;
+}
+
+.menu-content-section__body {
+  min-width: 0;
+}
+
+@media (max-width: 767.98px) {
+  .menu-content-section {
+    margin-inline: auto;
+  }
+
+  .menu-content-section__header {
+    position: relative;
+    justify-content: center;
+  }
+
+  .menu-content-section__prefix:not(:empty) {
+    position: absolute;
+    left: 0;
+  }
+
+  .menu-content-section__title {
+    width: 100%;
+    text-align: center;
+  }
+}

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

@@ -0,0 +1,58 @@
+import { Component, signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { describe, expect, it } from 'vitest';
+
+import { Tenant } from '../../../../core/services/tenant.interface';
+import { TenantService } from '../../../../core/services/tenant.service';
+import { MenuContentSectionComponent } from './menu-content-section.component';
+
+@Component({
+  imports: [MenuContentSectionComponent],
+  template: `
+    <app-menu-content-section menuCode="help.contact" titleId="contact-title">
+      <a menuContentPrefix href="/ayuda">Volver</a>
+      <p>Contenido proyectado</p>
+    </app-menu-content-section>
+  `,
+})
+class TestHostComponent {}
+
+describe('MenuContentSectionComponent', () => {
+  it('renders an accessible title and projects its content', async () => {
+    const tenant = signal({
+      menues: [
+        {
+          id: 1,
+          code: 'help.contact',
+          label: 'Contacto del comercio',
+          parent_menu_code: 'help',
+          content_type: 'static',
+          route: '/ayuda/contacto',
+          submenues: [],
+        },
+      ],
+    } as unknown as Tenant);
+
+    await TestBed.configureTestingModule({
+      imports: [TestHostComponent],
+      providers: [{ provide: TenantService, useValue: { tenant: tenant.asReadonly() } }],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(TestHostComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const section = element.querySelector('section');
+
+    expect(section?.getAttribute('aria-labelledby')).toBe('contact-title');
+    expect(element.querySelector('#contact-title')?.textContent?.trim()).toBe(
+      'CONTACTO DEL COMERCIO',
+    );
+    expect(element.querySelector('.menu-content-section__prefix a')?.textContent).toContain(
+      'Volver',
+    );
+    expect(element.querySelector('.menu-content-section__body')?.textContent).toContain(
+      'Contenido proyectado',
+    );
+  });
+});

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

@@ -0,0 +1,22 @@
+import { UpperCasePipe } from '@angular/common';
+import { Component, computed, inject, input } from '@angular/core';
+
+import { findMenu } from '../../../../core/services/menu.utils';
+import { TenantService } from '../../../../core/services/tenant.service';
+
+@Component({
+  selector: 'app-menu-content-section',
+  imports: [UpperCasePipe],
+  templateUrl: './menu-content-section.component.html',
+  styleUrl: './menu-content-section.component.scss',
+})
+export class MenuContentSectionComponent {
+  private readonly tenantService = inject(TenantService);
+
+  readonly menuCode = input.required<string>();
+  readonly titleId = input.required<string>();
+
+  protected readonly title = computed(
+    () => findMenu(this.tenantService.tenant()?.menues ?? [], this.menuCode())?.label ?? '',
+  );
+}

src/app/features/store/components/menu-page-layout/menu-page-layout.component.html

@@ -0,0 +1,22 @@
+<div class="menu-page-layout">
+  <aside class="menu-page-layout__sidebar">
+    <h1 class="menu-page-layout__title">{{ menu()?.label }}</h1>
+    <div class="menu-page-layout__divider"></div>
+
+    <nav class="menu-page-layout__nav" [attr.aria-label]="navigationLabel">
+      @for (submenu of submenues(); track submenu.code) {
+        <a
+          class="menu-page-layout__link"
+          [routerLink]="submenu.route"
+          routerLinkActive="menu-page-layout__link--active"
+        >
+          {{ submenu.label }}
+        </a>
+      }
+    </nav>
+  </aside>
+
+  <main class="menu-page-layout__content">
+    <router-outlet />
+  </main>
+</div>

src/app/features/store/components/menu-page-layout/menu-page-layout.component.scss

@@ -0,0 +1,88 @@
+:host {
+  display: block;
+  width: 100%;
+}
+
+.menu-page-layout {
+  display: grid;
+  grid-template-columns: minmax(190px, 250px) minmax(0, 1fr);
+  gap: clamp(3rem, 8vw, 6.25rem);
+  width: 100%;
+
+  &__sidebar,
+  &__content {
+    min-width: 0;
+  }
+
+  &__sidebar {
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__title {
+    margin: 0 0 0.75rem;
+    color: #1a1a1a;
+    font-size: 1rem;
+    font-weight: 700;
+    line-height: 1.25;
+    text-transform: uppercase;
+  }
+
+  &__divider {
+    height: 1px;
+    margin-bottom: 1.25rem;
+    background: #dedede;
+  }
+
+  &__nav {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+  }
+
+  &__link {
+    color: #888888;
+    font-size: 0.875rem;
+    font-weight: 500;
+    line-height: 1.35;
+    text-decoration: none;
+    transition: color 150ms ease;
+
+    &:hover,
+    &:focus-visible {
+      color: #5a5a5a;
+    }
+
+    &:focus-visible {
+      border-radius: 2px;
+      outline: 2px solid var(--color-primary);
+      outline-offset: 3px;
+    }
+
+    &--active {
+      color: var(--color-primary);
+      font-weight: 600;
+    }
+  }
+}
+
+@media (max-width: 767.98px) {
+  .menu-page-layout {
+    grid-template-columns: 1fr;
+    gap: 2rem;
+
+    &__title {
+      text-align: center;
+    }
+
+    &__nav {
+      flex-flow: row wrap;
+      justify-content: center;
+      gap: 0.75rem 1.25rem;
+    }
+
+    &__content {
+      width: 100%;
+    }
+  }
+}

src/app/features/store/components/menu-page-layout/menu-page-layout.component.spec.ts

@@ -0,0 +1,136 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { ActivatedRoute, provideRouter } from '@angular/router';
+import { describe, expect, it } from 'vitest';
+
+import { Tenant } from '../../../../core/services/tenant.interface';
+import { TenantService } from '../../../../core/services/tenant.service';
+import { MenuPageLayoutComponent } from './menu-page-layout.component';
+
+function createTenant(): Tenant {
+  return {
+    id: 1,
+    codigo: 'test',
+    nombre: 'Test',
+    dominio: 'localhost',
+    primary_color: '#000000',
+    secondary_color: '#000000',
+    danger_color: '#000000',
+    success_color: '#000000',
+    header_bg_color: '#ffffff',
+    footer_bg_color: '#ffffff',
+    header_logo: '',
+    footer_logo: '',
+    categories: [],
+    menues: [
+      {
+        id: 1,
+        code: 'account',
+        label: 'Mi cuenta',
+        parent_menu_code: null,
+        content_type: 'dynamic',
+        route: '/mi-cuenta',
+        submenues: [
+          {
+            id: 2,
+            code: 'account.profile',
+            label: 'Datos personales',
+            parent_menu_code: 'account',
+            content_type: 'dynamic',
+            route: '/mi-cuenta/datos-personales',
+            submenues: [],
+          },
+          {
+            id: 3,
+            code: 'account.purchases',
+            label: 'Mis compras',
+            parent_menu_code: 'account',
+            content_type: 'dynamic',
+            route: '/mi-cuenta/compras',
+            submenues: [],
+          },
+        ],
+      },
+      {
+        id: 4,
+        code: 'help',
+        label: 'Centro de ayuda',
+        parent_menu_code: null,
+        content_type: 'dynamic',
+        route: '/ayuda',
+        submenues: [
+          {
+            id: 5,
+            code: 'help.faq',
+            label: 'Consultas habituales',
+            parent_menu_code: 'help',
+            content_type: 'dynamic',
+            route: '/ayuda/preguntas-frecuentes',
+            submenues: [],
+          },
+        ],
+      },
+    ],
+  };
+}
+
+async function renderLayout(menuCode: string, navigationLabel: string): Promise<HTMLElement> {
+  const tenant = signal(createTenant());
+
+  await TestBed.configureTestingModule({
+    imports: [MenuPageLayoutComponent],
+    providers: [
+      provideRouter([]),
+      {
+        provide: ActivatedRoute,
+        useValue: {
+          snapshot: {
+            data: { menuCode, navigationLabel },
+          },
+        },
+      },
+      {
+        provide: TenantService,
+        useValue: { tenant: tenant.asReadonly() },
+      },
+    ],
+  }).compileComponents();
+
+  const fixture = TestBed.createComponent(MenuPageLayoutComponent);
+  fixture.detectChanges();
+
+  return fixture.nativeElement as HTMLElement;
+}
+
+describe('MenuPageLayoutComponent', () => {
+  it('renders the configured account menu and its navigation label', async () => {
+    const element = await renderLayout('account', 'Secciones de mi cuenta');
+    const links = Array.from(
+      element.querySelectorAll<HTMLAnchorElement>('.menu-page-layout__link'),
+    );
+
+    expect(element.querySelector('.menu-page-layout__title')?.textContent?.trim()).toBe(
+      'Mi cuenta',
+    );
+    expect(element.querySelector('nav')?.getAttribute('aria-label')).toBe('Secciones de mi cuenta');
+    expect(links.map((link) => link.textContent?.trim())).toEqual([
+      'Datos personales',
+      'Mis compras',
+    ]);
+    expect(links.map((link) => link.getAttribute('href'))).toEqual([
+      '/mi-cuenta/datos-personales',
+      '/mi-cuenta/compras',
+    ]);
+  });
+
+  it('uses the same component for the help menu', async () => {
+    const element = await renderLayout('help', 'Secciones de ayuda');
+
+    expect(element.querySelector('.menu-page-layout__title')?.textContent?.trim()).toBe(
+      'Centro de ayuda',
+    );
+    expect(element.querySelector('.menu-page-layout__link')?.textContent?.trim()).toBe(
+      'Consultas habituales',
+    );
+  });
+});

src/app/features/store/components/menu-page-layout/menu-page-layout.component.ts

@@ -0,0 +1,26 @@
+import { Component, computed, inject } from '@angular/core';
+import { ActivatedRoute, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
+
+import { findMenu } from '../../../../core/services/menu.utils';
+import { TenantService } from '../../../../core/services/tenant.service';
+
+@Component({
+  selector: 'app-menu-page-layout',
+  imports: [RouterLink, RouterLinkActive, RouterOutlet],
+  templateUrl: './menu-page-layout.component.html',
+  styleUrl: './menu-page-layout.component.scss',
+})
+export class MenuPageLayoutComponent {
+  private readonly route = inject(ActivatedRoute);
+  private readonly tenantService = inject(TenantService);
+
+  protected readonly navigationLabel =
+    (this.route.snapshot.data['navigationLabel'] as string | undefined) ?? 'Secciones';
+
+  private readonly menuCode = this.route.snapshot.data['menuCode'] as string | undefined;
+
+  protected readonly menu = computed(() =>
+    findMenu(this.tenantService.tenant()?.menues ?? [], this.menuCode ?? ''),
+  );
+  protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
+}

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--selected]="
-              [class.attribute-selector__text-option--disabled]="!availableOptions()[attribute.id][option.id]"
+                hasSelectedOption(attribute, option)
+              "
+              [class.attribute-selector__text-option--disabled]="
+                !availableOptions()[attribute.codigo][option.id]
+              "
               [attr.aria-pressed]="hasSelectedOption(attribute, option)"
-              [disabled]="!availableOptions()[attribute.id][option.id]"
+              [disabled]="!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

@@ -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, stock_tecnico: null, values: { event_date: '1' } },
+      { id: 2, stock_tecnico: null, values: { event_date: '2' } },
+      { id: 3, stock_tecnico: 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, stock_tecnico: null, values: { size: 'S', internal_type: 'adult' } },
+      { id: 2, stock_tecnico: 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);
+          const variantAttrValues = this.getVariantAttributeValues(attribute, variant.values);
-          if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) {
+          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;
+            if (otherAttr.codigo === attribute.codigo) continue;
-            const selectedOptionId = selections[otherAttr.id];
+            const selectedOptionIds = selections[otherAttr.codigo] ?? [];
-            if (selectedOptionId !== undefined) {
+            const selectedValues = selectedOptionIds
-              const selectedOption = otherAttr.options.find((o) => o.id === selectedOptionId);
+              .map((id) => otherAttr.options.find((candidate) => candidate.id === id))
-              if (selectedOption) {
+              .filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
-                const selectedNormalized = this.normalizeText(
+              .map((candidate) => this.normalizeText(candidate.value || candidate.label));
-                  selectedOption.value || selectedOption.label,
+            const variantValues = this.getVariantAttributeValues(otherAttr, variant.values);
-                );
+            if (!selectedValues.every((value) => variantValues.includes(value))) {
-                const vAttrValue = this.getDefaultVariantAttributeValue(otherAttr, variant.values);
+              return false;
-                if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) {
-                  return false;
-                }
-              }
             }
           }
           return true;
         });
 
-        availability[attribute.id][option.id] = isAvailable;
+        availability[attribute.codigo][option.id] = isAvailable;
       }
     }
 
@@ -86,7 +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) => ({
+    this.selectedAttributeOptions.update((current) => {
-      ...current,
+      const selected = current[attribute.codigo] ?? [];
-      [attribute.id]: option.id,
+      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);
+      const optionIds = this.findDefaultOptionIds(attribute, defaultVariant);
-      if (optionId !== null) {
+      if (optionIds.length > 0) {
-        selections[attribute.id] = optionId;
+        selections[attribute.codigo] = optionIds;
       }
     }
 
     this.selectedAttributeOptions.set(selections);
   }
 
-  private findDefaultOptionId(
+  private findDefaultOptionIds(
     attribute: ProductAttribute,
     variant: CatalogItemVariant | null,
-  ): number | null {
+  ): number[] {
     if (!variant) {
-      return null;
+      return [];
     }
 
-    const defaultValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
+    const defaultValues = this.getVariantAttributeValues(attribute, variant.values);
-    if (!defaultValue) {
+    if (defaultValues.length === 0) {
-      return null;
+      return [];
     }
 
-    const normalizedValue = this.normalizeText(defaultValue);
+    return attribute.options
-    const matchByValue = attribute.options.find(
+      .filter(
-      (option) => this.normalizeText(option.value) === normalizedValue,
+        (option) =>
-    );
+          defaultValues.includes(this.normalizeText(option.value)) ||
-
+          defaultValues.includes(this.normalizeText(option.label)),
-    if (matchByValue) {
+      )
-      return matchByValue.id;
+      .map((option) => option.id);
-    }
-
-    const matchByLabel = attribute.options.find(
-      (option) => this.normalizeText(option.label) === normalizedValue,
-    );
-
-    return matchByLabel?.id ?? null;
   }
 
-  private getDefaultVariantAttributeValue(
+  private getVariantAttributeValues(
     attribute: ProductAttribute,
-    variantAttributes: Record<string, string>,
+    variantAttributes: Record<string, string | string[]>,
-  ): string | null {
+  ): string[] {
     const normalizedCodigo = this.normalizeText(attribute.codigo);
     const normalizedNombre = this.normalizeText(attribute.nombre);
 
@@ -186,11 +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 {
@@ -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];
+      const selectedOptionIds = selections[attr.codigo] ?? [];
-      if (selectedOptionId === undefined) {
+      if (
+        selectedOptionIds.length === 0 ||
+        (!attr.allow_multi_select && selectedOptionIds.length !== 1)
+      ) {
         allSelected = false;
         break;
       }
-      const option = attr.options.find((o) => o.id === selectedOptionId);
+      selectedValuesByCode[attr.codigo] = selectedOptionIds
-      if (option) {
+        .map((id) => attr.options.find((option) => option.id === id))
-        selectedValuesById[attr.id] = this.normalizeText(option.value || option.label);
+        .filter((option): option is ProductAttributeOption => option !== undefined)
-      }
+        .map((option) => this.normalizeText(option.value || option.label))
+        .sort();
     }
 
     if (!allSelected) {
@@ -264,10 +293,12 @@ export class ProductAttributeSelectorComponent {
 
     const matchingVariant = variants.find((variant) => {
       return attributes.every((attr) => {
-        const selectedValue = selectedValuesById[attr.id];
+        const selectedValues = selectedValuesByCode[attr.codigo];
-        const variantValue = this.getDefaultVariantAttributeValue(attr, variant.values);
+        const variantValues = this.getVariantAttributeValues(attr, variant.values).sort();
-        if (!variantValue) return false;
+        return (
-        return this.normalizeText(variantValue) === selectedValue;
+          selectedValues.length === variantValues.length &&
+          selectedValues.every((value, index) => value === variantValues[index])
+        );
       });
     });
 

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

@@ -1,11 +0,0 @@
-<div class="sidebar-container">
-  <h2 class="sidebar-title">{{ menu()?.label }}</h2>
-  <div class="divider"></div>
-  <nav class="sidebar-nav" aria-label="Secciones de mi cuenta">
-    @for (menu of submenues(); track menu.code) {
-      <a [routerLink]="menu.route" routerLinkActive="active" class="nav-link">
-        {{ menu.label }}
-      </a>
-    }
-  </nav>
-</div>

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

@@ -1,35 +0,0 @@
-.sidebar-container {
-  display: flex;
-  flex-direction: column;
-}
-.sidebar-title {
-  font-size: 16px;
-  font-weight: bold;
-  color: #1a1a1a;
-  margin-bottom: 12px;
-  text-transform: uppercase;
-}
-.divider {
-  height: 1px;
-  background-color: #e0e0e0;
-  margin-bottom: 20px;
-}
-.sidebar-nav {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-.nav-link {
-  text-decoration: none;
-  color: #888;
-  font-size: 14px;
-  font-weight: 500;
-  transition: color 0.2s;
-}
-.nav-link:hover {
-  color: #5a5a5a;
-}
-.nav-link.active {
-  color: var(--color-primary); /* Blue color matching the image */
-  font-weight: 600;
-}

src/app/features/store/pages/account-page/components/account-sidebar/account-sidebar.spec.ts

@@ -1,84 +0,0 @@
-import { signal } from '@angular/core';
-import { TestBed } from '@angular/core/testing';
-import { provideRouter } from '@angular/router';
-import { describe, expect, it } from 'vitest';
-
-import { Tenant } from '../../../../../../core/services/tenant.interface';
-import { TenantService } from '../../../../../../core/services/tenant.service';
-import { AccountSidebar } from './account-sidebar';
-
-describe('AccountSidebar', () => {
-  it('renders only the account submenus configured for the tenant', async () => {
-    const tenant = signal<Tenant>({
-      id: 1,
-      codigo: 'test',
-      nombre: 'Test',
-      dominio: 'localhost',
-      primary_color: '#000000',
-      secondary_color: '#000000',
-      danger_color: '#000000',
-      success_color: '#000000',
-      header_bg_color: '#ffffff',
-      footer_bg_color: '#ffffff',
-      header_logo: '',
-      footer_logo: '',
-      menues: [
-        {
-          id: 1,
-          code: 'account',
-          label: 'Mi cuenta',
-          parent_menu_code: null,
-          content_type: 'dynamic',
-          route: '/mi-cuenta',
-          submenues: [
-            {
-              id: 2,
-              code: 'account.profile',
-              label: 'Datos personales',
-              parent_menu_code: 'account',
-              content_type: 'dynamic',
-              route: '/mi-cuenta/datos-personales',
-              submenues: [],
-            },
-            {
-              id: 3,
-              code: 'account.purchases',
-              label: 'Mis compras',
-              parent_menu_code: 'account',
-              content_type: 'dynamic',
-              route: '/mi-cuenta/compras',
-              submenues: [],
-            },
-          ],
-        },
-      ],
-    });
-
-    await TestBed.configureTestingModule({
-      imports: [AccountSidebar],
-      providers: [
-        provideRouter([]),
-        {
-          provide: TenantService,
-          useValue: { tenant: tenant.asReadonly() },
-        },
-      ],
-    }).compileComponents();
-
-    const fixture = TestBed.createComponent(AccountSidebar);
-    fixture.detectChanges();
-
-    const element = fixture.nativeElement as HTMLElement;
-    const links = Array.from(element.querySelectorAll<HTMLAnchorElement>('.nav-link'));
-
-    expect(element.querySelector('.sidebar-title')?.textContent?.trim()).toBe('Mi cuenta');
-    expect(links.map((link) => link.textContent?.trim())).toEqual([
-      'Datos personales',
-      'Mis compras',
-    ]);
-    expect(links.map((link) => link.getAttribute('href'))).toEqual([
-      '/mi-cuenta/datos-personales',
-      '/mi-cuenta/compras',
-    ]);
-  });
-});

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

@@ -1,21 +0,0 @@
-import { Component, computed, inject } from '@angular/core';
-import { RouterLink, RouterLinkActive } from '@angular/router';
-
-import { findMenu } from '../../../../../../core/services/menu.utils';
-import { TenantService } from '../../../../../../core/services/tenant.service';
-
-@Component({
-  selector: 'app-account-sidebar',
-  standalone: true,
-  imports: [RouterLink, RouterLinkActive],
-  templateUrl: './account-sidebar.html',
-  styleUrl: './account-sidebar.scss',
-})
-export class AccountSidebar {
-  private readonly tenantService = inject(TenantService);
-
-  protected readonly menu = computed(() =>
-    findMenu(this.tenantService.tenant()?.menues ?? [], 'account'),
-  );
-  protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
-}

src/app/features/store/pages/account-page/components/profile-form/profile-form.scss

@@ -13,3 +13,13 @@
   flex: 1;
   display: block;
 }
+
+@media (max-width: 767.98px) {
+  .form-actions {
+    flex-direction: column;
+  }
+
+  .action-btn {
+    width: 100%;
+  }
+}

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/components/purchase-list/purchase-list.ts

@@ -29,7 +29,9 @@ export class PurchaseList implements OnInit {
     try {
       const tenantCode = this.tenantService.tenant()?.codigo || '';
       
-      const response = await this.checkoutService.getPurchases(tenantCode, 'paid');
+      const response = await this.checkoutService
+        .withCustomLoading()
+        .getPurchases(tenantCode, 'paid');
       const mappedPurchases = response.data.map((purchase: PurchaseSummaryResponse) => ({
         id: purchase.id,
         date: this.formatDate(purchase.created_at),

src/app/features/store/pages/account-page/pages/profile-page/profile-page.html

@@ -1,4 +1,7 @@
-    <div class="page-container">
+<app-menu-content-section
-      <h2 class="page-title">DATOS PERSONALES</h2>
+  class="account-page"
-      <app-profile-form></app-profile-form>
+  menuCode="account.profile"
-    </div>
+  titleId="profile-page-title"
+>
+  <app-profile-form />
+</app-menu-content-section>

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

@@ -1,13 +1,10 @@
-.page-container {
+:host {
-  display: flex;
+  display: block;
-  flex-direction: column;
+  width: 100%;
+}
+
+.account-page {
+  display: block;
   width: 100%;
   max-width: 600px;
 }
-
-.page-title {
-  font-size: 15px;
-  font-weight: bold;
-  color: #A0A0A0;
-  margin-bottom: 24px;
-}

src/app/features/store/pages/account-page/pages/profile-page/profile-page.ts

@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { ProfileForm } from '../../components/profile-form/profile-form';
 
 @Component({
   selector: 'app-profile-page',
   standalone: true,
-  imports: [ProfileForm],
+  imports: [ProfileForm, MenuContentSectionComponent],
   templateUrl: './profile-page.html',
   styleUrl: './profile-page.scss',
 })

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

@@ -1,26 +1,35 @@
-<div class="page-container">
+<app-menu-content-section
-  <div class="d-flex align-items-center mb-4">
+  class="account-page"
-    <a routerLink="../" class="text-decoration-none " >
+  menuCode="account.purchases"
-      <i class="bi bi-arrow-left fs-5"></i>
+  titleId="purchase-detail-page-title"
-    </a>
+>
-    <h2 class="page-title m-0">MIS COMPRAS</h2>
+  <a
-  </div>
+    menuContentPrefix
+    routerLink="../"
+    class="purchase-back-link text-decoration-none"
+    aria-label="Volver a mis compras"
+  >
+    <i class="bi bi-arrow-left fs-5" aria-hidden="true"></i>
+  </a>
 
   @if (isLoading()) {
     <p class="purchase-loading">Cargando detalle de compra...</p>
   } @else if (purchase(); as purchase) {
-    <div class="d-flex justify-content-between align-items-center mb-4 pb-3" style="border-bottom: 1px solid #dddddd;">
+    <div
+      class="d-flex justify-content-between align-items-center mb-4 pb-3"
+      style="border-bottom: 1px solid #dddddd"
+    >
       <div class="purchase-info">
         <span class="purchase-id">Compra {{ purchase.id }}.</span>
         <span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
       </div>
-      <div class="purchase-total ">
+      <div class="purchase-total">
         <span class="purchase-total-label">Total:</span>
         <span class="purchase-total-value">${{ purchase.total }}</span>
       </div>
     </div>
 
-    <p style="font-size: 12px; color: #666666; margin:0;">Productos:</p>
+    <p style="font-size: 12px; color: #666666; margin: 0">Productos:</p>
 
     <div class="d-flex flex-column">
       @for (item of purchase.items; track item.id) {
@@ -30,4 +39,4 @@
       }
     </div>
   }
-</div>
+</app-menu-content-section>

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

@@ -1,14 +1,21 @@
-.page-container {
+:host {
-  display: flex;
+  display: block;
-  flex-direction: column;
+  width: 100%;
+}
+
+.account-page {
+  display: block;
   width: 100%;
   max-width: 600px;
 }
 
-.page-title {
+.purchase-back-link {
-  font-size: 15px;
+  color: #888888;
-  font-weight: bold;
+
-  color: #A0A0A0;
+  &:hover,
+  &:focus-visible {
+    color: var(--color-primary);
+  }
 }
 
 .purchase-info {

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

@@ -8,6 +8,7 @@ import {
 } from '../../../../../../core/services/checkout.service';
 import { TenantService } from '../../../../../../core/services/tenant.service';
 import { ToastService } from '../../../../../../core/services/toast.service';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { PurchaseItem, PurchaseItemViewModel } from '../../components/purchase-item/purchase-item';
 
 type PurchaseDetailViewModel = {
@@ -20,7 +21,7 @@ type PurchaseDetailViewModel = {
 @Component({
   selector: 'app-purchase-detail-page',
   standalone: true,
-  imports: [CommonModule, RouterLink, PurchaseItem],
+  imports: [CommonModule, RouterLink, PurchaseItem, MenuContentSectionComponent],
   templateUrl: './purchase-detail-page.html',
   styleUrl: './purchase-detail-page.scss',
 })
@@ -44,7 +45,9 @@ export class PurchaseDetailPage implements OnInit {
     }
 
     try {
-      const response = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
+      const response = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
 
       this.purchase.set({
         id: response.id,

src/app/features/store/pages/account-page/pages/purchases-page/purchases-page.html

@@ -1,4 +1,7 @@
-    <div class="page-container">
+<app-menu-content-section
-      <h2 class="page-title">MIS COMPRAS</h2>
+  class="account-page"
-      <app-purchase-list></app-purchase-list>
+  menuCode="account.purchases"
-    </div>
+  titleId="purchases-page-title"
+>
+  <app-purchase-list />
+</app-menu-content-section>

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

@@ -1,12 +1,10 @@
-.page-container {
+:host {
-  display: flex;
+  display: block;
-  flex-direction: column;
+  width: 100%;
+}
+
+.account-page {
+  display: block;
   width: 100%;
   max-width: 600px;
 }
-
-.page-title {
-  font-size: 15px;
-  font-weight: bold;
-  color: #A0A0A0;
-}

src/app/features/store/pages/account-page/pages/purchases-page/purchases-page.ts

@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { PurchaseList } from '../../components/purchase-list/purchase-list';
 
 @Component({
   selector: 'app-purchases-page',
   standalone: true,
-  imports: [PurchaseList],
+  imports: [PurchaseList, MenuContentSectionComponent],
   templateUrl: './purchases-page.html',
   styleUrl: './purchases-page.scss',
 })

src/app/features/store/pages/account-page/pages/tickets-page/components/ticket/ticket.component.html

@@ -41,9 +41,15 @@
       <app-icon-button
         variant="download"
         ariaLabel="Descargar ticket"
+        [disabled]="isGeneratingPdf()"
         (clicked)="download.emit()"
       />
-      <app-icon-button variant="share" ariaLabel="Compartir ticket" (clicked)="share.emit()" />
+      <app-icon-button
+        variant="share"
+        ariaLabel="Compartir ticket"
+        [disabled]="isGeneratingPdf()"
+        (clicked)="share.emit()"
+      />
     }
   </div>
 </article>

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/components/ticket/ticket.component.ts

@@ -16,6 +16,7 @@ export class TicketComponent {
   readonly date = input<string | null>(null);
   readonly disabled = input(false);
   readonly expired = input(false);
+  readonly isGeneratingPdf = input(false);
   readonly selected = model(false);
 
   readonly viewQr = output<void>();

src/app/features/store/pages/account-page/pages/tickets-page/ticket.service.ts

@@ -1,7 +1,7 @@
-import { HttpClient } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 
+import { BaseApiService } from '../../../../../../core/services/base-api.service';
 import { TenantService } from '../../../../../../core/services/tenant.service';
 
 export interface TicketResponse {
@@ -21,13 +21,26 @@ export interface TicketResponse {
 }
 
 @Injectable()
-export class TicketService {
+export class TicketService extends BaseApiService {
-  private readonly http = inject(HttpClient);
   private readonly tenantService = inject(TenantService);
 
   getTickets(): Promise<TicketResponse[]> {
     return firstValueFrom(
-      this.http.get<{ data: TicketResponse[] }>(`${this.tenantService.getTenantApiUrl()}/tickets`),
+      this.http.get<{ data: TicketResponse[] }>(
+        `${this.tenantService.getTenantApiUrl()}/tickets`,
+      ),
     ).then((response) => response.data ?? []);
   }
+
+  downloadPdf(ticketIds: number[]): Promise<Blob> {
+    return firstValueFrom(
+      this.http.post(
+        `${this.tenantService.getTenantApiUrl()}/tickets/pdf`,
+        { ticket_ids: ticketIds },
+        {
+          responseType: 'blob',
+        },
+      ),
+    );
+  }
 }

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

@@ -1,7 +1,16 @@
-<section class="tickets-page">
+<app-menu-content-section
-  <h1 class="tickets-page__title">MIS TICKETS</h1>
+  class="tickets-page"
+  menuCode="account.tickets"
+  titleId="tickets-page-title"
+>
+  <div class="tickets-list" [attr.aria-busy]="isLoading() || isGeneratingPdf()">
+    @if (isGeneratingPdf()) {
+      <div class="tickets-list__generating" role="status" aria-live="polite">
+        <span class="tickets-list__generating-spinner" aria-hidden="true"></span>
+        <span>Generando PDF...</span>
+      </div>
+    }
 
-  <div class="tickets-list" aria-busy="{{ isLoading() }}">
     @if (activeTickets().length) {
       <header class="tickets-list__header">
         <label class="tickets-list__select-all">
@@ -15,11 +24,21 @@
 
         <div class="tickets-list__bulk-actions">
           <span class="tickets-list__bulk-action">
-            <app-icon-button variant="download" ariaLabel="Descargar tickets seleccionados" />
+            <app-icon-button
+              variant="download"
+              ariaLabel="Descargar tickets seleccionados"
+              [disabled]="isGeneratingPdf()"
+              (clicked)="downloadSelected()"
+            />
             <small>Descargar</small>
           </span>
           <span class="tickets-list__bulk-action">
-            <app-icon-button variant="share" ariaLabel="Compartir tickets seleccionados" />
+            <app-icon-button
+              variant="share"
+              ariaLabel="Compartir tickets seleccionados"
+              [disabled]="isGeneratingPdf()"
+              (clicked)="shareSelected()"
+            />
             <small>Compartir</small>
           </span>
         </div>
@@ -27,8 +46,31 @@
     }
 
     @if (isLoading()) {
+      <header class="tickets-list__skeleton-header" aria-hidden="true">
+        <div class="tickets-list__skeleton-selection">
+          <span class="tickets-list__skeleton-check"></span>
+          <span class="tickets-list__skeleton-line tickets-list__skeleton-line--section"></span>
+        </div>
+        <div class="tickets-list__skeleton-bulk-actions">
+          <span class="tickets-list__skeleton-icon"></span>
+          <span class="tickets-list__skeleton-icon"></span>
+        </div>
+      </header>
+
       @for (item of [1, 2, 3, 4]; track item) {
-        <div class="tickets-list__skeleton" aria-hidden="true"></div>
+        <div class="tickets-list__skeleton" aria-hidden="true">
+          <span class="tickets-list__skeleton-check"></span>
+          <div class="tickets-list__skeleton-details">
+            <span class="tickets-list__skeleton-line tickets-list__skeleton-line--title"></span>
+            <span class="tickets-list__skeleton-line tickets-list__skeleton-line--id"></span>
+          </div>
+          <span class="tickets-list__skeleton-line tickets-list__skeleton-line--date"></span>
+          <div class="tickets-list__skeleton-actions">
+            <span class="tickets-list__skeleton-button"></span>
+            <span class="tickets-list__skeleton-icon"></span>
+            <span class="tickets-list__skeleton-icon"></span>
+          </div>
+        </div>
       }
     } @else if (tickets().length) {
       @for (ticket of activeTickets(); track ticket.id) {
@@ -37,8 +79,11 @@
           [ticketId]="ticket.id"
           [date]="formatDate(ticket)"
           [selected]="isSelected(ticket.id)"
+          [isGeneratingPdf]="isGeneratingPdf()"
           (selectedChange)="toggleTicket(ticket.id, $event)"
           (viewQr)="viewQr(ticket)"
+          (download)="downloadTicket(ticket)"
+          (share)="shareTicket(ticket)"
         />
       }
 
@@ -63,4 +108,4 @@
       <p class="tickets-list__empty">Aún no tenés tickets disponibles.</p>
     }
   </div>
-</section>
+</app-menu-content-section>

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

@@ -1,13 +1,36 @@
 .tickets-page {
+  display: block;
   width: 100%;
   max-width: 720px;
 }
 
-.tickets-page__title {
+.tickets-list {
-  margin: 0 0 20px;
+  position: relative;
-  color: #a0a0a0;
+}
-  font-size: 15px;
+
+.tickets-list__generating {
+  position: absolute;
+  z-index: 10;
+  inset: 0;
+  display: flex;
+  min-height: 180px;
+  align-items: center;
+  justify-content: center;
+  gap: 12px;
+  border-radius: 8px;
+  color: #26322a;
+  font-size: 14px;
   font-weight: 700;
+  backdrop-filter: blur(2px);
+}
+
+.tickets-list__generating-spinner {
+  width: 24px;
+  height: 24px;
+  border: 3px solid var(--border-color);
+  border-top-color: var(--tenant-primary, #009933);
+  border-radius: 50%;
+  animation: tickets-spinner 0.75s linear infinite;
 }
 
 .tickets-list__header {
@@ -16,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 {
@@ -66,7 +89,7 @@
 }
 
 .tickets-list app-ticket {
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-color);
 }
 
 .tickets-list__empty {
@@ -75,22 +98,124 @@
   text-align: center;
 }
 
-.tickets-list__skeleton {
+.tickets-list__skeleton-header {
-  height: 77px;
+  display: flex;
-  border-bottom: 1px solid #dddddd;
+  min-height: 58px;
-  background: linear-gradient(90deg, transparent, #f3f3f3, transparent);
+  align-items: center;
-  background-size: 200% 100%;
+  justify-content: space-between;
-  animation: loading 1.4s infinite;
+  padding-bottom: 12px;
+  border-bottom: 1px solid var(--border-color);
 }
 
-@keyframes loading {
+.tickets-list__skeleton-selection,
+.tickets-list__skeleton-bulk-actions,
+.tickets-list__skeleton-actions {
+  display: flex;
+  align-items: center;
+}
+
+.tickets-list__skeleton-selection {
+  gap: 16px;
+}
+
+.tickets-list__skeleton-bulk-actions,
+.tickets-list__skeleton-actions {
+  gap: 8px;
+}
+
+.tickets-list__skeleton {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr) 78px auto;
+  min-height: 76px;
+  align-items: center;
+  gap: 16px;
+  padding: 16px 0;
+  border-bottom: 1px solid var(--border-color);
+}
+
+.tickets-list__skeleton-check,
+.tickets-list__skeleton-line,
+.tickets-list__skeleton-icon,
+.tickets-list__skeleton-button {
+  display: block;
+  border-radius: 4px;
+  background: linear-gradient(90deg, #eeeeee 20%, #f7f7f7 50%, #eeeeee 80%);
+  background-size: 200% 100%;
+  animation: tickets-loading 1.4s ease-in-out infinite;
+}
+
+.tickets-list__skeleton-check {
+  width: 21px;
+  height: 21px;
+  border-radius: 2px;
+}
+
+.tickets-list__skeleton-details {
+  display: grid;
+  gap: 8px;
+}
+
+.tickets-list__skeleton-line--section {
+  width: 120px;
+  height: 14px;
+}
+
+.tickets-list__skeleton-line--title {
+  width: min(240px, 75%);
+  height: 13px;
+}
+
+.tickets-list__skeleton-line--id {
+  width: 86px;
+  height: 11px;
+}
+
+.tickets-list__skeleton-line--date {
+  width: 64px;
+  height: 11px;
+  justify-self: center;
+}
+
+.tickets-list__skeleton-button {
+  width: 115px;
+  height: 36px;
+}
+
+.tickets-list__skeleton-icon {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+}
+
+@keyframes tickets-loading {
   to {
     background-position: -200% 0;
   }
 }
 
-@media (max-width: 767.98px) {
+@keyframes tickets-spinner {
-  .tickets-page__title {
+  to {
-    margin-top: 24px;
+    transform: rotate(360deg);
+  }
+}
+
+@media (max-width: 767.98px) {
+  .tickets-list__skeleton {
+    grid-template-columns: auto minmax(0, 1fr) auto;
+    gap: 10px;
+  }
+
+  .tickets-list__skeleton-line--date {
+    grid-column: 2;
+    justify-self: start;
+  }
+
+  .tickets-list__skeleton-actions {
+    grid-column: 3;
+    grid-row: 1 / span 2;
+  }
+
+  .tickets-list__skeleton-actions .tickets-list__skeleton-icon {
+    display: none;
   }
 }

src/app/features/store/pages/account-page/pages/tickets-page/tickets-page.spec.ts

@@ -1,13 +1,21 @@
+import { signal } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { TestBed } from '@angular/core/testing';
-import { describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { TenantService } from '../../../../../../core/services/tenant.service';
 import { ToastService } from '../../../../../../core/services/toast.service';
 import { ModalService } from '../../../../../../core/services/modal.service';
 import { TicketComponent } from './components/ticket/ticket.component';
 import { TicketResponse, TicketService } from './ticket.service';
 import { TicketsPage } from './tickets-page';
 
+function withCustomLoading<T extends object>(service: T): T & { withCustomLoading: () => T } {
+  return Object.assign(service, {
+    withCustomLoading: () => service,
+  });
+}
+
 const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
   id: 1,
   tenant_code: 'tenant',
@@ -26,6 +34,147 @@ const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
 });
 
 describe('TicketsPage', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: TenantService,
+          useValue: {
+            tenant: signal({
+              menues: [
+                {
+                  id: 4,
+                  code: 'account.tickets',
+                  label: 'Entradas disponibles',
+                  parent_menu_code: 'account',
+                  content_type: 'dynamic',
+                  route: '/mi-cuenta/tickets',
+                  submenues: [],
+                },
+              ],
+            }).asReadonly(),
+          },
+        },
+      ],
+    });
+  });
+
+  it('shares the generated PDF as a file without text that Windows could prioritize', async () => {
+    const share = vi.fn().mockResolvedValue(undefined);
+    const canShare = vi.fn().mockReturnValue(true);
+    vi.stubGlobal('navigator', { canShare, share });
+
+    await TestBed.configureTestingModule({
+      imports: [TicketsPage],
+      providers: [{ provide: ToastService, useValue: { danger: vi.fn() } }],
+    })
+      .overrideComponent(TicketsPage, {
+        set: {
+          providers: [
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({
+                getTickets: () => Promise.resolve([ticket({})]),
+                downloadPdf: () => Promise.resolve(new Blob(['pdf-content'])),
+              }),
+            },
+          ],
+        },
+      })
+      .compileComponents();
+
+    const fixture = TestBed.createComponent(TicketsPage);
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    const page = fixture.nativeElement as HTMLElement;
+    page.querySelector<HTMLButtonElement>('[aria-label="Compartir ticket"]')?.click();
+
+    await vi.waitFor(() => expect(share).toHaveBeenCalledOnce());
+
+    const shareData = share.mock.calls[0][0] as ShareData;
+    const [sharedFile] = shareData.files ?? [];
+
+    expect(Object.keys(shareData)).toEqual(['files']);
+    expect(canShare).toHaveBeenCalledWith({ files: [sharedFile] });
+    expect(sharedFile).toBeInstanceOf(File);
+    expect(sharedFile.name).toBe('tickets_1.pdf');
+    expect(sharedFile.type).toBe('application/pdf');
+    expect(sharedFile.size).toBeGreaterThan(0);
+
+    vi.unstubAllGlobals();
+  });
+
+  it('shows a loading overlay and disables PDF actions while the file is generated', async () => {
+    let resolvePdf!: (pdf: Blob) => void;
+    const downloadPdf = vi.fn(
+      () =>
+        new Promise<Blob>((resolve) => {
+          resolvePdf = resolve;
+        }),
+    );
+    const createObjectUrl = vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:ticket');
+    const revokeObjectUrl = vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => undefined);
+    let downloadedFilename = '';
+    const linkClick = vi.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(function (
+      this: HTMLAnchorElement,
+    ) {
+      downloadedFilename = this.download;
+    });
+
+    await TestBed.configureTestingModule({
+      imports: [TicketsPage],
+      providers: [{ provide: ToastService, useValue: { danger: vi.fn() } }],
+    })
+      .overrideComponent(TicketsPage, {
+        set: {
+          providers: [
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({
+                getTickets: () => Promise.resolve([ticket({})]),
+                downloadPdf,
+              }),
+            },
+          ],
+        },
+      })
+      .compileComponents();
+
+    const fixture = TestBed.createComponent(TicketsPage);
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    const page = fixture.nativeElement as HTMLElement;
+    page.querySelector<HTMLButtonElement>('[aria-label="Descargar ticket"]')?.click();
+    fixture.detectChanges();
+
+    expect(page.querySelector('.tickets-list__generating')?.textContent).toContain(
+      'Generando PDF...',
+    );
+    expect(page.querySelector('.tickets-list')?.getAttribute('aria-busy')).toBe('true');
+    expect(page.querySelector<HTMLButtonElement>('[aria-label="Descargar ticket"]')?.disabled).toBe(
+      true,
+    );
+    expect(page.querySelector<HTMLButtonElement>('[aria-label="Compartir ticket"]')?.disabled).toBe(
+      true,
+    );
+
+    resolvePdf(new Blob(['pdf'], { type: 'application/pdf' }));
+    await fixture.whenStable();
+    await vi.waitFor(() => expect(downloadedFilename).toBe('tickets_1.pdf'));
+    fixture.detectChanges();
+
+    expect(page.querySelector('.tickets-list__generating')).toBeNull();
+    expect(page.querySelector('.tickets-list')?.getAttribute('aria-busy')).toBe('false');
+
+    createObjectUrl.mockRestore();
+    revokeObjectUrl.mockRestore();
+    linkClick.mockRestore();
+  });
+
   it('hides the active tickets header when there are no available tickets', async () => {
     await TestBed.configureTestingModule({
       imports: [TicketsPage],
@@ -34,7 +183,10 @@ describe('TicketsPage', () => {
       .overrideComponent(TicketsPage, {
         set: {
           providers: [
-            { provide: TicketService, useValue: { getTickets: () => Promise.resolve([]) } },
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({ getTickets: () => Promise.resolve([]) }),
+            },
           ],
         },
       })
@@ -67,7 +219,10 @@ describe('TicketsPage', () => {
       .overrideComponent(TicketsPage, {
         set: {
           providers: [
-            { provide: TicketService, useValue: { getTickets: () => Promise.resolve(tickets) } },
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({ getTickets: () => Promise.resolve(tickets) }),
+            },
           ],
         },
       })
@@ -120,7 +275,9 @@ describe('TicketsPage', () => {
           providers: [
             {
               provide: TicketService,
-              useValue: { getTickets: () => Promise.resolve([ticket({})]) },
+              useValue: withCustomLoading({
+                getTickets: () => Promise.resolve([ticket({})]),
+              }),
             },
           ],
         },

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

@@ -3,12 +3,13 @@ import { Component, computed, inject, OnInit, signal } from '@angular/core';
 import { ModalService } from '../../../../../../core/services/modal.service';
 import { ToastService } from '../../../../../../core/services/toast.service';
 import { IconButtonComponent } from '../../../../../../shared/components/icon-button/icon-button.component';
+import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
 import { TicketComponent } from './components/ticket/ticket.component';
 import { TicketResponse, TicketService } from './ticket.service';
 
 @Component({
   selector: 'app-tickets-page',
-  imports: [IconButtonComponent, TicketComponent],
+  imports: [IconButtonComponent, TicketComponent, MenuContentSectionComponent],
   providers: [TicketService],
   templateUrl: './tickets-page.html',
   styleUrl: './tickets-page.scss',
@@ -27,6 +28,7 @@ export class TicketsPage implements OnInit {
   );
   protected readonly selectedIds = signal<Set<number>>(new Set());
   protected readonly isLoading = signal(true);
+  protected readonly isGeneratingPdf = signal(false);
   protected readonly allSelected = computed(
     () =>
       this.activeTickets().length > 0 && this.selectedIds().size === this.activeTickets().length,
@@ -34,7 +36,7 @@ export class TicketsPage implements OnInit {
 
   async ngOnInit(): Promise<void> {
     try {
-      this.tickets.set(await this.ticketService.getTickets());
+      this.tickets.set(await this.ticketService.withCustomLoading().getTickets());
     } catch {
       this.toastService.danger('Hubo un error al cargar los tickets');
     } finally {
@@ -86,4 +88,93 @@ export class TicketsPage implements OnInit {
       ticket: ticket.ticket,
     });
   }
+
+  protected async downloadTicket(ticket: TicketResponse): Promise<void> {
+    await this.downloadTickets([ticket]);
+  }
+
+  protected async downloadSelected(): Promise<void> {
+    const tickets = this.activeTickets().filter((ticket) => this.selectedIds().has(ticket.id));
+
+    if (!tickets.length) {
+      this.toastService.danger('Seleccioná al menos un ticket para descargar.');
+      return;
+    }
+
+    await this.downloadTickets(tickets);
+  }
+
+  protected async shareTicket(ticket: TicketResponse): Promise<void> {
+    await this.shareTickets([ticket]);
+  }
+
+  protected async shareSelected(): Promise<void> {
+    const tickets = this.activeTickets().filter((ticket) => this.selectedIds().has(ticket.id));
+
+    if (!tickets.length) {
+      this.toastService.danger('Seleccioná al menos un ticket para compartir.');
+      return;
+    }
+
+    await this.shareTickets(tickets);
+  }
+
+  private async downloadTickets(tickets: TicketResponse[]): Promise<void> {
+    const pdf = await this.generateTicketsPdf(tickets);
+    if (pdf) this.downloadPdf(pdf, this.pdfFilename(tickets));
+  }
+
+  private async shareTickets(tickets: TicketResponse[]): Promise<void> {
+    const pdf = await this.generateTicketsPdf(tickets);
+    if (!pdf) return;
+
+    try {
+      const filename = this.pdfFilename(tickets);
+      const file = new File([pdf], filename, { type: 'application/pdf' });
+
+      if (navigator.canShare?.({ files: [file] })) {
+        await navigator.share({ files: [file] });
+        return;
+      }
+
+      this.downloadPdf(pdf, filename);
+      this.toastService.success('Tu navegador no permite compartir archivos; descargamos el PDF.');
+    } catch (error) {
+      if (error instanceof DOMException && error.name === 'AbortError') return;
+
+      this.toastService.danger('No se pudo compartir el PDF de los tickets.');
+    }
+  }
+
+  private async generateTicketsPdf(tickets: TicketResponse[]): Promise<Blob | null> {
+    if (this.isGeneratingPdf()) return null;
+
+    this.isGeneratingPdf.set(true);
+
+    try {
+      return await this.ticketService
+        .withCustomLoading()
+        .downloadPdf(tickets.map((ticket) => ticket.id));
+    } catch {
+      this.toastService.danger('No se pudo generar el PDF de los tickets.');
+      return null;
+    } finally {
+      this.isGeneratingPdf.set(false);
+    }
+  }
+
+  private pdfFilename(tickets: TicketResponse[]): string {
+    return `tickets_${tickets.map((ticket) => ticket.id).join('_')}.pdf`;
+  }
+
+  private downloadPdf(pdf: Blob, filename: string): void {
+    const url = URL.createObjectURL(pdf);
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = filename;
+    document.body.appendChild(link);
+    link.click();
+    link.remove();
+    window.setTimeout(() => URL.revokeObjectURL(url), 0);
+  }
 }

src/app/features/store/pages/account-page/sidebar-layout/sidebar-layout.html

@@ -1,6 +0,0 @@
-    <div class="sidebar-layout">
-      <app-account-sidebar class="account-sidebar"></app-account-sidebar>
-      <div class="account-content">
-        <router-outlet></router-outlet>
-      </div>
-    </div>

src/app/features/store/pages/account-page/sidebar-layout/sidebar-layout.scss

@@ -1,17 +0,0 @@
-.sidebar-layout {
-  display: flex;
-  margin: 0 auto;
-  gap: 100px;
-  min-height: calc(100vh - 100px);
-}
-.account-sidebar {
-  width: 250px;
-  flex-shrink: 0;
-}
-.account-content {
-  flex: 1;
-}
-
-label {
-  font-size: 13px !important;
-}

src/app/features/store/pages/account-page/sidebar-layout/sidebar-layout.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { RouterOutlet } from '@angular/router';
-import { AccountSidebar } from '../components/account-sidebar/account-sidebar';
-
-@Component({
-  selector: 'app-sidebar-layout',
-  standalone: true,
-  imports: [RouterOutlet, AccountSidebar],
-  templateUrl: './sidebar-layout.html',
-  styleUrl: './sidebar-layout.scss',
-})
-export class SidebarLayout {}

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

@@ -0,0 +1,26 @@
+<section class="category-items" aria-labelledby="category-items-title">
+  @if (error()) {
+    <p class="alert text-center mb-0 category-items__alert-error">{{ error() }}</p>
+  } @else if (results(); as categoryResults) {
+    <header class="category-items__header mb-5">
+      <h1 id="category-items-title" class="category-items__title mb-0">
+        {{ categoryResults.category.nombre }}
+      </h1>
+    </header>
+
+    @if (!categoryResults.data.length) {
+      <p class="alert alert-light border text-center mb-0">
+        No hay productos disponibles en esta categoría.
+      </p>
+    } @else {
+      <app-product-list
+        [layout]="categoryResults.layout"
+        [groupLayout]="paginatedLayout"
+        [items]="categoryResults"
+        (buy)="onBuyProduct($event)"
+        (addToCart)="onAddToCart($event)"
+        (pageChange)="onPageChange($event)"
+      />
+    }
+  }
+</section>

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

@@ -0,0 +1,18 @@
+.category-items__header {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 16px 28px;
+}
+
+.category-items__title {
+  font-size: 24px;
+  font-weight: bold;
+  line-height: 1.2;
+  text-align: center;
+  color:var(--bs-primary)
+}
+
+.category-items__alert-error {
+  color: var(--tenant-danger-color, var(--bs-danger));
+}

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

@@ -0,0 +1,126 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute, convertToParamMap, provideRouter } from '@angular/router';
+import { of } from 'rxjs';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { CartService } from '../../../../core/services/cart/cart.service';
+import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { 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 { CategoryItemsPageComponent } from './category-items-page.component';
+
+describe('CategoryItemsPageComponent', () => {
+  const getCategoryItems = vi.fn();
+  const tenant = signal({ codigo: 'shop' } as Tenant);
+
+  beforeEach(async () => {
+    getCategoryItems.mockReset();
+    getCategoryItems.mockReturnValue(
+      of({
+        category: {
+          id: 7,
+          nombre: 'Remeras',
+          categoria_id: null,
+        },
+        layout: 'row',
+        group_layout: 'simple_vertical',
+        data: [
+          {
+            id: 1,
+            nombre: 'Remera clásica',
+            descripcion: 'Algodón',
+            precio: '100.00',
+            variants: [],
+          },
+        ],
+        links: {
+          first: '/categories/7?page=1',
+          last: '/categories/7?page=2',
+          prev: null,
+          next: '/categories/7?page=2',
+        },
+        meta: {
+          current_page: 1,
+          from: 1,
+          last_page: 2,
+          links: [],
+          path: '/categories/7',
+          per_page: 12,
+          to: 1,
+          total: 13,
+        },
+      }),
+    );
+
+    await TestBed.configureTestingModule({
+      imports: [CategoryItemsPageComponent],
+      providers: [
+        provideRouter([]),
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            paramMap: of(convertToParamMap({ id: '7' })),
+            queryParamMap: of(convertToParamMap({ page: '1' })),
+          },
+        },
+        {
+          provide: CatalogService,
+          useValue: {
+            getCategoryItems,
+          },
+        },
+        {
+          provide: TenantService,
+          useValue: { tenant: tenant.asReadonly() },
+        },
+        {
+          provide: CartService,
+          useValue: { addItem: vi.fn() },
+        },
+        {
+          provide: ToastService,
+          useValue: {
+            success: vi.fn(),
+            danger: vi.fn(),
+          },
+        },
+      ],
+    }).compileComponents();
+  });
+
+  it('loads the category and renders its products with the configured product layout', () => {
+    const fixture = TestBed.createComponent(CategoryItemsPageComponent);
+    fixture.detectChanges();
+
+    expect(getCategoryItems).toHaveBeenCalledWith(7, { page: 1 });
+    expect((fixture.nativeElement as HTMLElement).textContent).toContain('Remeras');
+
+    const productList = fixture.debugElement.query(By.directive(ProductListComponent))
+      .componentInstance as ProductListComponent;
+
+    expect(productList.layout()).toBe('row');
+    expect(productList.groupLayout()).toBe('paginated');
+    expect(Array.isArray(productList.items())).toBe(false);
+  });
+
+  it('does not request the API when the category id is invalid', () => {
+    TestBed.overrideProvider(ActivatedRoute, {
+      useValue: {
+        paramMap: of(convertToParamMap({ id: 'invalid' })),
+        queryParamMap: of(convertToParamMap({ page: '1' })),
+      },
+    });
+
+    const fixture = TestBed.createComponent(CategoryItemsPageComponent);
+    fixture.detectChanges();
+
+    expect(getCategoryItems).not.toHaveBeenCalled();
+    expect((fixture.nativeElement as HTMLElement).textContent).toContain(
+      'La categoría solicitada no es válida.',
+    );
+  });
+});

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

@@ -0,0 +1,162 @@
+import { HttpErrorResponse } from '@angular/common/http';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  DestroyRef,
+  Injector,
+  inject,
+  signal,
+} 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 { AuthService } from '../../../../core/services/auth/auth.service';
+import { CartService } from '../../../../core/services/cart/cart.service';
+import { CheckoutService } from '../../../../core/services/checkout.service';
+import {
+  CatalogGroupLayout,
+  CategoryItemsResponse,
+} from '../../../../core/services/catalog/catalog.interface';
+import { CatalogService } from '../../../../core/services/catalog/catalog.service';
+import { TenantService } from '../../../../core/services/tenant.service';
+import { ToastService } from '../../../../core/services/toast.service';
+import {
+  ProductListBuyEvent,
+  ProductListCartEvent,
+  ProductListComponent,
+} from '../../../../shared/components/product-list/product-list.component';
+
+interface CategoryRouteState {
+  categoryId: number;
+  page: number;
+}
+
+@Component({
+  selector: 'app-category-items-page',
+  imports: [ProductListComponent],
+  templateUrl: './category-items-page.component.html',
+  styleUrl: './category-items-page.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CategoryItemsPageComponent {
+  private readonly cartService = inject(CartService);
+  private readonly catalogService = inject(CatalogService);
+  private readonly injector = inject(Injector);
+  private readonly destroyRef = inject(DestroyRef);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+  private readonly tenantService = inject(TenantService);
+  private readonly toastService = inject(ToastService);
+
+  protected readonly results = signal<CategoryItemsResponse | null>(null);
+  protected readonly error = signal<string | null>(null);
+  protected readonly creatingDirectPurchase = signal(false);
+  protected readonly paginatedLayout: CatalogGroupLayout = 'paginated';
+
+  constructor() {
+    combineLatest([this.route.paramMap, this.route.queryParamMap])
+      .pipe(
+        map(
+          ([params, queryParams]): CategoryRouteState => ({
+            categoryId: this.parsePositiveInteger(params.get('id')),
+            page: this.parsePositiveInteger(queryParams.get('page'), 1),
+          }),
+        ),
+        distinctUntilChanged(
+          (previous, current) =>
+            previous.categoryId === current.categoryId && previous.page === current.page,
+        ),
+        tap(() => {
+          this.results.set(null);
+          this.error.set(null);
+        }),
+        switchMap(({ categoryId, page }) => {
+          if (categoryId === 0) {
+            this.error.set('La categoría solicitada no es válida.');
+
+            return of(null);
+          }
+
+          return this.catalogService.getCategoryItems(categoryId, { page }).pipe(
+            catchError(() => {
+              this.error.set('No pudimos cargar los productos de esta categoría.');
+
+              return of(null);
+            }),
+          );
+        }),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe((results) => {
+        this.results.set(results);
+      });
+  }
+
+  protected onPageChange(page: number): void {
+    void this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: { page },
+      queryParamsHandling: 'merge',
+    });
+  }
+
+  protected async onBuyProduct(event: ProductListBuyEvent): Promise<void> {
+    if (!event.directPurchase) {
+      await this.router.navigate(['/producto', event.product.id]);
+      return;
+    }
+
+    if (this.creatingDirectPurchase()) {
+      return;
+    }
+
+    if (!this.injector.get(AuthService).user()) {
+      await this.router.navigate(['/login'], {
+        queryParams: { returnUrl: `/producto/${event.product.id}` },
+      });
+      return;
+    }
+
+    const tenant = this.tenantService.tenant();
+    if (!tenant) {
+      this.toastService.danger('No se pudo identificar la tienda.');
+      return;
+    }
+
+    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,
+        },
+      });
+      await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
+    } catch (error) {
+      console.error('Failed to create direct purchase:', error);
+      this.toastService.danger('No se pudo iniciar la compra directa.');
+    } finally {
+      this.creatingDirectPurchase.set(false);
+    }
+  }
+
+  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);
+      },
+    });
+  }
+
+  private parsePositiveInteger(value: string | null, fallback = 0): number {
+    const parsed = Number(value ?? fallback);
+
+    return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
+  }
+}

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

@@ -20,6 +20,6 @@
     display: block;
     width: 100%;
     flex: 1 1 290px;
-    max-width: 290px;
   }
+
 }

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

@@ -1,7 +1,17 @@
-
+@if (isLoadingPurchase()) {
+  <div class="checkout-page__loading" role="status" aria-live="polite">
+    <span class="checkout-page__spinner" aria-hidden="true"></span>
+    <span>Cargando compra...</span>
+  </div>
+} @else {
   <div class="checkout-page">
-    <div class="checkout-page__stepper-col ">
+    <div
-      <app-stepper #stepper>
+      class="checkout-page__stepper-col"
+      [class.checkout-page__stepper-col--editing]="isEditingItems()"
+      [attr.aria-hidden]="isEditingItems()"
+      [attr.inert]="isEditingItems() ? '' : null"
+    >
+      <app-stepper #stepper [initialStepIndex]="checkoutStepIndex()">
         <app-step label="Datos" [isValid]="isStep1Valid()">
           <app-checkout-data-step
             [form]="form"
@@ -21,6 +31,8 @@
             [qrData]="qrData()"
             [qrPaymentStatus]="qrPaymentStatus()"
             [isCheckingQrPayment]="isCheckingQrPayment()"
+            [qrPaymentAmount]="cartTotal()"
+            [whatsappUrl]="whatsappUrl()"
             [transferValidationStatus]="transferValidationStatus()"
             (paymentMethodChange)="selectPaymentMethod($event)"
             (copyTransferValue)="copyTransferValue($event.field, $event.value)"
@@ -33,13 +45,30 @@
       </app-stepper>
     </div>
 
+    @if (isEditingItems()) {
+      <div class="checkout-page__editing-notice" role="status">
+        <p>Terminá de modificar las cantidades para continuar con el pago.</p>
+      </div>
+    }
+
     <div class="checkout-page__cart-col">
       <app-cart
+        title="COMPRA"
         [items]="mappedCartItems()"
         [subtotal]="cartSubtotal()"
         [discount]="cartDiscount()"
         [total]="cartTotal()"
+        [allowEditing]="
+          createdPurchase()?.status === 'created' || createdPurchase()?.status === 'pending_payment'
+        "
+        [allowRemove]="false"
+        [persistQuantityChanges]="false"
+        [editing]="isEditingItems()"
+        [editingDisabled]="isUpdatingItem() || isPreparingItemEdit()"
         backgroundColor="transparent"
+        (editingChange)="onEditingItemsChange($event)"
+        (itemQuantityChange)="onPurchaseItemQuantityChange($event)"
       />
     </div>
   </div>
+}

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

@@ -6,19 +6,72 @@
 
   @media (max-width: 900px) {
     grid-template-columns: 1fr;
+
+    .checkout-page__cart-col {
+      order: 1;
+    }
+
+    .checkout-page__stepper-col,
+    .checkout-page__editing-notice {
+      order: 2;
+    }
   }
 
   &__stepper-col {
     min-width: 0;
     border-radius: 4px;
     min-height: 420px;
+
+    &--editing {
+      display: none;
+    }
+  }
+
+  &__editing-notice {
+    display: grid;
+    min-height: 420px;
+    place-items: center;
+    padding: 2rem;
+    border-radius: 4px;
+    background: #f5f5f5;
+    color: #666666;
+    text-align: center;
+
+    p {
+      max-width: 360px;
+      margin: 0;
+      font-size: 14px;
+    }
   }
 
   &__cart-col {
-
     max-height: 80vh;
     overflow: hidden;
     display: flex;
     flex-direction: column;
   }
 }
+
+.checkout-page__loading {
+  display: grid;
+  min-height: 420px;
+  place-items: center;
+  align-content: center;
+  gap: 1rem;
+  color: #666666;
+}
+
+.checkout-page__spinner {
+  width: 3rem;
+  height: 3rem;
+  border: 0.25rem solid var(--border-color);
+  border-top-color: var(--tenant-primary);
+  border-radius: 50%;
+  animation: checkout-page-spin 0.8s linear infinite;
+}
+
+@keyframes checkout-page-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}

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

@@ -1,20 +1,28 @@
 import { signal } from '@angular/core';
 import { getTestBed, TestBed } from '@angular/core/testing';
 import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
-import { Router } from '@angular/router';
+import { ActivatedRoute, convertToParamMap, Router } from '@angular/router';
 import { of } from 'rxjs';
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { AuthService } from '../../../../core/services/auth/auth.service';
 import { CartService } from '../../../../core/services/cart/cart.service';
 import { CheckoutService } from '../../../../core/services/checkout.service';
+import { CatalogService } from '../../../../core/services/catalog/catalog.service';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { CheckoutPageComponent } from './checkout-page.component';
 
 describe('CheckoutPageComponent payment validation', () => {
   let checkoutServiceStub: {
+    startCheckout: ReturnType<typeof vi.fn>;
+    updateCustomerData: ReturnType<typeof vi.fn>;
+    updateItemQuantity: ReturnType<typeof vi.fn>;
+    prepareItemEditing: ReturnType<typeof vi.fn>;
+    cancelPurchase: ReturnType<typeof vi.fn>;
     generatePaymentIntent: ReturnType<typeof vi.fn>;
     getPurchase: ReturnType<typeof vi.fn>;
+    submitPurchaseForReview: ReturnType<typeof vi.fn>;
+    withCustomLoading: ReturnType<typeof vi.fn>;
   };
   let cartServiceStub: {
     cart: ReturnType<typeof signal>;
@@ -23,6 +31,8 @@ describe('CheckoutPageComponent payment validation', () => {
     clearCart: ReturnType<typeof vi.fn>;
   };
   let routerStub: { navigate: ReturnType<typeof vi.fn> };
+  let routeQueryParamMap: ReturnType<typeof convertToParamMap>;
+  let authUserState: ReturnType<typeof signal>;
 
   beforeAll(() => {
     try {
@@ -36,11 +46,24 @@ describe('CheckoutPageComponent payment validation', () => {
     vi.useFakeTimers();
 
     checkoutServiceStub = {
+      startCheckout: vi.fn().mockResolvedValue({
+        id: 25,
+        items: [],
+        subtotal: '0.00',
+        total: '0.00',
+      }),
+      updateCustomerData: vi.fn(),
+      updateItemQuantity: vi.fn(),
+      prepareItemEditing: vi.fn(),
+      cancelPurchase: vi.fn().mockResolvedValue({ status: 'cancelled' }),
       generatePaymentIntent: vi.fn().mockResolvedValue({
         qr_data: { qr_code: 'qr-value' },
       }),
       getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
+      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
+      withCustomLoading: vi.fn(),
     };
+    checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
     cartServiceStub = {
       cart: signal({
         id: 10,
@@ -63,14 +86,27 @@ describe('CheckoutPageComponent payment validation', () => {
       });
     });
     routerStub = { navigate: vi.fn() };
+    routeQueryParamMap = convertToParamMap({});
+    authUserState = signal(null);
 
     await TestBed.configureTestingModule({
       imports: [CheckoutPageComponent],
       providers: [
         { provide: CheckoutService, useValue: checkoutServiceStub },
+        { provide: CatalogService, useValue: { getCatalogItem: vi.fn() } },
         { provide: CartService, useValue: cartServiceStub },
         { provide: TenantService, useValue: { tenant: signal({ codigo: 'tenant-test' }) } },
-        { provide: AuthService, useValue: { user: signal(null) } },
+        { provide: AuthService, useValue: { user: authUserState } },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              get queryParamMap() {
+                return routeQueryParamMap;
+              },
+            },
+          },
+        },
         { provide: Router, useValue: routerStub },
       ],
     })
@@ -87,6 +123,7 @@ describe('CheckoutPageComponent payment validation', () => {
     const fixture = TestBed.createComponent(CheckoutPageComponent);
     fixture.detectChanges();
     fixture.componentInstance['createdPurchaseId'].set(25);
+    routerStub.navigate.mockClear();
     return { fixture, component: fixture.componentInstance as any };
   }
 
@@ -105,7 +142,7 @@ describe('CheckoutPageComponent payment validation', () => {
 
     await vi.advanceTimersByTimeAsync(5_000);
     expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(2);
-    expect(cartServiceStub.clearCart).toHaveBeenCalledOnce();
+    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
     expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
     expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledTimes(1);
   });
@@ -128,19 +165,19 @@ describe('CheckoutPageComponent payment validation', () => {
     fixture.destroy();
   });
 
-  it('stops QR polling after five minutes and can restart it', async () => {
+  it('stops QR polling after 45 seconds and can restart it', async () => {
     const { component } = createComponent();
 
     await component.selectPaymentMethod('qr');
-    await vi.advanceTimersByTimeAsync(300_000);
+    await vi.advanceTimersByTimeAsync(45_000);
 
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(60);
+    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(9);
     expect(component.qrPaymentStatus()).toBe('timed_out');
 
     component.retryQrPolling();
     expect(component.qrPaymentStatus()).toBe('waiting');
     await vi.advanceTimersByTimeAsync(5_000);
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(61);
+    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(10);
   });
 
   it('cancels QR polling when payment method changes or component is destroyed', async () => {
@@ -162,32 +199,33 @@ describe('CheckoutPageComponent payment validation', () => {
     component.selectedPaymentMethod.set('transfer');
 
     await component.onComplete();
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
     expect(component.transferValidationStatus()).toBe('pending');
     expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
     expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
 
     await vi.advanceTimersByTimeAsync(30_000);
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
 
     await component.onComplete();
-    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
   });
 
   it('navigates after a transfer is confirmed as paid', async () => {
-    checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'paid' });
+    checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status: 'paid' });
     const { component } = createComponent();
     component.selectedPaymentMethod.set('transfer');
 
     await component.onComplete();
 
-    expect(cartServiceStub.clearCart).toHaveBeenCalledOnce();
+    expect(checkoutServiceStub.submitPurchaseForReview).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 () => {
     vi.spyOn(console, 'error').mockImplementation(() => undefined);
-    checkoutServiceStub.getPurchase.mockRejectedValue(new Error('network error'));
+    checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error'));
     const { component } = createComponent();
     component.selectedPaymentMethod.set('transfer');
 
@@ -197,4 +235,285 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
     expect(routerStub.navigate).not.toHaveBeenCalled();
   });
+
+  it('loads purchase items but prefills customer data from the user', async () => {
+    const purchase = {
+      id: 25,
+      cart_id: null,
+      status: 'created',
+      payment_method: null,
+      transfer_payer_dni: null,
+      nombre_apellido: 'Datos de la compra',
+      email: 'compra@example.com',
+      dni: '11111111',
+      telefono: '1111111111',
+      items: [
+        {
+          id: 91,
+          quantity: 2,
+          unit_price: '1250.50',
+          line_total: '2501.00',
+          source_catalog_item_id: 8,
+          source_variant_id: 21,
+          item_details: {
+            nombre: 'Remera',
+            descripcion: null,
+            slug: 'remera',
+            imagen: 'https://example.com/remera.jpg',
+            attributes: [{ name: 'Color', value: 'Negro' }],
+          },
+        },
+      ],
+      subtotal: '2501.00',
+      total: '2501.00',
+    };
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockResolvedValue(purchase);
+    authUserState.set({
+      id: 7,
+      nombre_apellido: 'Juan Perez',
+      email: 'juan@example.com',
+      dni: '12345678',
+      telefono: '3415555555',
+    });
+    const { component } = createComponent();
+    await Promise.resolve();
+
+    expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
+    expect(component.mappedCartItems()).toEqual([
+      {
+        cartItemId: 91,
+        imageUrl: 'https://example.com/remera.jpg',
+        product: 'Remera',
+        originalPrice: null,
+        discountedPrice: 1250.5,
+        discountPercentage: null,
+        attributes: [{ label: 'Color', value: 'Negro' }],
+        quantity: 2,
+      },
+    ]);
+    expect(component.cartSubtotal()).toBe(2501);
+    expect(component.cartTotal()).toBe(2501);
+    expect(component.form.getRawValue()).toEqual({
+      nombre: 'Juan Perez',
+      email: 'juan@example.com',
+      dni: '12345678',
+      telefono: '3415555555',
+    });
+  });
+
+  it('keeps the checkout hidden while the purchase is loading', async () => {
+    let resolvePurchase!: (purchase: any) => void;
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockReturnValue(
+      new Promise((resolve) => {
+        resolvePurchase = resolve;
+      }),
+    );
+    const { component } = createComponent();
+
+    expect(component.isLoadingPurchase()).toBe(true);
+
+    resolvePurchase({
+      id: 25,
+      status: 'created',
+      payment_method: null,
+      transfer_payer_dni: null,
+      items: [],
+      subtotal: '0.00',
+      total: '0.00',
+    });
+    await Promise.resolve();
+
+    expect(component.isLoadingPurchase()).toBe(false);
+    expect(component.checkoutStepIndex()).toBe(0);
+  });
+
+  it('opens a pending purchase on the payment step and restores its payment method', async () => {
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockResolvedValue({
+      id: 25,
+      status: 'pending_payment',
+      payment_method: 'transfer',
+      transfer_payer_dni: '12345678',
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    });
+    const { component } = createComponent();
+    await Promise.resolve();
+
+    expect(component.checkoutStepIndex()).toBe(1);
+    expect(component.selectedPaymentMethod()).toBe('transfer');
+    expect(component.transferDni()).toBe('12345678');
+    expect(component.isLoadingPurchase()).toBe(false);
+  });
+
+  it('generates a new QR when reopening a pending QR purchase', async () => {
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockResolvedValue({
+      id: 25,
+      status: 'pending_payment',
+      payment_method: 'qr',
+      transfer_payer_dni: null,
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    });
+    const { component } = createComponent();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(component.checkoutStepIndex()).toBe(1);
+    expect(component.selectedPaymentMethod()).toBe('qr');
+    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith(
+      'tenant-test',
+      25,
+      'qr',
+    );
+    expect(component.qrData()).toBe('qr-value');
+    expect(component.qrPaymentStatus()).toBe('waiting');
+  });
+
+  it.each(['paid', 'cancelled', 'rejected', 'expired'])(
+    'redirects a %s purchase to its status page',
+    async (status) => {
+      routeQueryParamMap = convertToParamMap({ purchase: 25 });
+      checkoutServiceStub.getPurchase.mockResolvedValue({
+        id: 25,
+        status,
+        payment_method: null,
+        transfer_payer_dni: null,
+        items: [],
+        subtotal: '100.00',
+        total: '100.00',
+      });
+      createComponent();
+      await Promise.resolve();
+
+      expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
+    },
+  );
+
+  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,
+      items: [],
+      subtotal: '300.00',
+      total: '300.00',
+    };
+    checkoutServiceStub.updateItemQuantity.mockResolvedValue(updatedPurchase);
+    const { component } = createComponent();
+    component.isEditingItems.set(true);
+
+    await component.onPurchaseItemQuantityChange({
+      item: {
+        cartItemId: 91,
+        imageUrl: null,
+        product: 'Remera',
+        originalPrice: null,
+        discountedPrice: 100,
+        discountPercentage: null,
+        attributes: [],
+        quantity: 2,
+      },
+      quantity: 3,
+    });
+
+    expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith('tenant-test', 25, 91, 3);
+    expect(component.createdPurchase()).toBe(updatedPurchase);
+    expect(component.isUpdatingItem()).toBe(false);
+  });
+
+  it('keeps the payment step selected while editing and regenerates payment afterward', async () => {
+    const editablePurchase = {
+      id: 25,
+      status: 'created',
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    };
+    checkoutServiceStub.prepareItemEditing.mockResolvedValue(editablePurchase);
+    const { component } = createComponent();
+    component.stepper = { currentStepIndex: signal(1) };
+    const selectPaymentMethod = vi
+      .spyOn(component, 'selectPaymentMethod')
+      .mockResolvedValue(undefined);
+
+    await component.onEditingItemsChange(true);
+
+    expect(checkoutServiceStub.prepareItemEditing).toHaveBeenCalledWith('tenant-test', 25);
+    expect(component.isEditingItems()).toBe(true);
+    expect(component.createdPurchase()).toBe(editablePurchase);
+
+    await component.onEditingItemsChange(false);
+
+    expect(component.stepper.currentStepIndex()).toBe(1);
+    expect(selectPaymentMethod).toHaveBeenCalledWith('qr');
+    expect(component.isEditingItems()).toBe(false);
+  });
+
+  it('updates customer data on the existing purchase before payment', async () => {
+    const updatedPurchase = {
+      id: 25,
+      cart_id: 10,
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    };
+    checkoutServiceStub.updateCustomerData.mockResolvedValue(updatedPurchase);
+    const { component } = createComponent();
+    component.form.setValue({
+      nombre: 'Juan Perez',
+      email: 'juan@example.com',
+      dni: '12345678',
+      telefono: '3415555555',
+    });
+    component.stepper = { next: vi.fn() };
+
+    await component.onStep1Continue();
+
+    expect(checkoutServiceStub.startCheckout).not.toHaveBeenCalled();
+    expect(checkoutServiceStub.updateCustomerData).toHaveBeenCalledWith('tenant-test', 25, {
+      dni: '12345678',
+      telefono: '3415555555',
+      email: 'juan@example.com',
+      nombre_apellido: 'Juan Perez',
+    });
+    expect(component.createdPurchase()).toEqual({
+      ...updatedPurchase,
+      status: 'pending_payment',
+    });
+    expect(component.stepper.next).toHaveBeenCalledOnce();
+  });
+
+  it('cancels the pending purchase before allowing navigation away', async () => {
+    const { component } = createComponent();
+
+    await expect(component.canDeactivate()).resolves.toBe(true);
+
+    expect(checkoutServiceStub.cancelPurchase).toHaveBeenCalledWith('tenant-test', 25);
+    expect(cartServiceStub.loadCart).toHaveBeenCalled();
+    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
+    expect(component.createdPurchaseId()).toBeNull();
+  });
 });

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

@@ -2,24 +2,25 @@ import {
   ChangeDetectionStrategy,
   Component,
   computed,
-  effect,
   inject,
   OnDestroy,
   OnInit,
   signal,
-  untracked,
   ViewChild,
 } from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
-import { startWith } from 'rxjs';
+import { firstValueFrom, startWith } from 'rxjs';
 
-import { CartService } from '../../../../core/services/cart/cart.service';
 import { TenantService } from '../../../../core/services/tenant.service';
-import { CheckoutService, CreatePurchasePayload } from '../../../../core/services/checkout.service';
+import {
+  CheckoutService,
+  PurchaseDetailItemResponse,
+  PurchaseDetailResponse,
+} from '../../../../core/services/checkout.service';
 import { AuthService } from '../../../../core/services/auth/auth.service';
+import { CartService } from '../../../../core/services/cart/cart.service';
 import { BankAccount } from '../../../../core/services/tenant.interface';
-import { CartItem } from '../../../../core/services/cart/cart.interface';
 import { CartComponent, CartItemMock } from '../../../../shared/components/cart/cart.component';
 import { StepComponent } from '../../../../shared/components/stepper/step.component';
 import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
@@ -51,13 +52,14 @@ import {
 })
 export class CheckoutPageComponent implements OnInit, OnDestroy {
   private readonly formBuilder = inject(FormBuilder);
-  private readonly cartService = inject(CartService);
+  private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
   private readonly tenantService = inject(TenantService);
   private readonly checkoutService = inject(CheckoutService);
   private readonly authService = inject(AuthService);
+  private readonly cartService = inject(CartService);
   private readonly qrPollingIntervalMs = 5_000;
-  private readonly qrPollingMaxAttempts = 60;
+  private readonly qrPollingMaxAttempts = 9;
 
   private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
   private qrPollingAttempts = 0;
@@ -74,19 +76,25 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     telefono: ['', [Validators.required]],
   });
 
+  protected readonly createdPurchase = signal<PurchaseDetailResponse | null>(null);
+  protected readonly isLoadingPurchase = signal(true);
+  protected readonly checkoutStepIndex = signal(0);
+
   protected readonly cartSubtotal = computed(() => {
-    const cart = this.cartService.cart();
+    const purchase = this.createdPurchase();
-    return cart ? parseFloat(cart.subtotal) : 0;
+    return purchase ? parseFloat(purchase.subtotal) : 0;
   });
 
   protected readonly cartDiscount = computed(() => 0);
 
-  protected readonly cartTotal = computed(() => this.cartSubtotal() - this.cartDiscount());
+  protected readonly cartTotal = computed(() => {
+    const purchase = this.createdPurchase();
+    return purchase ? parseFloat(purchase.total) : this.cartSubtotal() - this.cartDiscount();
+  });
 
   protected readonly mappedCartItems = computed<CartItemMock[]>(() => {
-    const cart = this.cartService.cart();
+    const purchase = this.createdPurchase();
-    if (!cart || !cart.items) return [];
+    return purchase ? purchase.items.map((item) => this.mapPurchaseItemToMock(item)) : [];
-    return cart.items.map((item) => this.mapCartItemToMock(item));
   });
 
   protected readonly isStep1Valid = signal(this.form.valid);
@@ -100,32 +108,25 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   protected readonly transferAccount = signal<TransferAccount | null>(null);
   protected readonly transferDni = signal<string>('');
 
-  protected readonly isCreatingPurchase = signal(false);
+  protected readonly isUpdatingPurchase = signal(false);
+  protected readonly isEditingItems = signal(false);
+  protected readonly isUpdatingItem = signal(false);
+  protected readonly isPreparingItemEdit = signal(false);
   protected readonly createdPurchaseId = signal<number | null>(null);
   protected readonly isGeneratingIntent = signal(false);
-  protected readonly isPaymentLoading = computed(
+  protected readonly isPaymentLoading = computed(() => this.isGeneratingIntent());
-    () => this.isGeneratingIntent() || this.cartService.isUpdating(),
-  );
   protected readonly qrData = signal<string | null>(null);
   protected readonly qrPaymentStatus = signal<QrPaymentStatus>('idle');
   protected readonly isCheckingQrPayment = signal(false);
   protected readonly transferValidationStatus = signal<TransferValidationStatus>('idle');
+  protected readonly whatsappUrl = computed(
+    () =>
+      this.tenantService
+        .tenant()
+        ?.social_media?.find((socialMedia) => socialMedia.code === 'whatsapp')?.url ?? null,
+  );
 
   constructor() {
-    effect(() => {
-      // We only want to trigger the intent generation when the cart changes.
-      // So we track the cart, but untrack the other signals to prevent duplicate calls.
-      const cart = this.cartService.cart();
-
-      untracked(() => {
-        const purchaseId = this.createdPurchaseId();
-        if (cart && purchaseId && !this.navigationStarted) {
-          // Trigger payment intent generation when cart changes and we are on the payment step
-          void this.selectPaymentMethod(this.selectedPaymentMethod());
-        }
-      });
-    });
-
     this.form.statusChanges
       .pipe(startWith(this.form.status))
       .subscribe(() => this.isStep1Valid.set(this.form.valid));
@@ -144,68 +145,123 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.cartService.loadCart().subscribe();
+    const purchaseId = Number(this.route.snapshot.queryParamMap.get('purchase'));
+    if (!Number.isInteger(purchaseId) || purchaseId <= 0) {
+      void this.router.navigate(['/']);
+      return;
+    }
+
+    void this.loadPurchase(purchaseId);
   }
 
   ngOnDestroy(): void {
     this.stopQrPolling();
   }
 
-  private mapCartItemToMock(item: CartItem): CartItemMock {
+  private mapPurchaseItemToMock(item: PurchaseDetailItemResponse): CartItemMock {
-    const fullName = item.product?.nombre ?? '';
-    let product = fullName;
-    let attributes: { label: string; value: string }[] = [];
-
-    const match = fullName.match(/^(.*?)\s*\((.*?)\)$/);
-    if (match) {
-      product = match[1];
-      const attributesString = match[2];
-      attributes = attributesString.split(',').map((attr) => {
-        const parts = attr.split(':');
-        if (parts.length === 2) {
-          return { label: parts[0].trim(), value: parts[1].trim() };
-        }
-        return { label: '', value: attr.trim() };
-      });
-    }
-
     return {
       cartItemId: item.id,
-      imageUrl: item.product?.imagen ?? null,
+      imageUrl: item.item_details.imagen,
-      product,
+      product: item.item_details.nombre,
       originalPrice: null,
-      discountedPrice: parseFloat(item.precio_unitario),
+      discountedPrice: parseFloat(item.unit_price),
       discountPercentage: null,
-      attributes,
+      attributes: item.item_details.attributes.map((attribute) => ({
-      quantity: item.cantidad,
+        label: attribute.name,
+        value: attribute.value === null ? '' : String(attribute.value),
+      })),
+      quantity: item.quantity,
     };
   }
 
-  protected async onStep1Continue(): Promise<void> {
+  protected async onEditingItemsChange(editing: boolean): Promise<void> {
-    if (this.form.invalid) return;
+    if (this.isUpdatingItem() || this.isPreparingItemEdit()) {
+      return;
+    }
 
-    const tenant = this.tenantService.tenant();
+    if (!editing) {
-    if (!tenant) return;
+      this.isEditingItems.set(false);
 
-    this.isCreatingPurchase.set(true);
+      if (this.stepper?.currentStepIndex() === 1) {
-
+        void this.selectPaymentMethod(this.selectedPaymentMethod());
-    try {
-      const cart = this.cartService.cart();
-      if (!cart?.id) {
-        throw new Error('No hay un carrito activo para finalizar la compra.');
       }
 
+      return;
+    }
+
+    this.isEditingItems.set(true);
+    this.stopQrPolling();
+    this.qrData.set(null);
+    this.qrPaymentStatus.set('idle');
+    this.transferAccount.set(null);
+    this.transferValidationStatus.set('idle');
+
+    const tenant = this.tenantService.tenant();
+    const purchaseId = this.createdPurchaseId();
+
+    if (!tenant || !purchaseId) {
+      this.isEditingItems.set(false);
+      return;
+    }
+
+    this.isPreparingItemEdit.set(true);
+    try {
+      const purchase = await this.checkoutService.prepareItemEditing(tenant.codigo, purchaseId);
+      this.createdPurchase.set(purchase);
+    } catch (error) {
+      console.error('Failed to prepare purchase item editing:', error);
+      this.isEditingItems.set(false);
+    } finally {
+      this.isPreparingItemEdit.set(false);
+    }
+  }
+
+  protected async onPurchaseItemQuantityChange(event: {
+    item: CartItemMock;
+    quantity: number;
+  }): Promise<void> {
+    const tenant = this.tenantService.tenant();
+    const purchaseId = this.createdPurchaseId();
+    const itemId = event.item.cartItemId;
+
+    if (!tenant || !purchaseId || !itemId || this.isUpdatingItem() || !this.isEditingItems()) {
+      return;
+    }
+
+    this.isUpdatingItem.set(true);
+    try {
+      const purchase = await this.checkoutService.updateItemQuantity(
+        tenant.codigo,
+        purchaseId,
+        itemId,
+        event.quantity,
+      );
+      this.createdPurchase.set(purchase);
+    } catch (error) {
+      console.error('Failed to update purchase item quantity:', error);
+    } finally {
+      this.isUpdatingItem.set(false);
+    }
+  }
+
+  protected async onStep1Continue(): Promise<void> {
+    if (this.form.invalid || this.isUpdatingPurchase() || this.isEditingItems()) return;
+
+    const tenant = this.tenantService.tenant();
+    const purchaseId = this.createdPurchaseId();
+    if (!tenant || !purchaseId) return;
+
+    this.isUpdatingPurchase.set(true);
+
+    try {
       const formValue = this.form.getRawValue();
-      const payload: CreatePurchasePayload = {
+      const purchase = await this.checkoutService.updateCustomerData(tenant.codigo, purchaseId, {
-        cart_id: cart.id,
         dni: formValue.dni,
         telefono: formValue.telefono,
         email: formValue.email,
         nombre_apellido: formValue.nombre,
-      };
+      });
-
+      this.createdPurchase.set(purchase);
-      const response = await this.checkoutService.createPurchase(tenant.codigo, payload);
-      this.createdPurchaseId.set(response.id);
 
       this.stepper.next();
 
@@ -215,17 +271,50 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       console.error('Failed to create purchase:', error);
       // Here we could show an alert or toast
     } finally {
-      this.isCreatingPurchase.set(false);
+      this.isUpdatingPurchase.set(false);
     }
   }
 
-  protected onCancel(): void {
+  protected async onCancel(): Promise<void> {
+    if (await this.canDeactivate()) {
+      void this.router.navigate(['/']);
+    }
+  }
+
+  public async canDeactivate(): Promise<boolean> {
     this.stopQrPolling();
-    void this.router.navigate(['/']);
+
+    if (this.navigationStarted) {
+      return true;
+    }
+
+    const purchaseId = this.createdPurchaseId();
+    const tenant = this.tenantService.tenant();
+
+    if (!purchaseId || !tenant) {
+      return true;
+    }
+
+    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;
+    } catch (error) {
+      console.error('Failed to cancel purchase:', error);
+      return false;
+    }
   }
 
   protected async selectPaymentMethod(method: PaymentMethod): Promise<void> {
-    if (this.navigationStarted) {
+    if (this.navigationStarted || this.isEditingItems()) {
       return;
     }
 
@@ -254,11 +343,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.isGeneratingIntent.set(true);
 
     try {
-      const response = await this.checkoutService.generatePaymentIntent(
+      const response = await this.checkoutService
-        tenant.codigo,
+        .withCustomLoading()
-        purchaseId,
+        .generatePaymentIntent(tenant.codigo, purchaseId, method);
-        method,
-      );
 
       if (method === 'qr' && response.qr_data?.qr_code) {
         if (requestId !== this.paymentMethodRequestId || this.selectedPaymentMethod() !== 'qr') {
@@ -266,6 +353,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
         }
 
         this.qrData.set(response.qr_data.qr_code);
+        this.markPurchasePendingPayment();
         this.startQrPolling();
       }
     } catch (error) {
@@ -276,6 +364,10 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
   }
 
   protected async generateTransferIntent(dni: string): Promise<void> {
+    if (this.isEditingItems()) {
+      return;
+    }
+
     const purchaseId = this.createdPurchaseId();
     const tenant = this.tenantService.tenant();
 
@@ -287,14 +379,12 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.transferValidationStatus.set('idle');
     this.isGeneratingIntent.set(true);
     try {
-      const response = await this.checkoutService.generatePaymentIntent(
+      const response = await this.checkoutService
-        tenant.codigo,
+        .withCustomLoading()
-        purchaseId,
+        .generatePaymentIntent(tenant.codigo, purchaseId, 'transfer', dni);
-        'transfer',
-        dni
-      );
 
       if (response.transfer_data) {
+        this.markPurchasePendingPayment();
         this.transferAccount.set({
           titular: response.transfer_data.titular,
           entidad: response.transfer_data.entidad,
@@ -334,6 +424,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
       !purchaseId ||
       !tenant ||
       this.navigationStarted ||
+      this.isEditingItems() ||
       this.transferValidationStatus() === 'checking'
     ) {
       return;
@@ -342,22 +433,22 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.transferValidationStatus.set('checking');
 
     try {
-      const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .submitPurchaseForReview(tenant.codigo, purchaseId);
 
-      if (purchase.status === 'paid') {
+      if (purchase.status === 'paid' || purchase.status === 'pending_payment') {
-        this.handleConfirmedPayment(purchaseId);
+        if (purchase.status === 'pending_payment') {
-        return;
+          this.transferValidationStatus.set('pending');
-      }
+        }
 
-      if (purchase.status === 'pending_payment') {
-        this.transferValidationStatus.set('pending');
         this.navigateToPurchaseStatus(purchaseId);
         return;
       }
 
-      this.transferValidationStatus.set('pending');
+      this.transferValidationStatus.set('error');
     } catch (error) {
-      console.error('Failed to validate transfer payment:', error);
+      console.error('Failed to submit purchase for review:', error);
       this.transferValidationStatus.set('error');
     }
   }
@@ -401,7 +492,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.isCheckingQrPayment.set(true);
 
     try {
-      const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
 
       if (runId !== this.qrPollingRunId) {
         return;
@@ -448,11 +541,22 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     }
   }
 
-  private handleConfirmedPayment(purchaseId: number): void {
+  private markPurchasePendingPayment(): void {
-    this.navigateToPurchaseStatus(purchaseId, true);
+    this.createdPurchase.update((purchase) =>
+      purchase
+        ? {
+            ...purchase,
+            status: 'pending_payment',
+          }
+        : purchase,
+    );
   }
 
-  private navigateToPurchaseStatus(purchaseId: number, clearCart = false): void {
+  private handleConfirmedPayment(purchaseId: number): void {
+    this.navigateToPurchaseStatus(purchaseId);
+  }
+
+  private navigateToPurchaseStatus(purchaseId: number): void {
     if (this.navigationStarted) {
       return;
     }
@@ -460,10 +564,57 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.navigationStarted = true;
     this.stopQrPolling();
 
-    if (clearCart) {
-      this.cartService.clearCart();
-    }
-
     void this.router.navigate(['/checkout/status', purchaseId]);
   }
+
+  private async loadPurchase(purchaseId: number): Promise<void> {
+    const tenant = this.tenantService.tenant();
+    if (!tenant) {
+      void this.router.navigate(['/']);
+      return;
+    }
+
+    try {
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
+
+      if (
+        (purchase.status === 'pending_payment' && purchase.expires_at === null) ||
+        purchase.status === 'paid' ||
+        purchase.status === 'cancelled' ||
+        purchase.status === 'rejected' ||
+        purchase.status === 'expired'
+      ) {
+        this.navigateToPurchaseStatus(purchaseId);
+        return;
+      }
+
+      if (purchase.status !== 'created' && purchase.status !== 'pending_payment') {
+        void this.router.navigate(['/']);
+        return;
+      }
+
+      this.createdPurchaseId.set(purchase.id);
+      this.createdPurchase.set(purchase);
+      this.checkoutStepIndex.set(purchase.status === 'pending_payment' ? 1 : 0);
+
+      if (
+        purchase.status === 'pending_payment' &&
+        this.paymentMethods.some((method) => method.id === purchase.payment_method)
+      ) {
+        this.selectedPaymentMethod.set(purchase.payment_method as PaymentMethod);
+        this.transferDni.set(purchase.transfer_payer_dni ?? '');
+      }
+
+      this.isLoadingPurchase.set(false);
+
+      if (purchase.status === 'pending_payment' && purchase.payment_method === 'qr') {
+        await this.selectPaymentMethod('qr');
+      }
+    } catch (error) {
+      console.error('Failed to load purchase:', error);
+      void this.router.navigate(['/']);
+    }
+  }
 }

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

@@ -0,0 +1,8 @@
+import { CanDeactivateFn } from '@angular/router';
+
+interface PendingCheckoutComponent {
+  canDeactivate(): Promise<boolean>;
+}
+
+export const checkoutPendingPurchaseGuard: CanDeactivateFn<PendingCheckoutComponent> = (component) =>
+  component.canDeactivate();

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

@@ -1,14 +1,13 @@
 <div class="checkout-payment">
   <div class="checkout-payment__content">
     <section class="payment-methods" aria-labelledby="payment-methods-title">
-      <h2 id="payment-methods-title" class="payment-methods__title">Selecciona el metodo de pago</h2>
+      <h2 id="payment-methods-title" class="payment-methods__title">
+        Selecciona el metodo de pago
+      </h2>
 
       <div class="payment-methods__list" role="radiogroup" aria-label="Metodo de pago">
         @for (method of paymentMethods(); track method.id) {
-          <label
+          <label class="payment-method" [class.is-selected]="selectedPaymentMethod() === method.id">
-            class="payment-method"
-            [class.is-selected]="selectedPaymentMethod() === method.id"
-          >
             <input
               class="payment-method__radio"
               type="radio"
@@ -21,7 +20,8 @@
             <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 class="telepagos-logo__tele">tele</span
+                  ><span class="telepagos-logo__pagos">pagos</span>
                 </span>
               } @else {
                 {{ method.label }}
@@ -34,9 +34,9 @@
       </div>
     </section>
 
-    <section class="payment-panel d-flex justify-content-end" aria-live="polite">
+    <section class="payment-panel" aria-live="polite">
       @if (isGeneratingIntent()) {
-        <div class="payment-panel__card" style="text-align: center; padding: 2rem;">
+        <div class="payment-panel__card" style="text-align: center; padding: 2rem">
           <h3 class="payment-panel__title">Cargando información de pago...</h3>
         </div>
       } @else if (selectedPaymentMethod() === 'qr') {
@@ -44,7 +44,8 @@
           [qrData]="qrData()"
           [paymentStatus]="qrPaymentStatus()"
           [isCheckingPayment]="isCheckingQrPayment()"
-          (retryPolling)="retryQrPolling.emit()"
+          [paymentAmount]="qrPaymentAmount()"
+          [whatsappUrl]="whatsappUrl()"
         />
       } @else if (selectedPaymentMethod() === 'transfer') {
         <app-checkout-payment-transfer
@@ -52,6 +53,8 @@
           [transferDni]="transferDni()"
           [copiedTransferField]="copiedTransferField()"
           [validationStatus]="transferValidationStatus()"
+          [paymentAmount]="qrPaymentAmount()"
+          [whatsappUrl]="whatsappUrl()"
           (copyTransferValue)="requestCopy($event.field, $event.value)"
           (submitDni)="generateTransferIntent.emit($event)"
           (completePurchase)="complete.emit()"
@@ -62,4 +65,3 @@
     </section>
   </div>
 </div>
-

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

@@ -32,6 +32,11 @@
 .payment-methods {
   min-width: 0;
 
+  @media (max-width: 760px) {
+    width: min(100%, 300px);
+    justify-self: center;
+  }
+
   &__title {
     margin: 0 0 1.75rem;
     color: #8a8a8a;
@@ -109,7 +114,22 @@
 }
 
 .payment-panel {
+  display: flex;
+  justify-content: flex-end;
   min-width: 0;
+
+  > app-checkout-payment-qr,
+  > app-checkout-payment-transfer,
+  > app-checkout-payment-telepagos {
+    display: block;
+    width: 100%;
+    max-width: 320px;
+  }
+
+  @media (max-width: 760px) {
+    justify-content: center;
+  }
+
   &__card {
     width: 100%;
     max-width: 320px;

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

@@ -30,6 +30,8 @@ export class CheckoutPaymentStepComponent {
   readonly qrData = input<string | null>(null);
   readonly qrPaymentStatus = input<QrPaymentStatus>('idle');
   readonly isCheckingQrPayment = input<boolean>(false);
+  readonly qrPaymentAmount = input<number>(0);
+  readonly whatsappUrl = input<string | null>(null);
   readonly transferValidationStatus = input<TransferValidationStatus>('idle');
 
   readonly paymentMethodChange = output<PaymentMethod>();
@@ -37,7 +39,6 @@ export class CheckoutPaymentStepComponent {
   readonly cancelStep = output<void>();
   readonly complete = output<void>();
   readonly generateTransferIntent = output<string>();
-  readonly retryQrPolling = output<void>();
 
   protected selectPaymentMethod(method: PaymentMethod): void {
     this.paymentMethodChange.emit(method);