Compare commits

...

24 Commits

Author SHA1 Message Date
4251ca8a8a fix(checkout): redirect expired purchases from checkout 2026-08-20 17:01:34 -03:00
cfa1091116 feat(checkout): enhance payment submission with error handling and polling logic 2026-08-20 15:53:33 -03:00
d0b1607ff4 refactor(checkout): update checkout navigation logic to retain purchase state 2026-08-20 13:53:52 -03:00
92546a28c0 feat(catalog): add anchor IDs to featured groups 2026-08-20 12:46:14 -03:00
ce26fb5d1a feat(tenant): display contact details in store footer 2026-08-20 12:46:14 -03:00
38a57adf55 feat(checkout): implement transfer payment polling with cancellation 2026-08-20 11:09:52 -03:00
e1d9590905 feat(checkout): map editing policy to cart controls 2026-08-20 10:56:33 -03:00
00a01e1a8e feat(cart): open header cart from query param 2026-08-20 10:56:27 -03:00
56e011bc7a feat(cart): update cart layout styles for improved responsiveness and structure 2026-08-20 08:42:41 -03:00
5c6a03b10d feat(catalog): replace stock_tecnico with maximum_addable_quantity across components and services 2026-08-19 17:00:03 -03:00
cc446433f6 Merge branch 'homologacion' 2026-08-19 15:36:19 -03:00
2d0664a7c7 feat(cart): implement cart editing policy with granular permissions 2026-08-19 10:16:06 -03:00
2192eea09f Merge branch 'homologacion' 2026-08-18 17:26:28 -03:00
8659708e1a Merge branch 'refactor/tenant_matching' into fix/minor_fixes 2026-08-18 17:24:09 -03:00
dce54ceb67 feat(checkout): update payment validation logic and enhance UI feedback for transfer payments 2026-08-18 17:23:50 -03:00
cab33d4842 fix(auth): return Google login to tenant base path 2026-08-18 17:19:53 -03:00
f318f614af fix(ssr): render storefront routes under tenant prefixes 2026-08-18 17:19:49 -03:00
581696ffab feat(tenant): support dynamic storefront base paths 2026-08-18 17:19:43 -03:00
53cee7ecdd Remove Telepagos payment method from frontend 2026-08-18 17:02:39 -03:00
757f362918 feat(tenant): add display_cart_item_images option to Tenant interface 2026-08-18 16:47:17 -03:00
a8e73af806 feat(cart): add cart editing toggle based on tenant settings and update related components 2026-08-18 16:32:20 -03:00
61789d9238 feat: add labels to ticket selector columns 2026-08-18 15:59:08 -03:00
dd2082f40e feat: poll pending purchase status 2026-08-18 15:57:01 -03:00
755d6a9903 feat(angular.json): enhance production and homo configurations with optimization and license extraction 2026-08-18 15:18:01 -03:00
58 changed files with 1563 additions and 322 deletions

View File

