From 640da80de4501018eade098e05ff02a6e7b89c30 Mon Sep 17 00:00:00 2001 From: merelendor Date: Tue, 13 Sep 2022 10:52:25 +0300 Subject: [PATCH] updates for appeal request, fines --- .../change/components/Options/index.js | 18 ++++++- pages/contract/components/InnerMenu/index.js | 2 +- pages/contract/fines.js | 2 +- pages/support/request.js | 51 ++++++++++++------- 4 files changed, 50 insertions(+), 23 deletions(-) diff --git a/pages/contract/change/components/Options/index.js b/pages/contract/change/components/Options/index.js index 40fa174..4a0c01c 100644 --- a/pages/contract/change/components/Options/index.js +++ b/pages/contract/change/components/Options/index.js @@ -325,14 +325,28 @@ class SumSelector extends React.Component _handle_onMin = () => { + const { onOption } = this.props; const { min } = this.state; - this.setState({ value: min }); + + const value = parseFloat(min).toFixed(2); + + this.setState({ value }, () => + { + onOption(value, false); + }); } _handle_onMax = () => { + const { onOption } = this.props; const { max } = this.state; - this.setState({ value: max }); + + const value = parseFloat(max).toFixed(2); + + this.setState({ value }, () => + { + onOption(value, false); + }); } _handle_onMobileHelp = () => diff --git a/pages/contract/components/InnerMenu/index.js b/pages/contract/components/InnerMenu/index.js index 5a2a8ad..495ba31 100644 --- a/pages/contract/components/InnerMenu/index.js +++ b/pages/contract/components/InnerMenu/index.js @@ -174,7 +174,7 @@ class InnerMenu extends React.Component { for(let i in contract_fines[number]) { - if(contract_fines[number][i].status_code === "NotPaid") + if(contract_fines[number][i].status_code === "NotPaid" || contract_fines[number][i].status_code === "PaidEvolution") { c++; } diff --git a/pages/contract/fines.js b/pages/contract/fines.js index fbd90bc..c235fb3 100644 --- a/pages/contract/fines.js +++ b/pages/contract/fines.js @@ -119,7 +119,7 @@ class ContractFinesPage extends React.Component const status = { NotPaid: "danger", - PaidEvolution: "success", + PaidEvolution: "danger", PaidIndependently: "success", }; diff --git a/pages/support/request.js b/pages/support/request.js index 703ba59..9f10071 100644 --- a/pages/support/request.js +++ b/pages/support/request.js @@ -26,43 +26,48 @@ import { sendAppealAttachments } from "../../actions"; +const LIMIT = 10000000; + class FileDropzone extends React.Component { constructor(props) { super(props); - this.state = {} + this.state = {}; } render() { const { files, onAddFile, onDeleteFile } = this.props; + return ( <> { files.length > 0 && (
-

Приложенные файлы

- { files.map((file, index) => ( -

{ file.name } onDeleteFile(file.name) }>[ удалить ]

- )) } +

Приложенные файлы ({ files.length }/5)

+ { files.map((file, index) => ( +

{ file.size > LIMIT && (Ошибка, превышен допустимый размер файла в 10 мб.) } { file.name } - { parseFloat(file.size / 1000000).toFixed(file.size < 100000 ? 3 : 2) } мб. onDeleteFile(file.name) }>[ удалить ]

+ )) }
) } - onAddFile(acceptedFiles) }> - { ({getRootProps, getInputProps}) => ( -
-
-
-

- Перенесите файлы на экран для быстрой загрузки или выберите файл с компьютера -

- + { files.length < 5 && ( + onAddFile(acceptedFiles) }> + { ({getRootProps, getInputProps}) => ( +
+
+
+

+ Перенесите файлы на экран для быстрой загрузки или выберите файл с компьютера +

+ +
+
- -
- ) } - + ) } + + ) } ) } @@ -346,12 +351,20 @@ class SupportRequestPage extends React.Component _checkDisabled = () => { - const { phone, email, question, } = this.state; + const { phone, email, question, files } = this.state; if(phone === "" || email === "" || question === "") { return true; } + for(let i in files) + { + if(files[i].size > LIMIT) + { + return true; + } + } + return false; }