87 Commits

Author SHA1 Message Date
9ba2041f7b feat(hero-banner): update image handling to support responsive images and refactor template
feat(cart): enhance editing logic and add tests for editable state
feat(tenant): modify HeroConfig to include responsive image type
2026-08-18 14:18:20 -03:00
92ad7340fe feat(icon-button): add bordered variant style and update product ticket selector to use it 2026-08-18 11:43:49 -03:00
6b2f8de210 feat: enhance product ticket selector and vertical cart card components
- Refactor ProductTicketSelectorComponent to improve variant selection logic and error handling.
- Introduce a new signal for variant attributes and manage variant loading more efficiently.
- Update the UI to reflect saving state in ProductVerticalWithCartCardComponent, preventing actions while saving.
- Adjust button text based on saving state for better user feedback.
2026-08-18 10:45:30 -03:00
69f3569ccf feat(product-ticket-selector): enhance variant selection logic and update test cases for improved accuracy 2026-08-18 09:18:45 -03:00
9937c1b484 feat(cart): refactor CartItem structure to remove nested product object and simplify access to properties 2026-08-18 09:06:17 -03:00
43e497cf97 feat(ticket-selector): refactor variant handling to use single variant property and update related tests 2026-08-18 08:51:52 -03:00
207c979f71 feat(product-ticket-selector): simplify row selection handling and improve test coverage for variant selection 2026-08-18 08:51:33 -03:00
30bfd9eff8 feat(ticket-selector): simplify validation handling and remove unused validation UI elements 2026-08-18 08:43:08 -03:00
3f8b5bf206 feat(product-ticket-selector): enhance variant selection handling and add toast notifications for errors 2026-08-14 15:44:30 -03:00
d92b5a7623 feat(tenant-service): implement bootstrap request timeout and enhance request context resolution 2026-08-14 15:17:22 -03:00
e4670491c7 feat(ticket-selector): implement confirmation modal for row deletion and refactor selection handling 2026-08-14 14:06:43 -03:00
1b94b2ca13 feat(ticket-selector): enhance validation feedback and improve cart synchronization 2026-08-14 13:40:26 -03:00
46dcb84985 test(ticket-selector): cover compact option responses 2026-08-14 10:15:01 -03:00
f7983b109f refactor(ticket-selector): consume compact remote options 2026-08-14 10:14:46 -03:00
8ff9ed216c fix(ticket-selector): reset invalid variant selections 2026-08-14 10:01:56 -03:00
f80d146012 refactor(ticket-selector): stop sending excluded variants 2026-08-14 09:54:44 -03:00
1cb2cf3d54 feat(checkout): use reserved cart for ticket purchases 2026-08-14 09:43:58 -03:00
97250d10b7 feat(ticket-selector): reserve completed selections in cart 2026-08-14 09:43:53 -03:00
15979874ce feat(catalog): fetch options for partial variant selections 2026-08-14 09:43:47 -03:00
0defe75adb feat(variant-selector): implement manual selection when autoSelectFirst is disabled 2026-08-14 09:26:43 -03:00
34afb5142d Merge branch 'tenant/desfile_pura_tendencia' of https://gitea.quo.ar/tbianchini/shopit-front into tenant/desfile_pura_tendencia 2026-08-14 09:05:08 -03:00
8eba15155e feat(stock): add handling for unavailable variants in product selection 2026-08-14 09:05:05 -03:00
85c31579e2 feat(checkout): update checkout process to handle multiple direct items 2026-08-14 09:05:05 -03:00
159ec36cb2 refactor(checkout): simplify direct item handling in checkout process 2026-08-14 09:05:05 -03:00
32b1eb5639 refactor(ticket-selector): restructure actions layout for improved responsiveness 2026-08-14 09:04:56 -03:00
0f9d3e79d4 refactor(variants): standardize variant structure and improve variant handling across components 2026-08-14 09:04:56 -03:00
b97753f825 feat(ticket-selector): implement ticket selector component with layout and functionality 2026-08-14 09:04:36 -03:00
f1b724ed63 feat(stock): add handling for unavailable variants in product selection 2026-08-14 09:01:34 -03:00
571cae0f98 feat(checkout): update checkout process to handle multiple direct items 2026-08-14 09:01:34 -03:00
30b8527c9a refactor(checkout): simplify direct item handling in checkout process 2026-08-14 09:01:34 -03:00
0e5f6dceb0 feat(store-layout): add dynamic background images to header and footer components 2026-08-14 09:01:34 -03:00
cd0a6e9b5e refactor(ticket-selector): restructure actions layout for improved responsiveness 2026-08-14 09:01:34 -03:00
1bbb3d0914 refactor(variants): standardize variant structure and improve variant handling across components 2026-08-14 09:01:34 -03:00
e4157a4005 feat(ticket-selector): implement ticket selector component with layout and functionality 2026-08-14 09:01:34 -03:00
c9f8a1c4a6 feat(tenant): add site_title and favicon properties to Tenant interface; update app to set document title and favicon dynamically 2026-08-14 09:01:17 -03:00
308af52ad5 refactor(ticket.service): remove validity time interfaces from ticket service 2026-08-13 15:13:48 -03:00
ae6728998d Merge branch 'tenant/desfile_pura_tendencia' of https://gitea.quo.ar/tbianchini/shopit-front into tenant/desfile_pura_tendencia 2026-08-12 16:14:26 -03:00
f1b829264f feat(stock): add handling for unavailable variants in product selection 2026-08-12 16:13:39 -03:00
fccb7676bf feat(checkout): update checkout process to handle multiple direct items 2026-08-12 16:13:39 -03:00
3adc04b68d refactor(checkout): simplify direct item handling in checkout process 2026-08-12 16:13:39 -03:00
12e2870d40 feat(store-layout): add dynamic background images to header and footer components 2026-08-12 16:13:39 -03:00
0b53253461 refactor(ticket-selector): restructure actions layout for improved responsiveness 2026-08-12 16:13:39 -03:00
6cc0fcd9c0 refactor(variants): standardize variant structure and improve variant handling across components 2026-08-12 16:13:39 -03:00
dc6668df72 feat(ticket-selector): implement ticket selector component with layout and functionality 2026-08-12 16:13:39 -03:00
f428a88ba8 feat(product-attribute-selector): add show_in_selector property to filter attributes in selector 2026-08-12 16:12:47 -03:00
e21c5e9e9f feat(stock): add handling for unavailable variants in product selection 2026-08-12 14:46:27 -03:00
f7a8b42892 feat(checkout): update checkout process to handle multiple direct items 2026-08-12 14:46:15 -03:00
9f8e42c30b refactor(checkout): simplify direct item handling in checkout process 2026-08-12 14:09:11 -03:00
d45199a0ef feat(store-layout): add dynamic background images to header and footer components 2026-08-12 14:08:56 -03:00
c1da31711f refactor(ticket-selector): restructure actions layout for improved responsiveness 2026-08-12 14:08:37 -03:00
cf61611d76 refactor(variants): standardize variant structure and improve variant handling across components 2026-08-12 10:47:09 -03:00
2c4d22f0b9 feat(ticket-selector): implement ticket selector component with layout and functionality 2026-08-12 10:30:21 -03:00
caa1fddcc1 feat(event-schedules): add border radius and clip-path to table rows for improved styling 2026-08-12 09:30:17 -03:00
5f0c99c395 feat(hero-banner): add border radius and clip-path to event schedule rows for improved styling 2026-08-12 09:27:50 -03:00
832fad19bc fix(auth): update cookie key to use 'shopit.front.auth.token' for consistency 2026-08-12 09:19:16 -03:00
28ed5d71b2 feat(header): update category button padding and header background color to use CSS variable 2026-08-12 09:11:49 -03:00
23a5ac32cc feat: update border styles to use CSS variables for consistency across components 2026-08-12 09:00:13 -03:00
1b19d36e26 feat: add file replacements for local environment and update default configuration for serve 2026-08-12 08:41:10 -03:00
86533b9ab4 feat(modal): enhance modal behavior and styling
- 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.
2026-08-11 16:59:01 -03:00
369cfb0a40 feat: update header background color to transparent and modify API URL for QA environment 2026-08-11 16:50:47 -03:00
7b0c9831f1 feat: add validity_time_id to ProductAttributeOption and enhance TicketResponse with validity_times and validity_groups 2026-08-11 13:26:05 -03:00
ede2173a5a feat: update styles for small quantity selector to improve appearance and usability 2026-08-11 10:38:42 -03:00
5d760bfd80 feat: improve modal styling and enhance padding management in modal host component 2026-08-11 10:14:59 -03:00
e3599a48e4 feat: update layout and styles for product components and variant selectors 2026-08-11 10:14:39 -03:00
5d629e27b1 feat: add configurable display options for categories and search bar in store header 2026-08-11 09:55:57 -03:00
563e4634d1 feat: update styles across components for improved layout and responsiveness 2026-08-11 09:55:49 -03:00
c75787a59c feat: enhance hero banner component with event schedule toggle and styling improvements 2026-08-11 08:50:32 -03:00
f6f3a997f7 feat: refactor variant selection to use app-variant-selector for improved maintainability 2026-08-11 08:28:42 -03:00
019c9df23b feat: update modal and cart components for improved user feedback and layout adjustments 2026-08-11 08:24:17 -03:00
9ea85b7924 feat: enhance variant handling in selector and layout components for improved display and selection 2026-08-10 16:34:02 -03:00
0769bb8683 Revert "feat: enhance variant attribute handling across components for improved selection and display"
This reverts commit 56f602d876.
2026-08-10 16:17:09 -03:00
c645feba80 feat: simplify event date labels in product components for clearer display 2026-08-10 14:17:09 -03:00
56f602d876 feat: enhance variant attribute handling across components for improved selection and display 2026-08-10 12:25:58 -03:00
d6bab24e1d feat: implement variant selection in cart and product components for enhanced user experience 2026-08-10 12:08:41 -03:00
dd828d9a4e feat: add event_date_text to Tenant interface and update StoreHomePageComponent to display formatted event dates 2026-08-10 10:42:15 -03:00
7c2a098696 feat: enhance product variant handling and improve layout for better user interaction 2026-08-10 09:58:51 -03:00
1977df6765 feat: enhance product attributes and event date handling for improved user experience and data management 2026-08-07 14:16:02 -03:00
c6ac974459 feat: adjust footer and cart dropdown styles for improved layout and responsiveness 2026-08-06 12:13:51 -03:00
8d88e1bb13 Merge branch 'feature/responsive' into develop 2026-08-06 09:23:37 -03:00
78970573a8 feat: add type property to Product and CatalogItemDetail interfaces; include event_id in PurchaseSummaryResponse and PurchaseDetailResponse 2026-08-05 08:49:52 -03:00
f289e9e2e4 feat: add expires_at to PurchaseDetailResponse and update checkout logic for pending payments 2026-08-03 17:04:07 -03:00
2487546a75 feat: add additionalInfoConfig to tenant interface and implement rendering in store home page 2026-08-03 15:08:33 -03:00
cc884e3cc0 feat: add description_html to tenant heroConfig and update tests for hero banner rendering 2026-08-03 15:08:13 -03:00
ffb586c348 feat: enhance product and tenant interfaces to support event dates, update product detail page to display event date selection 2026-08-03 14:24:42 -03:00
ec18aaf0c5 feat: update WebsiteType and EventConfig interfaces with new properties, enhance tenant creation in tests 2026-08-03 09:09:58 -03:00
941cb5c73c feat: add dates_text to EventConfig and update formattedDates method in HeroBannerComponent 2026-07-30 16:32:37 -03:00
934bd07105 feat: enhance tenant interface with website type and extras, update store home page to utilize new data structure 2026-07-29 15:46:02 -03:00
106 changed files with 4583 additions and 987 deletions

2
.vscode/launch.json vendored
View File

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

View File

@@ -34,7 +34,12 @@
"server": "src/main.server.ts", "server": "src/main.server.ts",
"outputMode": "server", "outputMode": "server",
"security": { "security": {
"allowedHosts": ["localhost", "127.0.0.1"] "allowedHosts": [
"localhost",
"localhost:4300",
"127.0.0.1",
"127.0.0.1:4300"
]
}, },
"ssr": { "ssr": {
"entry": "src/server.ts" "entry": "src/server.ts"
@@ -64,7 +69,13 @@
"local": { "local": {
"optimization": false, "optimization": false,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true "sourceMap": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.local.ts"
}
]
}, },
"homo": { "homo": {
"fileReplacements": [ "fileReplacements": [
@@ -79,6 +90,9 @@
}, },
"serve": { "serve": {
"builder": "@angular/build:dev-server", "builder": "@angular/build:dev-server",
"options": {
"port": 4300
},
"configurations": { "configurations": {
"production": { "production": {
"buildTarget": "shopit-front:build:production" "buildTarget": "shopit-front:build:production"
@@ -93,7 +107,7 @@
"buildTarget": "shopit-front:build:homo" "buildTarget": "shopit-front:build:homo"
} }
}, },
"defaultConfiguration": "development" "defaultConfiguration": "local"
}, },
"test": { "test": {
"builder": "@angular/build:unit-test" "builder": "@angular/build:unit-test"

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 KiB

View File

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

View File

@@ -13,10 +13,12 @@ import { authInterceptor } from './core/services/auth/auth.interceptor';
import { globalLoadingInterceptor } from './core/services/global-loading/global-loading.interceptor'; import { globalLoadingInterceptor } from './core/services/global-loading/global-loading.interceptor';
import { tenantBootstrap } from './core/services/tenant-bootstrap'; import { tenantBootstrap } from './core/services/tenant-bootstrap';
function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean { export function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
return ( return (
request.method === 'GET' && request.method === 'GET' &&
/\/api\/tenants\/[^/]+\/productos(?:\/\d+)?(?:\?|$)/.test(request.urlWithParams) /\/api\/tenants\/[^/?#]+\/(?:catalog(?:\/featured-groups\/\d+\/items)?|catalog-items(?:\/\d+)?)\/?(?:[?#]|$)/.test(
request.urlWithParams,
)
); );
} }

View File

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

View File

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

View File

@@ -17,6 +17,8 @@ const tenant: Tenant = {
codigo: 'test', codigo: 'test',
nombre: 'Test Tenant', nombre: 'Test Tenant',
dominio: 'localhost', dominio: 'localhost',
site_title: 'Test Store',
favicon: 'https://example.com/favicon.png',
primary_color: '#6376F3', primary_color: '#6376F3',
secondary_color: '#A0A0A0', secondary_color: '#A0A0A0',
danger_color: '#FF8888', danger_color: '#FF8888',
@@ -90,6 +92,9 @@ describe('App', () => {
expect(fixture.nativeElement.style.getPropertyValue('--tenant-danger-rgb')).toBe( expect(fixture.nativeElement.style.getPropertyValue('--tenant-danger-rgb')).toBe(
'255, 136, 136' '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 () => { it('renders the tenant not found screen when the tenant is missing', async () => {
@@ -108,5 +113,8 @@ describe('App', () => {
fixture.detectChanges(); fixture.detectChanges();
expect(fixture.nativeElement.textContent).toContain('No encontramos una tienda para este dominio'); 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');
}); });
}); });

View File

@@ -1,4 +1,6 @@
import { Component, computed, inject } from '@angular/core'; import { DOCUMENT } from '@angular/common';
import { Component, computed, effect, inject } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { RouterOutlet } from '@angular/router'; import { RouterOutlet } from '@angular/router';
import { TenantService } from './core/services/tenant.service'; import { TenantService } from './core/services/tenant.service';
@@ -57,6 +59,28 @@ function hexToRgb(hex: string): string {
}) })
export class App { export class App {
private readonly tenantService = inject(TenantService); 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; protected readonly status = this.tenantService.status;

View File

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

View File

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

View File

@@ -1,4 +1,7 @@
<footer class="store-layout__footer mt-auto text-light"> <footer
class="store-layout__footer mt-auto text-light"
[style.background-image]="backgroundImageUrl ? 'url(' + backgroundImageUrl + ')' : null"
>
<div class="container-xl px-3 px-md-4 py-4 py-md-5 store-layout__footer-content"> <div class="container-xl px-3 px-md-4 py-4 py-md-5 store-layout__footer-content">
<div class="row g-4 store-layout__footer-grid"> <div class="row g-4 store-layout__footer-grid">
<div class="col-12 store-layout__brand-column"> <div class="col-12 store-layout__brand-column">

View File

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

View File

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

View File

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

View File

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

View File

@@ -29,12 +29,16 @@ export class StoreHeaderComponent {
private readonly router = inject(Router); private readonly router = inject(Router);
readonly logoUrl = input<string | null>(null); readonly logoUrl = input<string | null>(null);
readonly backgroundImageUrl = input<string | null>(null);
readonly cartQuantity = input<number>(0); readonly cartQuantity = input<number>(0);
readonly user = input<AuthUser | null>(null); readonly user = input<AuthUser | null>(null);
readonly isAuthenticated = input<boolean>(false); readonly isAuthenticated = input<boolean>(false);
readonly accountNavigationMenus = input<readonly Menu[]>([]); readonly accountNavigationMenus = input<readonly Menu[]>([]);
readonly ticketsMenu = input<Menu | null>(null); readonly ticketsMenu = input<Menu | null>(null);
readonly categories = input<readonly Category[]>([]); readonly categories = input<readonly Category[]>([]);
readonly displayCategories = input(true);
readonly displaySeachBar = input(true);
readonly displayCart = input(true);
readonly cartClick = output<void>(); readonly cartClick = output<void>();
readonly ticketsClick = output<void>(); readonly ticketsClick = output<void>();
readonly loginClick = output<void>(); readonly loginClick = output<void>();

View File

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

View File

@@ -1,12 +1,17 @@
<div class="store-layout d-flex flex-column flex-grow-1"> <div class="store-layout d-flex flex-column flex-grow-1">
<app-store-header <app-store-header
ngSkipHydration
[cartQuantity]="cartQuantity()" [cartQuantity]="cartQuantity()"
[logoUrl]="tenant()?.header_logo ?? null" [logoUrl]="tenant()?.header_logo ?? null"
[backgroundImageUrl]="tenant()?.header_bg_image ?? null"
[user]="user()" [user]="user()"
[isAuthenticated]="isAuthenticated()" [isAuthenticated]="isAuthenticated()"
[accountNavigationMenus]="accountNavigationMenus()" [accountNavigationMenus]="accountNavigationMenus()"
[ticketsMenu]="ticketsMenu() ?? null" [ticketsMenu]="ticketsMenu() ?? null"
[categories]="tenant()?.categories ?? []" [categories]="tenant()?.categories ?? []"
[displayCategories]="tenant()?.display_categories ?? true"
[displaySeachBar]="tenant()?.display_seach_bar ?? true"
[displayCart]="displayCart()"
(cartClick)="isCartOpen.set(!isCartOpen())" (cartClick)="isCartOpen.set(!isCartOpen())"
(ticketsClick)="onTicketsClick()" (ticketsClick)="onTicketsClick()"
(loginClick)="onLoginClick()" (loginClick)="onLoginClick()"
@@ -15,11 +20,8 @@
(categorySelect)="onCategorySelect($event)" (categorySelect)="onCategorySelect($event)"
/> />
@if (isCartOpen()) { @if (displayCart() && isCartOpen()) {
<div <div class="store-layout__cart-overlay" (click)="isCartOpen.set(false)"></div>
class="store-layout__cart-overlay"
(click)="isCartOpen.set(false)"
></div>
<div class="store-layout__cart-dropdown card border-0 shadow-lg"> <div class="store-layout__cart-dropdown card border-0 shadow-lg">
<app-cart <app-cart
[showClose]="true" [showClose]="true"
@@ -30,10 +32,7 @@
[backgroundColor]="'#ffffff'" [backgroundColor]="'#ffffff'"
(closed)="isCartOpen.set(false)" (closed)="isCartOpen.set(false)"
> >
<app-button <app-button variant="secondary" class="flex-grow-1" (click)="isCartOpen.set(false)"
variant="secondary"
class="flex-grow-1"
(click)="isCartOpen.set(false)"
>Seguir comprando</app-button >Seguir comprando</app-button
> >
<app-button <app-button
@@ -61,6 +60,7 @@
[footerSections]="footerSections()" [footerSections]="footerSections()"
[socialMedia]="tenant()?.social_media ?? []" [socialMedia]="tenant()?.social_media ?? []"
[logoUrl]="tenant()?.footer_logo ?? null" [logoUrl]="tenant()?.footer_logo ?? null"
[backgroundImageUrl]="tenant()?.footer_bg_image ?? null"
[storeName]="tenant()?.nombre ?? null" [storeName]="tenant()?.nombre ?? null"
(logoutClick)="onLogoutClick()" (logoutClick)="onLogoutClick()"
/> />

View File

@@ -21,14 +21,15 @@
.store-layout__cart-dropdown { .store-layout__cart-dropdown {
position: absolute; position: absolute;
top: 76px; top: 100px;
right: calc((100% - 1320px) / 2 + 1.5rem); right: calc((100% - 1320px) / 2 + 1.5rem);
width: 100%;
max-width: 400px;
max-height: calc(100vh - 120px); max-height: calc(100vh - 120px);
z-index: 1050; z-index: 1050;
background-color: #ffffff; background-color: #ffffff;
border-radius: 8px; 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); box-shadow: 0 10px 25px rgba(0, 0, 0, 0.08);
overflow: hidden; overflow: hidden;
animation: store-layout-slide-down 0.2s ease-out; animation: store-layout-slide-down 0.2s ease-out;
@@ -40,6 +41,7 @@
right: 1rem; right: 1rem;
left: 1rem; left: 1rem;
width: auto; width: auto;
max-width: none;
} }
} }

View File

@@ -30,6 +30,8 @@ const tenant: Tenant = {
footer_bg_color: '#313131', footer_bg_color: '#313131',
header_logo: 'https://example.com/header.png', header_logo: 'https://example.com/header.png',
footer_logo: 'https://example.com/footer.png', footer_logo: 'https://example.com/footer.png',
header_bg_image: 'https://example.com/header-background.png',
footer_bg_image: 'https://example.com/footer-background.png',
categories: [], categories: [],
menues: [ menues: [
{ {
@@ -204,6 +206,37 @@ describe('StoreLayoutComponent', () => {
expect(compiled.querySelector('app-store-footer .store-layout__footer')).not.toBeNull(); 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,
display_cart: false,
});
const fixture = TestBed.createComponent(StoreLayoutComponent);
fixture.detectChanges();
const compiled = fixture.nativeElement as HTMLElement;
expect(compiled.querySelector('#store-search-input')).toBeNull();
expect(compiled.querySelector('.store-layout__category-trigger')).toBeNull();
expect(compiled.querySelector('app-cart-icon')).toBeNull();
(fixture.componentInstance as any).isCartOpen.set(true);
fixture.detectChanges();
expect(compiled.querySelector('app-cart')).toBeNull();
expect(compiled.querySelector('.store-layout__cart-overlay')).toBeNull();
const header = fixture.debugElement.query(By.directive(StoreHeaderComponent));
(header.componentInstance as any).toggleMobileMenu();
fixture.detectChanges();
expect(compiled.querySelectorAll('.store-layout__mobile-dropdown-item')).toHaveLength(1);
});
it('renders the tenant branding and action icons', () => { it('renders the tenant branding and action icons', () => {
const fixture = TestBed.createComponent(StoreLayoutComponent); const fixture = TestBed.createComponent(StoreLayoutComponent);
fixture.detectChanges(); fixture.detectChanges();
@@ -222,6 +255,12 @@ describe('StoreLayoutComponent', () => {
`app-store-footer img.store-layout__brand-logo[src="${tenant.footer_logo}"]`, `app-store-footer img.store-layout__brand-logo[src="${tenant.footer_logo}"]`,
), ),
).not.toBeNull(); ).not.toBeNull();
expect(
(compiled.querySelector('.store-layout__header') as HTMLElement).style.backgroundImage,
).toContain(tenant.header_bg_image!);
expect(
(compiled.querySelector('.store-layout__footer') as HTMLElement).style.backgroundImage,
).toContain(tenant.footer_bg_image!);
expect(compiled.querySelector('.fa-cart-shopping')).not.toBeNull(); expect(compiled.querySelector('.fa-cart-shopping')).not.toBeNull();
expect(compiled.querySelector('.fa-circle-user')).not.toBeNull(); expect(compiled.querySelector('.fa-circle-user')).not.toBeNull();
expect(compiled.querySelector('.fa-instagram')).not.toBeNull(); expect(compiled.querySelector('.fa-instagram')).not.toBeNull();
@@ -532,10 +571,9 @@ describe('StoreLayoutComponent', () => {
precio_unitario: '100.00', precio_unitario: '100.00',
catalog_item_id: 1, catalog_item_id: 1,
variant_id: null, variant_id: null,
product: { nombre: 'Producto',
nombre: 'Producto', imagen: null,
imagen: null, variant: null,
},
}, },
], ],
}); });
@@ -585,10 +623,9 @@ describe('StoreLayoutComponent', () => {
precio_unitario: '100.00', precio_unitario: '100.00',
catalog_item_id: 1, catalog_item_id: 1,
variant_id: null, variant_id: null,
product: { nombre: 'Producto',
nombre: 'Producto', imagen: null,
imagen: null, variant: null,
},
}, },
], ],
}); });

