Compare commits
33 Commits
88c3a08a23
...
homo_exper
| Author | SHA1 | Date | |
|---|---|---|---|
| 07972760fc | |||
| 848c3b280f | |||
| 5d9adc0494 | |||
| 593580d648 | |||
| eb524c7d99 | |||
| 65e8436ae1 | |||
| 07500f699d | |||
| 4997665da6 | |||
| dbfadf417a | |||
| dddb086cd8 | |||
| a825b3693b | |||
| 679342ec8d | |||
| a5420e6a42 | |||
| 91b8788c91 | |||
| b6a52ceb8c | |||
| 51d051733c | |||
| f62cd08807 | |||
| d61b1e4b0a | |||
| 1bffefece3 | |||
| b0d2cd05bc | |||
| 591f53c102 | |||
| 85529f40f2 | |||
| 4a952af784 | |||
| b1d4c4d13d | |||
| 8861e42fff | |||
| 7fbdd3844f | |||
| f2c1542e46 | |||
| def86405dc | |||
| 870de3ca6e | |||
| d8d489e846 | |||
| 4183d6386d | |||
| 8089298383 | |||
| d51db00247 |
@@ -7,6 +7,7 @@ import { of } from 'rxjs';
|
||||
import { App } from './app';
|
||||
import { AuthService } from './core/services/auth/auth.service';
|
||||
import { CartService } from './core/services/cart/cart.service';
|
||||
import { CheckoutService } from './core/services/checkout.service';
|
||||
import { Tenant } from './core/services/tenant.interface';
|
||||
import { TenantService } from './core/services/tenant.service';
|
||||
import { routes } from './app.routes';
|
||||
@@ -97,6 +98,21 @@ async function renderAppAt(
|
||||
{
|
||||
provide: AuthService,
|
||||
useValue: authService
|
||||
},
|
||||
{
|
||||
provide: CheckoutService,
|
||||
useValue: {
|
||||
withCustomLoading() {
|
||||
return this;
|
||||
},
|
||||
getPurchase: vi.fn().mockResolvedValue({
|
||||
id: 25,
|
||||
status: 'created',
|
||||
items: [],
|
||||
subtotal: '0.00',
|
||||
total: '0.00'
|
||||
})
|
||||
}
|
||||
}
|
||||
]
|
||||
}).compileComponents();
|
||||
@@ -246,15 +262,33 @@ describe('app routes', () => {
|
||||
expect(compiled.textContent).toContain('No encontramos una tienda para este dominio');
|
||||
});
|
||||
|
||||
it('redirects unauthenticated users from /checkout to /login', async () => {
|
||||
const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(false));
|
||||
it('redirects unauthenticated users from /checkout/:id to /login', async () => {
|
||||
const { router } = await renderAppAt('/checkout/25', createTenantServiceStub(), createAuthServiceStub(false));
|
||||
|
||||
expect(router.url).toBe('/login?returnUrl=%2Fcheckout');
|
||||
expect(router.url).toBe('/login?returnUrl=%2Fcheckout%2F25');
|
||||
});
|
||||
|
||||
it('allows authenticated users to access /checkout', async () => {
|
||||
const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(true));
|
||||
it('allows authenticated users to access /checkout/:id', async () => {
|
||||
const checkoutTenant = {
|
||||
...tenant,
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'checkout',
|
||||
label: 'Checkout',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic' as const,
|
||||
route: '/checkout',
|
||||
submenues: []
|
||||
}
|
||||
]
|
||||
};
|
||||
const { router } = await renderAppAt(
|
||||
'/checkout/25',
|
||||
createTenantServiceStub('ready', checkoutTenant),
|
||||
createAuthServiceStub(true)
|
||||
);
|
||||
|
||||
expect(router.url).toBe('/checkout');
|
||||
expect(router.url).toBe('/checkout/25');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -115,6 +115,6 @@ describe('App', () => {
|
||||
expect(fixture.nativeElement.textContent).toContain('No encontramos una tienda para este dominio');
|
||||
expect(document.title).toBe('ShopitFront');
|
||||
expect(document.head.querySelector<HTMLLinkElement>('link[rel~="icon"]')?.getAttribute('href'))
|
||||
.toBe('favicon.ico');
|
||||
.toBe("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -9,6 +9,8 @@ import { GlobalLoadingComponent } from './shared/components/global-loading/globa
|
||||
import { ModalHostComponent } from './shared/components/modal-host/modal-host.component';
|
||||
import { ToastContainerComponent } from './shared/components/toast-container/toast-container.component';
|
||||
|
||||
const EMPTY_FAVICON = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E";
|
||||
|
||||
function hexToRgb(hex: string): string {
|
||||
const cleanHex = hex.replace('#', '').trim();
|
||||
let r = 0, g = 0, b = 0;
|
||||
@@ -66,7 +68,7 @@ export class App {
|
||||
effect(() => {
|
||||
const tenant = this.tenantService.tenant();
|
||||
const siteTitle = tenant?.site_title?.trim() || 'ShopitFront';
|
||||
const faviconHref = tenant?.favicon || 'favicon.ico';
|
||||
const faviconHref = tenant?.favicon || EMPTY_FAVICON;
|
||||
|
||||
this.title.setTitle(siteTitle);
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ describe('hasMenuGuard', () => {
|
||||
});
|
||||
|
||||
it('redirects a missing menu route to the store root', () => {
|
||||
const result = runGuard('checkout', '/checkout', tenant);
|
||||
const result = runGuard('checkout', '/checkout/25', tenant);
|
||||
|
||||
expect(result instanceof UrlTree).toBe(true);
|
||||
expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe('/');
|
||||
|
||||
@@ -152,9 +152,9 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (displayCategories()) {
|
||||
<div class="store-layout__categories d-none d-md-block">
|
||||
<div class="container-xl px-3 px-md-4">
|
||||
<div class="store-layout__categories d-none d-md-block">
|
||||
<div class="container-xl h-100 px-3 px-md-4 d-flex align-items-center">
|
||||
@if (displayCategories()) {
|
||||
<div class="store-layout__category-menu">
|
||||
<button
|
||||
type="button"
|
||||
@@ -175,7 +175,18 @@
|
||||
(categorySelect)="onCategorySelect($event)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (checkoutRemainingTime(); as remainingTime) {
|
||||
<div
|
||||
class="store-layout__checkout-timer ms-auto d-none d-md-flex align-items-baseline gap-3"
|
||||
role="timer"
|
||||
aria-label="Tiempo restante de compra"
|
||||
>
|
||||
<span class="store-layout__checkout-timer-label">Tiempo restante de compra:</span>
|
||||
<span class="store-layout__checkout-timer-value">{{ remainingTime }}</span>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</header>
|
||||
|
||||
@@ -10,6 +10,26 @@
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.store-layout__categories {
|
||||
height: 3.5rem;
|
||||
}
|
||||
|
||||
.store-layout__checkout-timer {
|
||||
color: var(--tenant-primary);
|
||||
font-weight: 700;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.store-layout__checkout-timer-label {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.store-layout__checkout-timer-value {
|
||||
font-size: 20px;
|
||||
line-height: 1;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
|
||||
.store-layout__brand-slot {
|
||||
min-width: 150px;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
import { Component, ElementRef, HostListener, inject, input, output, signal } from '@angular/core';
|
||||
import {
|
||||
Component,
|
||||
computed,
|
||||
ElementRef,
|
||||
HostListener,
|
||||
inject,
|
||||
input,
|
||||
output,
|
||||
signal,
|
||||
} from '@angular/core';
|
||||
import { Router, RouterLink } from '@angular/router';
|
||||
import { AuthUser } from '../../../services/auth/auth.interfaces';
|
||||
import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
|
||||
@@ -40,6 +49,7 @@ export class StoreHeaderComponent {
|
||||
readonly displaySeachBar = input(true);
|
||||
readonly displayCart = input(true);
|
||||
readonly cartDisabled = input(false);
|
||||
readonly checkoutRemainingSeconds = input<number | null>(null);
|
||||
readonly cartClick = output<void>();
|
||||
readonly ticketsClick = output<void>();
|
||||
readonly loginClick = output<void>();
|
||||
@@ -53,6 +63,18 @@ export class StoreHeaderComponent {
|
||||
protected readonly minSearchLength = 3;
|
||||
protected readonly showSearchError = signal(false);
|
||||
protected readonly searchControl = new FormControl('', { nonNullable: true });
|
||||
protected readonly checkoutRemainingTime = computed(() => {
|
||||
const remainingSeconds = this.checkoutRemainingSeconds();
|
||||
|
||||
if (remainingSeconds === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const minutes = Math.floor(remainingSeconds / 60);
|
||||
const seconds = remainingSeconds % 60;
|
||||
|
||||
return `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
|
||||
});
|
||||
|
||||
protected onCartClick(): void {
|
||||
if (this.cartDisabled()) {
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
[displaySeachBar]="tenant()?.display_seach_bar ?? true"
|
||||
[displayCart]="displayCart()"
|
||||
[cartDisabled]="isCheckoutRoute()"
|
||||
[checkoutRemainingSeconds]="checkoutRemainingSeconds()"
|
||||
(cartClick)="onCartClick()"
|
||||
(ticketsClick)="onTicketsClick()"
|
||||
(loginClick)="onLoginClick()"
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
:host {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
min-height: 100dvh;
|
||||
background: #f5f5f5;
|
||||
color: #202020;
|
||||
@@ -7,6 +9,8 @@
|
||||
|
||||
.store-layout {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.store-layout__cart-overlay {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||||
import { signal } from '@angular/core';
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import {
|
||||
@@ -23,6 +24,7 @@ import { AuthUser } from '../../services/auth/auth.interfaces';
|
||||
import { StoreLayoutComponent } from './store-layout.component';
|
||||
import { StoreHeaderComponent } from './store-header/store-header.component';
|
||||
import { CheckoutService } from '../../services/checkout.service';
|
||||
import { CheckoutCountdownService } from '../../services/checkout-countdown.service';
|
||||
import { TenantUrlSerializer } from '../../services/tenant-url.serializer';
|
||||
|
||||
const tenant: Tenant = {
|
||||
@@ -149,6 +151,7 @@ describe('StoreLayoutComponent', () => {
|
||||
let tenantState = signal<Tenant | null>(tenant);
|
||||
let cartState = signal<Cart | null>(null);
|
||||
let authUserState = signal<AuthUser | null>(null);
|
||||
let checkoutRemainingSecondsState = signal<number | null>(null);
|
||||
let checkoutServiceStub: { startCheckout: ReturnType<typeof vi.fn> };
|
||||
let queryParamMapState: BehaviorSubject<ParamMap>;
|
||||
|
||||
@@ -156,6 +159,7 @@ describe('StoreLayoutComponent', () => {
|
||||
tenantState = signal<Tenant | null>(tenant);
|
||||
cartState = signal<Cart | null>(null);
|
||||
authUserState = signal<AuthUser | null>(null);
|
||||
checkoutRemainingSecondsState = signal<number | null>(null);
|
||||
queryParamMapState = new BehaviorSubject(convertToParamMap({}));
|
||||
const isAuthenticatedState = signal(false);
|
||||
checkoutServiceStub = {
|
||||
@@ -214,6 +218,12 @@ describe('StoreLayoutComponent', () => {
|
||||
provide: CheckoutService,
|
||||
useValue: checkoutServiceStub,
|
||||
},
|
||||
{
|
||||
provide: CheckoutCountdownService,
|
||||
useValue: {
|
||||
remainingSeconds: checkoutRemainingSecondsState.asReadonly(),
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
});
|
||||
@@ -246,7 +256,7 @@ describe('StoreLayoutComponent', () => {
|
||||
it('disables the cart icon and prevents opening the popup during checkout with a tenant base path', () => {
|
||||
tenantState.set({ ...tenant, base_path: 'fiesta' });
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'url', 'get').mockReturnValue('/fiesta/checkout?purchase=25');
|
||||
vi.spyOn(router, 'url', 'get').mockReturnValue('/fiesta/checkout/25');
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
@@ -270,6 +280,22 @@ describe('StoreLayoutComponent', () => {
|
||||
expect(element.querySelector('.store-layout__cart-overlay')).toBeNull();
|
||||
});
|
||||
|
||||
it('shows the synchronized countdown in the header whenever one is active', () => {
|
||||
checkoutRemainingSecondsState.set(587);
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
|
||||
expect(element.querySelector('.store-layout__checkout-timer-label')?.textContent).toContain(
|
||||
'Tiempo restante de compra:',
|
||||
);
|
||||
expect(element.querySelector('.store-layout__checkout-timer-value')?.textContent?.trim()).toBe(
|
||||
'09:47',
|
||||
);
|
||||
});
|
||||
|
||||
it('hides the configured header elements when the tenant disables them', () => {
|
||||
tenantState.set({
|
||||
...tenant,
|
||||
@@ -587,7 +613,7 @@ describe('StoreLayoutComponent', () => {
|
||||
const authService = TestBed.inject(AuthService);
|
||||
const cartService = TestBed.inject(CartService);
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'url', 'get').mockReturnValue('/checkout?purchase=25');
|
||||
vi.spyOn(router, 'url', 'get').mockReturnValue('/checkout/25');
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
@@ -674,12 +700,44 @@ describe('StoreLayoutComponent', () => {
|
||||
expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('test', {
|
||||
cart_id: 1,
|
||||
});
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/checkout'], {
|
||||
queryParams: { purchase: 55 },
|
||||
});
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/checkout', 55]);
|
||||
expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
|
||||
});
|
||||
|
||||
it('shows the backend message and refreshes the cart when its reservation expired', async () => {
|
||||
const message = 'La reserva de stock venció. Usá el carrito activo para continuar.';
|
||||
checkoutServiceStub.startCheckout.mockRejectedValue(
|
||||
new HttpErrorResponse({
|
||||
status: 422,
|
||||
error: { code: 'stock_reservation.expired', message },
|
||||
}),
|
||||
);
|
||||
cartState.set({
|
||||
id: 1,
|
||||
tenant_codigo: tenant.codigo,
|
||||
status: 'active',
|
||||
subtotal: '100.00',
|
||||
items: [],
|
||||
});
|
||||
authUserState.set({
|
||||
id: 7,
|
||||
nombre_apellido: 'Juan Perez',
|
||||
email: 'juan@example.com',
|
||||
dni: '12345678',
|
||||
telefono: '3415555555',
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
const loadCart = vi.spyOn(TestBed.inject(CartService), 'loadCart');
|
||||
fixture.detectChanges();
|
||||
loadCart.mockClear();
|
||||
|
||||
await (fixture.componentInstance as any).onCheckoutClick();
|
||||
|
||||
expect(TestBed.inject(ToastService).danger).toHaveBeenCalledWith(message);
|
||||
expect(loadCart).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it('allows modifying quantities directly in the regular cart without a toggle', () => {
|
||||
cartState.set({
|
||||
id: 1,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
import { Component, computed, DestroyRef, inject, OnInit, signal } from '@angular/core';
|
||||
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
||||
import {
|
||||
@@ -17,9 +18,13 @@ import { ButtonComponent } from '../../../shared/components/button/button.compon
|
||||
import { CartItem, CartItemVariantValue } from '../../services/cart/cart.interface';
|
||||
import { AuthService } from '../../services/auth/auth.service';
|
||||
import { findMenu } from '../../services/menu.utils';
|
||||
import { CheckoutService } from '../../services/checkout.service';
|
||||
import {
|
||||
CheckoutService,
|
||||
isExpiredStockReservationResponse,
|
||||
} from '../../services/checkout.service';
|
||||
import { ToastService } from '../../services/toast.service';
|
||||
import { Category } from '../../services/tenant.interface';
|
||||
import { CheckoutCountdownService } from '../../services/checkout-countdown.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-store-layout',
|
||||
@@ -38,6 +43,7 @@ export class StoreLayoutComponent implements OnInit {
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly checkoutService = inject(CheckoutService);
|
||||
private readonly checkoutCountdownService = inject(CheckoutCountdownService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly router = inject(Router);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
@@ -45,6 +51,7 @@ export class StoreLayoutComponent implements OnInit {
|
||||
|
||||
protected readonly isCartOpen = signal(false);
|
||||
protected readonly isCheckoutRoute = signal(this.isCheckoutUrl(this.router.url));
|
||||
protected readonly checkoutRemainingSeconds = this.checkoutCountdownService.remainingSeconds;
|
||||
protected readonly isCreatingPurchase = signal(false);
|
||||
protected readonly displayCart = computed(() => this.tenant()?.display_cart ?? true);
|
||||
protected readonly cartEditingPolicy = computed(() => this.tenant()?.cart_editing_policy ?? null);
|
||||
@@ -273,12 +280,20 @@ export class StoreLayoutComponent implements OnInit {
|
||||
});
|
||||
|
||||
this.isCartOpen.set(false);
|
||||
await this.router.navigate(['/checkout'], {
|
||||
queryParams: { purchase: purchase.id },
|
||||
});
|
||||
await this.router.navigate(['/checkout', purchase.id]);
|
||||
} catch (error) {
|
||||
console.error('Failed to create cart purchase:', error);
|
||||
this.toastService.danger('No se pudo iniciar la compra.');
|
||||
const message =
|
||||
error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
|
||||
? error.error.message
|
||||
: 'No se pudo iniciar la compra.';
|
||||
this.toastService.danger(message);
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
} finally {
|
||||
this.isCreatingPurchase.set(false);
|
||||
}
|
||||
|
||||
@@ -24,12 +24,12 @@ describe('auth guards', () => {
|
||||
});
|
||||
|
||||
const result = TestBed.runInInjectionContext(() =>
|
||||
authGuard(null as never, { url: '/checkout?mode=direct' } as never),
|
||||
authGuard(null as never, { url: '/checkout/25' } as never),
|
||||
);
|
||||
|
||||
expect(result instanceof UrlTree).toBe(true);
|
||||
expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe(
|
||||
'/login?returnUrl=%2Fcheckout%3Fmode%3Ddirect',
|
||||
'/login?returnUrl=%2Fcheckout%2F25',
|
||||
);
|
||||
});
|
||||
|
||||
@@ -39,7 +39,7 @@ describe('auth guards', () => {
|
||||
});
|
||||
|
||||
const result = TestBed.runInInjectionContext(() =>
|
||||
authGuard(null as never, { url: '/checkout' } as never),
|
||||
authGuard(null as never, { url: '/checkout/25' } as never),
|
||||
);
|
||||
|
||||
expect(result).toBe(true);
|
||||
|
||||
@@ -83,6 +83,20 @@ describe('CartService', () => {
|
||||
req.flush({ data: mockCart });
|
||||
});
|
||||
|
||||
it('refreshes catalog availability only after the expired cart has been reloaded', () => {
|
||||
const availabilityChanged = vi.fn();
|
||||
catalogAvailabilityService.availabilityChanged$.subscribe(availabilityChanged);
|
||||
|
||||
service.loadCart(true).subscribe();
|
||||
|
||||
expect(availabilityChanged).not.toHaveBeenCalled();
|
||||
const req = httpMock.expectOne('http://api.test/tenants/acme/cart');
|
||||
req.flush({ data: mockCart });
|
||||
|
||||
expect(service.cart()).toEqual(mockCart);
|
||||
expect(availabilityChanged).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it('propagates a custom loading mode to the request context', () => {
|
||||
service.withCustomLoading().loadCart().subscribe();
|
||||
|
||||
|
||||
@@ -34,14 +34,19 @@ export class CartService extends BaseApiService {
|
||||
});
|
||||
}
|
||||
|
||||
loadCart(): Observable<Cart> {
|
||||
loadCart(refreshCatalogAvailability = false): Observable<Cart> {
|
||||
return this.http
|
||||
.get<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart`, {
|
||||
withCredentials: true,
|
||||
})
|
||||
.pipe(
|
||||
map((response) => response.data),
|
||||
tap((cart) => this.cartState.set(cart)),
|
||||
tap((cart) => {
|
||||
this.cartState.set(cart);
|
||||
if (refreshCatalogAvailability) {
|
||||
this.catalogAvailabilityService.notifyAvailabilityChanged();
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -67,6 +67,7 @@ export interface CatalogItemVariant {
|
||||
event_date_ids?: number[];
|
||||
event_dates?: string[];
|
||||
maximum_addable_quantity?: number | null;
|
||||
unavailable_message?: string | null;
|
||||
minimum_use_date?: string | null;
|
||||
maximum_use_date?: string | null;
|
||||
effective_minimum_use_date?: string | null;
|
||||
@@ -114,6 +115,7 @@ export interface CatalogFeaturedItemVariant {
|
||||
descripcion?: string | null;
|
||||
precio?: string;
|
||||
maximum_addable_quantity?: number | null;
|
||||
unavailable_message?: string | null;
|
||||
values: Record<string, CatalogVariantValue>;
|
||||
}
|
||||
|
||||
@@ -146,6 +148,7 @@ export interface CatalogFeaturedItem {
|
||||
precio: number | string;
|
||||
image?: string | null;
|
||||
maximum_addable_quantity?: number | null;
|
||||
unavailable_message?: string | null;
|
||||
variants?: CatalogFeaturedItemVariant[];
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ import {
|
||||
CatalogItemDetail,
|
||||
CatalogVariantOptionsResponse,
|
||||
CategoryItemsResponse,
|
||||
Product,
|
||||
} from './catalog.interface';
|
||||
|
||||
type HttpParamValue = string | number | boolean | readonly (string | number | boolean)[];
|
||||
@@ -33,12 +32,6 @@ export class CatalogService extends BaseApiService {
|
||||
return this.tenantService.getTenantApiUrl();
|
||||
}
|
||||
|
||||
getProductos(params?: ApiPaginationQueryParams): Observable<ApiPaginatedResponse<Product[]>> {
|
||||
return this.http.get<ApiPaginatedResponse<Product[]>>(`${this.tenantApiUrl}/productos`, {
|
||||
params: this.buildHttpParams(params),
|
||||
});
|
||||
}
|
||||
|
||||
getCatalog(): Observable<CatalogFeaturedGroup[]> {
|
||||
return this.http.get<CatalogFeaturedGroup[]>(`${this.tenantApiUrl}/catalog`);
|
||||
}
|
||||
|
||||
69
src/app/core/services/checkout-countdown.service.spec.ts
Normal file
69
src/app/core/services/checkout-countdown.service.spec.ts
Normal file
@@ -0,0 +1,69 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { CheckoutCountdownService } from './checkout-countdown.service';
|
||||
|
||||
describe('CheckoutCountdownService', () => {
|
||||
let service: CheckoutCountdownService;
|
||||
|
||||
beforeEach(() => {
|
||||
vi.useFakeTimers();
|
||||
vi.setSystemTime(new Date('2026-08-27T12:00:00.000Z'));
|
||||
TestBed.configureTestingModule({ providers: [CheckoutCountdownService] });
|
||||
service = TestBed.inject(CheckoutCountdownService);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
service.clear();
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it('counts down from the checkout server timing without depending on the client clock', () => {
|
||||
service.synchronize({
|
||||
expires_at: '2026-08-27T15:10:00.000Z',
|
||||
expires_in_seconds: 600,
|
||||
server_time: '2026-08-27T15:00:00.000Z',
|
||||
});
|
||||
|
||||
expect(service.remainingSeconds()).toBe(600);
|
||||
|
||||
vi.advanceTimersByTime(1_000);
|
||||
|
||||
expect(service.remainingSeconds()).toBe(599);
|
||||
});
|
||||
|
||||
it('recalculates against the deadline after a delayed browser interval', () => {
|
||||
service.synchronize({
|
||||
expires_at: null,
|
||||
expires_in_seconds: 10,
|
||||
server_time: '2026-08-27T15:00:00.000Z',
|
||||
});
|
||||
|
||||
vi.setSystemTime(new Date('2026-08-27T12:00:07.000Z'));
|
||||
vi.advanceTimersByTime(1_000);
|
||||
|
||||
expect(service.remainingSeconds()).toBe(2);
|
||||
});
|
||||
|
||||
it('clears the countdown when checkout has no expiration', () => {
|
||||
service.synchronize({
|
||||
expires_at: null,
|
||||
expires_in_seconds: null,
|
||||
server_time: '2026-08-27T15:00:00.000Z',
|
||||
});
|
||||
|
||||
expect(service.remainingSeconds()).toBeNull();
|
||||
});
|
||||
|
||||
it('keeps the active countdown when a partial checkout response omits timing fields', () => {
|
||||
service.synchronize({
|
||||
expires_at: null,
|
||||
expires_in_seconds: 10,
|
||||
server_time: '2026-08-27T15:00:00.000Z',
|
||||
});
|
||||
|
||||
service.synchronize({});
|
||||
|
||||
expect(service.remainingSeconds()).toBe(10);
|
||||
});
|
||||
});
|
||||
97
src/app/core/services/checkout-countdown.service.ts
Normal file
97
src/app/core/services/checkout-countdown.service.ts
Normal file
@@ -0,0 +1,97 @@
|
||||
import { Injectable, OnDestroy, signal } from '@angular/core';
|
||||
|
||||
export interface CheckoutTiming {
|
||||
expires_at: string | null;
|
||||
expires_in_seconds: number | null;
|
||||
server_time: string;
|
||||
}
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class CheckoutCountdownService implements OnDestroy {
|
||||
private readonly remainingSecondsState = signal<number | null>(null);
|
||||
private deadlineMs: number | null = null;
|
||||
private intervalId: ReturnType<typeof setInterval> | null = null;
|
||||
|
||||
readonly remainingSeconds = this.remainingSecondsState.asReadonly();
|
||||
|
||||
synchronize(timing: Partial<CheckoutTiming>): void {
|
||||
const remainingSeconds = this.resolveRemainingSeconds(timing);
|
||||
|
||||
if (remainingSeconds === undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (remainingSeconds === null) {
|
||||
this.clear();
|
||||
return;
|
||||
}
|
||||
|
||||
this.stopInterval();
|
||||
this.deadlineMs = Date.now() + remainingSeconds * 1_000;
|
||||
this.updateRemainingSeconds();
|
||||
|
||||
if (remainingSeconds > 0) {
|
||||
this.intervalId = setInterval(() => this.updateRemainingSeconds(), 1_000);
|
||||
}
|
||||
}
|
||||
|
||||
clear(): void {
|
||||
this.stopInterval();
|
||||
this.deadlineMs = null;
|
||||
this.remainingSecondsState.set(null);
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.clear();
|
||||
}
|
||||
|
||||
private resolveRemainingSeconds(timing: Partial<CheckoutTiming>): number | null | undefined {
|
||||
if (timing.expires_at === null && timing.expires_in_seconds === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const expiresAt =
|
||||
typeof timing.expires_at === 'string' ? Date.parse(timing.expires_at) : Number.NaN;
|
||||
const serverTime =
|
||||
typeof timing.server_time === 'string' ? Date.parse(timing.server_time) : Number.NaN;
|
||||
|
||||
if (Number.isFinite(expiresAt) && Number.isFinite(serverTime)) {
|
||||
return Math.max(0, Math.ceil((expiresAt - serverTime) / 1_000));
|
||||
}
|
||||
|
||||
if (
|
||||
typeof timing.expires_in_seconds === 'number' &&
|
||||
Number.isFinite(timing.expires_in_seconds)
|
||||
) {
|
||||
return Math.max(0, Math.ceil(timing.expires_in_seconds));
|
||||
}
|
||||
|
||||
if (Number.isFinite(expiresAt)) {
|
||||
return Math.max(0, Math.ceil((expiresAt - Date.now()) / 1_000));
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
|
||||
private updateRemainingSeconds(): void {
|
||||
if (this.deadlineMs === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
const remainingSeconds = Math.max(0, Math.ceil((this.deadlineMs - Date.now()) / 1_000));
|
||||
this.remainingSecondsState.set(remainingSeconds);
|
||||
|
||||
if (remainingSeconds === 0) {
|
||||
this.stopInterval();
|
||||
}
|
||||
}
|
||||
|
||||
private stopInterval(): void {
|
||||
if (this.intervalId !== null) {
|
||||
clearInterval(this.intervalId);
|
||||
this.intervalId = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,10 @@
|
||||
import { provideHttpClient } from '@angular/common/http';
|
||||
import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { environment } from '../../../environments/environment';
|
||||
import { CatalogAvailabilityService } from './catalog/catalog-availability.service';
|
||||
import { CheckoutService } from './checkout.service';
|
||||
|
||||
describe('CheckoutService', () => {
|
||||
@@ -38,4 +39,59 @@ describe('CheckoutService', () => {
|
||||
|
||||
await expect(purchasePromise).resolves.toMatchObject({ id: 55 });
|
||||
});
|
||||
|
||||
it('refreshes catalog availability when starting checkout fails', async () => {
|
||||
const catalogAvailabilityService = TestBed.inject(CatalogAvailabilityService);
|
||||
const notifyAvailabilityChanged = vi.spyOn(
|
||||
catalogAvailabilityService,
|
||||
'notifyAvailabilityChanged',
|
||||
);
|
||||
const purchasePromise = service.startCheckout('desfile', { cart_id: 12 });
|
||||
const request = httpMock.expectOne(`${environment.url}tenants/desfile/compras/start-checkout`);
|
||||
|
||||
request.flush(
|
||||
{ message: 'No hay stock disponible.' },
|
||||
{ status: 422, statusText: 'Unprocessable Entity' },
|
||||
);
|
||||
|
||||
await expect(purchasePromise).rejects.toBeTruthy();
|
||||
expect(notifyAvailabilityChanged).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it('waits for the expired cart refresh before refreshing catalog availability', async () => {
|
||||
const catalogAvailabilityService = TestBed.inject(CatalogAvailabilityService);
|
||||
const notifyAvailabilityChanged = vi.spyOn(
|
||||
catalogAvailabilityService,
|
||||
'notifyAvailabilityChanged',
|
||||
);
|
||||
const purchasePromise = service.startCheckout('desfile', { cart_id: 12 });
|
||||
const request = httpMock.expectOne(`${environment.url}tenants/desfile/compras/start-checkout`);
|
||||
|
||||
request.flush(
|
||||
{
|
||||
code: 'stock_reservation.expired',
|
||||
message: 'La reserva de stock venció.',
|
||||
},
|
||||
{ status: 422, statusText: 'Unprocessable Entity' },
|
||||
);
|
||||
|
||||
await expect(purchasePromise).rejects.toBeTruthy();
|
||||
expect(notifyAvailabilityChanged).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('preserves checkout timing fields when completing a purchase', async () => {
|
||||
const purchasePromise = service.completePurchase('desfile', 55);
|
||||
const request = httpMock.expectOne(`${environment.url}tenants/desfile/compras/55/complete`);
|
||||
const response = {
|
||||
status: 'pending_payment',
|
||||
expires_at: '2026-08-26T20:00:00.000Z',
|
||||
expires_in_seconds: 900,
|
||||
server_time: '2026-08-26T19:45:00.000Z',
|
||||
};
|
||||
|
||||
expect(request.request.method).toBe('POST');
|
||||
request.flush({ data: response });
|
||||
|
||||
await expect(purchasePromise).resolves.toEqual(response);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { inject, Injectable } from '@angular/core';
|
||||
import { firstValueFrom } from 'rxjs';
|
||||
|
||||
import { environment } from '../../../environments/environment';
|
||||
import { ApiPaginatedResponse } from './api-paginated-response.interface';
|
||||
import { ApiPaginationQueryParams } from './api-pagination-query-params.interface';
|
||||
import { BaseApiService } from './base-api.service';
|
||||
import { CatalogAvailabilityService } from './catalog/catalog-availability.service';
|
||||
|
||||
export interface UpdatePurchaseCustomerPayload {
|
||||
dni: string;
|
||||
@@ -43,6 +46,21 @@ export function isInsufficientStockResponse(value: unknown): value is Insufficie
|
||||
);
|
||||
}
|
||||
|
||||
export interface ExpiredStockReservationResponse {
|
||||
code: 'stock_reservation.expired';
|
||||
message: string;
|
||||
}
|
||||
|
||||
export function isExpiredStockReservationResponse(
|
||||
value: unknown,
|
||||
): value is ExpiredStockReservationResponse {
|
||||
return (
|
||||
typeof value === 'object' &&
|
||||
value !== null &&
|
||||
(value as Partial<ExpiredStockReservationResponse>).code === 'stock_reservation.expired'
|
||||
);
|
||||
}
|
||||
|
||||
export type StartCheckoutPayload =
|
||||
| {
|
||||
cart_id: number;
|
||||
@@ -53,6 +71,32 @@ export type StartCheckoutPayload =
|
||||
|
||||
export interface PurchaseStatusResponse {
|
||||
status: string | null;
|
||||
expires_at: string | null;
|
||||
expires_in_seconds: number | null;
|
||||
server_time: string;
|
||||
payment_verification?: PurchasePaymentVerificationResponse;
|
||||
}
|
||||
|
||||
export type PurchasePaymentCandidateReason =
|
||||
| 'ambiguous_exact_match'
|
||||
| 'exact_dni_near_amount'
|
||||
| 'exact_amount_near_dni';
|
||||
|
||||
export interface PurchasePaymentCandidatePrimaryResponse {
|
||||
reason: PurchasePaymentCandidateReason;
|
||||
dni_distance: number | null;
|
||||
payment_amount: string;
|
||||
purchase_amount: string;
|
||||
amount_difference: string;
|
||||
confidence: 'exact' | 'high' | 'medium';
|
||||
detected_at: string | null;
|
||||
}
|
||||
|
||||
export interface PurchasePaymentVerificationResponse {
|
||||
status: 'pending' | 'candidate';
|
||||
candidate_count: number;
|
||||
primary: PurchasePaymentCandidatePrimaryResponse | null;
|
||||
reasons: PurchasePaymentCandidateReason[];
|
||||
}
|
||||
|
||||
export interface PurchaseSummaryResponse extends PurchaseStatusResponse {
|
||||
@@ -89,7 +133,6 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
|
||||
user_id: number;
|
||||
created_at: string | null;
|
||||
payment_method: string | null;
|
||||
expires_at: string | null;
|
||||
dni: string | null;
|
||||
transfer_payer_dni: string | null;
|
||||
telefono: string | null;
|
||||
@@ -107,24 +150,34 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class CheckoutService extends BaseApiService {
|
||||
private readonly catalogAvailabilityService = inject(CatalogAvailabilityService);
|
||||
|
||||
async startCheckout(
|
||||
tenantCode: string,
|
||||
payload: StartCheckoutPayload,
|
||||
): Promise<PurchaseDetailResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/start-checkout`,
|
||||
payload,
|
||||
),
|
||||
);
|
||||
try {
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/start-checkout`,
|
||||
payload,
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||
|
||||
if (!purchase?.id) {
|
||||
throw new Error('Error al crear la compra.');
|
||||
if (!purchase?.id) {
|
||||
throw new Error('Error al crear la compra.');
|
||||
}
|
||||
|
||||
return purchase;
|
||||
} catch (error) {
|
||||
const responseBody = (error as { error?: unknown } | null)?.error;
|
||||
if (!isExpiredStockReservationResponse(responseBody)) {
|
||||
this.catalogAvailabilityService.notifyAvailabilityChanged();
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async generatePaymentIntent(
|
||||
@@ -169,25 +222,6 @@ export class CheckoutService extends BaseApiService {
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`,
|
||||
{},
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
|
||||
|
||||
if (!purchase) {
|
||||
throw new Error('Error al finalizar la compra.');
|
||||
}
|
||||
|
||||
return {
|
||||
status: purchase.status ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
async submitPurchaseForReview(
|
||||
tenantCode: string,
|
||||
purchaseId: number,
|
||||
@@ -204,7 +238,7 @@ export class CheckoutService extends BaseApiService {
|
||||
throw new Error('Error al enviar la compra a revisi\u00f3n.');
|
||||
}
|
||||
|
||||
return { status: purchase.status ?? null };
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
|
||||
@@ -220,18 +254,26 @@ export class CheckoutService extends BaseApiService {
|
||||
throw new Error('Error al cancelar la compra.');
|
||||
}
|
||||
|
||||
return { status: purchase.status ?? null };
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async getPurchases(
|
||||
tenantCode: string,
|
||||
status?: string,
|
||||
): Promise<{ data: PurchaseSummaryResponse[] }> {
|
||||
let url = `${environment.url}tenants/${tenantCode}/compras`;
|
||||
if (status) {
|
||||
url += `?status=${status}`;
|
||||
}
|
||||
const response = await firstValueFrom(this.http.get<{ data: PurchaseSummaryResponse[] }>(url));
|
||||
pagination: ApiPaginationQueryParams = {},
|
||||
): Promise<ApiPaginatedResponse<PurchaseSummaryResponse[]>> {
|
||||
const params: Record<string, string | number> = {};
|
||||
|
||||
if (status) params['status'] = status;
|
||||
if (pagination.page) params['page'] = pagination.page;
|
||||
if (pagination.per_page) params['per_page'] = pagination.per_page;
|
||||
|
||||
const response = await firstValueFrom(
|
||||
this.http.get<ApiPaginatedResponse<PurchaseSummaryResponse[]>>(
|
||||
`${environment.url}tenants/${tenantCode}/compras`,
|
||||
{ params },
|
||||
),
|
||||
);
|
||||
if (!response) {
|
||||
throw new Error('Error al obtener las compras.');
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
.menu-content-section__header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
gap: var(--menu-content-prefix-gap, 0.75rem);
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,29 @@
|
||||
<div class="purchase-item" [routerLink]="[purchase.id]" style="cursor: pointer;">
|
||||
<div class="purchase-info">
|
||||
<span class="purchase-id">Compra {{ purchase.id }}.</span>
|
||||
<span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
|
||||
</div>
|
||||
<div class="purchase-action">
|
||||
<svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="arrow-icon">
|
||||
<path d="M1 1L7 7L1 13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
<div class="purchase-item" [routerLink]="[purchase.id]">
|
||||
<div class="purchase-info">
|
||||
<span class="purchase-id">Compra {{ purchase.id }}.</span>
|
||||
<span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
|
||||
</div>
|
||||
|
||||
@if (purchase.statusMessage) {
|
||||
<span class="purchase-status">{{ purchase.statusMessage }}</span>
|
||||
}
|
||||
|
||||
<div class="purchase-action">
|
||||
<svg
|
||||
width="8"
|
||||
height="14"
|
||||
viewBox="0 0 8 14"
|
||||
fill="none"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
class="arrow-icon"
|
||||
>
|
||||
<path
|
||||
d="M1 1L7 7L1 13"
|
||||
stroke="currentColor"
|
||||
stroke-width="2"
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
/>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,33 +2,57 @@
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 16px;
|
||||
padding-left:0;
|
||||
transition: box-shadow 0.2s, border-radius 0.2s;
|
||||
gap: 16px;
|
||||
padding: 16px;
|
||||
padding-left: 0;
|
||||
transition:
|
||||
box-shadow 0.2s,
|
||||
border-radius 0.2s;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.purchase-item:hover {
|
||||
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.07);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.purchase-item:hover .arrow-icon {
|
||||
color: #5b75ff; /* Blue on hover */
|
||||
color: var(--color-primary, var(--tenant-primary, #5b75ff));
|
||||
}
|
||||
|
||||
.purchase-info {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.purchase-id {
|
||||
font-weight: bold;
|
||||
color: #666666;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.purchase-date {
|
||||
font-weight: 325;
|
||||
color: #666666;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.purchase-status {
|
||||
margin-left: auto;
|
||||
margin-right: 20px;
|
||||
color: var(--color-primary, var(--tenant-primary, #5b75ff));
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.purchase-action {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.arrow-icon {
|
||||
width: 8px;
|
||||
height: 14px;
|
||||
|
||||
@@ -9,6 +9,5 @@ import { RouterLink } from '@angular/router';
|
||||
styleUrl: './purchase-list-item.scss',
|
||||
})
|
||||
export class PurchaseListItem {
|
||||
@Input() purchase!: { id: number; date: string };
|
||||
@Input() purchase!: { id: number; date: string; statusMessage?: string | null };
|
||||
}
|
||||
|
||||
|
||||
@@ -1,29 +1,36 @@
|
||||
<div class="purchase-list-container">
|
||||
<ng-container *ngIf="isLoading(); else contentTpl">
|
||||
<!-- Skeleton -->
|
||||
<div class="skeleton-item" *ngFor="let i of [1, 2, 3, 4]">
|
||||
<div class="skeleton-info">
|
||||
<div class="skeleton-id"></div>
|
||||
<div class="skeleton-date"></div>
|
||||
</div>
|
||||
<div class="skeleton-action"></div>
|
||||
<div class="purchase-list-container">
|
||||
@if (isLoading()) {
|
||||
@for (i of [1, 2, 3, 4]; track i) {
|
||||
<div class="skeleton-item">
|
||||
<div class="skeleton-info">
|
||||
<div class="skeleton-id"></div>
|
||||
<div class="skeleton-date"></div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<div class="skeleton-action"></div>
|
||||
</div>
|
||||
}
|
||||
} @else {
|
||||
@if (purchases().length > 0) {
|
||||
@for (purchase of purchases(); track purchase.id; let last = $last) {
|
||||
<app-purchase-list-item [purchase]="purchase"></app-purchase-list-item>
|
||||
@if (!last) {
|
||||
<div class="purchase-divider"></div>
|
||||
}
|
||||
}
|
||||
} @else {
|
||||
<div class="empty-state">Aún no hay compras realizadas</div>
|
||||
}
|
||||
|
||||
<ng-template #contentTpl>
|
||||
<ng-container *ngIf="purchases().length > 0; else emptyTpl">
|
||||
<ng-container *ngFor="let purchase of purchases(); let last = last">
|
||||
<app-purchase-list-item
|
||||
[purchase]="purchase">
|
||||
</app-purchase-list-item>
|
||||
<div class="purchase-divider" *ngIf="!last"></div>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #emptyTpl>
|
||||
<div class="empty-state">
|
||||
Aún no hay compras realizadas
|
||||
</div>
|
||||
</ng-template>
|
||||
</div>
|
||||
@if (pagination(); as paginationData) {
|
||||
@if (paginationData.last_page > 1) {
|
||||
<app-paginator
|
||||
class="purchase-list__paginator"
|
||||
[page]="paginationData.current_page"
|
||||
[totalPages]="paginationData.last_page"
|
||||
[disabled]="isLoading()"
|
||||
(pageChange)="onPageChange($event)"
|
||||
></app-paginator>
|
||||
}
|
||||
}
|
||||
}
|
||||
</div>
|
||||
|
||||
@@ -4,9 +4,14 @@
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.purchase-list__paginator {
|
||||
align-self: center;
|
||||
margin-top: 1.5rem;
|
||||
}
|
||||
|
||||
.purchase-divider {
|
||||
height: 1px;
|
||||
background-color: #DDDDDD;
|
||||
background-color: #dddddd;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -39,7 +44,7 @@
|
||||
.skeleton-id {
|
||||
width: 100px;
|
||||
height: 1rem;
|
||||
background-color: #EEEEEE;
|
||||
background-color: #eeeeee;
|
||||
border-radius: 4px;
|
||||
animation: pulse 1.5s infinite ease-in-out;
|
||||
}
|
||||
@@ -47,7 +52,7 @@
|
||||
.skeleton-date {
|
||||
width: 150px;
|
||||
height: 0.8rem;
|
||||
background-color: #EEEEEE;
|
||||
background-color: #eeeeee;
|
||||
border-radius: 4px;
|
||||
animation: pulse 1.5s infinite ease-in-out;
|
||||
}
|
||||
@@ -55,19 +60,19 @@
|
||||
.skeleton-action {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
background-color: #EEEEEE;
|
||||
background-color: #eeeeee;
|
||||
border-radius: 50%;
|
||||
animation: pulse 1.5s infinite ease-in-out;
|
||||
}
|
||||
|
||||
@keyframes pulse {
|
||||
0% {
|
||||
background-color: #EEEEEE;
|
||||
background-color: #eeeeee;
|
||||
}
|
||||
50% {
|
||||
background-color: #E0E0E0;
|
||||
background-color: #e0e0e0;
|
||||
}
|
||||
100% {
|
||||
background-color: #EEEEEE;
|
||||
background-color: #eeeeee;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,24 @@
|
||||
import { Component, OnInit, inject, signal } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { PurchaseListItem } from '../purchase-list-item/purchase-list-item';
|
||||
import { CheckoutService, PurchaseSummaryResponse } from '../../../../../../core/services/checkout.service';
|
||||
import {
|
||||
CheckoutService,
|
||||
PurchaseSummaryResponse,
|
||||
} from '../../../../../../core/services/checkout.service';
|
||||
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { ApiPaginationMeta } from '../../../../../../core/services/api-paginated-response.interface';
|
||||
import { PaginatorComponent } from '../../../../../../shared/components/paginator/paginator.component';
|
||||
|
||||
type PurchaseListViewModel = {
|
||||
id: number;
|
||||
date: string;
|
||||
statusMessage: string | null;
|
||||
};
|
||||
|
||||
@Component({
|
||||
selector: 'app-purchase-list',
|
||||
standalone: true,
|
||||
imports: [CommonModule, PurchaseListItem],
|
||||
imports: [PurchaseListItem, PaginatorComponent],
|
||||
templateUrl: './purchase-list.html',
|
||||
styleUrl: './purchase-list.scss',
|
||||
})
|
||||
@@ -22,21 +27,28 @@ export class PurchaseList implements OnInit {
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
purchases = signal<PurchaseListViewModel[]>([]);
|
||||
isLoading = signal<boolean>(true);
|
||||
protected readonly purchases = signal<PurchaseListViewModel[]>([]);
|
||||
protected readonly pagination = signal<ApiPaginationMeta | null>(null);
|
||||
protected readonly isLoading = signal(true);
|
||||
|
||||
async ngOnInit(): Promise<void> {
|
||||
await this.loadPurchases();
|
||||
}
|
||||
|
||||
protected async onPageChange(page: number): Promise<void> {
|
||||
await this.loadPurchases(page);
|
||||
}
|
||||
|
||||
private async loadPurchases(page = 1): Promise<void> {
|
||||
this.isLoading.set(true);
|
||||
|
||||
try {
|
||||
const tenantCode = this.tenantService.tenant()?.codigo || '';
|
||||
|
||||
const response = await this.checkoutService
|
||||
.withCustomLoading()
|
||||
.getPurchases(tenantCode, 'paid');
|
||||
const mappedPurchases = response.data.map((purchase: PurchaseSummaryResponse) => ({
|
||||
id: purchase.id,
|
||||
date: this.formatDate(purchase.created_at),
|
||||
}));
|
||||
this.purchases.set(mappedPurchases);
|
||||
.getPurchases(this.tenantCode(), 'paid,in_review', { page });
|
||||
|
||||
this.purchases.set(this.mapPurchases(response.data));
|
||||
this.pagination.set(response.meta);
|
||||
} catch (error) {
|
||||
this.toastService.danger('Hubo un error al cargar las compras');
|
||||
} finally {
|
||||
@@ -44,6 +56,18 @@ export class PurchaseList implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
private tenantCode(): string {
|
||||
return this.tenantService.tenant()?.codigo || '';
|
||||
}
|
||||
|
||||
private mapPurchases(purchases: PurchaseSummaryResponse[]): PurchaseListViewModel[] {
|
||||
return purchases.map((purchase) => ({
|
||||
id: purchase.id,
|
||||
date: this.formatDate(purchase.created_at),
|
||||
statusMessage: purchase.status === 'in_review' ? 'Esperando confirmación' : null,
|
||||
}));
|
||||
}
|
||||
|
||||
private formatDate(value: string | null): string {
|
||||
if (!value) {
|
||||
return '-';
|
||||
|
||||
@@ -15,6 +15,27 @@
|
||||
@if (isLoading()) {
|
||||
<p class="purchase-loading">Cargando detalle de compra...</p>
|
||||
} @else if (purchase(); as purchase) {
|
||||
@if (purchase.isInReview) {
|
||||
<section class="purchase-review" aria-labelledby="purchase-review-title">
|
||||
<h3 id="purchase-review-title" class="purchase-review__title">ESPERANDO CONFIRMACIÓN</h3>
|
||||
<p class="purchase-review__message">
|
||||
Tu compra aún no ha sido confirmada.<br />
|
||||
Si no te contactaste con nosotros, podés hacerlo a través del siguiente WhatsApp
|
||||
</p>
|
||||
|
||||
@if (whatsappUrl()) {
|
||||
<app-button
|
||||
type="button"
|
||||
variant="primary"
|
||||
hostClass="purchase-review__button"
|
||||
(click)="openWhatsApp()"
|
||||
>
|
||||
WhatsApp
|
||||
</app-button>
|
||||
}
|
||||
</section>
|
||||
}
|
||||
|
||||
<div
|
||||
class="d-flex justify-content-between align-items-center mb-4 pb-3"
|
||||
style="border-bottom: 1px solid #dddddd"
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
}
|
||||
|
||||
.account-page {
|
||||
--menu-content-prefix-gap: 0;
|
||||
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 600px;
|
||||
@@ -50,6 +52,32 @@
|
||||
font-size: 17px;
|
||||
}
|
||||
|
||||
.purchase-review {
|
||||
padding-bottom: 2rem;
|
||||
margin-bottom: 2rem;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
.purchase-review__title {
|
||||
margin: 0 0 0.5rem;
|
||||
color: var(--color-primary, var(--tenant-primary, #5b75ff));
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
line-height: 1.25;
|
||||
}
|
||||
|
||||
.purchase-review__message {
|
||||
margin: 0 0 1.5rem;
|
||||
color: #777777;
|
||||
font-size: 12px;
|
||||
font-weight: 400;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.purchase-review__button {
|
||||
width: 185px;
|
||||
}
|
||||
|
||||
.purchase-loading,
|
||||
.purchase-empty {
|
||||
color: #666666;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { Component, OnInit, inject, signal } from '@angular/core';
|
||||
import { Component, OnInit, computed, inject, signal } from '@angular/core';
|
||||
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
|
||||
|
||||
import {
|
||||
@@ -8,6 +7,7 @@ import {
|
||||
} from '../../../../../../core/services/checkout.service';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
|
||||
import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
|
||||
import { PurchaseItem, PurchaseItemViewModel } from '../../components/purchase-item/purchase-item';
|
||||
|
||||
@@ -16,12 +16,13 @@ type PurchaseDetailViewModel = {
|
||||
date: string;
|
||||
total: string;
|
||||
items: PurchaseItemViewModel[];
|
||||
isInReview: boolean;
|
||||
};
|
||||
|
||||
@Component({
|
||||
selector: 'app-purchase-detail-page',
|
||||
standalone: true,
|
||||
imports: [CommonModule, RouterLink, PurchaseItem, MenuContentSectionComponent],
|
||||
imports: [RouterLink, PurchaseItem, MenuContentSectionComponent, ButtonComponent],
|
||||
templateUrl: './purchase-detail-page.html',
|
||||
styleUrl: './purchase-detail-page.scss',
|
||||
})
|
||||
@@ -34,6 +35,12 @@ export class PurchaseDetailPage implements OnInit {
|
||||
|
||||
readonly isLoading = signal(true);
|
||||
readonly purchase = signal<PurchaseDetailViewModel | null>(null);
|
||||
protected readonly whatsappUrl = computed(
|
||||
() =>
|
||||
this.tenantService
|
||||
.tenant()
|
||||
?.social_media?.find((socialMedia) => socialMedia.code === 'whatsapp')?.url ?? null,
|
||||
);
|
||||
|
||||
async ngOnInit(): Promise<void> {
|
||||
const purchaseId = this.route.snapshot.paramMap.get('id');
|
||||
@@ -54,6 +61,7 @@ export class PurchaseDetailPage implements OnInit {
|
||||
date: this.formatDate(response.created_at),
|
||||
total: response.total,
|
||||
items: this.mapItems(response),
|
||||
isInReview: response.status === 'in_review',
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch purchase detail:', error);
|
||||
@@ -64,6 +72,14 @@ export class PurchaseDetailPage implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
protected openWhatsApp(): void {
|
||||
const url = this.whatsappUrl();
|
||||
|
||||
if (url) {
|
||||
window.open(url, '_blank', 'noopener,noreferrer');
|
||||
}
|
||||
}
|
||||
|
||||
private formatDate(value: string | null): string {
|
||||
if (!value) {
|
||||
return '-';
|
||||
|
||||
@@ -23,7 +23,10 @@ import {
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { CheckoutService } from '../../../../core/services/checkout.service';
|
||||
import {
|
||||
CheckoutService,
|
||||
isExpiredStockReservationResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import {
|
||||
CatalogGroupLayout,
|
||||
CategoryItemsResponse,
|
||||
@@ -167,10 +170,20 @@ export class CategoryItemsPageComponent {
|
||||
],
|
||||
},
|
||||
);
|
||||
await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
|
||||
await this.router.navigate(['/checkout', purchase.id]);
|
||||
} catch (error) {
|
||||
console.error('Failed to create direct purchase:', error);
|
||||
this.toastService.danger('No se pudo iniciar la compra directa.');
|
||||
const message =
|
||||
error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
|
||||
? error.error.message
|
||||
: 'No se pudo iniciar la compra directa.';
|
||||
this.toastService.danger(message);
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
} finally {
|
||||
this.creatingDirectPurchase.set(false);
|
||||
}
|
||||
|
||||
@@ -6,7 +6,11 @@
|
||||
} @else {
|
||||
<div class="checkout-page">
|
||||
<div class="checkout-page__stepper-col">
|
||||
<app-stepper #stepper [initialStepIndex]="checkoutStepIndex()">
|
||||
<app-stepper
|
||||
#stepper
|
||||
[initialStepIndex]="checkoutStepIndex()"
|
||||
[disabled]="hasSubmittedTransfer()"
|
||||
>
|
||||
<app-step label="Datos" [isValid]="isStep1Valid()">
|
||||
<app-checkout-data-step
|
||||
[form]="form"
|
||||
@@ -30,6 +34,7 @@
|
||||
[qrPaymentAmount]="cartTotal()"
|
||||
[whatsappUrl]="whatsappUrl()"
|
||||
[transferValidationStatus]="transferValidationStatus()"
|
||||
[transferVerificationErrorTitle]="transferVerificationErrorTitle()"
|
||||
(paymentMethodChange)="selectPaymentMethod($event)"
|
||||
(copyTransferValue)="copyTransferValue($event.field, $event.value)"
|
||||
(cancelStep)="onCancel()"
|
||||
@@ -42,6 +47,17 @@
|
||||
</div>
|
||||
|
||||
<div class="checkout-page__cart-col">
|
||||
@if (checkoutRemainingTime(); as remainingTime) {
|
||||
<div
|
||||
class="checkout-page__mobile-countdown d-flex d-md-none align-items-baseline justify-content-center gap-3"
|
||||
role="timer"
|
||||
aria-label="Tiempo restante de compra"
|
||||
>
|
||||
<span class="checkout-page__mobile-countdown-label">Tiempo restante de compra:</span>
|
||||
<span class="checkout-page__mobile-countdown-value">{{ remainingTime }}</span>
|
||||
</div>
|
||||
}
|
||||
|
||||
<app-cart
|
||||
title="COMPRA"
|
||||
[items]="mappedCartItems()"
|
||||
|
||||
@@ -28,6 +28,24 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
&__mobile-countdown {
|
||||
flex: 0 0 auto;
|
||||
margin-bottom: 1.5rem;
|
||||
color: var(--tenant-primary);
|
||||
font-weight: 700;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
&__mobile-countdown-label {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
&__mobile-countdown-value {
|
||||
font-size: 20px;
|
||||
line-height: 1;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
}
|
||||
|
||||
.checkout-page__loading {
|
||||
|
||||
@@ -14,6 +14,7 @@ import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { CartEditingPolicy } from '../../../../core/services/tenant.interface';
|
||||
import { CheckoutCountdownService } from '../../../../core/services/checkout-countdown.service';
|
||||
import { CheckoutPageComponent } from './checkout-page.component';
|
||||
|
||||
describe('CheckoutPageComponent payment validation', () => {
|
||||
@@ -33,7 +34,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
stop: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
let cartServiceStub: { loadCart: ReturnType<typeof vi.fn> };
|
||||
let routeQueryParamMap: ReturnType<typeof convertToParamMap>;
|
||||
let routeParamMap: ReturnType<typeof convertToParamMap>;
|
||||
let authUserState: ReturnType<typeof signal>;
|
||||
let tenantState: ReturnType<
|
||||
typeof signal<{
|
||||
@@ -76,7 +77,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
cartServiceStub = {
|
||||
loadCart: vi.fn().mockReturnValue(of({ id: 30, items: [], subtotal: '0.00' })),
|
||||
};
|
||||
routeQueryParamMap = convertToParamMap({});
|
||||
routeParamMap = convertToParamMap({});
|
||||
authUserState = signal(null);
|
||||
tenantState = signal({
|
||||
codigo: 'tenant-test',
|
||||
@@ -103,8 +104,8 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
get queryParamMap() {
|
||||
return routeQueryParamMap;
|
||||
get paramMap() {
|
||||
return routeParamMap;
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -129,6 +130,35 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
return { fixture, component: fixture.componentInstance as any };
|
||||
}
|
||||
|
||||
it('does not expose an active countdown until the purchase timing is loaded', async () => {
|
||||
const countdown = TestBed.inject(CheckoutCountdownService);
|
||||
countdown.synchronize({
|
||||
expires_at: null,
|
||||
expires_in_seconds: 600,
|
||||
server_time: new Date().toISOString(),
|
||||
});
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||
id: 25,
|
||||
status: 'created',
|
||||
expires_at: '2026-08-27T15:10:00.000Z',
|
||||
expires_in_seconds: 600,
|
||||
server_time: '2026-08-27T15:00:00.000Z',
|
||||
items: [],
|
||||
subtotal: '0.00',
|
||||
total: '0.00',
|
||||
});
|
||||
routeParamMap = convertToParamMap({ id: 25 });
|
||||
|
||||
const { component } = createComponent();
|
||||
|
||||
expect(component.checkoutRemainingTime()).toBeNull();
|
||||
|
||||
await Promise.resolve();
|
||||
|
||||
expect(countdown.remainingSeconds()).toBe(600);
|
||||
expect(component.checkoutRemainingTime()).toBe('10:00');
|
||||
});
|
||||
|
||||
it('polls QR after five seconds and navigates only when payment is paid', async () => {
|
||||
checkoutServiceStub.getPurchase
|
||||
.mockResolvedValueOnce({ status: 'pending_payment' })
|
||||
@@ -195,7 +225,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('polls a transfer every three seconds up to four attempts', async () => {
|
||||
it('polls a transfer every three seconds for one minute', async () => {
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'pending_payment' });
|
||||
const { component } = createComponent();
|
||||
component.selectedPaymentMethod.set('transfer');
|
||||
@@ -205,14 +235,12 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
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(57_000);
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(19);
|
||||
expect(component.transferValidationStatus()).toBe('checking');
|
||||
|
||||
await vi.advanceTimersByTimeAsync(3_000);
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(4);
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(20);
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenLastCalledWith('tenant-test', 25);
|
||||
expect(component.transferValidationStatus()).toBe('error');
|
||||
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||
@@ -256,13 +284,43 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
component.selectedPaymentMethod.set('transfer');
|
||||
|
||||
await component.onComplete();
|
||||
await vi.advanceTimersByTimeAsync(12_000);
|
||||
await vi.advanceTimersByTimeAsync(60_000);
|
||||
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(4);
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(20);
|
||||
expect(component.transferValidationStatus()).toBe('error');
|
||||
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('uses the primary candidate reason when transfer polling times out', async () => {
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||
status: 'in_review',
|
||||
payment_verification: {
|
||||
status: 'candidate',
|
||||
candidate_count: 1,
|
||||
primary: {
|
||||
reason: 'exact_amount_near_dni',
|
||||
dni_distance: 1,
|
||||
payment_amount: '300000.00',
|
||||
purchase_amount: '300000.00',
|
||||
amount_difference: '0.00',
|
||||
confidence: 'medium',
|
||||
detected_at: '2026-08-27T18:00:00-03:00',
|
||||
},
|
||||
reasons: ['exact_amount_near_dni'],
|
||||
},
|
||||
});
|
||||
const { component } = createComponent();
|
||||
component.selectedPaymentMethod.set('transfer');
|
||||
|
||||
await component.onComplete();
|
||||
await vi.advanceTimersByTimeAsync(60_000);
|
||||
|
||||
expect(component.transferValidationStatus()).toBe('error');
|
||||
expect(component.transferVerificationErrorTitle()).toBe(
|
||||
'El DNI no corresponde con el de la transferencia',
|
||||
);
|
||||
});
|
||||
|
||||
it('does not poll when submitting a transfer for review fails', async () => {
|
||||
vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||
checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error'));
|
||||
@@ -317,7 +375,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
subtotal: '2501.00',
|
||||
total: '2501.00',
|
||||
};
|
||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||
routeParamMap = convertToParamMap({ id: 25 });
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue(purchase);
|
||||
authUserState.set({
|
||||
id: 7,
|
||||
@@ -354,7 +412,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
|
||||
it('keeps the checkout hidden while the purchase is loading', async () => {
|
||||
let resolvePurchase!: (purchase: any) => void;
|
||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||
routeParamMap = convertToParamMap({ id: 25 });
|
||||
checkoutServiceStub.getPurchase.mockReturnValue(
|
||||
new Promise((resolve) => {
|
||||
resolvePurchase = resolve;
|
||||
@@ -375,12 +433,13 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
});
|
||||
await Promise.resolve();
|
||||
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
|
||||
expect(component.isLoadingPurchase()).toBe(false);
|
||||
expect(component.checkoutStepIndex()).toBe(0);
|
||||
});
|
||||
|
||||
it('opens a pending purchase on the payment step and restores its payment method', async () => {
|
||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||
routeParamMap = convertToParamMap({ id: 25 });
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||
id: 25,
|
||||
status: 'pending_payment',
|
||||
@@ -400,7 +459,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
});
|
||||
|
||||
it('generates a new QR when reopening a pending QR purchase', async () => {
|
||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||
routeParamMap = convertToParamMap({ id: 25 });
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||
id: 25,
|
||||
status: 'pending_payment',
|
||||
@@ -424,7 +483,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
it.each(['paid', 'cancelled', 'rejected', 'expired'])(
|
||||
'redirects a %s purchase to its status page',
|
||||
async (status) => {
|
||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||
routeParamMap = convertToParamMap({ id: 25 });
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||
id: 25,
|
||||
status,
|
||||
@@ -442,7 +501,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
);
|
||||
|
||||
it('redirects a submitted pending payment purchase to its status page', async () => {
|
||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||
routeParamMap = convertToParamMap({ id: 25 });
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||
id: 25,
|
||||
status: 'pending_payment',
|
||||
@@ -460,7 +519,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
||||
});
|
||||
|
||||
it('shows the API error in a toast when cancelling the purchase fails', async () => {
|
||||
it('shows the API error and redirects to status when cancellation finds an expired purchase', async () => {
|
||||
const message = 'La compra venció. Iniciá una nueva compra.';
|
||||
checkoutServiceStub.cancelPurchase.mockRejectedValue({
|
||||
error: { code: 'purchase.expired', message },
|
||||
@@ -470,7 +529,9 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
await component.onModifyPurchase();
|
||||
|
||||
expect(toastServiceStub.danger).toHaveBeenCalledWith(message);
|
||||
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
|
||||
queryParams: { status: 'expired' },
|
||||
});
|
||||
expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
|
||||
expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
|
||||
expect(component.isCancellingPurchase()).toBe(false);
|
||||
@@ -587,7 +648,24 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
expect(component.createdPurchaseId()).toBe(25);
|
||||
});
|
||||
|
||||
it('shows the API message and redirects home when a checkout operation finds an expired purchase', async () => {
|
||||
it('allows leaving checkout when cancellation finds an expired stock reservation', async () => {
|
||||
const message = 'La reserva de stock venció. Usá el carrito activo para continuar.';
|
||||
checkoutServiceStub.cancelPurchase.mockRejectedValue({
|
||||
error: { code: 'stock_reservation.expired', message },
|
||||
});
|
||||
const { component } = createComponent();
|
||||
|
||||
await expect(component.canDeactivate()).resolves.toBe(true);
|
||||
|
||||
expect(toastServiceStub.danger).toHaveBeenCalledWith(message);
|
||||
expect(cartServiceStub.loadCart).toHaveBeenCalledOnce();
|
||||
expect(component.createdPurchaseId()).toBeNull();
|
||||
expect(component.createdPurchase()).toBeNull();
|
||||
expect(globalLoadingServiceStub.start).toHaveBeenCalledOnce();
|
||||
expect(globalLoadingServiceStub.stop).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it('shows the API message and redirects to status when a checkout operation finds an expired purchase', async () => {
|
||||
checkoutServiceStub.generatePaymentIntent.mockRejectedValue(
|
||||
new HttpErrorResponse({
|
||||
status: 422,
|
||||
@@ -604,10 +682,35 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
expect(toastServiceStub.danger).toHaveBeenCalledWith(
|
||||
'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
|
||||
);
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
|
||||
queryParams: { status: 'expired' },
|
||||
});
|
||||
expect(component.isGeneratingIntent()).toBe(false);
|
||||
});
|
||||
|
||||
it('redirects to status when QR polling receives a purchase-expired response', async () => {
|
||||
checkoutServiceStub.getPurchase.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');
|
||||
await vi.advanceTimersByTimeAsync(5_000);
|
||||
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
|
||||
queryParams: { status: 'expired' },
|
||||
});
|
||||
expect(toastServiceStub.danger).toHaveBeenCalledWith(
|
||||
'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
|
||||
);
|
||||
});
|
||||
|
||||
it('treats a generic customer-data error as expired when the local deadline passed', () => {
|
||||
const { component } = createComponent();
|
||||
component.createdPurchase.set({
|
||||
@@ -635,6 +738,8 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
expect(toastServiceStub.danger).toHaveBeenCalledWith(
|
||||
'La compra venci\u00f3. Inici\u00e1 una nueva compra.',
|
||||
);
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
|
||||
queryParams: { status: 'expired' },
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -16,8 +16,10 @@ import { firstValueFrom, startWith } from 'rxjs';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import {
|
||||
CheckoutService,
|
||||
PurchasePaymentCandidateReason,
|
||||
PurchaseDetailItemResponse,
|
||||
PurchaseDetailResponse,
|
||||
PurchaseStatusResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { GlobalLoadingService } from '../../../../core/services/global-loading/global-loading.service';
|
||||
@@ -28,6 +30,7 @@ import { StepComponent } from '../../../../shared/components/stepper/step.compon
|
||||
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
|
||||
import { CheckoutDataStepComponent } from './checkout-data-step.component';
|
||||
import { CheckoutPaymentStepComponent } from './checkout-payment-step.component';
|
||||
import { CheckoutCountdownService } from '../../../../core/services/checkout-countdown.service';
|
||||
import {
|
||||
CheckoutForm,
|
||||
PaymentMethod,
|
||||
@@ -64,14 +67,15 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
private readonly router = inject(Router);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
private readonly checkoutService = inject(CheckoutService);
|
||||
private readonly checkoutCountdownService = inject(CheckoutCountdownService);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly globalLoadingService = inject(GlobalLoadingService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly qrPollingIntervalMs = 5_000;
|
||||
private readonly qrPollingMaxAttempts = 9;
|
||||
private readonly qrPollingMaxAttempts = 120;
|
||||
private readonly transferPollingIntervalMs = 3_000;
|
||||
private readonly transferPollingMaxAttempts = 4;
|
||||
private readonly transferPollingMaxAttempts = 20;
|
||||
|
||||
private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
|
||||
private qrPollingAttempts = 0;
|
||||
@@ -95,6 +99,27 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
protected readonly createdPurchase = signal<PurchaseDetailResponse | null>(null);
|
||||
protected readonly isLoadingPurchase = signal(true);
|
||||
protected readonly checkoutStepIndex = signal(0);
|
||||
protected readonly checkoutRemainingTime = computed(() => {
|
||||
const purchase = this.createdPurchase();
|
||||
|
||||
if (
|
||||
!purchase ||
|
||||
(typeof purchase.expires_at !== 'string' && typeof purchase.expires_in_seconds !== 'number')
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const remainingSeconds = this.checkoutCountdownService.remainingSeconds();
|
||||
|
||||
if (remainingSeconds === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const minutes = Math.floor(remainingSeconds / 60);
|
||||
const seconds = remainingSeconds % 60;
|
||||
|
||||
return `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
|
||||
});
|
||||
protected readonly cartSubtotal = computed(() => {
|
||||
const purchase = this.createdPurchase();
|
||||
return purchase ? parseFloat(purchase.subtotal) : 0;
|
||||
@@ -135,6 +160,14 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
protected readonly qrPaymentStatus = signal<QrPaymentStatus>('idle');
|
||||
protected readonly isCheckingQrPayment = signal(false);
|
||||
protected readonly transferValidationStatus = signal<TransferValidationStatus>('idle');
|
||||
private readonly transferPrimaryCandidateReason = signal<PurchasePaymentCandidateReason | null>(
|
||||
null,
|
||||
);
|
||||
protected readonly transferVerificationErrorTitle = computed(() =>
|
||||
this.transferPrimaryCandidateReason() === 'exact_amount_near_dni'
|
||||
? 'El DNI no corresponde con el de la transferencia'
|
||||
: null,
|
||||
);
|
||||
protected readonly whatsappUrl = computed(
|
||||
() =>
|
||||
this.tenantService
|
||||
@@ -161,7 +194,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
const purchaseId = Number(this.route.snapshot.queryParamMap.get('purchase'));
|
||||
const purchaseId = Number(this.route.snapshot.paramMap.get('id'));
|
||||
if (!Number.isInteger(purchaseId) || purchaseId <= 0) {
|
||||
void this.router.navigate(['/']);
|
||||
return;
|
||||
@@ -228,6 +261,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
nombre_apellido: formValue.nombre,
|
||||
});
|
||||
this.createdPurchase.set(purchase);
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
|
||||
this.stepper.next();
|
||||
|
||||
@@ -281,6 +315,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
const tenant = this.tenantService.tenant();
|
||||
const purchaseId = this.createdPurchaseId();
|
||||
if (!tenant || !purchaseId) {
|
||||
this.checkoutCountdownService.clear();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -291,11 +326,25 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
await firstValueFrom(this.cartService.loadCart());
|
||||
this.createdPurchaseId.set(null);
|
||||
this.createdPurchase.set(null);
|
||||
this.checkoutCountdownService.clear();
|
||||
|
||||
this.navigationStarted = true;
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('Failed to cancel the current purchase:', error);
|
||||
|
||||
if (this.isStockReservationExpiredError(error)) {
|
||||
this.showRequestError(error, 'La reserva de stock venció.');
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
this.createdPurchaseId.set(null);
|
||||
this.createdPurchase.set(null);
|
||||
this.checkoutCountdownService.clear();
|
||||
this.navigationStarted = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
this.showRequestError(error, 'No se pudo cancelar la compra.');
|
||||
return false;
|
||||
} finally {
|
||||
@@ -370,6 +419,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.transferDni.set(dni);
|
||||
this.stopTransferPolling();
|
||||
this.transferValidationStatus.set('idle');
|
||||
this.transferPrimaryCandidateReason.set(null);
|
||||
this.isGeneratingIntent.set(true);
|
||||
try {
|
||||
const response = await this.checkoutService
|
||||
@@ -426,6 +476,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.stopTransferPolling();
|
||||
this.hasSubmittedTransfer.set(true);
|
||||
this.transferValidationStatus.set('checking');
|
||||
this.transferPrimaryCandidateReason.set(null);
|
||||
this.transferPollingAttempts = 0;
|
||||
|
||||
const runId = this.transferPollingRunId;
|
||||
@@ -439,6 +490,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
this.captureTransferCandidateReason(purchase);
|
||||
|
||||
if (purchase.status === 'paid') {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
return;
|
||||
@@ -488,12 +542,24 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
this.captureTransferCandidateReason(purchase);
|
||||
|
||||
if (purchase.status === 'paid') {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
return;
|
||||
}
|
||||
|
||||
if (purchase.status === 'expired') {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
return;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to validate transfer payment:', error);
|
||||
if (this.isPurchaseExpiredError(error)) {
|
||||
this.showRequestError(error, 'La compra venció. Iniciá una nueva compra.');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (runId !== this.transferPollingRunId) {
|
||||
@@ -509,6 +575,14 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.scheduleTransferPoll(runId);
|
||||
}
|
||||
|
||||
private captureTransferCandidateReason(purchase: PurchaseStatusResponse): void {
|
||||
const reason = purchase.payment_verification?.primary?.reason;
|
||||
|
||||
if (reason) {
|
||||
this.transferPrimaryCandidateReason.set(reason);
|
||||
}
|
||||
}
|
||||
|
||||
private stopTransferPolling(): void {
|
||||
this.transferPollingRunId += 1;
|
||||
|
||||
@@ -565,6 +639,8 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
|
||||
if (purchase.status === 'paid') {
|
||||
this.handleConfirmedPayment(purchaseId);
|
||||
return;
|
||||
@@ -575,8 +651,17 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.qrPaymentStatus.set('failed');
|
||||
return;
|
||||
}
|
||||
|
||||
if (purchase.status === 'expired') {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
return;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to validate QR payment:', error);
|
||||
if (this.isPurchaseExpiredError(error)) {
|
||||
this.showRequestError(error, 'La compra venció. Iniciá una nueva compra.');
|
||||
return;
|
||||
}
|
||||
} finally {
|
||||
if (runId === this.qrPollingRunId) {
|
||||
this.isCheckingQrPayment.set(false);
|
||||
@@ -629,6 +714,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.navigationStarted = true;
|
||||
this.stopQrPolling();
|
||||
this.stopTransferPolling();
|
||||
this.checkoutCountdownService.clear();
|
||||
|
||||
void this.router.navigate(['/checkout/status', purchaseId]);
|
||||
}
|
||||
@@ -666,6 +752,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
|
||||
this.createdPurchaseId.set(purchase.id);
|
||||
this.createdPurchase.set(purchase);
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
this.checkoutStepIndex.set(purchase.status === 'pending_payment' ? 1 : 0);
|
||||
|
||||
if (
|
||||
@@ -683,15 +770,17 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to load purchase:', error);
|
||||
this.showRequestError(error, 'No se pudo cargar la compra.');
|
||||
void this.router.navigate(['/']);
|
||||
const expired = this.showRequestError(error, 'No se pudo cargar la compra.');
|
||||
if (!expired) {
|
||||
void this.router.navigate(['/']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private showRequestError(error: unknown, fallbackMessage: string): void {
|
||||
private showRequestError(error: unknown, fallbackMessage: string): boolean {
|
||||
const payload =
|
||||
typeof error === 'object' && error !== null && 'error' in error
|
||||
? (error as { error?: { message?: unknown } }).error
|
||||
? (error as { error?: ApiErrorResponse }).error
|
||||
: undefined;
|
||||
const message =
|
||||
typeof payload?.message === 'string' && payload.message.trim()
|
||||
@@ -699,6 +788,13 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
: fallbackMessage;
|
||||
|
||||
this.toastService.danger(message);
|
||||
|
||||
if (payload?.code === 'purchase.expired') {
|
||||
this.navigateToExpiredPurchaseStatus();
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private handleCheckoutError(error: unknown, fallbackMessage: string): boolean {
|
||||
@@ -717,7 +813,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
? response.message
|
||||
: 'La compra venció. Iniciá una nueva compra.',
|
||||
);
|
||||
void this.router.navigate(['/']);
|
||||
this.navigateToExpiredPurchaseStatus();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -729,6 +825,43 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
return false;
|
||||
}
|
||||
|
||||
private navigateToExpiredPurchaseStatus(): void {
|
||||
const purchaseId = this.createdPurchaseId() ?? this.createdPurchase()?.id;
|
||||
|
||||
if (purchaseId) {
|
||||
if (this.navigationStarted) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.navigationStarted = true;
|
||||
this.stopQrPolling();
|
||||
this.stopTransferPolling();
|
||||
this.checkoutCountdownService.clear();
|
||||
void this.router.navigate(['/checkout/status', purchaseId], {
|
||||
queryParams: { status: 'expired' },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
void this.router.navigate(['/']);
|
||||
}
|
||||
|
||||
private isPurchaseExpiredError(error: unknown): boolean {
|
||||
if (typeof error !== 'object' || error === null || !('error' in error)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (error as { error?: ApiErrorResponse }).error?.code === 'purchase.expired';
|
||||
}
|
||||
|
||||
private isStockReservationExpiredError(error: unknown): boolean {
|
||||
if (typeof error !== 'object' || error === null || !('error' in error)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (error as { error?: ApiErrorResponse }).error?.code === 'stock_reservation.expired';
|
||||
}
|
||||
|
||||
private hasExpiredPurchase(): boolean {
|
||||
const purchase = this.createdPurchase();
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
[validationStatus]="transferValidationStatus()"
|
||||
[paymentAmount]="qrPaymentAmount()"
|
||||
[whatsappUrl]="whatsappUrl()"
|
||||
[verificationErrorTitle]="transferVerificationErrorTitle()"
|
||||
(copyTransferValue)="requestCopy($event.field, $event.value)"
|
||||
(submitDni)="generateTransferIntent.emit($event)"
|
||||
(completePurchase)="complete.emit()"
|
||||
|
||||
@@ -33,6 +33,7 @@ export class CheckoutPaymentStepComponent {
|
||||
readonly qrPaymentAmount = input<number>(0);
|
||||
readonly whatsappUrl = input<string | null>(null);
|
||||
readonly transferValidationStatus = input<TransferValidationStatus>('idle');
|
||||
readonly transferVerificationErrorTitle = input<string | null>(null);
|
||||
|
||||
readonly paymentMethodChange = output<PaymentMethod>();
|
||||
readonly copyTransferValue = output<{ field: TransferField; value: string }>();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
<app-payment-verification-error
|
||||
[paymentAmount]="paymentAmount()"
|
||||
[whatsappUrl]="whatsappUrl()"
|
||||
[title]="verificationErrorTitle()"
|
||||
/>
|
||||
} @else {
|
||||
<div class="dni-form-container">
|
||||
|
||||
@@ -47,4 +47,23 @@ describe('CheckoutPaymentTransferComponent', () => {
|
||||
expect(whatsapp).toBeDefined();
|
||||
expect(element.querySelector('.payment-verification')).toBeNull();
|
||||
});
|
||||
|
||||
it('shows a custom validation title for a near DNI candidate', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [CheckoutPaymentTransferComponent],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(CheckoutPaymentTransferComponent);
|
||||
fixture.componentRef.setInput('validationStatus', 'error');
|
||||
fixture.componentRef.setInput(
|
||||
'verificationErrorTitle',
|
||||
'El DNI no corresponde con el de la transferencia',
|
||||
);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(fixture.nativeElement.textContent).toContain(
|
||||
'El DNI no corresponde con el de la transferencia',
|
||||
);
|
||||
expect(fixture.nativeElement.textContent).not.toContain('No pudimos verificar el pago de');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -41,6 +41,7 @@ export class CheckoutPaymentTransferComponent implements OnInit {
|
||||
readonly validationStatus = input<TransferValidationStatus>('idle');
|
||||
readonly paymentAmount = input<number>(0);
|
||||
readonly whatsappUrl = input<string | null>(null);
|
||||
readonly verificationErrorTitle = input<string | null>(null);
|
||||
|
||||
readonly copyTransferValue = output<{ field: TransferField; value: string }>();
|
||||
readonly submitDni = output<string>();
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="payment-timeout__icon" aria-hidden="true">
|
||||
<i class="fa-solid fa-xmark"></i>
|
||||
</div>
|
||||
<h4 class="payment-timeout__title">No pudimos verificar el pago de {{ formattedAmount() }}.</h4>
|
||||
<h4 class="payment-timeout__title">{{ displayTitle() }}</h4>
|
||||
<p class="payment-timeout__message">Por favor contactate con nosotros para resolverlo.</p>
|
||||
@if (whatsappUrl()) {
|
||||
<app-button
|
||||
|
||||
@@ -13,6 +13,7 @@ import { ButtonComponent } from '../../../../../../shared/components/button/butt
|
||||
export class PaymentVerificationErrorComponent {
|
||||
readonly paymentAmount = input<number>(0);
|
||||
readonly whatsappUrl = input<string | null>(null);
|
||||
readonly title = input<string | null>(null);
|
||||
|
||||
protected readonly formattedAmount = computed(() =>
|
||||
new Intl.NumberFormat('es-AR', {
|
||||
@@ -21,6 +22,9 @@ export class PaymentVerificationErrorComponent {
|
||||
maximumFractionDigits: 0,
|
||||
}).format(this.paymentAmount()),
|
||||
);
|
||||
protected readonly displayTitle = computed(
|
||||
() => this.title() ?? `No pudimos verificar el pago de ${this.formattedAmount()}.`,
|
||||
);
|
||||
|
||||
protected openWhatsApp(): void {
|
||||
const url = this.whatsappUrl();
|
||||
|
||||
@@ -507,9 +507,7 @@ describe('ProductDetailPageComponent', () => {
|
||||
},
|
||||
],
|
||||
});
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout'], {
|
||||
queryParams: { purchase: 44 },
|
||||
});
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout', 44]);
|
||||
});
|
||||
|
||||
it('shows the backend purchase-limit message for a direct checkout', async () => {
|
||||
|
||||
@@ -358,9 +358,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
],
|
||||
});
|
||||
|
||||
await this.router.navigate(['/checkout'], {
|
||||
queryParams: { purchase: purchase.id },
|
||||
});
|
||||
await this.router.navigate(['/checkout', purchase.id]);
|
||||
} catch (error) {
|
||||
console.error('Failed to create direct purchase:', error);
|
||||
const message =
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
|
||||
<div class="status-content__section status-content__section--secondary">
|
||||
@if (ticketsRoute()) {
|
||||
<p class="status-content__message">A continuación, vas a poder ver los tickets que debés presentar en el evento.</p>
|
||||
<p class="status-content__message">
|
||||
A continuación, vas a poder ver los tickets que debés presentar en el evento.
|
||||
</p>
|
||||
|
||||
<app-button
|
||||
type="button"
|
||||
@@ -29,7 +31,9 @@
|
||||
<span>Mis tickets</span>
|
||||
</app-button>
|
||||
} @else if (whatsappUrl()) {
|
||||
<p class="status-content__message">Comunicate con nosotros para coordinar el envío.</p>
|
||||
<p class="status-content__message">
|
||||
Comunicate con nosotros para coordinar el envío.
|
||||
</p>
|
||||
|
||||
<app-button
|
||||
type="button"
|
||||
@@ -51,13 +55,21 @@
|
||||
<i class="fa-solid fa-clock"></i>
|
||||
</div>
|
||||
<h2 class="status-content__title">ESTAMOS VERIFICANDO TU PAGO</h2>
|
||||
<p class="status-content__subtitle">Tu compra ya fue registrada y estamos esperando la confirmación del pago.</p>
|
||||
<p class="status-content__subtitle">
|
||||
Tu compra ya fue registrada y estamos esperando la confirmación del pago.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<hr class="status-content__divider" />
|
||||
|
||||
<div class="status-content__section status-content__section--secondary">
|
||||
<p class="status-content__message">Te avisaremos cuando el pago sea confirmado.</p>
|
||||
@if (paymentIssueMessage()) {
|
||||
<p class="status-content__message">
|
||||
{{ paymentIssueMessage() }} Estamos revisando el pago.
|
||||
</p>
|
||||
} @else {
|
||||
<p class="status-content__message">Te avisaremos cuando el pago sea confirmado.</p>
|
||||
}
|
||||
</div>
|
||||
} @else if (status() === 'expired') {
|
||||
<div class="status-content__section status-content__section--primary">
|
||||
@@ -65,13 +77,17 @@
|
||||
<i class="fa-solid fa-clock"></i>
|
||||
</div>
|
||||
<h2 class="status-content__title">LA COMPRA VENCIÓ</h2>
|
||||
<p class="status-content__subtitle">El plazo de pago terminó y liberamos el stock reservado.</p>
|
||||
<p class="status-content__subtitle">
|
||||
El plazo de pago terminó y liberamos el stock reservado.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<hr class="status-content__divider" />
|
||||
|
||||
<div class="status-content__section status-content__section--secondary">
|
||||
<p class="status-content__message">Podés volver a la tienda e iniciar una nueva compra.</p>
|
||||
<p class="status-content__message">
|
||||
Podés volver a la tienda e iniciar una nueva compra.
|
||||
</p>
|
||||
</div>
|
||||
} @else if (status() === 'rejected') {
|
||||
<div class="status-content__section status-content__section--primary">
|
||||
@@ -79,7 +95,9 @@
|
||||
<i class="fa-solid fa-triangle-exclamation"></i>
|
||||
</div>
|
||||
<h2 class="status-content__title">NO PUDIMOS CONFIRMAR EL PAGO</h2>
|
||||
<p class="status-content__subtitle">Revisá el medio de pago o comunicate con nosotros para continuar.</p>
|
||||
<p class="status-content__subtitle">
|
||||
Revisá el medio de pago o comunicate con nosotros para continuar.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<hr class="status-content__divider" />
|
||||
@@ -114,7 +132,9 @@
|
||||
<hr class="status-content__divider" />
|
||||
|
||||
<div class="status-content__section status-content__section--secondary">
|
||||
<p class="status-content__message">Volvé a ingresar más tarde. Si el problema sigue, comunicate con nosotros.</p>
|
||||
<p class="status-content__message">
|
||||
Volvé a ingresar más tarde. Si el problema sigue, comunicate con nosotros.
|
||||
</p>
|
||||
|
||||
@if (whatsappUrl()) {
|
||||
<div class="status-content__actions">
|
||||
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
CheckoutService,
|
||||
PurchaseDetailResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { Tenant } from '../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { PurchaseStatusPageComponent } from './purchase-status-page.component';
|
||||
@@ -66,9 +67,13 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
TestBed.resetTestingModule();
|
||||
});
|
||||
|
||||
async function render(hasGeneratedTickets: boolean) {
|
||||
async function render(
|
||||
hasGeneratedTickets: boolean,
|
||||
forcedStatus?: string,
|
||||
purchaseResponse = purchase(hasGeneratedTickets),
|
||||
) {
|
||||
const checkoutService = {
|
||||
getPurchase: vi.fn().mockResolvedValue(purchase(hasGeneratedTickets)),
|
||||
getPurchase: vi.fn().mockResolvedValue(purchaseResponse),
|
||||
withCustomLoading() {
|
||||
return this;
|
||||
},
|
||||
@@ -77,15 +82,22 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
navigate: vi.fn().mockResolvedValue(true),
|
||||
navigateByUrl: vi.fn().mockResolvedValue(true),
|
||||
};
|
||||
const cartService = { clearCart: vi.fn() };
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [PurchaseStatusPageComponent],
|
||||
providers: [
|
||||
{ provide: CheckoutService, useValue: checkoutService },
|
||||
{ provide: CartService, useValue: cartService },
|
||||
{ provide: TenantService, useValue: { tenant: () => tenant } },
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: { snapshot: { paramMap: convertToParamMap({ id: '42' }) } },
|
||||
useValue: {
|
||||
snapshot: {
|
||||
paramMap: convertToParamMap({ id: '42' }),
|
||||
queryParamMap: convertToParamMap(forcedStatus ? { status: forcedStatus } : {}),
|
||||
},
|
||||
},
|
||||
},
|
||||
{ provide: Router, useValue: router },
|
||||
],
|
||||
@@ -100,15 +112,22 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
fixture,
|
||||
element: fixture.nativeElement as HTMLElement,
|
||||
checkoutService,
|
||||
cartService,
|
||||
router,
|
||||
};
|
||||
}
|
||||
|
||||
it('clears the cart when the purchase is approved', async () => {
|
||||
const { cartService } = await render(true);
|
||||
|
||||
expect(cartService.clearCart).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it('shows the tickets action when this purchase generated tickets', async () => {
|
||||
const { element, checkoutService, router } = await render(true);
|
||||
|
||||
expect(checkoutService.getPurchase).toHaveBeenCalledOnce();
|
||||
expect(element.textContent).toContain('Ver mis tickets');
|
||||
expect(element.textContent).toContain('Mis tickets');
|
||||
expect(element.textContent).not.toContain('WhatsApp');
|
||||
|
||||
element.querySelector<HTMLButtonElement>('app-button button')?.click();
|
||||
@@ -134,6 +153,38 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
openSpy.mockRestore();
|
||||
});
|
||||
|
||||
it('shows the expired result without polling when checkout redirects after expiration', async () => {
|
||||
const { element, checkoutService } = await render(false, 'expired');
|
||||
|
||||
expect(element.textContent).toContain('LA COMPRA VENCIÓ');
|
||||
expect(element.textContent).not.toContain('ESTAMOS VERIFICANDO TU PAGO');
|
||||
expect(checkoutService.getPurchase).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('shows the primary transfer candidate issue while the purchase is in review', async () => {
|
||||
const { element } = await render(false, undefined, {
|
||||
status: 'in_review',
|
||||
payment_verification: {
|
||||
status: 'candidate',
|
||||
candidate_count: 2,
|
||||
primary: {
|
||||
reason: 'exact_dni_near_amount',
|
||||
dni_distance: 0,
|
||||
payment_amount: '49000.00',
|
||||
purchase_amount: '50000.00',
|
||||
amount_difference: '1000.00',
|
||||
confidence: 'high',
|
||||
detected_at: '2026-08-27T18:00:00-03:00',
|
||||
},
|
||||
reasons: ['exact_dni_near_amount', 'exact_amount_near_dni'],
|
||||
},
|
||||
} as PurchaseDetailResponse);
|
||||
|
||||
expect(element.textContent).toContain('Encontramos 2 transferencias posibles.');
|
||||
expect(element.textContent).toMatch(/diferencia de \$\s*1\.000/);
|
||||
expect(element.textContent).toContain('Estamos revisando el pago.');
|
||||
});
|
||||
|
||||
it('polls every five seconds while the payment is pending and shows the confirmation', async () => {
|
||||
vi.useFakeTimers();
|
||||
|
||||
@@ -147,11 +198,13 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
return this;
|
||||
},
|
||||
};
|
||||
const cartService = { clearCart: vi.fn() };
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [PurchaseStatusPageComponent],
|
||||
providers: [
|
||||
{ provide: CheckoutService, useValue: checkoutService },
|
||||
{ provide: CartService, useValue: cartService },
|
||||
{ provide: TenantService, useValue: { tenant: () => tenant } },
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
@@ -174,6 +227,7 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
|
||||
expect(checkoutService.getPurchase).toHaveBeenCalledTimes(2);
|
||||
expect(fixture.nativeElement.textContent).toContain('COMPRA REALIZADA!');
|
||||
expect(cartService.clearCart).toHaveBeenCalledOnce();
|
||||
|
||||
await vi.advanceTimersByTimeAsync(10_000);
|
||||
expect(checkoutService.getPurchase).toHaveBeenCalledTimes(2);
|
||||
@@ -197,6 +251,7 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
imports: [PurchaseStatusPageComponent],
|
||||
providers: [
|
||||
{ provide: CheckoutService, useValue: checkoutService },
|
||||
{ provide: CartService, useValue: { clearCart: vi.fn() } },
|
||||
{ provide: TenantService, useValue: { tenant: () => tenant } },
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
|
||||
@@ -13,8 +13,10 @@ import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import {
|
||||
CheckoutService,
|
||||
PurchasePaymentVerificationResponse,
|
||||
PurchaseStatusResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { findMenu } from '../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||
@@ -35,6 +37,7 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly router = inject(Router);
|
||||
private readonly checkoutService = inject(CheckoutService);
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
private readonly isBrowser = isPlatformBrowser(inject(PLATFORM_ID));
|
||||
|
||||
@@ -46,6 +49,7 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||
protected readonly isLoading = signal(true);
|
||||
protected readonly status = signal<PurchaseStatusView>('pending');
|
||||
protected readonly hasGeneratedTickets = signal(false);
|
||||
protected readonly paymentIssueMessage = signal<string | null>(null);
|
||||
protected readonly ticketsRoute = computed(() => {
|
||||
if (!this.hasGeneratedTickets()) {
|
||||
return null;
|
||||
@@ -72,6 +76,12 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||
this.purchaseId = purchaseId;
|
||||
this.tenantCode = tenant.codigo;
|
||||
|
||||
if (this.route.snapshot.queryParamMap?.get('status') === 'expired') {
|
||||
this.status.set('expired');
|
||||
this.isLoading.set(false);
|
||||
return;
|
||||
}
|
||||
|
||||
void this.loadStatus();
|
||||
}
|
||||
|
||||
@@ -97,6 +107,11 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||
const status = this.resolveStatus(purchase);
|
||||
this.status.set(status);
|
||||
this.hasGeneratedTickets.set(purchase.has_generated_tickets === true);
|
||||
this.paymentIssueMessage.set(this.resolvePaymentIssueMessage(purchase.payment_verification));
|
||||
|
||||
if (status === 'approved') {
|
||||
this.cartService.clearCart();
|
||||
}
|
||||
|
||||
if (status === 'pending') {
|
||||
this.schedulePolling();
|
||||
@@ -107,7 +122,10 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||
console.error('Failed to fetch purchase status:', error);
|
||||
|
||||
if (!this.isDestroyed) {
|
||||
if (isPolling) {
|
||||
if (this.isPurchaseExpiredError(error)) {
|
||||
this.status.set('expired');
|
||||
this.stopPolling();
|
||||
} else if (isPolling) {
|
||||
this.schedulePolling();
|
||||
} else {
|
||||
this.status.set('error');
|
||||
@@ -154,6 +172,51 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||
return 'pending';
|
||||
}
|
||||
|
||||
private resolvePaymentIssueMessage(
|
||||
verification?: PurchasePaymentVerificationResponse,
|
||||
): string | null {
|
||||
const primary = verification?.primary;
|
||||
|
||||
if (!primary) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const primaryMessage = (() => {
|
||||
switch (primary.reason) {
|
||||
case 'ambiguous_exact_match':
|
||||
return 'Encontramos una transferencia que también coincide con otra compra.';
|
||||
case 'exact_dni_near_amount':
|
||||
return `El DNI coincide, pero el monto transferido tiene una diferencia de ${this.formatCurrency(primary.amount_difference)}.`;
|
||||
case 'exact_amount_near_dni':
|
||||
return primary.dni_distance === null
|
||||
? 'El monto coincide, pero el DNI del pagador es diferente.'
|
||||
: `El monto coincide, pero el DNI del pagador presenta ${primary.dni_distance} ${primary.dni_distance === 1 ? 'diferencia' : 'diferencias'} de escritura.`;
|
||||
}
|
||||
})();
|
||||
|
||||
if (verification.candidate_count > 1) {
|
||||
return `Encontramos ${verification.candidate_count} transferencias posibles. ${primaryMessage}`;
|
||||
}
|
||||
|
||||
return primaryMessage;
|
||||
}
|
||||
|
||||
private formatCurrency(amount: string): string {
|
||||
return new Intl.NumberFormat('es-AR', {
|
||||
style: 'currency',
|
||||
currency: 'ARS',
|
||||
maximumFractionDigits: 2,
|
||||
}).format(Number(amount));
|
||||
}
|
||||
|
||||
private isPurchaseExpiredError(error: unknown): boolean {
|
||||
if (typeof error !== 'object' || error === null || !('error' in error)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (error as { error?: { code?: string } }).error?.code === 'purchase.expired';
|
||||
}
|
||||
|
||||
protected goToTickets(): void {
|
||||
const route = this.ticketsRoute();
|
||||
|
||||
|
||||
@@ -38,11 +38,13 @@
|
||||
<label class="visually-hidden" for="register-password">Contraseña</label>
|
||||
<app-input
|
||||
id="register-password"
|
||||
type="password"
|
||||
type="password-toggle"
|
||||
placeholder="Contraseña"
|
||||
[value]="form.controls.password.value"
|
||||
[invalid]="showControlError('password')"
|
||||
[visible]="passwordVisible()"
|
||||
(valueChange)="updateField('password', $event)"
|
||||
(visibleChange)="setPasswordVisibility($event)"
|
||||
/>
|
||||
@if (getControlError('password'); as errorMessage) {
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
@@ -51,11 +53,13 @@
|
||||
<label class="visually-hidden" for="register-password-repeat">Repetir Contraseña</label>
|
||||
<app-input
|
||||
id="register-password-repeat"
|
||||
type="password"
|
||||
type="password-toggle"
|
||||
placeholder="Repetir Contraseña"
|
||||
[value]="form.controls.password_confirmation.value"
|
||||
[invalid]="showControlError('password_confirmation')"
|
||||
[visible]="passwordVisible()"
|
||||
(valueChange)="updateField('password_confirmation', $event)"
|
||||
(visibleChange)="setPasswordVisibility($event)"
|
||||
/>
|
||||
@if (getControlError('password_confirmation'); as errorMessage) {
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
|
||||
@@ -12,6 +12,48 @@ describe('RegisterPageComponent', () => {
|
||||
TestBed.resetTestingModule();
|
||||
});
|
||||
|
||||
it('shows and hides both password fields with either visibility control', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RegisterPageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
{ provide: AuthService, useValue: { register: vi.fn() } },
|
||||
{ provide: ModalService, useValue: { openSimple: vi.fn() } },
|
||||
{ provide: ToastService, useValue: { danger: vi.fn() } }
|
||||
]
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RegisterPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const getPasswordInputs = () =>
|
||||
Array.from(
|
||||
fixture.nativeElement.querySelectorAll(
|
||||
'input#register-password, input#register-password-repeat'
|
||||
)
|
||||
) as HTMLInputElement[];
|
||||
const getVisibilityButtons = () =>
|
||||
Array.from(
|
||||
fixture.nativeElement.querySelectorAll('button[aria-label]')
|
||||
) as HTMLButtonElement[];
|
||||
|
||||
expect(getPasswordInputs().map((input) => input.type)).toEqual(['password', 'password']);
|
||||
|
||||
getVisibilityButtons()[0].click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(getPasswordInputs().map((input) => input.type)).toEqual(['text', 'text']);
|
||||
expect(getVisibilityButtons().map((button) => button.getAttribute('aria-label'))).toEqual([
|
||||
'Ocultar contraseña',
|
||||
'Ocultar contraseña'
|
||||
]);
|
||||
|
||||
getVisibilityButtons()[1].click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(getPasswordInputs().map((input) => input.type)).toEqual(['password', 'password']);
|
||||
});
|
||||
|
||||
it('submits registration data and redirects to /login on success', async () => {
|
||||
const authService = {
|
||||
register: vi.fn().mockReturnValue(
|
||||
|
||||
@@ -48,6 +48,7 @@ export class RegisterPageComponent {
|
||||
private readonly submittedState = signal(false);
|
||||
private readonly serverErrorState = signal<string | null>(null);
|
||||
private readonly isSubmittingState = signal(false);
|
||||
private readonly passwordVisibleState = signal(false);
|
||||
|
||||
protected readonly form = this.formBuilder.nonNullable.group({
|
||||
nombre_apellido: ['', [Validators.required, Validators.maxLength(TEXT_MAX_LENGTH)]],
|
||||
@@ -67,6 +68,11 @@ export class RegisterPageComponent {
|
||||
protected readonly submitted = this.submittedState.asReadonly();
|
||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||
protected readonly passwordVisible = this.passwordVisibleState.asReadonly();
|
||||
|
||||
protected setPasswordVisibility(visible: boolean): void {
|
||||
this.passwordVisibleState.set(visible);
|
||||
}
|
||||
|
||||
goToLogin(): void {
|
||||
void this.router.navigate(['/login']);
|
||||
|
||||
@@ -13,11 +13,13 @@
|
||||
<label class="visually-hidden" for="reset-password-new">Nueva Contraseña</label>
|
||||
<app-input
|
||||
id="reset-password-new"
|
||||
type="password"
|
||||
type="password-toggle"
|
||||
placeholder="Nueva Contraseña"
|
||||
[value]="form.controls.password.value"
|
||||
[invalid]="showControlError('password')"
|
||||
[visible]="passwordVisible()"
|
||||
(valueChange)="updatePassword('password', $event)"
|
||||
(visibleChange)="setPasswordVisibility($event)"
|
||||
/>
|
||||
@if (getControlError('password'); as errorMessage) {
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
@@ -30,11 +32,13 @@
|
||||
</label>
|
||||
<app-input
|
||||
id="reset-password-confirmation"
|
||||
type="password"
|
||||
type="password-toggle"
|
||||
placeholder="Repetir Nueva Contraseña"
|
||||
[value]="form.controls.password_confirmation.value"
|
||||
[invalid]="showControlError('password_confirmation')"
|
||||
[visible]="passwordVisible()"
|
||||
(valueChange)="updatePassword('password_confirmation', $event)"
|
||||
(visibleChange)="setPasswordVisibility($event)"
|
||||
/>
|
||||
@if (getControlError('password_confirmation'); as errorMessage) {
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
|
||||
@@ -50,6 +50,43 @@ describe('ResetPasswordPageComponent', () => {
|
||||
];
|
||||
}
|
||||
|
||||
it('shows and hides both password fields with either visibility control', async () => {
|
||||
const modalService = {
|
||||
openSimple: vi.fn(),
|
||||
};
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ResetPasswordPageComponent],
|
||||
providers: resetProviders(modalService),
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ResetPasswordPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const getPasswordInputs = () =>
|
||||
Array.from(fixture.nativeElement.querySelectorAll('input')) as HTMLInputElement[];
|
||||
const getVisibilityButtons = () =>
|
||||
Array.from(
|
||||
fixture.nativeElement.querySelectorAll('button[aria-label]'),
|
||||
) as HTMLButtonElement[];
|
||||
|
||||
expect(getPasswordInputs().map((input) => input.type)).toEqual(['password', 'password']);
|
||||
|
||||
getVisibilityButtons()[0].click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(getPasswordInputs().map((input) => input.type)).toEqual(['text', 'text']);
|
||||
expect(getVisibilityButtons().map((button) => button.getAttribute('aria-label'))).toEqual([
|
||||
'Ocultar contraseña',
|
||||
'Ocultar contraseña',
|
||||
]);
|
||||
|
||||
getVisibilityButtons()[1].click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(getPasswordInputs().map((input) => input.type)).toEqual(['password', 'password']);
|
||||
});
|
||||
|
||||
it('rejects passwords that do not match', async () => {
|
||||
const modalService = {
|
||||
openSimple: vi.fn(),
|
||||
|
||||
@@ -49,6 +49,7 @@ export class ResetPasswordPageComponent {
|
||||
private readonly submittedState = signal(false);
|
||||
private readonly isSubmittingState = signal(false);
|
||||
private readonly serverErrorState = signal<string | null>(null);
|
||||
private readonly passwordVisibleState = signal(false);
|
||||
|
||||
private readonly email = this.route.snapshot.queryParamMap.get('email') ?? '';
|
||||
private readonly code = this.route.snapshot.queryParamMap.get('code') ?? '';
|
||||
@@ -72,6 +73,11 @@ export class ResetPasswordPageComponent {
|
||||
protected readonly submitted = this.submittedState.asReadonly();
|
||||
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||
protected readonly passwordVisible = this.passwordVisibleState.asReadonly();
|
||||
|
||||
protected setPasswordVisibility(visible: boolean): void {
|
||||
this.passwordVisibleState.set(visible);
|
||||
}
|
||||
|
||||
protected updatePassword(controlName: PasswordControlName, value: string | number): void {
|
||||
this.form.controls[controlName].setValue(String(value));
|
||||
|
||||
@@ -24,7 +24,10 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
||||
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { CheckoutService } from '../../../../core/services/checkout.service';
|
||||
import {
|
||||
CheckoutService,
|
||||
isExpiredStockReservationResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import {
|
||||
CatalogFeaturedItem,
|
||||
CatalogFeaturedItems,
|
||||
@@ -199,10 +202,20 @@ export class SearchPageComponent {
|
||||
],
|
||||
},
|
||||
);
|
||||
await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
|
||||
await this.router.navigate(['/checkout', purchase.id]);
|
||||
} catch (error) {
|
||||
console.error('Failed to create direct purchase:', error);
|
||||
this.toastService.danger('No se pudo iniciar la compra directa.');
|
||||
const message =
|
||||
error instanceof HttpErrorResponse && typeof error.error?.message === 'string'
|
||||
? error.error.message
|
||||
: 'No se pudo iniciar la compra directa.';
|
||||
this.toastService.danger(message);
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
} finally {
|
||||
this.creatingDirectPurchase.set(false);
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import {
|
||||
CheckoutService,
|
||||
isExpiredStockReservationResponse,
|
||||
isInsufficientStockResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import {
|
||||
@@ -217,10 +218,18 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
|
||||
tenant.codigo,
|
||||
reservedCartId !== null ? { cart_id: reservedCartId } : { direct_items: directItems },
|
||||
);
|
||||
await this.router.navigate(['/checkout'], { queryParams: { purchase: purchase.id } });
|
||||
await this.router.navigate(['/checkout', purchase.id]);
|
||||
} catch (error) {
|
||||
console.error('Failed to create direct purchase:', error);
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.toastService.danger(error.error.message);
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (error instanceof HttpErrorResponse && isInsufficientStockResponse(error.error)) {
|
||||
const unavailableIds = error.error.unavailable_items
|
||||
.map((item) => item.variant_id)
|
||||
|
||||
@@ -91,15 +91,6 @@ export const routes: Routes = [
|
||||
(m) => m.ProductDetailPageComponent,
|
||||
),
|
||||
},
|
||||
{
|
||||
path: 'checkout',
|
||||
canActivate: [authGuard, hasMenuGuard('checkout')],
|
||||
canDeactivate: [checkoutPendingPurchaseGuard],
|
||||
loadComponent: () =>
|
||||
import('./pages/checkout-page/checkout-page.component').then(
|
||||
(m) => m.CheckoutPageComponent,
|
||||
),
|
||||
},
|
||||
{
|
||||
path: 'checkout/status',
|
||||
component: SimpleLayoutComponent,
|
||||
@@ -113,6 +104,15 @@ export const routes: Routes = [
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: 'checkout/:id',
|
||||
canActivate: [authGuard, hasMenuGuard('checkout')],
|
||||
canDeactivate: [checkoutPendingPurchaseGuard],
|
||||
loadComponent: () =>
|
||||
import('./pages/checkout-page/checkout-page.component').then(
|
||||
(m) => m.CheckoutPageComponent,
|
||||
),
|
||||
},
|
||||
{
|
||||
path: 'ayuda',
|
||||
canActivate: [hasMenuGuard('help')],
|
||||
|
||||
@@ -175,6 +175,63 @@ describe('CartComponent', () => {
|
||||
expect(removeItem).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('notifies the user and refreshes the cart when a mutation reports expiration', async () => {
|
||||
const expirationMessage = 'La reserva de stock venció. Usá el carrito activo para continuar.';
|
||||
const removeItem = vi.fn().mockReturnValue(
|
||||
throwError(() => ({
|
||||
error: {
|
||||
code: 'stock_reservation.expired',
|
||||
message: expirationMessage,
|
||||
},
|
||||
})),
|
||||
);
|
||||
const loadCart = vi.fn().mockReturnValue(of({}));
|
||||
const danger = vi.fn();
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [CartComponent],
|
||||
providers: [
|
||||
{
|
||||
provide: CartService,
|
||||
useValue: {
|
||||
cart: signal(null).asReadonly(),
|
||||
loadCart,
|
||||
updateItemQuantity: vi.fn(),
|
||||
removeItem,
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: { openConfirmDelete: vi.fn().mockReturnValue(of(true)) },
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: { success: vi.fn(), info: vi.fn(), danger },
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(CartComponent);
|
||||
fixture.componentRef.setInput('items', [
|
||||
{
|
||||
cartItemId: 10,
|
||||
imageUrl: null,
|
||||
product: 'Producto vencido',
|
||||
originalPrice: null,
|
||||
discountedPrice: 1000,
|
||||
discountPercentage: null,
|
||||
attributes: [],
|
||||
quantity: 1,
|
||||
},
|
||||
]);
|
||||
fixture.detectChanges();
|
||||
|
||||
fixture.debugElement.query(By.css('app-cart-item')).triggerEventHandler('remove');
|
||||
|
||||
expect(danger).toHaveBeenCalledWith(expirationMessage);
|
||||
expect(loadCart).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it('optimistically updates quantity and rolls back on error', async () => {
|
||||
vi.useFakeTimers();
|
||||
const updateItemQuantity = vi.fn().mockReturnValue(throwError(() => new Error('Error')));
|
||||
|
||||
@@ -98,11 +98,12 @@ export class CartComponent {
|
||||
this.clearOverride(update.cartItemId);
|
||||
},
|
||||
error: (err: HttpErrorResponse) => {
|
||||
console.error('Error updating cart quantity', err);
|
||||
const msg =
|
||||
err.error?.message || 'Error al actualizar la cantidad del producto.';
|
||||
this.toastService.danger(msg);
|
||||
this.clearOverride(update.cartItemId);
|
||||
this.handleMutationError(
|
||||
err,
|
||||
'Error al actualizar la cantidad del producto.',
|
||||
'Error updating cart quantity',
|
||||
);
|
||||
},
|
||||
}),
|
||||
catchError(() => EMPTY),
|
||||
@@ -205,9 +206,12 @@ export class CartComponent {
|
||||
this.toastService.success(response.message || 'Variante actualizada.');
|
||||
},
|
||||
error: (error: HttpErrorResponse) => {
|
||||
console.error('Error updating cart item variant', error);
|
||||
this.clearVariantOverride(cartItemId);
|
||||
this.toastService.danger(error.error?.message || 'No se pudo actualizar la variante.');
|
||||
this.handleMutationError(
|
||||
error,
|
||||
'No se pudo actualizar la variante.',
|
||||
'Error updating cart item variant',
|
||||
);
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -305,10 +309,29 @@ export class CartComponent {
|
||||
this.toastService.info(msg);
|
||||
},
|
||||
error: (err: HttpErrorResponse) => {
|
||||
console.error('Error removing item from cart', err);
|
||||
const msg = err.error?.message || 'Error al eliminar el producto del carrito.';
|
||||
this.toastService.danger(msg);
|
||||
this.handleMutationError(
|
||||
err,
|
||||
'Error al eliminar el producto del carrito.',
|
||||
'Error removing item from cart',
|
||||
);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private handleMutationError(
|
||||
error: HttpErrorResponse,
|
||||
fallbackMessage: string,
|
||||
logMessage: string,
|
||||
): void {
|
||||
console.error(logMessage, error);
|
||||
this.toastService.danger(error.error?.message || fallbackMessage);
|
||||
|
||||
if (error.error?.code !== 'stock_reservation.expired') {
|
||||
return;
|
||||
}
|
||||
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,9 +31,16 @@
|
||||
<div
|
||||
class="product-column-with-image__body p-3 d-flex flex-column align-items-center text-center flex-grow-1"
|
||||
>
|
||||
<h3 class="product-column-with-image__title text-uppercase text-black mb-4">{{ title() }}</h3>
|
||||
<h3 class="product-column-with-image__title text-uppercase text-black mb-4">
|
||||
{{ title() }}
|
||||
@if (unavailableMessage(); as message) {
|
||||
<app-tooltip [message]="message" />
|
||||
}
|
||||
</h3>
|
||||
|
||||
<div class="product-column-with-image__prices d-flex align-items-center justify-content-center gap-2">
|
||||
<div
|
||||
class="product-column-with-image__prices d-flex align-items-center justify-content-center gap-2"
|
||||
>
|
||||
<span class="product-column-with-image__price-discounted text-primary">
|
||||
{{ formattedDiscountedPrice() }}
|
||||
</span>
|
||||
@@ -53,7 +60,12 @@
|
||||
</div>
|
||||
|
||||
<div class="product-column-with-image__action mt-auto w-100">
|
||||
<app-button variant="primary" class="w-100" (click)="buy.emit()">
|
||||
<app-button
|
||||
variant="primary"
|
||||
class="w-100"
|
||||
[disabled]="!!unavailableMessage()"
|
||||
(click)="onBuy()"
|
||||
>
|
||||
{{ buttonText() }}
|
||||
</app-button>
|
||||
</div>
|
||||
|
||||
@@ -2,10 +2,11 @@ import { NgOptimizedImage } from '@angular/common';
|
||||
import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
|
||||
|
||||
import { ButtonComponent } from '../button/button.component';
|
||||
import { TooltipComponent } from '../tooltip/tooltip.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-product-column-with-image',
|
||||
imports: [ButtonComponent, NgOptimizedImage],
|
||||
imports: [ButtonComponent, NgOptimizedImage, TooltipComponent],
|
||||
templateUrl: './product-column-with-image.component.html',
|
||||
styleUrl: './product-column-with-image.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
@@ -18,9 +19,16 @@ export class ProductColumnWithImageComponent {
|
||||
readonly transferPrice = input<number | null>(null);
|
||||
readonly buttonText = input<string>('Comprar');
|
||||
readonly imagePriority = input<boolean>(false);
|
||||
readonly unavailableMessage = input<string | null>(null);
|
||||
|
||||
readonly buy = output<void>();
|
||||
|
||||
protected onBuy(): void {
|
||||
if (this.unavailableMessage()) return;
|
||||
|
||||
this.buy.emit();
|
||||
}
|
||||
|
||||
readonly discountedPrice = computed(() => {
|
||||
const original = this.originalPrice();
|
||||
const discount = this.discount();
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
[description]="item.descripcion ?? ''"
|
||||
[price]="price(item)"
|
||||
[maximumAddableQuantity]="item.maximum_addable_quantity ?? null"
|
||||
[unavailableMessage]="item.unavailable_message ?? null"
|
||||
[variants]="item.variants ?? []"
|
||||
[saving]="savingProductIds().has(item.id)"
|
||||
(buy)="emitRowBuy(item, $event)"
|
||||
@@ -25,6 +26,7 @@
|
||||
[description]="item.descripcion ?? ''"
|
||||
[price]="price(item)"
|
||||
[maximumAddableQuantity]="item.maximum_addable_quantity ?? null"
|
||||
[unavailableMessage]="item.unavailable_message ?? null"
|
||||
[variants]="item.variants ?? []"
|
||||
[saving]="savingProductIds().has(item.id)"
|
||||
(buy)="emitColumnBuy(item, $event)"
|
||||
@@ -38,7 +40,8 @@
|
||||
[description]="item.descripcion ?? ''"
|
||||
[price]="price(item)"
|
||||
[imageUrl]="loadImages() ? (item.image ?? null) : null"
|
||||
[disabled]="loading()"
|
||||
[unavailableMessage]="item.unavailable_message ?? null"
|
||||
[disabled]="loading() || !!item.unavailable_message"
|
||||
(buy)="emitTicketBuy(item, $event)"
|
||||
/>
|
||||
}
|
||||
@@ -47,6 +50,7 @@
|
||||
[imageUrl]="loadImages() ? (item.image ?? null) : null"
|
||||
[title]="item.nombre"
|
||||
[originalPrice]="price(item)"
|
||||
[unavailableMessage]="item.unavailable_message ?? null"
|
||||
[imagePriority]="loadImages() && index < 4"
|
||||
(buy)="emitProductDetailBuy(item)"
|
||||
/>
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
<div class="product-row-card__info d-flex flex-column justify-content-center flex-grow-1">
|
||||
<h3 class="product-row-card__title text-uppercase mb-1 m-0">
|
||||
{{ title() }}
|
||||
@if (effectiveUnavailableMessage(); as message) {
|
||||
<app-tooltip [message]="message" />
|
||||
}
|
||||
</h3>
|
||||
@if (effectiveDescription()) {
|
||||
<p class="product-row-card__description m-0 mt-1">
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
} from '@angular/core';
|
||||
import { ButtonComponent } from '../button/button.component';
|
||||
import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
|
||||
import { TooltipComponent } from '../tooltip/tooltip.component';
|
||||
import {
|
||||
VariantSelectorComponent,
|
||||
VariantSelectorVariant,
|
||||
@@ -19,12 +20,13 @@ export interface Variant extends VariantSelectorVariant {
|
||||
descripcion?: string | null;
|
||||
precio?: string | number;
|
||||
maximum_addable_quantity?: number | null;
|
||||
unavailable_message?: string | null;
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-product-row-card',
|
||||
standalone: true,
|
||||
imports: [ButtonComponent, QuantitySelectorComponent, VariantSelectorComponent],
|
||||
imports: [ButtonComponent, QuantitySelectorComponent, TooltipComponent, VariantSelectorComponent],
|
||||
templateUrl: './product-row-card.component.html',
|
||||
styleUrl: './product-row-card.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
@@ -35,6 +37,7 @@ export class ProductRowCardComponent {
|
||||
readonly description = input<string>('');
|
||||
readonly price = input<number>(0);
|
||||
readonly maximumAddableQuantity = input<number | null>(null);
|
||||
readonly unavailableMessage = input<string | null>(null);
|
||||
readonly variants = input<Variant[]>([]);
|
||||
readonly saving = input(false);
|
||||
|
||||
@@ -61,6 +64,13 @@ export class ProductRowCardComponent {
|
||||
() => this.selectedVariantData()?.maximum_addable_quantity ?? this.maximumAddableQuantity(),
|
||||
);
|
||||
protected readonly unavailable = computed(() => this.effectiveMaximum() === 0);
|
||||
protected readonly effectiveUnavailableMessage = computed(() => {
|
||||
const selectedVariant = this.selectedVariantData();
|
||||
|
||||
return selectedVariant
|
||||
? (selectedVariant.unavailable_message ?? null)
|
||||
: this.unavailableMessage();
|
||||
});
|
||||
|
||||
readonly formattedPrice = computed(() => this.formatCurrency(this.effectivePrice()));
|
||||
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
<article class="ticket-selector">
|
||||
<header class="ticket-selector__header">
|
||||
<div>
|
||||
<h3 class="ticket-selector__title">{{ title() }}</h3>
|
||||
<h3 class="ticket-selector__title">
|
||||
{{ title() }}
|
||||
@if (unavailableMessage(); as message) {
|
||||
<app-tooltip [message]="message" />
|
||||
}
|
||||
</h3>
|
||||
@if (description()) {
|
||||
<p class="ticket-selector__description">{{ description() }}</p>
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ import { ModalService } from '../../../core/services/modal.service';
|
||||
import { ToastService } from '../../../core/services/toast.service';
|
||||
import { ButtonComponent } from '../button/button.component';
|
||||
import { IconButtonComponent } from '../icon-button/icon-button.component';
|
||||
import { TooltipComponent } from '../tooltip/tooltip.component';
|
||||
|
||||
type TicketSelectionStatus =
|
||||
| 'selecting'
|
||||
@@ -56,7 +57,7 @@ interface TicketSelectionRow {
|
||||
|
||||
@Component({
|
||||
selector: 'app-product-ticket-selector',
|
||||
imports: [ButtonComponent, IconButtonComponent],
|
||||
imports: [ButtonComponent, IconButtonComponent, TooltipComponent],
|
||||
templateUrl: './product-ticket-selector.component.html',
|
||||
styleUrl: './product-ticket-selector.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
@@ -80,6 +81,7 @@ export class ProductTicketSelectorComponent {
|
||||
readonly price = input<number>(0);
|
||||
readonly imageUrl = input<string | null>(null);
|
||||
readonly disabled = input(false);
|
||||
readonly unavailableMessage = input<string | null>(null);
|
||||
|
||||
readonly buy = output<number[]>();
|
||||
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
<article class="product-vertical-with-cart-card">
|
||||
<div class="product-vertical-with-cart-card__content">
|
||||
<h3 class="product-vertical-with-cart-card__title">{{ title() }}</h3>
|
||||
<h3 class="product-vertical-with-cart-card__title">
|
||||
{{ title() }}
|
||||
@if (effectiveUnavailableMessage(); as message) {
|
||||
<app-tooltip [message]="message" />
|
||||
}
|
||||
</h3>
|
||||
|
||||
@if (effectiveDescription()) {
|
||||
<p class="product-vertical-with-cart-card__description">{{ effectiveDescription() }}</p>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
height: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 30px 20px;
|
||||
overflow: hidden;
|
||||
overflow: visible;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 7px;
|
||||
|
||||
@@ -56,6 +56,23 @@ describe('ProductVerticalWithCartCardComponent', () => {
|
||||
).toBeNull();
|
||||
});
|
||||
|
||||
it('shows the backend availability message with the reusable tooltip', async () => {
|
||||
const fixture = await createComponent();
|
||||
fixture.componentRef.setInput('maximumAddableQuantity', 0);
|
||||
fixture.componentRef.setInput(
|
||||
'unavailableMessage',
|
||||
'Alcanzaste el cupo máximo permitido para este producto.',
|
||||
);
|
||||
fixture.detectChanges();
|
||||
|
||||
const tooltip = (fixture.nativeElement as HTMLElement).querySelector('app-tooltip');
|
||||
|
||||
expect(tooltip?.querySelector('i.fa-solid.fa-circle-info')).not.toBeNull();
|
||||
expect(tooltip?.textContent).toContain(
|
||||
'Alcanzaste el cupo máximo permitido para este producto.',
|
||||
);
|
||||
});
|
||||
|
||||
it('updates the quantity with the reusable quantity selector', async () => {
|
||||
const fixture = await createComponent();
|
||||
const buttons = fixture.nativeElement.querySelectorAll(
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
|
||||
import { ButtonComponent } from '../button/button.component';
|
||||
import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
|
||||
import { TooltipComponent } from '../tooltip/tooltip.component';
|
||||
import {
|
||||
VariantSelectorComponent,
|
||||
VariantSelectorVariant,
|
||||
@@ -19,11 +20,12 @@ export interface VerticalCartVariant extends VariantSelectorVariant {
|
||||
descripcion?: string | null;
|
||||
precio?: string | number;
|
||||
maximum_addable_quantity?: number | null;
|
||||
unavailable_message?: string | null;
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-product-vertical-with-cart-card',
|
||||
imports: [ButtonComponent, QuantitySelectorComponent, VariantSelectorComponent],
|
||||
imports: [ButtonComponent, QuantitySelectorComponent, TooltipComponent, VariantSelectorComponent],
|
||||
templateUrl: './product-vertical-with-cart-card.component.html',
|
||||
styleUrl: './product-vertical-with-cart-card.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
@@ -33,6 +35,7 @@ export class ProductVerticalWithCartCardComponent {
|
||||
readonly description = input<string>('');
|
||||
readonly price = input<number>(0);
|
||||
readonly maximumAddableQuantity = input<number | null>(null);
|
||||
readonly unavailableMessage = input<string | null>(null);
|
||||
readonly variants = input<VerticalCartVariant[]>([]);
|
||||
readonly saving = input(false);
|
||||
|
||||
@@ -59,6 +62,13 @@ export class ProductVerticalWithCartCardComponent {
|
||||
() => this.selectedVariantData()?.maximum_addable_quantity ?? this.maximumAddableQuantity(),
|
||||
);
|
||||
protected readonly unavailable = computed(() => this.effectiveMaximum() === 0);
|
||||
protected readonly effectiveUnavailableMessage = computed(() => {
|
||||
const selectedVariant = this.selectedVariantData();
|
||||
|
||||
return selectedVariant
|
||||
? (selectedVariant.unavailable_message ?? null)
|
||||
: this.unavailableMessage();
|
||||
});
|
||||
|
||||
constructor() {
|
||||
effect(() => {
|
||||
|
||||
@@ -1,25 +1,27 @@
|
||||
<div class="stepper-container">
|
||||
|
||||
<!-- Horizontal indicator bar -->
|
||||
<div class="stepper-header">
|
||||
<div class="stepper-header" [class.is-disabled]="disabled()" [attr.aria-disabled]="disabled()">
|
||||
@for (step of steps(); track step; let i = $index; let last = $last) {
|
||||
<div
|
||||
class="stepper-header__item"
|
||||
[ngClass]="{
|
||||
'is-active': currentStepIndex() === i,
|
||||
'is-completed': currentStepIndex() > i
|
||||
'is-completed': currentStepIndex() > i,
|
||||
}"
|
||||
>
|
||||
<!-- Connecting line before (except first) -->
|
||||
@if (i > 0) {
|
||||
<div class="stepper-header__line" [ngClass]="{ 'is-completed': currentStepIndex() > i - 1 }"></div>
|
||||
<div
|
||||
class="stepper-header__line"
|
||||
[ngClass]="{ 'is-completed': currentStepIndex() > i - 1 }"
|
||||
></div>
|
||||
}
|
||||
|
||||
<!-- Circle indicator -->
|
||||
<div
|
||||
class="stepper-header__circle"
|
||||
[attr.aria-label]="step.label()"
|
||||
[class.is-clickable]="currentStepIndex() > i"
|
||||
[class.is-clickable]="!disabled() && currentStepIndex() > i"
|
||||
(click)="goToStep(i)"
|
||||
></div>
|
||||
|
||||
@@ -33,5 +35,4 @@
|
||||
<div class="stepper-body">
|
||||
<ng-content></ng-content>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -13,6 +13,14 @@
|
||||
margin-bottom: 2rem;
|
||||
position: relative;
|
||||
|
||||
&.is-disabled {
|
||||
opacity: 0.5;
|
||||
|
||||
.stepper-header__circle {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
&__item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -6,7 +6,7 @@ import { StepComponent } from './step.component';
|
||||
@Component({
|
||||
imports: [StepperComponent, StepComponent],
|
||||
template: `
|
||||
<app-stepper #stepper>
|
||||
<app-stepper #stepper [disabled]="stepperDisabled()">
|
||||
<app-step label="Step 1" [isValid]="step1Valid()">
|
||||
<div id="content-1">Content 1</div>
|
||||
</app-step>
|
||||
@@ -20,6 +20,7 @@ class TestHostComponent {
|
||||
@ViewChild('stepper') stepper!: StepperComponent;
|
||||
step1Valid = signal(true);
|
||||
step2Valid = signal(true);
|
||||
stepperDisabled = signal(false);
|
||||
}
|
||||
|
||||
describe('StepperComponent & StepComponent', () => {
|
||||
@@ -137,4 +138,28 @@ describe('StepperComponent & StepComponent', () => {
|
||||
expect(component.stepper.currentStepIndex()).toBe(0);
|
||||
expect(fixture.nativeElement.querySelector('#content-1')).not.toBeNull();
|
||||
});
|
||||
|
||||
it('blocks all navigation and shows visual feedback while disabled', async () => {
|
||||
const { fixture, component } = await setup();
|
||||
component.stepperDisabled.set(true);
|
||||
fixture.detectChanges();
|
||||
|
||||
component.stepper.next();
|
||||
expect(component.stepper.currentStepIndex()).toBe(0);
|
||||
|
||||
component.stepperDisabled.set(false);
|
||||
fixture.detectChanges();
|
||||
component.stepper.next();
|
||||
expect(component.stepper.currentStepIndex()).toBe(1);
|
||||
|
||||
component.stepperDisabled.set(true);
|
||||
fixture.detectChanges();
|
||||
component.stepper.previous();
|
||||
component.stepper.goToStep(0);
|
||||
|
||||
expect(component.stepper.currentStepIndex()).toBe(1);
|
||||
const header = fixture.nativeElement.querySelector('.stepper-header');
|
||||
expect(header.classList.contains('is-disabled')).toBe(true);
|
||||
expect(header.getAttribute('aria-disabled')).toBe('true');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -18,9 +18,12 @@ import { NgClass } from '@angular/common';
|
||||
export class StepperComponent {
|
||||
readonly steps = contentChildren(StepComponent);
|
||||
readonly initialStepIndex = input(0);
|
||||
readonly disabled = input(false);
|
||||
readonly currentStepIndex = linkedSignal(() => this.initialStepIndex());
|
||||
|
||||
next() {
|
||||
if (this.disabled()) return;
|
||||
|
||||
const currentSteps = this.steps();
|
||||
const currentIndex = this.currentStepIndex();
|
||||
if (currentIndex < currentSteps.length - 1) {
|
||||
@@ -32,6 +35,8 @@ export class StepperComponent {
|
||||
}
|
||||
|
||||
previous() {
|
||||
if (this.disabled()) return;
|
||||
|
||||
const currentIndex = this.currentStepIndex();
|
||||
if (currentIndex > 0) {
|
||||
this.currentStepIndex.set(currentIndex - 1);
|
||||
@@ -39,6 +44,8 @@ export class StepperComponent {
|
||||
}
|
||||
|
||||
goToStep(index: number) {
|
||||
if (this.disabled()) return;
|
||||
|
||||
const targetIndex = index;
|
||||
// Only allow navigating to completed steps or the current one
|
||||
if (targetIndex < this.currentStepIndex()) {
|
||||
|
||||
11
src/app/shared/components/tooltip/tooltip.component.html
Normal file
11
src/app/shared/components/tooltip/tooltip.component.html
Normal file
@@ -0,0 +1,11 @@
|
||||
<button
|
||||
type="button"
|
||||
class="tooltip-trigger"
|
||||
[attr.aria-describedby]="tooltipId"
|
||||
[attr.aria-label]="message()"
|
||||
>
|
||||
<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
|
||||
<span class="tooltip-message" [id]="tooltipId" role="tooltip">
|
||||
{{ message() }}
|
||||
</span>
|
||||
</button>
|
||||
62
src/app/shared/components/tooltip/tooltip.component.scss
Normal file
62
src/app/shared/components/tooltip/tooltip.component.scss
Normal file
@@ -0,0 +1,62 @@
|
||||
:host {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
margin-left: 0.25rem;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.tooltip-trigger {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: var(--tenant-primary, var(--color-primary, #0d6efd));
|
||||
font-size: 1em;
|
||||
line-height: inherit;
|
||||
|
||||
&:focus-visible {
|
||||
border-radius: 50%;
|
||||
outline: 2px solid currentColor;
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
&:hover .tooltip-message,
|
||||
&:focus-visible .tooltip-message {
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
transform: translate(-50%, -0.25rem);
|
||||
}
|
||||
}
|
||||
|
||||
.tooltip-message {
|
||||
position: absolute;
|
||||
z-index: 1100;
|
||||
bottom: calc(100% + 0.625rem);
|
||||
left: 50%;
|
||||
width: max-content;
|
||||
max-width: min(16rem, 75vw);
|
||||
padding: 0.5rem 0.75rem;
|
||||
border-radius: 0.375rem;
|
||||
border: 1px solid var(--tenant-primary, var(--color-primary, #0d6efd));
|
||||
background: #fff;
|
||||
color: #212529;
|
||||
font-family: inherit;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 400;
|
||||
line-height: 1.35;
|
||||
text-align: center;
|
||||
text-transform: none;
|
||||
letter-spacing: normal;
|
||||
white-space: normal;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
transform: translate(-50%, 0);
|
||||
transition:
|
||||
opacity 0.15s ease,
|
||||
transform 0.15s ease,
|
||||
visibility 0.15s ease;
|
||||
}
|
||||
32
src/app/shared/components/tooltip/tooltip.component.spec.ts
Normal file
32
src/app/shared/components/tooltip/tooltip.component.spec.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
import { TestBed, getTestBed } from '@angular/core/testing';
|
||||
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||
import { afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||
|
||||
import { TooltipComponent } from './tooltip.component';
|
||||
|
||||
describe('TooltipComponent', () => {
|
||||
beforeAll(() => {
|
||||
try {
|
||||
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||
} catch {
|
||||
// Test environment may already be initialized by another setup entrypoint.
|
||||
}
|
||||
});
|
||||
|
||||
afterEach(() => TestBed.resetTestingModule());
|
||||
|
||||
it('renders the reusable danger information tooltip', async () => {
|
||||
await TestBed.configureTestingModule({ imports: [TooltipComponent] }).compileComponents();
|
||||
const fixture = TestBed.createComponent(TooltipComponent);
|
||||
fixture.componentRef.setInput('message', 'Este producto no tiene stock disponible.');
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const trigger = element.querySelector('.tooltip-trigger');
|
||||
const message = element.querySelector('.tooltip-message');
|
||||
|
||||
expect(trigger?.querySelector('i.fa-solid.fa-circle-info')).not.toBeNull();
|
||||
expect(message?.textContent?.trim()).toBe('Este producto no tiene stock disponible.');
|
||||
expect(trigger?.getAttribute('aria-describedby')).toBe(message?.id);
|
||||
});
|
||||
});
|
||||
14
src/app/shared/components/tooltip/tooltip.component.ts
Normal file
14
src/app/shared/components/tooltip/tooltip.component.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { ChangeDetectionStrategy, Component, input } from '@angular/core';
|
||||
|
||||
let nextTooltipId = 0;
|
||||
|
||||
@Component({
|
||||
selector: 'app-tooltip',
|
||||
templateUrl: './tooltip.component.html',
|
||||
styleUrl: './tooltip.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class TooltipComponent {
|
||||
readonly message = input.required<string>();
|
||||
protected readonly tooltipId = `app-tooltip-${nextTooltipId++}`;
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
export const environment = {
|
||||
production: false,
|
||||
production: true,
|
||||
nombre:"Homologación - activo",
|
||||
url:"https://backend.qa.shopit.com.ar/api/",
|
||||
urlDescarga:"url/"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<title>ShopitFront</title>
|
||||
<base href="/">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||
<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E">
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
|
||||
@@ -6,6 +6,15 @@
|
||||
|
||||
@import '../node_modules/bootstrap/scss/bootstrap';
|
||||
|
||||
html,
|
||||
body,
|
||||
app-root {
|
||||
width: 100%;
|
||||
min-height: 100%;
|
||||
margin: 0;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
|
||||
:root,
|
||||
app-root {
|
||||
--border-color: #dddddd;
|
||||
|
||||
Reference in New Issue
Block a user