Style error messages.

master
sync 1 year ago
parent e160d3861f
commit 5c1df592e1

@ -1,7 +1,8 @@
import { useState, useEffect, useCallback } from 'react';
import Messages from './Messages.jsx';
import './Form.css';
function Form(props) {
function Form() {
const [firstRender, setFirstRender] = useState(true);
const [payerName, setPayerName] = useState('');
const [payerINN, setPayerINN] = useState('');
@ -23,6 +24,8 @@ function Form(props) {
const [codePurpose, setCodePurpose] = useState('1');
const [taxUINCode, setTaxUINCode] = useState('');
const [messages, setMessages] = useState([]);
const fields = [
{
name: 'payer_name',
@ -135,13 +138,18 @@ function Form(props) {
},
];
const handleBlur = useCallback(() => {
const handleBlur = () => {
setFirstRender(false);
(async () => {
const data = await requestPMTValidationAsyncAwait(fields, 'validate');
props.fillMessages(data);
setMessages(
data.fields?.reduce((acc, item) => {
acc[item.name] = { status: item.status, message: item.message };
return acc;
}, {})
);
})();
}, [fields, props]);
};
const requestPMTValidationAsyncAwait = async (fields, action) => {
const response = await fetch('/pmtvalidation/validate/', {
@ -159,12 +167,6 @@ function Form(props) {
return data;
};
useEffect(() => {
if (!firstRender) {
handleBlur();
}
}, [firstRender, handleBlur, chargesDetails, codePurpose, payerAccount]);
useEffect(() => {
const URLParams = new URLSearchParams(window.location.search);
const cnum = URLParams.get('cnum');
@ -191,168 +193,194 @@ function Form(props) {
}, []);
return (
<div className="payment">
<div className="title_wrapper">
<div className="title">
Рублевый перевод на счета других клиентов или в другие банки, включая
налоговые платежи
<div className="payment_container">
<div
className="payment_form"
style={{
width:
Object.keys(messages)?.filter(
(item) => messages[item]?.status != 'OK'
).length > 0
? '75%'
: '100%',
}}
>
<div className="payment">
<div className="title_wrapper">
<div className="title">
Рублевый перевод на счета других клиентов или в другие банки,
включая налоговые платежи
</div>
<div className="title">2 от 03.07.2024</div>
</div>
<div className="section_wrapper">
<div className="section_header">Плательщик</div>
<div className="section_line"></div>
</div>
<div className="payer">
<div className="child">Плательщик:</div>
<div className="child">{`${payerName} ${clientId}`}</div>
<div className="child">Номер счета:</div>
<div className="child">
<select
value={payerAccount}
onChange={(e) => {
setPayerAccount(e.target.value);
handleBlur();
}}
>
{payerAccounts.map((item, ind) => (
<option key={`cbAccountNumber_${ind}`}>
{item.description
? `${item.cbAccountNumber}|${item.description}`
: item.cbAccountNumber}
</option>
))}
</select>
</div>
<div className="child">ИНН:</div>
<div className="child">{payerINN}</div>
<div className="child">Сумма:</div>
<div className="child">
<span>
<input
value={amount}
onChange={(e) => setAmount(e.target.value)}
onBlur={handleBlur}
/>
RUB
</span>
</div>
<div className="child">Телефон или электронный адрес:</div>
<div className="child">{payerPhoneEmail}</div>
<div className="child"></div>
<div className="child"></div>
<div className="child">Адрес места жительства:</div>
<div className="child">{payerAddress}</div>
<div className="child">Комиссии и расходы:</div>
<div className="child">
<select
value={chargesDetails}
onChange={(e) => {
setChargesDetails(e.target.value);
handleBlur();
}}
>
<option>BEN</option>
<option>OUR</option>
<option>SHA</option>
</select>
</div>
</div>
<div className="section_wrapper_1">
<div className="section_header">Получатель</div>
<div className="section_line"></div>
</div>
<div className="receiver_1">
<div className="child"></div>
<div className="child"></div>
<div className="child">БИК:</div>
<div className="child">
<input
value={bnfBankBic}
onChange={(e) => setBNFBankBic(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
<div className="child"> Корр. счета:</div>
<div className="child">
<select style={{ maxWidth: '34ch' }}>
<option>Выберите значение...</option>
</select>
</div>
<div className="child">Номер счета:</div>
<div className="child">
<input
value={bnfAccount}
onChange={(e) => setBNFAccount(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
<div className="child">ИНН:</div>
<div className="child">
<input
value={bnfINN}
onChange={(e) => setBNFINN(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
<div className="child">КПП (103):</div>
<div className="child">
<input
value={bnfKPP}
onChange={(e) => setBNFKPP(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
</div>
<div className="receiver_2">
<div className="child">Наименование:</div>
<div className="child">
<input
value={bnfName}
onChange={(e) => setBNFName(e.target.value)}
onBlur={handleBlur}
style={{ width: '100ch' }}
/>
</div>
<div className="child">Банк получателя:</div>
<div className="child">{bnfBankName}</div>
<div className="child">Назначение платежа:</div>
<div className="child">
<textarea
value={paymentDetails}
onChange={(e) => setPaymentDetails(e.target.value)}
onBlur={handleBlur}
style={{
height: '60px',
width: '133ch',
}}
/>
</div>
<div className="child">Код вида дохода:</div>
<div className="child">
<select
style={{ width: '102ch' }}
value={codePurpose}
onChange={(e) => {
setCodePurpose(e.target.value);
handleBlur();
}}
>
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
</select>
</div>
<div className="child">Код (УИП) (22):</div>
<div className="child">
<input
value={taxUINCode}
onChange={(e) => setTaxUINCode(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
</div>
</div>
<div className="title">2 от 03.07.2024</div>
</div>
<div className="section_wrapper">
<div className="section_header">Плательщик</div>
<div className="section_line"></div>
</div>
<div className="payer">
<div className="child">Плательщик:</div>
<div className="child">{`${payerName} ${clientId}`}</div>
<div className="child">Номер счета:</div>
<div className="child">
<select
value={payerAccount}
onChange={(e) => setPayerAccount(e.target.value)}
onClick={() => setFirstRender(false)}
>
{payerAccounts.map((item, ind) => (
<option key={`cbAccountNumber_${ind}`}>
{item.description
? `${item.cbAccountNumber}|${item.description}`
: item.cbAccountNumber}
</option>
))}
</select>
</div>
<div className="child">ИНН:</div>
<div className="child">{payerINN}</div>
<div className="child">Сумма:</div>
<div className="child">
<span>
<input
value={amount}
onChange={(e) => setAmount(e.target.value)}
onBlur={handleBlur}
/>
RUB
</span>
</div>
<div className="child">Телефон или электронный адрес:</div>
<div className="child">{payerPhoneEmail}</div>
<div className="child"></div>
<div className="child"></div>
<div className="child">Адрес места жительства:</div>
<div className="child">{payerAddress}</div>
<div className="child">Комиссии и расходы:</div>
<div className="child">
<select
value={chargesDetails}
onChange={(e) => setChargesDetails(e.target.value)}
onClick={() => setFirstRender(false)}
>
<option>BEN</option>
<option>OUR</option>
<option>SHA</option>
</select>
</div>
</div>
<div className="section_wrapper_1">
<div className="section_header">Получатель</div>
<div className="section_line"></div>
</div>
<div className="receiver_1">
<div className="child"></div>
<div className="child"></div>
<div className="child">БИК:</div>
<div className="child">
<input
value={bnfBankBic}
onChange={(e) => setBNFBankBic(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
{Object.keys(messages)?.filter((item) => messages[item]?.status != 'OK')
.length > 0 ? (
<div className="payment_messages">
<Messages messages={messages} />
</div>
<div className="child"> Корр. счета:</div>
<div className="child">
<select style={{ maxWidth: '34ch' }}>
<option>Выберите значение...</option>
</select>
</div>
<div className="child">Номер счета:</div>
<div className="child">
<input
value={bnfAccount}
onChange={(e) => setBNFAccount(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
<div className="child">ИНН:</div>
<div className="child">
<input
value={bnfINN}
onChange={(e) => setBNFINN(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
<div className="child">КПП (103):</div>
<div className="child">
<input
value={bnfKPP}
onChange={(e) => setBNFKPP(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
</div>
<div className="receiver_2">
<div className="child">Наименование:</div>
<div className="child">
<input
value={bnfName}
onChange={(e) => setBNFName(e.target.value)}
onBlur={handleBlur}
style={{ width: '100ch' }}
/>
</div>
<div className="child">Банк получателя:</div>
<div className="child">{bnfBankName}</div>
<div className="child">Назначение платежа:</div>
<div className="child">
<textarea
value={paymentDetails}
onChange={(e) => setPaymentDetails(e.target.value)}
onBlur={handleBlur}
style={{
height: '60px',
width: '133ch',
}}
/>
</div>
<div className="child">Код вида дохода:</div>
<div className="child">
<select
style={{ width: '102ch' }}
value={codePurpose}
onChange={(e) => setCodePurpose(e.target.value)}
onClick={() => setFirstRender(false)}
>
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
</select>
</div>
<div className="child">Код (УИП) (22):</div>
<div className="child">
<input
value={taxUINCode}
onChange={(e) => setTaxUINCode(e.target.value)}
onBlur={handleBlur}
style={{ maxWidth: '32ch' }}
/>
</div>
</div>
) : null}
</div>
);
}

@ -1,8 +1,29 @@
import errorIcon from './assets/error.svg';
import warningIcon from './assets/warning.svg';
function Messages(props) {
return props.messages
.filter((item) => item.status != 'OK')
return Object.keys(props.messages)
?.filter((item) => props.messages[item]?.status !== 'OK')
.map((item, ind) => (
<div key={`messages_${ind}`}>{JSON.stringify(item)}</div>
<div
key={`messages_${ind}`}
style={{
backgroundColor:
props.messages[item].status === 'ERROR' ? '#ffcccc' : '#ffebcc',
width: '500px',
padding: '5px',
border: 'solid 1px',
}}
>
<img
style={{ height: '20px' }}
src={
props.messages[item].status === 'ERROR' ? errorIcon : warningIcon
}
alt="Error"
/>
{props.messages[item].message}
</div>
));
}

@ -1,39 +1,10 @@
import { useMemo, useState } from 'react';
import Form from './Form.jsx';
import Messages from './Messages.jsx';
import './Payment.css';
function Payment() {
const [messages, setMessages] = useState([]);
const fillMessages = (data) => {
setMessages(data);
};
const cachedForm = useMemo(() => <Form fillMessages={fillMessages} />, []);
return (
<>
<div className="payment_container">
<div
className="payment_form"
style={{
width:
messages.fields?.filter((item) => item.status != 'OK')?.length > 0
? '75%'
: '100%',
}}
>
{cachedForm}
</div>
{messages.fields?.length > 0 ? (
<div className="payment_messages">
<Messages
messages={messages.fields?.filter((item) => item.status != 'OK')}
/>
</div>
) : null}
</div>
<Form />
</>
);
}

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 50 50" xml:space="preserve">
<circle style="fill:#D75A4A;" cx="25" cy="25" r="25"/>
<polyline style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;" points="16,34 25,25 34,16
"/>
<polyline style="fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;" points="16,16 25,25 34,34
"/>
</svg>

After

Width:  |  Height:  |  Size: 615 B

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

Before

Width:  |  Height:  |  Size: 4.0 KiB

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 512 512" xml:space="preserve">
<path style="fill:#FF9F19;" d="M445.215,478.835H66.848c-23.67,0-45.079-12.118-57.25-32.418
c-12.182-20.3-12.802-44.883-1.663-65.781L198.889,65.387c12.182-20.17,33.548-32.222,57.142-32.222s44.959,12.052,57.152,32.245
l190.499,314.433c11.585,21.692,10.966,46.274-1.217,66.575C490.294,466.717,468.885,478.835,445.215,478.835z"/>
<path style="fill:#F28618;" d="M445.215,478.835c23.67,0,45.079-12.118,57.25-32.418c12.182-20.3,12.802-44.883,1.217-66.575
L313.184,65.409c-12.193-20.193-33.559-32.245-57.152-32.245v445.67H445.215z"/>
<path style="fill:#486475;" d="M256.031,345.294c-9.215,0-16.693-7.477-16.693-16.693V161.675c0-9.215,7.477-16.693,16.693-16.693
s16.693,7.477,16.693,16.693v166.926C272.724,337.817,265.247,345.294,256.031,345.294z"/>
<path style="fill:#3C4D5C;" d="M256.031,412.061c-9.21,0-16.693-7.498-16.693-16.693s7.483-16.693,16.693-16.693
c9.21,0,16.693,7.498,16.693,16.693S265.241,412.061,256.031,412.061z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save