View File

@@ -6,7 +6,7 @@ import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-f
import { StoreHeaderComponent } from './store-header/store-header.component'; import { StoreHeaderComponent } from './store-header/store-header.component';
import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component'; import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component';
import { ButtonComponent } from '../../../shared/components/button/button.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 { AuthService } from '../../services/auth/auth.service';
import { findMenu } from '../../services/menu.utils'; import { findMenu } from '../../services/menu.utils';
import { CheckoutService } from '../../services/checkout.service'; import { CheckoutService } from '../../services/checkout.service';
@@ -35,6 +35,7 @@ export class StoreLayoutComponent implements OnInit {
protected readonly isCartOpen = signal(false); protected readonly isCartOpen = signal(false);
protected readonly isCreatingPurchase = signal(false); protected readonly isCreatingPurchase = signal(false);
protected readonly displayCart = computed(() => this.tenant()?.display_cart ?? true);
protected readonly cartSubtotal = computed(() => { protected readonly cartSubtotal = computed(() => {
const cart = this.cartService.cart(); const cart = this.cartService.cart();
@@ -52,7 +53,7 @@ export class StoreLayoutComponent implements OnInit {
}); });
private mapCartItemToMock(item: CartItem): CartItemMock { private mapCartItemToMock(item: CartItem): CartItemMock {
const fullName = item.product?.nombre ?? ''; const fullName = item.nombre ?? '';
let product = fullName; let product = fullName;
let attributes: { label: string; value: string }[] = []; let attributes: { label: string; value: string }[] = [];
@@ -69,18 +70,38 @@ export class StoreLayoutComponent implements OnInit {
}); });
} }
const selectedVariant = item.variant;
if (selectedVariant) {
attributes = Object.entries(selectedVariant.values).map(([label, value]) => ({
label: this.formatAttributeLabel(label),
value: this.formatAttributeValue(value),
}));
}
return { return {
cartItemId: item.id, cartItemId: item.id,
imageUrl: item.product?.imagen ?? null, imageUrl: item.imagen,
product, product,
originalPrice: null, originalPrice: null,
discountedPrice: parseFloat(item.precio_unitario), discountedPrice: parseFloat(item.precio_unitario),
discountPercentage: null, discountPercentage: null,
attributes, attributes,
quantity: item.cantidad, quantity: item.cantidad,
variantId: item.variant_id,
}; };
} }
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 currentYear = new Date().getFullYear();
protected readonly tenant = this.tenantService.tenant; protected readonly tenant = this.tenantService.tenant;
protected readonly user = this.authService.user; protected readonly user = this.authService.user;

View File

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

View File

