Compare commits

..

14 Commits

31 changed files with 922 additions and 30 deletions

View File

@@ -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 {

View File

@@ -74,6 +74,29 @@ export interface PurchaseStatusResponse {
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 {

View File

@@ -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({

View File

@@ -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 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;

View File

@@ -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 }}

View File

@@ -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',
);

View File

@@ -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}`;

View File

@@ -34,6 +34,7 @@
[qrPaymentAmount]="cartTotal()"
[whatsappUrl]="whatsappUrl()"
[transferValidationStatus]="transferValidationStatus()"
[transferVerificationErrorTitle]="transferVerificationErrorTitle()"
(paymentMethodChange)="selectPaymentMethod($event)"
(copyTransferValue)="copyTransferValue($event.field, $event.value)"
(cancelStep)="onCancel()"

View File

@@ -225,7 +225,7 @@ describe('CheckoutPageComponent payment validation', () => {
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
});
it('polls a transfer every three seconds up to four attempts', async () => {
it('polls a transfer every three seconds for one minute', async () => {
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'pending_payment' });
const { component } = createComponent();
component.selectedPaymentMethod.set('transfer');
@@ -235,14 +235,12 @@ describe('CheckoutPageComponent payment validation', () => {
expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
for (let attempt = 1; attempt <= 3; attempt += 1) {
await vi.advanceTimersByTimeAsync(3_000);
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(attempt);
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();
@@ -286,13 +284,43 @@ describe('CheckoutPageComponent payment validation', () => {
component.selectedPaymentMethod.set('transfer');
await component.onComplete();
await vi.advanceTimersByTimeAsync(12_000);
await vi.advanceTimersByTimeAsync(60_000);
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(4);
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(20);
expect(component.transferValidationStatus()).toBe('error');
expect(routerStub.navigate).not.toHaveBeenCalled();
});
it('uses the primary candidate reason when transfer polling times out', async () => {
checkoutServiceStub.getPurchase.mockResolvedValue({
status: 'in_review',
payment_verification: {
status: 'candidate',
candidate_count: 1,
primary: {
reason: 'exact_amount_near_dni',
dni_distance: 1,
payment_amount: '300000.00',
purchase_amount: '300000.00',
amount_difference: '0.00',
confidence: 'medium',
detected_at: '2026-08-27T18:00:00-03:00',
},
reasons: ['exact_amount_near_dni'],
},
});
const { component } = createComponent();
component.selectedPaymentMethod.set('transfer');
await component.onComplete();
await vi.advanceTimersByTimeAsync(60_000);
expect(component.transferValidationStatus()).toBe('error');
expect(component.transferVerificationErrorTitle()).toBe(
'El DNI no corresponde con el de la transferencia',
);
});
it('does not poll when submitting a transfer for review fails', async () => {
vi.spyOn(console, 'error').mockImplementation(() => undefined);
checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error'));

View File

@@ -16,8 +16,10 @@ import { firstValueFrom, startWith } from 'rxjs';
import { TenantService } from '../../../../core/services/tenant.service';
import {
CheckoutService,
PurchasePaymentCandidateReason,
PurchaseDetailItemResponse,
PurchaseDetailResponse,
PurchaseStatusResponse,
} from '../../../../core/services/checkout.service';
import { AuthService } from '../../../../core/services/auth/auth.service';
import { GlobalLoadingService } from '../../../../core/services/global-loading/global-loading.service';
@@ -73,7 +75,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;
@@ -102,8 +104,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
if (
!purchase ||
(typeof purchase.expires_at !== 'string' &&
typeof purchase.expires_in_seconds !== 'number')
(typeof purchase.expires_at !== 'string' && typeof purchase.expires_in_seconds !== 'number')
) {
return null;
}
@@ -159,6 +160,14 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
protected readonly qrPaymentStatus = signal<QrPaymentStatus>('idle');
protected readonly isCheckingQrPayment = signal(false);
protected readonly transferValidationStatus = signal<TransferValidationStatus>('idle');
private readonly transferPrimaryCandidateReason = signal<PurchasePaymentCandidateReason | null>(
null,
);
protected readonly transferVerificationErrorTitle = computed(() =>
this.transferPrimaryCandidateReason() === 'exact_amount_near_dni'
? 'El DNI no corresponde con el de la transferencia'
: null,
);
protected readonly whatsappUrl = computed(
() =>
this.tenantService
@@ -410,6 +419,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
this.transferDni.set(dni);
this.stopTransferPolling();
this.transferValidationStatus.set('idle');
this.transferPrimaryCandidateReason.set(null);
this.isGeneratingIntent.set(true);
try {
const response = await this.checkoutService
@@ -466,6 +476,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
this.stopTransferPolling();
this.hasSubmittedTransfer.set(true);
this.transferValidationStatus.set('checking');
this.transferPrimaryCandidateReason.set(null);
this.transferPollingAttempts = 0;
const runId = this.transferPollingRunId;
@@ -480,6 +491,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
}
this.checkoutCountdownService.synchronize(purchase);
this.captureTransferCandidateReason(purchase);
if (purchase.status === 'paid') {
this.navigateToPurchaseStatus(purchaseId);
@@ -531,6 +543,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
}
this.checkoutCountdownService.synchronize(purchase);
this.captureTransferCandidateReason(purchase);
if (purchase.status === 'paid') {
this.navigateToPurchaseStatus(purchaseId);
@@ -562,6 +575,14 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
this.scheduleTransferPoll(runId);
}
private captureTransferCandidateReason(purchase: PurchaseStatusResponse): void {
const reason = purchase.payment_verification?.primary?.reason;
if (reason) {
this.transferPrimaryCandidateReason.set(reason);
}
}
private stopTransferPolling(): void {
this.transferPollingRunId += 1;

View File

@@ -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()"

View File

@@ -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 }>();

View File

@@ -3,6 +3,7 @@
<app-payment-verification-error
[paymentAmount]="paymentAmount()"
[whatsappUrl]="whatsappUrl()"
[title]="verificationErrorTitle()"
/>
} @else {
<div class="dni-form-container">

View File

@@ -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');
});
});

View File

@@ -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>();

View File

@@ -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

View File

@@ -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();

View File

@@ -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&iacute;o.</p>
<p class="status-content__message">
Comunicate con nosotros para coordinar el env&iacute;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&oacute;n del pago.</p>
<p class="status-content__subtitle">
Tu compra ya fue registrada y estamos esperando la confirmaci&oacute;n del pago.
</p>
</div>
<hr class="status-content__divider" />
<div class="status-content__section status-content__section--secondary">
@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&Oacute;</h2>
<p class="status-content__subtitle">El plazo de pago termin&oacute; y liberamos el stock reservado.</p>
<p class="status-content__subtitle">
El plazo de pago termin&oacute; 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&eacute;s volver a la tienda e iniciar una nueva compra.</p>
<p class="status-content__message">
Pod&eacute;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&aacute; el medio de pago o comunicate con nosotros para continuar.</p>
<p class="status-content__subtitle">
Revis&aacute; 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&eacute; a ingresar m&aacute;s tarde. Si el problema sigue, comunicate con nosotros.</p>
<p class="status-content__message">
Volv&eacute; a ingresar m&aacute;s tarde. Si el problema sigue, comunicate con nosotros.
</p>
@if (whatsappUrl()) {
<div class="status-content__actions">

View File

@@ -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();

View File

@@ -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;

View File

@@ -0,0 +1,52 @@
<div class="image-modal">
<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()"
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()"
>
&minus;
</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()"
>
&plus;
</button>
</div>
</div>

View File

@@ -0,0 +1,124 @@
: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: #111111;
}
.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;
will-change: transform;
-webkit-user-drag: none;
}
.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));
}
}
@media (prefers-reduced-motion: reduce) {
.image-modal__image {
transition: none;
}
}

View File

@@ -0,0 +1,106 @@
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 } from 'vitest';
import { ImageModalData, MODAL_DATA } from '../../../core/services/modal.service';
import { ImageModalComponent } from './image-modal.component';
describe('ImageModalComponent', () => {
let fixture: ComponentFixture<ImageModalComponent>;
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 () => {
await TestBed.configureTestingModule({
imports: [ImageModalComponent],
providers: [{ provide: MODAL_DATA, useValue: data }],
}).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', () => {
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));
fixture.detectChanges();
expect(zoom.textContent).toContain('150%');
});
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;
}

View File

@@ -0,0 +1,231 @@
import {
ChangeDetectionStrategy,
Component,
ElementRef,
computed,
inject,
signal,
viewChild,
} from '@angular/core';
import { ImageModalData, MODAL_DATA } from '../../../core/services/modal.service';
interface Point {
x: number;
y: 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 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 transform = computed(
() => `translate3d(${this.offsetX()}px, ${this.offsetY()}px, 0) scale(${this.zoom()})`,
);
protected readonly zoomLabel = computed(() => `${Math.round(this.zoom() * 100)}%`);
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;
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();
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.dragStart = point;
this.dragOffset = { x: this.offsetX(), y: this.offsetY() };
} else if (this.pointers.size === 2) {
this.hadMultiplePointers = true;
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;
}
if (this.pointers.size === 2) {
const [first, second] = [...this.pointers.values()];
const distance = this.distance(first, second);
const midpoint = this.midpoint(first, second);
const nextZoom = this.clampZoom(this.pinchZoom * (distance / this.pinchDistance));
const rect = this.viewport().nativeElement.getBoundingClientRect();
this.zoom.set(nextZoom);
this.offsetX.set(midpoint.x - (rect.left + rect.width / 2) - this.pinchLocal.x * nextZoom);
this.offsetY.set(midpoint.y - (rect.top + rect.height / 2) - this.pinchLocal.y * nextZoom);
this.clampOffset();
return;
}
if (this.pointers.size === 1 && 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();
}
}
protected onPointerUp(event: PointerEvent): void {
const wasTouch = event.pointerType === 'touch';
const tapPoint = this.pointers.get(event.pointerId);
this.pointers.delete(event.pointerId);
const viewport = this.viewport().nativeElement;
if (viewport.hasPointerCapture?.(event.pointerId)) {
viewport.releasePointerCapture(event.pointerId);
}
if (wasTouch && tapPoint && !this.gestureMoved && !this.hadMultiplePointers) {
const now = Date.now();
if (now - this.lastTapAt < 300) {
this.toggleZoom(tapPoint.x, tapPoint.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.clampOffset();
}
}
protected onImageLoad(): void {
this.imageFailed.set(false);
this.clampOffset();
}
private beginPinch(): void {
const [first, second] = [...this.pointers.values()];
const midpoint = this.midpoint(first, second);
const rect = this.viewport().nativeElement.getBoundingClientRect();
this.pinchDistance = Math.max(1, this.distance(first, second));
this.pinchZoom = this.zoom();
this.pinchLocal = {
x: (midpoint.x - (rect.left + rect.width / 2) - this.offsetX()) / this.zoom(),
y: (midpoint.y - (rect.top + rect.height / 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();
if (clientX !== undefined && clientY !== undefined && currentZoom > 0) {
const rect = this.viewport().nativeElement.getBoundingClientRect();
const pointX = clientX - (rect.left + rect.width / 2);
const pointY = clientY - (rect.top + rect.height / 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 viewport = this.viewport().nativeElement;
const image = this.image()?.nativeElement;
if (!image) {
return;
}
const maxX = Math.max(0, (image.offsetWidth * this.zoom() - viewport.clientWidth) / 2);
const maxY = Math.max(0, (image.offsetHeight * this.zoom() - viewport.clientHeight) / 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);
}
}

View File

@@ -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()"

View File

@@ -1,4 +1,8 @@
<div class="modal-shell" (click)="backdropClick.emit()">
<div
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()"

View File

@@ -109,6 +109,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 +186,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;
}
}

View File

@@ -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',
@@ -23,6 +23,7 @@ export class ModalShellComponent {
readonly title = input<string | undefined>();
readonly size = input<ModalSize>('md');
readonly presentation = input<ModalPresentation>('dialog');
readonly showCloseButton = input(true);
readonly backdropClick = output<void>();

View File

@@ -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;

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>ShopitFront</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E">
</head>
<body>

View File

@@ -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;