Merge branch 'master' into develop
This commit is contained in:
@@ -23,10 +23,10 @@ import FormField from '../../components/FormField';
|
||||
import { Button } from 'primereact/button';
|
||||
import BlockingOverlay from '../../components/BlockingOverlay';
|
||||
import { InputText } from 'primereact/inputtext';
|
||||
import FileuploadDelega from '../../components/FileuploadDelega';
|
||||
//import FileuploadDelega from '../../components/FileuploadDelega';
|
||||
import { Toast } from 'primereact/toast';
|
||||
import getFormatedFileSizeText from '../../helpers/getFormatedFileSizeText';
|
||||
import { defaultMaxFileSize } from '../../configData';
|
||||
//import getFormatedFileSizeText from '../../helpers/getFormatedFileSizeText';
|
||||
//import { defaultMaxFileSize } from '../../configData';
|
||||
import { Dialog } from 'primereact/dialog';
|
||||
import { confirmPopup, ConfirmPopup } from 'primereact/confirmpopup';
|
||||
|
||||
@@ -37,7 +37,7 @@ const ProfileCompany = () => {
|
||||
const infoMsgs = useRef(null);
|
||||
const [formInitialData, setFormInitialData] = useState({});
|
||||
const [delegaData, setDelegaData] = useState({});
|
||||
const [delega, setDelega] = useState([]);
|
||||
//const [delega, setDelega] = useState([]);
|
||||
const [isVisibleRemoveDialog, setIsVisibleRemoveDialog] = useState(false);
|
||||
const { delegaFirstName = '', delegaLastName = '', delegaCodiceFiscale = '' } = delegaData;
|
||||
const toast = useRef(null);
|
||||
@@ -161,11 +161,11 @@ const ProfileCompany = () => {
|
||||
setDelegaData(newDelegaData)
|
||||
}
|
||||
|
||||
const setDelegaFile = (name, value) => {
|
||||
/*const setDelegaFile = (name, value) => {
|
||||
setDelega(value);
|
||||
}
|
||||
}*/
|
||||
|
||||
const getDellegaCallback = (data) => {
|
||||
/*const getDellegaCallback = (data) => {
|
||||
if (data.data) {
|
||||
setDelega([data.data]);
|
||||
}
|
||||
@@ -175,7 +175,7 @@ const ProfileCompany = () => {
|
||||
const errDellegaCallback = () => {
|
||||
setDelega([]);
|
||||
storeSet.main.unsetAsyncRequest();
|
||||
}
|
||||
}*/
|
||||
|
||||
const downloadDelega = () => {
|
||||
storeSet.main.setAsyncRequest();
|
||||
@@ -338,14 +338,14 @@ const ProfileCompany = () => {
|
||||
setFormInitialData(companyData);
|
||||
}, [chosenCompanyId, companies]);
|
||||
|
||||
useEffect(() => {
|
||||
/*useEffect(() => {
|
||||
if (formInitialData.id) {
|
||||
storeSet.main.setAsyncRequest();
|
||||
CompanyService.getCompanyDelega(getDellegaCallback, errDellegaCallback, [
|
||||
['companyId', formInitialData.id]
|
||||
]);
|
||||
}
|
||||
}, [formInitialData])
|
||||
}, [formInitialData])*/
|
||||
|
||||
return (
|
||||
<div className="appPage">
|
||||
@@ -516,7 +516,7 @@ const ProfileCompany = () => {
|
||||
? <div className="appForm__delegaForm">
|
||||
<div className="appForm__delegaFormHeader">
|
||||
<legend>{__('Compilazione Delega', 'gepafin')}</legend>
|
||||
<p className="appForm__delegaFormText">{__('Per procedere come delegato, compila il form seguente, scarica il documento della delega, fallo firmare dal rappresentante legale e ricaricalo.', 'gepafin')}</p>
|
||||
<p className="appForm__delegaFormText">{__('Per procedere come delegato, compila il form seguente, scarica il documento della delega, fallo firmare dal rappresentante legale.', 'gepafin')}</p>
|
||||
</div>
|
||||
|
||||
<div className="appForm__cols">
|
||||
@@ -563,7 +563,7 @@ const ProfileCompany = () => {
|
||||
icon="pi pi-check" iconPos="right"/>
|
||||
</div>
|
||||
|
||||
<div className="appForm__field">
|
||||
{/*<div className="appForm__field">
|
||||
<label htmlFor="delega">
|
||||
{__('Carica documento Delega Firmato', 'gepafin')}
|
||||
<span className="appForm__field--required">*</span>
|
||||
@@ -580,7 +580,7 @@ const ProfileCompany = () => {
|
||||
doctype="document"
|
||||
companyId={formInitialData.id}
|
||||
/>
|
||||
</div>
|
||||
</div>*/}
|
||||
|
||||
{/*<div className="appForm__delegaFormActions">
|
||||
<Button
|
||||
|
||||
Reference in New Issue
Block a user