@@ -47,6 +47,9 @@
}, },
"configurations": { "configurations": {
"production": { "production": {
"optimization": true,
"extractLicenses": true,
"sourceMap": false,
"budgets": [ "budgets": [
{ {
"type": "initial", "type": "initial",
@@ -84,6 +87,9 @@
] ]
}, },
"homo": { "homo": {
"optimization": true,
"extractLicenses": true,
"sourceMap": false,
"fileReplacements": [ "fileReplacements": [
{ {
"replace": "src/environments/environment.ts", "replace": "src/environments/environment.ts",

View File

@@ -4,7 +4,7 @@ import {
provideAppInitializer, provideAppInitializer,
provideBrowserGlobalErrorListeners, provideBrowserGlobalErrorListeners,
} from '@angular/core'; } from '@angular/core';
import { provideRouter } from '@angular/router'; import { provideRouter, UrlSerializer } from '@angular/router';
import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/platform-browser'; import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/platform-browser';
import { routes } from './app.routes'; import { routes } from './app.routes';
@@ -12,6 +12,7 @@ import { authBootstrap } from './core/services/auth/auth-bootstrap';
import { authInterceptor } from './core/services/auth/auth.interceptor'; 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';
import { TenantUrlSerializer } from './core/services/tenant-url.serializer';
export function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean { export function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
return ( return (
@@ -26,6 +27,7 @@ export const appConfig: ApplicationConfig = {
providers: [ providers: [
provideBrowserGlobalErrorListeners(), provideBrowserGlobalErrorListeners(),
provideRouter(routes), provideRouter(routes),
{ provide: UrlSerializer, useClass: TenantUrlSerializer },
provideClientHydration( provideClientHydration(
withHttpTransferCacheOptions({ withHttpTransferCacheOptions({
includeRequestsWithAuthHeaders: true, includeRequestsWithAuthHeaders: true,

View File

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

View File

@@ -22,14 +22,18 @@
<div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start store-layout__contact"> <div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start store-layout__contact">
<div class="d-grid gap-2 store-layout__contact-details"> <div class="d-grid gap-2 store-layout__contact-details">
@if (address) {
<div class="d-flex align-items-center gap-2"> <div class="d-flex align-items-center gap-2">
<i class="fa-solid fa-location-dot" aria-hidden="true"></i> <i class="fa-solid fa-location-dot" aria-hidden="true"></i>
<span>Av. San Lorenzo 1542, Rosario</span> <span>{{ address }}</span>
</div> </div>
}
@if (phone) {
<div class="d-flex align-items-center gap-2"> <div class="d-flex align-items-center gap-2">
<i class="fa-solid fa-phone" aria-hidden="true"></i> <i class="fa-solid fa-phone" aria-hidden="true"></i>
<span>54 9 (0341) 6658247</span> <span>{{ phone }}</span>
</div> </div>
}
</div> </div>
<p class="mb-0 small store-layout__muted-text store-layout__copyright"> <p class="mb-0 small store-layout__muted-text store-layout__copyright">

View File

@@ -27,5 +27,7 @@ export class StoreFooterComponent {
@Input() logoUrl: string | null = null; @Input() logoUrl: string | null = null;
@Input() backgroundImageUrl: string | null = null; @Input() backgroundImageUrl: string | null = null;
@Input() storeName: string | null = null; @Input() storeName: string | null = null;
@Input() address: string | null = null;
@Input() phone: string | null = null;
readonly logoutClick = output<void>(); readonly logoutClick = output<void>();
} }

View File

@@ -29,6 +29,11 @@
[subtotal]="cartSubtotal()" [subtotal]="cartSubtotal()"
[discount]="cartDiscount()" [discount]="cartDiscount()"
[total]="cartTotal()" [total]="cartTotal()"
[readonly]="!canModifyCart()"
[allowModify]="canModifyCart()"
[allowUpdateQuantity]="canUpdateCartQuantity()"
[allowUpdateVariant]="canUpdateCartVariant()"
[allowDelete]="canDeleteCartItems()"
[backgroundColor]="'#ffffff'" [backgroundColor]="'#ffffff'"
(closed)="isCartOpen.set(false)" (closed)="isCartOpen.set(false)"
> >
@@ -62,6 +67,8 @@
[logoUrl]="tenant()?.footer_logo ?? null" [logoUrl]="tenant()?.footer_logo ?? null"
[backgroundImageUrl]="tenant()?.footer_bg_image ?? null" [backgroundImageUrl]="tenant()?.footer_bg_image ?? null"
[storeName]="tenant()?.nombre ?? null" [storeName]="tenant()?.nombre ?? null"
[address]="tenant()?.address ?? null"
[phone]="tenant()?.phone ?? null"
(logoutClick)="onLogoutClick()" (logoutClick)="onLogoutClick()"
/> />
</div> </div>

View File

@@ -21,6 +21,8 @@
.store-layout__cart-dropdown { .store-layout__cart-dropdown {
position: absolute; position: absolute;
display: flex;
flex-direction: column;
top: 100px; top: 100px;
right: calc((100% - 1320px) / 2 + 1.5rem); right: calc((100% - 1320px) / 2 + 1.5rem);
width: 100%; width: 100%;
@@ -34,6 +36,10 @@
overflow: hidden; overflow: hidden;
animation: store-layout-slide-down 0.2s ease-out; animation: store-layout-slide-down 0.2s ease-out;
> app-cart {
min-height: 0;
}
@media (max-width: 1400px) { @media (max-width: 1400px) {
right: 1.5rem; right: 1.5rem;
} }

View File

@@ -2,9 +2,15 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
import { signal } from '@angular/core'; import { signal } from '@angular/core';
import { TestBed } from '@angular/core/testing'; import { TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { provideRouter, Router } from '@angular/router'; import {
ActivatedRoute,
convertToParamMap,
ParamMap,
provideRouter,
Router,
} from '@angular/router';
import { of } from 'rxjs'; import { BehaviorSubject, of } from 'rxjs';
import { Tenant } from '../../services/tenant.interface'; import { Tenant } from '../../services/tenant.interface';
import { TenantService } from '../../services/tenant.service'; import { TenantService } from '../../services/tenant.service';
@@ -22,6 +28,8 @@ const tenant: Tenant = {
codigo: 'test', codigo: 'test',
nombre: 'Test Tenant', nombre: 'Test Tenant',
dominio: 'localhost', dominio: 'localhost',
address: 'Calle Test 123, Rosario',
phone: '+54 341 555 1234',
primary_color: '#6376F3', primary_color: '#6376F3',
secondary_color: '#A0A0A0', secondary_color: '#A0A0A0',
danger_color: '#FF8888', danger_color: '#FF8888',
@@ -32,6 +40,13 @@ const tenant: Tenant = {
footer_logo: 'https://example.com/footer.png', footer_logo: 'https://example.com/footer.png',
header_bg_image: 'https://example.com/header-background.png', header_bg_image: 'https://example.com/header-background.png',
footer_bg_image: 'https://example.com/footer-background.png', footer_bg_image: 'https://example.com/footer-background.png',
cart_editing_policy: {
code: 'full',
allow_modify: true,
allow_delete: true,
allow_update_quantity: true,
allow_update_variant: true,
},
categories: [], categories: [],
menues: [ menues: [
{ {
@@ -133,11 +148,13 @@ describe('StoreLayoutComponent', () => {
let cartState = signal<Cart | null>(null); let cartState = signal<Cart | null>(null);
let authUserState = signal<AuthUser | null>(null); let authUserState = signal<AuthUser | null>(null);
let checkoutServiceStub: { startCheckout: ReturnType<typeof vi.fn> }; let checkoutServiceStub: { startCheckout: ReturnType<typeof vi.fn> };
let queryParamMapState: BehaviorSubject<ParamMap>;
beforeEach(async () => { beforeEach(async () => {
tenantState = signal<Tenant | null>(tenant); tenantState = signal<Tenant | null>(tenant);
cartState = signal<Cart | null>(null); cartState = signal<Cart | null>(null);
authUserState = signal<AuthUser | null>(null); authUserState = signal<AuthUser | null>(null);
queryParamMapState = new BehaviorSubject(convertToParamMap({}));
const isAuthenticatedState = signal(false); const isAuthenticatedState = signal(false);
checkoutServiceStub = { checkoutServiceStub = {
startCheckout: vi.fn().mockResolvedValue({ id: 55 }), startCheckout: vi.fn().mockResolvedValue({ id: 55 }),
@@ -147,6 +164,10 @@ describe('StoreLayoutComponent', () => {
imports: [StoreLayoutComponent], imports: [StoreLayoutComponent],
providers: [ providers: [
provideRouter([]), provideRouter([]),
{
provide: ActivatedRoute,
useValue: { queryParamMap: queryParamMapState.asObservable() },
},
{ {
provide: TenantService, provide: TenantService,
useValue: { useValue: {
@@ -206,6 +227,19 @@ 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('opens the cart when requested through the openCart query parameter', () => {
const fixture = TestBed.createComponent(StoreLayoutComponent);
fixture.detectChanges();
expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
queryParamMapState.next(convertToParamMap({ openCart: 'true' }));
fixture.detectChanges();
expect((fixture.componentInstance as any).isCartOpen()).toBe(true);
expect((fixture.nativeElement as HTMLElement).querySelector('app-cart')).not.toBeNull();
});
it('hides the configured header elements when the tenant disables them', () => { it('hides the configured header elements when the tenant disables them', () => {
tenantState.set({ tenantState.set({
...tenant, ...tenant,
@@ -267,6 +301,12 @@ describe('StoreLayoutComponent', () => {
expect(compiled.querySelector('.fa-whatsapp')).not.toBeNull(); expect(compiled.querySelector('.fa-whatsapp')).not.toBeNull();
expect(compiled.querySelector('.fa-facebook')).not.toBeNull(); expect(compiled.querySelector('.fa-facebook')).not.toBeNull();
expect(compiled.querySelector('.fa-linkedin-in')).not.toBeNull(); expect(compiled.querySelector('.fa-linkedin-in')).not.toBeNull();
expect(compiled.querySelector('.store-layout__contact-details')?.textContent).toContain(
tenant.address,
);
expect(compiled.querySelector('.store-layout__contact-details')?.textContent).toContain(
tenant.phone,
);
}); });
it('navigates to search results when the search button is clicked', () => { it('navigates to search results when the search button is clicked', () => {
@@ -645,4 +685,102 @@ describe('StoreLayoutComponent', () => {
expect(cartItem.componentInstance.quantityDisabled()).toBe(false); expect(cartItem.componentInstance.quantityDisabled()).toBe(false);
expect(buyButton).toBeDefined(); expect(buyButton).toBeDefined();
}); });
it('hides quantity selectors when the tenant disables cart editing', () => {
tenantState.set({
...tenant,
cart_editing_policy: {
code: 'disabled',
allow_modify: false,
allow_delete: false,
allow_update_quantity: false,
allow_update_variant: false,
},
});
cartState.set({
id: 1,
tenant_codigo: tenant.codigo,
status: 'active',
subtotal: '100.00',
items: [
{
id: 1,
cantidad: 1,
precio_unitario: '100.00',
catalog_item_id: 1,
variant_id: null,
nombre: 'Producto',
imagen: null,
variant: null,
},
],
});
const fixture = TestBed.createComponent(StoreLayoutComponent);
fixture.detectChanges();
(fixture.componentInstance as any).isCartOpen.set(true);
fixture.detectChanges();
const cartItem = fixture.debugElement.query(By.css('app-cart-item'));
expect(cartItem.componentInstance.readonly()).toBe(true);
expect(cartItem.nativeElement.querySelector('app-quantity-selector')).toBeNull();
});
it('shows variant selectors only for the full cart editing policy', () => {
const variantCart: Cart = {
id: 1,
tenant_codigo: tenant.codigo,
status: 'active',
subtotal: '100.00',
items: [
{
id: 1,
cantidad: 1,
precio_unitario: '100.00',
catalog_item_id: 1,
variant_id: 10,
nombre: 'Producto',
imagen: null,
variant: { id: 10, precio: '100.00', stock_tecnico: 5, values: { talle: 'M' } },
variants: [
{ id: 10, precio: '100.00', stock_tecnico: 5, values: { talle: 'M' } },
{ id: 11, precio: '100.00', stock_tecnico: 5, values: { talle: 'L' } },
],
},
],
};
tenantState.set({
...tenant,
cart_editing_policy: {
code: 'quantity_and_remove',
allow_modify: true,
allow_delete: true,
allow_update_quantity: true,
allow_update_variant: false,
},
});
cartState.set(variantCart);
const fixture = TestBed.createComponent(StoreLayoutComponent);
fixture.detectChanges();
(fixture.componentInstance as any).isCartOpen.set(true);
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('app-variant-selector')).toBeNull();
expect(fixture.nativeElement.querySelector('app-quantity-selector')).not.toBeNull();
tenantState.set({
...tenant,
cart_editing_policy: {
code: 'full',
allow_modify: true,
allow_delete: true,
allow_update_quantity: true,
allow_update_variant: true,
},
});
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('app-variant-selector')).not.toBeNull();
});
}); });

View File

@@ -1,5 +1,6 @@
import { Component, computed, inject, OnInit, signal } from '@angular/core'; import { Component, computed, DestroyRef, inject, OnInit, signal } from '@angular/core';
import { Router, RouterOutlet } from '@angular/router'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
import { TenantService } from '../../services/tenant.service'; import { TenantService } from '../../services/tenant.service';
import { CartService } from '../../services/cart/cart.service'; import { CartService } from '../../services/cart/cart.service';
import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-footer.component'; import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-footer.component';
@@ -32,10 +33,25 @@ export class StoreLayoutComponent implements OnInit {
private readonly checkoutService = inject(CheckoutService); private readonly checkoutService = inject(CheckoutService);
private readonly toastService = inject(ToastService); private readonly toastService = inject(ToastService);
private readonly router = inject(Router); private readonly router = inject(Router);
private readonly route = inject(ActivatedRoute);
private readonly destroyRef = inject(DestroyRef);
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 displayCart = computed(() => this.tenant()?.display_cart ?? true);
protected readonly cartEditingPolicy = computed(() => this.tenant()?.cart_editing_policy ?? null);
protected readonly canModifyCart = computed(
() => this.cartEditingPolicy()?.allow_modify ?? false,
);
protected readonly canDeleteCartItems = computed(
() => this.cartEditingPolicy()?.allow_delete ?? false,
);
protected readonly canUpdateCartQuantity = computed(
() => this.cartEditingPolicy()?.allow_update_quantity ?? false,
);
protected readonly canUpdateCartVariant = computed(
() => this.cartEditingPolicy()?.allow_update_variant ?? false,
);
protected readonly cartSubtotal = computed(() => { protected readonly cartSubtotal = computed(() => {
const cart = this.cartService.cart(); const cart = this.cartService.cart();
@@ -89,6 +105,7 @@ export class StoreLayoutComponent implements OnInit {
attributes, attributes,
quantity: item.cantidad, quantity: item.cantidad,
variantId: item.variant_id, variantId: item.variant_id,
variants: item.variants,
}; };
} }
@@ -132,6 +149,12 @@ export class StoreLayoutComponent implements OnInit {
}); });
ngOnInit(): void { ngOnInit(): void {
this.route.queryParamMap.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
if (params.get('openCart') === 'true') {
this.isCartOpen.set(true);
}
});
this.cartService.loadCart().subscribe({ this.cartService.loadCart().subscribe({
error: (err) => console.error('Error loading cart', err), error: (err) => console.error('Error loading cart', err),
}); });
@@ -164,8 +187,8 @@ export class StoreLayoutComponent implements OnInit {
protected async onLogoutClick(): Promise<void> { protected async onLogoutClick(): Promise<void> {
const isLeavingCheckout = this.router.url.startsWith('/checkout'); const isLeavingCheckout = this.router.url.startsWith('/checkout');
// Checkout must be left while the authenticated session is still valid so // Leave checkout before closing the authenticated session so its component
// its CanDeactivate guard can cancel the pending purchase. // can stop payment polling cleanly. The checkout itself remains pending.
if (isLeavingCheckout) { if (isLeavingCheckout) {
const navigationSucceeded = await this.router.navigate(['/']); const navigationSucceeded = await this.router.navigate(['/']);

View File

@@ -119,8 +119,12 @@ export class AuthService extends BaseApiService {
const apiUrl = new URL(environment.url); const apiUrl = new URL(environment.url);
const authorizationUrl = new URL('/auth/google/redirect', apiUrl.origin); const authorizationUrl = new URL('/auth/google/redirect', apiUrl.origin);
const basePath = tenant.base_path && tenant.base_path !== '/' ? tenant.base_path : '';
authorizationUrl.searchParams.set('tenant', tenant.codigo); authorizationUrl.searchParams.set('tenant', tenant.codigo);
authorizationUrl.searchParams.set('return_url', this.document.location.origin); authorizationUrl.searchParams.set(
'return_url',
`${this.document.location.origin}${basePath}`,
);
this.document.location.assign(authorizationUrl.toString()); this.document.location.assign(authorizationUrl.toString());
} }

View File

@@ -24,6 +24,7 @@ export interface CartItem {
nombre: string | null; nombre: string | null;
imagen: string | null; imagen: string | null;
variant: CartItemVariant | null; variant: CartItemVariant | null;
variants?: CartItemVariant[];
} }
export interface Cart { export interface Cart {

View File

@@ -66,7 +66,7 @@ export interface CatalogItemVariant {
event_date_id?: number | null; event_date_id?: number | null;
event_date_ids?: number[]; event_date_ids?: number[];
event_dates?: string[]; event_dates?: string[];
stock_tecnico: number | null; maximum_addable_quantity?: 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;
@@ -98,7 +98,7 @@ export interface CatalogItemDetail {
attributes: ProductAttribute[]; attributes: ProductAttribute[];
variants: CatalogItemVariant[]; variants: CatalogItemVariant[];
selected_variant?: SelectedCatalogItemVariant; selected_variant?: SelectedCatalogItemVariant;
stock_tecnico?: number | null; maximum_addable_quantity?: number | null;
images?: string[]; images?: string[];
} }
@@ -113,7 +113,7 @@ export interface CatalogFeaturedItemVariant {
id: number; id: number;
descripcion?: string | null; descripcion?: string | null;
precio?: string; precio?: string;
stock_tecnico: number | null; maximum_addable_quantity?: number | null;
values: Record<string, CatalogVariantValue>; values: Record<string, CatalogVariantValue>;
} }
@@ -145,7 +145,7 @@ export interface CatalogFeaturedItem {
descripcion?: string | null; descripcion?: string | null;
precio: number | string; precio: number | string;
image?: string | null; image?: string | null;
stock_tecnico?: number | null; maximum_addable_quantity?: number | null;
variants?: CatalogFeaturedItemVariant[]; variants?: CatalogFeaturedItemVariant[];
} }
@@ -155,6 +155,7 @@ export type CatalogFeaturedItems =
export interface CatalogFeaturedGroup { export interface CatalogFeaturedGroup {
id: number; id: number;
code: string;
title: string; title: string;
layout: CatalogProductLayout; layout: CatalogProductLayout;
group_layout: CatalogGroupLayout; group_layout: CatalogGroupLayout;

View File

@@ -3,6 +3,7 @@ import { firstValueFrom } 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 { CartItemVariant } from './cart/cart.interface';
export interface UpdatePurchaseCustomerPayload { export interface UpdatePurchaseCustomerPayload {
dni: string; dni: string;
@@ -73,6 +74,7 @@ export interface PurchaseDetailItemResponse {
line_total: string; line_total: string;
source_catalog_item_id: number | null; source_catalog_item_id: number | null;
source_variant_id: number | null; source_variant_id: number | null;
variants?: CartItemVariant[];
item_details: { item_details: {
nombre: string; nombre: string;
descripcion: string | null; descripcion: string | null;
@@ -95,7 +97,7 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
telefono: string | null; telefono: string | null;
nombre_apellido: string | null; nombre_apellido: string | null;
email: string | null; email: string | null;
items_source: 'purchase'; items_source: 'purchase' | 'cart';
items: PurchaseDetailItemResponse[]; items: PurchaseDetailItemResponse[];
tickets_count?: number; tickets_count?: number;
has_generated_tickets?: boolean; has_generated_tickets?: boolean;
@@ -130,7 +132,7 @@ export class CheckoutService extends BaseApiService {
async generatePaymentIntent( async generatePaymentIntent(
tenantCode: string, tenantCode: string,
purchaseId: number, purchaseId: number,
method: 'qr' | 'transfer' | 'telepagos', method: 'qr' | 'transfer',
payerDni?: string, payerDni?: string,
): Promise<any> { ): Promise<any> {
const payload: any = { method }; const payload: any = { method };
@@ -174,7 +176,20 @@ export class CheckoutService extends BaseApiService {
purchaseId: number, purchaseId: number,
itemId: number, itemId: number,
quantity: number, quantity: number,
cartId: number | null = null,
itemsSource: 'purchase' | 'cart' = 'purchase',
): Promise<PurchaseDetailResponse> { ): Promise<PurchaseDetailResponse> {
if (itemsSource === 'cart' && cartId !== null) {
await firstValueFrom(
this.http.patch(
`${environment.url}tenants/${tenantCode}/checkout-carts/${cartId}/items/${itemId}`,
{ cantidad: quantity },
),
);
return this.getPurchase(tenantCode, purchaseId);
}
const response = await firstValueFrom( const response = await firstValueFrom(
this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>( this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`, `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`,
@@ -190,6 +205,51 @@ export class CheckoutService extends BaseApiService {
return purchase; return purchase;
} }
async updateItemVariant(
tenantCode: string,
purchaseId: number,
itemId: number,
variantId: number,
quantity: number,
cartId: number | null = null,
itemsSource: 'purchase' | 'cart' = 'purchase',
): Promise<PurchaseDetailResponse> {
if (itemsSource === 'cart' && cartId !== null) {
await firstValueFrom(
this.http.patch(
`${environment.url}tenants/${tenantCode}/checkout-carts/${cartId}/items/${itemId}`,
{ cantidad: quantity, variant_id: variantId },
),
);
} else {
await firstValueFrom(
this.http.patch(
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`,
{ quantity, variant_id: variantId },
),
);
}
return this.getPurchase(tenantCode, purchaseId);
}
async removeItem(
tenantCode: string,
purchaseId: number,
itemId: number,
cartId: number | null = null,
itemsSource: 'purchase' | 'cart' = 'purchase',
): Promise<PurchaseDetailResponse> {
const url =
itemsSource === 'cart' && cartId !== null
? `${environment.url}tenants/${tenantCode}/checkout-carts/${cartId}/items/${itemId}`
: `${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`;
await firstValueFrom(this.http.delete(url));
return this.getPurchase(tenantCode, purchaseId);
}
async prepareItemEditing( async prepareItemEditing(
tenantCode: string, tenantCode: string,
purchaseId: number, purchaseId: number,

View File

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

View File

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

View File

@@ -1,5 +1,15 @@
import { ApiResponse } from './api-response.interface'; import { ApiResponse } from './api-response.interface';
export type CartEditingPolicyCode = 'disabled' | 'quantity_and_remove' | 'full';
export interface CartEditingPolicy {
code: CartEditingPolicyCode;
allow_modify: boolean;
allow_delete: boolean;
allow_update_quantity: boolean;
allow_update_variant: boolean;
}
export interface BankAccount { export interface BankAccount {
id: number; id: number;
tenant_code: string; tenant_code: string;
@@ -101,7 +111,10 @@ export interface Tenant {
codigo: string; codigo: string;
nombre: string; nombre: string;
dominio: string; dominio: string;
base_path?: string;
site_title?: string | null; site_title?: string | null;
address?: string | null;
phone?: string | null;
favicon?: string | null; favicon?: string | null;
primary_color: string; primary_color: string;
secondary_color: string; secondary_color: string;
@@ -126,6 +139,9 @@ export interface Tenant {
display_categories?: boolean; display_categories?: boolean;
display_seach_bar?: boolean; display_seach_bar?: boolean;
display_cart?: boolean; display_cart?: boolean;
cart_editing_policy?: CartEditingPolicy;
checkout_editing_policy?: CartEditingPolicy;
display_cart_item_images?: boolean;
social_media?: SocialMedia[]; social_media?: SocialMedia[];
menues?: Menu[]; menues?: Menu[];
categories: Category[]; categories: Category[];

View File

@@ -232,7 +232,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1001, id: 1001,
precio: 250000, precio: 250000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('vip_lunch', 'VIP + Lunch'), tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
sector: ticketOption('a', 'Sector A'), sector: ticketOption('a', 'Sector A'),
@@ -243,7 +243,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1002, id: 1002,
precio: 250000, precio: 250000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('vip_lunch', 'VIP + Lunch'), tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
sector: ticketOption('a', 'Sector A'), sector: ticketOption('a', 'Sector A'),
@@ -254,7 +254,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1003, id: 1003,
precio: 250000, precio: 250000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('vip_lunch', 'VIP + Lunch'), tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
sector: ticketOption('c', 'Sector C'), sector: ticketOption('c', 'Sector C'),
@@ -265,7 +265,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1004, id: 1004,
precio: 200000, precio: 200000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('vip_lunch', 'VIP + Lunch'), tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
sector: ticketOption('a', 'Sector A'), sector: ticketOption('a', 'Sector A'),
@@ -276,7 +276,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1005, id: 1005,
precio: 200000, precio: 200000,
stock_tecnico: 0, maximum_addable_quantity: 0,
values: { values: {
tipo: ticketOption('vip_lunch', 'VIP + Lunch'), tipo: ticketOption('vip_lunch', 'VIP + Lunch'),
sector: ticketOption('a', 'Sector A'), sector: ticketOption('a', 'Sector A'),
@@ -287,7 +287,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1006, id: 1006,
precio: 100000, precio: 100000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('general', 'General'), tipo: ticketOption('general', 'General'),
sector: ticketOption('b', 'Sector B'), sector: ticketOption('b', 'Sector B'),
@@ -298,7 +298,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1007, id: 1007,
precio: 100000, precio: 100000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('general', 'General'), tipo: ticketOption('general', 'General'),
sector: ticketOption('b', 'Sector B'), sector: ticketOption('b', 'Sector B'),
@@ -309,7 +309,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1008, id: 1008,
precio: 90000, precio: 90000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('general', 'General'), tipo: ticketOption('general', 'General'),
sector: ticketOption('d', 'Sector D'), sector: ticketOption('d', 'Sector D'),
@@ -320,7 +320,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1009, id: 1009,
precio: 65000, precio: 65000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('general', 'General'), tipo: ticketOption('general', 'General'),
sector: ticketOption('d', 'Sector D'), sector: ticketOption('d', 'Sector D'),
@@ -331,7 +331,7 @@ export class ReutilizablesTestPageComponent {
{ {
id: 1010, id: 1010,
precio: 40000, precio: 40000,
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: ticketOption('general', 'General'), tipo: ticketOption('general', 'General'),
sector: ticketOption('d', 'Sector D'), sector: ticketOption('d', 'Sector D'),

View File

@@ -31,7 +31,7 @@ describe('ProductAttributeSelectorComponent', () => {
fixture.componentRef.setInput('variants', [ fixture.componentRef.setInput('variants', [
{ {
id: 1, id: 1,
stock_tecnico: null, maximum_addable_quantity: null,
values: { size: 'S' }, values: { size: 'S' },
}, },
]); ]);
@@ -51,12 +51,12 @@ describe('ProductAttributeSelectorComponent', () => {
fixture.componentRef.setInput('variants', [ fixture.componentRef.setInput('variants', [
{ {
id: 1, id: 1,
stock_tecnico: 0, maximum_addable_quantity: 0,
values: { size: 'S' }, values: { size: 'S' },
}, },
{ {
id: 2, id: 2,
stock_tecnico: 2, maximum_addable_quantity: 2,
values: { size: 'M' }, values: { size: 'M' },
}, },
]); ]);
@@ -92,9 +92,9 @@ describe('ProductAttributeSelectorComponent', () => {
]); ]);
fixture.componentRef.setInput('inventoryPolicy', 'unlimited'); fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
fixture.componentRef.setInput('variants', [ fixture.componentRef.setInput('variants', [
{ id: 1, stock_tecnico: null, values: { event_date: '1' } }, { id: 1, maximum_addable_quantity: null, values: { event_date: '1' } },
{ id: 2, stock_tecnico: null, values: { event_date: '2' } }, { id: 2, maximum_addable_quantity: null, values: { event_date: '2' } },
{ id: 3, stock_tecnico: null, values: { event_date: ['1', '2'] } }, { id: 3, maximum_addable_quantity: null, values: { event_date: ['1', '2'] } },
]); ]);
fixture.detectChanges(); fixture.detectChanges();
@@ -135,8 +135,8 @@ describe('ProductAttributeSelectorComponent', () => {
]); ]);
fixture.componentRef.setInput('inventoryPolicy', 'unlimited'); fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
fixture.componentRef.setInput('variants', [ fixture.componentRef.setInput('variants', [
{ id: 1, stock_tecnico: null, values: { size: 'S', internal_type: 'adult' } }, { id: 1, maximum_addable_quantity: null, values: { size: 'S', internal_type: 'adult' } },
{ id: 2, stock_tecnico: null, values: { size: 'M', internal_type: 'child' } }, { id: 2, maximum_addable_quantity: null, values: { size: 'M', internal_type: 'child' } },
]); ]);
fixture.detectChanges(); fixture.detectChanges();

View File

@@ -227,7 +227,7 @@ export class ProductAttributeSelectorComponent {
} }
private isVariantAvailable(variant: CatalogItemVariant): boolean { private isVariantAvailable(variant: CatalogItemVariant): boolean {
return this.inventoryPolicy() === 'unlimited' || (variant.stock_tecnico ?? 0) > 0; return variant.maximum_addable_quantity !== 0;
} }
private findFirstHexValue(value: unknown): string | null { private findFirstHexValue(value: unknown): string | null {

View File

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

View File

@@ -1,3 +1,4 @@
import { HttpErrorResponse } from '@angular/common/http';
import { signal } from '@angular/core'; import { signal } from '@angular/core';
import { getTestBed, TestBed } from '@angular/core/testing'; import { getTestBed, TestBed } from '@angular/core/testing';
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing'; import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
@@ -10,6 +11,8 @@ import { CartService } from '../../../../core/services/cart/cart.service';
import { CheckoutService } from '../../../../core/services/checkout.service'; import { CheckoutService } from '../../../../core/services/checkout.service';
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 { CartEditingPolicy } from '../../../../core/services/tenant.interface';
import { CheckoutPageComponent } from './checkout-page.component'; import { CheckoutPageComponent } from './checkout-page.component';
describe('CheckoutPageComponent payment validation', () => { describe('CheckoutPageComponent payment validation', () => {
@@ -17,11 +20,13 @@ describe('CheckoutPageComponent payment validation', () => {
startCheckout: ReturnType<typeof vi.fn>; startCheckout: ReturnType<typeof vi.fn>;
updateCustomerData: ReturnType<typeof vi.fn>; updateCustomerData: ReturnType<typeof vi.fn>;
updateItemQuantity: ReturnType<typeof vi.fn>; updateItemQuantity: ReturnType<typeof vi.fn>;
updateItemVariant: ReturnType<typeof vi.fn>;
removeItem: ReturnType<typeof vi.fn>;
prepareItemEditing: ReturnType<typeof vi.fn>; prepareItemEditing: ReturnType<typeof vi.fn>;
cancelPurchase: ReturnType<typeof vi.fn>; cancelPurchase: ReturnType<typeof vi.fn>;
generatePaymentIntent: ReturnType<typeof vi.fn>; generatePaymentIntent: ReturnType<typeof vi.fn>;
getPurchase: ReturnType<typeof vi.fn>;
submitPurchaseForReview: ReturnType<typeof vi.fn>; submitPurchaseForReview: ReturnType<typeof vi.fn>;
getPurchase: ReturnType<typeof vi.fn>;
withCustomLoading: ReturnType<typeof vi.fn>; withCustomLoading: ReturnType<typeof vi.fn>;
}; };
let cartServiceStub: { let cartServiceStub: {
@@ -31,8 +36,15 @@ describe('CheckoutPageComponent payment validation', () => {
clearCart: ReturnType<typeof vi.fn>; clearCart: ReturnType<typeof vi.fn>;
}; };
let routerStub: { navigate: ReturnType<typeof vi.fn> }; let routerStub: { navigate: ReturnType<typeof vi.fn> };
let toastServiceStub: { danger: ReturnType<typeof vi.fn> };
let routeQueryParamMap: ReturnType<typeof convertToParamMap>; let routeQueryParamMap: ReturnType<typeof convertToParamMap>;
let authUserState: ReturnType<typeof signal>; let authUserState: ReturnType<typeof signal>;
let tenantState: ReturnType<
typeof signal<{
codigo: string;
checkout_editing_policy?: CartEditingPolicy;
}>
>;
beforeAll(() => { beforeAll(() => {
try { try {
@@ -54,13 +66,15 @@ describe('CheckoutPageComponent payment validation', () => {
}), }),
updateCustomerData: vi.fn(), updateCustomerData: vi.fn(),
updateItemQuantity: vi.fn(), updateItemQuantity: vi.fn(),
updateItemVariant: vi.fn(),
removeItem: vi.fn(),
prepareItemEditing: vi.fn(), prepareItemEditing: vi.fn(),
cancelPurchase: vi.fn().mockResolvedValue({ status: 'cancelled' }), cancelPurchase: vi.fn().mockResolvedValue({ status: 'cancelled' }),
generatePaymentIntent: vi.fn().mockResolvedValue({ generatePaymentIntent: vi.fn().mockResolvedValue({
qr_data: { qr_code: 'qr-value' }, qr_data: { qr_code: 'qr-value' },
}), }),
getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'pending_payment' }), submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
withCustomLoading: vi.fn(), withCustomLoading: vi.fn(),
}; };
checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub); checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
@@ -86,8 +100,19 @@ describe('CheckoutPageComponent payment validation', () => {
}); });
}); });
routerStub = { navigate: vi.fn() }; routerStub = { navigate: vi.fn() };
toastServiceStub = { danger: vi.fn() };
routeQueryParamMap = convertToParamMap({}); routeQueryParamMap = convertToParamMap({});
authUserState = signal(null); authUserState = signal(null);
tenantState = signal({
codigo: 'tenant-test',
checkout_editing_policy: {
code: 'full',
allow_modify: true,
allow_delete: true,
allow_update_quantity: true,
allow_update_variant: true,
},
});
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [CheckoutPageComponent], imports: [CheckoutPageComponent],
@@ -95,8 +120,9 @@ describe('CheckoutPageComponent payment validation', () => {
{ provide: CheckoutService, useValue: checkoutServiceStub }, { provide: CheckoutService, useValue: checkoutServiceStub },
{ provide: CatalogService, useValue: { getCatalogItem: vi.fn() } }, { provide: CatalogService, useValue: { getCatalogItem: vi.fn() } },
{ provide: CartService, useValue: cartServiceStub }, { provide: CartService, useValue: cartServiceStub },
{ provide: TenantService, useValue: { tenant: signal({ codigo: 'tenant-test' }) } }, { provide: TenantService, useValue: { tenant: tenantState } },
{ provide: AuthService, useValue: { user: authUserState } }, { provide: AuthService, useValue: { user: authUserState } },
{ provide: ToastService, useValue: toastServiceStub },
{ {
provide: ActivatedRoute, provide: ActivatedRoute,
useValue: { useValue: {
@@ -194,46 +220,87 @@ describe('CheckoutPageComponent payment validation', () => {
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled(); expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
}); });
it('checks a transfer once and redirects to purchase status while pending', async () => { it('polls a transfer every three seconds up to four attempts', async () => {
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'pending_payment' });
const { component } = createComponent(); const { component } = createComponent();
component.selectedPaymentMethod.set('transfer'); component.selectedPaymentMethod.set('transfer');
await component.onComplete(); await component.onComplete();
expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1); expect(component.transferValidationStatus()).toBe('checking');
expect(component.transferValidationStatus()).toBe('pending'); expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
for (let attempt = 1; attempt <= 3; attempt += 1) {
await vi.advanceTimersByTimeAsync(3_000);
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(attempt);
expect(component.transferValidationStatus()).toBe('checking');
}
await vi.advanceTimersByTimeAsync(3_000);
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(4);
expect(checkoutServiceStub.getPurchase).toHaveBeenLastCalledWith('tenant-test', 25);
expect(component.transferValidationStatus()).toBe('error');
expect(cartServiceStub.clearCart).not.toHaveBeenCalled(); expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]); expect(routerStub.navigate).not.toHaveBeenCalled();
await vi.advanceTimersByTimeAsync(30_000);
expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledTimes(1);
await component.onComplete();
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.submitPurchaseForReview.mockResolvedValue({ status: 'paid' }); checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'paid' });
const { component } = createComponent(); const { component } = createComponent();
component.selectedPaymentMethod.set('transfer'); component.selectedPaymentMethod.set('transfer');
await component.onComplete(); await component.onComplete();
await vi.advanceTimersByTimeAsync(3_000);
expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25); expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
expect(cartServiceStub.clearCart).not.toHaveBeenCalled(); expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]); expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
}); });
it('shows a retryable state when transfer validation fails', async () => { it('keeps polling after transfer validation requests fail', async () => {
vi.spyOn(console, 'error').mockImplementation(() => undefined);
checkoutServiceStub.getPurchase.mockRejectedValue(new Error('network error'));
const { component } = createComponent();
component.selectedPaymentMethod.set('transfer');
await component.onComplete();
await vi.advanceTimersByTimeAsync(12_000);
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(4);
expect(component.transferValidationStatus()).toBe('error');
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
expect(routerStub.navigate).not.toHaveBeenCalled();
});
it('does not poll when submitting a transfer for review fails', async () => {
vi.spyOn(console, 'error').mockImplementation(() => undefined); vi.spyOn(console, 'error').mockImplementation(() => undefined);
checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error')); checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error'));
const { component } = createComponent(); const { component } = createComponent();
component.selectedPaymentMethod.set('transfer'); component.selectedPaymentMethod.set('transfer');
await component.onComplete(); await component.onComplete();
await vi.advanceTimersByTimeAsync(12_000);
expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
expect(component.transferValidationStatus()).toBe('error'); expect(component.transferValidationStatus()).toBe('error');
expect(cartServiceStub.clearCart).not.toHaveBeenCalled(); });
expect(routerStub.navigate).not.toHaveBeenCalled();
it('cancels transfer polling when the payment method changes or the component is destroyed', async () => {
const first = createComponent();
first.component.selectedPaymentMethod.set('transfer');
first.component.onComplete();
checkoutServiceStub.generatePaymentIntent.mockResolvedValueOnce({});
await first.component.selectPaymentMethod('qr');
await vi.advanceTimersByTimeAsync(12_000);
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
const second = createComponent();
second.component.selectedPaymentMethod.set('transfer');
second.component.onComplete();
second.fixture.destroy();
await vi.advanceTimersByTimeAsync(12_000);
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
}); });
it('loads purchase items but prefills customer data from the user', async () => { it('loads purchase items but prefills customer data from the user', async () => {
@@ -366,11 +433,7 @@ describe('CheckoutPageComponent payment validation', () => {
expect(component.checkoutStepIndex()).toBe(1); expect(component.checkoutStepIndex()).toBe(1);
expect(component.selectedPaymentMethod()).toBe('qr'); expect(component.selectedPaymentMethod()).toBe('qr');
expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith( expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith('tenant-test', 25, 'qr');
'tenant-test',
25,
'qr',
);
expect(component.qrData()).toBe('qr-value'); expect(component.qrData()).toBe('qr-value');
expect(component.qrPaymentStatus()).toBe('waiting'); expect(component.qrPaymentStatus()).toBe('waiting');
}); });
@@ -439,7 +502,14 @@ describe('CheckoutPageComponent payment validation', () => {
quantity: 3, quantity: 3,
}); });
expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith('tenant-test', 25, 91, 3); expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith(
'tenant-test',
25,
91,
3,
null,
'purchase',
);
expect(component.createdPurchase()).toBe(updatedPurchase); expect(component.createdPurchase()).toBe(updatedPurchase);
expect(component.isUpdatingItem()).toBe(false); expect(component.isUpdatingItem()).toBe(false);
}); });
@@ -472,6 +542,60 @@ describe('CheckoutPageComponent payment validation', () => {
expect(component.isEditingItems()).toBe(false); expect(component.isEditingItems()).toBe(false);
}); });
it('shows Modificar and returns to the home cart when checkout editing is disabled', async () => {
tenantState.set({
codigo: 'tenant-test',
checkout_editing_policy: {
code: 'disabled',
allow_modify: false,
allow_delete: false,
allow_update_quantity: false,
allow_update_variant: false,
},
});
const { fixture, component } = createComponent();
component.createdPurchase.set({
id: 25,
status: 'created',
items: [
{
id: 91,
quantity: 2,
unit_price: '100.00',
line_total: '200.00',
source_catalog_item_id: 8,
source_variant_id: null,
item_details: {
nombre: 'Remera',
descripcion: null,
slug: 'remera',
imagen: null,
attributes: [],
},
},
],
subtotal: '200.00',
total: '200.00',
});
fixture.detectChanges();
const modifyButton = (fixture.nativeElement as HTMLElement).querySelector('.cart-edit-btn');
expect(modifyButton?.textContent?.trim()).toBe('Modificar');
expect(
(fixture.nativeElement as HTMLElement).querySelector('app-quantity-selector'),
).toBeNull();
await component.onEditingItemsChange(true);
expect(component.canUpdateCartQuantity()).toBe(false);
expect(component.canModifyCart()).toBe(false);
expect(component.isEditingItems()).toBe(false);
expect(checkoutServiceStub.prepareItemEditing).not.toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/'], {
queryParams: { openCart: true },
});
});
it('updates customer data on the existing purchase before payment', async () => { it('updates customer data on the existing purchase before payment', async () => {
const updatedPurchase = { const updatedPurchase = {
id: 25, id: 25,
@@ -506,14 +630,65 @@ describe('CheckoutPageComponent payment validation', () => {
expect(component.stepper.next).toHaveBeenCalledOnce(); expect(component.stepper.next).toHaveBeenCalledOnce();
}); });
it('cancels the pending purchase before allowing navigation away', async () => { it('keeps the checkout purchase intact when navigating away', async () => {
const { component } = createComponent(); const { component } = createComponent();
await expect(component.canDeactivate()).resolves.toBe(true); await expect(component.canDeactivate()).resolves.toBe(true);
expect(checkoutServiceStub.cancelPurchase).toHaveBeenCalledWith('tenant-test', 25); expect(checkoutServiceStub.cancelPurchase).not.toHaveBeenCalled();
expect(cartServiceStub.loadCart).toHaveBeenCalled(); expect(cartServiceStub.loadCart).toHaveBeenCalled();
expect(cartServiceStub.clearCart).not.toHaveBeenCalled(); expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
expect(component.createdPurchaseId()).toBeNull(); expect(component.createdPurchaseId()).toBe(25);
});
it('shows the API message and redirects home when a checkout operation finds an expired purchase', async () => {
checkoutServiceStub.generatePaymentIntent.mockRejectedValue(
new HttpErrorResponse({
status: 422,
error: {
code: 'purchase.expired',
message: 'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
},
}),
);
const { component } = createComponent();
await component.selectPaymentMethod('qr');
expect(toastServiceStub.danger).toHaveBeenCalledWith(
'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
);
expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
expect(component.isGeneratingIntent()).toBe(false);
});
it('treats a generic customer-data error as expired when the local deadline passed', () => {
const { component } = createComponent();
component.createdPurchase.set({
id: 25,
status: 'created',
expires_at: new Date(Date.now() - 1_000).toISOString(),
items: [],
subtotal: '100.00',
total: '100.00',
});
const handled = component.handleCheckoutError(
new HttpErrorResponse({
status: 422,
error: {
errors: {
purchase: ['La compra ya no se puede modificar.'],
},
},
}),
'No se pudieron actualizar los datos de la compra.',
);
expect(handled).toBe(true);
expect(toastServiceStub.danger).toHaveBeenCalledWith(
'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
);
expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
}); });
}); });

View File

@@ -8,6 +8,7 @@ import {
signal, signal,
ViewChild, ViewChild,
} from '@angular/core'; } from '@angular/core';
import { HttpErrorResponse } from '@angular/common/http';
import { FormBuilder, Validators } from '@angular/forms'; import { FormBuilder, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { firstValueFrom, startWith } from 'rxjs'; import { firstValueFrom, startWith } from 'rxjs';
@@ -20,6 +21,7 @@ import {
} from '../../../../core/services/checkout.service'; } from '../../../../core/services/checkout.service';
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';
import { ToastService } from '../../../../core/services/toast.service';
import { BankAccount } from '../../../../core/services/tenant.interface'; import { BankAccount } from '../../../../core/services/tenant.interface';
import { CartComponent, CartItemMock } from '../../../../shared/components/cart/cart.component'; import { CartComponent, CartItemMock } from '../../../../shared/components/cart/cart.component';
import { StepComponent } from '../../../../shared/components/stepper/step.component'; import { StepComponent } from '../../../../shared/components/stepper/step.component';
@@ -36,6 +38,12 @@ import {
TransferValidationStatus, TransferValidationStatus,
} from './checkout-page.models'; } from './checkout-page.models';
interface ApiErrorResponse {
code?: string;
message?: string;
errors?: Record<string, string[]>;
}
@Component({ @Component({
selector: 'app-checkout-page', selector: 'app-checkout-page',
standalone: true, standalone: true,
@@ -59,11 +67,17 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
private readonly authService = inject(AuthService); private readonly authService = inject(AuthService);
private readonly cartService = inject(CartService); private readonly cartService = inject(CartService);
private readonly qrPollingIntervalMs = 5_000; private readonly qrPollingIntervalMs = 5_000;
private readonly toastService = inject(ToastService);
private readonly qrPollingMaxAttempts = 9; private readonly qrPollingMaxAttempts = 9;
private readonly transferPollingIntervalMs = 3_000;
private readonly transferPollingMaxAttempts = 4;
private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null; private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
private qrPollingAttempts = 0; private qrPollingAttempts = 0;
private qrPollingRunId = 0; private qrPollingRunId = 0;
private transferPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
private transferPollingAttempts = 0;
private transferPollingRunId = 0;
private paymentMethodRequestId = 0; private paymentMethodRequestId = 0;
private navigationStarted = false; private navigationStarted = false;
@@ -79,6 +93,18 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
protected readonly createdPurchase = signal<PurchaseDetailResponse | null>(null); protected readonly createdPurchase = signal<PurchaseDetailResponse | null>(null);
protected readonly isLoadingPurchase = signal(true); protected readonly isLoadingPurchase = signal(true);
protected readonly checkoutStepIndex = signal(0); protected readonly checkoutStepIndex = signal(0);
protected readonly canUpdateCartQuantity = computed(
() => this.tenantService.tenant()?.checkout_editing_policy?.allow_update_quantity ?? false,
);
protected readonly canUpdateCartVariant = computed(
() => this.tenantService.tenant()?.checkout_editing_policy?.allow_update_variant ?? false,
);
protected readonly canDeleteCartItems = computed(
() => this.tenantService.tenant()?.checkout_editing_policy?.allow_delete ?? false,
);
protected readonly canModifyCart = computed(
() => this.tenantService.tenant()?.checkout_editing_policy?.allow_modify ?? false,
);
protected readonly cartSubtotal = computed(() => { protected readonly cartSubtotal = computed(() => {
const purchase = this.createdPurchase(); const purchase = this.createdPurchase();
@@ -101,7 +127,6 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
protected readonly paymentMethods: ReadonlyArray<PaymentMethodOption> = [ protected readonly paymentMethods: ReadonlyArray<PaymentMethodOption> = [
{ id: 'qr', label: 'QR' }, { id: 'qr', label: 'QR' },
{ id: 'transfer', label: 'Transferencia' }, { id: 'transfer', label: 'Transferencia' },
{ id: 'telepagos', label: 'TelePagos' },
]; ];
protected readonly selectedPaymentMethod = signal<PaymentMethod>('qr'); protected readonly selectedPaymentMethod = signal<PaymentMethod>('qr');
protected readonly copiedTransferField = signal<TransferField | null>(null); protected readonly copiedTransferField = signal<TransferField | null>(null);
@@ -156,6 +181,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
ngOnDestroy(): void { ngOnDestroy(): void {
this.stopQrPolling(); this.stopQrPolling();
this.stopTransferPolling();
} }
private mapPurchaseItemToMock(item: PurchaseDetailItemResponse): CartItemMock { private mapPurchaseItemToMock(item: PurchaseDetailItemResponse): CartItemMock {
@@ -171,6 +197,8 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
value: attribute.value === null ? '' : String(attribute.value), value: attribute.value === null ? '' : String(attribute.value),
})), })),
quantity: item.quantity, quantity: item.quantity,
variantId: item.source_variant_id,
variants: item.variants,
}; };
} }
@@ -179,6 +207,32 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
return; return;
} }
if (editing && !this.canModifyCart()) {
const tenant = this.tenantService.tenant();
const purchaseId = this.createdPurchaseId();
if (!tenant || !purchaseId) {
return;
}
this.isPreparingItemEdit.set(true);
try {
await this.checkoutService.cancelPurchase(tenant.codigo, purchaseId);
this.createdPurchaseId.set(null);
this.createdPurchase.set(null);
await firstValueFrom(this.cartService.loadCart());
await this.router.navigate(['/'], {
queryParams: { openCart: true },
});
} catch (error) {
this.handleCheckoutError(error, 'No se pudo restaurar el carrito para editarlo.');
} finally {
this.isPreparingItemEdit.set(false);
}
return;
}
if (!editing) { if (!editing) {
this.isEditingItems.set(false); this.isEditingItems.set(false);
@@ -191,6 +245,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
this.isEditingItems.set(true); this.isEditingItems.set(true);
this.stopQrPolling(); this.stopQrPolling();
this.stopTransferPolling();
this.qrData.set(null); this.qrData.set(null);
this.qrPaymentStatus.set('idle'); this.qrPaymentStatus.set('idle');
this.transferAccount.set(null); this.transferAccount.set(null);
@@ -209,7 +264,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
const purchase = await this.checkoutService.prepareItemEditing(tenant.codigo, purchaseId); const purchase = await this.checkoutService.prepareItemEditing(tenant.codigo, purchaseId);
this.createdPurchase.set(purchase); this.createdPurchase.set(purchase);
} catch (error) { } catch (error) {
console.error('Failed to prepare purchase item editing:', error); this.handleCheckoutError(error, 'No se pudo preparar la compra para editarla.');
this.isEditingItems.set(false); this.isEditingItems.set(false);
} finally { } finally {
this.isPreparingItemEdit.set(false); this.isPreparingItemEdit.set(false);
@@ -224,7 +279,14 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
const purchaseId = this.createdPurchaseId(); const purchaseId = this.createdPurchaseId();
const itemId = event.item.cartItemId; const itemId = event.item.cartItemId;
if (!tenant || !purchaseId || !itemId || this.isUpdatingItem() || !this.isEditingItems()) { if (
!this.canUpdateCartQuantity() ||
!tenant ||
!purchaseId ||
!itemId ||
this.isUpdatingItem() ||
!this.isEditingItems()
) {
return; return;
} }
@@ -235,10 +297,85 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
purchaseId, purchaseId,
itemId, itemId,
event.quantity, event.quantity,
this.createdPurchase()?.cart_id ?? null,
this.createdPurchase()?.items_source ?? 'purchase',
); );
this.createdPurchase.set(purchase); this.createdPurchase.set(purchase);
} catch (error) { } catch (error) {
console.error('Failed to update purchase item quantity:', error); this.handleCheckoutError(error, 'No se pudo actualizar la cantidad del producto.');
} finally {
this.isUpdatingItem.set(false);
}
}
protected async onPurchaseItemVariantChange(event: {
item: CartItemMock;
variantId: number;
}): Promise<void> {
const tenant = this.tenantService.tenant();
const purchase = this.createdPurchase();
const itemId = event.item.cartItemId;
if (
!this.canUpdateCartVariant() ||
!tenant ||
!purchase ||
!itemId ||
this.isUpdatingItem() ||
!this.isEditingItems()
) {
return;
}
this.isUpdatingItem.set(true);
try {
this.createdPurchase.set(
await this.checkoutService.updateItemVariant(
tenant.codigo,
purchase.id,
itemId,
event.variantId,
event.item.quantity,
purchase.cart_id,
purchase.items_source,
),
);
} catch (error) {
this.handleCheckoutError(error, 'No se pudo actualizar la variante del producto.');
} finally {
this.isUpdatingItem.set(false);
}
}
protected async onPurchaseItemRemove(event: { item: CartItemMock }): Promise<void> {
const tenant = this.tenantService.tenant();
const purchase = this.createdPurchase();
const itemId = event.item.cartItemId;
if (
!this.canDeleteCartItems() ||
!tenant ||
!purchase ||
!itemId ||
this.isUpdatingItem() ||
!this.isEditingItems()
) {
return;
}
this.isUpdatingItem.set(true);
try {
this.createdPurchase.set(
await this.checkoutService.removeItem(
tenant.codigo,
purchase.id,
itemId,
purchase.cart_id,
purchase.items_source,
),
);
} catch (error) {
this.handleCheckoutError(error, 'No se pudo eliminar el producto de la compra.');
} finally { } finally {
this.isUpdatingItem.set(false); this.isUpdatingItem.set(false);
} }
@@ -268,8 +405,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
// Auto trigger intent for default option // Auto trigger intent for default option
void this.selectPaymentMethod(this.selectedPaymentMethod()); void this.selectPaymentMethod(this.selectedPaymentMethod());
} catch (error) { } catch (error) {
console.error('Failed to create purchase:', error); this.handleCheckoutError(error, 'No se pudieron actualizar los datos de la compra.');
// Here we could show an alert or toast
} finally { } finally {
this.isUpdatingPurchase.set(false); this.isUpdatingPurchase.set(false);
} }
@@ -283,34 +419,21 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
public async canDeactivate(): Promise<boolean> { public async canDeactivate(): Promise<boolean> {
this.stopQrPolling(); this.stopQrPolling();
this.stopTransferPolling();
if (this.navigationStarted) { if (this.navigationStarted) {
return true; return true;
} }
const purchaseId = this.createdPurchaseId(); // The checkout cart remains attached to its purchase. Once the user adds a
const tenant = this.tenantService.tenant(); // new item, the cart API creates a separate active cart automatically.
if (!purchaseId || !tenant) {
return true;
}
try {
await this.checkoutService.cancelPurchase(tenant.codigo, purchaseId);
this.createdPurchaseId.set(null);
this.createdPurchase.set(null);
try { try {
await firstValueFrom(this.cartService.loadCart()); await firstValueFrom(this.cartService.loadCart());
} catch (error) { } catch (error) {
console.error('Failed to restore cart after cancelling checkout:', error); console.error('Failed to load the active cart after leaving checkout:', error);
} }
return true; return true;
} catch (error) {
console.error('Failed to cancel purchase:', error);
return false;
}
} }
protected async selectPaymentMethod(method: PaymentMethod): Promise<void> { protected async selectPaymentMethod(method: PaymentMethod): Promise<void> {
@@ -319,6 +442,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
} }
this.stopQrPolling(); this.stopQrPolling();
this.stopTransferPolling();
this.qrPaymentStatus.set('idle'); this.qrPaymentStatus.set('idle');
this.transferValidationStatus.set('idle'); this.transferValidationStatus.set('idle');
this.selectedPaymentMethod.set(method); this.selectedPaymentMethod.set(method);
@@ -331,7 +455,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
const purchaseId = this.createdPurchaseId(); const purchaseId = this.createdPurchaseId();
const tenant = this.tenantService.tenant(); const tenant = this.tenantService.tenant();
if (!purchaseId || !tenant || method === 'telepagos') { if (!purchaseId || !tenant) {
return; return;
} }
@@ -357,7 +481,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
this.startQrPolling(); this.startQrPolling();
} }
} catch (error) { } catch (error) {
console.error('Failed to generate payment intent:', error); this.handleCheckoutError(error, 'No se pudo generar la intenci\u00f3n de pago.');
} finally { } finally {
this.isGeneratingIntent.set(false); this.isGeneratingIntent.set(false);
} }
@@ -376,6 +500,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
} }
this.transferDni.set(dni); this.transferDni.set(dni);
this.stopTransferPolling();
this.transferValidationStatus.set('idle'); this.transferValidationStatus.set('idle');
this.isGeneratingIntent.set(true); this.isGeneratingIntent.set(true);
try { try {
@@ -393,7 +518,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
}); });
} }
} catch (error) { } catch (error) {
console.error('Failed to generate transfer payment intent:', error); this.handleCheckoutError(error, 'No se pudo generar la intenci\u00f3n de transferencia.');
} finally { } finally {
this.isGeneratingIntent.set(false); this.isGeneratingIntent.set(false);
} }
@@ -430,28 +555,99 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
return; return;
} }
this.stopTransferPolling();
this.transferValidationStatus.set('checking'); this.transferValidationStatus.set('checking');
this.transferPollingAttempts = 0;
const runId = this.transferPollingRunId;
try { try {
const purchase = await this.checkoutService const purchase = await this.checkoutService
.withCustomLoading() .withCustomLoading()
.submitPurchaseForReview(tenant.codigo, purchaseId); .submitPurchaseForReview(tenant.codigo, purchaseId);
if (purchase.status === 'paid' || purchase.status === 'pending_payment') { if (runId !== this.transferPollingRunId) {
if (purchase.status === 'pending_payment') { return;
this.transferValidationStatus.set('pending');
} }
if (purchase.status === 'paid') {
this.navigateToPurchaseStatus(purchaseId); this.navigateToPurchaseStatus(purchaseId);
return; return;
} }
this.transferValidationStatus.set('error'); this.scheduleTransferPoll(runId);
} catch (error) { } catch (error) {
console.error('Failed to submit purchase for review:', error); const expired = this.handleCheckoutError(
error,
'No se pudo enviar la compra a revisi\u00f3n.',
);
if (!expired && runId === this.transferPollingRunId) {
this.transferValidationStatus.set('error'); this.transferValidationStatus.set('error');
} }
} }
}
private scheduleTransferPoll(runId: number): void {
this.transferPollingTimeoutId = setTimeout(() => {
this.transferPollingTimeoutId = null;
void this.checkTransferPayment(runId);
}, this.transferPollingIntervalMs);
}
private async checkTransferPayment(runId: number): Promise<void> {
if (runId !== this.transferPollingRunId) {
return;
}
const purchaseId = this.createdPurchaseId();
const tenant = this.tenantService.tenant();
if (!purchaseId || !tenant || this.selectedPaymentMethod() !== 'transfer') {
this.stopTransferPolling();
return;
}
this.transferPollingAttempts += 1;
try {
const purchase = await this.checkoutService
.withCustomLoading()
.getPurchase(tenant.codigo, purchaseId);
if (runId !== this.transferPollingRunId) {
return;
}
if (purchase.status === 'paid') {
this.navigateToPurchaseStatus(purchaseId);
return;
}
} catch (error) {
console.error('Failed to validate transfer payment:', error);
}
if (runId !== this.transferPollingRunId) {
return;
}
if (this.transferPollingAttempts >= this.transferPollingMaxAttempts) {
this.stopTransferPolling();
this.transferValidationStatus.set('error');
return;
}
this.scheduleTransferPoll(runId);
}
private stopTransferPolling(): void {
this.transferPollingRunId += 1;
if (this.transferPollingTimeoutId !== null) {
clearTimeout(this.transferPollingTimeoutId);
this.transferPollingTimeoutId = null;
}
}
protected retryQrPolling(): void { protected retryQrPolling(): void {
if (this.selectedPaymentMethod() === 'qr' && this.qrData()) { if (this.selectedPaymentMethod() === 'qr' && this.qrData()) {
@@ -563,6 +759,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
this.navigationStarted = true; this.navigationStarted = true;
this.stopQrPolling(); this.stopQrPolling();
this.stopTransferPolling();
void this.router.navigate(['/checkout/status', purchaseId]); void this.router.navigate(['/checkout/status', purchaseId]);
} }
@@ -617,4 +814,54 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
void this.router.navigate(['/']); void this.router.navigate(['/']);
} }
} }
private handleCheckoutError(error: unknown, fallbackMessage: string): boolean {
if (!(error instanceof HttpErrorResponse)) {
this.toastService.danger(fallbackMessage);
return false;
}
const response = error.error as ApiErrorResponse | null;
if (response?.code === 'purchase.expired' || this.hasExpiredPurchase()) {
this.navigationStarted = true;
this.stopQrPolling();
this.stopTransferPolling();
this.toastService.danger(
response?.code === 'purchase.expired' && response.message
? response.message
: 'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
);
void this.router.navigate(['/']);
return true;
}
const validationMessage = response?.errors
? Object.values(response.errors).flat().find(Boolean)
: undefined;
this.toastService.danger(validationMessage ?? response?.message ?? fallbackMessage);
return false;
}
private hasExpiredPurchase(): boolean {
const purchase = this.createdPurchase();
if (!purchase) {
return false;
}
if (purchase.status === 'expired') {
return true;
}
if (!purchase.expires_at) {
return false;
}
return Date.parse(purchase.expires_at) <= Date.now();
}
} }

View File

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

View File

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

View File

@@ -101,26 +101,13 @@
} }
} }
.telepagos-logo {
display: inline-block;
font-size: 1.45rem;
font-weight: 800;
line-height: 1;
letter-spacing: -0.03em;
background: linear-gradient(90deg, #0a69d8 0 78%, #f6a11a 78% 100%);
-webkit-background-clip: text;
background-clip: text;
color: transparent;
}
.payment-panel { .payment-panel {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
min-width: 0; min-width: 0;
> app-checkout-payment-qr, > app-checkout-payment-qr,
> app-checkout-payment-transfer, > app-checkout-payment-transfer {
> app-checkout-payment-telepagos {
display: block; display: block;
width: 100%; width: 100%;
max-width: 320px; max-width: 320px;

View File

@@ -1,7 +1,6 @@
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
import { CheckoutPaymentQrComponent } from './components/checkout-payment-qr/checkout-payment-qr.component'; import { CheckoutPaymentQrComponent } from './components/checkout-payment-qr/checkout-payment-qr.component';
import { CheckoutPaymentTelepagosComponent } from './components/checkout-payment-telepagos/checkout-payment-telepagos.component';
import { CheckoutPaymentTransferComponent } from './components/checkout-payment-transfer/checkout-payment-transfer.component'; import { CheckoutPaymentTransferComponent } from './components/checkout-payment-transfer/checkout-payment-transfer.component';
import { import {
PaymentMethod, PaymentMethod,
@@ -15,7 +14,7 @@ import {
@Component({ @Component({
selector: 'app-checkout-payment-step', selector: 'app-checkout-payment-step',
standalone: true, standalone: true,
imports: [CheckoutPaymentQrComponent, CheckoutPaymentTelepagosComponent, CheckoutPaymentTransferComponent], imports: [CheckoutPaymentQrComponent, CheckoutPaymentTransferComponent],
templateUrl: './checkout-payment-step.component.html', templateUrl: './checkout-payment-step.component.html',
styleUrl: './checkout-payment-step.component.scss', styleUrl: './checkout-payment-step.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,6 @@
import { TestBed, getTestBed } from '@angular/core/testing'; import { TestBed, getTestBed } from '@angular/core/testing';
import { signal } from '@angular/core'; import { signal } from '@angular/core';
import { HttpErrorResponse } from '@angular/common/http';
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing'; import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
@@ -36,7 +37,7 @@ describe('ProductDetailPageComponent', () => {
has_tickets: false, has_tickets: false,
minimum_use_date: null, minimum_use_date: null,
maximum_use_date: null, maximum_use_date: null,
stock_tecnico: 10, maximum_addable_quantity: 10,
attributes: [], attributes: [],
variants: [], variants: [],
}; };
@@ -190,10 +191,10 @@ describe('ProductDetailPageComponent', () => {
const detailProduct: CatalogItemDetail = { const detailProduct: CatalogItemDetail = {
...mockProduct, ...mockProduct,
images: ['https://example.com/product.png'], images: ['https://example.com/product.png'],
variants: [{ id: 123, stock_tecnico: 10, values: {} }], variants: [{ id: 123, maximum_addable_quantity: 10, values: {} }],
selected_variant: { selected_variant: {
id: 123, id: 123,
stock_tecnico: 10, maximum_addable_quantity: 10,
images: ['https://example.com/variant1.png', 'https://example.com/variant2.png'], images: ['https://example.com/variant1.png', 'https://example.com/variant2.png'],
values: {}, values: {},
}, },
@@ -294,10 +295,12 @@ describe('ProductDetailPageComponent', () => {
], ],
}, },
], ],
variants: [{ id: 123, stock_tecnico: 10, values: { color: 'beige', material: 'Cuero' } }], variants: [
{ id: 123, maximum_addable_quantity: 10, values: { color: 'beige', material: 'Cuero' } },
],
selected_variant: { selected_variant: {
id: 123, id: 123,
stock_tecnico: 10, maximum_addable_quantity: 10,
images: ['https://example.com/variant1.png'], images: ['https://example.com/variant1.png'],
values: { values: {
color: 'beige', color: 'beige',
@@ -334,8 +337,8 @@ describe('ProductDetailPageComponent', () => {
purpose: 'entry', purpose: 'entry',
has_tickets: true, has_tickets: true,
variants: [ variants: [
{ id: 101, event_date_id: 20, stock_tecnico: 10, values: { event_date: '20' } }, { id: 101, event_date_id: 20, maximum_addable_quantity: 10, values: { event_date: '20' } },
{ id: 102, event_date_id: 21, stock_tecnico: 10, values: { event_date: '21' } }, { id: 102, event_date_id: 21, maximum_addable_quantity: 10, values: { event_date: '21' } },
], ],
attributes: [ attributes: [
{ {
@@ -366,7 +369,7 @@ describe('ProductDetailPageComponent', () => {
selected_variant: { selected_variant: {
id: 101, id: 101,
event_date_id: 20, event_date_id: 20,
stock_tecnico: 10, maximum_addable_quantity: 10,
images: [], images: [],
values: {}, values: {},
}, },
@@ -410,7 +413,7 @@ describe('ProductDetailPageComponent', () => {
fixture.componentInstance['selectedVariant'].set({ fixture.componentInstance['selectedVariant'].set({
id: 1, id: 1,
stock_tecnico: 10, maximum_addable_quantity: 10,
values: {}, values: {},
}); });
fixture.detectChanges(); fixture.detectChanges();
@@ -493,19 +496,45 @@ describe('ProductDetailPageComponent', () => {
}); });
}); });
it('shows the backend purchase-limit message for a direct checkout', async () => {
checkoutServiceStub.startCheckout.mockRejectedValue(
new HttpErrorResponse({
status: 422,
error: {
code: 'purchase.limit_exceeded',
message: 'Podés agregar hasta 2 unidades más de “Auriculares Bluetooth”.',
maximum_addable_quantity: 2,
},
}),
);
await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent);
fixture.detectChanges();
const buyButton = Array.from(fixture.nativeElement.querySelectorAll('app-button button')).find(
(button) => button.textContent?.trim() === 'Comprar',
) as HTMLButtonElement;
buyButton.click();
await Promise.resolve();
expect(toastServiceStub.danger).toHaveBeenCalledWith(
'Podés agregar hasta 2 unidades más de “Auriculares Bluetooth”.',
);
});
it('calls CartService.addItem when variant is selected and Add to Cart is clicked', async () => { it('calls CartService.addItem when variant is selected and Add to Cart is clicked', async () => {
const detailProduct: CatalogItemDetail = { const detailProduct: CatalogItemDetail = {
...mockProduct, ...mockProduct,
variants: [ variants: [
{ {
id: 123, id: 123,
stock_tecnico: 5, maximum_addable_quantity: 5,
values: {}, values: {},
}, },
], ],
selected_variant: { selected_variant: {
id: 123, id: 123,
stock_tecnico: 5, maximum_addable_quantity: 5,
images: [], images: [],
values: {}, values: {},
}, },
@@ -538,7 +567,7 @@ describe('ProductDetailPageComponent', () => {
resolveProduct({ resolveProduct({
...mockProduct, ...mockProduct,
variants: [], variants: [],
stock_tecnico: 4, maximum_addable_quantity: 4,
}); });
await configureTestingModule(); await configureTestingModule();
@@ -564,13 +593,13 @@ describe('ProductDetailPageComponent', () => {
variants: [ variants: [
{ {
id: 123, id: 123,
stock_tecnico: 5, maximum_addable_quantity: 5,
values: {}, values: {},
}, },
], ],
selected_variant: { selected_variant: {
id: 123, id: 123,
stock_tecnico: 5, maximum_addable_quantity: 5,
images: [], images: [],
values: {}, values: {},
}, },
@@ -602,7 +631,7 @@ describe('ProductDetailPageComponent', () => {
it('allows unlimited variants to increase quantity without a maximum', async () => { it('allows unlimited variants to increase quantity without a maximum', async () => {
const unlimitedVariant = { const unlimitedVariant = {
id: 321, id: 321,
stock_tecnico: null, maximum_addable_quantity: null,
values: {}, values: {},
}; };
resolveProduct({ resolveProduct({
@@ -610,7 +639,7 @@ describe('ProductDetailPageComponent', () => {
inventory_policy: 'unlimited', inventory_policy: 'unlimited',
selected_variant: { selected_variant: {
id: 321, id: 321,
stock_tecnico: null, maximum_addable_quantity: null,
images: [], images: [],
values: {}, values: {},
}, },
@@ -634,7 +663,7 @@ describe('ProductDetailPageComponent', () => {
it('caps an unlimited variant at the per-user purchase limit', async () => { it('caps an unlimited variant at the per-user purchase limit', async () => {
const unlimitedVariant = { const unlimitedVariant = {
id: 322, id: 322,
stock_tecnico: null, maximum_addable_quantity: 2,
values: {}, values: {},
}; };
resolveProduct({ resolveProduct({
@@ -643,7 +672,7 @@ describe('ProductDetailPageComponent', () => {
max_units_per_user: 2, max_units_per_user: 2,
selected_variant: { selected_variant: {
id: 322, id: 322,
stock_tecnico: null, maximum_addable_quantity: 2,
images: [], images: [],
values: { event_date: '20' }, values: { event_date: '20' },
}, },
@@ -667,14 +696,14 @@ describe('ProductDetailPageComponent', () => {
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,
stock_tecnico: 0, maximum_addable_quantity: 0,
values: {}, values: {},
}; };
resolveProduct({ resolveProduct({
...mockProduct, ...mockProduct,
selected_variant: { selected_variant: {
id: 654, id: 654,
stock_tecnico: 0, maximum_addable_quantity: 0,
images: [], images: [],
values: {}, values: {},
}, },

View File

@@ -98,27 +98,23 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
const variant = this.selectedVariant(); const variant = this.selectedVariant();
if (!prod) return 0; if (!prod) return 0;
const stockLimit = variant return variant
? variant.stock_tecnico ? (variant.maximum_addable_quantity ?? null)
: prod.variants.length === 0 : prod.variants.length === 0
? (prod.stock_tecnico ?? null) ? (prod.maximum_addable_quantity ?? null)
: 0; : 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();
if (!prod) return false; if (!prod) return false;
if (this.selectedVariantMax() === 0) return false;
const variant = this.selectedVariant(); const variant = this.selectedVariant();
if (variant) return this.isVariantAvailable(variant, prod); if (variant) return this.isVariantAvailable(variant);
if (prod.purpose === 'entry') return false; if (prod.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 this.selectedVariantMax() !== 0;
}); });
protected readonly descriptionExpanded = signal(false); protected readonly descriptionExpanded = signal(false);
protected readonly descriptionMaxHeight = signal(0); protected readonly descriptionMaxHeight = signal(0);
@@ -333,14 +329,18 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
}); });
} catch (error) { } catch (error) {
console.error('Failed to create direct purchase:', error); console.error('Failed to create direct purchase:', error);
this.toastService.danger('No se pudo iniciar la compra directa.'); const message =
error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
? error.error.message
: 'No se pudo iniciar la compra directa.';
this.toastService.danger(message);
} finally { } finally {
this.creatingDirectPurchase.set(false); this.creatingDirectPurchase.set(false);
} }
} }
private isVariantAvailable(variant: CatalogItemVariant, product: CatalogItemDetail): boolean { private isVariantAvailable(variant: CatalogItemVariant): boolean {
return product.inventory_policy === 'unlimited' || (variant.stock_tecnico ?? 0) > 0; return variant.maximum_addable_quantity !== 0;
} }
protected toggleDescription(): void { protected toggleDescription(): void {

View File

@@ -28,7 +28,7 @@ describe('productDetailResolver', () => {
has_tickets: false, has_tickets: false,
minimum_use_date: null, minimum_use_date: null,
maximum_use_date: null, maximum_use_date: null,
stock_tecnico: 0, maximum_addable_quantity: 0,
attributes: [], attributes: [],
variants: [], variants: [],
}; };

View File

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

View File

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

View File

@@ -23,7 +23,7 @@
</p> </p>
} @else { } @else {
@for (group of catalog(); track group.id) { @for (group of catalog(); track group.id) {
<app-store-section [title]="group.title"> <app-store-section [attr.id]="group.code" [title]="group.title">
<app-product-list <app-product-list
[layout]="group.layout" [layout]="group.layout"
[groupLayout]="group.group_layout" [groupLayout]="group.group_layout"

View File

@@ -11,6 +11,10 @@ app-store-section + app-store-section {
margin-top: clamp(3rem, 6vw, 5rem); margin-top: clamp(3rem, 6vw, 5rem);
} }
app-store-section[id] {
scroll-margin-top: 8rem;
}
:host > .store-home__additional-info:not(:first-child) { :host > .store-home__additional-info:not(:first-child) {
margin-top: clamp(3rem, 6vw, 5rem); margin-top: clamp(3rem, 6vw, 5rem);
} }

View File

@@ -58,6 +58,7 @@ function createCatalog(
return [ return [
{ {
id: 7, id: 7,
code: 'destacados',
title: 'Destacados', title: 'Destacados',
layout: 'column_with_image', layout: 'column_with_image',
group_layout: 'paginated', group_layout: 'paginated',
@@ -149,6 +150,7 @@ describe('StoreHomePageComponent', () => {
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
expect(catalogServiceStub.getCatalog).not.toHaveBeenCalled(); expect(catalogServiceStub.getCatalog).not.toHaveBeenCalled();
expect(element.querySelector('app-store-section')?.id).toBe('destacados');
expect(element.querySelector('.store-section__title')?.textContent?.trim()).toBe('Destacados'); expect(element.querySelector('.store-section__title')?.textContent?.trim()).toBe('Destacados');
expect(element.querySelectorAll('app-product-column-with-image')).toHaveLength(2); expect(element.querySelectorAll('app-product-column-with-image')).toHaveLength(2);
expect(element.textContent).toContain('Auriculares Bluetooth'); expect(element.textContent).toContain('Auriculares Bluetooth');

View File

@@ -224,6 +224,11 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
return; return;
} }
if (error instanceof HttpErrorResponse && typeof error.error?.message === 'string') {
this.toastService.danger(error.error.message);
return;
}
this.toastService.danger('No se pudo iniciar la compra directa.'); this.toastService.danger('No se pudo iniciar la compra directa.');
} finally { } finally {
this.creatingDirectPurchase.set(false); this.creatingDirectPurchase.set(false);

View File

@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
@if (hasVariantSelectors() && !quantityDisabled()) { @if (hasVariantSelectors() && !variantDisabled()) {
<app-variant-selector <app-variant-selector
class="cart-item-variant-selector" class="cart-item-variant-selector"
[variants]="variants()" [variants]="variants()"
@@ -55,7 +55,7 @@
(increase)="onIncrease()" (increase)="onIncrease()"
(decrease)="onDecrease()" (decrease)="onDecrease()"
/> />
@if (!quantityDisabled() && showRemove()) { @if (!removeDisabled() && allowDelete()) {
<app-icon-button variant="trash" class="cart-item-remove-btn" (click)="onRemove()" /> <app-icon-button variant="trash" class="cart-item-remove-btn" (click)="onRemove()" />
} }
</div> </div>

View File

@@ -31,7 +31,9 @@ export class CartItemComponent {
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);
readonly showRemove = input<boolean>(true); readonly variantDisabled = input<boolean>(false);
readonly removeDisabled = input<boolean>(false);
readonly allowDelete = input<boolean>(true);
readonly quantityChange = output<number>(); readonly quantityChange = output<number>();
readonly remove = output<void>(); readonly remove = output<void>();
@@ -61,7 +63,7 @@ export class CartItemComponent {
} }
protected onVariantChange(variant: unknown): void { protected onVariantChange(variant: unknown): void {
if (!this.quantityDisabled() && typeof variant === 'number') { if (!this.variantDisabled() && typeof variant === 'number') {
this.variantChange.emit(variant); this.variantChange.emit(variant);
} }
} }

View File

@@ -1,12 +1,17 @@
<section <section
class="d-flex flex-column h-100 overflow-hidden text-secondary" class="d-flex flex-column overflow-hidden text-secondary cart-shell"
[style.background-color]="backgroundColor()" [style.background-color]="backgroundColor()"
> >
<header class="d-flex align-items-center p-3 justify-content-between bg-transparent cart-header"> <header class="d-flex align-items-center p-3 justify-content-between bg-transparent cart-header">
<h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2> <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() && editable() && allowEditing() && items().length > 0) { @if (
allowModify() &&
(!readonly() || showModifyWhenReadonly()) &&
requireEditingMode() &&
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"
@@ -48,8 +53,22 @@
[selectedVariant]="getItemVariant(item)" [selectedVariant]="getItemVariant(item)"
[quantity]="getItemQuantity(item)" [quantity]="getItemQuantity(item)"
[readonly]="readonly()" [readonly]="readonly()"
[quantityDisabled]="!editable() || editingDisabled() || (allowEditing() && !editing())" [quantityDisabled]="
[showRemove]="allowRemove()" readonly() ||
!allowUpdateQuantity() ||
editingDisabled() ||
(requireEditingMode() && !editing())
"
[variantDisabled]="
readonly() ||
!allowUpdateVariant() ||
editingDisabled() ||
(requireEditingMode() && !editing())
"
[removeDisabled]="
readonly() || !allowDelete() || editingDisabled() || (requireEditingMode() && !editing())
"
[allowDelete]="allowDelete()"
(quantityChange)="onItemQuantityChange(idx, $event)" (quantityChange)="onItemQuantityChange(idx, $event)"
(variantChange)="onItemVariantChange(idx, $event)" (variantChange)="onItemVariantChange(idx, $event)"
(remove)="onItemRemove(idx)" (remove)="onItemRemove(idx)"

View File

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

View File

@@ -340,7 +340,7 @@ describe('CartComponent', () => {
quantity: 1, quantity: 1,
}, },
]); ]);
fixture.componentRef.setInput('allowEditing', true); fixture.componentRef.setInput('requireEditingMode', true);
const editingChange = vi.fn(); const editingChange = vi.fn();
fixture.componentInstance.editing.subscribe(editingChange); fixture.componentInstance.editing.subscribe(editingChange);
fixture.detectChanges(); fixture.detectChanges();
@@ -408,7 +408,7 @@ describe('CartComponent', () => {
).toBe(false); ).toBe(false);
}); });
it('hides the edit toggle and disables quantity changes when editable is false', async () => { it('hides the edit toggle and disables quantity changes when quantity updates are false', async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [CartComponent], imports: [CartComponent],
providers: [ providers: [
@@ -441,8 +441,9 @@ describe('CartComponent', () => {
quantity: 1, quantity: 1,
}, },
]); ]);
fixture.componentRef.setInput('allowEditing', true); fixture.componentRef.setInput('requireEditingMode', true);
fixture.componentRef.setInput('editable', false); fixture.componentRef.setInput('allowModify', false);
fixture.componentRef.setInput('allowUpdateQuantity', false);
const quantityChange = vi.fn(); const quantityChange = vi.fn();
fixture.componentInstance.itemQuantityChange.subscribe(quantityChange); fixture.componentInstance.itemQuantityChange.subscribe(quantityChange);
fixture.detectChanges(); fixture.detectChanges();

View File

@@ -53,10 +53,15 @@ 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 allowUpdateQuantity = input<boolean>(true);
readonly allowEditing = input<boolean>(false); readonly allowModify = input<boolean>(true);
readonly allowRemove = input<boolean>(true); readonly showModifyWhenReadonly = input<boolean>(false);
readonly requireEditingMode = input<boolean>(false);
readonly allowUpdateVariant = input<boolean>(true);
readonly allowDelete = input<boolean>(true);
readonly persistQuantityChanges = input<boolean>(true); readonly persistQuantityChanges = input<boolean>(true);
readonly persistVariantChanges = input<boolean>(true);
readonly persistDeleteChanges = input<boolean>(true);
readonly editingDisabled = input<boolean>(false); readonly editingDisabled = input<boolean>(false);
readonly editing = model<boolean>(false); readonly editing = model<boolean>(false);
@@ -66,6 +71,12 @@ export class CartComponent {
index: number; index: number;
quantity: number; quantity: number;
}>(); }>();
readonly itemVariantChange = output<{
item: CartItemMock;
index: number;
variantId: number;
}>();
readonly itemRemove = output<{ item: CartItemMock; index: number }>();
protected readonly quantityOverrides = signal<Record<number, number>>({}); protected readonly quantityOverrides = signal<Record<number, number>>({});
protected readonly variantOverrides = signal<Record<number, number>>({}); protected readonly variantOverrides = signal<Record<number, number>>({});
@@ -125,7 +136,7 @@ export class CartComponent {
} }
protected onItemQuantityChange(index: number, newQuantity: number): void { protected onItemQuantityChange(index: number, newQuantity: number): void {
if (!this.editable()) { if (!this.allowUpdateQuantity()) {
return; return;
} }
@@ -170,11 +181,19 @@ export class CartComponent {
} }
protected onItemVariantChange(index: number, variantId: number): void { protected onItemVariantChange(index: number, variantId: number): void {
if (this.readonly() || !this.allowUpdateVariant() || this.editingDisabled()) return;
const item = this.items()[index]; const item = this.items()[index];
const cartItemId = item?.cartItemId; const cartItemId = item?.cartItemId;
if (!item || !cartItemId || variantId === this.getItemVariant(item)) return; if (!item || !cartItemId || variantId === this.getItemVariant(item)) return;
this.itemVariantChange.emit({ item, index, variantId });
if (!this.persistVariantChanges()) {
return;
}
this.variantOverrides.update((overrides) => ({ ...overrides, [cartItemId]: variantId })); this.variantOverrides.update((overrides) => ({ ...overrides, [cartItemId]: variantId }));
this.cartService this.cartService
.updateItemVariant(cartItemId, this.getItemQuantity(item), variantId) .updateItemVariant(cartItemId, this.getItemQuantity(item), variantId)
@@ -200,6 +219,8 @@ export class CartComponent {
} }
protected onItemRemove(index: number): void { protected onItemRemove(index: number): void {
if (this.readonly() || !this.allowDelete() || this.editingDisabled()) return;
const target = this.resolveRemoveTarget(index); const target = this.resolveRemoveTarget(index);
if (!target) { if (!target) {
@@ -215,8 +236,15 @@ export class CartComponent {
}) })
.subscribe((confirmed) => { .subscribe((confirmed) => {
if (confirmed) { if (confirmed) {
const item = this.items()[index];
if (item) {
this.itemRemove.emit({ item, index });
}
if (this.persistDeleteChanges()) {
this.removeItem(target.cartItemId); this.removeItem(target.cartItemId);
} }
}
}); });
} }
@@ -225,7 +253,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.editable() || this.editingDisabled()) { if (!this.allowModify() || this.editingDisabled()) {
return; return;
} }

View File

@@ -12,6 +12,7 @@
[title]="item.nombre" [title]="item.nombre"
[description]="item.descripcion ?? ''" [description]="item.descripcion ?? ''"
[price]="price(item)" [price]="price(item)"
[maximumAddableQuantity]="item.maximum_addable_quantity ?? null"
[variants]="item.variants ?? []" [variants]="item.variants ?? []"
[saving]="savingProductIds().has(item.id)" [saving]="savingProductIds().has(item.id)"
(buy)="emitRowBuy(item, $event)" (buy)="emitRowBuy(item, $event)"
@@ -23,6 +24,7 @@
[title]="item.nombre" [title]="item.nombre"
[description]="item.descripcion ?? ''" [description]="item.descripcion ?? ''"
[price]="price(item)" [price]="price(item)"
[maximumAddableQuantity]="item.maximum_addable_quantity ?? null"
[variants]="item.variants ?? []" [variants]="item.variants ?? []"
[saving]="savingProductIds().has(item.id)" [saving]="savingProductIds().has(item.id)"
(buy)="emitColumnBuy(item, $event)" (buy)="emitColumnBuy(item, $event)"

View File

@@ -193,8 +193,8 @@ describe('ProductListComponent', () => {
const itemWithVariants: ProductListItem = { const itemWithVariants: ProductListItem = {
...items[0], ...items[0],
variants: [ variants: [
{ id: 91, stock_tecnico: 3, values: { fecha: '10 de octubre' } }, { id: 91, maximum_addable_quantity: 3, values: { fecha: '10 de octubre' } },
{ id: 92, stock_tecnico: 4, values: { fecha: '11 de octubre' } }, { id: 92, maximum_addable_quantity: 4, values: { fecha: '11 de octubre' } },
], ],
}; };
const fixture = await render('column_with_cart', [itemWithVariants]); const fixture = await render('column_with_cart', [itemWithVariants]);
@@ -214,6 +214,58 @@ describe('ProductListComponent', () => {
}); });
}); });
it('caps the quantity at the selected variant maximum', async () => {
const itemWithVariants: ProductListItem = {
...items[0],
variants: [
{
id: 91,
maximum_addable_quantity: 2,
values: { fecha: '10 de octubre' },
},
],
};
const fixture = await render('column_with_cart', [itemWithVariants]);
await fixture.whenStable();
fixture.detectChanges();
const increase = fixture.nativeElement.querySelector(
'.quantity-selector__button:last-child',
) as HTMLButtonElement;
increase.click();
fixture.detectChanges();
expect(
(fixture.nativeElement as HTMLElement).querySelector('.quantity-selector__value')
?.textContent,
).toContain('2');
expect(increase.disabled).toBe(true);
});
it('disables purchase actions when the selected variant maximum is zero', async () => {
const unavailableItem: ProductListItem = {
...items[0],
variants: [
{
id: 91,
maximum_addable_quantity: 0,
values: { fecha: '10 de octubre' },
},
],
};
const fixture = await render('row', [unavailableItem]);
await fixture.whenStable();
fixture.detectChanges();
const buttons = Array.from(
(fixture.nativeElement as HTMLElement).querySelectorAll<HTMLButtonElement>(
'.product-row-card__buttons button',
),
);
expect(buttons).toHaveLength(2);
expect(buttons.every((button) => button.disabled)).toBe(true);
});
it('renders pagination and emits the requested page', async () => { it('renders pagination and emits the requested page', async () => {
const fixture = await render('row'); const fixture = await render('row');
const pageChangeSpy = vi.fn(); const pageChangeSpy = vi.fn();
@@ -252,7 +304,7 @@ describe('ProductListComponent', () => {
{ {
id: 401, id: 401,
precio: '10000.00', precio: '10000.00',
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: { value: 'vip', label: 'VIP' }, tipo: { value: 'vip', label: 'VIP' },
sector: { value: 'a', label: 'Sector A' }, sector: { value: 'a', label: 'Sector A' },
@@ -263,7 +315,7 @@ describe('ProductListComponent', () => {
{ {
id: 402, id: 402,
precio: '12000.00', precio: '12000.00',
stock_tecnico: 1, maximum_addable_quantity: 1,
values: { values: {
tipo: { value: 'vip', label: 'VIP' }, tipo: { value: 'vip', label: 'VIP' },
sector: { value: 'a', label: 'Sector A' }, sector: { value: 'a', label: 'Sector A' },

View File

@@ -21,7 +21,11 @@
[(selectedVariant)]="selectedVariant" [(selectedVariant)]="selectedVariant"
/> />
<app-quantity-selector [(quantity)]="quantity"></app-quantity-selector> <app-quantity-selector
[(quantity)]="quantity"
[max]="effectiveMaximum()"
[disabled]="unavailable()"
/>
</div> </div>
<span class="product-row-card__price text-primary"> <span class="product-row-card__price text-primary">
@@ -31,10 +35,16 @@
<div class="product-row-card__buttons"> <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" [disabled]="unavailable()" (click)="onBuy()">
Comprar
</app-button>
</div> </div>
<div class="product-row-card__btn-wrapper"> <div class="product-row-card__btn-wrapper">
<app-button variant="secondary" [disabled]="saving()" (click)="onAddToCart()"> <app-button
variant="secondary"
[disabled]="saving() || unavailable()"
(click)="onAddToCart()"
>
{{ saving() ? 'Guardando' : 'Agregar al carrito' }} {{ saving() ? 'Guardando' : 'Agregar al carrito' }}
</app-button> </app-button>
</div> </div>

View File

@@ -1,4 +1,12 @@
import { ChangeDetectionStrategy, Component, computed, input, model, output } from '@angular/core'; import {
ChangeDetectionStrategy,
Component,
computed,
effect,
input,
model,
output,
} from '@angular/core';
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 { import {
@@ -10,7 +18,7 @@ export interface Variant extends VariantSelectorVariant {
label?: string; label?: string;
descripcion?: string | null; descripcion?: string | null;
precio?: string | number; precio?: string | number;
stock_tecnico?: number | null; maximum_addable_quantity?: number | null;
} }
@Component({ @Component({
@@ -26,6 +34,7 @@ export class ProductRowCardComponent {
readonly title = input<string>(''); readonly title = input<string>('');
readonly description = input<string>(''); readonly description = input<string>('');
readonly price = input<number>(0); readonly price = input<number>(0);
readonly maximumAddableQuantity = input<number | null>(null);
readonly variants = input<Variant[]>([]); readonly variants = input<Variant[]>([]);
readonly saving = input(false); readonly saving = input(false);
@@ -48,11 +57,25 @@ export class ProductRowCardComponent {
return Number.isFinite(variantPrice) ? variantPrice : this.price(); return Number.isFinite(variantPrice) ? variantPrice : this.price();
}); });
protected readonly effectiveMaximum = computed(
() => this.selectedVariantData()?.maximum_addable_quantity ?? this.maximumAddableQuantity(),
);
protected readonly unavailable = computed(() => this.effectiveMaximum() === 0);
readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice())); readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice()));
constructor() {
effect(() => {
const maximum = this.effectiveMaximum();
if (maximum !== null && maximum > 0 && this.quantity() > maximum) {
this.quantity.set(maximum);
}
});
}
protected onAddToCart(): void { protected onAddToCart(): void {
if (this.saving()) { if (this.saving() || this.unavailable()) {
return; return;
} }
@@ -63,6 +86,8 @@ export class ProductRowCardComponent {
} }
protected onBuy(): void { protected onBuy(): void {
if (this.unavailable()) return;
this.buy.emit({ this.buy.emit({
quantity: this.quantity(), quantity: this.quantity(),
variant: this.selectedVariant(), variant: this.selectedVariant(),

View File

@@ -20,6 +20,17 @@
<span class="ticket-selector__label">Seleccioná Entrada/s:</span> <span class="ticket-selector__label">Seleccioná Entrada/s:</span>
<div class="ticket-selector__rows"> <div class="ticket-selector__rows">
@if (attributes().length > 0) {
<div class="ticket-selector__columns" aria-hidden="true">
<div class="ticket-selector__column-labels">
@for (attribute of attributes(); track attribute.key) {
<span class="ticket-selector__column-label">{{ attribute.label }}</span>
}
</div>
<span class="ticket-selector__action-spacer"></span>
</div>
}
@for (row of rows(); track row.id) { @for (row of rows(); track row.id) {
<div class="ticket-selector__row"> <div class="ticket-selector__row">
<div class="ticket-selector__row-content"> <div class="ticket-selector__row-content">

View File

@@ -57,6 +57,30 @@
gap: 0.5rem; gap: 0.5rem;
} }
&__columns {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
align-items: end;
gap: 0.5rem;
}
&__column-labels {
min-width: 0;
display: grid;
grid-template-columns: repeat(4, minmax(120px, 1fr));
gap: 0.5rem;
}
&__column-label {
color: #666;
font-size: 13px;
font-weight: 600;
}
&__action-spacer {
width: 38px;
}
&__row { &__row {
display: grid; display: grid;
grid-template-columns: minmax(0, 1fr) auto; grid-template-columns: minmax(0, 1fr) auto;
@@ -160,6 +184,10 @@
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
&__columns {
display: none;
}
&__map { &__map {
margin-top: 2rem; margin-top: 2rem;
} }

View File

@@ -209,6 +209,23 @@ describe('ProductTicketSelectorComponent', () => {
expect(removeButton?.classList.contains('icon-btn--bordered')).toBe(true); expect(removeButton?.classList.contains('icon-btn--bordered')).toBe(true);
}); });
it('shows one header row with the label of every selector', async () => {
const { fixture } = await createComponent({
maps: [mapResponse([variant(401, 'general', 'A', '1', '1')])],
});
const headerRows = fixture.nativeElement.querySelectorAll('.ticket-selector__columns');
const labels = fixture.nativeElement.querySelectorAll('.ticket-selector__column-label');
expect(headerRows).toHaveLength(1);
expect([...labels].map((label: Element) => label.textContent?.trim())).toEqual([
'Tipo',
'Sector',
'Fila',
'Asiento',
]);
});
it('clears only the seat after a stock conflict when the row still has alternatives', async () => { 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 failed = variant(401, 'general', 'A', '1', '1');
const alternative = variant(402, 'general', 'A', '1', '2'); const alternative = variant(402, 'general', 'A', '1', '2');

View File

@@ -71,7 +71,7 @@ export class ProductTicketSelectorComponent {
private readonly viewReady = signal(false); private readonly viewReady = signal(false);
private readonly mapReady = signal(false); private readonly mapReady = signal(false);
private readonly variants = signal<CatalogFeaturedItemVariant[]>([]); private readonly variants = signal<CatalogFeaturedItemVariant[]>([]);
private readonly attributes = signal<VariantAttribute[]>([]); protected readonly attributes = signal<VariantAttribute[]>([]);
private mapRequest: Subscription | null = null; private mapRequest: Subscription | null = null;
readonly productId = input.required<number>(); readonly productId = input.required<number>();
@@ -361,7 +361,7 @@ export class ProductTicketSelectorComponent {
return { return {
id: item.variant.id, id: item.variant.id,
precio: item.variant.precio, precio: item.variant.precio,
stock_tecnico: item.variant.stock_tecnico, maximum_addable_quantity: item.variant.stock_tecnico,
values: item.variant.values, values: item.variant.values,
}; };
} }

View File

@@ -11,13 +11,21 @@
@if (!hasVariants()) { @if (!hasVariants()) {
<div class="product-vertical-with-cart-card__summary"> <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"
[max]="effectiveMaximum()"
[disabled]="unavailable()"
/>
</div> </div>
} @else { } @else {
<div class="product-vertical-with-cart-card__variants"> <div class="product-vertical-with-cart-card__variants">
<div class="product-vertical-with-cart-card__summary"> <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"
[max]="effectiveMaximum()"
[disabled]="unavailable()"
/>
</div> </div>
<div class="product-vertical-with-cart-card__variant-selectors"> <div class="product-vertical-with-cart-card__variant-selectors">
@@ -29,14 +37,14 @@
<div class="product-vertical-with-cart-card__actions"> <div class="product-vertical-with-cart-card__actions">
<app-button <app-button
variant="primary" variant="primary"
[disabled]="hasVariants() && selectedVariant() === null" [disabled]="unavailable() || (hasVariants() && selectedVariant() === null)"
(click)="onBuy()" (click)="onBuy()"
> >
Comprar Comprar
</app-button> </app-button>
<app-button <app-button
variant="secondary" variant="secondary"
[disabled]="saving() || (hasVariants() && selectedVariant() === null)" [disabled]="saving() || unavailable() || (hasVariants() && selectedVariant() === null)"
(click)="onAddToCart()" (click)="onAddToCart()"
> >
{{ saving() ? 'Guardando' : 'Agregar al carrito' }} {{ saving() ? 'Guardando' : 'Agregar al carrito' }}

View File

@@ -1,4 +1,12 @@
import { ChangeDetectionStrategy, Component, computed, input, model, output } from '@angular/core'; import {
ChangeDetectionStrategy,
Component,
computed,
effect,
input,
model,
output,
} from '@angular/core';
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';
@@ -10,6 +18,7 @@ import {
export interface VerticalCartVariant extends VariantSelectorVariant { export interface VerticalCartVariant extends VariantSelectorVariant {
descripcion?: string | null; descripcion?: string | null;
precio?: string | number; precio?: string | number;
maximum_addable_quantity?: number | null;
} }
@Component({ @Component({
@@ -23,6 +32,7 @@ export class ProductVerticalWithCartCardComponent {
readonly title = input<string>(''); readonly title = input<string>('');
readonly description = input<string>(''); readonly description = input<string>('');
readonly price = input<number>(0); readonly price = input<number>(0);
readonly maximumAddableQuantity = input<number | null>(null);
readonly variants = input<VerticalCartVariant[]>([]); readonly variants = input<VerticalCartVariant[]>([]);
readonly saving = input(false); readonly saving = input(false);
@@ -45,9 +55,23 @@ export class ProductVerticalWithCartCardComponent {
}); });
protected readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice())); protected readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice()));
protected readonly hasVariants = computed(() => this.variants().length > 0); protected readonly hasVariants = computed(() => this.variants().length > 0);
protected readonly effectiveMaximum = computed(
() => this.selectedVariantData()?.maximum_addable_quantity ?? this.maximumAddableQuantity(),
);
protected readonly unavailable = computed(() => this.effectiveMaximum() === 0);
constructor() {
effect(() => {
const maximum = this.effectiveMaximum();
if (maximum !== null && maximum > 0 && this.quantity() > maximum) {
this.quantity.set(maximum);
}
});
}
protected onAddToCart(): void { protected onAddToCart(): void {
if (this.saving()) { if (this.saving() || this.unavailable()) {
return; return;
} }
@@ -55,6 +79,8 @@ export class ProductVerticalWithCartCardComponent {
} }
protected onBuy(): void { protected onBuy(): void {
if (this.unavailable()) return;
this.buy.emit({ quantity: this.quantity(), variant: this.selectedVariant() }); this.buy.emit({ quantity: this.quantity(), variant: this.selectedVariant() });
} }

View File

@@ -0,0 +1,27 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-route-not-found-page',
template: `
<main class="route-not-found">
<h1>404</h1>
<p>No encontramos la página solicitada.</p>
</main>
`,
styles: `
.route-not-found {
min-height: 100vh;
display: grid;
place-content: center;
gap: 0.5rem;
padding: 2rem;
text-align: center;
}
h1,
p {
margin: 0;
}
`,
})
export class RouteNotFoundPageComponent {}