feat: add type property to Product and CatalogItemDetail interfaces; include event_id in PurchaseSummaryResponse and PurchaseDetailResponse

- Refactor AuthService, CartService, CatalogService, CheckoutService, TenantService, and TicketService to extend BaseApiService for consistent loading context handling.
- Implement loading modes ('global', 'custom', 'none') using HttpContext for API requests.
- Update existing service methods to accept loading mode parameters and propagate them to HTTP requests.
- Enhance global loading interceptor to respect loading modes and prevent global loading for specific requests.
- Add unit tests to verify loading mode propagation in services and interceptors.
- Update component interactions to utilize the new loading mode functionality.

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

@@ -3,6 +3,7 @@ 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 +24,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: {

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

@@ -1,10 +1,11 @@
 import { DOCUMENT } from '@angular/common';
-import { HttpClient, HttpErrorResponse, HttpResponse } 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,
@@ -26,8 +27,7 @@ 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);
@@ -51,7 +51,9 @@ export class AuthService {
       .post<LoginResponse>(
         `${environment.url}login`,
         { ...payload, tenant_codigo: tenant.codigo },
-        { withCredentials: true }
+        {
+          withCredentials: true
+        }
       )
       .pipe(
         tap((response) => this.applyAuthenticatedState(response.token, response.user)),
@@ -62,13 +64,18 @@ export class AuthService {
   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>> {
+  requestPasswordReset(
+    email: string
+  ): Observable<HttpResponse<ResetPasswordAttemptResponse>> {
     const tenantCode = this.tenantService.getTenant()?.codigo;
 
     return this.http.post<ResetPasswordAttemptResponse>(
@@ -77,7 +84,9 @@ export class AuthService {
         email,
         ...(tenantCode ? { tenant_codigo: tenantCode } : {})
       },
-      { observe: 'response' }
+      {
+        observe: 'response'
+      }
     );
   }
 
@@ -88,7 +97,9 @@ export class AuthService {
     return this.http.post<ValidateResetPasswordAttemptResponse>(
       `${environment.url}password/reset-attempts/validate`,
       { email, codigo },
-      { observe: 'response' }
+      {
+        observe: 'response'
+      }
     );
   }
 
@@ -122,7 +133,9 @@ export class AuthService {
       .post<LoginResponse>(
         `${environment.url}auth/google/exchange`,
         { oauth_code: oauthCode, tenant_codigo: tenant.codigo },
-        { withCredentials: true }
+        {
+          withCredentials: true
+        }
       )
       .pipe(
         tap((response) => this.applyAuthenticatedState(response.token, response.user)),
@@ -131,7 +144,9 @@ export class AuthService {
   }
 
   updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
-    return this.http.put<AuthUser>(`${environment.url}me`, payload).pipe(tap((user) => this.userState.set(user)));
+    return this.http
+      .put<AuthUser>(`${environment.url}me`, payload)
+      .pipe(tap((user) => this.userState.set(user)));
   }
 
   logout(): Observable<void> {
@@ -140,7 +155,9 @@ export class AuthService {
       return of(void 0);
     }
 
-    return this.http.post<void>(`${environment.url}logout`, {}).pipe(tap(() => this.clearSession()));
+    return this.http
+      .post<void>(`${environment.url}logout`, {})
+      .pipe(tap(() => this.clearSession()));
   }
 
   async bootstrap(): Promise<void> {
@@ -179,7 +196,9 @@ export class AuthService {
   }
 
   loadCurrentUser(): Observable<AuthUser> {
-    return this.http.get<AuthUser>(`${environment.url}me`).pipe(tap((user) => this.userState.set(user)));
+    return this.http
+      .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.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);
@@ -53,7 +52,13 @@ export class CartService {
     return this.http
       .post<
         ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items`, { catalog_item_id: catalogItemId, variant_id: variantId, cantidad }, { withCredentials: true })
+      >(
+        `${this.tenantApiUrl}/cart/items`,
+        { catalog_item_id: catalogItemId, variant_id: variantId, cantidad },
+        {
+          withCredentials: true,
+        },
+      )
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
@@ -66,12 +71,21 @@ export class CartService {
       );
   }
 
-  updateItemQuantity(cartItemId: number, cantidad: number): Observable<ApiResponse<Cart>> {
+  updateItemQuantity(
+    cartItemId: number,
+    cantidad: number,
+  ): Observable<ApiResponse<Cart>> {
     this.isUpdatingState.set(true);
     return this.http
       .patch<
         ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { cantidad }, { withCredentials: true })
+      >(
+        `${this.tenantApiUrl}/cart/items/${cartItemId}`,
+        { cantidad },
+        {
+          withCredentials: true,
+        },
+      )
       .pipe(
         tap((response) => {
           this.cartState.set(response.data);
@@ -89,7 +103,9 @@ export class CartService {
     return this.http
       .delete<
         ApiResponse<Cart>
-      >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { 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;
@@ -35,6 +38,7 @@ export type InventoryPolicy = 'tracked' | 'unlimited';
 
 export interface CatalogItemVariant {
   id: number;
+  event_date_id?: number | null;
   stock_tecnico: number | null;
   minimum_use_date?: string | null;
   maximum_use_date?: string | null;
@@ -43,12 +47,24 @@ export interface CatalogItemVariant {
   values: Record<string, string>;
 }
 
+export interface CatalogItemEventDate {
+  id: number;
+  variant_id: number;
+  date: string;
+  starts_at: string;
+  ends_at: string;
+  label: string;
+  stock_tecnico: number | null;
+}
+
 export interface SelectedCatalogItemVariant extends CatalogItemVariant {
   images: string[];
 }
 
 export interface CatalogItemDetail {
   id: number;
+  type: CatalogItemType;
+  purpose?: 'product' | 'entry';
   category_id: number | null;
   brand_id: number | null;
   slug: string;
@@ -63,6 +79,7 @@ export interface CatalogItemDetail {
   maximum_use_date: string | null;
   attributes: ProductAttribute[];
   variants: CatalogItemVariant[];
+  event_dates?: CatalogItemEventDate[];
   selected_variant?: SelectedCatalogItemVariant;
   stock_tecnico?: number | null;
   images?: string[];
@@ -79,6 +96,7 @@ export interface CatalogFeaturedItemVariant {
 
 export interface CatalogFeaturedItem {
   id: number;
+  type: CatalogItemType;
   nombre: string;
   descripcion?: string | null;
   precio: number | string;

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

@@ -1,10 +1,11 @@
+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,
@@ -24,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 {
@@ -47,7 +47,9 @@ export class CatalogService {
   ): Observable<ApiPaginatedResponse<CatalogFeaturedItem[]>> {
     return this.http.get<ApiPaginatedResponse<CatalogFeaturedItem[]>>(
       `${this.tenantApiUrl}/catalog-items`,
-      { params: this.buildHttpParams(params) },
+      {
+        params: this.buildHttpParams(params),
+      },
     );
   }
 
@@ -66,18 +68,25 @@ export class CatalogService {
   ): 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,8 +1,8 @@
-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 UpdatePurchaseCustomerPayload {
   dni: string;
@@ -29,6 +29,7 @@ export interface PurchaseStatusResponse {
 
 export interface PurchaseSummaryResponse extends PurchaseStatusResponse {
   id: number;
+  event_id: number | null;
   created_at: string | null;
   total: string;
 }
@@ -58,9 +59,11 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
   id: number;
   cart_id: number | null;
   tenant_codigo: string;
+  event_id: number | null;
   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;
@@ -77,9 +80,7 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
 @Injectable({
   providedIn: 'root',
 })
-export class CheckoutService {
+export class CheckoutService extends BaseApiService {
-  private readonly http = inject(HttpClient);
-
   async startCheckout(
     tenantCode: string,
     payload: StartCheckoutPayload,
@@ -182,7 +183,10 @@ export class CheckoutService {
     return purchase;
   }
 
-  async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
+  async completePurchase(
+    tenantCode: string,
+    purchaseId: number,
+  ): Promise<PurchaseStatusResponse> {
     const response = await firstValueFrom(
       this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`,
@@ -220,7 +224,10 @@ export class CheckoutService {
     return { status: purchase.status ?? null };
   }
 
-  async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
+  async cancelPurchase(
+    tenantCode: string,
+    purchaseId: number,
+  ): Promise<PurchaseStatusResponse> {
     const response = await firstValueFrom(
       this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
         `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/cancel`,
@@ -244,7 +251,9 @@ export class CheckoutService {
     if (status) {
       url += `?status=${status}`;
     }
-    const response = await firstValueFrom(this.http.get<{ data: PurchaseSummaryResponse[] }>(url));
+    const response = await firstValueFrom(
+      this.http.get<{ data: PurchaseSummaryResponse[] }>(url),
+    );
     if (!response) {
       throw new Error('Error al obtener las compras.');
     }

src/app/core/services/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/tenant.interface.ts

@@ -9,18 +9,63 @@ 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 ActiveEvent {
+  id: number;
+  name: string;
+  address: string;
+  dates: ActiveEventDate[];
+}
+
+export interface WebsiteExtras {
+  carousel?: string[];
+  heroConfig?: HeroConfig | null;
+  additionalInfoConfig?: AdditionalInfoConfig | null;
+  [extraName: string]: unknown;
 }
 
 export interface Menu {
@@ -60,14 +105,16 @@ export interface Tenant {
   footer_bg_color: string;
   header_logo: string;
   footer_logo: string;
+  website_type_code?: string | null;
+  website_type?: WebsiteType | null;
+  extras?: WebsiteExtras;
+  active_event_id?: number | null;
+  active_event?: ActiveEvent | 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[];
   social_media?: SocialMedia[];
   menues?: Menu[];
   categories: Category[];

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/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/purchase-detail-page/purchase-detail-page.ts

@@ -44,7 +44,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/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,14 @@ 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 ?? []);
   }
 
@@ -36,7 +37,9 @@ export class TicketService {
       this.http.post(
         `${this.tenantService.getTenantApiUrl()}/tickets/pdf`,
         { ticket_ids: ticketIds },
-        { responseType: 'blob' },
+        {
+          responseType: 'blob',
+        },
       ),
     );
   }

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

@@ -8,6 +8,14 @@ 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',
@@ -40,10 +48,10 @@ describe('TicketsPage', () => {
           providers: [
             {
               provide: TicketService,
-              useValue: {
+              useValue: withCustomLoading({
                 getTickets: () => Promise.resolve([ticket({})]),
                 downloadPdf: () => Promise.resolve(new Blob(['pdf-content'])),
-              },
+              }),
             },
           ],
         },
@@ -99,10 +107,10 @@ describe('TicketsPage', () => {
           providers: [
             {
               provide: TicketService,
-              useValue: {
+              useValue: withCustomLoading({
                 getTickets: () => Promise.resolve([ticket({})]),
                 downloadPdf,
-              },
+              }),
             },
           ],
         },
@@ -150,7 +158,10 @@ describe('TicketsPage', () => {
       .overrideComponent(TicketsPage, {
         set: {
           providers: [
-            { provide: TicketService, useValue: { getTickets: () => Promise.resolve([]) } },
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({ getTickets: () => Promise.resolve([]) }),
+            },
           ],
         },
       })
@@ -183,7 +194,10 @@ describe('TicketsPage', () => {
       .overrideComponent(TicketsPage, {
         set: {
           providers: [
-            { provide: TicketService, useValue: { getTickets: () => Promise.resolve(tickets) } },
+            {
+              provide: TicketService,
+              useValue: withCustomLoading({ getTickets: () => Promise.resolve(tickets) }),
+            },
           ],
         },
       })
@@ -236,7 +250,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

@@ -35,7 +35,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 {
@@ -151,7 +151,9 @@ export class TicketsPage implements OnInit {
     this.isGeneratingPdf.set(true);
 
     try {
-      return await this.ticketService.downloadPdf(tickets.map((ticket) => ticket.id));
+      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;

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

@@ -1,8 +1,6 @@
 <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 (loading()) {
-    <p class="alert alert-light border text-center mb-0">Cargando productos...</p>
   } @else if (results(); as categoryResults) {
     <header class="category-items__header mb-5">
       <h1 id="category-items-title" class="category-items__title mb-0">
@@ -19,7 +17,6 @@
         [layout]="categoryResults.layout"
         [groupLayout]="paginatedLayout"
         [items]="categoryResults"
-        [loading]="loading()"
         (buy)="onBuyProduct($event)"
         (addToCart)="onAddToCart($event)"
         (pageChange)="onPageChange($event)"

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

@@ -69,7 +69,9 @@ describe('CategoryItemsPageComponent', () => {
         },
         {
           provide: CatalogService,
-          useValue: { getCategoryItems },
+          useValue: {
+            getCategoryItems,
+          },
         },
         {
           provide: TenantService,

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

@@ -50,7 +50,6 @@ export class CategoryItemsPageComponent {
   private readonly toastService = inject(ToastService);
 
   protected readonly results = signal<CategoryItemsResponse | null>(null);
-  protected readonly loading = signal(true);
   protected readonly error = signal<string | null>(null);
   protected readonly creatingDirectPurchase = signal(false);
   protected readonly paginatedLayout: CatalogGroupLayout = 'paginated';
@@ -71,7 +70,6 @@ export class CategoryItemsPageComponent {
         tap(() => {
           this.results.set(null);
           this.error.set(null);
-          this.loading.set(true);
         }),
         switchMap(({ categoryId, page }) => {
           if (categoryId === 0) {
@@ -92,7 +90,6 @@ export class CategoryItemsPageComponent {
       )
       .subscribe((results) => {
         this.results.set(results);
-        this.loading.set(false);
       });
   }
 

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

@@ -22,6 +22,7 @@ describe('CheckoutPageComponent payment validation', () => {
     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>;
@@ -59,8 +60,10 @@ describe('CheckoutPageComponent payment validation', () => {
         qr_data: { qr_code: 'qr-value' },
       }),
       getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
-      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'in_review' }),
+      submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
+      withCustomLoading: vi.fn(),
     };
+    checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
     cartServiceStub = {
       cart: signal({
         id: 10,
@@ -191,23 +194,24 @@ describe('CheckoutPageComponent payment validation', () => {
     expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
   });
 
-  it.each(['created', 'pending_payment', 'in_review'])(
+  it('checks a transfer once and redirects to purchase status while pending', async () => {
-    'shows the payment error when a transfer remains %s',
+    const { component } = createComponent();
-    async (status) => {
+    component.selectedPaymentMethod.set('transfer');
-      checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status });
-      const { component } = createComponent();
-      component.selectedPaymentMethod.set('transfer');
 
-      await component.onComplete();
+    await component.onComplete();
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
+    expect(component.transferValidationStatus()).toBe('pending');
+    expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
 
-      expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
+    await vi.advanceTimersByTimeAsync(30_000);
-      expect(component.transferValidationStatus()).toBe('error');
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
-      expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
-      expect(routerStub.navigate).not.toHaveBeenCalled();
-    },
-  );
 
-  it('submits a paid transfer and navigates to its confirmation page', async () => {
+    await component.onComplete();
+    expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
+  });
+
+  it('navigates after a transfer is confirmed as paid', async () => {
     checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status: 'paid' });
     const { component } = createComponent();
     component.selectedPaymentMethod.set('transfer');
@@ -362,12 +366,16 @@ describe('CheckoutPageComponent payment validation', () => {
 
     expect(component.checkoutStepIndex()).toBe(1);
     expect(component.selectedPaymentMethod()).toBe('qr');
-    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith('tenant-test', 25, 'qr');
+    expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith(
+      'tenant-test',
+      25,
+      'qr',
+    );
     expect(component.qrData()).toBe('qr-value');
     expect(component.qrPaymentStatus()).toBe('waiting');
   });
 
-  it.each(['in_review', 'paid', 'cancelled', 'rejected', 'expired'])(
+  it.each(['paid', 'cancelled', 'rejected', 'expired'])(
     'redirects a %s purchase to its status page',
     async (status) => {
       routeQueryParamMap = convertToParamMap({ purchase: 25 });
@@ -387,6 +395,25 @@ describe('CheckoutPageComponent payment validation', () => {
     },
   );
 
+  it('redirects a submitted pending payment purchase to its status page', async () => {
+    routeQueryParamMap = convertToParamMap({ purchase: 25 });
+    checkoutServiceStub.getPurchase.mockResolvedValue({
+      id: 25,
+      status: 'pending_payment',
+      payment_method: 'transfer',
+      expires_at: null,
+      transfer_payer_dni: null,
+      items: [],
+      subtotal: '100.00',
+      total: '100.00',
+    });
+
+    createComponent();
+    await Promise.resolve();
+
+    expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
+  });
+
   it('updates a purchase item while editing and refreshes checkout totals', async () => {
     const updatedPurchase = {
       id: 25,

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

@@ -343,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') {
@@ -381,12 +379,9 @@ 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();
@@ -438,12 +433,15 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     this.transferValidationStatus.set('checking');
 
     try {
-      const purchase = await this.checkoutService.submitPurchaseForReview(
+      const purchase = await this.checkoutService
-        tenant.codigo,
+        .withCustomLoading()
-        purchaseId,
+        .submitPurchaseForReview(tenant.codigo, purchaseId);
-      );
+
+      if (purchase.status === 'paid' || purchase.status === 'pending_payment') {
+        if (purchase.status === 'pending_payment') {
+          this.transferValidationStatus.set('pending');
+        }
 
-      if (purchase.status === 'paid') {
         this.navigateToPurchaseStatus(purchaseId);
         return;
       }
@@ -494,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;
@@ -575,10 +575,12 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
     }
 
     try {
-      const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(tenant.codigo, purchaseId);
 
       if (
-        purchase.status === 'in_review' ||
+        (purchase.status === 'pending_payment' && purchase.expires_at === null) ||
         purchase.status === 'paid' ||
         purchase.status === 'cancelled' ||
         purchase.status === 'rejected' ||

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

@@ -30,7 +30,7 @@
       <label class="visually-hidden" for="login-password">Contraseña</label>
       <app-input
         id="login-password"
-        type="password"
+        type="password-toggle"
         placeholder="Contraseña"
         [value]="form.controls.password.value"
         [invalid]="showControlError('password')"

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

@@ -35,6 +35,31 @@
             </div>
           </section>
 
+          @if (hasEventDates()) {
+            <div class="product-detail__divider"></div>
+
+            <section class="product-detail__section product-detail__section--event-date">
+              <label class="form-label" for="event-date-selector">Fecha</label>
+              <select
+                id="event-date-selector"
+                class="form-select"
+                [value]="selectedVariant()?.id ?? ''"
+                (change)="onEventDateChange($event)"
+              >
+                @for (eventDate of eventDates(); track eventDate.id) {
+                  <option
+                    [value]="eventDate.variant_id"
+                    [disabled]="
+                      prod.inventory_policy !== 'unlimited' && (eventDate.stock_tecnico ?? 0) <= 0
+                    "
+                  >
+                    {{ eventDate.label }}
+                  </option>
+                }
+              </select>
+            </section>
+          }
+
           @if (hasRenderableAttributes()) {
             <div class="product-detail__divider"></div>
 

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

@@ -65,13 +65,17 @@ describe('ProductDetailPageComponent', () => {
     });
     catalogServiceStub = {
       getCatalogItem: vi.fn(),
+      withCustomLoading: vi.fn(),
     };
+    catalogServiceStub.withCustomLoading.mockReturnValue(catalogServiceStub);
     routerStub = {
       navigate: vi.fn(),
     };
     cartServiceStub = {
       addItem: vi.fn().mockReturnValue(of({ message: 'Producto agregado al carrito' })),
+      withCustomLoading: vi.fn(),
     };
+    cartServiceStub.withCustomLoading.mockReturnValue(cartServiceStub);
     toastServiceStub = {
       success: vi.fn(),
       danger: vi.fn(),
@@ -323,6 +327,63 @@ describe('ProductDetailPageComponent', () => {
     expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe('');
   });
 
+  it('renders event dates and resolves the selected date through its variant', async () => {
+    const detailProduct: CatalogItemDetail = {
+      ...mockProduct,
+      purpose: 'entry',
+      has_tickets: true,
+      variants: [
+        { id: 101, event_date_id: 20, stock_tecnico: 10, values: {} },
+        { id: 102, event_date_id: 21, stock_tecnico: 10, values: {} },
+      ],
+      event_dates: [
+        {
+          id: 20,
+          variant_id: 101,
+          date: '2026-10-09',
+          starts_at: '2026-10-09T10:00:00.000000Z',
+          ends_at: '2026-10-09T20:00:00.000000Z',
+          label: 'Viernes 9 de octubre - 10:00 a 20:00',
+          stock_tecnico: 10,
+        },
+        {
+          id: 21,
+          variant_id: 102,
+          date: '2026-10-10',
+          starts_at: '2026-10-10T10:00:00.000000Z',
+          ends_at: '2026-10-10T20:00:00.000000Z',
+          label: 'Sábado 10 de octubre - 10:00 a 20:00',
+          stock_tecnico: 10,
+        },
+      ],
+      selected_variant: {
+        id: 101,
+        event_date_id: 20,
+        stock_tecnico: 10,
+        images: [],
+        values: {},
+      },
+    };
+    resolveProduct(detailProduct);
+    catalogServiceStub.getCatalogItem.mockReturnValue(
+      of({ ...detailProduct, selected_variant: { ...detailProduct.selected_variant!, id: 102 } }),
+    );
+
+    await configureTestingModule();
+    const fixture = TestBed.createComponent(ProductDetailPageComponent);
+    fixture.detectChanges();
+
+    const select = fixture.nativeElement.querySelector('#event-date-selector') as HTMLSelectElement;
+    expect(select.options).toHaveLength(2);
+    expect(select.value).toBe('101');
+
+    select.value = '102';
+    select.dispatchEvent(new Event('change'));
+    fixture.detectChanges();
+
+    expect(catalogServiceStub.getCatalogItem).toHaveBeenCalledWith(1, 102);
+  });
+
   it('hides the attributes block and its extra divider when no attributes are present', async () => {
     await configureTestingModule();
     const fixture = TestBed.createComponent(ProductDetailPageComponent);

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

@@ -100,6 +100,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
 
     const variant = this.selectedVariant();
     if (variant) return this.isVariantAvailable(variant, prod);
+    if (prod.purpose === 'entry') return false;
     if (prod.variants.length > 0) return false;
 
     return prod.inventory_policy === 'unlimited' || (prod.stock_tecnico ?? 0) > 0;
@@ -108,8 +109,14 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
   protected readonly descriptionMaxHeight = signal(0);
   protected readonly descriptionHasOverflow = signal(false);
   protected readonly renderableAttributes = computed(() =>
-    (this.product()?.attributes ?? []).filter((attribute) => attribute.options.length > 0),
+    (this.product()?.attributes ?? []).filter(
+      (attribute) =>
+        attribute.options.length > 0 &&
+        !(this.product()?.purpose === 'entry' && attribute.codigo === 'fecha'),
+    ),
   );
+  protected readonly eventDates = computed(() => this.product()?.event_dates ?? []);
+  protected readonly hasEventDates = computed(() => this.eventDates().length > 0);
   protected readonly hasRenderableAttributes = computed(
     () => this.renderableAttributes().length > 0,
   );
@@ -155,27 +162,30 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     this.variantLoading.set(true);
 
     this.productSub?.unsubscribe();
-    this.productSub = this.catalogService.getCatalogItem(productId, variantId).subscribe({
+    this.productSub = this.catalogService
-      next: (prod) => {
+      .withCustomLoading()
-        this.applyProduct(prod, false);
+      .getCatalogItem(productId, variantId)
-        this.variantLoading.set(false);
+      .subscribe({
-      },
+        next: (prod) => {
-      error: (err: HttpErrorResponse) => {
+          this.applyProduct(prod, false);
-        const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
+          this.variantLoading.set(false);
-        this.toastService.danger(errorMessage);
+        },
-        this.variantLoading.set(false);
+        error: (err: HttpErrorResponse) => {
+          const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
+          this.toastService.danger(errorMessage);
+          this.variantLoading.set(false);
 
-        this.product.update((currentProduct) => {
+          this.product.update((currentProduct) => {
-          if (!currentProduct) return null;
+            if (!currentProduct) return null;
-          return {
+            return {
-            ...currentProduct,
+              ...currentProduct,
-            variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
+              variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
-          };
+            };
-        });
+          });
 
-        this.attributeSelector()?.reset();
+          this.attributeSelector()?.reset();
-      },
+        },
-    });
+      });
   }
 
   private applyResolvedData(resolvedData: ProductDetailResolvedData): void {
@@ -237,6 +247,12 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     }
   }
 
+  protected onEventDateChange(event: Event): void {
+    const variantId = Number((event.target as HTMLSelectElement).value);
+    const variant = this.product()?.variants.find((item) => item.id === variantId) ?? null;
+    this.onVariantChange(variant);
+  }
+
   protected addToCart(): void {
     const currentProduct = this.product();
     const variant = this.selectedVariant();
@@ -246,18 +262,21 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
     }
 
     this.addingToCart.set(true);
-    this.cartService.addItem(currentProduct.id, variant?.id ?? null, this.quantity()).subscribe({
+    this.cartService
-      next: (res) => {
+      .withCustomLoading()
-        const msg = res.message || 'Producto agregado al carrito';
+      .addItem(currentProduct.id, variant?.id ?? null, this.quantity())
-        this.toastService.success(msg);
+      .subscribe({
-        this.addingToCart.set(false);
+        next: (res) => {
-      },
+          const msg = res.message || 'Producto agregado al carrito';
-      error: (err: HttpErrorResponse) => {
+          this.toastService.success(msg);
-        const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
+          this.addingToCart.set(false);
-        this.toastService.danger(errorMessage);
+        },
-        this.addingToCart.set(false);
+        error: (err: HttpErrorResponse) => {
-      },
+          const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
-    });
+          this.toastService.danger(errorMessage);
+          this.addingToCart.set(false);
+        },
+      });
   }
 
   protected async buyNow(): Promise<void> {

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

@@ -66,6 +66,9 @@ describe('PurchaseStatusPageComponent', () => {
   async function render(hasGeneratedTickets: boolean) {
     const checkoutService = {
       getPurchase: vi.fn().mockResolvedValue(purchase(hasGeneratedTickets)),
+      withCustomLoading() {
+        return this;
+      },
     };
     const router = {
       navigate: vi.fn().mockResolvedValue(true),

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

@@ -63,7 +63,9 @@ export class PurchaseStatusPageComponent implements OnInit {
     }
 
     try {
-      const purchase = await this.checkoutService.getPurchase(this.tenantCode, this.purchaseId);
+      const purchase = await this.checkoutService
+        .withCustomLoading()
+        .getPurchase(this.tenantCode, this.purchaseId);
       this.status.set(this.resolveStatus(purchase));
       this.hasGeneratedTickets.set(purchase.has_generated_tickets === true);
     } catch (error) {

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

@@ -1,8 +1,8 @@
 <section class="search-results" aria-labelledby="search-results-title">
-  <header class="search-results__header mb-4">
+  <header class="search-results__header mb-5">
-    <h1 id="search-results-title" class="h3 mb-2">Resultados de búsqueda</h1>
+    <h1 id="search-results-title" class="search-results__title mb-0">Resultados de búsqueda</h1>
     @if (query()) {
-      <p class="text-body-secondary mb-0">
+      <p class="search-results__subtitle text-body-secondary mb-0">
         Resultados para <strong>“{{ query() }}”</strong>
       </p>
     }
@@ -10,8 +10,6 @@
 
   @if (error()) {
     <p class="alert text-center mb-0 search-results__alert-error">{{ error() }}</p>
-  } @else if (loading()) {
-    <p class="alert alert-light border text-center mb-0">Buscando productos...</p>
   } @else if (results(); as searchResults) {
     @if (!searchResults.data.length) {
       <p class="alert alert-light border text-center mb-0">

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

@@ -1,3 +1,24 @@
+.search-results__header {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  padding: 16px 28px;
+  text-align: center;
+}
+
+.search-results__title {
+  color: var(--bs-primary);
+  font-size: 24px;
+  font-weight: bold;
+  line-height: 1.2;
+}
+
+.search-results__subtitle {
+  line-height: 1.2;
+}
+
 .search-results__alert-error {
   color: var(--tenant-danger-color, var(--bs-danger));
 }

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

@@ -65,7 +65,9 @@ describe('SearchPageComponent', () => {
         },
         {
           provide: CatalogService,
-          useValue: { searchCatalog },
+          useValue: {
+            searchCatalog,
+          },
         },
         {
           provide: TenantService,
@@ -106,6 +108,22 @@ describe('SearchPageComponent', () => {
     );
   });
 
+  it('renders the search title and query subtitle with the category header layout', () => {
+    const fixture = TestBed.createComponent(SearchPageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const header = element.querySelector('.search-results__header');
+    const title = element.querySelector('#search-results-title');
+    const subtitle = element.querySelector('.search-results__subtitle');
+
+    expect(header?.classList).toContain('mb-5');
+    expect(title?.classList).toContain('search-results__title');
+    expect(title?.classList).toContain('mb-0');
+    expect(subtitle?.textContent).toContain('Resultados para');
+    expect(subtitle?.textContent).toContain('running');
+  });
+
   it('does not search when the query has fewer than three characters', () => {
     TestBed.overrideProvider(ActivatedRoute, {
       useValue: {

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

@@ -56,7 +56,6 @@ export class SearchPageComponent {
 
   protected readonly query = signal('');
   protected readonly results = signal<ApiPaginatedResponse<CatalogFeaturedItem[]> | null>(null);
-  protected readonly loading = signal(false);
   protected readonly error = signal<string | null>(null);
   protected readonly creatingDirectPurchase = signal(false);
 
@@ -105,7 +104,6 @@ export class SearchPageComponent {
               ? null
               : `Ingresá al menos ${this.minSearchLength} caracteres para buscar.`,
           );
-          this.loading.set(query.length >= this.minSearchLength);
         }),
         switchMap(({ query, page }) => {
           if (query.length < this.minSearchLength) {
@@ -124,7 +122,6 @@ export class SearchPageComponent {
       )
       .subscribe((results) => {
         this.results.set(results);
-        this.loading.set(false);
       });
   }
 

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

@@ -1,19 +1,16 @@
-@if (tenant()?.main_carousel_images; as mainCarouselImages) {
+@if (mainCarouselImages(); as images) {
-  @if (mainCarouselImages.length) {
+  @if (images.length) {
     <app-main-carousel
       class="store-home__main-carousel"
-      [images]="mainCarouselImages"
+      [images]="images"
       ariaLabel="Imágenes destacadas de la tienda"
       (firstImageReady)="mainCarouselReady.set(true)"
     />
   }
 }
 
-@if (tenant()?.hero_config || tenant()?.event_config) {
+@if (heroConfig() || eventConfig()) {
-  <app-hero-banner
+  <app-hero-banner [heroConfig]="heroConfig()" [eventConfig]="eventConfig()" />
-    [heroConfig]="tenant()?.hero_config"
-    [eventConfig]="tenant()?.event_config"
-  ></app-hero-banner>
 }
 
 @if (error()) {
@@ -40,3 +37,9 @@
     </app-store-section>
   }
 }
+
+@if (additionalInfo(); as content) {
+  <app-store-section class="store-home__additional-info" title="Información adicional">
+    <div class="store-home__additional-info-content" [innerHTML]="content"></div>
+  </app-store-section>
+}

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

@@ -11,6 +11,25 @@ app-store-section + app-store-section {
   margin-top: clamp(3rem, 6vw, 5rem);
 }
 
+:host > .store-home__additional-info:not(:first-child) {
+  margin-top: clamp(3rem, 6vw, 5rem);
+}
+
+.store-home__additional-info-content {
+  width: 100%;
+  text-align: center;
+}
+
+::ng-deep .store-home__additional-info-content img {
+  display: block;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+::ng-deep .store-home__additional-info-content > :last-child {
+  margin-bottom: 0;
+}
+
 .store-home__alert-error {
   margin: 0;
   border-color: rgba(var(--tenant-danger-rgb, 220, 53, 69), 0.18);

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

@@ -16,6 +16,7 @@ import { Tenant } from '../../../../core/services/tenant.interface';
 import { TenantService } from '../../../../core/services/tenant.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import { ProductListComponent } from '../../../../shared/components/product-list/product-list.component';
+import { HeroBannerComponent } from '../../../../shared/components/hero-banner/hero-banner.component';
 import { StoreHomePageComponent } from './store-home-page.component';
 import {
   STORE_HOME_PRODUCTS_ERROR_MESSAGE,
@@ -88,7 +89,7 @@ const pageOneItems: CatalogFeaturedItem[] = [
   },
 ];
 
-function createTenant(mainCarouselImages?: string[]): Tenant {
+function createTenant(extras: Tenant['extras'] = {}): Tenant {
   return {
     id: 1,
     codigo: 'acme',
@@ -102,8 +103,18 @@ function createTenant(mainCarouselImages?: string[]): Tenant {
     footer_bg_color: '#ffffff',
     header_logo: '/header.png',
     footer_logo: '/footer.png',
+    website_type_code: 'shopit',
+    website_type: {
+      codigo: 'shopit',
+      nombre: 'ShopIt',
+      primary_color: null,
+      secondary_color: null,
+      danger_color: null,
+      success_color: null,
+      site_logo: null,
+    },
+    extras,
     categories: [],
-    main_carousel_images: mainCarouselImages,
   };
 }
 
@@ -146,11 +157,8 @@ describe('StoreHomePageComponent', () => {
     );
   });
 
-  it('renders the tenant main carousel images at the beginning of the home page', async () => {
+  it('renders the carousel URLs received in tenant extras', async () => {
-    const mainCarouselImages = [
+    const carousel = ['https://example.com/carousel-1.webp', 'https://example.com/carousel-2.webp'];
-      'https://example.com/carousel-1.webp',
-      'https://example.com/carousel-2.webp',
-    ];
 
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
@@ -162,7 +170,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant(mainCarouselImages)),
+          useValue: createTenantServiceStub(createTenant({ carousel })),
         },
       ],
     }).compileComponents();
@@ -171,25 +179,61 @@ describe('StoreHomePageComponent', () => {
     fixture.detectChanges();
 
     const element = fixture.nativeElement as HTMLElement;
-    const carousel = element.querySelector('app-main-carousel');
+    const carouselElement = element.querySelector('app-main-carousel');
-    const images = carousel?.querySelectorAll('.main-carousel__image');
+    const images = carouselElement?.querySelectorAll('.main-carousel__image');
 
-    expect(element.firstElementChild).toBe(carousel);
+    expect(element.firstElementChild).toBe(carouselElement);
     expect(images).toHaveLength(2);
-    expect(images?.[0].getAttribute('src')).toBe(mainCarouselImages[0]);
+    expect(images?.[0].getAttribute('src')).toBe(carousel[0]);
-    expect(images?.[1].getAttribute('src')).toBeNull();
-    expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(0);
-
-    images?.[0].dispatchEvent(new Event('load'));
-    fixture.detectChanges();
-
-    expect(images?.[1].getAttribute('src')).toBe(mainCarouselImages[1]);
-    expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(1);
-
-    fixture.destroy();
   });
 
-  it('does not render the main carousel when the tenant has no images', async () => {
+  it('renders the hero extra and the active tenant event', async () => {
+    const tenant = createTenant({
+      heroConfig: {
+        title_html: '<h1>Fiesta Fútbol Infantil</h1>',
+        description_html: '<p>Viví una jornada inolvidable de fútbol infantil.</p>',
+        background_image_id: 'https://example.com/hero.jpg',
+      },
+    });
+    tenant.active_event_id = 10;
+    tenant.active_event = {
+      id: 10,
+      name: 'Fiesta Fútbol Infantil',
+      address: 'Rosario, Santa Fe',
+      dates: [
+        {
+          id: 20,
+          date: '2026-12-05',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+        {
+          id: 21,
+          date: '2026-12-06',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+      ],
+    };
+    tenant.website_type_code = 'onticket';
+    tenant.social_media = [
+      {
+        code: 'whatsapp',
+        icon: 'fa-brands fa-whatsapp',
+        name: 'WhatsApp',
+        url: 'https://wa.me/5493410000000',
+      },
+    ];
+    tenant.website_type = {
+      codigo: 'onticket',
+      nombre: 'OnTicket',
+      primary_color: null,
+      secondary_color: null,
+      danger_color: null,
+      success_color: null,
+      site_logo: null,
+    };
+
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
       providers: [
@@ -200,7 +244,7 @@ describe('StoreHomePageComponent', () => {
         },
         {
           provide: TenantService,
-          useValue: createTenantServiceStub(createTenant([])),
+          useValue: createTenantServiceStub(tenant),
         },
       ],
     }).compileComponents();
@@ -208,7 +252,129 @@ describe('StoreHomePageComponent', () => {
     const fixture = TestBed.createComponent(StoreHomePageComponent);
     fixture.detectChanges();
 
-    expect((fixture.nativeElement as HTMLElement).querySelector('app-main-carousel')).toBeNull();
+    const hero = (fixture.nativeElement as HTMLElement).querySelector(
+      'app-hero-banner .hero-banner',
+    ) as HTMLElement;
+
+    expect(hero).not.toBeNull();
+    expect(hero.style.backgroundImage).toContain('https://example.com/hero.jpg');
+    expect(hero.textContent).toContain('Fiesta Fútbol Infantil');
+    expect(hero.textContent).toContain('Viví una jornada inolvidable de fútbol infantil.');
+    expect(hero.textContent).toContain('Rosario, Santa Fe');
+    expect(hero.textContent).toContain('2026-12-05, 2026-12-06');
+    const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
+      .componentInstance as HeroBannerComponent;
+    expect(heroComponent.eventConfig?.contact).toEqual(tenant.social_media);
+  });
+
+  it('renders additional information as an HTML section', async () => {
+    const description =
+      '<p>Consultá los <strong>términos del evento</strong>.</p><ul><li>Ingreso con DNI</li></ul>';
+
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(
+            createTenant({ additionalInfoConfig: { description } }),
+          ),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const section = element.querySelector('.store-home__additional-info');
+    const sections = element.querySelectorAll(':scope > app-store-section');
+
+    expect(sections[sections.length - 1]).toBe(section);
+    expect(section?.querySelector('.store-section__title')?.textContent?.trim()).toBe(
+      'Información adicional',
+    );
+    expect(section?.querySelector('strong')?.textContent).toBe('términos del evento');
+    expect(section?.querySelector('li')?.textContent).toBe('Ingreso con DNI');
+  });
+
+  it('does not render the additional information section without content', async () => {
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(
+            createTenant({ additionalInfoConfig: { description: '   ' } }),
+          ),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    expect(
+      (fixture.nativeElement as HTMLElement).querySelector('.store-home__additional-info'),
+    ).toBeNull();
+  });
+
+  it('renders only the active event data when the tenant does not have the hero extra', async () => {
+    const tenant = createTenant();
+    tenant.active_event_id = 12;
+    tenant.active_event = {
+      id: 12,
+      name: 'Fiesta Fútbol Infantil',
+      address: 'Sunchales, Santa Fe',
+      dates: [
+        {
+          id: 25,
+          date: '2026-10-09',
+          time_start: '09:00:00',
+          time_end: '18:00:00',
+        },
+      ],
+    };
+    await TestBed.configureTestingModule({
+      imports: [StoreHomePageComponent],
+      providers: [
+        provideActivatedRoute({ response: createCatalog(), error: null }),
+        {
+          provide: CatalogService,
+          useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
+        },
+        {
+          provide: TenantService,
+          useValue: createTenantServiceStub(tenant),
+        },
+      ],
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(StoreHomePageComponent);
+    fixture.detectChanges();
+
+    const element = fixture.nativeElement as HTMLElement;
+    const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
+      .componentInstance as HeroBannerComponent;
+
+    expect(heroComponent.heroConfig).toBeNull();
+    expect(element.querySelector('.hero-banner')).toBeNull();
+    expect(element.querySelector('.hero-banner-container')).toBeNull();
+    expect(element.querySelector('.hero-content')).toBeNull();
+    expect(element.querySelector('.event-card')).not.toBeNull();
+    expect(element.textContent).toContain('Fiesta Fútbol Infantil');
+    expect(element.textContent).toContain('Sunchales, Santa Fe');
+    expect(element.textContent).toContain('2026-10-09');
   });
 
   it('requests another page for the selected featured group', async () => {
@@ -216,7 +382,9 @@ describe('StoreHomePageComponent', () => {
     const catalogServiceStub = {
       getCatalog: vi.fn(),
       getFeaturedGroupItems: vi.fn().mockReturnValue(of(createItemsPage(pageTwoItems, 2, 2))),
+      withCustomLoading: vi.fn(),
     };
+    catalogServiceStub.withCustomLoading.mockReturnValue(catalogServiceStub);
 
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
@@ -232,6 +400,7 @@ describe('StoreHomePageComponent', () => {
     (element.querySelector('[data-testid="paginator-next"]') as HTMLButtonElement).click();
     fixture.detectChanges();
 
+    expect(catalogServiceStub.withCustomLoading).toHaveBeenCalledOnce();
     expect(catalogServiceStub.getFeaturedGroupItems).toHaveBeenCalledWith(7, { page: 2 });
     expect(element.textContent).toContain('Mouse Gamer');
     expect(element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()).toBe(
@@ -244,7 +413,9 @@ describe('StoreHomePageComponent', () => {
     const catalogServiceStub = {
       getCatalog: vi.fn(),
       getFeaturedGroupItems: vi.fn().mockReturnValue(nextPage.asObservable()),
+      withCustomLoading: vi.fn(),
     };
+    catalogServiceStub.withCustomLoading.mockReturnValue(catalogServiceStub);
 
     await TestBed.configureTestingModule({
       imports: [StoreHomePageComponent],
@@ -318,9 +489,9 @@ describe('StoreHomePageComponent', () => {
   it('adds a product-list cart event to the cart', async () => {
     const catalogServiceStub = { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() };
     const cartServiceStub = {
-      addItem: vi.fn().mockReturnValue(
+      addItem: vi
-        of({ data: {}, message: 'Producto agregado correctamente' }),
+        .fn()
-      ),
+        .mockReturnValue(of({ data: {}, message: 'Producto agregado correctamente' })),
     };
     const toastServiceStub = { success: vi.fn(), danger: vi.fn() };
 

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

@@ -60,9 +60,34 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
   protected readonly error = signal<string | null>(null);
   protected readonly mainCarouselReady = signal(false);
   protected readonly creatingDirectPurchase = signal(false);
-  protected readonly hasMainCarouselImages = computed(
+  protected readonly mainCarouselImages = computed(() => this.tenant()?.extras?.carousel ?? []);
-    () => (this.tenant()?.main_carousel_images?.length ?? 0) > 0,
+  protected readonly heroConfig = computed(() => this.tenant()?.extras?.heroConfig ?? null);
+  protected readonly additionalInfo = computed(
+    () => this.tenant()?.extras?.additionalInfoConfig?.description?.trim() || null,
   );
+  protected readonly eventConfig = computed(() => {
+    const tenant = this.tenant();
+    const contact = tenant?.social_media ?? [];
+    const activeEvent = tenant?.active_event;
+
+    if (activeEvent) {
+      return {
+        id: activeEvent.id,
+        title: activeEvent.name,
+        location: activeEvent.address,
+        dates: activeEvent.dates.map((eventDate) => ({
+          id: eventDate.id,
+          date: eventDate.date,
+          start_time: eventDate.time_start,
+          end_time: eventDate.time_end,
+        })),
+        contact,
+      };
+    }
+
+    return null;
+  });
+  protected readonly hasMainCarouselImages = computed(() => this.mainCarouselImages().length > 0);
 
   private catalogRequestSubscription: Subscription | null = null;
   private readonly groupRequestSubscriptions = new Map<number, Subscription>();
@@ -105,21 +130,24 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
     this.setGroupLoading(groupId, true);
     this.groupRequestSubscriptions.get(groupId)?.unsubscribe();
 
-    const subscription = this.catalogService.getFeaturedGroupItems(groupId, { page }).subscribe({
+    const subscription = this.catalogService
-      next: (items) => {
+      .withCustomLoading()
-        this.catalog.update((groups) =>
+      .getFeaturedGroupItems(groupId, { page })
-          groups.map((candidate) =>
+      .subscribe({
-            candidate.id === groupId ? { ...candidate, items } : candidate,
+        next: (items) => {
-          ),
+          this.catalog.update((groups) =>
-        );
+            groups.map((candidate) =>
-        this.error.set(null);
+              candidate.id === groupId ? { ...candidate, items } : candidate,
-      },
+            ),
-      error: () => {
+          );
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+          this.error.set(null);
-        this.setGroupLoading(groupId, false);
+        },
-      },
+        error: () => {
-      complete: () => this.setGroupLoading(groupId, false),
+          this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
-    });
+          this.setGroupLoading(groupId, false);
+        },
+        complete: () => this.setGroupLoading(groupId, false),
+      });
 
     this.groupRequestSubscriptions.set(groupId, subscription);
   }
@@ -182,15 +210,18 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
     this.error.set(null);
     this.catalogRequestSubscription?.unsubscribe();
 
-    this.catalogRequestSubscription = this.catalogService.getCatalog().subscribe({
+    this.catalogRequestSubscription = this.catalogService
-      next: (catalog) => this.catalog.set(catalog),
+      .withCustomLoading()
-      error: () => {
+      .getCatalog()
-        this.catalog.set([]);
+      .subscribe({
-        this.loading.set(false);
+        next: (catalog) => this.catalog.set(catalog),
-        this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+        error: () => {
-      },
+          this.catalog.set([]);
-      complete: () => this.loading.set(false),
+          this.loading.set(false);
-    });
+          this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
+        },
+        complete: () => this.loading.set(false),
+      });
   }
 
   private applyResolvedData(resolvedData: StoreHomeCatalogResolvedData): void {

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

@@ -0,0 +1,11 @@
+@if (isLoading()) {
+  <div
+    class="global-loading"
+    role="status"
+    aria-live="polite"
+    aria-label="Cargando"
+  >
+    <span class="global-loading__spinner" aria-hidden="true"></span>
+    <span class="visually-hidden">Cargando...</span>
+  </div>
+}

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

@@ -0,0 +1,31 @@
+.global-loading {
+  position: fixed;
+  inset: 0;
+  z-index: 3000;
+  display: grid;
+  place-items: center;
+  background: rgba(255, 255, 255, 0.64);
+  backdrop-filter: blur(2px);
+  cursor: wait;
+}
+
+.global-loading__spinner {
+  width: 3rem;
+  height: 3rem;
+  border: 0.25rem solid rgba(32, 32, 32, 0.12);
+  border-top-color: var(--tenant-primary, #6376f3);
+  border-radius: 50%;
+  animation: global-loading-spin 0.75s linear infinite;
+}
+
+@keyframes global-loading-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .global-loading__spinner {
+    animation-duration: 1.5s;
+  }
+}

src/app/shared/components/global-loading/global-loading.component.spec.ts

@@ -0,0 +1,54 @@
+import '@angular/compiler';
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { GlobalLoadingService } from '../../../core/services/global-loading/global-loading.service';
+import { GlobalLoadingComponent } from './global-loading.component';
+
+describe('GlobalLoadingComponent', () => {
+  afterEach(() => {
+    TestBed.resetTestingModule();
+  });
+
+  it('renders an accessible overlay while the app is loading', async () => {
+    const loadingState = signal(true);
+
+    await TestBed.configureTestingModule({
+      imports: [GlobalLoadingComponent],
+      providers: [
+        {
+          provide: GlobalLoadingService,
+          useValue: { isLoading: loadingState.asReadonly() }
+        }
+      ]
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(GlobalLoadingComponent);
+    fixture.detectChanges();
+
+    const overlay = fixture.nativeElement.querySelector('.global-loading');
+    expect(overlay).not.toBeNull();
+    expect(overlay.getAttribute('role')).toBe('status');
+    expect(overlay.getAttribute('aria-label')).toBe('Cargando');
+  });
+
+  it('does not render the overlay while the app is idle', async () => {
+    const loadingState = signal(false);
+
+    await TestBed.configureTestingModule({
+      imports: [GlobalLoadingComponent],
+      providers: [
+        {
+          provide: GlobalLoadingService,
+          useValue: { isLoading: loadingState.asReadonly() }
+        }
+      ]
+    }).compileComponents();
+
+    const fixture = TestBed.createComponent(GlobalLoadingComponent);
+    fixture.detectChanges();
+
+    expect(fixture.nativeElement.querySelector('.global-loading')).toBeNull();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+
+import { GlobalLoadingService } from '../../../core/services/global-loading/global-loading.service';
+
+@Component({
+  selector: 'app-global-loading',
+  templateUrl: './global-loading.component.html',
+  styleUrl: './global-loading.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class GlobalLoadingComponent {
+  private readonly loadingService = inject(GlobalLoadingService);
+
+  protected readonly isLoading = this.loadingService.isLoading;
+}

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

@@ -1,11 +1,18 @@
-<div class="hero-banner-container">
+<div [class.hero-banner-container]="heroConfig">
   <div
-    class="hero-banner position-relative rounded" 
+    [class.hero-banner]="heroConfig"
-    [ngStyle]="{'background-image': heroConfig?.background_image ? 'url(' + heroConfig.background_image + ')' : 'none'}"
+    [class.position-relative]="heroConfig"
+    [class.rounded]="heroConfig"
+    [ngStyle]="{
+      'background-image': heroConfig?.background_image_id
+        ? 'url(' + heroConfig.background_image_id + ')'
+        : 'none',
+    }"
   >
-    
     @if (heroConfig) {
-      <div class="hero-content d-flex justify-content-end p-4 p-md-5 w-100 h-100 align-items-center">
+      <div
+        class="hero-content d-flex justify-content-end p-4 p-md-5 w-100 h-100 align-items-center"
+      >
         <div class="hero-text-box">
           @if (heroConfig.title_html) {
             <div class="hero-title" [innerHTML]="heroConfig.title_html"></div>
@@ -14,7 +21,10 @@
             <div class="hero-description" [innerHTML]="heroConfig.description_html"></div>
           }
           @if (heroConfig.button_text) {
-            <a [href]="heroConfig.button_href || '#'" class="text-decoration-none mt-3 d-inline-block">
+            <a
+              [href]="heroConfig.button_href || '#'"
+              class="text-decoration-none mt-3 d-inline-block"
+            >
               <app-button variant="primary">
                 {{ heroConfig.button_text }}
               </app-button>
@@ -25,13 +35,18 @@
     }
 
     @if (eventConfig) {
-      <div class="event-card-container position-absolute w-100 d-flex justify-content-center">
+      <div
+        class="event-card-container w-100 d-flex justify-content-center"
+        [class.position-absolute]="heroConfig"
+      >
         <div class="event-card bg-white shadow rounded p-3 p-md-4 text-center">
           @if (eventConfig.title) {
             <h3 class="event-title text-primary fw-bold mb-3">{{ eventConfig.title }}</h3>
           }
 
-          <div class="event-details d-flex flex-column flex-md-row justify-content-center align-items-center gap-3 gap-md-5 text-muted">
+          <div
+            class="event-details d-flex flex-column flex-md-row justify-content-center align-items-center gap-3 gap-md-5 text-muted"
+          >
             @if (eventConfig.dates && eventConfig.dates.length > 0) {
               <div class="d-flex align-items-center gap-2">
                 <i class="fa-regular fa-calendar event-icon"></i>

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

@@ -1,7 +1,7 @@
 import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { HeroConfig, EventConfig } from '../../../core/services/tenant.interface';
+import { EventConfig, HeroConfig } from '../../../core/services/tenant.interface';
 import { ButtonComponent } from '../button/button.component';
 
 @Component({
@@ -17,25 +17,14 @@ export class HeroBannerComponent {
   @Input() eventConfig?: EventConfig | null;
 
   get formattedDates(): string {
+    if (this.eventConfig?.dates_text) {
+      return this.eventConfig.dates_text;
+    }
+
     if (!this.eventConfig?.dates || this.eventConfig.dates.length === 0) {
       return '';
     }
 
-    // Si ya viene formateado o es un string libre largo, lo devolvemos
+    return this.eventConfig.dates.map(({ date }) => date).join(', ');
-    if (this.eventConfig.dates.length === 1 && this.eventConfig.dates[0].length > 10) {
-      return this.eventConfig.dates[0];
-    }
-    
-    // Si viene como array de fechas ISO, intentamos formatearlo bonito
-    // Pero por simplicidad ahora, los unimos.
-    // Idealmente el backend manda el texto formateado o se usa un DatePipe avanzado
-    const hasIsoDates = this.eventConfig.dates.some(d => d.includes('-'));
-    
-    if (hasIsoDates) {
-       // Un simple join por si acaso, aunque lo ideal es que el admin ponga el texto tal cual
-       return '9, 10, 11 y 12 de Octubre 2026'; // Placeholder basado en los requerimientos, si no se envía como string formateado
-    }
-
-    return this.eventConfig.dates.join(', ');
   }
 }

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

@@ -51,7 +51,7 @@
       (click)="togglePasswordVisibility()"
     >
       <i
-        class="fa-solid"
+        class="fa-regular"
         [ngClass]="isPasswordVisible() ? 'fa-eye' : 'fa-eye-slash'"
         aria-hidden="true"
       ></i>

src/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="e">
 <head>
   <meta charset="utf-8">
   <title>ShopitFront</title>