Compare commits
7 Commits
3ab73a395a
...
refactor/p
| Author | SHA1 | Date | |
|---|---|---|---|
| 109a1cab5a | |||
| 9bb3374ba0 | |||
| 76327d34ec | |||
| 4cb81ed70d | |||
| c233845ce0 | |||
| 15a74bb56e | |||
| 58e9dc06b1 |
@@ -68,6 +68,8 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
|
|||||||
email: string | null;
|
email: string | null;
|
||||||
items_source: 'purchase';
|
items_source: 'purchase';
|
||||||
items: PurchaseDetailItemResponse[];
|
items: PurchaseDetailItemResponse[];
|
||||||
|
tickets_count?: number;
|
||||||
|
has_generated_tickets?: boolean;
|
||||||
subtotal: string;
|
subtotal: string;
|
||||||
total: string;
|
total: string;
|
||||||
}
|
}
|
||||||
@@ -199,6 +201,25 @@ export class CheckoutService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async submitPurchaseForReview(
|
||||||
|
tenantCode: string,
|
||||||
|
purchaseId: number,
|
||||||
|
): Promise<PurchaseStatusResponse> {
|
||||||
|
const response = await firstValueFrom(
|
||||||
|
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
|
||||||
|
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/review`,
|
||||||
|
{},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
|
||||||
|
if (!purchase) {
|
||||||
|
throw new Error('Error al enviar la compra a revisi\u00f3n.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return { status: purchase.status ?? null };
|
||||||
|
}
|
||||||
|
|
||||||
async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
|
async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
|
||||||
const response = await firstValueFrom(
|
const response = await firstValueFrom(
|
||||||
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
|
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
|
||||||
|
|||||||
@@ -3,15 +3,14 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 16px 28px;
|
padding: 16px 28px;
|
||||||
background-color: #d9d9d9;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.category-items__title {
|
.category-items__title {
|
||||||
color: #313131;
|
font-size: 24px;
|
||||||
font-size: 30px;
|
font-weight: bold;
|
||||||
font-weight: 400;
|
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
color:var(--bs-primary)
|
||||||
}
|
}
|
||||||
|
|
||||||
.category-items__alert-error {
|
.category-items__alert-error {
|
||||||
|
|||||||
@@ -31,6 +31,8 @@
|
|||||||
[qrData]="qrData()"
|
[qrData]="qrData()"
|
||||||
[qrPaymentStatus]="qrPaymentStatus()"
|
[qrPaymentStatus]="qrPaymentStatus()"
|
||||||
[isCheckingQrPayment]="isCheckingQrPayment()"
|
[isCheckingQrPayment]="isCheckingQrPayment()"
|
||||||
|
[qrPaymentAmount]="cartTotal()"
|
||||||
|
[whatsappUrl]="whatsappUrl()"
|
||||||
[transferValidationStatus]="transferValidationStatus()"
|
[transferValidationStatus]="transferValidationStatus()"
|
||||||
(paymentMethodChange)="selectPaymentMethod($event)"
|
(paymentMethodChange)="selectPaymentMethod($event)"
|
||||||
(copyTransferValue)="copyTransferValue($event.field, $event.value)"
|
(copyTransferValue)="copyTransferValue($event.field, $event.value)"
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
|||||||
cancelPurchase: ReturnType<typeof vi.fn>;
|
cancelPurchase: ReturnType<typeof vi.fn>;
|
||||||
generatePaymentIntent: ReturnType<typeof vi.fn>;
|
generatePaymentIntent: ReturnType<typeof vi.fn>;
|
||||||
getPurchase: ReturnType<typeof vi.fn>;
|
getPurchase: ReturnType<typeof vi.fn>;
|
||||||
|
submitPurchaseForReview: ReturnType<typeof vi.fn>;
|
||||||
};
|
};
|
||||||
let cartServiceStub: {
|
let cartServiceStub: {
|
||||||
cart: ReturnType<typeof signal>;
|
cart: ReturnType<typeof signal>;
|
||||||
@@ -58,6 +59,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
|||||||
qr_data: { qr_code: 'qr-value' },
|
qr_data: { qr_code: 'qr-value' },
|
||||||
}),
|
}),
|
||||||
getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
|
getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
|
||||||
|
submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'in_review' }),
|
||||||
};
|
};
|
||||||
cartServiceStub = {
|
cartServiceStub = {
|
||||||
cart: signal({
|
cart: signal({
|
||||||
@@ -160,19 +162,19 @@ describe('CheckoutPageComponent payment validation', () => {
|
|||||||
fixture.destroy();
|
fixture.destroy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('stops QR polling after five minutes and can restart it', async () => {
|
it('stops QR polling after 45 seconds and can restart it', async () => {
|
||||||
const { component } = createComponent();
|
const { component } = createComponent();
|
||||||
|
|
||||||
await component.selectPaymentMethod('qr');
|
await component.selectPaymentMethod('qr');
|
||||||
await vi.advanceTimersByTimeAsync(300_000);
|
await vi.advanceTimersByTimeAsync(45_000);
|
||||||
|
|
||||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(60);
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(9);
|
||||||
expect(component.qrPaymentStatus()).toBe('timed_out');
|
expect(component.qrPaymentStatus()).toBe('timed_out');
|
||||||
|
|
||||||
component.retryQrPolling();
|
component.retryQrPolling();
|
||||||
expect(component.qrPaymentStatus()).toBe('waiting');
|
expect(component.qrPaymentStatus()).toBe('waiting');
|
||||||
await vi.advanceTimersByTimeAsync(5_000);
|
await vi.advanceTimersByTimeAsync(5_000);
|
||||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(61);
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(10);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('cancels QR polling when payment method changes or component is destroyed', async () => {
|
it('cancels QR polling when payment method changes or component is destroyed', async () => {
|
||||||
@@ -189,37 +191,37 @@ describe('CheckoutPageComponent payment validation', () => {
|
|||||||
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
|
expect(checkoutServiceStub.getPurchase).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('checks a transfer once and redirects to purchase status while pending', async () => {
|
it.each(['created', 'pending_payment', 'in_review'])(
|
||||||
const { component } = createComponent();
|
'shows the payment error when a transfer remains %s',
|
||||||
component.selectedPaymentMethod.set('transfer');
|
async (status) => {
|
||||||
|
checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status });
|
||||||
|
const { component } = createComponent();
|
||||||
|
component.selectedPaymentMethod.set('transfer');
|
||||||
|
|
||||||
await component.onComplete();
|
await component.onComplete();
|
||||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
|
|
||||||
expect(component.transferValidationStatus()).toBe('pending');
|
|
||||||
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
|
||||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
|
||||||
|
|
||||||
await vi.advanceTimersByTimeAsync(30_000);
|
expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
|
||||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
|
expect(component.transferValidationStatus()).toBe('error');
|
||||||
|
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||||
|
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
await component.onComplete();
|
it('submits a paid transfer and navigates to its confirmation page', async () => {
|
||||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(1);
|
checkoutServiceStub.submitPurchaseForReview.mockResolvedValue({ status: 'paid' });
|
||||||
});
|
|
||||||
|
|
||||||
it('navigates after a transfer is confirmed as paid', async () => {
|
|
||||||
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'paid' });
|
|
||||||
const { component } = createComponent();
|
const { component } = createComponent();
|
||||||
component.selectedPaymentMethod.set('transfer');
|
component.selectedPaymentMethod.set('transfer');
|
||||||
|
|
||||||
await component.onComplete();
|
await component.onComplete();
|
||||||
|
|
||||||
|
expect(checkoutServiceStub.submitPurchaseForReview).toHaveBeenCalledWith('tenant-test', 25);
|
||||||
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('shows a retryable state when transfer validation fails', async () => {
|
it('shows a retryable state when transfer validation fails', async () => {
|
||||||
vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||||
checkoutServiceStub.getPurchase.mockRejectedValue(new Error('network error'));
|
checkoutServiceStub.submitPurchaseForReview.mockRejectedValue(new Error('network error'));
|
||||||
const { component } = createComponent();
|
const { component } = createComponent();
|
||||||
component.selectedPaymentMethod.set('transfer');
|
component.selectedPaymentMethod.set('transfer');
|
||||||
|
|
||||||
@@ -360,16 +362,12 @@ describe('CheckoutPageComponent payment validation', () => {
|
|||||||
|
|
||||||
expect(component.checkoutStepIndex()).toBe(1);
|
expect(component.checkoutStepIndex()).toBe(1);
|
||||||
expect(component.selectedPaymentMethod()).toBe('qr');
|
expect(component.selectedPaymentMethod()).toBe('qr');
|
||||||
expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith(
|
expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith('tenant-test', 25, 'qr');
|
||||||
'tenant-test',
|
|
||||||
25,
|
|
||||||
'qr',
|
|
||||||
);
|
|
||||||
expect(component.qrData()).toBe('qr-value');
|
expect(component.qrData()).toBe('qr-value');
|
||||||
expect(component.qrPaymentStatus()).toBe('waiting');
|
expect(component.qrPaymentStatus()).toBe('waiting');
|
||||||
});
|
});
|
||||||
|
|
||||||
it.each(['paid', 'cancelled', 'rejected', 'expired'])(
|
it.each(['in_review', 'paid', 'cancelled', 'rejected', 'expired'])(
|
||||||
'redirects a %s purchase to its status page',
|
'redirects a %s purchase to its status page',
|
||||||
async (status) => {
|
async (status) => {
|
||||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
|||||||
private readonly authService = inject(AuthService);
|
private readonly authService = inject(AuthService);
|
||||||
private readonly cartService = inject(CartService);
|
private readonly cartService = inject(CartService);
|
||||||
private readonly qrPollingIntervalMs = 5_000;
|
private readonly qrPollingIntervalMs = 5_000;
|
||||||
private readonly qrPollingMaxAttempts = 60;
|
private readonly qrPollingMaxAttempts = 9;
|
||||||
|
|
||||||
private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
|
private qrPollingTimeoutId: ReturnType<typeof setTimeout> | null = null;
|
||||||
private qrPollingAttempts = 0;
|
private qrPollingAttempts = 0;
|
||||||
@@ -119,6 +119,12 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
|||||||
protected readonly qrPaymentStatus = signal<QrPaymentStatus>('idle');
|
protected readonly qrPaymentStatus = signal<QrPaymentStatus>('idle');
|
||||||
protected readonly isCheckingQrPayment = signal(false);
|
protected readonly isCheckingQrPayment = signal(false);
|
||||||
protected readonly transferValidationStatus = signal<TransferValidationStatus>('idle');
|
protected readonly transferValidationStatus = signal<TransferValidationStatus>('idle');
|
||||||
|
protected readonly whatsappUrl = computed(
|
||||||
|
() =>
|
||||||
|
this.tenantService
|
||||||
|
.tenant()
|
||||||
|
?.social_media?.find((socialMedia) => socialMedia.code === 'whatsapp')?.url ?? null,
|
||||||
|
);
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.form.statusChanges
|
this.form.statusChanges
|
||||||
@@ -432,22 +438,19 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
|||||||
this.transferValidationStatus.set('checking');
|
this.transferValidationStatus.set('checking');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
const purchase = await this.checkoutService.submitPurchaseForReview(
|
||||||
|
tenant.codigo,
|
||||||
|
purchaseId,
|
||||||
|
);
|
||||||
|
|
||||||
if (purchase.status === 'paid') {
|
if (purchase.status === 'paid') {
|
||||||
this.handleConfirmedPayment(purchaseId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (purchase.status === 'pending_payment') {
|
|
||||||
this.transferValidationStatus.set('pending');
|
|
||||||
this.navigateToPurchaseStatus(purchaseId);
|
this.navigateToPurchaseStatus(purchaseId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.transferValidationStatus.set('pending');
|
this.transferValidationStatus.set('error');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to validate transfer payment:', error);
|
console.error('Failed to submit purchase for review:', error);
|
||||||
this.transferValidationStatus.set('error');
|
this.transferValidationStatus.set('error');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -575,6 +578,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
|||||||
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
purchase.status === 'in_review' ||
|
||||||
purchase.status === 'paid' ||
|
purchase.status === 'paid' ||
|
||||||
purchase.status === 'cancelled' ||
|
purchase.status === 'cancelled' ||
|
||||||
purchase.status === 'rejected' ||
|
purchase.status === 'rejected' ||
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
<div class="checkout-payment">
|
<div class="checkout-payment">
|
||||||
<div class="checkout-payment__content">
|
<div class="checkout-payment__content">
|
||||||
<section class="payment-methods" aria-labelledby="payment-methods-title">
|
<section class="payment-methods" aria-labelledby="payment-methods-title">
|
||||||
<h2 id="payment-methods-title" class="payment-methods__title">Selecciona el metodo de pago</h2>
|
<h2 id="payment-methods-title" class="payment-methods__title">
|
||||||
|
Selecciona el metodo de pago
|
||||||
|
</h2>
|
||||||
|
|
||||||
<div class="payment-methods__list" role="radiogroup" aria-label="Metodo de pago">
|
<div class="payment-methods__list" role="radiogroup" aria-label="Metodo de pago">
|
||||||
@for (method of paymentMethods(); track method.id) {
|
@for (method of paymentMethods(); track method.id) {
|
||||||
<label
|
<label class="payment-method" [class.is-selected]="selectedPaymentMethod() === method.id">
|
||||||
class="payment-method"
|
|
||||||
[class.is-selected]="selectedPaymentMethod() === method.id"
|
|
||||||
>
|
|
||||||
<input
|
<input
|
||||||
class="payment-method__radio"
|
class="payment-method__radio"
|
||||||
type="radio"
|
type="radio"
|
||||||
@@ -21,7 +20,8 @@
|
|||||||
<span class="payment-method__label">
|
<span class="payment-method__label">
|
||||||
@if (method.id === 'telepagos') {
|
@if (method.id === 'telepagos') {
|
||||||
<span class="telepagos-logo" aria-label="TelePagos">
|
<span class="telepagos-logo" aria-label="TelePagos">
|
||||||
<span class="telepagos-logo__tele">tele</span><span class="telepagos-logo__pagos">pagos</span>
|
<span class="telepagos-logo__tele">tele</span
|
||||||
|
><span class="telepagos-logo__pagos">pagos</span>
|
||||||
</span>
|
</span>
|
||||||
} @else {
|
} @else {
|
||||||
{{ method.label }}
|
{{ method.label }}
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
<section class="payment-panel d-flex justify-content-end" aria-live="polite">
|
<section class="payment-panel d-flex justify-content-end" aria-live="polite">
|
||||||
@if (isGeneratingIntent()) {
|
@if (isGeneratingIntent()) {
|
||||||
<div class="payment-panel__card" style="text-align: center; padding: 2rem;">
|
<div class="payment-panel__card" style="text-align: center; padding: 2rem">
|
||||||
<h3 class="payment-panel__title">Cargando información de pago...</h3>
|
<h3 class="payment-panel__title">Cargando información de pago...</h3>
|
||||||
</div>
|
</div>
|
||||||
} @else if (selectedPaymentMethod() === 'qr') {
|
} @else if (selectedPaymentMethod() === 'qr') {
|
||||||
@@ -44,7 +44,8 @@
|
|||||||
[qrData]="qrData()"
|
[qrData]="qrData()"
|
||||||
[paymentStatus]="qrPaymentStatus()"
|
[paymentStatus]="qrPaymentStatus()"
|
||||||
[isCheckingPayment]="isCheckingQrPayment()"
|
[isCheckingPayment]="isCheckingQrPayment()"
|
||||||
(retryPolling)="retryQrPolling.emit()"
|
[paymentAmount]="qrPaymentAmount()"
|
||||||
|
[whatsappUrl]="whatsappUrl()"
|
||||||
/>
|
/>
|
||||||
} @else if (selectedPaymentMethod() === 'transfer') {
|
} @else if (selectedPaymentMethod() === 'transfer') {
|
||||||
<app-checkout-payment-transfer
|
<app-checkout-payment-transfer
|
||||||
@@ -52,6 +53,8 @@
|
|||||||
[transferDni]="transferDni()"
|
[transferDni]="transferDni()"
|
||||||
[copiedTransferField]="copiedTransferField()"
|
[copiedTransferField]="copiedTransferField()"
|
||||||
[validationStatus]="transferValidationStatus()"
|
[validationStatus]="transferValidationStatus()"
|
||||||
|
[paymentAmount]="qrPaymentAmount()"
|
||||||
|
[whatsappUrl]="whatsappUrl()"
|
||||||
(copyTransferValue)="requestCopy($event.field, $event.value)"
|
(copyTransferValue)="requestCopy($event.field, $event.value)"
|
||||||
(submitDni)="generateTransferIntent.emit($event)"
|
(submitDni)="generateTransferIntent.emit($event)"
|
||||||
(completePurchase)="complete.emit()"
|
(completePurchase)="complete.emit()"
|
||||||
@@ -62,4 +65,3 @@
|
|||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ export class CheckoutPaymentStepComponent {
|
|||||||
readonly qrData = input<string | null>(null);
|
readonly qrData = input<string | null>(null);
|
||||||
readonly qrPaymentStatus = input<QrPaymentStatus>('idle');
|
readonly qrPaymentStatus = input<QrPaymentStatus>('idle');
|
||||||
readonly isCheckingQrPayment = input<boolean>(false);
|
readonly isCheckingQrPayment = input<boolean>(false);
|
||||||
|
readonly qrPaymentAmount = input<number>(0);
|
||||||
|
readonly whatsappUrl = input<string | null>(null);
|
||||||
readonly transferValidationStatus = input<TransferValidationStatus>('idle');
|
readonly transferValidationStatus = input<TransferValidationStatus>('idle');
|
||||||
|
|
||||||
readonly paymentMethodChange = output<PaymentMethod>();
|
readonly paymentMethodChange = output<PaymentMethod>();
|
||||||
@@ -37,7 +39,6 @@ export class CheckoutPaymentStepComponent {
|
|||||||
readonly cancelStep = output<void>();
|
readonly cancelStep = output<void>();
|
||||||
readonly complete = output<void>();
|
readonly complete = output<void>();
|
||||||
readonly generateTransferIntent = output<string>();
|
readonly generateTransferIntent = output<string>();
|
||||||
readonly retryQrPolling = output<void>();
|
|
||||||
|
|
||||||
protected selectPaymentMethod(method: PaymentMethod): void {
|
protected selectPaymentMethod(method: PaymentMethod): void {
|
||||||
this.paymentMethodChange.emit(method);
|
this.paymentMethodChange.emit(method);
|
||||||
|
|||||||
@@ -1,34 +1,34 @@
|
|||||||
<div class="payment-panel__card">
|
<div class="payment-panel__card">
|
||||||
<h3 class="payment-panel__title">Ingresa a tu billetera y escanea el siguiente QR</h3>
|
|
||||||
<div class="payment-panel__divider"></div>
|
|
||||||
|
|
||||||
<div class="qr-code" aria-label="QR de pago">
|
|
||||||
@if (qrData()) {
|
|
||||||
<qrcode [qrdata]="qrData()!" [width]="200" [errorCorrectionLevel]="'M'"></qrcode>
|
|
||||||
} @else {
|
|
||||||
<span class="qr-code__finder qr-code__finder--tl"></span>
|
|
||||||
<span class="qr-code__finder qr-code__finder--tr"></span>
|
|
||||||
<span class="qr-code__finder qr-code__finder--bl"></span>
|
|
||||||
}
|
|
||||||
|
|
||||||
@if (isCheckingPayment()) {
|
|
||||||
<div class="payment-verification" role="status" aria-live="polite">
|
|
||||||
<span class="payment-verification__spinner" aria-hidden="true"></span>
|
|
||||||
<span class="payment-verification__message">Verificando pago</span>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if (paymentStatus() === 'timed_out') {
|
@if (paymentStatus() === 'timed_out') {
|
||||||
<p class="payment-status payment-status--warning" role="status">
|
<app-payment-verification-error
|
||||||
Todavía no recibimos el pago.
|
[paymentAmount]="paymentAmount()"
|
||||||
</p>
|
[whatsappUrl]="whatsappUrl()"
|
||||||
<app-button type="button" variant="secondary" (click)="retryPolling.emit()">
|
/>
|
||||||
Volver a verificar
|
} @else {
|
||||||
</app-button>
|
<h3 class="payment-panel__title">Ingresa a tu billetera y escanea el siguiente QR</h3>
|
||||||
} @else if (paymentStatus() === 'failed') {
|
<div class="payment-panel__divider"></div>
|
||||||
<p class="payment-status payment-status--warning" role="alert">
|
|
||||||
El pago fue rechazado o cancelado.
|
<div class="qr-code" aria-label="QR de pago">
|
||||||
</p>
|
@if (qrData()) {
|
||||||
|
<qrcode [qrdata]="qrData()!" [width]="200" [errorCorrectionLevel]="'M'"></qrcode>
|
||||||
|
} @else {
|
||||||
|
<span class="qr-code__finder qr-code__finder--tl"></span>
|
||||||
|
<span class="qr-code__finder qr-code__finder--tr"></span>
|
||||||
|
<span class="qr-code__finder qr-code__finder--bl"></span>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (isCheckingPayment()) {
|
||||||
|
<div class="payment-verification" role="status" aria-live="polite">
|
||||||
|
<span class="payment-verification__spinner" aria-hidden="true"></span>
|
||||||
|
<span class="payment-verification__message">Verificando pago</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (paymentStatus() === 'failed') {
|
||||||
|
<p class="payment-status payment-status--warning" role="alert">
|
||||||
|
El pago fue rechazado o cancelado.
|
||||||
|
</p>
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -57,7 +57,9 @@
|
|||||||
rgba(17, 17, 17, 0.95) 84% 100%
|
rgba(17, 17, 17, 0.95) 84% 100%
|
||||||
);
|
);
|
||||||
background-size: 18px 18px;
|
background-size: 18px 18px;
|
||||||
background-position: 0 0, 9px 9px;
|
background-position:
|
||||||
|
0 0,
|
||||||
|
9px 9px;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -86,7 +88,9 @@
|
|||||||
height: 38px;
|
height: 38px;
|
||||||
border: 5px solid #111111;
|
border: 5px solid #111111;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
box-shadow: inset 0 0 0 8px #ffffff, inset 0 0 0 14px #111111;
|
box-shadow:
|
||||||
|
inset 0 0 0 8px #ffffff,
|
||||||
|
inset 0 0 0 14px #111111;
|
||||||
|
|
||||||
&--tl {
|
&--tl {
|
||||||
top: 10px;
|
top: 10px;
|
||||||
|
|||||||
@@ -27,4 +27,25 @@ describe('CheckoutPaymentQrComponent', () => {
|
|||||||
expect(overlay.textContent).toContain('Verificando pago');
|
expect(overlay.textContent).toContain('Verificando pago');
|
||||||
expect(overlay.querySelector('.payment-verification__spinner')).not.toBeNull();
|
expect(overlay.querySelector('.payment-verification__spinner')).not.toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('shows the payment verification error and WhatsApp action after timeout', async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [CheckoutPaymentQrComponent],
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(CheckoutPaymentQrComponent);
|
||||||
|
fixture.componentRef.setInput('paymentStatus', 'timed_out');
|
||||||
|
fixture.componentRef.setInput('paymentAmount', 300000);
|
||||||
|
fixture.componentRef.setInput('whatsappUrl', 'https://wa.me/543412602222');
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
const whatsapp = Array.from(element.querySelectorAll('button')).find((button) =>
|
||||||
|
button.textContent?.includes('WhatsApp'),
|
||||||
|
);
|
||||||
|
expect(element.textContent).toMatch(/No pudimos verificar el pago de \$\s*300\.000\./);
|
||||||
|
expect(element.textContent).toContain('Por favor contactate con nosotros para resolverlo.');
|
||||||
|
expect(whatsapp).toBeDefined();
|
||||||
|
expect(element.textContent).not.toContain('Volver a verificar');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,19 +1,20 @@
|
|||||||
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, input } from '@angular/core';
|
||||||
import { QRCodeComponent } from '../../../../../../shared/components/qrcode/qrcode.component';
|
import { QRCodeComponent } from '../../../../../../shared/components/qrcode/qrcode.component';
|
||||||
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
|
|
||||||
import { QrPaymentStatus } from '../../checkout-page.models';
|
import { QrPaymentStatus } from '../../checkout-page.models';
|
||||||
|
import { PaymentVerificationErrorComponent } from '../payment-verification-error/payment-verification-error.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-checkout-payment-qr',
|
selector: 'app-checkout-payment-qr',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [QRCodeComponent, ButtonComponent],
|
imports: [PaymentVerificationErrorComponent, QRCodeComponent],
|
||||||
templateUrl: './checkout-payment-qr.component.html',
|
templateUrl: './checkout-payment-qr.component.html',
|
||||||
styleUrl: './checkout-payment-qr.component.scss',
|
styleUrl: './checkout-payment-qr.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class CheckoutPaymentQrComponent {
|
export class CheckoutPaymentQrComponent {
|
||||||
readonly qrData = input<string | null>(null);
|
readonly qrData = input<string | null>(null);
|
||||||
readonly paymentStatus = input<QrPaymentStatus>('idle');
|
readonly paymentStatus = input<QrPaymentStatus>('idle');
|
||||||
readonly isCheckingPayment = input<boolean>(false);
|
readonly isCheckingPayment = input<boolean>(false);
|
||||||
readonly retryPolling = output<void>();
|
readonly paymentAmount = input<number>(0);
|
||||||
|
readonly whatsappUrl = input<string | null>(null);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,105 +1,106 @@
|
|||||||
<div class="payment-panel__card">
|
<div class="payment-panel__card">
|
||||||
<div class="dni-form-container">
|
@if (validationStatus() === 'pending' || validationStatus() === 'error') {
|
||||||
<h3 class="dni-form-title">Ingresá DNI de quién va a transferir</h3>
|
<app-payment-verification-error
|
||||||
<form class="dni-form row gx-2" (submit)="$event.preventDefault(); onSubmitDni()">
|
[paymentAmount]="paymentAmount()"
|
||||||
<div class="col-8">
|
[whatsappUrl]="whatsappUrl()"
|
||||||
<app-input
|
/>
|
||||||
type="text"
|
} @else {
|
||||||
[value]="dniControl.value"
|
<div class="dni-form-container">
|
||||||
(valueChange)="dniControl.setValue($event.toString()); dniControl.markAsDirty()"
|
<h3 class="dni-form-title">Ingresá DNI de quién va a transferir</h3>
|
||||||
[disabled]="isDniDisabled()"
|
<form class="dni-form row gx-2" (submit)="$event.preventDefault(); onSubmitDni()">
|
||||||
[invalid]="dniControl.invalid && (dniControl.dirty || dniControl.touched)"
|
<div class="col-8">
|
||||||
/>
|
<app-input
|
||||||
</div>
|
type="text"
|
||||||
<div class="col-4">
|
[value]="dniControl.value"
|
||||||
@if (isDniDisabled()) {
|
(valueChange)="dniControl.setValue($event.toString()); dniControl.markAsDirty()"
|
||||||
<app-button
|
[disabled]="isDniDisabled()"
|
||||||
type="button"
|
[invalid]="dniControl.invalid && (dniControl.dirty || dniControl.touched)"
|
||||||
variant="secondary"
|
/>
|
||||||
hostClass="w-100 h-100"
|
</div>
|
||||||
buttonClass="w-100 h-100 px-0"
|
<div class="col-4">
|
||||||
(click)="enableEditing()"
|
@if (isDniDisabled()) {
|
||||||
>
|
<app-button
|
||||||
Modificar
|
type="button"
|
||||||
</app-button>
|
variant="secondary"
|
||||||
} @else {
|
hostClass="w-100 h-100"
|
||||||
<app-button
|
buttonClass="w-100 h-100 px-0"
|
||||||
type="submit"
|
(click)="enableEditing()"
|
||||||
variant="primary"
|
>
|
||||||
hostClass="w-100 h-100"
|
Modificar
|
||||||
buttonClass="w-100 h-100 px-0"
|
</app-button>
|
||||||
[disabled]="dniControl.invalid"
|
} @else {
|
||||||
>
|
<app-button
|
||||||
Continuar
|
type="submit"
|
||||||
</app-button>
|
variant="primary"
|
||||||
}
|
hostClass="w-100 h-100"
|
||||||
</div>
|
buttonClass="w-100 h-100 px-0"
|
||||||
</form>
|
[disabled]="dniControl.invalid"
|
||||||
</div>
|
>
|
||||||
|
Continuar
|
||||||
@if (transferAccount() && !isEditing()) {
|
</app-button>
|
||||||
<div class="payment-panel__divider"></div>
|
}
|
||||||
<div class="payment-panel__account">
|
</div>
|
||||||
<p class="payment-panel__eyebrow">DATOS DE CUENTA:</p>
|
</form>
|
||||||
|
|
||||||
<div class="payment-detail">
|
|
||||||
<span class="payment-detail__label">Titular:</span>
|
|
||||||
<span class="payment-detail__value">{{ transferAccount()?.titular }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="payment-detail">
|
|
||||||
<span class="payment-detail__label">Entidad:</span>
|
|
||||||
<span class="payment-detail__value">{{ transferAccount()?.entidad }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="payment-detail payment-detail--copy">
|
|
||||||
<span class="payment-detail__label">CVU:</span>
|
|
||||||
<span class="payment-detail__value">{{ transferAccount()?.cvu }}</span>
|
|
||||||
<app-icon-button
|
|
||||||
variant="copy"
|
|
||||||
ariaLabel="Copiar CVU"
|
|
||||||
(click)="requestCopy('cvu', transferAccount()!.cvu)"
|
|
||||||
/>
|
|
||||||
@if (copiedTransferField() === 'cvu') {
|
|
||||||
<span class="payment-detail__feedback" style="grid-column: 1 / -1; text-align: center;">¡Copiado!</span>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="payment-detail payment-detail--copy">
|
|
||||||
<span class="payment-detail__label">Alias:</span>
|
|
||||||
<span class="payment-detail__value">{{ transferAccount()?.alias }}</span>
|
|
||||||
<app-icon-button
|
|
||||||
variant="copy"
|
|
||||||
ariaLabel="Copiar Alias"
|
|
||||||
(click)="requestCopy('alias', transferAccount()!.alias)"
|
|
||||||
/>
|
|
||||||
@if (copiedTransferField() === 'alias') {
|
|
||||||
<span class="payment-detail__feedback" style="grid-column: 1 / -1; text-align: center;">¡Copiado!</span>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-4">
|
@if (transferAccount() && !isEditing()) {
|
||||||
<app-button
|
<div class="payment-panel__divider"></div>
|
||||||
type="button"
|
<div class="payment-panel__account">
|
||||||
variant="primary"
|
<p class="payment-panel__eyebrow">DATOS DE CUENTA:</p>
|
||||||
hostClass="w-100"
|
|
||||||
buttonClass="w-100"
|
|
||||||
[disabled]="validationStatus() === 'checking'"
|
|
||||||
(click)="completePurchase.emit()"
|
|
||||||
>
|
|
||||||
{{ validationStatus() === 'checking' ? 'Validando pago...' : 'Ya transferí' }}
|
|
||||||
</app-button>
|
|
||||||
|
|
||||||
@if (validationStatus() === 'pending') {
|
<div class="payment-detail">
|
||||||
<p class="payment-validation payment-validation--pending" role="status">
|
<span class="payment-detail__label">Titular:</span>
|
||||||
Todavía no recibimos la transferencia. Podés volver a verificar.
|
<span class="payment-detail__value">{{ transferAccount()?.titular }}</span>
|
||||||
</p>
|
</div>
|
||||||
} @else if (validationStatus() === 'error') {
|
|
||||||
<p class="payment-validation payment-validation--error" role="alert">
|
<div class="payment-detail">
|
||||||
No pudimos validar la transferencia. Intentá nuevamente.
|
<span class="payment-detail__label">Entidad:</span>
|
||||||
</p>
|
<span class="payment-detail__value">{{ transferAccount()?.entidad }}</span>
|
||||||
}
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="payment-detail payment-detail--copy">
|
||||||
|
<span class="payment-detail__label">CVU:</span>
|
||||||
|
<span class="payment-detail__value">{{ transferAccount()?.cvu }}</span>
|
||||||
|
<app-icon-button
|
||||||
|
variant="copy"
|
||||||
|
ariaLabel="Copiar CVU"
|
||||||
|
(click)="requestCopy('cvu', transferAccount()!.cvu)"
|
||||||
|
/>
|
||||||
|
@if (copiedTransferField() === 'cvu') {
|
||||||
|
<span class="payment-detail__feedback" style="grid-column: 1 / -1; text-align: center"
|
||||||
|
>¡Copiado!</span
|
||||||
|
>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="payment-detail payment-detail--copy">
|
||||||
|
<span class="payment-detail__label">Alias:</span>
|
||||||
|
<span class="payment-detail__value">{{ transferAccount()?.alias }}</span>
|
||||||
|
<app-icon-button
|
||||||
|
variant="copy"
|
||||||
|
ariaLabel="Copiar Alias"
|
||||||
|
(click)="requestCopy('alias', transferAccount()!.alias)"
|
||||||
|
/>
|
||||||
|
@if (copiedTransferField() === 'alias') {
|
||||||
|
<span class="payment-detail__feedback" style="grid-column: 1 / -1; text-align: center"
|
||||||
|
>¡Copiado!</span
|
||||||
|
>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4">
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="primary"
|
||||||
|
hostClass="w-100"
|
||||||
|
buttonClass="w-100"
|
||||||
|
[disabled]="validationStatus() === 'checking'"
|
||||||
|
(click)="completePurchase.emit()"
|
||||||
|
>
|
||||||
|
{{ validationStatus() === 'checking' ? 'Validando pago...' : 'Ya transferí' }}
|
||||||
|
</app-button>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -115,17 +115,3 @@
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.payment-validation {
|
|
||||||
margin: 0.75rem 0 0;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
line-height: 1.35;
|
|
||||||
|
|
||||||
&--pending {
|
|
||||||
color: #8a681d;
|
|
||||||
}
|
|
||||||
|
|
||||||
&--error {
|
|
||||||
color: #b42318;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,23 +1,46 @@
|
|||||||
import { ChangeDetectionStrategy, Component, computed, input, output, signal, OnInit, effect, untracked } from '@angular/core';
|
import {
|
||||||
|
ChangeDetectionStrategy,
|
||||||
|
Component,
|
||||||
|
computed,
|
||||||
|
input,
|
||||||
|
output,
|
||||||
|
signal,
|
||||||
|
OnInit,
|
||||||
|
effect,
|
||||||
|
untracked,
|
||||||
|
} from '@angular/core';
|
||||||
import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
|
import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||||
import { IconButtonComponent } from '../../../../../../shared/components/icon-button/icon-button.component';
|
import { IconButtonComponent } from '../../../../../../shared/components/icon-button/icon-button.component';
|
||||||
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
|
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
|
||||||
import { InputComponent } from '../../../../../../shared/components/input/input.component';
|
import { InputComponent } from '../../../../../../shared/components/input/input.component';
|
||||||
import { TransferAccount, TransferField, TransferValidationStatus } from '../../checkout-page.models';
|
import {
|
||||||
|
TransferAccount,
|
||||||
|
TransferField,
|
||||||
|
TransferValidationStatus,
|
||||||
|
} from '../../checkout-page.models';
|
||||||
|
import { PaymentVerificationErrorComponent } from '../payment-verification-error/payment-verification-error.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-checkout-payment-transfer',
|
selector: 'app-checkout-payment-transfer',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [IconButtonComponent, ButtonComponent, InputComponent, ReactiveFormsModule],
|
imports: [
|
||||||
|
IconButtonComponent,
|
||||||
|
ButtonComponent,
|
||||||
|
InputComponent,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
PaymentVerificationErrorComponent,
|
||||||
|
],
|
||||||
templateUrl: './checkout-payment-transfer.component.html',
|
templateUrl: './checkout-payment-transfer.component.html',
|
||||||
styleUrl: './checkout-payment-transfer.component.scss',
|
styleUrl: './checkout-payment-transfer.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class CheckoutPaymentTransferComponent implements OnInit {
|
export class CheckoutPaymentTransferComponent implements OnInit {
|
||||||
readonly transferAccount = input<TransferAccount | null>(null);
|
readonly transferAccount = input<TransferAccount | null>(null);
|
||||||
readonly transferDni = input<string>('');
|
readonly transferDni = input<string>('');
|
||||||
readonly copiedTransferField = input<TransferField | null>(null);
|
readonly copiedTransferField = input<TransferField | null>(null);
|
||||||
readonly validationStatus = input<TransferValidationStatus>('idle');
|
readonly validationStatus = input<TransferValidationStatus>('idle');
|
||||||
|
readonly paymentAmount = input<number>(0);
|
||||||
|
readonly whatsappUrl = input<string | null>(null);
|
||||||
|
|
||||||
readonly copyTransferValue = output<{ field: TransferField; value: string }>();
|
readonly copyTransferValue = output<{ field: TransferField; value: string }>();
|
||||||
readonly submitDni = output<string>();
|
readonly submitDni = output<string>();
|
||||||
@@ -25,7 +48,7 @@ export class CheckoutPaymentTransferComponent implements OnInit {
|
|||||||
|
|
||||||
protected readonly dniControl = new FormControl('', {
|
protected readonly dniControl = new FormControl('', {
|
||||||
nonNullable: true,
|
nonNullable: true,
|
||||||
validators: [Validators.required, Validators.pattern(/^\d{7,8}$/)]
|
validators: [Validators.required, Validators.pattern(/^\d{7,8}$/)],
|
||||||
});
|
});
|
||||||
|
|
||||||
protected readonly isEditing = signal<boolean>(false);
|
protected readonly isEditing = signal<boolean>(false);
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<div class="payment-timeout" role="alert">
|
||||||
|
<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>
|
||||||
|
<p class="payment-timeout__message">Por favor contactate con nosotros para resolverlo.</p>
|
||||||
|
@if (whatsappUrl()) {
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="primary"
|
||||||
|
buttonClass="d-inline-flex align-items-center justify-content-center gap-2"
|
||||||
|
(click)="openWhatsApp()"
|
||||||
|
>
|
||||||
|
<span>WhatsApp</span>
|
||||||
|
</app-button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
.payment-timeout {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
padding-top: 0.85rem;
|
||||||
|
|
||||||
|
&__icon {
|
||||||
|
display: grid;
|
||||||
|
width: 84px;
|
||||||
|
height: 84px;
|
||||||
|
place-items: center;
|
||||||
|
border: 1px solid var(--tenant-danger, #dc3545);
|
||||||
|
border-radius: 50%;
|
||||||
|
color: var(--tenant-danger, #dc3545);
|
||||||
|
font-size: 2.7rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__title {
|
||||||
|
max-width: 250px;
|
||||||
|
margin: 1.35rem 0 0;
|
||||||
|
color: var(--tenant-danger, #dc3545);
|
||||||
|
font-size: 1.05rem;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.3;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__message {
|
||||||
|
max-width: 250px;
|
||||||
|
margin: 2rem 0 1.75rem;
|
||||||
|
color: #666666;
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.25;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
|
||||||
|
|
||||||
|
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-payment-verification-error',
|
||||||
|
standalone: true,
|
||||||
|
imports: [ButtonComponent],
|
||||||
|
templateUrl: './payment-verification-error.component.html',
|
||||||
|
styleUrl: './payment-verification-error.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class PaymentVerificationErrorComponent {
|
||||||
|
readonly paymentAmount = input<number>(0);
|
||||||
|
readonly whatsappUrl = input<string | null>(null);
|
||||||
|
|
||||||
|
protected readonly formattedAmount = computed(() =>
|
||||||
|
new Intl.NumberFormat('es-AR', {
|
||||||
|
style: 'currency',
|
||||||
|
currency: 'ARS',
|
||||||
|
maximumFractionDigits: 0,
|
||||||
|
}).format(this.paymentAmount()),
|
||||||
|
);
|
||||||
|
|
||||||
|
protected openWhatsApp(): void {
|
||||||
|
const url = this.whatsappUrl();
|
||||||
|
|
||||||
|
if (url) {
|
||||||
|
window.open(url, '_blank', 'noopener,noreferrer');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,18 +16,34 @@
|
|||||||
<hr class="status-content__divider" />
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
<div class="status-content__section status-content__section--secondary">
|
<div class="status-content__section status-content__section--secondary">
|
||||||
<p class="status-content__message">Comunicate con nosotros para coordinar el envío.</p>
|
@if (ticketsRoute()) {
|
||||||
|
<p class="status-content__message">A continuación, vas a poder ver los tickets que debés presentar en el evento.</p>
|
||||||
|
|
||||||
<app-button
|
<app-button
|
||||||
type="button"
|
type="button"
|
||||||
variant="secondary"
|
variant="primary"
|
||||||
hostClass="status-content__button d-block"
|
hostClass="status-content__button d-block"
|
||||||
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
||||||
(click)="openWhatsApp()"
|
(click)="goToTickets()"
|
||||||
>
|
>
|
||||||
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
<span>Mis tickets</span>
|
||||||
<span>WhatsApp</span>
|
</app-button>
|
||||||
</app-button>
|
} @else if (whatsappUrl()) {
|
||||||
|
<p class="status-content__message">Comunicate con nosotros para coordinar el envío.</p>
|
||||||
|
|
||||||
|
<app-button
|
||||||
|
type="button"
|
||||||
|
variant="secondary"
|
||||||
|
hostClass="status-content__button d-block"
|
||||||
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
||||||
|
(click)="openWhatsApp()"
|
||||||
|
>
|
||||||
|
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
||||||
|
<span>WhatsApp</span>
|
||||||
|
</app-button>
|
||||||
|
} @else {
|
||||||
|
<p class="status-content__message">Tu compra quedó registrada correctamente.</p>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
} @else if (status() === 'pending') {
|
} @else if (status() === 'pending') {
|
||||||
<div class="status-content__section status-content__section--primary">
|
<div class="status-content__section status-content__section--primary">
|
||||||
@@ -41,21 +57,7 @@
|
|||||||
<hr class="status-content__divider" />
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
<div class="status-content__section status-content__section--secondary">
|
<div class="status-content__section status-content__section--secondary">
|
||||||
<p class="status-content__message">Esta pantalla se actualiza automáticamente cuando el pago impacta.</p>
|
<p class="status-content__message">Te avisaremos cuando el pago sea confirmado.</p>
|
||||||
@if (isRefreshing()) {
|
|
||||||
<p class="status-content__hint">Actualizando estado...</p>
|
|
||||||
}
|
|
||||||
|
|
||||||
<app-button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
hostClass="status-content__button d-block"
|
|
||||||
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center py-2"
|
|
||||||
[disabled]="isRefreshing()"
|
|
||||||
(click)="retryStatusCheck()"
|
|
||||||
>
|
|
||||||
Actualizar estado
|
|
||||||
</app-button>
|
|
||||||
</div>
|
</div>
|
||||||
} @else if (status() === 'expired') {
|
} @else if (status() === 'expired') {
|
||||||
<div class="status-content__section status-content__section--primary">
|
<div class="status-content__section status-content__section--primary">
|
||||||
@@ -83,30 +85,22 @@
|
|||||||
<hr class="status-content__divider" />
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
<div class="status-content__section status-content__section--secondary">
|
<div class="status-content__section status-content__section--secondary">
|
||||||
<p class="status-content__message">Si ya pagaste, podés reintentar la consulta o escribirnos para revisarlo.</p>
|
<p class="status-content__message">Si ya pagaste, escribinos para que podamos revisarlo.</p>
|
||||||
|
|
||||||
<div class="status-content__actions">
|
@if (whatsappUrl()) {
|
||||||
<app-button
|
<div class="status-content__actions">
|
||||||
type="button"
|
<app-button
|
||||||
variant="secondary"
|
type="button"
|
||||||
hostClass="status-content__button d-block"
|
variant="secondary"
|
||||||
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center py-2"
|
hostClass="status-content__button d-block"
|
||||||
(click)="retryStatusCheck()"
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
||||||
>
|
(click)="openWhatsApp()"
|
||||||
Reintentar
|
>
|
||||||
</app-button>
|
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
||||||
|
<span>WhatsApp</span>
|
||||||
<app-button
|
</app-button>
|
||||||
type="button"
|
</div>
|
||||||
variant="secondary"
|
}
|
||||||
hostClass="status-content__button d-block"
|
|
||||||
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
|
||||||
(click)="openWhatsApp()"
|
|
||||||
>
|
|
||||||
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
|
||||||
<span>WhatsApp</span>
|
|
||||||
</app-button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
} @else {
|
} @else {
|
||||||
<div class="status-content__section status-content__section--primary">
|
<div class="status-content__section status-content__section--primary">
|
||||||
@@ -120,30 +114,22 @@
|
|||||||
<hr class="status-content__divider" />
|
<hr class="status-content__divider" />
|
||||||
|
|
||||||
<div class="status-content__section status-content__section--secondary">
|
<div class="status-content__section status-content__section--secondary">
|
||||||
<p class="status-content__message">Reintentá en unos segundos. 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>
|
||||||
|
|
||||||
<div class="status-content__actions">
|
@if (whatsappUrl()) {
|
||||||
<app-button
|
<div class="status-content__actions">
|
||||||
type="button"
|
<app-button
|
||||||
variant="secondary"
|
type="button"
|
||||||
hostClass="status-content__button d-block"
|
variant="secondary"
|
||||||
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center py-2"
|
hostClass="status-content__button d-block"
|
||||||
(click)="retryStatusCheck()"
|
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
||||||
>
|
(click)="openWhatsApp()"
|
||||||
Reintentar
|
>
|
||||||
</app-button>
|
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
||||||
|
<span>WhatsApp</span>
|
||||||
<app-button
|
</app-button>
|
||||||
type="button"
|
</div>
|
||||||
variant="secondary"
|
}
|
||||||
hostClass="status-content__button d-block"
|
|
||||||
buttonClass="status-content__button-control d-inline-flex align-items-center justify-content-center gap-2 py-2"
|
|
||||||
(click)="openWhatsApp()"
|
|
||||||
>
|
|
||||||
<i class="fa-brands fa-whatsapp status-content__button-icon"></i>
|
|
||||||
<span>WhatsApp</span>
|
|
||||||
</app-button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -98,7 +98,7 @@
|
|||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: 325;
|
font-weight: 325;
|
||||||
line-height: 1.45;
|
line-height: 1.45;
|
||||||
color: var(--color-text);
|
color: #666666;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__hint {
|
&__hint {
|
||||||
|
|||||||
@@ -0,0 +1,130 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
import { ActivatedRoute, convertToParamMap, Router } from '@angular/router';
|
||||||
|
|
||||||
|
import { CheckoutService, PurchaseDetailResponse } from '../../../../core/services/checkout.service';
|
||||||
|
import { Tenant } from '../../../../core/services/tenant.interface';
|
||||||
|
import { TenantService } from '../../../../core/services/tenant.service';
|
||||||
|
import { PurchaseStatusPageComponent } from './purchase-status-page.component';
|
||||||
|
|
||||||
|
const tenant: Tenant = {
|
||||||
|
id: 1,
|
||||||
|
codigo: 'tickets-tenant',
|
||||||
|
nombre: 'Tickets tenant',
|
||||||
|
dominio: 'tickets.local',
|
||||||
|
primary_color: '#000000',
|
||||||
|
secondary_color: '#000000',
|
||||||
|
danger_color: '#000000',
|
||||||
|
success_color: '#000000',
|
||||||
|
header_bg_color: '#000000',
|
||||||
|
footer_bg_color: '#000000',
|
||||||
|
header_logo: '',
|
||||||
|
footer_logo: '',
|
||||||
|
categories: [],
|
||||||
|
social_media: [
|
||||||
|
{
|
||||||
|
code: 'whatsapp',
|
||||||
|
icon: 'whatsapp',
|
||||||
|
name: 'WhatsApp',
|
||||||
|
url: 'https://wa.me/543411234567',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
menues: [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
code: 'account',
|
||||||
|
label: 'Mi cuenta',
|
||||||
|
parent_menu_code: null,
|
||||||
|
content_type: 'dynamic',
|
||||||
|
route: '/mi-cuenta',
|
||||||
|
submenues: [
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
code: 'account.tickets',
|
||||||
|
label: 'Mis tickets',
|
||||||
|
parent_menu_code: 'account',
|
||||||
|
content_type: 'dynamic',
|
||||||
|
route: '/mi-cuenta/tickets',
|
||||||
|
submenues: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
const purchase = (hasGeneratedTickets: boolean): PurchaseDetailResponse =>
|
||||||
|
({
|
||||||
|
status: 'paid',
|
||||||
|
has_generated_tickets: hasGeneratedTickets,
|
||||||
|
tickets_count: hasGeneratedTickets ? 1 : 0,
|
||||||
|
}) as PurchaseDetailResponse;
|
||||||
|
|
||||||
|
describe('PurchaseStatusPageComponent', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function render(hasGeneratedTickets: boolean) {
|
||||||
|
const checkoutService = {
|
||||||
|
getPurchase: vi.fn().mockResolvedValue(purchase(hasGeneratedTickets)),
|
||||||
|
};
|
||||||
|
const router = {
|
||||||
|
navigate: vi.fn().mockResolvedValue(true),
|
||||||
|
navigateByUrl: vi.fn().mockResolvedValue(true),
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [PurchaseStatusPageComponent],
|
||||||
|
providers: [
|
||||||
|
{ provide: CheckoutService, useValue: checkoutService },
|
||||||
|
{ provide: TenantService, useValue: { tenant: () => tenant } },
|
||||||
|
{
|
||||||
|
provide: ActivatedRoute,
|
||||||
|
useValue: { snapshot: { paramMap: convertToParamMap({ id: '42' }) } },
|
||||||
|
},
|
||||||
|
{ provide: Router, useValue: router },
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(PurchaseStatusPageComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
await fixture.whenStable();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
return {
|
||||||
|
fixture,
|
||||||
|
element: fixture.nativeElement as HTMLElement,
|
||||||
|
checkoutService,
|
||||||
|
router,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('shows the tickets action when this purchase generated tickets', async () => {
|
||||||
|
const { element, checkoutService, router } = await render(true);
|
||||||
|
|
||||||
|
expect(checkoutService.getPurchase).toHaveBeenCalledOnce();
|
||||||
|
expect(element.textContent).toContain('Ver mis tickets');
|
||||||
|
expect(element.textContent).not.toContain('WhatsApp');
|
||||||
|
|
||||||
|
element.querySelector<HTMLButtonElement>('app-button button')?.click();
|
||||||
|
|
||||||
|
expect(router.navigateByUrl).toHaveBeenCalledWith('/mi-cuenta/tickets');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows the tenant WhatsApp action when this purchase did not generate tickets', async () => {
|
||||||
|
const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
|
||||||
|
const { element } = await render(false);
|
||||||
|
|
||||||
|
expect(element.textContent).toContain('WhatsApp');
|
||||||
|
expect(element.textContent).not.toContain('Ver mis tickets');
|
||||||
|
|
||||||
|
element.querySelector<HTMLButtonElement>('app-button button')?.click();
|
||||||
|
|
||||||
|
expect(openSpy).toHaveBeenCalledWith(
|
||||||
|
'https://wa.me/543411234567',
|
||||||
|
'_blank',
|
||||||
|
'noopener,noreferrer',
|
||||||
|
);
|
||||||
|
|
||||||
|
openSpy.mockRestore();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, inject, signal } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, OnInit, computed, inject, signal } from '@angular/core';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
|
||||||
import { CheckoutService, PurchaseStatusResponse } from '../../../../core/services/checkout.service';
|
import { CheckoutService, PurchaseStatusResponse } from '../../../../core/services/checkout.service';
|
||||||
|
import { findMenu } from '../../../../core/services/menu.utils';
|
||||||
import { TenantService } from '../../../../core/services/tenant.service';
|
import { TenantService } from '../../../../core/services/tenant.service';
|
||||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
|
|
||||||
@@ -15,20 +16,31 @@ type PurchaseStatusView = 'approved' | 'pending' | 'rejected' | 'expired' | 'err
|
|||||||
styleUrl: './purchase-status-page.component.scss',
|
styleUrl: './purchase-status-page.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
})
|
})
|
||||||
export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
export class PurchaseStatusPageComponent implements OnInit {
|
||||||
private readonly route = inject(ActivatedRoute);
|
private readonly route = inject(ActivatedRoute);
|
||||||
private readonly router = inject(Router);
|
private readonly router = inject(Router);
|
||||||
private readonly checkoutService = inject(CheckoutService);
|
private readonly checkoutService = inject(CheckoutService);
|
||||||
private readonly tenantService = inject(TenantService);
|
private readonly tenantService = inject(TenantService);
|
||||||
|
|
||||||
private readonly pollIntervalMs = 5000;
|
|
||||||
private purchaseId: string | null = null;
|
private purchaseId: string | null = null;
|
||||||
private tenantCode: string | null = null;
|
private tenantCode: string | null = null;
|
||||||
private pollTimeoutId: ReturnType<typeof setTimeout> | null = null;
|
|
||||||
|
|
||||||
protected readonly isLoading = signal(true);
|
protected readonly isLoading = signal(true);
|
||||||
protected readonly isRefreshing = signal(false);
|
|
||||||
protected readonly status = signal<PurchaseStatusView>('pending');
|
protected readonly status = signal<PurchaseStatusView>('pending');
|
||||||
|
protected readonly hasGeneratedTickets = signal(false);
|
||||||
|
protected readonly ticketsRoute = computed(() => {
|
||||||
|
if (!this.hasGeneratedTickets()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return findMenu(this.tenantService.tenant()?.menues ?? [], 'account.tickets')?.route ?? null;
|
||||||
|
});
|
||||||
|
protected readonly whatsappUrl = computed(
|
||||||
|
() =>
|
||||||
|
this.tenantService
|
||||||
|
.tenant()
|
||||||
|
?.social_media?.find((socialMedia) => socialMedia.code === 'whatsapp')?.url ?? null,
|
||||||
|
);
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
const purchaseId = this.route.snapshot.paramMap.get('id');
|
const purchaseId = this.route.snapshot.paramMap.get('id');
|
||||||
@@ -42,45 +54,23 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
|||||||
this.purchaseId = purchaseId;
|
this.purchaseId = purchaseId;
|
||||||
this.tenantCode = tenant.codigo;
|
this.tenantCode = tenant.codigo;
|
||||||
|
|
||||||
void this.refreshStatus(true);
|
void this.loadStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy(): void {
|
private async loadStatus(): Promise<void> {
|
||||||
this.clearScheduledPoll();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected retryStatusCheck(): void {
|
|
||||||
void this.refreshStatus(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async refreshStatus(showLoader: boolean): Promise<void> {
|
|
||||||
if (!this.purchaseId || !this.tenantCode) {
|
if (!this.purchaseId || !this.tenantCode) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.clearScheduledPoll();
|
|
||||||
|
|
||||||
if (showLoader) {
|
|
||||||
this.isLoading.set(true);
|
|
||||||
} else {
|
|
||||||
this.isRefreshing.set(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const purchase = await this.checkoutService.getPurchase(this.tenantCode, this.purchaseId);
|
const purchase = await this.checkoutService.getPurchase(this.tenantCode, this.purchaseId);
|
||||||
const resolvedStatus = this.resolveStatus(purchase);
|
this.status.set(this.resolveStatus(purchase));
|
||||||
|
this.hasGeneratedTickets.set(purchase.has_generated_tickets === true);
|
||||||
this.status.set(resolvedStatus);
|
|
||||||
|
|
||||||
if (resolvedStatus === 'pending') {
|
|
||||||
this.scheduleNextPoll();
|
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to fetch purchase status:', error);
|
console.error('Failed to fetch purchase status:', error);
|
||||||
this.status.set('error');
|
this.status.set('error');
|
||||||
} finally {
|
} finally {
|
||||||
this.isLoading.set(false);
|
this.isLoading.set(false);
|
||||||
this.isRefreshing.set(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,33 +90,19 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
|||||||
return 'pending';
|
return 'pending';
|
||||||
}
|
}
|
||||||
|
|
||||||
private scheduleNextPoll(): void {
|
protected goToTickets(): void {
|
||||||
if (this.pollTimeoutId !== null) {
|
const route = this.ticketsRoute();
|
||||||
return;
|
|
||||||
|
if (route) {
|
||||||
|
void this.router.navigateByUrl(route);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.pollTimeoutId = setTimeout(() => {
|
|
||||||
this.pollTimeoutId = null;
|
|
||||||
void this.refreshStatus(false);
|
|
||||||
}, this.pollIntervalMs);
|
|
||||||
}
|
|
||||||
|
|
||||||
private clearScheduledPoll(): void {
|
|
||||||
if (this.pollTimeoutId === null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
clearTimeout(this.pollTimeoutId);
|
|
||||||
this.pollTimeoutId = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected getWhatsAppLink(): string {
|
|
||||||
const phone = '5493416658247';
|
|
||||||
const message = encodeURIComponent('Hola! Mi compra fue realizada con \u00E9xito.');
|
|
||||||
return `https://wa.me/${phone}?text=${message}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected openWhatsApp(): void {
|
protected openWhatsApp(): void {
|
||||||
window.open(this.getWhatsAppLink(), '_blank', 'noopener,noreferrer');
|
const url = this.whatsappUrl();
|
||||||
|
|
||||||
|
if (url) {
|
||||||
|
window.open(url, '_blank', 'noopener,noreferrer');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user