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-08-27 02:28:44 +03:00
commit a8fbe75527
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,6 @@ export default class VariantsList extends React.Component
render()
{
const { number, variants, variants_types, selected, blocked, loading } = this.props;
console.log("variants_typesvariants_typesvariants_typesvariants_typesvariants_types");
console.log(variants_types);
return (
@ -86,25 +85,25 @@ export default class VariantsList extends React.Component
<input type="checkbox" hidden id={ `variant_${ index }` } name="variants" disabled={ disabled } checked={ selected.indexOf(variant.type) > -1 ? true : false } onChange={ () => { this._handle_onVariant(variant.type) } }/>
<label htmlFor={ `variant_${ index }` } className="unselectable"
style={ disabled ? { color: "#A8026B", textDecoration: "line-through", } : {} }>{ variant.title }</label>
<div className="help_tooltip">
<div className="help_icon">
<svg width={ 24 } height={ 24 } fill="none" xmlns="http://www.w3.org/2000/svg" >
<path d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Z" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
<path d="M11.25 11.25H12v5.25h.75" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
<path d="M12 9a1.125 1.125 0 1 0 0-2.25A1.125 1.125 0 0 0 12 9Z" fill="#8E94A7" />
</svg>
</div>
{ help !== null && (
<div className="help_content">
{" "}
{/* opened */}
<div>
<p dangerouslySetInnerHTML={{ __html: help }}/>
<p className="button">Закрыть</p>
</div>
{ help !== null && (
<div className="help_tooltip">
<div className="help_icon">
<svg width={ 24 } height={ 24 } fill="none" xmlns="http://www.w3.org/2000/svg" >
<path d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Z" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
<path d="M11.25 11.25H12v5.25h.75" stroke="#8E94A7" strokeWidth={ 2 } strokeLinecap="round" strokeLinejoin="round" />
<path d="M12 9a1.125 1.125 0 1 0 0-2.25A1.125 1.125 0 0 0 12 9Z" fill="#8E94A7" />
</svg>
</div>
) }
</div>
<div className="help_content">
{" "}
{/* opened */}
<div>
<p dangerouslySetInnerHTML={{ __html: help }}/>
<p className="button">Закрыть</p>
</div>
</div>
</div>
) }
</div>
)
}) }

9
pages/contract/change/index.js
View File

@ -347,11 +347,8 @@ class ChangeGraphicPage extends React.Component
<>
{ variants.enable_addcontract === false ? (
<div className="block alert">
<p>
Внимание! Существует активное неподписанное дополнительное
соглашение. Расчёт новых изменений невозможен
</p>
<Link href={`/contract/${ number }/agreement`}><a>Подробнее</a></Link>
<p>{ variants.comment !== null ? variants.comment : "Внимание! Существует активное неподписанное дополнительное соглашение. Расчёт новых изменений невозможен." }</p>
{ variants.comment === null && (<Link href={`/contract/${ number }/agreement`}><a>Подробнее</a></Link>) }
</div>
) : (
<></>
@ -376,7 +373,7 @@ class ChangeGraphicPage extends React.Component
variants_types={ variants_types }
selected={ variants_selected }
loading={ variants_loading }
blocked={ variants.enable_addcontract === false ? false : false }
blocked={ variants.enable_addcontract === false ? true : false }
/>
{/*}
{ variants.enable_addcontract !== false && (