@@ -2,7 +2,7 @@ import { DOCUMENT } from '@angular/common';
import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
import { isPlatformBrowser, isPlatformServer } from '@angular/common'; import { isPlatformBrowser, isPlatformServer } from '@angular/common';
import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core'; import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core';
import { firstValueFrom, map, Observable, of, tap } from 'rxjs'; import { firstValueFrom, map, Observable, of, tap, timeout } from 'rxjs';
import { environment } from '../../../../environments/environment'; import { environment } from '../../../../environments/environment';
import { BaseApiService } from '../base-api.service'; import { BaseApiService } from '../base-api.service';
@@ -20,8 +20,9 @@ import {
} from './auth.interfaces'; } from './auth.interfaces';
import { CookieService } from '../cookie/cookie.service'; import { CookieService } from '../cookie/cookie.service';
import { TenantService } from '../tenant.service'; import { TenantService } from '../tenant.service';
import { BOOTSTRAP_REQUEST_TIMEOUT_MS } from '../bootstrap-request-timeout';
const AUTH_TOKEN_COOKIE_KEY = 'shopit.auth.token'; const AUTH_TOKEN_COOKIE_KEY = 'shopit.front.auth.token';
const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user'); const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
@Injectable({ @Injectable({
@@ -33,6 +34,7 @@ export class AuthService extends BaseApiService {
private readonly cookieService = inject(CookieService); private readonly cookieService = inject(CookieService);
private readonly transferState = inject(TransferState); private readonly transferState = inject(TransferState);
private readonly tenantService = inject(TenantService); private readonly tenantService = inject(TenantService);
private readonly bootstrapRequestTimeoutMs = inject(BOOTSTRAP_REQUEST_TIMEOUT_MS);
private readonly userState = signal<AuthUser | null>(null); private readonly userState = signal<AuthUser | null>(null);
private readonly tokenState = signal<string | null>(null); private readonly tokenState = signal<string | null>(null);
@@ -175,7 +177,9 @@ export class AuthService extends BaseApiService {
} }
try { try {
const user = await firstValueFrom(this.loadCurrentUser()); const user = await firstValueFrom(
this.loadCurrentUser().pipe(timeout(this.bootstrapRequestTimeoutMs)),
);
if (isPlatformServer(this.platformId)) { if (isPlatformServer(this.platformId)) {
this.transferState.set(AUTH_USER_SSR_STATE_KEY, user); this.transferState.set(AUTH_USER_SSR_STATE_KEY, user);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -11,16 +11,44 @@ export interface UpdatePurchaseCustomerPayload {
email: string; email: string;
} }
export interface DirectCheckoutItem {
catalog_item_id: number;
variant_id: number | null;
cantidad: number;
}
export interface UnavailableCheckoutItem {
index: number;
catalog_item_id: number;
variant_id: number | null;
requested_quantity: number;
available_quantity: number;
message: string;
}
export interface InsufficientStockResponse {
code: 'purchase.insufficient_stock';
message: string;
errors: Record<string, string[]>;
unavailable_items: UnavailableCheckoutItem[];
}
export function isInsufficientStockResponse(value: unknown): value is InsufficientStockResponse {
if (typeof value !== 'object' || value === null) return false;
const response = value as Partial<InsufficientStockResponse>;
return (
response.code === 'purchase.insufficient_stock' && Array.isArray(response.unavailable_items)
);
}
export type StartCheckoutPayload = export type StartCheckoutPayload =
| { | {
cart_id: number; cart_id: number;
} }
| { | {
direct_item: { direct_items: DirectCheckoutItem[];
catalog_item_id: number;
variant_id: number | null;
cantidad: number;
};
}; };
export interface PurchaseStatusResponse { export interface PurchaseStatusResponse {
@@ -61,6 +89,7 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
user_id: number; user_id: number;
created_at: string | null; created_at: string | null;
payment_method: string | null; payment_method: string | null;
expires_at: string | null;
dni: string | null; dni: string | null;
transfer_payer_dni: string | null; transfer_payer_dni: string | null;
telefono: string | null; telefono: string | null;
@@ -180,10 +209,7 @@ export class CheckoutService extends BaseApiService {
return purchase; return purchase;
} }
async completePurchase( async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
tenantCode: string,
purchaseId: number,
): Promise<PurchaseStatusResponse> {
const response = await firstValueFrom( const response = await firstValueFrom(
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>( this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`, `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`,
@@ -221,10 +247,7 @@ export class CheckoutService extends BaseApiService {
return { status: purchase.status ?? null }; return { status: purchase.status ?? null };
} }
async cancelPurchase( async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
tenantCode: string,
purchaseId: number,
): Promise<PurchaseStatusResponse> {
const response = await firstValueFrom( const response = await firstValueFrom(
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>( this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/cancel`, `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/cancel`,
@@ -248,9 +271,7 @@ export class CheckoutService extends BaseApiService {
if (status) { if (status) {
url += `?status=${status}`; url += `?status=${status}`;
} }
const response = await firstValueFrom( const response = await firstValueFrom(this.http.get<{ data: PurchaseSummaryResponse[] }>(url));
this.http.get<{ data: PurchaseSummaryResponse[] }>(url),
);
if (!response) { if (!response) {
throw new Error('Error al obtener las compras.'); throw new Error('Error al obtener las compras.');
} }

View File

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

View File

@@ -166,7 +166,10 @@ export class ModalService {
} }
openConfirmDeleteRef(config: ConfirmModalConfig): ModalRef<boolean> { 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> { openSimple(config: SimpleModalConfig): Observable<void> {

View File

@@ -9,18 +9,67 @@ export interface BankAccount {
cvu: string; 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 { export interface HeroConfig {
background_image?: string | null; background_image_id?: string | ResponsiveImage | null;
title_html?: string | null; title_html?: string | null;
description_html?: string | null; description_html?: string | null;
button_text?: string | null; button_text?: string | null;
button_href?: string | null; button_href?: string | null;
} }
export interface ResponsiveImage {
desktop: string;
mobile: string;
}
export interface AdditionalInfoConfig {
description?: string | null;
}
export interface EventDate {
id?: number;
date: string;
start_time: string;
end_time: string;
}
export interface EventConfig { export interface EventConfig {
id?: number;
title?: string | null; title?: string | null;
location?: 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 { export interface Menu {
@@ -52,6 +101,8 @@ export interface Tenant {
codigo: string; codigo: string;
nombre: string; nombre: string;
dominio: string; dominio: string;
site_title?: string | null;
favicon?: string | null;
primary_color: string; primary_color: string;
secondary_color: string; secondary_color: string;
danger_color: string; danger_color: string;
@@ -60,14 +111,21 @@ export interface Tenant {
footer_bg_color: string; footer_bg_color: string;
header_logo: string; header_logo: string;
footer_logo: string; footer_logo: string;
header_bg_image?: string | null;
footer_bg_image?: string | null;
website_type_code?: string | null;
website_type?: WebsiteType | null;
event_date_text?: string | null;
extras?: WebsiteExtras;
event?: TenantEvent | null;
selected_bank_account_id?: number | null; selected_bank_account_id?: number | null;
selected_bank_account?: BankAccount | null; selected_bank_account?: BankAccount | null;
hero_config?: HeroConfig | null; search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart' | 'ticket_selector';
event_config?: EventConfig | null; search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel' | 'single';
search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart';
search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
search_items_per_page?: number; search_items_per_page?: number;
main_carousel_images?: string[]; display_categories?: boolean;
display_seach_bar?: boolean;
display_cart?: boolean;
social_media?: SocialMedia[]; social_media?: SocialMedia[];
menues?: Menu[]; menues?: Menu[];
categories: Category[]; categories: Category[];

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -68,4 +68,85 @@ describe('ProductAttributeSelectorComponent', () => {
expect(buttons[0].disabled).toBe(true); expect(buttons[0].disabled).toBe(true);
expect(buttons[1].disabled).toBe(false); 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);
});
}); });

View File

@@ -32,48 +32,69 @@ export class ProductAttributeSelectorComponent {
public variantChange = output<CatalogItemVariant | null>(); 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(() => { protected readonly availableOptions = computed(() => {
const selections = this.selectedAttributeOptions(); const selections = this.selectedAttributeOptions();
const variants = this.variants(); 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) { for (const attribute of attributes) {
availability[attribute.id] = {}; availability[attribute.codigo] = {};
for (const option of attribute.options) { for (const option of attribute.options) {
const optionNormalized = this.normalizeText(option.value || option.label); 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) => { const isAvailable = variants.some((variant) => {
if (!this.isVariantAvailable(variant)) return false; 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; return false;
} }
for (const otherAttr of attributes) { 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; return true;
}); });
availability[attribute.id][option.id] = isAvailable; availability[attribute.codigo][option.id] = isAvailable;
} }
} }
@@ -86,7 +107,7 @@ export class ProductAttributeSelectorComponent {
constructor() { constructor() {
effect(() => { effect(() => {
const attributes = this.attributes(); const attributes = this.visibleAttributes();
const defaultVariant = this.selectedVariant(); const defaultVariant = this.selectedVariant();
untracked(() => { untracked(() => {
@@ -97,7 +118,7 @@ export class ProductAttributeSelectorComponent {
effect(() => { effect(() => {
const selections = this.selectedAttributeOptions(); const selections = this.selectedAttributeOptions();
const variants = this.variants(); const variants = this.variants();
const attributes = this.attributes(); const attributes = this.visibleAttributes();
untracked(() => { untracked(() => {
this.emitMatchingVariant(selections, variants, attributes); this.emitMatchingVariant(selections, variants, attributes);
@@ -109,17 +130,28 @@ export class ProductAttributeSelectorComponent {
attribute: ProductAttribute, attribute: ProductAttribute,
option: ProductAttributeOption, option: ProductAttributeOption,
): boolean { ): boolean {
return this.selectedAttributeOptions()[attribute.id] === option.id; return (this.selectedAttributeOptions()[attribute.codigo] ?? []).includes(option.id);
} }
protected selectAttributeOption( protected selectAttributeOption(
attribute: ProductAttribute, attribute: ProductAttribute,
option: ProductAttributeOption, option: ProductAttributeOption,
): void { ): 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 { protected isColorOption(option: ProductAttributeOption): boolean {
@@ -134,51 +166,44 @@ export class ProductAttributeSelectorComponent {
attributes: ProductAttribute[], attributes: ProductAttribute[],
defaultVariant: CatalogItemVariant | null, defaultVariant: CatalogItemVariant | null,
): void { ): void {
const selections: Record<number, number> = {}; const selections: Record<string, number[]> = {};
for (const attribute of attributes) { 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); this.selectedAttributeOptions.set(selections);
} }
private findDefaultOptionId( private findDefaultOptionIds(
attribute: ProductAttribute, attribute: ProductAttribute,
variant: CatalogItemVariant | null, variant: CatalogItemVariant | null,
): number | null { ): number[] {
if (!variant) { 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, attribute: ProductAttribute,
variantAttributes: Record<string, string>, variantAttributes: Record<string, string | string[]>,
): string | null { ): string[] {
const normalizedCodigo = this.normalizeText(attribute.codigo); const normalizedCodigo = this.normalizeText(attribute.codigo);
const normalizedNombre = this.normalizeText(attribute.nombre); const normalizedNombre = this.normalizeText(attribute.nombre);
@@ -186,11 +211,11 @@ export class ProductAttributeSelectorComponent {
const normalizedKey = this.normalizeText(key); const normalizedKey = this.normalizeText(key);
if (normalizedKey === normalizedCodigo || normalizedKey === normalizedNombre) { 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 { private normalizeText(value: string | null | undefined): string {
@@ -234,7 +259,7 @@ export class ProductAttributeSelectorComponent {
} }
private emitMatchingVariant( private emitMatchingVariant(
selections: Record<number, number>, selections: Record<string, number[]>,
variants: CatalogItemVariant[], variants: CatalogItemVariant[],
attributes: ProductAttribute[], attributes: ProductAttribute[],
): void { ): void {
@@ -243,18 +268,22 @@ export class ProductAttributeSelectorComponent {
return; return;
} }
const selectedValuesById: Record<number, string> = {}; const selectedValuesByCode: Record<string, string[]> = {};
let allSelected = true; let allSelected = true;
for (const attr of attributes) { 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; allSelected = false;
break; 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) { if (!allSelected) {
@@ -264,10 +293,12 @@ export class ProductAttributeSelectorComponent {
const matchingVariant = variants.find((variant) => { const matchingVariant = variants.find((variant) => {
return attributes.every((attr) => { 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])
);
}); });
}); });

View File

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

View File

@@ -23,7 +23,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 1rem 0; padding: 1rem 0;
border-bottom: 1px solid #DDDDDD; border-bottom: 1px solid var(--border-color);
} }
.skeleton-item:last-child { .skeleton-item:last-child {

View File

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

View File

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

View File

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

View File

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

View File

@@ -64,7 +64,7 @@
.checkout-page__spinner { .checkout-page__spinner {
width: 3rem; width: 3rem;
height: 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-top-color: var(--tenant-primary);
border-radius: 50%; border-radius: 50%;
animation: checkout-page-spin 0.8s linear infinite; animation: checkout-page-spin 0.8s linear infinite;

View File

@@ -60,7 +60,7 @@ describe('CheckoutPageComponent payment validation', () => {
qr_data: { qr_code: 'qr-value' }, qr_data: { qr_code: 'qr-value' },
}), }),
getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }), getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'in_review' }), submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
withCustomLoading: vi.fn(), withCustomLoading: vi.fn(),
}; };
checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub); checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
@@ -199,20 +199,20 @@ describe('CheckoutPageComponent payment validation', () => {
component.selectedPaymentMethod.set('transfer'); component.selectedPaymentMethod.set('transfer');
await component.onComplete(); await component.onComplete();
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1); expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
expect(component.transferValidationStatus()).toBe('pending'); expect(component.transferValidationStatus()).toBe('pending');
expect(cartServiceStub.clearCart).not.toHaveBeenCalled(); expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]); expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
await vi.advanceTimersByTimeAsync(30_000); await vi.advanceTimersByTimeAsync(30_000);
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1); expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
await component.onComplete(); await component.onComplete();
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1); expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
}); });
it('navigates after a transfer is confirmed as paid', async () => { it('navigates after a transfer is confirmed as paid', async () => {
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'paid' }); checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status: 'paid' });
const { component } = createComponent(); const { component } = createComponent();
component.selectedPaymentMethod.set('transfer'); component.selectedPaymentMethod.set('transfer');
@@ -375,7 +375,7 @@ describe('CheckoutPageComponent payment validation', () => {
expect(component.qrPaymentStatus()).toBe('waiting'); 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', 'redirects a %s purchase to its status page',
async (status) => { async (status) => {
routeQueryParamMap = convertToParamMap({ purchase: 25 }); routeQueryParamMap = convertToParamMap({ purchase: 25 });
@@ -395,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 () => { it('updates a purchase item while editing and refreshes checkout totals', async () => {
const updatedPurchase = { const updatedPurchase = {
id: 25, id: 25,

View File

@@ -437,7 +437,11 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
.withCustomLoading() .withCustomLoading()
.submitPurchaseForReview(tenant.codigo, purchaseId); .submitPurchaseForReview(tenant.codigo, purchaseId);
if (purchase.status === 'paid') { if (purchase.status === 'paid' || purchase.status === 'pending_payment') {
if (purchase.status === 'pending_payment') {
this.transferValidationStatus.set('pending');
}
this.navigateToPurchaseStatus(purchaseId); this.navigateToPurchaseStatus(purchaseId);
return; return;
} }
@@ -576,7 +580,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
.getPurchase(tenant.codigo, purchaseId); .getPurchase(tenant.codigo, purchaseId);
if ( if (
purchase.status === 'in_review' || (purchase.status === 'pending_payment' && purchase.expires_at === null) ||
purchase.status === 'paid' || purchase.status === 'paid' ||
purchase.status === 'cancelled' || purchase.status === 'cancelled' ||
purchase.status === 'rejected' || purchase.status === 'rejected' ||

View File

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

View File

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

View File

@@ -26,7 +26,7 @@
<div class="product-detail__price-group"> <div class="product-detail__price-group">
<span class="product-detail__price-current"> <span class="product-detail__price-current">
{{ getFormattedPrice(prod.precio) }} {{ getFormattedPrice(effectivePrice()) }}
</span> </span>
@if (oldPrice(); as oldPrice) { @if (oldPrice(); as oldPrice) {
@@ -63,7 +63,9 @@
[disabled]="!selectedVariantAvailable() || variantLoading() || addingToCart()" [disabled]="!selectedVariantAvailable() || variantLoading() || addingToCart()"
(click)="addToCart()" (click)="addToCart()"
> >
@if (variantLoading() || addingToCart()) { @if (addingToCart()) {
Guardando
} @else if (variantLoading()) {
<div class="spinner-border spinner-border-sm" role="status"></div> <div class="spinner-border spinner-border-sm" role="status"></div>
} @else { } @else {
Agregar al carrito Agregar al carrito
@@ -99,7 +101,7 @@
[class.product-detail__description-body--expanded]="descriptionExpanded()" [class.product-detail__description-body--expanded]="descriptionExpanded()"
[style.max-height.px]="descriptionExpanded() ? descriptionMaxHeight() || null : null" [style.max-height.px]="descriptionExpanded() ? descriptionMaxHeight() || null : null"
> >
{{ prod.descripcion }} {{ effectiveDescription() }}
</div> </div>
@if (showDescriptionToggle()) { @if (showDescriptionToggle()) {

View File

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

View File

@@ -22,6 +22,7 @@ import {
describe('ProductDetailPageComponent', () => { describe('ProductDetailPageComponent', () => {
const mockProduct: CatalogItemDetail = { const mockProduct: CatalogItemDetail = {
id: 1, id: 1,
type: 'product',
category_id: 10, category_id: 10,
brand_id: null, brand_id: null,
slug: 'auriculares-bluetooth', slug: 'auriculares-bluetooth',
@@ -327,6 +328,70 @@ describe('ProductDetailPageComponent', () => {
expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe(''); expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe('');
}); });
it('renders event dates as a dynamic attribute and resolves their variants', async () => {
const detailProduct: CatalogItemDetail = {
...mockProduct,
purpose: 'entry',
has_tickets: true,
variants: [
{ id: 101, event_date_id: 20, stock_tecnico: 10, values: { event_date: '20' } },
{ id: 102, event_date_id: 21, stock_tecnico: 10, values: { event_date: '21' } },
],
attributes: [
{
id: 99,
codigo: 'event_date',
nombre: 'Fecha',
is_required: true,
metadata_schema: null,
type: 'event_date',
options: [
{
id: 20,
value: '20',
label: '09/10/2026',
sort_order: 0,
metadata: null,
},
{
id: 21,
value: '21',
label: '10/10/2026',
sort_order: 1,
metadata: null,
},
],
},
],
selected_variant: {
id: 101,
event_date_id: 20,
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 options = fixture.nativeElement.querySelectorAll(
'.attribute-selector__text-option',
) as NodeListOf<HTMLButtonElement>;
expect(options).toHaveLength(2);
expect(options[0].classList.contains('attribute-selector__text-option--selected')).toBe(true);
options[1].click();
fixture.detectChanges();
expect(catalogServiceStub.getCatalogItem).toHaveBeenCalledWith(1, 102);
});
it('hides the attributes block and its extra divider when no attributes are present', async () => { it('hides the attributes block and its extra divider when no attributes are present', async () => {
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
@@ -415,11 +480,13 @@ describe('ProductDetailPageComponent', () => {
await Promise.resolve(); await Promise.resolve();
expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('tenant-test', { expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('tenant-test', {
direct_item: { direct_items: [
catalog_item_id: 1, {
variant_id: null, catalog_item_id: 1,
cantidad: 1, variant_id: null,
}, cantidad: 1,
},
],
}); });
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout'], { expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout'], {
queryParams: { purchase: 44 }, queryParams: { purchase: 44 },
@@ -564,6 +631,39 @@ describe('ProductDetailPageComponent', () => {
expect(fixture.componentInstance['quantity']()).toBe(2); expect(fixture.componentInstance['quantity']()).toBe(2);
}); });
it('caps an unlimited variant at the per-user purchase limit', async () => {
const unlimitedVariant = {
id: 322,
stock_tecnico: null,
values: {},
};
resolveProduct({
...mockProduct,
inventory_policy: 'unlimited',
max_units_per_user: 2,
selected_variant: {
id: 322,
stock_tecnico: null,
images: [],
values: { event_date: '20' },
},
variants: [unlimitedVariant],
});
await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent);
fixture.detectChanges();
const increaseButton = fixture.nativeElement.querySelector(
'app-quantity-selector button:last-child',
) as HTMLButtonElement;
increaseButton.click();
fixture.detectChanges();
expect(fixture.componentInstance['quantity']()).toBe(2);
expect(increaseButton.disabled).toBe(true);
});
it('disables purchase actions for tracked variants without stock', async () => { it('disables purchase actions for tracked variants without stock', async () => {
const trackedVariant = { const trackedVariant = {
id: 654, id: 654,

View File

@@ -86,13 +86,28 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
protected readonly creatingDirectPurchase = signal(false); protected readonly creatingDirectPurchase = signal(false);
protected readonly error = signal<string | null>(null); protected readonly error = signal<string | null>(null);
protected readonly selectedVariant = signal<CatalogItemVariant | null>(null); protected readonly selectedVariant = signal<CatalogItemVariant | null>(null);
protected readonly effectiveDescription = computed(
() => this.selectedVariant()?.descripcion ?? this.product()?.descripcion ?? '',
);
protected readonly effectivePrice = computed(
() => this.selectedVariant()?.precio ?? this.product()?.precio,
);
protected readonly quantity = signal(1); protected readonly quantity = signal(1);
protected readonly selectedVariantMax = computed<number | null>(() => { protected readonly selectedVariantMax = computed<number | null>(() => {
const prod = this.product(); const prod = this.product();
const variant = this.selectedVariant(); const variant = this.selectedVariant();
if (variant) return variant.stock_tecnico; if (!prod) return 0;
if (prod && prod.variants.length === 0) return prod.stock_tecnico ?? null;
return 0; const stockLimit = variant
? variant.stock_tecnico
: prod.variants.length === 0
? (prod.stock_tecnico ?? null)
: 0;
const userLimit = prod.max_units_per_user ?? null;
if (stockLimit === null) return userLimit;
if (userLimit === null) return stockLimit;
return Math.min(stockLimit, userLimit);
}); });
protected readonly selectedVariantAvailable = computed(() => { protected readonly selectedVariantAvailable = computed(() => {
const prod = this.product(); const prod = this.product();
@@ -100,6 +115,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
const variant = this.selectedVariant(); const variant = this.selectedVariant();
if (variant) return this.isVariantAvailable(variant, prod); if (variant) return this.isVariantAvailable(variant, prod);
if (prod.purpose === 'entry') return false;
if (prod.variants.length > 0) return false; if (prod.variants.length > 0) return false;
return prod.inventory_policy === 'unlimited' || (prod.stock_tecnico ?? 0) > 0; return prod.inventory_policy === 'unlimited' || (prod.stock_tecnico ?? 0) > 0;
@@ -108,7 +124,9 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
protected readonly descriptionMaxHeight = signal(0); protected readonly descriptionMaxHeight = signal(0);
protected readonly descriptionHasOverflow = signal(false); protected readonly descriptionHasOverflow = signal(false);
protected readonly renderableAttributes = computed(() => protected readonly renderableAttributes = computed(() =>
(this.product()?.attributes ?? []).filter((attribute) => attribute.options.length > 0), (this.product()?.attributes ?? []).filter(
(attribute) => attribute.show_in_selector !== false && attribute.options.length > 0,
),
); );
protected readonly hasRenderableAttributes = computed( protected readonly hasRenderableAttributes = computed(
() => this.renderableAttributes().length > 0, () => this.renderableAttributes().length > 0,
@@ -123,6 +141,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
this.carouselHost(); this.carouselHost();
this.descriptionBody(); this.descriptionBody();
this.product(); this.product();
this.selectedVariant();
this.descriptionExpanded(); this.descriptionExpanded();
if (this.isBrowser) { if (this.isBrowser) {
@@ -159,26 +178,26 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
.withCustomLoading() .withCustomLoading()
.getCatalogItem(productId, variantId) .getCatalogItem(productId, variantId)
.subscribe({ .subscribe({
next: (prod) => { next: (prod) => {
this.applyProduct(prod, false); this.applyProduct(prod, false);
this.variantLoading.set(false); this.variantLoading.set(false);
}, },
error: (err: HttpErrorResponse) => { error: (err: HttpErrorResponse) => {
const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.'; const errorMessage = err.error?.message || 'No pudimos cargar la variante seleccionada.';
this.toastService.danger(errorMessage); this.toastService.danger(errorMessage);
this.variantLoading.set(false); this.variantLoading.set(false);
this.product.update((currentProduct) => { this.product.update((currentProduct) => {
if (!currentProduct) return null; if (!currentProduct) return null;
return { return {
...currentProduct, ...currentProduct,
variants: currentProduct.variants.filter((variant) => variant.id !== variantId), variants: currentProduct.variants.filter((variant) => variant.id !== variantId),
}; };
}); });
this.attributeSelector()?.reset(); this.attributeSelector()?.reset();
}, },
}); });
} }
private applyResolvedData(resolvedData: ProductDetailResolvedData): void { private applyResolvedData(resolvedData: ProductDetailResolvedData): void {
@@ -230,8 +249,11 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
} }
this.selectedVariant.set(variant); this.selectedVariant.set(variant);
if (variant && variant.stock_tecnico !== null && this.quantity() > variant.stock_tecnico) { this.descriptionExpanded.set(false);
this.quantity.set(Math.max(1, variant.stock_tecnico)); this.descriptionHasOverflow.set(false);
const maximum = this.selectedVariantMax();
if (maximum !== null && this.quantity() > maximum) {
this.quantity.set(Math.max(1, maximum));
} }
const currentProduct = this.product(); const currentProduct = this.product();
@@ -253,17 +275,17 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
.withCustomLoading() .withCustomLoading()
.addItem(currentProduct.id, variant?.id ?? null, this.quantity()) .addItem(currentProduct.id, variant?.id ?? null, this.quantity())
.subscribe({ .subscribe({
next: (res) => { next: (res) => {
const msg = res.message || 'Producto agregado al carrito'; const msg = res.message || 'Producto agregado al carrito';
this.toastService.success(msg); this.toastService.success(msg);
this.addingToCart.set(false); this.addingToCart.set(false);
}, },
error: (err: HttpErrorResponse) => { error: (err: HttpErrorResponse) => {
const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.'; const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
this.toastService.danger(errorMessage); this.toastService.danger(errorMessage);
this.addingToCart.set(false); this.addingToCart.set(false);
}, },
}); });
} }
protected async buyNow(): Promise<void> { protected async buyNow(): Promise<void> {
@@ -297,11 +319,13 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
this.creatingDirectPurchase.set(true); this.creatingDirectPurchase.set(true);
try { try {
const purchase = await this.checkoutService.startCheckout(tenant.codigo, { const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
direct_item: { direct_items: [
catalog_item_id: currentProduct.id, {
variant_id: variant?.id ?? null, catalog_item_id: currentProduct.id,
cantidad: this.quantity(), variant_id: variant?.id ?? null,
}, cantidad: this.quantity(),
},
],
}); });
await this.router.navigate(['/checkout'], { await this.router.navigate(['/checkout'], {

View File

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

View File

@@ -9,7 +9,7 @@ import {
signal, signal,
} from '@angular/core'; } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { catchError, distinctUntilChanged, map, of, switchMap, tap } from 'rxjs'; import { catchError, distinctUntilChanged, finalize, map, of, switchMap, tap } from 'rxjs';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { CartService } from '../../../../core/services/cart/cart.service'; import { CartService } from '../../../../core/services/cart/cart.service';
@@ -58,6 +58,7 @@ export class SearchPageComponent {
protected readonly results = signal<ApiPaginatedResponse<CatalogFeaturedItem[]> | null>(null); protected readonly results = signal<ApiPaginatedResponse<CatalogFeaturedItem[]> | null>(null);
protected readonly error = signal<string | null>(null); protected readonly error = signal<string | null>(null);
protected readonly creatingDirectPurchase = signal(false); protected readonly creatingDirectPurchase = signal(false);
protected readonly savingProductIds = signal<ReadonlySet<number>>(new Set<number>());
protected readonly productLayout = computed<CatalogProductLayout>( protected readonly productLayout = computed<CatalogProductLayout>(
() => this.tenantService.tenant()?.search_product_layout ?? 'column_with_image', () => this.tenantService.tenant()?.search_product_layout ?? 'column_with_image',
@@ -145,7 +146,9 @@ export class SearchPageComponent {
if (!this.injector.get(AuthService).user()) { if (!this.injector.get(AuthService).user()) {
await this.router.navigate(['/login'], { await this.router.navigate(['/login'], {
queryParams: { returnUrl: `/producto/${event.product.id}` }, queryParams: {
returnUrl: event.reservedInCart ? this.router.url : `/producto/${event.product.id}`,
},
}); });
return; return;
} }
@@ -158,13 +161,25 @@ export class SearchPageComponent {
this.creatingDirectPurchase.set(true); this.creatingDirectPurchase.set(true);
try { try {
const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, { const reservedCartId = event.reservedInCart ? (this.cartService.cart()?.id ?? null) : null;
direct_item: { if (event.reservedInCart && reservedCartId === null) {
catalog_item_id: event.product.id, this.toastService.danger('No se pudo identificar el carrito reservado.');
variant_id: event.variant ?? null, return;
cantidad: event.quantity, }
}, const purchase = await this.injector.get(CheckoutService).startCheckout(
}); tenant.codigo,
reservedCartId !== null
? { cart_id: reservedCartId }
: {
direct_items: [
{
catalog_item_id: event.product.id,
variant_id: event.variant ?? null,
cantidad: event.quantity,
},
],
},
);
await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } }); await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
} catch (error) { } catch (error) {
console.error('Failed to create direct purchase:', error); console.error('Failed to create direct purchase:', error);
@@ -175,14 +190,31 @@ export class SearchPageComponent {
} }
protected onAddToCart(event: ProductListCartEvent): void { protected onAddToCart(event: ProductListCartEvent): void {
this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).subscribe({ const productId = event.product.id;
next: (response) => { if (this.savingProductIds().has(productId)) {
this.toastService.success(response.message || 'Producto agregado al carrito'); return;
}, }
error: (error: HttpErrorResponse) => {
const message = error.error?.message || 'No se pudo agregar el producto al carrito.'; this.setProductSaving(productId, true);
this.toastService.danger(message); this.cartService
}, .addItem(productId, event.variant ?? null, event.quantity)
.pipe(finalize(() => this.setProductSaving(productId, false)))
.subscribe({
next: (response) => {
this.toastService.success(response.message || 'Producto agregado al carrito');
},
error: (error: HttpErrorResponse) => {
const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
this.toastService.danger(message);
},
});
}
private setProductSaving(productId: number, saving: boolean): void {
this.savingProductIds.update((current) => {
const updated = new Set(current);
saving ? updated.add(productId) : updated.delete(productId);
return updated;
}); });
} }

View File

@@ -1,19 +1,16 @@
@if (tenant()?.main_carousel_images; as mainCarouselImages) { @if (mainCarouselImages(); as images) {
@if (mainCarouselImages.length) { @if (images.length) {
<app-main-carousel <app-main-carousel
class="store-home__main-carousel" class="store-home__main-carousel"
[images]="mainCarouselImages" [images]="images"
ariaLabel="Imágenes destacadas de la tienda" ariaLabel="Imágenes destacadas de la tienda"
(firstImageReady)="mainCarouselReady.set(true)" (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()) { @if (error()) {
@@ -33,6 +30,8 @@
[items]="group.items" [items]="group.items"
[loading]="isGroupLoading(group.id)" [loading]="isGroupLoading(group.id)"
[loadImages]="!hasMainCarouselImages() || mainCarouselReady()" [loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
[unavailableVariantIds]="unavailableVariantIds()"
[savingProductIds]="savingProductIds()"
(buy)="onBuyProduct($event)" (buy)="onBuyProduct($event)"
(addToCart)="onAddToCart($event)" (addToCart)="onAddToCart($event)"
(pageChange)="onPageChange(group.id, $event)" (pageChange)="onPageChange(group.id, $event)"
@@ -40,3 +39,9 @@
</app-store-section> </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>
}

View File

@@ -11,6 +11,32 @@ app-store-section + app-store-section {
margin-top: clamp(3rem, 6vw, 5rem); 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;
}
@media (max-width: 767.98px) {
:host > app-hero-banner:first-child {
display: block;
margin-top: -3rem;
}
}
.store-home__alert-error { .store-home__alert-error {
margin: 0; margin: 0;
border-color: rgba(var(--tenant-danger-rgb, 220, 53, 69), 0.18); border-color: rgba(var(--tenant-danger-rgb, 220, 53, 69), 0.18);

View File

@@ -16,6 +16,7 @@ import { Tenant } from '../../../../core/services/tenant.interface';
import { TenantService } from '../../../../core/services/tenant.service'; import { TenantService } from '../../../../core/services/tenant.service';
import { ToastService } from '../../../../core/services/toast.service'; import { ToastService } from '../../../../core/services/toast.service';
import { ProductListComponent } from '../../../../shared/components/product-list/product-list.component'; 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 { StoreHomePageComponent } from './store-home-page.component';
import { import {
STORE_HOME_PRODUCTS_ERROR_MESSAGE, STORE_HOME_PRODUCTS_ERROR_MESSAGE,
@@ -88,7 +89,7 @@ const pageOneItems: CatalogFeaturedItem[] = [
}, },
]; ];
function createTenant(mainCarouselImages?: string[]): Tenant { function createTenant(extras: Tenant['extras'] = {}): Tenant {
return { return {
id: 1, id: 1,
codigo: 'acme', codigo: 'acme',
@@ -102,8 +103,18 @@ function createTenant(mainCarouselImages?: string[]): Tenant {
footer_bg_color: '#ffffff', footer_bg_color: '#ffffff',
header_logo: '/header.png', header_logo: '/header.png',
footer_logo: '/footer.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: [], 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({ await TestBed.configureTestingModule({
imports: [StoreHomePageComponent], imports: [StoreHomePageComponent],
@@ -162,7 +170,7 @@ describe('StoreHomePageComponent', () => {
}, },
{ {
provide: TenantService, provide: TenantService,
useValue: createTenantServiceStub(createTenant(mainCarouselImages)), useValue: createTenantServiceStub(createTenant({ carousel })),
}, },
], ],
}).compileComponents(); }).compileComponents();
@@ -171,25 +179,60 @@ describe('StoreHomePageComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement; 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).toHaveLength(2);
expect(images?.[0].getAttribute('src')).toBe(mainCarouselImages[0]); expect(images?.[0].getAttribute('src')).toBe(carousel[0]);
expect(images?.[1].getAttribute('src')).toBeNull();
expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(0);
images?.[0].dispatchEvent(new Event('load'));
fixture.detectChanges();
expect(images?.[1].getAttribute('src')).toBe(mainCarouselImages[1]);
expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(1);
fixture.destroy();
}); });
it('does not render the main carousel when the tenant has no images', async () => { it('renders the hero extra and the active tenant event', async () => {
const tenant = createTenant({
heroConfig: {
title_html: '<h1>Fiesta Fútbol Infantil</h1>',
description_html: '<p>Viví una jornada inolvidable de fútbol infantil.</p>',
background_image_id: 'https://example.com/hero.jpg',
},
});
tenant.event = {
title: 'Fiesta Fútbol Infantil',
location: 'Rosario, Santa Fe',
dates: [
{
id: 20,
date: '2026-12-05',
time_start: '09:00:00',
time_end: '18:00:00',
},
{
id: 21,
date: '2026-12-06',
time_start: '09:00:00',
time_end: '18:00:00',
},
],
};
tenant.event_date_text = '5 y 6 de Diciembre 2026';
tenant.website_type_code = 'onticket';
tenant.social_media = [
{
code: 'whatsapp',
icon: 'fa-brands fa-whatsapp',
name: 'WhatsApp',
url: 'https://wa.me/5493410000000',
},
];
tenant.website_type = {
codigo: 'onticket',
nombre: 'OnTicket',
primary_color: null,
secondary_color: null,
danger_color: null,
success_color: null,
site_logo: null,
};
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [StoreHomePageComponent], imports: [StoreHomePageComponent],
providers: [ providers: [
@@ -200,7 +243,7 @@ describe('StoreHomePageComponent', () => {
}, },
{ {
provide: TenantService, provide: TenantService,
useValue: createTenantServiceStub(createTenant([])), useValue: createTenantServiceStub(tenant),
}, },
], ],
}).compileComponents(); }).compileComponents();
@@ -208,7 +251,128 @@ describe('StoreHomePageComponent', () => {
const fixture = TestBed.createComponent(StoreHomePageComponent); const fixture = TestBed.createComponent(StoreHomePageComponent);
fixture.detectChanges(); fixture.detectChanges();
expect((fixture.nativeElement as HTMLElement).querySelector('app-main-carousel')).toBeNull(); const hero = (fixture.nativeElement as HTMLElement).querySelector(
'app-hero-banner .hero-banner',
) as HTMLElement;
const heroImage = hero.querySelector('img');
expect(hero).not.toBeNull();
expect(heroImage?.getAttribute('src')).toBe('https://example.com/hero.jpg');
expect(hero.textContent).toContain('Fiesta Fútbol Infantil');
expect(hero.textContent).toContain('Viví una jornada inolvidable de fútbol infantil.');
expect(hero.textContent).toContain('Rosario, Santa Fe');
expect(hero.textContent).toContain('5 y 6 de Diciembre 2026');
const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
.componentInstance as HeroBannerComponent;
expect(heroComponent.eventConfig?.contact).toEqual(tenant.social_media);
});
it('renders additional information as an HTML section', async () => {
const description =
'<p>Consultá los <strong>términos del evento</strong>.</p><ul><li>Ingreso con DNI</li></ul>';
await TestBed.configureTestingModule({
imports: [StoreHomePageComponent],
providers: [
provideActivatedRoute({ response: createCatalog(), error: null }),
{
provide: CatalogService,
useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
},
{
provide: TenantService,
useValue: createTenantServiceStub(
createTenant({ additionalInfoConfig: { description } }),
),
},
],
}).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent);
fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement;
const section = element.querySelector('.store-home__additional-info');
const sections = element.querySelectorAll(':scope > app-store-section');
expect(sections[sections.length - 1]).toBe(section);
expect(section?.querySelector('.store-section__title')?.textContent?.trim()).toBe(
'Información adicional',
);
expect(section?.querySelector('strong')?.textContent).toBe('términos del evento');
expect(section?.querySelector('li')?.textContent).toBe('Ingreso con DNI');
});
it('does not render the additional information section without content', async () => {
await TestBed.configureTestingModule({
imports: [StoreHomePageComponent],
providers: [
provideActivatedRoute({ response: createCatalog(), error: null }),
{
provide: CatalogService,
useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
},
{
provide: TenantService,
useValue: createTenantServiceStub(
createTenant({ additionalInfoConfig: { description: ' ' } }),
),
},
],
}).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent);
fixture.detectChanges();
expect(
(fixture.nativeElement as HTMLElement).querySelector('.store-home__additional-info'),
).toBeNull();
});
it('renders only the active event data when the tenant does not have the hero extra', async () => {
const tenant = createTenant();
tenant.event = {
title: 'Fiesta Fútbol Infantil',
location: 'Sunchales, Santa Fe',
dates: [
{
id: 25,
date: '2026-10-09',
time_start: '09:00:00',
time_end: '18:00:00',
},
],
};
await TestBed.configureTestingModule({
imports: [StoreHomePageComponent],
providers: [
provideActivatedRoute({ response: createCatalog(), error: null }),
{
provide: CatalogService,
useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
},
{
provide: TenantService,
useValue: createTenantServiceStub(tenant),
},
],
}).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent);
fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement;
const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
.componentInstance as HeroBannerComponent;
expect(heroComponent.heroConfig).toBeNull();
expect(element.querySelector('.hero-banner')).toBeNull();
expect(element.querySelector('.hero-banner-container')).toBeNull();
expect(element.querySelector('.hero-content')).toBeNull();
expect(element.querySelector('.event-card')).not.toBeNull();
expect(element.textContent).toContain('Fiesta Fútbol Infantil');
expect(element.textContent).toContain('Sunchales, Santa Fe');
expect(element.textContent).toContain('2026-10-09');
}); });
it('requests another page for the selected featured group', async () => { it('requests another page for the selected featured group', async () => {
@@ -323,9 +487,9 @@ describe('StoreHomePageComponent', () => {
it('adds a product-list cart event to the cart', async () => { it('adds a product-list cart event to the cart', async () => {
const catalogServiceStub = { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() }; const catalogServiceStub = { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() };
const cartServiceStub = { 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() }; const toastServiceStub = { success: vi.fn(), danger: vi.fn() };

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -6,7 +6,7 @@
<h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2> <h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2>
<div class="d-flex align-items-center cart-header-actions"> <div class="d-flex align-items-center cart-header-actions">
@if (!readonly() && allowEditing() && items().length > 0) { @if (!readonly() && editable() && allowEditing() && items().length > 0) {
<button <button
class="btn btn-link p-0 border-0 cart-edit-btn" class="btn btn-link p-0 border-0 cart-edit-btn"
type="button" type="button"
@@ -44,11 +44,14 @@
[discountedPrice]="item.discountedPrice" [discountedPrice]="item.discountedPrice"
[discountPercentage]="item.discountPercentage" [discountPercentage]="item.discountPercentage"
[attributes]="item.attributes" [attributes]="item.attributes"
[variants]="item.variants ?? []"
[selectedVariant]="getItemVariant(item)"
[quantity]="getItemQuantity(item)" [quantity]="getItemQuantity(item)"
[readonly]="readonly()" [readonly]="readonly()"
[quantityDisabled]="editingDisabled() || (allowEditing() && !editing())" [quantityDisabled]="!editable() || editingDisabled() || (allowEditing() && !editing())"
[showRemove]="allowRemove()" [showRemove]="allowRemove()"
(quantityChange)="onItemQuantityChange(idx, $event)" (quantityChange)="onItemQuantityChange(idx, $event)"
(variantChange)="onItemVariantChange(idx, $event)"
(remove)="onItemRemove(idx)" (remove)="onItemRemove(idx)"
/> />
} @empty { } @empty {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router'; 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'; import { ButtonComponent } from '../button/button.component';
@Component({ @Component({
@@ -16,26 +16,53 @@ export class HeroBannerComponent {
@Input() heroConfig?: HeroConfig | null; @Input() heroConfig?: HeroConfig | null;
@Input() eventConfig?: EventConfig | null; @Input() eventConfig?: EventConfig | null;
protected schedulesExpanded = false;
protected get desktopImageUrl(): string | null {
const image = this.heroConfig?.background_image_id;
return typeof image === 'string' ? image : (image?.desktop ?? null);
}
protected get mobileImageUrl(): string | null {
const image = this.heroConfig?.background_image_id;
return typeof image === 'string' ? image : (image?.mobile ?? image?.desktop ?? null);
}
get formattedDates(): string { get formattedDates(): string {
if (this.eventConfig?.dates_text) {
return this.eventConfig.dates_text;
}
if (!this.eventConfig?.dates || this.eventConfig.dates.length === 0) { if (!this.eventConfig?.dates || this.eventConfig.dates.length === 0) {
return ''; 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];
} protected toggleSchedules(): void {
this.schedulesExpanded = !this.schedulesExpanded;
// 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 protected formatScheduleDate(date: string): string {
const hasIsoDates = this.eventConfig.dates.some(d => d.includes('-')); const [year, month, day] = date.split('-').map(Number);
if (hasIsoDates) { if (!year || !month || !day) {
// Un simple join por si acaso, aunque lo ideal es que el admin ponga el texto tal cual return date;
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(', '); const monthName = new Intl.DateTimeFormat('es-AR', {
month: 'long',
timeZone: 'UTC',
}).format(new Date(Date.UTC(year, month - 1, day)));
const capitalizedMonth = `${monthName.charAt(0).toUpperCase()}${monthName.slice(1)}`;
return `${day} de ${capitalizedMonth} ${year}`;
}
protected formatScheduleTime(time: string): string {
return time.match(/^\d{2}:\d{2}/)?.[0] ?? time;
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

@@ -7,21 +7,17 @@ import {
computed, computed,
effect, effect,
inject, inject,
viewChild viewChild,
} from '@angular/core'; } from '@angular/core';
import { import { MODAL_DATA, ModalRef, ModalService } from '../../../core/services/modal.service';
MODAL_DATA,
ModalRef,
ModalService
} from '../../../core/services/modal.service';
import { ModalShellComponent } from '../modal-shell/modal-shell.component'; import { ModalShellComponent } from '../modal-shell/modal-shell.component';
@Component({ @Component({
selector: 'app-modal-host', selector: 'app-modal-host',
imports: [NgComponentOutlet, ModalShellComponent], imports: [NgComponentOutlet, ModalShellComponent],
templateUrl: './modal-host.component.html', templateUrl: './modal-host.component.html',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class ModalHostComponent { export class ModalHostComponent {
private readonly modalService = inject(ModalService); private readonly modalService = inject(ModalService);
@@ -42,9 +38,9 @@ export class ModalHostComponent {
return Injector.create({ return Injector.create({
providers: [ providers: [
{ provide: ModalRef, useValue: modal.ref }, { provide: ModalRef, useValue: modal.ref },
{ provide: MODAL_DATA, useValue: modal.config.data ?? null } { provide: MODAL_DATA, useValue: modal.config.data ?? null },
], ],
parent: this.injector parent: this.injector,
}); });
}); });
@@ -58,6 +54,18 @@ export class ModalHostComponent {
const body = this.document.body; const body = this.document.body;
const previousOverflow = body.style.overflow; const previousOverflow = body.style.overflow;
const previousPaddingRight = body.style.paddingRight;
const view = this.document.defaultView;
const scrollbarWidth = view
? Math.max(0, view.innerWidth - this.document.documentElement.clientWidth)
: 0;
if (scrollbarWidth > 0 && view) {
const currentPaddingRight =
Number.parseFloat(view.getComputedStyle(body).paddingRight) || 0;
body.style.paddingRight = `${currentPaddingRight + scrollbarWidth}px`;
}
body.style.overflow = 'hidden'; body.style.overflow = 'hidden';
const onKeyDown = (event: KeyboardEvent) => { const onKeyDown = (event: KeyboardEvent) => {
@@ -75,6 +83,7 @@ export class ModalHostComponent {
onCleanup(() => { onCleanup(() => {
this.document.removeEventListener('keydown', onKeyDown); this.document.removeEventListener('keydown', onKeyDown);
body.style.overflow = previousOverflow; body.style.overflow = previousOverflow;
body.style.paddingRight = previousPaddingRight;
}); });
}); });
} }

View File

@@ -10,8 +10,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 1rem; padding: 1rem;
background: rgba(16, 18, 22, 0.48); background: rgba(16, 18, 22, 0.56);
backdrop-filter: blur(2px);
} }
.modal-shell__dialog { .modal-shell__dialog {

View File

@@ -12,7 +12,8 @@
[title]="item.nombre" [title]="item.nombre"
[description]="item.descripcion ?? ''" [description]="item.descripcion ?? ''"
[price]="price(item)" [price]="price(item)"
[variants]="variantsFor(item)" [variants]="item.variants ?? []"
[saving]="savingProductIds().has(item.id)"
(buy)="emitRowBuy(item, $event)" (buy)="emitRowBuy(item, $event)"
(addToCart)="emitRowCart(item, $event)" (addToCart)="emitRowCart(item, $event)"
/> />
@@ -23,10 +24,22 @@
[description]="item.descripcion ?? ''" [description]="item.descripcion ?? ''"
[price]="price(item)" [price]="price(item)"
[variants]="item.variants ?? []" [variants]="item.variants ?? []"
[saving]="savingProductIds().has(item.id)"
(buy)="emitColumnBuy(item, $event)" (buy)="emitColumnBuy(item, $event)"
(addToCart)="emitColumnCart(item, $event)" (addToCart)="emitColumnCart(item, $event)"
/> />
} }
@case ('ticket_selector') {
<app-product-ticket-selector
[productId]="item.id"
[title]="item.nombre"
[description]="item.descripcion ?? ''"
[price]="price(item)"
[imageUrl]="loadImages() ? (item.image ?? null) : null"
[disabled]="loading()"
(buy)="emitTicketBuy(item, $event)"
/>
}
@default { @default {
<app-product-column-with-image <app-product-column-with-image
[imageUrl]="loadImages() ? (item.image ?? null) : null" [imageUrl]="loadImages() ? (item.image ?? null) : null"
@@ -54,8 +67,11 @@
class="product-list" class="product-list"
[class.product-list--row]="effectiveLayout() === 'row'" [class.product-list--row]="effectiveLayout() === 'row'"
[class.product-list--column]="effectiveLayout() !== 'row'" [class.product-list--column]="effectiveLayout() !== 'row'"
[class.product-list--adaptive]="groupLayout() !== 'simple_vertical'" [class.product-list--adaptive]="
groupLayout() !== 'simple_vertical' && groupLayout() !== 'single'
"
[class.product-list--simple-vertical]="groupLayout() === 'simple_vertical'" [class.product-list--simple-vertical]="groupLayout() === 'simple_vertical'"
[class.product-list--single]="groupLayout() === 'single'"
> >
@for (item of itemData(); track item.id; let index = $index) { @for (item of itemData(); track item.id; let index = $index) {
<ng-container <ng-container

View File

@@ -12,6 +12,8 @@
&--row { &--row {
--product-list-item-min-width: 32rem; --product-list-item-min-width: 32rem;
gap: 0;
} }
&--adaptive { &--adaptive {
@@ -25,6 +27,10 @@
grid-template-columns: minmax(0, 1fr); grid-template-columns: minmax(0, 1fr);
} }
&--single {
grid-template-columns: minmax(0, 1fr);
}
&__item { &__item {
width: 100%; width: 100%;
min-width: 0; min-width: 0;

View File

@@ -1,18 +1,24 @@
import { TestBed, getTestBed } from '@angular/core/testing'; import { TestBed, getTestBed } from '@angular/core/testing';
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing'; import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest'; import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
import { of } from 'rxjs';
import { ApiPaginatedResponse } from '../../../core/services/api-paginated-response.interface'; import { ApiPaginatedResponse } from '../../../core/services/api-paginated-response.interface';
import { CartService } from '../../../core/services/cart/cart.service';
import { CatalogService } from '../../../core/services/catalog/catalog.service';
import { import {
CatalogFeaturedItems, CatalogFeaturedItems,
CatalogGroupLayout, CatalogGroupLayout,
} from '../../../core/services/catalog/catalog.interface'; } from '../../../core/services/catalog/catalog.interface';
import { ProductListComponent, ProductListItem, ProductListLayout } from './product-list.component'; import { ProductListComponent, ProductListItem, ProductListLayout } from './product-list.component';
import { ProductTicketSelectorComponent } from '../product-ticket-selector/product-ticket-selector.component';
import { By } from '@angular/platform-browser';
describe('ProductListComponent', () => { describe('ProductListComponent', () => {
const items: ProductListItem[] = [ const items: ProductListItem[] = [
{ {
id: 1, id: 1,
type: 'product',
nombre: 'Producto uno', nombre: 'Producto uno',
descripcion: 'Primera descripcion', descripcion: 'Primera descripcion',
precio: '100.00', precio: '100.00',
@@ -21,6 +27,7 @@ describe('ProductListComponent', () => {
}, },
{ {
id: 2, id: 2,
type: 'product',
nombre: 'Producto dos', nombre: 'Producto dos',
descripcion: 'Segunda descripcion', descripcion: 'Segunda descripcion',
precio: 200, precio: 200,
@@ -47,7 +54,29 @@ describe('ProductListComponent', () => {
productItems: CatalogFeaturedItems = paginatedItems(), productItems: CatalogFeaturedItems = paginatedItems(),
groupLayout: CatalogGroupLayout = 'paginated', groupLayout: CatalogGroupLayout = 'paginated',
) { ) {
await TestBed.configureTestingModule({ imports: [ProductListComponent] }).compileComponents(); const getVariantOptions = vi.fn().mockReturnValue(
of({
selectors: ['tipo', 'sector', 'fila', 'asiento'].map((key, index) => ({
key,
label: key,
options: [{ value: String(index + 1), label: String(index + 1) }],
enabled: index === 0,
})),
selected_values: {},
resolved_variant: null,
valid: true,
available_variant_count: 2,
matching_variant_count: 2,
price_range: { minimum: '10000.00', maximum: '12000.00' },
}),
);
await TestBed.configureTestingModule({
imports: [ProductListComponent],
providers: [
{ provide: CatalogService, useValue: { getVariantOptions } },
{ provide: CartService, useValue: {} },
],
}).compileComponents();
const fixture = TestBed.createComponent(ProductListComponent); const fixture = TestBed.createComponent(ProductListComponent);
fixture.componentRef.setInput('layout', layout); fixture.componentRef.setInput('layout', layout);
fixture.componentRef.setInput('groupLayout', groupLayout); fixture.componentRef.setInput('groupLayout', groupLayout);
@@ -216,6 +245,101 @@ describe('ProductListComponent', () => {
expect(element.querySelectorAll('app-product-column-with-image')).toHaveLength(2); expect(element.querySelectorAll('app-product-column-with-image')).toHaveLength(2);
}); });
it('renders a single ticket selector and emits its selected variant', async () => {
const ticket: ProductListItem = {
...items[0],
variants: [
{
id: 401,
precio: '10000.00',
stock_tecnico: 1,
values: {
tipo: { value: 'vip', label: 'VIP' },
sector: { value: 'a', label: 'Sector A' },
fila: { value: '3', label: 'Fila 3' },
asiento: { value: '12', label: 'Asiento 12' },
},
},
{
id: 402,
precio: '12000.00',
stock_tecnico: 1,
values: {
tipo: { value: 'vip', label: 'VIP' },
sector: { value: 'a', label: 'Sector A' },
fila: { value: '3', label: 'Fila 3' },
asiento: { value: '13', label: 'Asiento 13' },
},
},
],
};
const fixture = await render('ticket_selector', [ticket], 'single');
const buySpy = vi.fn();
fixture.componentInstance.buy.subscribe(buySpy);
await fixture.whenStable();
fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement;
expect(element.querySelector('.product-list--single')).not.toBeNull();
expect(element.querySelectorAll('app-product-ticket-selector')).toHaveLength(1);
expect(element.querySelectorAll('.variant-selector__select')).toHaveLength(4);
expect(
(element.querySelector('.ticket-selector__actions .btn-primary') as HTMLButtonElement)
.disabled,
).toBe(true);
const ticketSelector = fixture.debugElement.query(By.directive(ProductTicketSelectorComponent))
.componentInstance as ProductTicketSelectorComponent;
ticketSelector['patchRow'](1, {
variantId: 401,
reservedVariantId: 401,
cartItemId: 1,
status: 'reserved',
});
fixture.detectChanges();
(element.querySelector('.ticket-selector__add-row-button') as HTMLButtonElement).click();
fixture.detectChanges();
expect(element.querySelectorAll('.ticket-selector__row')).toHaveLength(2);
expect(element.querySelectorAll('.variant-selector__select')).toHaveLength(8);
ticketSelector['patchRow'](2, {
variantId: 402,
reservedVariantId: 402,
cartItemId: 2,
status: 'reserved',
});
fixture.detectChanges();
(element.querySelector('.ticket-selector__actions .btn-primary') as HTMLButtonElement).click();
expect(buySpy).toHaveBeenCalledWith({
product: ticket,
quantity: 2,
variant: 401,
variantIds: [401, 402],
directPurchase: true,
reservedInCart: true,
});
});
it('loads ticket selector availability without requiring catalog variants', async () => {
const ticket: ProductListItem = {
...items[0],
variants: undefined,
};
const fixture = await render('ticket_selector', [ticket], 'single');
await fixture.whenStable();
fixture.detectChanges();
const selector = fixture.debugElement.query(By.directive(ProductTicketSelectorComponent))
.componentInstance as ProductTicketSelectorComponent;
expect(selector['availableVariantCount']()).toBe(2);
expect(fixture.nativeElement.querySelectorAll('.variant-selector__select')).toHaveLength(4);
});
it('renders carousel groups with the reusable carousel', async () => { it('renders carousel groups with the reusable carousel', async () => {
const fixture = await render('column_with_image', items, 'carousel'); const fixture = await render('column_with_image', items, 'carousel');
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;

View File

@@ -21,11 +21,9 @@ import {
import { CarouselComponent } from '../carousel/carousel.component'; import { CarouselComponent } from '../carousel/carousel.component';
import { PaginatorComponent } from '../paginator/paginator.component'; import { PaginatorComponent } from '../paginator/paginator.component';
import { ProductColumnWithImageComponent } from '../product-column-with-image/product-column-with-image.component'; import { ProductColumnWithImageComponent } from '../product-column-with-image/product-column-with-image.component';
import { import { ProductRowCardComponent } from '../product-row-card/product-row-card.component';
ProductRowCardComponent,
Variant as RowVariant,
} from '../product-row-card/product-row-card.component';
import { ProductVerticalWithCartCardComponent } from '../product-vertical-with-cart-card/product-vertical-with-cart-card.component'; import { ProductVerticalWithCartCardComponent } from '../product-vertical-with-cart-card/product-vertical-with-cart-card.component';
import { ProductTicketSelectorComponent } from '../product-ticket-selector/product-ticket-selector.component';
export type ProductListLayout = CatalogProductLayout; export type ProductListLayout = CatalogProductLayout;
export type ProductListVariant = CatalogFeaturedItemVariant; export type ProductListVariant = CatalogFeaturedItemVariant;
@@ -41,7 +39,9 @@ export interface ProductListBuyEvent {
product: ProductListItem; product: ProductListItem;
quantity: number; quantity: number;
variant?: number | null; variant?: number | null;
variantIds?: number[];
directPurchase: boolean; directPurchase: boolean;
reservedInCart?: boolean;
} }
@Component({ @Component({
@@ -53,6 +53,7 @@ export interface ProductListBuyEvent {
PaginatorComponent, PaginatorComponent,
ProductRowCardComponent, ProductRowCardComponent,
ProductVerticalWithCartCardComponent, ProductVerticalWithCartCardComponent,
ProductTicketSelectorComponent,
], ],
templateUrl: './product-list.component.html', templateUrl: './product-list.component.html',
styleUrl: './product-list.component.scss', styleUrl: './product-list.component.scss',
@@ -67,6 +68,8 @@ export class ProductListComponent {
readonly items = input.required<CatalogFeaturedItems>(); readonly items = input.required<CatalogFeaturedItems>();
readonly loading = input(false); readonly loading = input(false);
readonly loadImages = input(true); readonly loadImages = input(true);
readonly unavailableVariantIds = input<ReadonlySet<number>>(new Set<number>());
readonly savingProductIds = input<ReadonlySet<number>>(new Set<number>());
readonly buy = output<ProductListBuyEvent>(); readonly buy = output<ProductListBuyEvent>();
readonly addToCart = output<ProductListCartEvent>(); readonly addToCart = output<ProductListCartEvent>();
@@ -105,13 +108,6 @@ export class ProductListComponent {
return Number.isFinite(price) ? price : 0; return Number.isFinite(price) ? price : 0;
} }
protected variantsFor(item: ProductListItem): RowVariant[] {
return (item.variants ?? []).map((variant) => ({
value: variant.id,
label: Object.values(variant.values).join(' / ') || `Variante ${variant.id}`,
}));
}
protected emitRowCart( protected emitRowCart(
product: ProductListItem, product: ProductListItem,
event: { quantity: number; variant: unknown }, event: { quantity: number; variant: unknown },
@@ -157,4 +153,15 @@ export class ProductListComponent {
protected emitProductDetailBuy(product: ProductListItem): void { protected emitProductDetailBuy(product: ProductListItem): void {
this.buy.emit({ product, quantity: 1, variant: null, directPurchase: false }); this.buy.emit({ product, quantity: 1, variant: null, directPurchase: false });
} }
protected emitTicketBuy(product: ProductListItem, variantIds: number[]): void {
this.buy.emit({
product,
quantity: variantIds.length,
variant: variantIds[0] ?? null,
variantIds,
directPurchase: true,
reservedInCart: true,
});
}
} }

View File

@@ -1,44 +1,42 @@
<div <div class="product-row-card">
class="product-row-card border rounded bg-white shadow-sm d-flex justify-content-between p-3 gap-3"
>
<!-- Left Side: Title and Description --> <!-- Left Side: Title and Description -->
<div class="product-row-card__info d-flex flex-column justify-content-center flex-grow-1"> <div class="product-row-card__info d-flex flex-column justify-content-center flex-grow-1">
<h3 class="product-row-card__title text-uppercase mb-1 m-0"> <h3 class="product-row-card__title text-uppercase mb-1 m-0">
{{ title() }} {{ title() }}
</h3> </h3>
@if (description()) { @if (effectiveDescription()) {
<p class="product-row-card__description m-0 mt-1"> <p class="product-row-card__description m-0 mt-1">
{{ description() }} {{ effectiveDescription() }}
</p> </p>
} }
</div> </div>
<!-- Right Side: Actions and Pricing --> <!-- Right Side: Selectors and quantity first, then price -->
<div class="product-row-card__actions d-flex flex-column gap-2 justify-content-center"> <div class="product-row-card__actions">
<!-- Top Row: Price and Comprar button --> <div class="product-row-card__summary">
<div class="d-flex align-items-center justify-content-end gap-3"> <div class="product-row-card__controls">
<app-variant-selector
class="product-row-card__selectors"
[variants]="variants()"
[(selectedVariant)]="selectedVariant"
/>
<app-quantity-selector [(quantity)]="quantity"></app-quantity-selector>
</div>
<span class="product-row-card__price text-primary"> <span class="product-row-card__price text-primary">
{{ formattedPrice() }} {{ formattedPrice() }}
</span> </span>
</div>
<div class="product-row-card__buttons">
<div class="product-row-card__btn-wrapper"> <div class="product-row-card__btn-wrapper">
<app-button variant="primary" (click)="onBuy()"> Comprar </app-button> <app-button variant="primary" (click)="onBuy()"> Comprar </app-button>
</div> </div>
</div>
<!-- Bottom Row: Select, Quantity, and Agregar al carrito button -->
<div class="d-flex align-items-center justify-content-end gap-2">
@if (variants().length > 0) {
<select class="form-select product-row-card__select" [(ngModel)]="selectedVariant">
@for (variant of variants(); track variant.value) {
<option [ngValue]="variant.value">{{ variant.label }}</option>
}
</select>
}
<app-quantity-selector [(quantity)]="quantity"></app-quantity-selector>
<div class="product-row-card__btn-wrapper"> <div class="product-row-card__btn-wrapper">
<app-button variant="secondary" (click)="onAddToCart()"> Agregar al carrito </app-button> <app-button variant="secondary" [disabled]="saving()" (click)="onAddToCart()">
{{ saving() ? 'Guardando' : 'Agregar al carrito' }}
</app-button>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -4,9 +4,14 @@
} }
.product-row-card { .product-row-card {
display: flex;
align-items: center;
justify-content: space-between;
gap: 2rem;
width: 100%; width: 100%;
background-color: #f8f9fa; /* slightly light bg matching the screenshot if needed, but let's use white or #f8f9fa based on the border */ padding: 2rem 0;
border-color: #e9ecef !important; border-bottom: 1px solid var(--border-color);
background: transparent;
&__title { &__title {
font-size: 16px; font-size: 16px;
@@ -20,35 +25,48 @@
color: #777; /* lighter grey for text */ color: #777; /* lighter grey for text */
line-height: 1.4; line-height: 1.4;
max-width: 600px; max-width: 600px;
/* Simulate the bold text for 'Niños menores...' if it was HTML. /* Simulate the bold text for 'Niños menores...' if it was HTML.
Since it's passed as string we just let it be, unless we parse it. */ Since it's passed as string we just let it be, unless we parse it. */
} }
&__price { &__price {
display: block;
align-self: flex-end;
font-size: 20px; font-size: 20px;
font-weight: 800; font-weight: 800;
color: var(--tenant-primary, #009933) !important; /* Green matching screenshot */ color: var(--tenant-primary, #009933) !important;
white-space: nowrap;
} }
&__select { &__actions {
width: auto; display: grid;
min-width: 150px; grid-template-columns: minmax(0, auto) minmax(0, 230px);
font-size: 14px; align-items: stretch;
height: 38px; gap: 0.75rem 2.5rem;
color: #666; }
border-color: #ccc;
cursor: pointer;
&:focus { &__summary,
border-color: var(--tenant-primary); &__buttons {
box-shadow: 0 0 0 0.25rem rgba(0, 153, 51, 0.25); display: flex;
} flex-direction: column;
justify-content: center;
gap: 0.5rem;
}
&__buttons {
width: 100%;
max-width: 230px;
}
&__controls {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 0.5rem;
} }
&__btn-wrapper { &__btn-wrapper {
min-width: 160px; /* To make both buttons equal width as in screenshot */
app-button { app-button {
display: block; display: block;
width: 100%; width: 100%;
@@ -61,3 +79,41 @@
} }
} }
} }
@media (min-width: 992px) {
.product-row-card {
&__info {
min-width: 0;
}
&__actions {
flex: 0 0 auto;
}
&__selectors {
width: auto;
::ng-deep .variant-selector {
display: flex;
width: auto;
}
::ng-deep .variant-selector__select {
width: auto;
min-width: 108px;
}
}
}
}
@media (max-width: 991.98px) {
.product-row-card {
align-items: stretch;
flex-direction: column;
&__actions {
grid-template-columns: minmax(0, 1fr) minmax(0, 230px);
}
}
}

View File

@@ -1,25 +1,22 @@
import { import { ChangeDetectionStrategy, Component, computed, input, model, output } from '@angular/core';
ChangeDetectionStrategy,
Component,
computed,
effect,
input,
output,
model,
} from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ButtonComponent } from '../button/button.component'; import { ButtonComponent } from '../button/button.component';
import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component'; import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
import {
VariantSelectorComponent,
VariantSelectorVariant,
} from '../variant-selector/variant-selector.component';
export interface Variant { export interface Variant extends VariantSelectorVariant {
label: string; label?: string;
value: any; descripcion?: string | null;
precio?: string | number;
stock_tecnico?: number | null;
} }
@Component({ @Component({
selector: 'app-product-row-card', selector: 'app-product-row-card',
standalone: true, standalone: true,
imports: [ButtonComponent, QuantitySelectorComponent, FormsModule], imports: [ButtonComponent, QuantitySelectorComponent, VariantSelectorComponent],
templateUrl: './product-row-card.component.html', templateUrl: './product-row-card.component.html',
styleUrl: './product-row-card.component.scss', styleUrl: './product-row-card.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
@@ -30,35 +27,35 @@ export class ProductRowCardComponent {
readonly description = input<string>(''); readonly description = input<string>('');
readonly price = input<number>(0); readonly price = input<number>(0);
readonly variants = input<Variant[]>([]); readonly variants = input<Variant[]>([]);
readonly saving = input(false);
// Internal state models // Internal state models
readonly quantity = model<number>(1); readonly quantity = model<number>(1);
readonly selectedVariant = model<any>(null); readonly selectedVariant = model<unknown>(null);
// Interactive events // Interactive events
readonly buy = output<{ quantity: number; variant: any }>(); readonly buy = output<{ quantity: number; variant: unknown }>();
readonly addToCart = output<{ quantity: number; variant: any }>(); readonly addToCart = output<{ quantity: number; variant: unknown }>();
constructor() { protected readonly selectedVariantData = computed(() =>
effect(() => { this.variants().find((variant) => Object.is(variant.id, this.selectedVariant())),
const variants = this.variants(); );
const selectedVariant = this.selectedVariant(); protected readonly effectiveDescription = computed(
() => this.selectedVariantData()?.descripcion ?? this.description(),
);
protected readonly effectivePrice = computed(() => {
const variantPrice = Number(this.selectedVariantData()?.precio);
if ( return Number.isFinite(variantPrice) ? variantPrice : this.price();
variants.length > 0 &&
!variants.some((variant) => Object.is(variant.value, selectedVariant))
) {
this.selectedVariant.set(variants[0].value);
}
});
}
// Formatted string for price: "$ 10.000"
readonly formattedPrice = computed(() => {
return this.formatCurrency(this.price());
}); });
readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice()));
protected onAddToCart(): void { protected onAddToCart(): void {
if (this.saving()) {
return;
}
this.addToCart.emit({ this.addToCart.emit({
quantity: this.quantity(), quantity: this.quantity(),
variant: this.selectedVariant(), variant: this.selectedVariant(),

View File

@@ -0,0 +1,96 @@
<article class="ticket-selector">
<header class="ticket-selector__header">
<div>
<h3 class="ticket-selector__title">{{ title() }}</h3>
@if (description()) {
<p class="ticket-selector__description">{{ description() }}</p>
}
</div>
<span class="ticket-selector__price text-primary">
@if (priceRange().hasRange) {
de <strong>{{ priceRange().minimum }}</strong> a
<strong>{{ priceRange().maximum }}</strong>
} @else {
<strong>{{ priceRange().minimum }}</strong>
}
</span>
</header>
<div class="ticket-selector__selection">
<span class="ticket-selector__label">Seleccioná Entrada/s:</span>
<div class="ticket-selector__rows">
@for (row of rows(); track row.id) {
<div class="ticket-selector__row">
<div class="ticket-selector__row-content">
<div class="ticket-selector__fields variant-selector">
@for (selector of row.selectors; track selector.key) {
<select
class="form-select variant-selector__select"
[attr.aria-label]="selector.label"
[disabled]="rowDisabled(row) || !selector.enabled"
(change)="onSelectionKeyChange(row.id, selector, $any($event.target).value)"
>
<option
value=""
disabled
[selected]="selectedOptionKey(row, selector.key) === ''"
>
Seleccioná {{ selector.label }}
</option>
@for (option of selector.options; track $index) {
<option
[value]="optionKey(option)"
[selected]="optionKey(option) === selectedOptionKey(row, selector.key)"
>
{{ optionLabel(option) }}
</option>
}
</select>
}
</div>
@if (row.status === 'reserving') {
<span class="ticket-selector__row-status" role="status" aria-live="polite">
Guardando...
</span>
}
</div>
<app-icon-button
variant="trash"
[bordered]="true"
ariaLabel="Eliminar entrada"
[disabled]="rowDisabled(row)"
(clicked)="removeRow(row.id)"
/>
</div>
}
</div>
<app-button
hostClass="ticket-selector__add-row"
buttonClass="ticket-selector__add-row-button"
variant="secondary"
[disabled]="disabled() || !canAddRow()"
(click)="addRow()"
>
+ Agregar entrada
</app-button>
@if (availableVariantCount() === 0) {
<p class="ticket-selector__empty">No hay entradas disponibles.</p>
}
<div class="ticket-selector__actions row g-0 justify-content-end">
<div class="col-12 col-md-3">
<app-button variant="primary" [disabled]="disabled() || !hasSelection()" (click)="onBuy()">
Comprar
</app-button>
</div>
</div>
</div>
@if (imageUrl(); as image) {
<img class="ticket-selector__map" [src]="image" [alt]="'Plano de ubicaciones de ' + title()" />
}
</article>

View File

@@ -0,0 +1,167 @@
:host {
display: block;
width: 100%;
}
.ticket-selector {
width: 100%;
&__header {
display: flex;
align-items: flex-start;
justify-content: space-between;
gap: 1rem;
padding-bottom: 1.25rem;
border-bottom: 1px solid var(--border-color);
}
&__title {
margin: 0;
color: #666;
font-size: 22px;
font-weight: 700;
letter-spacing: 0.4px;
text-transform: uppercase;
}
&__description {
margin: 0.35rem 0 0;
color: #777;
font-size: 13px;
}
&__price {
flex: 0 0 auto;
font-size: 25px;
font-weight: 400;
strong {
font-weight: 700;
}
}
&__selection {
padding-top: 1rem;
}
&__label {
display: inline-block;
margin-bottom: 0.5rem;
color: #555;
font-size: 15px;
font-weight: 700;
}
&__rows {
display: grid;
gap: 0.5rem;
}
&__row {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
align-items: start;
gap: 0.5rem;
}
&__row-content {
min-width: 0;
}
&__fields {
min-width: 0;
display: grid;
grid-template-columns: repeat(4, minmax(120px, 1fr));
gap: 0.5rem;
}
.variant-selector__select {
width: 100%;
min-width: 0;
height: 38px;
color: #666;
border-color: var(--border-color);
font-size: 14px;
cursor: pointer;
&:focus {
border-color: var(--tenant-primary);
box-shadow: 0 0 0 0.25rem rgba(0, 153, 51, 0.25);
}
}
&__add-row {
display: block;
width: 100%;
margin-top: 0.5rem;
::ng-deep .ticket-selector__add-row-button {
width: 100%;
}
}
&__row-status {
display: inline-flex;
align-items: center;
gap: 0.4rem;
margin-top: 0.35rem;
color: #777;
font-size: 13px;
&::before {
width: 0.8rem;
height: 0.8rem;
border: 2px solid currentcolor;
border-right-color: transparent;
border-radius: 50%;
animation: ticket-selector-spin 0.7s linear infinite;
content: '';
}
}
&__empty {
margin: 0;
color: #777;
font-size: 13px;
}
&__actions {
margin-top: 0.75rem;
}
&__map {
display: block;
width: min(100%, 720px);
max-height: 680px;
margin: 3rem auto 0;
object-fit: contain;
}
}
@keyframes ticket-selector-spin {
to {
transform: rotate(360deg);
}
}
@media (prefers-reduced-motion: reduce) {
.ticket-selector__row-status::before {
animation: none;
}
}
@media (max-width: 767.98px) {
.ticket-selector {
&__header {
flex-direction: column;
}
&__fields {
grid-template-columns: 1fr;
}
&__map {
margin-top: 2rem;
}
}
}

View File

@@ -0,0 +1,293 @@
import '@angular/compiler';
import { HttpErrorResponse } from '@angular/common/http';
import { signal } from '@angular/core';
import { TestBed, getTestBed } from '@angular/core/testing';
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
import { of, Subject, throwError } from 'rxjs';
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
import { CartService } from '../../../core/services/cart/cart.service';
import { CatalogService } from '../../../core/services/catalog/catalog.service';
import { ModalService } from '../../../core/services/modal.service';
import { ToastService } from '../../../core/services/toast.service';
import { ProductTicketSelectorComponent } from './product-ticket-selector.component';
const attributes = [
{ key: 'tipo', label: 'Tipo' },
{ key: 'sector', label: 'Sector' },
{ key: 'fila', label: 'Fila' },
{ key: 'asiento', label: 'Asiento' },
];
function variant(id: number, tipo: string, sector: string, fila: string, asiento: string) {
return {
id,
precio: '10000.00',
stock_tecnico: 1,
values: { tipo, sector, fila, asiento },
};
}
function mapResponse(variants: ReturnType<typeof variant>[]) {
return {
variants,
selectors: attributes.map(({ key, label }, index) => ({
key,
label,
options: index === 0 ? ['general'] : [],
enabled: index === 0,
})),
selected_values: {},
resolved_variant: null,
valid: variants.length > 0,
available_variant_count: variants.length,
matching_variant_count: variants.length,
price_range: { minimum: '10000.00', maximum: '10000.00' },
};
}
function cartWith(item: ReturnType<typeof variant> | null = null) {
return {
id: 10,
tenant_codigo: 'demo',
status: 'active',
subtotal: item === null ? '0.00' : '10000.00',
items:
item === null
? []
: [
{
id: 25,
cantidad: 1,
precio_unitario: '10000.00',
catalog_item_id: 7,
variant_id: item.id,
nombre: 'Entrada',
imagen: null,
variant: item,
},
],
};
}
describe('ProductTicketSelectorComponent', () => {
beforeAll(() => {
try {
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
} catch {
// Test environment may already be initialized by another setup entrypoint.
}
});
afterEach(() => TestBed.resetTestingModule());
async function createComponent({
maps,
addItem = vi.fn(),
cartState = signal(cartWith()),
toastDanger = vi.fn(),
}: {
maps: ReturnType<typeof mapResponse>[];
addItem?: ReturnType<typeof vi.fn>;
cartState?: ReturnType<typeof signal<ReturnType<typeof cartWith>>>;
toastDanger?: ReturnType<typeof vi.fn>;
}) {
const getVariantOptions = vi.fn();
maps.forEach((response) => getVariantOptions.mockReturnValueOnce(of(response)));
const catalogService = { withoutLoading: vi.fn(), getVariantOptions };
const cartService = {
cart: cartState.asReadonly(),
withoutLoading: vi.fn(),
addItem,
updateItemVariant: vi.fn(),
removeItem: vi.fn().mockReturnValue(of({ data: cartWith() })),
};
catalogService.withoutLoading.mockReturnValue(catalogService);
cartService.withoutLoading.mockReturnValue(cartService);
await TestBed.configureTestingModule({
imports: [ProductTicketSelectorComponent],
providers: [
{ provide: CatalogService, useValue: catalogService },
{ provide: CartService, useValue: cartService },
{
provide: ModalService,
useValue: { openConfirmDelete: vi.fn().mockReturnValue(of(true)) },
},
{ provide: ToastService, useValue: { danger: toastDanger } },
],
}).compileComponents();
const fixture = TestBed.createComponent(ProductTicketSelectorComponent);
fixture.componentRef.setInput('productId', 7);
fixture.componentRef.setInput('title', 'Entrada');
fixture.detectChanges();
await fixture.whenStable();
fixture.detectChanges();
return { fixture, getVariantOptions, cartService, toastDanger };
}
it('loads one map, recalculates the cascade locally and reserves only after the last select', async () => {
const selectedVariant = variant(401, 'general', 'A', '1', '1');
const variants = [
selectedVariant,
variant(402, 'general', 'A', '1', '2'),
variant(403, 'general', 'B', '2', '1'),
];
const addItem = vi.fn().mockReturnValue(of({ data: cartWith(selectedVariant) }));
const { fixture, getVariantOptions } = await createComponent({
maps: [mapResponse(variants)],
addItem,
});
const component = fixture.componentInstance;
expect(getVariantOptions).toHaveBeenCalledTimes(1);
expect(getVariantOptions).toHaveBeenCalledWith(7, { selected_values: {} });
component['onSelectionChange'](1, 'tipo', 'general');
component['onSelectionChange'](1, 'sector', 'A');
component['onSelectionChange'](1, 'fila', '1');
expect(getVariantOptions).toHaveBeenCalledTimes(1);
expect(addItem).not.toHaveBeenCalled();
expect(component['rows']()[0].selectors[3]).toMatchObject({
key: 'asiento',
options: ['1', '2'],
enabled: true,
});
component['onSelectionChange'](1, 'asiento', '1');
expect(getVariantOptions).toHaveBeenCalledTimes(1);
expect(addItem).toHaveBeenCalledWith(7, 401, 1);
expect(component['rows']()[0]).toMatchObject({
variantId: 401,
reservedVariantId: 401,
status: 'reserved',
});
});
it('shows a saving status while the selected seat is being reserved', async () => {
const selectedVariant = variant(401, 'general', 'A', '1', '1');
const reservation = new Subject<{ data: ReturnType<typeof cartWith> }>();
const addItem = vi.fn().mockReturnValue(reservation);
const { fixture } = await createComponent({
maps: [mapResponse([selectedVariant])],
addItem,
});
const component = fixture.componentInstance;
component['onSelectionChange'](1, 'tipo', 'general');
component['onSelectionChange'](1, 'sector', 'A');
component['onSelectionChange'](1, 'fila', '1');
component['onSelectionChange'](1, 'asiento', '1');
fixture.detectChanges();
const savingStatus = fixture.nativeElement.querySelector(
'.ticket-selector__row-status',
) as HTMLElement | null;
expect(savingStatus?.textContent?.trim()).toBe('Guardando...');
expect(savingStatus?.getAttribute('role')).toBe('status');
reservation.next({ data: cartWith(selectedVariant) });
reservation.complete();
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('.ticket-selector__row-status')).toBeNull();
});
it('shows the remove action as a bordered icon button', async () => {
const { fixture } = await createComponent({
maps: [mapResponse([variant(401, 'general', 'A', '1', '1')])],
});
const removeButton = fixture.nativeElement.querySelector(
'app-icon-button[ariaLabel="Eliminar entrada"] button',
) as HTMLButtonElement | null;
expect(removeButton?.classList.contains('icon-btn--bordered')).toBe(true);
});
it('clears only the seat after a stock conflict when the row still has alternatives', async () => {
const failed = variant(401, 'general', 'A', '1', '1');
const alternative = variant(402, 'general', 'A', '1', '2');
const message = 'El asiento ya no está disponible.';
const addItem = vi.fn().mockReturnValue(
throwError(
() =>
new HttpErrorResponse({
status: 422,
error: { message },
}),
),
);
const { fixture, getVariantOptions, toastDanger } = await createComponent({
maps: [mapResponse([failed, alternative]), mapResponse([alternative])],
addItem,
});
const component = fixture.componentInstance;
component['onSelectionChange'](1, 'tipo', 'general');
component['onSelectionChange'](1, 'sector', 'A');
component['onSelectionChange'](1, 'fila', '1');
component['onSelectionChange'](1, 'asiento', '1');
expect(getVariantOptions).toHaveBeenCalledTimes(2);
expect(component['rows']()[0]).toMatchObject({
selectedValues: { tipo: 'general', sector: 'A', fila: '1' },
variantId: null,
status: 'selecting',
error: message,
});
expect(component['rows']()[0].selectors[3].options).toEqual(['2']);
expect(toastDanger).toHaveBeenCalledWith(message);
});
it('also clears the row when the refreshed map has no seats for that row', async () => {
const failed = variant(401, 'general', 'A', '1', '1');
const otherRow = variant(402, 'general', 'A', '2', '1');
const addItem = vi
.fn()
.mockReturnValue(
throwError(() => new HttpErrorResponse({ status: 422, error: { message: 'Sin stock.' } })),
);
const { fixture } = await createComponent({
maps: [mapResponse([failed, otherRow]), mapResponse([otherRow])],
addItem,
});
const component = fixture.componentInstance;
component['onSelectionChange'](1, 'tipo', 'general');
component['onSelectionChange'](1, 'sector', 'A');
component['onSelectionChange'](1, 'fila', '1');
component['onSelectionChange'](1, 'asiento', '1');
expect(component['rows']()[0].selectedValues).toEqual({ tipo: 'general', sector: 'A' });
expect(component['rows']()[0].selectors[2]).toMatchObject({
key: 'fila',
options: ['2'],
enabled: true,
});
expect(component['rows']()[0].selectors[3].enabled).toBe(false);
});
it('restores a variant already reserved in the cart without another options request', async () => {
const reserved = variant(401, 'general', 'A', '1', '1');
const cartState = signal(cartWith(reserved));
const { fixture, getVariantOptions, cartService } = await createComponent({
maps: [mapResponse([])],
cartState,
});
expect(getVariantOptions).toHaveBeenCalledTimes(1);
expect(cartService.updateItemVariant).not.toHaveBeenCalled();
expect(fixture.componentInstance['rows']()[0]).toMatchObject({
variantId: 401,
reservedVariantId: 401,
cartItemId: 25,
selectedValues: { tipo: 'general', sector: 'A', fila: '1', asiento: '1' },
status: 'reserved',
});
});
});

View File

@@ -0,0 +1,625 @@
import { HttpErrorResponse } from '@angular/common/http';
import {
afterNextRender,
ChangeDetectionStrategy,
Component,
computed,
DestroyRef,
effect,
inject,
input,
output,
signal,
untracked,
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { Subscription } from 'rxjs';
import { CartItem } from '../../../core/services/cart/cart.interface';
import { CartService } from '../../../core/services/cart/cart.service';
import {
CatalogFeaturedItemVariant,
CatalogVariantOptionsResponse,
CatalogVariantSelector,
CatalogVariantValue,
} from '../../../core/services/catalog/catalog.interface';
import { CatalogService } from '../../../core/services/catalog/catalog.service';
import { ModalService } from '../../../core/services/modal.service';
import { ToastService } from '../../../core/services/toast.service';
import { ButtonComponent } from '../button/button.component';
import { IconButtonComponent } from '../icon-button/icon-button.component';
type TicketSelectionStatus =
| 'selecting'
| 'checking'
| 'reserving'
| 'reserved'
| 'removing'
| 'error';
interface VariantAttribute {
key: string;
label: string;
}
interface TicketSelectionRow {
id: number;
variantId: number | null;
reservedVariantId: number | null;
cartItemId: number | null;
selectedValues: Record<string, string | string[]>;
selectors: CatalogVariantSelector[];
reservedSelectedValues: Record<string, string | string[]>;
status: TicketSelectionStatus;
error: string | null;
}
@Component({
selector: 'app-product-ticket-selector',
imports: [ButtonComponent, IconButtonComponent],
templateUrl: './product-ticket-selector.component.html',
styleUrl: './product-ticket-selector.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class ProductTicketSelectorComponent {
private readonly catalogService = inject(CatalogService);
private readonly cartService = inject(CartService);
private readonly modalService = inject(ModalService);
private readonly toastService = inject(ToastService);
private readonly destroyRef = inject(DestroyRef);
private readonly reservationRequests = new Map<number, Subscription>();
private readonly viewReady = signal(false);
private readonly mapReady = signal(false);
private readonly variants = signal<CatalogFeaturedItemVariant[]>([]);
private readonly attributes = signal<VariantAttribute[]>([]);
private mapRequest: Subscription | null = null;
readonly productId = input.required<number>();
readonly title = input.required<string>();
readonly description = input<string>('');
readonly price = input<number>(0);
readonly imageUrl = input<string | null>(null);
readonly disabled = input(false);
readonly buy = output<number[]>();
protected readonly rows = signal<TicketSelectionRow[]>([this.createRow(1)]);
private readonly remotePriceRange = signal<{ minimum: number; maximum: number } | null>(null);
private nextRowId = 2;
protected readonly availableVariantCount = computed(() => {
const reservedIds = new Set(
this.rows().flatMap(({ reservedVariantId }) =>
reservedVariantId === null ? [] : [reservedVariantId],
),
);
return this.variants().filter(({ id }) => !reservedIds.has(id)).length;
});
protected readonly hasSelection = computed(
() =>
this.rows().length > 0 &&
this.rows().every(
(row) =>
row.status === 'reserved' &&
row.variantId !== null &&
row.variantId === row.reservedVariantId,
),
);
protected readonly canAddRow = computed(
() =>
this.availableVariantCount() > 0 &&
this.rows().every((row) => row.status === 'reserved') &&
!this.rows().some((row) => this.isBusy(row)),
);
protected readonly priceRange = computed(() => {
const range = this.remotePriceRange();
const minimum = range?.minimum ?? this.price();
const maximum = range?.maximum ?? this.price();
return {
minimum: this.formatCurrency(minimum),
maximum: this.formatCurrency(maximum),
hasRange: minimum !== maximum,
};
});
constructor() {
effect(() => {
const viewReady = this.viewReady();
const mapReady = this.mapReady();
const cart = this.cartService.cart?.() ?? null;
if (!viewReady) return;
untracked(() => {
if (!mapReady) {
this.loadVariantMap();
return;
}
this.synchronizeWithCart(cart?.items ?? []);
});
});
afterNextRender(() => this.viewReady.set(true));
this.destroyRef.onDestroy(() => {
this.mapRequest?.unsubscribe();
this.reservationRequests.forEach((request) => request.unsubscribe());
});
}
protected onBuy(): void {
const variantIds = this.rows().flatMap((row) =>
row.reservedVariantId === null ? [] : [row.reservedVariantId],
);
if (this.hasSelection() && variantIds.length > 0) this.buy.emit(variantIds);
}
protected addRow(): void {
if (!this.canAddRow()) return;
const row = this.createRow(this.nextRowId++);
row.status = 'selecting';
row.selectors = this.buildSelectors(row.selectedValues, row);
this.rows.update((rows) => [...rows, row]);
}
protected removeRow(rowId: number): void {
const row = this.findRow(rowId);
if (!row || this.isBusy(row)) return;
this.modalService
.openConfirmDelete({
title: 'Eliminar entrada',
content: `Se eliminará esta entrada de “${this.title()}”. Si ya estaba reservada, se liberará del carrito.`,
confirmLabel: 'Sí, eliminar',
cancelLabel: 'Cancelar',
size: 'md',
})
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((confirmed) => {
if (confirmed) this.confirmRemoveRow(row);
});
}
private confirmRemoveRow(row: TicketSelectionRow): void {
if (row.cartItemId === null) {
this.deleteRow(row.id);
return;
}
this.patchRow(row.id, { status: 'removing', error: null });
const request = this.cartService
.withoutLoading()
.removeItem(row.cartItemId)
.subscribe({
next: () => this.deleteRow(row.id),
error: (error: HttpErrorResponse) => {
this.patchRow(row.id, {
status: 'reserved',
error: this.errorMessage(error, 'No se pudo liberar la entrada.'),
});
},
});
this.reservationRequests.set(row.id, request);
}
protected onSelectionChange(
rowId: number,
selectorKey: string,
value: CatalogVariantValue | null,
): void {
const row = this.findRow(rowId);
if (!row || this.isBusy(row)) return;
const selectorIndex = this.attributes().findIndex(({ key }) => key === selectorKey);
if (selectorIndex < 0) return;
const selectedValues = { ...row.selectedValues };
if (value === null) delete selectedValues[selectorKey];
else selectedValues[selectorKey] = this.normalizeValue(value);
this.attributes()
.slice(selectorIndex + 1)
.forEach(({ key }) => delete selectedValues[key]);
const variant = this.resolveVariant(row, selectedValues);
this.patchRow(rowId, {
variantId: variant?.id ?? null,
selectedValues,
selectors: this.buildSelectors(selectedValues, row),
status: 'selecting',
error: null,
});
if (variant !== null) this.reserveRow(rowId, variant.id, selectedValues);
}
protected optionLabel(value: CatalogVariantValue): string {
const values = Array.isArray(value) ? value : [value];
return values.map((item) => (typeof item === 'string' ? item : item.label)).join(', ');
}
protected selectedOption(row: TicketSelectionRow, key: string): string | string[] | null {
return row.selectedValues[key] ?? null;
}
protected optionKey(value: CatalogVariantValue): string {
return this.valueKey(value);
}
protected selectedOptionKey(row: TicketSelectionRow, key: string): string {
const selectedOption = this.selectedOption(row, key);
return selectedOption === null ? '' : this.valueKey(selectedOption);
}
protected onSelectionKeyChange(
rowId: number,
selector: CatalogVariantSelector,
selectedKey: string,
): void {
const selectedOption =
selector.options.find((option) => this.valueKey(option) === selectedKey) ?? null;
this.onSelectionChange(rowId, selector.key, selectedOption);
}
protected rowDisabled(row: TicketSelectionRow): boolean {
return this.disabled() || this.isBusy(row);
}
private loadVariantMap(
onLoaded?: () => void,
onError?: (error: HttpErrorResponse) => void,
): void {
if (this.mapRequest !== null && !onLoaded) return;
this.mapRequest?.unsubscribe();
const request = this.catalogService
.withoutLoading()
.getVariantOptions(this.productId(), { selected_values: {} })
.subscribe({
next: (response) => {
this.applyVariantMap(response);
this.mapReady.set(true);
this.mapRequest = null;
onLoaded?.();
},
error: (error: HttpErrorResponse) => {
this.mapRequest = null;
if (onError) {
onError(error);
return;
}
const message = this.errorMessage(error, 'No se pudo consultar la disponibilidad.');
this.rows.update((rows) =>
rows.map((row) => ({ ...row, status: 'error', error: message })),
);
this.toastService.danger(message);
},
});
this.mapRequest = request;
}
private applyVariantMap(response: CatalogVariantOptionsResponse): void {
this.variants.set(response.variants);
this.attributes.set(response.selectors.map(({ key, label }) => ({ key, label })));
this.remotePriceRange.set({
minimum: Number(response.price_range.minimum),
maximum: Number(response.price_range.maximum),
});
}
private buildSelectors(
selectedValues: Record<string, string | string[]>,
row: TicketSelectionRow,
variants = this.availableVariantsFor(row),
): CatalogVariantSelector[] {
return this.attributes().map(({ key, label }, index, attributes) => {
const previousKeys = attributes.slice(0, index).map((attribute) => attribute.key);
const compatibleVariants = variants.filter((variant) =>
previousKeys.every(
(previousKey) =>
previousKey in selectedValues &&
this.valueKey(variant.values[previousKey]) ===
this.valueKey(selectedValues[previousKey]),
),
);
return {
key,
label,
options: this.uniqueValues(compatibleVariants.map((variant) => variant.values[key])),
enabled: index === 0 || previousKeys.every((previousKey) => previousKey in selectedValues),
};
});
}
private resolveVariant(
row: TicketSelectionRow,
selectedValues: Record<string, string | string[]>,
): CatalogFeaturedItemVariant | null {
const attributes = this.attributes();
if (attributes.length === 0 || attributes.some(({ key }) => !(key in selectedValues)))
return null;
const matches = this.availableVariantsFor(row).filter((variant) =>
attributes.every(
({ key }) => this.valueKey(variant.values[key]) === this.valueKey(selectedValues[key]),
),
);
return matches.length === 1 ? matches[0] : null;
}
private availableVariantsFor(row: TicketSelectionRow): CatalogFeaturedItemVariant[] {
const reservedByOtherRows = new Set(
this.rows().flatMap((candidate) =>
candidate.id !== row.id && candidate.reservedVariantId !== null
? [candidate.reservedVariantId]
: [],
),
);
const variants = [...this.variants()];
const reservedVariant = this.reservedVariantData(row);
if (reservedVariant !== null && !variants.some(({ id }) => id === reservedVariant.id)) {
variants.push(reservedVariant);
}
return variants.filter(({ id }) => !reservedByOtherRows.has(id));
}
private reservedVariantData(row: TicketSelectionRow): CatalogFeaturedItemVariant | null {
if (row.cartItemId === null || row.reservedVariantId === null) return null;
const item = this.cartService.cart?.()?.items.find(({ id }) => id === row.cartItemId);
if (!item?.variant) return null;
return {
id: item.variant.id,
precio: item.variant.precio,
stock_tecnico: item.variant.stock_tecnico,
values: item.variant.values,
};
}
private uniqueValues(values: Array<CatalogVariantValue | undefined>): CatalogVariantValue[] {
const unique = new Map<string, CatalogVariantValue>();
values.forEach((value) => {
if (value !== undefined) unique.set(this.valueKey(value), value);
});
return [...unique.values()];
}
private reserveRow(
rowId: number,
variantId: number,
selectedValues: Record<string, string | string[]>,
): void {
const row = this.findRow(rowId);
if (!row || (row.status === 'reserved' && row.reservedVariantId === variantId)) return;
this.patchRow(rowId, { status: 'reserving', error: null });
const cartService = this.cartService.withoutLoading();
const operation =
row.cartItemId === null
? cartService.addItem(this.productId(), variantId, 1)
: cartService.updateItemVariant(row.cartItemId, 1, variantId);
const request = operation.subscribe({
next: (response) => {
const cartItem =
row.cartItemId === null
? response.data.items.find(
(item) =>
item.catalog_item_id === this.productId() && item.variant_id === variantId,
)
: response.data.items.find((item) => item.id === row.cartItemId);
if (!cartItem) {
this.patchRow(rowId, {
variantId: row.reservedVariantId,
status: row.reservedVariantId === null ? 'error' : 'reserved',
error: 'No se pudo identificar la entrada reservada.',
});
return;
}
const currentRow = this.findRow(rowId) ?? row;
this.patchRow(rowId, {
variantId,
reservedVariantId: variantId,
selectedValues,
selectors: this.buildSelectors(selectedValues, currentRow),
reservedSelectedValues: selectedValues,
cartItemId: cartItem.id,
status: 'reserved',
error: null,
});
},
error: (error: HttpErrorResponse) => {
const message = this.errorMessage(error, 'La entrada ya no está disponible.');
if (error.status === 422) {
this.recoverFromUnavailableVariant(rowId, variantId, message);
return;
}
this.restoreReservedRowAfterError(rowId, row, message);
},
});
this.reservationRequests.set(rowId, request);
}
private recoverFromUnavailableVariant(
rowId: number,
failedVariantId: number,
message: string,
): void {
this.patchRow(rowId, { status: 'checking', error: null });
this.loadVariantMap(
() => this.backtrackSelection(rowId, failedVariantId, message),
() => {
const row = this.findRow(rowId);
if (row) this.restoreReservedRowAfterError(rowId, row, message);
},
);
}
private backtrackSelection(rowId: number, failedVariantId: number, message: string): void {
const row = this.findRow(rowId);
if (!row) return;
const variants = this.availableVariantsFor(row).filter(({ id }) => id !== failedVariantId);
const selectedValues = { ...row.selectedValues };
const attributes = this.attributes();
for (let index = attributes.length - 1; index >= 0; index--) {
delete selectedValues[attributes[index].key];
const prefixKeys = attributes.slice(0, index).map(({ key }) => key);
const hasCompatibleVariant = variants.some((variant) =>
prefixKeys.every(
(key) =>
key in selectedValues &&
this.valueKey(variant.values[key]) === this.valueKey(selectedValues[key]),
),
);
if (!hasCompatibleVariant) continue;
this.patchRow(rowId, {
variantId: null,
selectedValues: { ...selectedValues },
selectors: this.buildSelectors(selectedValues, row, variants),
status: 'selecting',
error: message,
});
this.toastService.danger(message);
return;
}
this.patchRow(rowId, {
variantId: null,
selectedValues: {},
selectors: this.buildSelectors({}, row, variants),
status: 'error',
error: message,
});
this.toastService.danger(message);
}
private restoreReservedRowAfterError(
rowId: number,
row: TicketSelectionRow,
message: string,
): void {
if (row.reservedVariantId === null) {
this.patchRow(rowId, { variantId: null, status: 'error', error: message });
} else {
const selectedValues = row.reservedSelectedValues;
this.patchRow(rowId, {
variantId: row.reservedVariantId,
selectedValues,
selectors: this.buildSelectors(selectedValues, row),
status: 'reserved',
error: null,
});
}
this.toastService.danger(message);
}
private createRow(id: number): TicketSelectionRow {
return {
id,
variantId: null,
reservedVariantId: null,
cartItemId: null,
selectedValues: {},
selectors: [],
reservedSelectedValues: {},
status: 'checking',
error: null,
};
}
private createCartRow(item: CartItem, id = this.nextRowId++): TicketSelectionRow | null {
if (item.variant_id === null || item.variant === null) return null;
const selectedValues = Object.fromEntries(
Object.entries(item.variant.values).map(([key, value]) => [key, this.normalizeValue(value)]),
);
return {
id,
variantId: item.variant_id,
reservedVariantId: item.variant_id,
cartItemId: item.id,
selectedValues,
selectors: [],
reservedSelectedValues: selectedValues,
status: 'reserved',
error: null,
};
}
private synchronizeWithCart(items: CartItem[]): void {
const cartItems = items.filter(
(item) => item.catalog_item_id === this.productId() && item.variant_id !== null,
);
const currentRows = this.rows();
if (cartItems.length === 0) {
const localRows = currentRows.filter((row) => row.cartItemId === null);
const rows = localRows.length > 0 ? localRows : [this.createRow(this.nextRowId++)];
this.replaceRows(this.withRefreshedSelectors(rows));
return;
}
const synchronizedRows = cartItems.flatMap((item) => {
const existingRow = currentRows.find((row) => row.cartItemId === item.id);
if (existingRow?.reservedVariantId === item.variant_id) return [existingRow];
const cartRow = this.createCartRow(item, existingRow?.id);
return cartRow === null ? [] : [cartRow];
});
const localRows = currentRows.filter(
(row) => row.cartItemId === null && Object.keys(row.selectedValues).length > 0,
);
this.replaceRows(this.withRefreshedSelectors([...synchronizedRows, ...localRows]));
}
private withRefreshedSelectors(rows: TicketSelectionRow[]): TicketSelectionRow[] {
const previousRows = this.rows();
this.rows.set(rows);
const refreshed = rows.map((row) => ({
...row,
status: row.status === 'checking' ? ('selecting' as const) : row.status,
selectors: this.buildSelectors(row.selectedValues, row),
}));
this.rows.set(previousRows);
return refreshed;
}
private replaceRows(rows: TicketSelectionRow[]): void {
const retainedIds = new Set(rows.map(({ id }) => id));
this.rows().forEach((row) => {
if (retainedIds.has(row.id)) return;
this.reservationRequests.get(row.id)?.unsubscribe();
this.reservationRequests.delete(row.id);
});
this.rows.set(rows);
}
private findRow(rowId: number): TicketSelectionRow | undefined {
return this.rows().find((row) => row.id === rowId);
}
private patchRow(rowId: number, patch: Partial<TicketSelectionRow>): void {
this.rows.update((rows) => rows.map((row) => (row.id === rowId ? { ...row, ...patch } : row)));
}
private deleteRow(rowId: number): void {
this.rows.update((rows) => rows.filter((row) => row.id !== rowId));
this.reservationRequests.delete(rowId);
}
private isBusy(row: TicketSelectionRow): boolean {
return ['checking', 'reserving', 'removing'].includes(row.status);
}
private normalizeValue(value: CatalogVariantValue): string | string[] {
return Array.isArray(value)
? value.map((item) => this.scalarValue(item))
: this.scalarValue(value);
}
private scalarValue(value: string | { value: string }): string {
return typeof value === 'string' ? value : value.value;
}
private valueKey(value: CatalogVariantValue): string {
return JSON.stringify(this.normalizeValue(value));
}
private errorMessage(error: HttpErrorResponse, fallback: string): string {
return typeof error.error?.message === 'string' ? error.error.message : fallback;
}
private formatCurrency(value: number): string {
return new Intl.NumberFormat('es-AR', {
style: 'currency',
currency: 'ARS',
maximumFractionDigits: 0,
}).format(value);
}
}

View File

@@ -2,8 +2,8 @@
<div class="product-vertical-with-cart-card__content"> <div class="product-vertical-with-cart-card__content">
<h3 class="product-vertical-with-cart-card__title">{{ title() }}</h3> <h3 class="product-vertical-with-cart-card__title">{{ title() }}</h3>
@if (description()) { @if (effectiveDescription()) {
<p class="product-vertical-with-cart-card__description">{{ description() }}</p> <p class="product-vertical-with-cart-card__description">{{ effectiveDescription() }}</p>
} }
</div> </div>
@@ -13,47 +13,15 @@
<span class="product-vertical-with-cart-card__price">{{ formattedPrice() }}</span> <span class="product-vertical-with-cart-card__price">{{ formattedPrice() }}</span>
<app-quantity-selector [(quantity)]="quantity" /> <app-quantity-selector [(quantity)]="quantity" />
</div> </div>
} @else if (!hasMultipleVariantSelectors()) {
<div class="product-vertical-with-cart-card__single-variant">
<span class="product-vertical-with-cart-card__price">{{ formattedPrice() }}</span>
<div class="product-vertical-with-cart-card__single-variant-row">
@for (selector of variantSelectors(); track selector.key) {
<select
class="form-select product-vertical-with-cart-card__variant-select"
[attr.aria-label]="selector.label"
[ngModel]="selectedValues()[selector.key]"
(ngModelChange)="onVariantValueChange(selector.key, $event)"
>
@for (option of selector.options; track option) {
<option [ngValue]="option">{{ option }}</option>
}
</select>
}
<app-quantity-selector [(quantity)]="quantity" />
</div>
</div>
} @else { } @else {
<div class="product-vertical-with-cart-card__multiple-variants"> <div class="product-vertical-with-cart-card__variants">
<div class="product-vertical-with-cart-card__summary-column"> <div class="product-vertical-with-cart-card__summary">
<span class="product-vertical-with-cart-card__price">{{ formattedPrice() }}</span> <span class="product-vertical-with-cart-card__price">{{ formattedPrice() }}</span>
<app-quantity-selector [(quantity)]="quantity" /> <app-quantity-selector [(quantity)]="quantity" />
</div> </div>
<div class="product-vertical-with-cart-card__variant-selectors"> <div class="product-vertical-with-cart-card__variant-selectors">
@for (selector of variantSelectors(); track selector.key) { <app-variant-selector [variants]="variants()" [(selectedVariant)]="selectedVariant" />
<select
class="form-select product-vertical-with-cart-card__variant-select"
[attr.aria-label]="selector.label"
[ngModel]="selectedValues()[selector.key]"
(ngModelChange)="onVariantValueChange(selector.key, $event)"
>
@for (option of selector.options; track option) {
<option [ngValue]="option">{{ option }}</option>
}
</select>
}
</div> </div>
</div> </div>
} }
@@ -68,10 +36,10 @@
</app-button> </app-button>
<app-button <app-button
variant="secondary" variant="secondary"
[disabled]="hasVariants() && selectedVariant() === null" [disabled]="saving() || (hasVariants() && selectedVariant() === null)"
(click)="onAddToCart()" (click)="onAddToCart()"
> >
Agregar al carrito {{ saving() ? 'Guardando' : 'Agregar al carrito' }}
</app-button> </app-button>
</div> </div>
</div> </div>

View File

@@ -19,7 +19,7 @@
padding: 30px 20px; padding: 30px 20px;
overflow: hidden; overflow: hidden;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #dedede; border: 1px solid var(--border-color);
border-radius: 7px; border-radius: 7px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
@@ -60,59 +60,17 @@
padding-inline: 12px; padding-inline: 12px;
} }
&__single-variant { &__variants {
display: grid; display: grid;
justify-items: center;
gap: 16px; gap: 16px;
} }
&__single-variant-row { &__variant-selectors {
display: flex;
align-items: center;
width: 100%; width: 100%;
gap: 8px;
} }
&__multiple-variants { &__variant-selectors app-variant-selector {
display: grid; width: 100%;
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
align-items: center;
gap: 16px;
}
&__summary-column,
&__variant-selectors {
display: flex;
flex-direction: column;
align-items: center;
gap: 10px;
min-width: 0;
}
&__variant-selectors {
align-items: stretch;
}
&__variant-select {
min-width: 0;
height: 40px;
border-color: #d8d8d8;
color: #6f6f6f;
font-size: 12px;
&:focus {
border-color: var(--tenant-primary, #009933);
box-shadow: 0 0 0 0.2rem color-mix(in srgb, transparent 75%, var(--tenant-primary, #009933));
}
}
&__single-variant-row &__variant-select {
flex: 1 1 auto;
}
&__single-variant-row app-quantity-selector {
flex: 0 0 auto;
} }
&__price { &__price {
@@ -145,6 +103,16 @@
@media (max-width: 767.98px) { @media (max-width: 767.98px) {
.product-vertical-with-cart-card { .product-vertical-with-cart-card {
border-color: var(--color-primary, var(--tenant-primary, #009933)); border-color: var(--color-primary, var(--tenant-primary, #009933));
&__title {
color: var(--color-primary, var(--tenant-primary, #009933));
font-size: 15px;
}
&__description {
font-size: 13px;
font-weight: 400;
}
} }
} }

View File

@@ -1,4 +1,4 @@
import { TestBed, getTestBed } from '@angular/core/testing'; import { TestBed, getTestBed } from '@angular/core/testing';
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing'; import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest'; import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
@@ -17,7 +17,7 @@ describe('ProductVerticalWithCartCardComponent', () => {
TestBed.resetTestingModule(); TestBed.resetTestingModule();
}); });
async function createComponent(description = 'Pancho con aderezo a elección.') { async function createComponent(description = 'Pancho con aderezo a elección.') {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [ProductVerticalWithCartCardComponent], imports: [ProductVerticalWithCartCardComponent],
}).compileComponents(); }).compileComponents();
@@ -40,7 +40,7 @@ describe('ProductVerticalWithCartCardComponent', () => {
); );
expect( expect(
element.querySelector('.product-vertical-with-cart-card__description')?.textContent, element.querySelector('.product-vertical-with-cart-card__description')?.textContent,
).toContain('Pancho con aderezo a elección.'); ).toContain('Pancho con aderezo a elección.');
expect( expect(
element.querySelector('.product-vertical-with-cart-card__price')?.textContent?.trim(), element.querySelector('.product-vertical-with-cart-card__price')?.textContent?.trim(),
).toBe('$ 11.500'); ).toBe('$ 11.500');
@@ -116,7 +116,7 @@ describe('ProductVerticalWithCartCardComponent', () => {
).not.toBeNull(); ).not.toBeNull();
}); });
it('places a single variant selector in the same row as the quantity', async () => { it('places price and quantity together above a single variant selector', async () => {
const fixture = await createComponent(); const fixture = await createComponent();
fixture.componentRef.setInput('variants', [ fixture.componentRef.setInput('variants', [
{ id: 10, values: { fecha: '10 de octubre' } }, { id: 10, values: { fecha: '10 de octubre' } },
@@ -125,31 +125,31 @@ describe('ProductVerticalWithCartCardComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
const row = element.querySelector('.product-vertical-with-cart-card__single-variant-row'); const summary = element.querySelector('.product-vertical-with-cart-card__summary');
const selectors = element.querySelector('.product-vertical-with-cart-card__variant-selectors');
expect(row?.querySelectorAll('.product-vertical-with-cart-card__variant-select')).toHaveLength( expect(summary?.querySelector('.product-vertical-with-cart-card__price')).not.toBeNull();
1, expect(summary?.querySelector('app-quantity-selector')).not.toBeNull();
); expect(selectors?.querySelectorAll('.variant-selector__select')).toHaveLength(1);
expect(row?.querySelector('app-quantity-selector')).not.toBeNull(); expect(selectors?.querySelector('app-quantity-selector')).toBeNull();
expect(element.querySelector('.product-vertical-with-cart-card__multiple-variants')).toBeNull();
}); });
it('uses separate summary and selector columns for multiple variant attributes', async () => { it('places all variant selectors together below price and quantity', async () => {
const fixture = await createComponent(); const fixture = await createComponent();
fixture.componentRef.setInput('variants', [ fixture.componentRef.setInput('variants', [
{ id: 20, values: { fecha: '10 de octubre', turno: 'Mañana' } }, { id: 20, values: { fecha: '10 de octubre', turno: 'Mañana' } },
{ id: 21, values: { fecha: '10 de octubre', turno: 'Tarde' } }, { id: 21, values: { fecha: '10 de octubre', turno: 'Tarde' } },
]); ]);
fixture.detectChanges(); fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
const layout = element.querySelector('.product-vertical-with-cart-card__multiple-variants'); const layout = element.querySelector('.product-vertical-with-cart-card__variants');
expect(layout?.querySelector('.product-vertical-with-cart-card__summary')).not.toBeNull();
expect( expect(
layout?.querySelector('.product-vertical-with-cart-card__summary-column'), layout?.querySelectorAll(
).not.toBeNull(); '.product-vertical-with-cart-card__variant-selectors .variant-selector__select',
expect( ),
layout?.querySelectorAll('.product-vertical-with-cart-card__variant-select'),
).toHaveLength(2); ).toHaveLength(2);
}); });
@@ -164,7 +164,7 @@ describe('ProductVerticalWithCartCardComponent', () => {
fixture.componentInstance.buy.subscribe(buySpy); fixture.componentInstance.buy.subscribe(buySpy);
const select = fixture.nativeElement.querySelector( const select = fixture.nativeElement.querySelector(
'.product-vertical-with-cart-card__variant-select', '.variant-selector__select',
) as HTMLSelectElement; ) as HTMLSelectElement;
select.value = select.options[1].value; select.value = select.options[1].value;
select.dispatchEvent(new Event('change')); select.dispatchEvent(new Event('change'));
@@ -177,4 +177,43 @@ describe('ProductVerticalWithCartCardComponent', () => {
expect(buySpy).toHaveBeenCalledWith({ quantity: 1, variant: 31 }); expect(buySpy).toHaveBeenCalledWith({ quantity: 1, variant: 31 });
}); });
it('prioritizes the selected variant description and price', async () => {
const fixture = await createComponent('Descripción general');
fixture.componentRef.setInput('variants', [
{
id: 40,
descripcion: 'Almuerzo en comedor',
precio: '10000.00',
values: { servicio: 'Comedor' },
},
{
id: 41,
descripcion: 'Almuerzo en vianda',
precio: '8000.00',
values: { servicio: 'Vianda' },
},
]);
fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement;
expect(
element.querySelector('.product-vertical-with-cart-card__description')?.textContent,
).toContain('Almuerzo en comedor');
expect(
element.querySelector('.product-vertical-with-cart-card__price')?.textContent?.trim(),
).toBe('$ 10.000');
const select = element.querySelector('.variant-selector__select') as HTMLSelectElement;
select.value = select.options[1].value;
select.dispatchEvent(new Event('change'));
fixture.detectChanges();
expect(
element.querySelector('.product-vertical-with-cart-card__description')?.textContent,
).toContain('Almuerzo en vianda');
expect(
element.querySelector('.product-vertical-with-cart-card__price')?.textContent?.trim(),
).toBe('$ 8.000');
});
}); });

View File

@@ -1,33 +1,20 @@
import { import { ChangeDetectionStrategy, Component, computed, input, model, output } from '@angular/core';
ChangeDetectionStrategy,
Component,
computed,
effect,
input,
model,
output,
signal,
untracked,
} from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ButtonComponent } from '../button/button.component'; import { ButtonComponent } from '../button/button.component';
import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component'; import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
import {
VariantSelectorComponent,
VariantSelectorVariant,
} from '../variant-selector/variant-selector.component';
export interface VerticalCartVariant { export interface VerticalCartVariant extends VariantSelectorVariant {
id: number; descripcion?: string | null;
values: Record<string, string>; precio?: string | number;
}
interface VariantSelector {
key: string;
label: string;
options: string[];
} }
@Component({ @Component({
selector: 'app-product-vertical-with-cart-card', selector: 'app-product-vertical-with-cart-card',
imports: [ButtonComponent, FormsModule, QuantitySelectorComponent], imports: [ButtonComponent, QuantitySelectorComponent, VariantSelectorComponent],
templateUrl: './product-vertical-with-cart-card.component.html', templateUrl: './product-vertical-with-cart-card.component.html',
styleUrl: './product-vertical-with-cart-card.component.scss', styleUrl: './product-vertical-with-cart-card.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
@@ -37,6 +24,7 @@ export class ProductVerticalWithCartCardComponent {
readonly description = input<string>(''); readonly description = input<string>('');
readonly price = input<number>(0); readonly price = input<number>(0);
readonly variants = input<VerticalCartVariant[]>([]); readonly variants = input<VerticalCartVariant[]>([]);
readonly saving = input(false);
readonly quantity = model<number>(1); readonly quantity = model<number>(1);
readonly selectedVariant = model<number | null>(null); readonly selectedVariant = model<number | null>(null);
@@ -44,62 +32,25 @@ export class ProductVerticalWithCartCardComponent {
readonly buy = output<{ quantity: number; variant: number | null }>(); readonly buy = output<{ quantity: number; variant: number | null }>();
readonly addToCart = output<{ quantity: number; variant: number | null }>(); readonly addToCart = output<{ quantity: number; variant: number | null }>();
protected readonly selectedValues = signal<Record<string, string>>({}); protected readonly selectedVariantData = computed(() =>
this.variants().find((variant) => variant.id === this.selectedVariant()),
protected readonly formattedPrice = computed(() => this.formatCurrency(this.price()));
protected readonly variantSelectors = computed<VariantSelector[]>(() => {
const variants = this.variants();
const keys = Array.from(new Set(variants.flatMap((variant) => Object.keys(variant.values))));
return keys.map((key) => ({
key,
label: this.formatVariantLabel(key),
options: Array.from(
new Set(
variants
.map((variant) => variant.values[key])
.filter((value): value is string => Boolean(value)),
),
),
}));
});
protected readonly hasVariants = computed(() => this.variantSelectors().length > 0);
protected readonly hasMultipleVariantSelectors = computed(
() => this.variantSelectors().length > 1,
); );
protected readonly effectiveDescription = computed(
() => this.selectedVariantData()?.descripcion ?? this.description(),
);
protected readonly effectivePrice = computed(() => {
const variantPrice = Number(this.selectedVariantData()?.precio);
constructor() { return Number.isFinite(variantPrice) ? variantPrice : this.price();
effect(() => { });
const variants = this.variants(); protected readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice()));
protected readonly hasVariants = computed(() => this.variants().length > 0);
untracked(() => {
if (variants.length === 0) {
this.selectedValues.set({});
this.selectedVariant.set(null);
return;
}
const selected =
variants.find((variant) => variant.id === this.selectedVariant()) ?? variants[0];
this.selectedValues.set({ ...selected.values });
this.selectedVariant.set(selected.id);
});
});
}
protected onVariantValueChange(key: string, value: string): void {
const values = { ...this.selectedValues(), [key]: value };
const selectors = this.variantSelectors();
const matchingVariant = this.variants().find((variant) =>
selectors.every((selector) => variant.values[selector.key] === values[selector.key]),
);
this.selectedValues.set(values);
this.selectedVariant.set(matchingVariant?.id ?? null);
}
protected onAddToCart(): void { protected onAddToCart(): void {
if (this.saving()) {
return;
}
this.addToCart.emit({ quantity: this.quantity(), variant: this.selectedVariant() }); this.addToCart.emit({ quantity: this.quantity(), variant: this.selectedVariant() });
} }
@@ -107,11 +58,6 @@ export class ProductVerticalWithCartCardComponent {
this.buy.emit({ quantity: this.quantity(), variant: this.selectedVariant() }); this.buy.emit({ quantity: this.quantity(), variant: this.selectedVariant() });
} }
private formatVariantLabel(key: string): string {
const label = key.replace(/[_-]+/g, ' ');
return label.charAt(0).toUpperCase() + label.slice(1);
}
private formatCurrency(value: number): string { private formatCurrency(value: number): string {
const rounded = Math.round(value); const rounded = Math.round(value);
const parts = rounded.toString().split('.'); const parts = rounded.toString().split('.');

View File

@@ -3,11 +3,11 @@
} }
.quantity-selector { .quantity-selector {
border: 1px solid #d8d8d8; border: 1px solid var(--border-color);
width: 78px; width: 78px;
height: 40px; height: 40px;
min-height: 40px; min-height: 40px;
background: inherit; background-color: #ffffff;
box-sizing: border-box; box-sizing: border-box;
&__button { &__button {
@@ -15,8 +15,10 @@
height: 100%; height: 100%;
font-size: 20px; font-size: 20px;
color: #6f6f6f; color: #6f6f6f;
background: inherit; background-color: #ffffff;
transition: background-color 0.2s ease, color 0.2s ease; transition:
background-color 0.2s ease,
color 0.2s ease;
cursor: pointer; cursor: pointer;
&:not(:disabled):hover { &:not(:disabled):hover {
@@ -25,7 +27,7 @@
} }
&:disabled { &:disabled {
color: #A0A0A0; color: #a0a0a0;
opacity: 1; opacity: 1;
cursor: not-allowed; cursor: not-allowed;
} }
@@ -37,16 +39,16 @@
} }
&--small { &--small {
width: 46px; width: 62px;
height: 21px; height: 28px;
min-height: 21px; min-height: 28px;
border: 1px solid #cfcfcf; border-color: var(--border-color);
background: inherit; background-color: #ffffff;
.quantity-selector__button { .quantity-selector__button {
width: 15px; width: 18px;
font-size: 10px; font-size: 11px;
background: inherit; background-color: #ffffff;
color: #666666; color: #666666;
&:not(:disabled):hover { &:not(:disabled):hover {
@@ -55,7 +57,7 @@
} }
.quantity-selector__value { .quantity-selector__value {
font-size: 10px; font-size: 11px;
color: #666666; color: #666666;
} }
} }

Some files were not shown because too many files have changed in this diff Show More