evo/evoleasing-account
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/merelendor/evoleasing-account

Browse Source
This commit is contained in:
merelendor 2022-09-08 10:06:49 +03:00
commit 8a045ba678
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/contract/change/components/VariantsList/index.js
View File

@ -126,7 +126,9 @@ export default class VariantsList extends React.Component
</div>
)
}) }
<button className="button button-blue" disabled={ blocked || loading ? true : selected.length > 0 ? false : true } onClick={ this._handle_onOptions }>Далее</button>
{ selected !== undefined && selected !== null && (
<button className="button button-blue" disabled={ blocked || loading ? true : selected.length > 0 ? false : true } onClick={ this._handle_onOptions }>Далее</button>
)}
</form>
</div>
{ loading && (

4
pages/settings/components/InnerMenu/index.js
View File

@ -64,7 +64,7 @@ export default class InnerMenu extends React.Component
render()
{
const { user, observer } = this.props;
const { menuOpened, } = this.state;
const { menu, menuOpened, } = this.state;
return (
<aside>
@ -72,7 +72,7 @@ export default class InnerMenu extends React.Component
{ this.props.router && this._getActiveLink(this.props.router.asPath) }
</button>
<ul className={ menuOpened ? "aside_nav open" : "aside_nav" } ref={ this.menuRef }>
{ menu.map(item =>
{ user !== undefined && user !== null && menu.map(item =>
{
if(item.type === "admin" && !observer && !user.is_admin) { return null; }

15
pages/support/appeals.js
View File

@ -137,7 +137,6 @@ class SupportAppealsPage extends React.Component
<>
{ appeals.list.map((appeal, index) =>
{
console.log("appeal >>>>>>>", appeal);
if(active) { if(appeal.status !== "active") { return null; } }
return (
@ -154,11 +153,17 @@ class SupportAppealsPage extends React.Component
<div className="item_text">
<p><b>Тема запроса</b></p>
<p>{ appeal.subject }</p>
{ appeal.client_request !== null && appeal.client_request !== "" && (
<>
<p><b>Текст запроса</b></p>
<p>{ appeal.client_request }</p>
</>
) }
{ appeal.documents.length > 0 && (
<div className="dosc_list medium-icon">
{ appeal.documents.map((file, index) => {
if(file.doc_direction !== "outgoing") { return null; }
return (<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ file.doc_name } extension={ file.doc_extension }/>)
if(file.doc_direction !== "incoming") { return null; }
return (<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ `${ file.doc_name }.${ file.doc_extension }` } extension={ file.doc_extension } title="Скачать документ"/>)
}) }
</div>
) }
@ -169,8 +174,8 @@ class SupportAppealsPage extends React.Component
{ appeal.documents.length > 0 && (
<div className="dosc_list medium-icon">
{ appeal.documents.map((file, index) => {
if(file.doc_direction !== "incoming") { return null; }
(<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ file.doc_name } extension={ file.doc_extension }/>)
if(file.doc_direction !== "outgoing") { return null; }
return (<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ `${ file.doc_name }.${ file.doc_extension }` } extension={ file.doc_extension } title="Скачать документ"/>)
}) }
</div>
) }

4
pages/support/components/RequestFile/index.js
View File

@ -31,7 +31,7 @@ export default class RequestFile extends React.Component
render()
{
const { filename, extension } = this.props;
const { filename, extension, title } = this.props;
const { downloading } = this.state;
return (
@ -39,7 +39,7 @@ export default class RequestFile extends React.Component
<p className="doc_name i-pdf extension" data-format={ extension } style={{ flexDirection: "column", display: "flex", alignItems: "flex-start", }}>
{ filename }
<span style={{ position: "relative", color: downloading ? "#8e94a780" : "#8e94a7", }}>
Скачать шаблон{ downloading ? (<SpinnerCircular size={ 20 } thickness={ 100 } speed={ 100 } color="rgba(236, 239, 244, 1)" secondaryColor="rgba(28, 1, 169, 1)" style={{ position: "absolute", right: 0, marginRight: "-26px", top: 0, }} />) : null }
{ title ? title : "Скачать шаблон" } { downloading ? (<SpinnerCircular size={ 20 } thickness={ 100 } speed={ 100 } color="rgba(236, 239, 244, 1)" secondaryColor="rgba(28, 1, 169, 1)" style={{ position: "absolute", right: 0, marginRight: "-26px", top: 0, }} />) : null }
</span>
</p>
</div>