Compare commits
42 Commits
fix/cart-e
...
fix/zoom_b
| Author | SHA1 | Date | |
|---|---|---|---|
| 4bd74d95cb | |||
| 6f87aae939 | |||
| 71ef09b413 | |||
| 1d54cb1c48 | |||
| 7d52e11bca | |||
| ebae063a0f | |||
| f0c1e74c1b | |||
| 709859e731 | |||
| e95a7612c2 | |||
| 8bc0e165c7 | |||
| 158b28ec1a | |||
| 8c22485d49 | |||
| 2462f25f2f | |||
| 63b01f366a | |||
| ddd0b1b56d | |||
| 2cad0c39b4 | |||
| 3089873232 | |||
| 3fa0235163 | |||
| 0910d90363 | |||
| f3d446d012 | |||
| 1ec48f7e21 | |||
| 07972760fc | |||
| 848c3b280f | |||
| c387a01d62 | |||
| 5d9adc0494 | |||
| 593580d648 | |||
| eb524c7d99 | |||
| 65e8436ae1 | |||
| 07500f699d | |||
| 4997665da6 | |||
| dbfadf417a | |||
| dddb086cd8 | |||
| a825b3693b | |||
| 679342ec8d | |||
| a5420e6a42 | |||
| 91b8788c91 | |||
| b6a52ceb8c | |||
| 51d051733c | |||
| f62cd08807 | |||
| d61b1e4b0a | |||
| 1bffefece3 | |||
| b0d2cd05bc |
@@ -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 {
|
||||
|
||||
@@ -24,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 = {
|
||||
@@ -150,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>;
|
||||
|
||||
@@ -157,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 = {
|
||||
@@ -215,6 +218,12 @@ describe('StoreLayoutComponent', () => {
|
||||
provide: CheckoutService,
|
||||
useValue: checkoutServiceStub,
|
||||
},
|
||||
{
|
||||
provide: CheckoutCountdownService,
|
||||
useValue: {
|
||||
remainingSeconds: checkoutRemainingSecondsState.asReadonly(),
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
});
|
||||
@@ -271,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,
|
||||
|
||||
@@ -24,6 +24,7 @@ import {
|
||||
} 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',
|
||||
@@ -42,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);
|
||||
@@ -49,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);
|
||||
@@ -287,7 +290,7 @@ export class StoreLayoutComponent implements OnInit {
|
||||
this.toastService.danger(message);
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.cartService.loadCart().subscribe({
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -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,10 +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;
|
||||
@@ -70,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 {
|
||||
@@ -106,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;
|
||||
@@ -124,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(
|
||||
@@ -186,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,
|
||||
@@ -221,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> {
|
||||
@@ -237,7 +254,7 @@ export class CheckoutService extends BaseApiService {
|
||||
throw new Error('Error al cancelar la compra.');
|
||||
}
|
||||
|
||||
return { status: purchase.status ?? null };
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async getPurchases(
|
||||
|
||||
@@ -7,6 +7,7 @@ import { firstValueFrom } from 'rxjs';
|
||||
|
||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||
import { ImageModalComponent } from '../../shared/components/image-modal/image-modal.component';
|
||||
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||
import { MODAL_DATA, ModalRef, ModalService } from './modal.service';
|
||||
@@ -258,6 +259,36 @@ describe('ModalService', () => {
|
||||
showCloseButton: true,
|
||||
});
|
||||
});
|
||||
|
||||
it('opens the image viewer fullscreen with normalized zoom limits', () => {
|
||||
service.openImage({
|
||||
title: 'Producto',
|
||||
src: '/images/producto.webp',
|
||||
alt: 'Producto visto de frente',
|
||||
initialZoom: 8,
|
||||
minZoom: 0,
|
||||
maxZoom: 3,
|
||||
});
|
||||
|
||||
const activeModal = service.activeModal();
|
||||
|
||||
expect(activeModal?.component).toBe(ImageModalComponent);
|
||||
expect(activeModal?.config).toEqual({
|
||||
title: 'Producto',
|
||||
size: 'full',
|
||||
presentation: 'fullscreen-media',
|
||||
data: {
|
||||
src: '/images/producto.webp',
|
||||
alt: 'Producto visto de frente',
|
||||
initialZoom: 3,
|
||||
minZoom: 0.1,
|
||||
maxZoom: 3,
|
||||
},
|
||||
closeOnBackdrop: true,
|
||||
closeOnEscape: true,
|
||||
showCloseButton: true,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@Component({
|
||||
|
||||
@@ -2,16 +2,19 @@ import { InjectionToken, Injectable, Type, signal } from '@angular/core';
|
||||
import { Observable, Subject, map } from 'rxjs';
|
||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||
import { ImageModalComponent } from '../../shared/components/image-modal/image-modal.component';
|
||||
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||
|
||||
export type ModalSize = 'qr' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
||||
export type ModalDismissReason = 'backdrop' | 'escape' | 'programmatic' | 'replaced';
|
||||
export type ModalDismissReason = 'backdrop' | 'escape' | 'programmatic' | 'replaced' | 'swipe';
|
||||
export type ModalPresentation = 'dialog' | 'fullscreen-media';
|
||||
|
||||
export interface ModalConfig<TData = unknown> {
|
||||
title?: string;
|
||||
data?: TData;
|
||||
size?: ModalSize;
|
||||
presentation?: ModalPresentation;
|
||||
closeOnBackdrop?: boolean;
|
||||
closeOnEscape?: boolean;
|
||||
showCloseButton?: boolean;
|
||||
@@ -62,6 +65,25 @@ export interface QrModalConfig extends Omit<ModalConfig<QrModalData>, 'data' | '
|
||||
ticket: string;
|
||||
}
|
||||
|
||||
export interface ImageModalData {
|
||||
src: string;
|
||||
alt: string;
|
||||
initialZoom: number;
|
||||
minZoom: number;
|
||||
maxZoom: number;
|
||||
}
|
||||
|
||||
export interface ImageModalConfig extends Omit<
|
||||
ModalConfig<ImageModalData>,
|
||||
'data' | 'presentation' | 'size'
|
||||
> {
|
||||
src: string;
|
||||
alt: string;
|
||||
initialZoom?: number;
|
||||
minZoom?: number;
|
||||
maxZoom?: number;
|
||||
}
|
||||
|
||||
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
||||
component: Type<unknown>;
|
||||
config: NormalizedModalConfig<TData>;
|
||||
@@ -195,6 +217,33 @@ export class ModalService {
|
||||
});
|
||||
}
|
||||
|
||||
openImage(config: ImageModalConfig): Observable<void> {
|
||||
return this.openImageRef(config).afterClosed$.pipe(map(() => undefined));
|
||||
}
|
||||
|
||||
openImageRef(config: ImageModalConfig): ModalRef<void> {
|
||||
const { src, alt, initialZoom = 1, minZoom = 1, maxZoom = 4, ...modalConfig } = config;
|
||||
const normalizedMinZoom = Math.max(0.1, minZoom);
|
||||
const normalizedMaxZoom = Math.max(normalizedMinZoom, maxZoom);
|
||||
const normalizedInitialZoom = Math.min(
|
||||
normalizedMaxZoom,
|
||||
Math.max(normalizedMinZoom, initialZoom),
|
||||
);
|
||||
|
||||
return this.open(ImageModalComponent, {
|
||||
...modalConfig,
|
||||
size: 'full',
|
||||
presentation: 'fullscreen-media',
|
||||
data: {
|
||||
src,
|
||||
alt,
|
||||
initialZoom: normalizedInitialZoom,
|
||||
minZoom: normalizedMinZoom,
|
||||
maxZoom: normalizedMaxZoom,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
||||
if (this.activeModalState()?.ref !== ref) {
|
||||
return;
|
||||
|
||||
@@ -83,6 +83,9 @@
|
||||
Abrir modal ancho
|
||||
</app-button>
|
||||
<app-button (click)="openSimpleModal()"> Abrir simple modal </app-button>
|
||||
<app-button variant="secondary" (click)="openImageModal()">
|
||||
Abrir visor de imagen
|
||||
</app-button>
|
||||
</div>
|
||||
<div class="modal-showcase__result" data-testid="modal-last-result">
|
||||
{{ lastModalResult }}
|
||||
|
||||
@@ -51,6 +51,7 @@ function createModalServiceStub() {
|
||||
open: vi.fn(),
|
||||
openConfirm: vi.fn().mockReturnValue(of(true)),
|
||||
openConfirmDelete: vi.fn().mockReturnValue(of(false)),
|
||||
openImage: vi.fn().mockReturnValue(of(undefined)),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -281,6 +282,9 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
const deleteButton = buttons.find((button) =>
|
||||
button.textContent?.includes('Abrir confirm delete'),
|
||||
) as HTMLButtonElement;
|
||||
const imageButton = buttons.find((button) =>
|
||||
button.textContent?.includes('Abrir visor de imagen'),
|
||||
) as HTMLButtonElement;
|
||||
|
||||
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
||||
'Todavia no se abrio ningun modal.',
|
||||
@@ -290,6 +294,8 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
fixture.detectChanges();
|
||||
deleteButton.click();
|
||||
fixture.detectChanges();
|
||||
imageButton.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(modalServiceStub.openConfirm).toHaveBeenCalledWith({
|
||||
title: 'Confirmar accion',
|
||||
@@ -302,6 +308,11 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
'Esta accion eliminara el producto del catalogo. Podras volver a crearlo manualmente.',
|
||||
confirmLabel: 'Eliminar',
|
||||
});
|
||||
expect(modalServiceStub.openImage).toHaveBeenCalledWith({
|
||||
title: 'Mochila urbana roja',
|
||||
src: '/images/carousel-mochila-roja.webp',
|
||||
alt: 'Mochila urbana roja vista de frente',
|
||||
});
|
||||
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
||||
'Resultado: false',
|
||||
);
|
||||
|
||||
@@ -493,6 +493,14 @@ export class ReutilizablesTestPageComponent {
|
||||
});
|
||||
}
|
||||
|
||||
protected openImageModal(): void {
|
||||
this.modalService.openImage({
|
||||
title: 'Mochila urbana roja',
|
||||
src: '/images/carousel-mochila-roja.webp',
|
||||
alt: 'Mochila urbana roja vista de frente',
|
||||
});
|
||||
}
|
||||
|
||||
private openConfirmModal(config: Parameters<ModalService['openConfirm']>[0]): void {
|
||||
this.modalService.openConfirm(config).subscribe((confirmed) => {
|
||||
this.lastModalResult = `Resultado: ${confirmed}`;
|
||||
|
||||
@@ -180,7 +180,7 @@ export class CategoryItemsPageComponent {
|
||||
this.toastService.danger(message);
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.cartService.loadCart().subscribe({
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
[qrPaymentAmount]="cartTotal()"
|
||||
[whatsappUrl]="whatsappUrl()"
|
||||
[transferValidationStatus]="transferValidationStatus()"
|
||||
[transferVerificationErrorTitle]="transferVerificationErrorTitle()"
|
||||
(paymentMethodChange)="selectPaymentMethod($event)"
|
||||
(copyTransferValue)="copyTransferValue($event.field, $event.value)"
|
||||
(cancelStep)="onCancel()"
|
||||
@@ -46,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', () => {
|
||||
@@ -129,6 +130,93 @@ 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('checks the purchase when the countdown expires and redirects to the expired status', async () => {
|
||||
const countdown = TestBed.inject(CheckoutCountdownService);
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'expired' });
|
||||
const { fixture, component } = createComponent();
|
||||
component.createdPurchase.set({
|
||||
id: 25,
|
||||
status: 'created',
|
||||
expires_at: new Date(Date.now() + 1_000).toISOString(),
|
||||
expires_in_seconds: 1,
|
||||
server_time: new Date().toISOString(),
|
||||
items: [],
|
||||
subtotal: '0.00',
|
||||
total: '0.00',
|
||||
});
|
||||
countdown.synchronize(component.createdPurchase());
|
||||
fixture.detectChanges();
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1_000);
|
||||
fixture.detectChanges();
|
||||
await Promise.resolve();
|
||||
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledOnce();
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
|
||||
queryParams: { status: 'expired' },
|
||||
});
|
||||
});
|
||||
|
||||
it('checks the purchase only once when the expired countdown remains at zero', async () => {
|
||||
const countdown = TestBed.inject(CheckoutCountdownService);
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||
status: 'pending_payment',
|
||||
expires_at: new Date(Date.now() - 1_000).toISOString(),
|
||||
expires_in_seconds: 0,
|
||||
server_time: new Date().toISOString(),
|
||||
});
|
||||
const { fixture, component } = createComponent();
|
||||
component.createdPurchase.set({
|
||||
id: 25,
|
||||
status: 'pending_payment',
|
||||
expires_at: new Date(Date.now() - 1_000).toISOString(),
|
||||
expires_in_seconds: 0,
|
||||
server_time: new Date().toISOString(),
|
||||
items: [],
|
||||
subtotal: '0.00',
|
||||
total: '0.00',
|
||||
});
|
||||
countdown.synchronize(component.createdPurchase());
|
||||
fixture.detectChanges();
|
||||
|
||||
await Promise.resolve();
|
||||
fixture.detectChanges();
|
||||
await vi.advanceTimersByTimeAsync(5_000);
|
||||
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledOnce();
|
||||
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('polls QR after five seconds and navigates only when payment is paid', async () => {
|
||||
checkoutServiceStub.getPurchase
|
||||
.mockResolvedValueOnce({ status: 'pending_payment' })
|
||||
@@ -195,7 +283,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 +293,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 +342,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'));
|
||||
|
||||
@@ -2,6 +2,7 @@ import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
computed,
|
||||
effect,
|
||||
inject,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
@@ -16,8 +17,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 +31,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,6 +68,7 @@ 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);
|
||||
@@ -71,7 +76,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
private readonly qrPollingIntervalMs = 5_000;
|
||||
private readonly qrPollingMaxAttempts = 120;
|
||||
private readonly transferPollingIntervalMs = 3_000;
|
||||
private readonly transferPollingMaxAttempts = 209;
|
||||
private readonly transferPollingMaxAttempts = 20;
|
||||
|
||||
private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
|
||||
private qrPollingAttempts = 0;
|
||||
@@ -82,6 +87,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
private paymentMethodRequestId = 0;
|
||||
private navigationStarted = false;
|
||||
private cancelPurchasePromise: Promise<boolean> | null = null;
|
||||
private expirationCheckPurchaseId: number | null = null;
|
||||
|
||||
@ViewChild(StepperComponent) stepper!: StepperComponent;
|
||||
|
||||
@@ -95,6 +101,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 +162,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
|
||||
@@ -143,6 +178,28 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
);
|
||||
|
||||
constructor() {
|
||||
effect(() => {
|
||||
const remainingSeconds = this.checkoutCountdownService.remainingSeconds();
|
||||
const purchaseId = this.createdPurchaseId() ?? this.createdPurchase()?.id ?? null;
|
||||
|
||||
if (remainingSeconds !== null && remainingSeconds > 0) {
|
||||
this.expirationCheckPurchaseId = null;
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
remainingSeconds !== 0 ||
|
||||
purchaseId === null ||
|
||||
this.navigationStarted ||
|
||||
this.expirationCheckPurchaseId === purchaseId
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.expirationCheckPurchaseId = purchaseId;
|
||||
void this.checkPurchaseAfterCountdownExpiration(purchaseId);
|
||||
});
|
||||
|
||||
this.form.statusChanges
|
||||
.pipe(startWith(this.form.status))
|
||||
.subscribe(() => this.isStep1Valid.set(this.form.valid));
|
||||
@@ -228,6 +285,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
nombre_apellido: formValue.nombre,
|
||||
});
|
||||
this.createdPurchase.set(purchase);
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
|
||||
this.stepper.next();
|
||||
|
||||
@@ -281,6 +339,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,6 +350,7 @@ 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;
|
||||
@@ -299,11 +359,12 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
|
||||
if (this.isStockReservationExpiredError(error)) {
|
||||
this.showRequestError(error, 'La reserva de stock venció.');
|
||||
this.cartService.loadCart().subscribe({
|
||||
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;
|
||||
}
|
||||
@@ -382,6 +443,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
|
||||
@@ -438,6 +500,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;
|
||||
@@ -451,6 +514,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
this.captureTransferCandidateReason(purchase);
|
||||
|
||||
if (purchase.status === 'paid') {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
return;
|
||||
@@ -500,6 +566,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
this.captureTransferCandidateReason(purchase);
|
||||
|
||||
if (purchase.status === 'paid') {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
return;
|
||||
@@ -530,6 +599,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;
|
||||
|
||||
@@ -586,6 +663,8 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
|
||||
if (purchase.status === 'paid') {
|
||||
this.handleConfirmedPayment(purchaseId);
|
||||
return;
|
||||
@@ -659,10 +738,40 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.navigationStarted = true;
|
||||
this.stopQrPolling();
|
||||
this.stopTransferPolling();
|
||||
this.checkoutCountdownService.clear();
|
||||
|
||||
void this.router.navigate(['/checkout/status', purchaseId]);
|
||||
}
|
||||
|
||||
private async checkPurchaseAfterCountdownExpiration(purchaseId: number): Promise<void> {
|
||||
const tenant = this.tenantService.tenant();
|
||||
|
||||
if (!tenant || this.navigationStarted) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const purchase = await this.checkoutService
|
||||
.withCustomLoading()
|
||||
.getPurchase(tenant.codigo, purchaseId);
|
||||
|
||||
if (this.navigationStarted) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (purchase.status === 'expired') {
|
||||
this.navigateToExpiredPurchaseStatus();
|
||||
return;
|
||||
}
|
||||
|
||||
this.checkoutCountdownService.synchronize(purchase);
|
||||
} catch (error) {
|
||||
if (this.isPurchaseExpiredError(error)) {
|
||||
this.navigateToExpiredPurchaseStatus();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async loadPurchase(purchaseId: number): Promise<void> {
|
||||
const tenant = this.tenantService.tenant();
|
||||
if (!tenant) {
|
||||
@@ -696,6 +805,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 (
|
||||
@@ -779,6 +889,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.navigationStarted = true;
|
||||
this.stopQrPolling();
|
||||
this.stopTransferPolling();
|
||||
this.checkoutCountdownService.clear();
|
||||
void this.router.navigate(['/checkout/status', purchaseId], {
|
||||
queryParams: { status: 'expired' },
|
||||
});
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -67,9 +67,13 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
TestBed.resetTestingModule();
|
||||
});
|
||||
|
||||
async function render(hasGeneratedTickets: boolean, forcedStatus?: string) {
|
||||
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;
|
||||
},
|
||||
@@ -91,9 +95,7 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
useValue: {
|
||||
snapshot: {
|
||||
paramMap: convertToParamMap({ id: '42' }),
|
||||
queryParamMap: convertToParamMap(
|
||||
forcedStatus ? { status: forcedStatus } : {},
|
||||
),
|
||||
queryParamMap: convertToParamMap(forcedStatus ? { status: forcedStatus } : {}),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -159,6 +161,30 @@ describe('PurchaseStatusPageComponent', () => {
|
||||
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();
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import {
|
||||
CheckoutService,
|
||||
PurchasePaymentVerificationResponse,
|
||||
PurchaseStatusResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
@@ -48,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;
|
||||
@@ -105,6 +107,7 @@ 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();
|
||||
@@ -169,6 +172,43 @@ 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;
|
||||
|
||||
@@ -212,7 +212,7 @@ export class SearchPageComponent {
|
||||
this.toastService.danger(message);
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.cartService.loadCart().subscribe({
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
|
||||
|
||||
if (error instanceof HttpErrorResponse && isExpiredStockReservationResponse(error.error)) {
|
||||
this.toastService.danger(error.error.message);
|
||||
this.cartService.loadCart().subscribe({
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
return;
|
||||
|
||||
@@ -330,7 +330,7 @@ export class CartComponent {
|
||||
return;
|
||||
}
|
||||
|
||||
this.cartService.loadCart().subscribe({
|
||||
this.cartService.loadCart(true).subscribe({
|
||||
error: (refreshError) => console.error('Error refreshing expired cart', refreshError),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
<div
|
||||
class="image-modal"
|
||||
[class.image-modal--gesturing]="gestureActive()"
|
||||
[class.image-modal--settling]="swipeSettling()"
|
||||
[style.transform]="swipeTransform()"
|
||||
>
|
||||
<div
|
||||
#viewport
|
||||
class="image-modal__viewport"
|
||||
[class.image-modal__viewport--zoomed]="zoom() > data.minZoom"
|
||||
(wheel)="onWheel($event)"
|
||||
(dblclick)="onDoubleClick($event)"
|
||||
(pointerdown)="onPointerDown($event)"
|
||||
(pointermove)="onPointerMove($event)"
|
||||
(pointerup)="onPointerUp($event)"
|
||||
(pointercancel)="onPointerUp($event)"
|
||||
>
|
||||
@if (!imageFailed()) {
|
||||
<img
|
||||
#image
|
||||
class="image-modal__image"
|
||||
[src]="data.src"
|
||||
[alt]="data.alt"
|
||||
[style.transform]="transform()"
|
||||
decoding="async"
|
||||
draggable="false"
|
||||
(load)="onImageLoad()"
|
||||
(error)="imageFailed.set(true)"
|
||||
/>
|
||||
} @else {
|
||||
<p class="image-modal__error" role="alert">No se pudo cargar la imagen.</p>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="image-modal__controls" aria-label="Controles de zoom">
|
||||
<button
|
||||
type="button"
|
||||
class="image-modal__control"
|
||||
aria-label="Alejar"
|
||||
[disabled]="zoom() <= data.minZoom"
|
||||
(click)="zoomOut()"
|
||||
>
|
||||
−
|
||||
</button>
|
||||
<button type="button" class="image-modal__zoom" aria-label="Restablecer zoom" (click)="reset()">
|
||||
{{ zoomLabel() }}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="image-modal__control"
|
||||
aria-label="Acercar"
|
||||
[disabled]="zoom() >= data.maxZoom"
|
||||
(click)="zoomIn()"
|
||||
>
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
146
src/app/shared/components/image-modal/image-modal.component.scss
Normal file
146
src/app/shared/components/image-modal/image-modal.component.scss
Normal file
@@ -0,0 +1,146 @@
|
||||
:host {
|
||||
display: flex;
|
||||
min-height: 0;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.image-modal {
|
||||
position: relative;
|
||||
display: flex;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
background: black;
|
||||
transform-origin: center top;
|
||||
}
|
||||
|
||||
.image-modal--settling {
|
||||
transition: transform 180ms ease-out;
|
||||
}
|
||||
|
||||
.image-modal--gesturing {
|
||||
will-change: transform;
|
||||
}
|
||||
|
||||
.image-modal__viewport {
|
||||
display: flex;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
flex: 1;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
overflow: hidden;
|
||||
cursor: zoom-in;
|
||||
touch-action: none;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.image-modal__viewport--zoomed {
|
||||
cursor: grab;
|
||||
}
|
||||
|
||||
.image-modal__viewport--zoomed:active {
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.image-modal__image {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
max-height: 100%;
|
||||
object-fit: contain;
|
||||
transform-origin: center;
|
||||
transition: transform 120ms ease-out;
|
||||
-webkit-user-drag: none;
|
||||
}
|
||||
|
||||
.image-modal--gesturing .image-modal__image {
|
||||
transition: none;
|
||||
will-change: transform;
|
||||
}
|
||||
|
||||
.image-modal__viewport:active .image-modal__image {
|
||||
transition: none;
|
||||
}
|
||||
|
||||
.image-modal__error {
|
||||
margin: 1rem;
|
||||
color: #ffffff;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.image-modal__controls {
|
||||
position: absolute;
|
||||
right: 50%;
|
||||
bottom: max(1.25rem, env(safe-area-inset-bottom));
|
||||
z-index: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
border: 1px solid rgba(255, 255, 255, 0.25);
|
||||
border-radius: 2rem;
|
||||
background: rgba(20, 20, 20, 0.78);
|
||||
box-shadow: 0 0.25rem 1rem rgba(0, 0, 0, 0.3);
|
||||
transform: translateX(50%);
|
||||
backdrop-filter: blur(0.5rem);
|
||||
}
|
||||
|
||||
.image-modal__control,
|
||||
.image-modal__zoom {
|
||||
display: inline-flex;
|
||||
height: 2.75rem;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 0;
|
||||
color: #ffffff;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.image-modal__control {
|
||||
width: 2.75rem;
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.image-modal__zoom {
|
||||
min-width: 4rem;
|
||||
padding: 0 0.5rem;
|
||||
font-size: 0.875rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
|
||||
.image-modal__control:hover:not(:disabled),
|
||||
.image-modal__zoom:hover {
|
||||
background: rgba(255, 255, 255, 0.12);
|
||||
}
|
||||
|
||||
.image-modal__control:focus-visible,
|
||||
.image-modal__zoom:focus-visible {
|
||||
outline: 2px solid #ffffff;
|
||||
outline-offset: -3px;
|
||||
}
|
||||
|
||||
.image-modal__control:disabled {
|
||||
opacity: 0.35;
|
||||
}
|
||||
|
||||
@media (max-width: 576px) {
|
||||
.image-modal__controls {
|
||||
bottom: max(1rem, env(safe-area-inset-bottom));
|
||||
background: rgba(20, 20, 20, 0.94);
|
||||
backdrop-filter: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (pointer: coarse) {
|
||||
.image-modal__controls {
|
||||
background: rgba(20, 20, 20, 0.94);
|
||||
backdrop-filter: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.image-modal__image {
|
||||
transition: none;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,165 @@
|
||||
import '@angular/compiler';
|
||||
import { ComponentFixture, TestBed, getTestBed } from '@angular/core/testing';
|
||||
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { ImageModalData, MODAL_DATA, ModalRef } from '../../../core/services/modal.service';
|
||||
import { ImageModalComponent } from './image-modal.component';
|
||||
|
||||
describe('ImageModalComponent', () => {
|
||||
let fixture: ComponentFixture<ImageModalComponent>;
|
||||
const modalRef = { dismiss: vi.fn() };
|
||||
const data: ImageModalData = {
|
||||
src: '/images/producto.webp',
|
||||
alt: 'Vista frontal del producto',
|
||||
initialZoom: 1,
|
||||
minZoom: 1,
|
||||
maxZoom: 2,
|
||||
};
|
||||
|
||||
beforeAll(() => {
|
||||
try {
|
||||
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||
} catch {
|
||||
// Test environment may already be initialized by another setup entrypoint.
|
||||
}
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
modalRef.dismiss.mockReset();
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ImageModalComponent],
|
||||
providers: [
|
||||
{ provide: MODAL_DATA, useValue: data },
|
||||
{ provide: ModalRef, useValue: modalRef },
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ImageModalComponent);
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
fixture.destroy();
|
||||
TestBed.resetTestingModule();
|
||||
});
|
||||
|
||||
it('renders the image and accessible zoom controls', () => {
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const image = element.querySelector('img') as HTMLImageElement;
|
||||
|
||||
expect(image.getAttribute('src')).toBe('/images/producto.webp');
|
||||
expect(image.alt).toBe('Vista frontal del producto');
|
||||
expect(element.querySelector('[aria-label="Acercar"]')).not.toBeNull();
|
||||
expect(element.querySelector('[aria-label="Alejar"]')).not.toBeNull();
|
||||
});
|
||||
|
||||
it('zooms with controls, respects limits, and resets', () => {
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const zoomIn = element.querySelector('[aria-label="Acercar"]') as HTMLButtonElement;
|
||||
const zoomOut = element.querySelector('[aria-label="Alejar"]') as HTMLButtonElement;
|
||||
const reset = element.querySelector('[aria-label="Restablecer zoom"]') as HTMLButtonElement;
|
||||
|
||||
zoomIn.click();
|
||||
fixture.detectChanges();
|
||||
expect(reset.textContent).toContain('150%');
|
||||
expect(zoomOut.disabled).toBe(false);
|
||||
|
||||
zoomIn.click();
|
||||
fixture.detectChanges();
|
||||
expect(reset.textContent).toContain('200%');
|
||||
expect(zoomIn.disabled).toBe(true);
|
||||
|
||||
reset.click();
|
||||
fixture.detectChanges();
|
||||
expect(reset.textContent).toContain('100%');
|
||||
expect(zoomOut.disabled).toBe(true);
|
||||
});
|
||||
|
||||
it('supports pinch zoom through touch pointer events', async () => {
|
||||
const viewport = fixture.nativeElement.querySelector('.image-modal__viewport') as HTMLElement;
|
||||
const zoom = fixture.nativeElement.querySelector(
|
||||
'[aria-label="Restablecer zoom"]',
|
||||
) as HTMLButtonElement;
|
||||
|
||||
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 100, 100));
|
||||
viewport.dispatchEvent(pointerEvent('pointerdown', 2, 200, 100));
|
||||
viewport.dispatchEvent(pointerEvent('pointermove', 2, 250, 100));
|
||||
await renderNextFrame();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(zoom.textContent).toContain('150%');
|
||||
});
|
||||
|
||||
it('dismisses with a downward swipe while the image is at its base zoom', async () => {
|
||||
const viewport = fixture.nativeElement.querySelector('.image-modal__viewport') as HTMLElement;
|
||||
const modal = fixture.nativeElement.querySelector('.image-modal') as HTMLElement;
|
||||
|
||||
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 150, 100));
|
||||
viewport.dispatchEvent(pointerEvent('pointermove', 1, 155, 230));
|
||||
await renderNextFrame();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(modal.style.transform).toBe('translate3d(0, 130px, 0)');
|
||||
expect(Number(modal.style.opacity)).toBeLessThan(1);
|
||||
|
||||
viewport.dispatchEvent(pointerEvent('pointerup', 1, 155, 230));
|
||||
|
||||
expect(modalRef.dismiss).toHaveBeenCalledWith('swipe');
|
||||
});
|
||||
|
||||
it('returns smoothly to its position when the swipe is too short', async () => {
|
||||
const viewport = fixture.nativeElement.querySelector('.image-modal__viewport') as HTMLElement;
|
||||
const modal = fixture.nativeElement.querySelector('.image-modal') as HTMLElement;
|
||||
|
||||
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 150, 100));
|
||||
viewport.dispatchEvent(pointerEvent('pointermove', 1, 150, 160));
|
||||
await renderNextFrame();
|
||||
fixture.detectChanges();
|
||||
expect(modal.style.transform).toBe('translate3d(0, 60px, 0)');
|
||||
|
||||
viewport.dispatchEvent(pointerEvent('pointerup', 1, 150, 160));
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(modalRef.dismiss).not.toHaveBeenCalled();
|
||||
expect(modal.classList.contains('image-modal--settling')).toBe(true);
|
||||
expect(modal.style.transform).toBe('translate3d(0, 0px, 0)');
|
||||
});
|
||||
|
||||
it('does not dismiss with a downward gesture while the image is zoomed', () => {
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const viewport = element.querySelector('.image-modal__viewport') as HTMLElement;
|
||||
const zoomIn = element.querySelector('[aria-label="Acercar"]') as HTMLButtonElement;
|
||||
zoomIn.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 150, 100));
|
||||
viewport.dispatchEvent(pointerEvent('pointermove', 1, 155, 230));
|
||||
viewport.dispatchEvent(pointerEvent('pointerup', 1, 155, 230));
|
||||
|
||||
expect(modalRef.dismiss).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('shows a fallback when the image cannot be loaded', () => {
|
||||
const image = fixture.nativeElement.querySelector('img') as HTMLImageElement;
|
||||
image.dispatchEvent(new Event('error'));
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(fixture.nativeElement.querySelector('[role="alert"]')?.textContent).toContain(
|
||||
'No se pudo cargar la imagen',
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
function pointerEvent(type: string, pointerId: number, clientX: number, clientY: number): Event {
|
||||
const event = new MouseEvent(type, { bubbles: true, clientX, clientY });
|
||||
Object.defineProperties(event, {
|
||||
pointerId: { value: pointerId },
|
||||
pointerType: { value: 'touch' },
|
||||
});
|
||||
return event;
|
||||
}
|
||||
|
||||
async function renderNextFrame(): Promise<void> {
|
||||
await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
|
||||
}
|
||||
395
src/app/shared/components/image-modal/image-modal.component.ts
Normal file
395
src/app/shared/components/image-modal/image-modal.component.ts
Normal file
@@ -0,0 +1,395 @@
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
DestroyRef,
|
||||
ElementRef,
|
||||
computed,
|
||||
inject,
|
||||
signal,
|
||||
viewChild,
|
||||
} from '@angular/core';
|
||||
|
||||
import { ImageModalData, MODAL_DATA, ModalRef } from '../../../core/services/modal.service';
|
||||
|
||||
const SWIPE_DISMISS_DISTANCE = 100;
|
||||
const SWIPE_DIRECTION_RATIO = 1.25;
|
||||
|
||||
interface Point {
|
||||
x: number;
|
||||
y: number;
|
||||
}
|
||||
|
||||
interface ViewerGeometry {
|
||||
imageHeight: number;
|
||||
imageWidth: number;
|
||||
viewportHeight: number;
|
||||
viewportLeft: number;
|
||||
viewportTop: number;
|
||||
viewportWidth: number;
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-image-modal',
|
||||
templateUrl: './image-modal.component.html',
|
||||
styleUrl: './image-modal.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class ImageModalComponent {
|
||||
protected readonly data = inject<ImageModalData>(MODAL_DATA);
|
||||
private readonly modalRef = inject<ModalRef<void>>(ModalRef);
|
||||
private readonly destroyRef = inject(DestroyRef);
|
||||
private readonly viewport = viewChild.required<ElementRef<HTMLElement>>('viewport');
|
||||
private readonly image = viewChild<ElementRef<HTMLImageElement>>('image');
|
||||
private readonly pointers = new Map<number, Point>();
|
||||
|
||||
protected readonly zoom = signal(this.data.initialZoom);
|
||||
protected readonly offsetX = signal(0);
|
||||
protected readonly offsetY = signal(0);
|
||||
protected readonly imageFailed = signal(false);
|
||||
protected readonly swipeOffsetY = signal(0);
|
||||
protected readonly swipeSettling = signal(false);
|
||||
protected readonly gestureActive = signal(false);
|
||||
protected readonly transform = computed(
|
||||
() => `translate3d(${this.offsetX()}px, ${this.offsetY()}px, 0) scale(${this.zoom()})`,
|
||||
);
|
||||
protected readonly zoomLabel = computed(() => `${Math.round(this.zoom() * 100)}%`);
|
||||
protected readonly swipeTransform = computed(() => `translate3d(0, ${this.swipeOffsetY()}px, 0)`);
|
||||
|
||||
private dragStart: Point | null = null;
|
||||
private dragOffset: Point = { x: 0, y: 0 };
|
||||
private pinchDistance = 0;
|
||||
private pinchZoom = 1;
|
||||
private pinchLocal: Point = { x: 0, y: 0 };
|
||||
private pointerDownAt: Point | null = null;
|
||||
private gestureMoved = false;
|
||||
private hadMultiplePointers = false;
|
||||
private lastTapAt = 0;
|
||||
private swipeStart: Point | null = null;
|
||||
private geometry: ViewerGeometry | null = null;
|
||||
private animationFrameId: number | null = null;
|
||||
|
||||
constructor() {
|
||||
this.destroyRef.onDestroy(() => this.cancelGestureFrame());
|
||||
}
|
||||
|
||||
protected zoomIn(): void {
|
||||
this.setZoomAt(Math.min(this.data.maxZoom, this.zoom() + 0.5));
|
||||
}
|
||||
|
||||
protected zoomOut(): void {
|
||||
this.setZoomAt(Math.max(this.data.minZoom, this.zoom() - 0.5));
|
||||
}
|
||||
|
||||
protected reset(): void {
|
||||
this.zoom.set(this.data.initialZoom);
|
||||
this.offsetX.set(0);
|
||||
this.offsetY.set(0);
|
||||
}
|
||||
|
||||
protected onWheel(event: WheelEvent): void {
|
||||
event.preventDefault();
|
||||
const factor = event.deltaY < 0 ? 1.15 : 1 / 1.15;
|
||||
this.setZoomAt(this.zoom() * factor, event.clientX, event.clientY);
|
||||
}
|
||||
|
||||
protected onDoubleClick(event: MouseEvent): void {
|
||||
this.toggleZoom(event.clientX, event.clientY);
|
||||
}
|
||||
|
||||
protected onPointerDown(event: PointerEvent): void {
|
||||
if (event.pointerType === 'mouse' && event.button !== 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
event.preventDefault();
|
||||
if (this.pointers.size === 0) {
|
||||
this.refreshGeometry();
|
||||
this.gestureActive.set(true);
|
||||
}
|
||||
this.viewport().nativeElement.setPointerCapture?.(event.pointerId);
|
||||
const point = { x: event.clientX, y: event.clientY };
|
||||
this.pointers.set(event.pointerId, point);
|
||||
this.pointerDownAt = point;
|
||||
this.gestureMoved = false;
|
||||
|
||||
if (this.pointers.size === 1) {
|
||||
this.swipeSettling.set(false);
|
||||
this.dragStart = point;
|
||||
this.dragOffset = { x: this.offsetX(), y: this.offsetY() };
|
||||
this.swipeStart =
|
||||
event.pointerType === 'touch' && this.zoom() <= this.data.minZoom + 0.01 ? point : null;
|
||||
} else if (this.pointers.size === 2) {
|
||||
this.hadMultiplePointers = true;
|
||||
this.swipeStart = null;
|
||||
this.swipeOffsetY.set(0);
|
||||
this.beginPinch();
|
||||
}
|
||||
}
|
||||
|
||||
protected onPointerMove(event: PointerEvent): void {
|
||||
if (!this.pointers.has(event.pointerId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const point = { x: event.clientX, y: event.clientY };
|
||||
this.pointers.set(event.pointerId, point);
|
||||
|
||||
if (this.pointerDownAt && this.distance(this.pointerDownAt, point) > 4) {
|
||||
this.gestureMoved = true;
|
||||
}
|
||||
|
||||
this.scheduleGestureFrame();
|
||||
}
|
||||
|
||||
protected onPointerUp(event: PointerEvent): void {
|
||||
const wasTouch = event.pointerType === 'touch';
|
||||
const trackedPoint = this.pointers.get(event.pointerId);
|
||||
const endPoint = trackedPoint ? { x: event.clientX, y: event.clientY } : null;
|
||||
if (endPoint) {
|
||||
this.pointers.set(event.pointerId, endPoint);
|
||||
if (this.animationFrameId !== null) {
|
||||
this.flushGestureFrame();
|
||||
} else {
|
||||
this.applyPointerMovement();
|
||||
}
|
||||
}
|
||||
const shouldDismiss =
|
||||
event.type === 'pointerup' &&
|
||||
wasTouch &&
|
||||
endPoint !== null &&
|
||||
this.isSwipeDown(this.swipeStart, endPoint);
|
||||
this.pointers.delete(event.pointerId);
|
||||
const viewport = this.viewport().nativeElement;
|
||||
if (viewport.hasPointerCapture?.(event.pointerId)) {
|
||||
viewport.releasePointerCapture(event.pointerId);
|
||||
}
|
||||
|
||||
if (shouldDismiss) {
|
||||
this.resetGesture();
|
||||
this.modalRef.dismiss('swipe');
|
||||
return;
|
||||
}
|
||||
|
||||
if (wasTouch && endPoint && !this.gestureMoved && !this.hadMultiplePointers) {
|
||||
const now = Date.now();
|
||||
if (now - this.lastTapAt < 300) {
|
||||
this.toggleZoom(endPoint.x, endPoint.y);
|
||||
this.lastTapAt = 0;
|
||||
} else {
|
||||
this.lastTapAt = now;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.pointers.size === 1) {
|
||||
const remaining = [...this.pointers.values()][0];
|
||||
this.dragStart = remaining;
|
||||
this.dragOffset = { x: this.offsetX(), y: this.offsetY() };
|
||||
} else if (this.pointers.size === 0) {
|
||||
this.dragStart = null;
|
||||
this.pointerDownAt = null;
|
||||
this.hadMultiplePointers = false;
|
||||
this.swipeStart = null;
|
||||
this.gestureActive.set(false);
|
||||
if (this.swipeOffsetY() > 0) {
|
||||
this.swipeSettling.set(true);
|
||||
this.swipeOffsetY.set(0);
|
||||
}
|
||||
this.clampOffset();
|
||||
}
|
||||
}
|
||||
|
||||
protected onImageLoad(): void {
|
||||
this.imageFailed.set(false);
|
||||
this.refreshGeometry();
|
||||
this.clampOffset();
|
||||
}
|
||||
|
||||
private beginPinch(): void {
|
||||
const [first, second] = [...this.pointers.values()];
|
||||
const midpoint = this.midpoint(first, second);
|
||||
const geometry = this.geometry ?? this.refreshGeometry();
|
||||
if (!geometry) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.pinchDistance = Math.max(1, this.distance(first, second));
|
||||
this.pinchZoom = this.zoom();
|
||||
this.pinchLocal = {
|
||||
x:
|
||||
(midpoint.x - (geometry.viewportLeft + geometry.viewportWidth / 2) - this.offsetX()) /
|
||||
this.zoom(),
|
||||
y:
|
||||
(midpoint.y - (geometry.viewportTop + geometry.viewportHeight / 2) - this.offsetY()) /
|
||||
this.zoom(),
|
||||
};
|
||||
}
|
||||
|
||||
private toggleZoom(clientX?: number, clientY?: number): void {
|
||||
const target =
|
||||
this.zoom() > this.data.minZoom + 0.01
|
||||
? this.data.minZoom
|
||||
: Math.min(this.data.maxZoom, Math.max(2, this.data.minZoom));
|
||||
this.setZoomAt(target, clientX, clientY);
|
||||
}
|
||||
|
||||
private setZoomAt(value: number, clientX?: number, clientY?: number): void {
|
||||
const nextZoom = this.clampZoom(value);
|
||||
const currentZoom = this.zoom();
|
||||
const geometry = this.refreshGeometry();
|
||||
|
||||
if (clientX !== undefined && clientY !== undefined && currentZoom > 0 && geometry) {
|
||||
const pointX = clientX - (geometry.viewportLeft + geometry.viewportWidth / 2);
|
||||
const pointY = clientY - (geometry.viewportTop + geometry.viewportHeight / 2);
|
||||
const localX = (pointX - this.offsetX()) / currentZoom;
|
||||
const localY = (pointY - this.offsetY()) / currentZoom;
|
||||
this.offsetX.set(pointX - localX * nextZoom);
|
||||
this.offsetY.set(pointY - localY * nextZoom);
|
||||
}
|
||||
|
||||
this.zoom.set(nextZoom);
|
||||
if (nextZoom <= this.data.minZoom) {
|
||||
this.offsetX.set(0);
|
||||
this.offsetY.set(0);
|
||||
}
|
||||
this.clampOffset();
|
||||
}
|
||||
|
||||
private clampZoom(value: number): number {
|
||||
return Math.min(this.data.maxZoom, Math.max(this.data.minZoom, value));
|
||||
}
|
||||
|
||||
private clampOffset(): void {
|
||||
const geometry = this.geometry;
|
||||
if (!geometry) {
|
||||
return;
|
||||
}
|
||||
|
||||
const maxX = Math.max(0, (geometry.imageWidth * this.zoom() - geometry.viewportWidth) / 2);
|
||||
const maxY = Math.max(0, (geometry.imageHeight * this.zoom() - geometry.viewportHeight) / 2);
|
||||
|
||||
this.offsetX.set(Math.min(maxX, Math.max(-maxX, this.offsetX())));
|
||||
this.offsetY.set(Math.min(maxY, Math.max(-maxY, this.offsetY())));
|
||||
}
|
||||
|
||||
private midpoint(first: Point, second: Point): Point {
|
||||
return { x: (first.x + second.x) / 2, y: (first.y + second.y) / 2 };
|
||||
}
|
||||
|
||||
private distance(first: Point, second: Point): number {
|
||||
return Math.hypot(second.x - first.x, second.y - first.y);
|
||||
}
|
||||
|
||||
private isSwipeDown(start: Point | null, end: Point): boolean {
|
||||
if (!start || this.hadMultiplePointers || this.zoom() > this.data.minZoom + 0.01) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const deltaX = Math.abs(end.x - start.x);
|
||||
const deltaY = end.y - start.y;
|
||||
return deltaY >= SWIPE_DISMISS_DISTANCE && deltaY >= deltaX * SWIPE_DIRECTION_RATIO;
|
||||
}
|
||||
|
||||
private resetGesture(): void {
|
||||
this.cancelGestureFrame();
|
||||
this.pointers.clear();
|
||||
this.dragStart = null;
|
||||
this.pointerDownAt = null;
|
||||
this.swipeStart = null;
|
||||
this.hadMultiplePointers = false;
|
||||
this.gestureActive.set(false);
|
||||
}
|
||||
|
||||
private scheduleGestureFrame(): void {
|
||||
if (this.animationFrameId !== null) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.animationFrameId = requestAnimationFrame(() => {
|
||||
this.animationFrameId = null;
|
||||
this.applyPointerMovement();
|
||||
});
|
||||
}
|
||||
|
||||
private flushGestureFrame(): void {
|
||||
if (this.animationFrameId === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
cancelAnimationFrame(this.animationFrameId);
|
||||
this.animationFrameId = null;
|
||||
this.applyPointerMovement();
|
||||
}
|
||||
|
||||
private cancelGestureFrame(): void {
|
||||
if (this.animationFrameId !== null) {
|
||||
cancelAnimationFrame(this.animationFrameId);
|
||||
this.animationFrameId = null;
|
||||
}
|
||||
}
|
||||
|
||||
private applyPointerMovement(): void {
|
||||
if (this.pointers.size === 2) {
|
||||
const [first, second] = [...this.pointers.values()];
|
||||
const geometry = this.geometry;
|
||||
if (!geometry) {
|
||||
return;
|
||||
}
|
||||
|
||||
const distance = this.distance(first, second);
|
||||
const midpoint = this.midpoint(first, second);
|
||||
const nextZoom = this.clampZoom(this.pinchZoom * (distance / this.pinchDistance));
|
||||
|
||||
this.zoom.set(nextZoom);
|
||||
this.offsetX.set(
|
||||
midpoint.x -
|
||||
(geometry.viewportLeft + geometry.viewportWidth / 2) -
|
||||
this.pinchLocal.x * nextZoom,
|
||||
);
|
||||
this.offsetY.set(
|
||||
midpoint.y -
|
||||
(geometry.viewportTop + geometry.viewportHeight / 2) -
|
||||
this.pinchLocal.y * nextZoom,
|
||||
);
|
||||
this.clampOffset();
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.pointers.size !== 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
const point = [...this.pointers.values()][0];
|
||||
if (this.swipeStart) {
|
||||
const deltaX = Math.abs(point.x - this.swipeStart.x);
|
||||
const deltaY = point.y - this.swipeStart.y;
|
||||
this.swipeOffsetY.set(deltaY > 0 && deltaY >= deltaX ? deltaY : 0);
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.dragStart && this.zoom() > this.data.minZoom) {
|
||||
this.offsetX.set(this.dragOffset.x + point.x - this.dragStart.x);
|
||||
this.offsetY.set(this.dragOffset.y + point.y - this.dragStart.y);
|
||||
this.clampOffset();
|
||||
}
|
||||
}
|
||||
|
||||
private refreshGeometry(): ViewerGeometry | null {
|
||||
const viewport = this.viewport().nativeElement;
|
||||
const image = this.image()?.nativeElement;
|
||||
if (!image) {
|
||||
this.geometry = null;
|
||||
return null;
|
||||
}
|
||||
|
||||
const rect = viewport.getBoundingClientRect();
|
||||
this.geometry = {
|
||||
imageHeight: image.offsetHeight,
|
||||
imageWidth: image.offsetWidth,
|
||||
viewportHeight: viewport.clientHeight,
|
||||
viewportLeft: rect.left,
|
||||
viewportTop: rect.top,
|
||||
viewportWidth: viewport.clientWidth,
|
||||
};
|
||||
return this.geometry;
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
<app-modal-shell
|
||||
[title]="modal.config.title"
|
||||
[size]="modal.config.size"
|
||||
[presentation]="modal.config.presentation ?? 'dialog'"
|
||||
[showCloseButton]="modal.config.showCloseButton"
|
||||
(backdropClick)="onBackdropClick()"
|
||||
(closeRequested)="onCloseRequested()"
|
||||
|
||||
@@ -51,6 +51,10 @@ describe('ModalHostComponent', () => {
|
||||
afterEach(() => {
|
||||
doc.body.style.overflow = '';
|
||||
doc.body.style.paddingRight = '';
|
||||
doc.body.style.position = '';
|
||||
doc.body.style.top = '';
|
||||
doc.body.style.left = '';
|
||||
doc.body.style.width = '';
|
||||
TestBed.resetTestingModule();
|
||||
});
|
||||
|
||||
@@ -99,6 +103,10 @@ describe('ModalHostComponent', () => {
|
||||
expect(service.activeModal()).toBeNull();
|
||||
expect(doc.body.style.overflow).toBe('');
|
||||
expect(doc.body.style.paddingRight).toBe('');
|
||||
expect(doc.body.style.position).toBe('');
|
||||
expect(doc.body.style.top).toBe('');
|
||||
expect(doc.body.style.left).toBe('');
|
||||
expect(doc.body.style.width).toBe('');
|
||||
});
|
||||
|
||||
it('closes on backdrop click when enabled', () => {
|
||||
|
||||
@@ -55,11 +55,23 @@ export class ModalHostComponent {
|
||||
const body = this.document.body;
|
||||
const previousOverflow = body.style.overflow;
|
||||
const previousPaddingRight = body.style.paddingRight;
|
||||
const previousPosition = body.style.position;
|
||||
const previousTop = body.style.top;
|
||||
const previousLeft = body.style.left;
|
||||
const previousWidth = body.style.width;
|
||||
const view = this.document.defaultView;
|
||||
const scrollX = view?.scrollX ?? 0;
|
||||
const scrollY = view?.scrollY ?? 0;
|
||||
const scrollbarWidth = view
|
||||
? Math.max(0, view.innerWidth - this.document.documentElement.clientWidth)
|
||||
: 0;
|
||||
|
||||
const activeElement = this.document.activeElement;
|
||||
|
||||
if (activeElement instanceof HTMLElement && activeElement !== body) {
|
||||
activeElement.blur();
|
||||
}
|
||||
|
||||
if (scrollbarWidth > 0 && view) {
|
||||
const currentPaddingRight =
|
||||
Number.parseFloat(view.getComputedStyle(body).paddingRight) || 0;
|
||||
@@ -68,6 +80,47 @@ export class ModalHostComponent {
|
||||
|
||||
body.style.overflow = 'hidden';
|
||||
|
||||
const isIos = view
|
||||
? /iPad|iPhone|iPod/.test(view.navigator.userAgent) ||
|
||||
(view.navigator.platform === 'MacIntel' && view.navigator.maxTouchPoints > 1)
|
||||
: false;
|
||||
|
||||
if (isIos) {
|
||||
body.style.position = 'fixed';
|
||||
body.style.top = `${-scrollY}px`;
|
||||
body.style.left = `${-scrollX}px`;
|
||||
body.style.width = '100%';
|
||||
}
|
||||
|
||||
let viewportFrame: number | undefined;
|
||||
const viewportSyncTimers: number[] = [];
|
||||
const syncVisualViewport = () => {
|
||||
if (!view) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (viewportFrame !== undefined) {
|
||||
view.cancelAnimationFrame(viewportFrame);
|
||||
}
|
||||
|
||||
viewportFrame = view.requestAnimationFrame(() => {
|
||||
viewportFrame = undefined;
|
||||
this.modalShell()?.setVisualViewport(view.visualViewport, view.scrollX, view.scrollY);
|
||||
});
|
||||
};
|
||||
|
||||
view?.visualViewport?.addEventListener('resize', syncVisualViewport);
|
||||
view?.visualViewport?.addEventListener('scroll', syncVisualViewport);
|
||||
view?.addEventListener('orientationchange', syncVisualViewport);
|
||||
syncVisualViewport();
|
||||
|
||||
if (view) {
|
||||
viewportSyncTimers.push(
|
||||
view.setTimeout(syncVisualViewport, 100),
|
||||
view.setTimeout(syncVisualViewport, 300),
|
||||
);
|
||||
}
|
||||
|
||||
const onKeyDown = (event: KeyboardEvent) => {
|
||||
if (event.key !== 'Escape' || !this.activeModal()?.config.closeOnEscape) {
|
||||
return;
|
||||
@@ -82,8 +135,26 @@ export class ModalHostComponent {
|
||||
|
||||
onCleanup(() => {
|
||||
this.document.removeEventListener('keydown', onKeyDown);
|
||||
view?.visualViewport?.removeEventListener('resize', syncVisualViewport);
|
||||
view?.visualViewport?.removeEventListener('scroll', syncVisualViewport);
|
||||
view?.removeEventListener('orientationchange', syncVisualViewport);
|
||||
|
||||
if (viewportFrame !== undefined) {
|
||||
view?.cancelAnimationFrame(viewportFrame);
|
||||
}
|
||||
|
||||
viewportSyncTimers.forEach((timer) => view?.clearTimeout(timer));
|
||||
|
||||
body.style.overflow = previousOverflow;
|
||||
body.style.paddingRight = previousPaddingRight;
|
||||
body.style.position = previousPosition;
|
||||
body.style.top = previousTop;
|
||||
body.style.left = previousLeft;
|
||||
body.style.width = previousWidth;
|
||||
|
||||
if (isIos) {
|
||||
view?.scrollTo(scrollX, scrollY);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
<div class="modal-shell" (click)="backdropClick.emit()">
|
||||
<div
|
||||
#shell
|
||||
class="modal-shell"
|
||||
[class.modal-shell--fullscreen-media]="presentation() === 'fullscreen-media'"
|
||||
(click)="backdropClick.emit()"
|
||||
>
|
||||
<div
|
||||
class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-shell__dialog"
|
||||
[ngClass]="dialogClass()"
|
||||
|
||||
@@ -4,7 +4,10 @@
|
||||
|
||||
.modal-shell {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
top: var(--modal-viewport-top, 0);
|
||||
left: var(--modal-viewport-left, 0);
|
||||
width: var(--modal-viewport-width, 100vw);
|
||||
height: var(--modal-viewport-height, 100dvh);
|
||||
z-index: 2000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -109,6 +112,64 @@
|
||||
color: #303030;
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media {
|
||||
padding: 1.5rem;
|
||||
background: rgba(0, 0, 0, 0.92);
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__dialog {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
height: calc(100dvh - 3rem);
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__content {
|
||||
min-height: 0;
|
||||
height: 100%;
|
||||
max-height: none;
|
||||
overflow: hidden;
|
||||
border-radius: 0.4rem;
|
||||
background: #111111;
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__header {
|
||||
position: absolute;
|
||||
inset: 0 0 auto;
|
||||
z-index: 2;
|
||||
justify-content: flex-start;
|
||||
height: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__title {
|
||||
position: absolute;
|
||||
top: max(1.25rem, env(safe-area-inset-top));
|
||||
left: max(1.25rem, env(safe-area-inset-left));
|
||||
width: auto;
|
||||
max-width: calc(100% - 8rem);
|
||||
overflow: hidden;
|
||||
color: #ffffff;
|
||||
font-size: 1rem;
|
||||
line-height: 1.4;
|
||||
text-align: left;
|
||||
text-overflow: ellipsis;
|
||||
text-shadow: 0 1px 3px #000000;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__header .btn-close {
|
||||
top: max(1rem, env(safe-area-inset-top));
|
||||
right: max(1rem, env(safe-area-inset-right));
|
||||
filter: invert(1) grayscale(1) brightness(2) drop-shadow(0 1px 2px #000000);
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__body {
|
||||
min-height: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
@media (max-width: 576px) {
|
||||
.modal-shell {
|
||||
padding: 0.75rem;
|
||||
@@ -128,4 +189,18 @@
|
||||
max-height: min(100dvh - 1.5rem, 48rem);
|
||||
border-radius: 1.25rem 1.25rem 0.75rem 0.75rem;
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media {
|
||||
align-items: center;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__dialog {
|
||||
height: 100dvh;
|
||||
}
|
||||
|
||||
.modal-shell--fullscreen-media .modal-shell__content {
|
||||
max-height: none;
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
viewChild,
|
||||
} from '@angular/core';
|
||||
|
||||
import { ModalSize } from '../../../core/services/modal.service';
|
||||
import { ModalPresentation, ModalSize } from '../../../core/services/modal.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-modal-shell',
|
||||
@@ -19,10 +19,12 @@ import { ModalSize } from '../../../core/services/modal.service';
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class ModalShellComponent {
|
||||
private readonly shell = viewChild.required<ElementRef<HTMLElement>>('shell');
|
||||
private readonly panel = viewChild.required<ElementRef<HTMLElement>>('panel');
|
||||
|
||||
readonly title = input<string | undefined>();
|
||||
readonly size = input<ModalSize>('md');
|
||||
readonly presentation = input<ModalPresentation>('dialog');
|
||||
readonly showCloseButton = input(true);
|
||||
|
||||
readonly backdropClick = output<void>();
|
||||
@@ -46,6 +48,28 @@ export class ModalShellComponent {
|
||||
return this.title() ? this.titleId : null;
|
||||
}
|
||||
|
||||
setVisualViewport(viewport: VisualViewport | null, layoutScrollX = 0, layoutScrollY = 0): void {
|
||||
const shell = this.shell().nativeElement;
|
||||
|
||||
if (!viewport) {
|
||||
shell.style.removeProperty('--modal-viewport-top');
|
||||
shell.style.removeProperty('--modal-viewport-left');
|
||||
shell.style.removeProperty('--modal-viewport-width');
|
||||
shell.style.removeProperty('--modal-viewport-height');
|
||||
return;
|
||||
}
|
||||
|
||||
// pageTop/pageLeft are a useful fallback for WebKit versions that update
|
||||
// offsetTop/offsetLeft one frame late after dismissing a native control.
|
||||
const top = Math.max(viewport.offsetTop, viewport.pageTop - layoutScrollY);
|
||||
const left = Math.max(viewport.offsetLeft, viewport.pageLeft - layoutScrollX);
|
||||
|
||||
shell.style.setProperty('--modal-viewport-top', `${top}px`);
|
||||
shell.style.setProperty('--modal-viewport-left', `${left}px`);
|
||||
shell.style.setProperty('--modal-viewport-width', `${viewport.width}px`);
|
||||
shell.style.setProperty('--modal-viewport-height', `${viewport.height}px`);
|
||||
}
|
||||
|
||||
focusInitialElement(): void {
|
||||
const panel = this.panel().nativeElement;
|
||||
const focusTarget = panel.querySelector<HTMLElement>(
|
||||
|
||||
@@ -107,6 +107,17 @@
|
||||
</div>
|
||||
|
||||
@if (imageUrl(); as image) {
|
||||
<img class="ticket-selector__map" [src]="image" [alt]="'Plano de ubicaciones de ' + title()" />
|
||||
<button
|
||||
type="button"
|
||||
class="ticket-selector__map-button"
|
||||
aria-label="Ampliar plano de ubicaciones"
|
||||
(click)="openImage(image)"
|
||||
>
|
||||
<img
|
||||
class="ticket-selector__map"
|
||||
[src]="image"
|
||||
[alt]="'Plano de ubicaciones de ' + title()"
|
||||
/>
|
||||
</button>
|
||||
}
|
||||
</article>
|
||||
|
||||
@@ -153,11 +153,27 @@
|
||||
margin-top: 0.75rem;
|
||||
}
|
||||
|
||||
&__map {
|
||||
&__map-button {
|
||||
display: block;
|
||||
width: min(100%, 720px);
|
||||
max-height: 680px;
|
||||
margin: 3rem auto 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
border: 0;
|
||||
border-radius: 0.4rem;
|
||||
background: transparent;
|
||||
cursor: zoom-in;
|
||||
|
||||
&:focus-visible {
|
||||
outline: 3px solid var(--tenant-primary);
|
||||
outline-offset: 0.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
&__map {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-height: 680px;
|
||||
object-fit: contain;
|
||||
}
|
||||
}
|
||||
@@ -188,7 +204,7 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
&__map {
|
||||
&__map-button {
|
||||
margin-top: 2rem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,6 +104,10 @@ describe('ProductTicketSelectorComponent', () => {
|
||||
};
|
||||
catalogService.withoutLoading.mockReturnValue(catalogService);
|
||||
cartService.withoutLoading.mockReturnValue(cartService);
|
||||
const modalService = {
|
||||
openConfirmDelete: vi.fn().mockReturnValue(of(true)),
|
||||
openImage: vi.fn(),
|
||||
};
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ProductTicketSelectorComponent],
|
||||
@@ -112,7 +116,7 @@ describe('ProductTicketSelectorComponent', () => {
|
||||
{ provide: CartService, useValue: cartService },
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: { openConfirmDelete: vi.fn().mockReturnValue(of(true)) },
|
||||
useValue: modalService,
|
||||
},
|
||||
{ provide: ToastService, useValue: { danger: toastDanger } },
|
||||
],
|
||||
@@ -125,7 +129,7 @@ describe('ProductTicketSelectorComponent', () => {
|
||||
await fixture.whenStable();
|
||||
fixture.detectChanges();
|
||||
|
||||
return { fixture, getVariantOptions, cartService, toastDanger };
|
||||
return { fixture, getVariantOptions, cartService, toastDanger, modalService };
|
||||
}
|
||||
|
||||
it('loads one map, recalculates the cascade locally and reserves only after the last select', async () => {
|
||||
@@ -226,6 +230,25 @@ describe('ProductTicketSelectorComponent', () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it('opens the zoomable image modal when the seating map is clicked', async () => {
|
||||
const { fixture, modalService } = await createComponent({
|
||||
maps: [mapResponse([variant(401, 'general', 'A', '1', '1')])],
|
||||
});
|
||||
fixture.componentRef.setInput('imageUrl', '/images/plano.png');
|
||||
fixture.detectChanges();
|
||||
|
||||
const button = fixture.nativeElement.querySelector(
|
||||
'button[aria-label="Ampliar plano de ubicaciones"]',
|
||||
) as HTMLButtonElement;
|
||||
button.click();
|
||||
|
||||
expect(modalService.openImage).toHaveBeenCalledWith({
|
||||
title: 'Entrada',
|
||||
src: '/images/plano.png',
|
||||
alt: 'Plano de ubicaciones de Entrada',
|
||||
});
|
||||
});
|
||||
|
||||
it('clears only the seat after a stock conflict when the row still has alternatives', async () => {
|
||||
const failed = variant(401, 'general', 'A', '1', '1');
|
||||
const alternative = variant(402, 'general', 'A', '1', '2');
|
||||
|
||||
@@ -154,6 +154,14 @@ export class ProductTicketSelectorComponent {
|
||||
if (this.hasSelection() && variantIds.length > 0) this.buy.emit(variantIds);
|
||||
}
|
||||
|
||||
protected openImage(src: string): void {
|
||||
this.modalService.openImage({
|
||||
title: this.title(),
|
||||
src,
|
||||
alt: `Plano de ubicaciones de ${this.title()}`,
|
||||
});
|
||||
}
|
||||
|
||||
protected addRow(): void {
|
||||
if (!this.canAddRow()) return;
|
||||
const row = this.createRow(this.nextRowId++);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
<!doctype html>
|
||||
<html lang="es">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>ShopitFront</title>
|
||||
<base href="/">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E">
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
</body>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>ShopitFront</title>
|
||||
<base href="/" />
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
|
||||
/>
|
||||
<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E" />
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -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