diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js
index 0e68ae5..d83988d 100644
--- a/src/components/AddPartnerClient.js
+++ b/src/components/AddPartnerClient.js
@@ -54,6 +54,9 @@ const AddParnerClient = (props) => {
const [p_client_type_id, setp_client_type_id] = useState("");
const [p_client_type_label, setp_client_type_label] = useState("");
+ const [p_client_type_financeur, setp_client_type_financeur] = useState("");
+ const [p_client_type_pouvoir_public, setp_client_type_pouvoir_public] = useState("");
+
const [p_client_raison_sociale, setclient_raison_sociale] = useState("");
const [p_client_is_company, setp_client_is_company] = useState("");
@@ -630,6 +633,8 @@ const AddParnerClient = (props) => {
Get_List_Client_Type();
Getall_Partner_Paiement_Condition();
Get_List_Of_All_PJ(props.client_id);
+ Get_List_Type_Financeur();
+ Get_List_Type_Pouvoir_Public();
if (String(props.new_customer) !== "1") {
setformedit_mode("0");
@@ -656,7 +661,7 @@ const AddParnerClient = (props) => {
const [has_client_invoice_email, sethas_client_invoice_email] = useState();
-
+
const [fillfield_api, setfillfield_api] = useState("");
const [fillfield_result, setfillfield_result] = useState("");
const [fillfield_message, setfillfield_message] = useState("");
@@ -763,6 +768,22 @@ const AddParnerClient = (props) => {
else
setclient_tva("");
+
+ if (mylocalclient.type_financeur_id)
+ setp_client_type_financeur(mylocalclient.type_financeur_id);
+ else
+ setp_client_type_financeur("");
+
+
+ if (mylocalclient.type_pouvoir_public_id)
+ setp_client_type_pouvoir_public(mylocalclient.type_pouvoir_public_id);
+
+ else
+ setp_client_type_pouvoir_public("");
+
+
+
+
if (mylocalclient.website)
setclient_website(mylocalclient.website);
else
@@ -776,7 +797,7 @@ const AddParnerClient = (props) => {
// Remplissage des doonées de facturation
if (mylocalclient.invoice_email)
setclient_invoice_email(mylocalclient.invoice_email);
- else{
+ else {
setclient_invoice_email("");
sethas_client_invoice_email("0");
}
@@ -804,7 +825,7 @@ const AddParnerClient = (props) => {
if (mylocalclient.invoice_condition_paiement_id)
setp_client_invoice_paiement_condition_id(mylocalclient.invoice_condition_paiement_id);
- else{
+ else {
setp_client_invoice_paiement_condition_id("");
sethas_client_invoice_email("0");
}
@@ -1161,6 +1182,14 @@ const AddParnerClient = (props) => {
document.getElementsByName("client_type_id")[0].value = "";
}
+ if (document.getElementsByName("client_type_financeur_id") && document.getElementsByName("client_type_financeur_id")[0]) {
+ document.getElementsByName("client_type_financeur_id")[0].value = "";
+ }
+
+ if (document.getElementsByName("client_type_pouvoir_public_id") && document.getElementsByName("client_type_pouvoir_public_id")[0]) {
+ document.getElementsByName("client_type_pouvoir_public_id")[0].value = "";
+ }
+
if (document.getElementsByName("client_tva")) {
@@ -1227,6 +1256,19 @@ const AddParnerClient = (props) => {
document.getElementsByName("client_type_id")[0].style.backgroundColor = "#ECEFF1";
}
+
+ if (document.getElementsByName("client_type_financeur_id") && document.getElementsByName("client_type_financeur_id")[0]) {
+ document.getElementsByName("client_type_financeur_id")[0].disabled = true;
+ document.getElementsByName("client_type_financeur_id")[0].style.backgroundColor = "#ECEFF1";
+ }
+
+ if (document.getElementsByName("client_type_pouvoir_public_id") && document.getElementsByName("client_type_pouvoir_public_id")[0]) {
+ document.getElementsByName("client_type_pouvoir_public_id")[0].disabled = true;
+ document.getElementsByName("client_type_pouvoir_public_id")[0].style.backgroundColor = "#ECEFF1";
+ }
+
+
+
if (document.getElementsByName("client_tva") && document.getElementsByName("client_tva")[0]) {
document.getElementsByName("client_tva")[0].disabled = true;
document.getElementsByName("client_tva")[0].style.backgroundColor = "#ECEFF1";
@@ -1297,6 +1339,19 @@ const AddParnerClient = (props) => {
document.getElementsByName("client_type_id")[0].style.backgroundColor = "#FFFFFF";
}
+
+ if (document.getElementsByName("client_type_financeur_id") && document.getElementsByName("client_type_financeur_id")[0]) {
+ document.getElementsByName("client_type_financeur_id")[0].disabled = false;
+ document.getElementsByName("client_type_financeur_id")[0].style.backgroundColor = "#FFFFFF";
+ }
+
+ if (document.getElementsByName("client_type_pouvoir_public_id") && document.getElementsByName("client_type_pouvoir_public_id")[0]) {
+ document.getElementsByName("client_type_pouvoir_public_id")[0].disabled = false;
+ document.getElementsByName("client_type_pouvoir_public_id")[0].style.backgroundColor = "#FFFFFF";
+ }
+
+
+
if (document.getElementsByName("client_tva")) {
document.getElementsByName("client_tva")[0].disabled = false;
document.getElementsByName("client_tva")[0].style.backgroundColor = "#FFFFFF";
@@ -1587,6 +1642,9 @@ const AddParnerClient = (props) => {
form.append("is_client", "0");
form.append("invoice_automatique", p_detail_facturation_automatique);
+ form.append("type_financeur_id", p_client_type_financeur);
+
+ form.append("type_pouvoir_public_id", p_client_type_pouvoir_public);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Partner_Client/";
@@ -1757,6 +1815,11 @@ const AddParnerClient = (props) => {
form.append("is_client", "0");
+ form.append("type_financeur_id", p_client_type_financeur);
+
+ form.append("type_pouvoir_public_id", p_client_type_pouvoir_public);
+
+
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Update_Partner_Client/";
axios.post(myurl, form).then(res => {
@@ -1813,23 +1876,23 @@ const AddParnerClient = (props) => {
form.append("email", p_client_email);
form.append("nom", p_client_nom);
- // Données de facturation
- var client_invoice_email = p_client_invoice_email
-
+ // Données de facturation
+ var client_invoice_email = p_client_invoice_email
+
var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
- if (String(client_invoice_email) === "" || !client_invoice_email.match(validRegex) ) {
+ if (String(client_invoice_email) === "" || !client_invoice_email.match(validRegex)) {
alert("L'adresse email de facturation est invalide.");
return;
}
- if( String(p_client_invoice_paiement_condition_id).trim() === ""){
+ if (String(p_client_invoice_paiement_condition_id).trim() === "") {
alert(" Vous devez choisir une condition de paiement");
return;
}
-
-
+
+
form.append("invoice_email", client_invoice_email);
var client_invoice_nom = p_client_invoice_nom;
@@ -1838,21 +1901,21 @@ const AddParnerClient = (props) => {
var client_invoice_siret = p_client_invoice_siret;
-
+
form.append("invoice_siret", client_invoice_siret);
var client_invoice_tva = p_client_invoice_tva;
-
+
form.append("invoice_tva", client_invoice_tva);
form.append("invoice_condition_paiement_id", p_client_invoice_paiement_condition_id);
-
+
var client_invoice_adresse = p_client_invoice_adresse;
-
+
form.append("invoice_adresse", client_invoice_adresse);
var client_invoice_ville = p_client_invoice_ville;
@@ -1861,7 +1924,7 @@ const AddParnerClient = (props) => {
var client_invoice_code_postal = p_client_invoice_code_postal;
-
+
form.append("invoice_code_postal", client_invoice_code_postal);
@@ -1889,7 +1952,7 @@ const AddParnerClient = (props) => {
alert(" Les données de facturation ont été mises à jour.")
Disable_invoice_fields();
sethas_client_invoice_email("");
- alert(res.data.message);
+ alert(res.data.message);
}
@@ -2704,7 +2767,7 @@ const AddParnerClient = (props) => {
}
if (file_1_name && file_1_name.name) {
- console.log(" ### Traitement de : ", file_1_name.name);
+
const formData = new FormData();
formData.append('File', file_1_name);
@@ -2880,8 +2943,142 @@ const AddParnerClient = (props) => {
// -- end gestion pièces jointes
+ const [New_Get_List_Type_Financeur_result, setNew_Get_List_Type_Financeur_result] = useState([]);
+
+ const [Get_List_Type_Financeur_api, setGet_List_Type_Financeur_api] = useState();
+ const [Get_List_Type_Financeur_message, setGet_List_Type_Financeur_message] = useState();
+ const [Get_List_Type_Financeur_result, setGet_List_Type_Financeur_result] = useState();
+ function Get_List_Type_Financeur() {
+
+ var form = new FormData();
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Type_Organisme_Financement/";
+
+ axios.post(myurl, form).then(res => {
+
+ if (String(res.data.status) === "true") {
+ //console.log(" In Get_List_Type_Financeur res.data.status = " + res.data.status);
+ //console.log(" In Get_List_Type_Financeur res.data.message r_class = " + res.data.message);
+ setGet_List_Type_Financeur_api("true");
+ setGet_List_Type_Financeur_result(res.data.message);
+
+ var new_data2 = [];
+ const new_data = res.data.message.map((x) => {
+
+ //---
+
+ var _id = JSON.parse(x)._id;
+ var code = JSON.parse(x).code;
+ var description = JSON.parse(x).description;
+
+
+ //---
+ var node = {
+ "_id": _id,
+ "code": code,
+ "description": description,
+ "label": code,
+ };
+ //console.log(" --- node = ", node);
+ new_data2.push(node);
+ });
+
+ var node = {
+ "_id": "",
+ "code": "",
+ "description": "",
+ "label": "",
+ };
+ //console.log(" --- node = ", node);
+ new_data2.push(node);
+ if (new_data2.length > 0)
+ setNew_Get_List_Type_Financeur_result(new_data2);
+ }
+ else {
+ setGet_List_Type_Financeur_api("false");
+ setGet_List_Type_Financeur_message(res.data.message);
+ alert(res.data.message);
+ }
+
+ }).catch((error) => {
+ console.warn('Not good man :( Get_List_Type_Financeur = ', error);
+ setGet_List_Type_Financeur_api("false");
+ alert(" Impossible de recuperer Get_List_Type_Financeur");
+ //setmyApimyApiMessage("")
+ })
+ }
+
+
+ const [New_Get_List_Type_Pouvoir_Public_result, setNew_Get_List_Type_Pouvoir_Public_result] = useState([]);
+
+ const [Get_List_Type_Pouvoir_Public_api, setGet_List_Type_Pouvoir_Public_api] = useState();
+ const [Get_List_Type_Pouvoir_Public_message, setGet_List_Type_Pouvoir_Public_message] = useState();
+ const [Get_List_Type_Pouvoir_Public_result, setGet_List_Type_Pouvoir_Public_result] = useState();
+ function Get_List_Type_Pouvoir_Public() {
+
+ var form = new FormData();
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+
+
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Type_Pouvoir_Public/";
+
+ axios.post(myurl, form).then(res => {
+
+ if (String(res.data.status) === "true") {
+ //console.log(" In Get_List_Type_Pouvoir_Public res.data.status = " + res.data.status);
+ //console.log(" In Get_List_Type_Pouvoir_Public res.data.message r_class = " + res.data.message);
+ setGet_List_Type_Pouvoir_Public_api("true");
+ setGet_List_Type_Pouvoir_Public_result(res.data.message);
+
+ var new_data2 = [];
+ const new_data = res.data.message.map((x) => {
+
+ //---
+
+ var _id = JSON.parse(x)._id;
+ var code = JSON.parse(x).code;
+ var description = JSON.parse(x).description;
+
+
+ //---
+ var node = {
+ "_id": _id,
+ "code": code,
+ "description": description,
+ "label": code + " - " + description,
+ };
+ //console.log(" --- node = ", node);
+ new_data2.push(node);
+ });
+
+ var node = {
+ "_id": "",
+ "code": "",
+ "description": "",
+ "label": "",
+ };
+ //console.log(" --- node = ", node);
+ new_data2.push(node);
+ if (new_data2.length > 0)
+ setNew_Get_List_Type_Pouvoir_Public_result(new_data2);
+ }
+ else {
+ setGet_List_Type_Pouvoir_Public_api("false");
+ setGet_List_Type_Pouvoir_Public_message(res.data.message);
+ alert(res.data.message);
+ }
+
+ }).catch((error) => {
+ console.warn('Not good man :( Get_List_Type_Pouvoir_Public = ', error);
+ setGet_List_Type_Pouvoir_Public_api("false");
+ alert(" Impossible de recuperer Get_List_Type_Pouvoir_Public");
+ //setmyApimyApiMessage("")
+ })
+ }
return (
@@ -2910,7 +3107,7 @@ const AddParnerClient = (props) => {
},
}}
- /> Société
+ /> Société
{
inputProps={{ 'aria-label': 'B' }}
/> Particulier
+ {
+ DataEditMode();
+ setp_client_is_company('2');
+ }}
+ value="2"
+ name="radio-buttons"
+ inputProps={{ 'aria-label': 'C' }}
+
+ /> P. Public
@@ -2971,6 +3179,8 @@ const AddParnerClient = (props) => {
if (value && value._id) {
setp_client_type_id(value._id);
+ } else {
+ setp_client_type_id("");
}
}}
//value={p_one_detail_client_rattachement_nom}
@@ -2983,39 +3193,71 @@ const AddParnerClient = (props) => {
/>
- {/* {
- setp_client_type_id(e.target.value);
-
- }}
- >
-
- {Get_List_Client_Type_result &&
- Get_List_Client_Type_result.map((myclass) => (
-
- ))}
-
-
- */}
+ {p_client_is_financeur === true && Type Financeur
+
+
{
+ if (value && value._id) {
+ setp_client_type_financeur(value._id);
+
+ } else {
+
+ setp_client_type_financeur("");
+
+ }
+ }}
+ //value={p_one_detail_client_rattachement_nom}
+
+ renderInput={(params) =>
+ }
+ />
+
+
+ }
+
+ {p_client_is_company && String(p_client_is_company) === "2" && Type P. Public
+
+
{
+ if (value && value._id) {
+ setp_client_type_pouvoir_public(value._id);
+
+ } else {
+
+ setp_client_type_pouvoir_public("");
+
+ }
+ }}
+ //value={p_one_detail_client_rattachement_nom}
+
+ renderInput={(params) =>
+ }
+ />
+
+
+ }
+
+
N° Siret
{
@@ -3406,6 +3661,39 @@ const AddParnerClient = (props) => {
/>
}
+ {String(formedit_mode) !== "1" && p_client_is_financeur === true &&
+ New_Get_List_Type_Financeur_result && New_Get_List_Type_Financeur_result.length > 1 && Type Financeur
+ (data)._id === String(p_client_type_financeur))[0].label}
+ />
+
}
+
+ {String(formedit_mode) !== "1" && p_client_is_company && String(p_client_is_company) === "2" &&
+ New_Get_List_Type_Pouvoir_Public_result && New_Get_List_Type_Pouvoir_Public_result.length > 1 && Type P. Public
+
+ (data)._id === String(p_client_type_pouvoir_public))[0].code}
+ />
+
}
+
{New_Get_List_Client_Type_result && New_Get_List_Client_Type_result.length > 1 &&
String(formedit_mode) === "1" && Type client
@@ -3433,34 +3721,66 @@ const AddParnerClient = (props) => {
/>
}
/>
- {/* {
- setp_client_type_id(e.target.value);
+
}
- }}
- >
- {Get_List_Client_Type_result &&
- Get_List_Client_Type_result.map((myclass) => (
-