From 679e404dc8a45b8174e34f2628054296840cf859 Mon Sep 17 00:00:00 2001 From: sdarbinyan Date: Tue, 5 May 2026 11:23:07 +0400 Subject: [PATCH] removed default Co-authored-by: Copilot --- src/app/fastcheck.service.ts | 2 +- src/app/pages/create-page/create-page.ts | 16 +++---- .../pages/fastcheck-page/fastcheck-page.html | 42 +++++++++---------- .../pages/fastcheck-page/fastcheck-page.scss | 6 +++ 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/app/fastcheck.service.ts b/src/app/fastcheck.service.ts index 8e7d199..3257096 100644 --- a/src/app/fastcheck.service.ts +++ b/src/app/fastcheck.service.ts @@ -2,7 +2,7 @@ export interface FastcheckData { fastcheck: string; - amount: number; + amount: number | null; code: string; expiration?: string; } diff --git a/src/app/pages/create-page/create-page.ts b/src/app/pages/create-page/create-page.ts index cf40a2d..a5ce708 100644 --- a/src/app/pages/create-page/create-page.ts +++ b/src/app/pages/create-page/create-page.ts @@ -66,7 +66,7 @@ export class CreatePage { minAmount = signal(30); maxAmount = signal(200_000); - amount = signal(100); + amount = signal(null); note = signal(''); error = signal(''); loading = signal(false); @@ -122,11 +122,11 @@ export class CreatePage { createCheck(): void { const val = this.amount(); - if (!val || val < this.minAmount()) { + if (val !== null && val < this.minAmount()) { this.error.set(`${this.t('errors.invalid_amount')} (мин. ${this.minAmount()} ₽)`); return; } - if (val > this.maxAmount()) { + if (val !== null && val > this.maxAmount()) { this.error.set(`${this.t('errors.invalid_amount')} (макс. ${this.maxAmount().toLocaleString('ru')} ₽)`); return; } @@ -145,7 +145,7 @@ export class CreatePage { `${QR_VITANOVA_API}/qr`, { qrtype: 'QRDynamic', - amount: val, + ...(val !== null ? { amount: val } : {}), currency: this.currency(), partnerqrID, qrDescription: this.note().trim(), @@ -225,7 +225,7 @@ export class CreatePage { this.store.setCreated({ fastcheck: res.fastcheck, code: res.code, - amount: this.amount(), + amount: this.amount() ?? null, expiration: res.expiration }); } @@ -235,9 +235,9 @@ export class CreatePage { }); } - onAmountChange(value: number): void { - this.amount.set(value); - if (value > 0) this.error.set(''); + onAmountChange(value: number | null): void { + this.amount.set(value || null); + if (value && value > 0) this.error.set(''); } onNoteChange(value: string): void { diff --git a/src/app/pages/fastcheck-page/fastcheck-page.html b/src/app/pages/fastcheck-page/fastcheck-page.html index 353f70d..d010e7f 100644 --- a/src/app/pages/fastcheck-page/fastcheck-page.html +++ b/src/app/pages/fastcheck-page/fastcheck-page.html @@ -55,27 +55,27 @@ } - - @if (fastcheckAmount() !== null && !amountLoading()) { - - } + +
diff --git a/src/app/pages/fastcheck-page/fastcheck-page.scss b/src/app/pages/fastcheck-page/fastcheck-page.scss index 0dad22d..eec9b8e 100644 --- a/src/app/pages/fastcheck-page/fastcheck-page.scss +++ b/src/app/pages/fastcheck-page/fastcheck-page.scss @@ -40,6 +40,12 @@ border-color: #bfdbfe; &:hover { background: #dbeafe; border-color: #93c5fd; } } + + &:disabled { + opacity: .4; + cursor: not-allowed; + pointer-events: none; + } } .btn {