diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 69d8a6f..6b19b64 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -3637,7 +3637,7 @@ const AddClassManual = (props) => { const otherSetting = { height: 300, - yAxis: [{ label: 'rainfall (mm)' }], + yAxis: [{ label: '' }], grid: { horizontal: true }, sx: { [`& .${axisClasses.left} .${axisClasses.label}`]: { diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index 9ccff3e..728e099 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -32,7 +32,7 @@ import { IoCloseCircleOutline } from "react-icons/io5"; import AttachFileIcon from '@mui/icons-material/AttachFile'; import Radio from '@mui/material/Radio'; - +import WarningAmberIcon from '@mui/icons-material/WarningAmber'; const AddParnerClient = (props) => { const history = useHistory(); const [submenu, setsubmenu] = useState(""); @@ -182,7 +182,7 @@ const AddParnerClient = (props) => { document.getElementById("submenu_activite").style.background = "#d8edfc"; document.getElementById("submenu_activite").style.color = "#3b3e40"; - + document.getElementById("submenu_donnee_facturation").style.background = "#d8edfc"; document.getElementById("submenu_donnee_facturation").style.color = "#3b3e40"; @@ -653,6 +653,10 @@ const AddParnerClient = (props) => { }, [props.client_mail,]); + + 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(""); @@ -673,7 +677,7 @@ const AddParnerClient = (props) => { //console.log(" In fillfield res.data.message = " + res.data.message); setfillfield_api("true"); setfillfield_result(res.data.message); - var mylocalclient = JSON.parse(res.data.message); + var mylocalclient = JSON.parse(res.data.message); if (mylocalclient) { @@ -772,8 +776,10 @@ 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"); + } if (mylocalclient.invoice_nom) setclient_invoice_nom(mylocalclient.invoice_nom); @@ -798,8 +804,10 @@ 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"); + } if (mylocalclient.invoice_condition_paiement_code) setp_client_invoice_paiement_condition_code(mylocalclient.invoice_condition_paiement_code); @@ -1059,6 +1067,8 @@ const AddParnerClient = (props) => { } + const [client_has_communication_contact, setclient_has_communication_contact] = useState(); + const [Get_List_Contact_Of_client_Part_api, setGet_List_Contact_Of_client_Part_api] = useState(); const [Get_List_Contact_Of_client_Part_message, setGet_List_Contact_Of_client_Part_message] = useState(); const [Get_List_Contact_Of_client_Part_result, setGet_List_Contact_Of_client_Part_result] = useState(); @@ -1084,6 +1094,18 @@ const AddParnerClient = (props) => { setGet_List_Contact_Of_client_Part_api("true"); setGet_List_Contact_Of_client_Part_result(res.data.message); + var contact_com = "0"; + + const new_data = res.data.message.map((x) => { + + //--- + var include_com = JSON.parse(x).include_com; + if (String(include_com) === "1") { + contact_com = "1" + } + }); + + setclient_has_communication_contact(contact_com); } else if (String(res.data.status) === String("Err_Connexion")) { alert('Erreur: ' + res.data.message); @@ -1215,12 +1237,12 @@ const AddParnerClient = (props) => { document.getElementsByName("client_website")[0].style.backgroundColor = "#ECEFF1"; } - if (document.getElementsByName("client_code_postal") && document.getElementsByName("client_code_postal")[0] ) { + if (document.getElementsByName("client_code_postal") && document.getElementsByName("client_code_postal")[0]) { document.getElementsByName("client_code_postal")[0].disabled = true; document.getElementsByName("client_code_postal")[0].style.backgroundColor = "#ECEFF1"; } - if (document.getElementsByName("client_telephone")&& document.getElementsByName("client_telephone")[0]) { + if (document.getElementsByName("client_telephone") && document.getElementsByName("client_telephone")[0]) { document.getElementsByName("client_telephone")[0].disabled = true; document.getElementsByName("client_telephone")[0].style.backgroundColor = "#ECEFF1"; } @@ -1791,57 +1813,61 @@ const AddParnerClient = (props) => { form.append("email", p_client_email); form.append("nom", p_client_nom); - // Données de facturation - var client_invoice_email = "" - if (document.getElementsByName("client_invoice_email")) { - client_invoice_email = document.getElementsByName("client_invoice_email")[0].value; + // 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) ) { + alert("L'adresse email de facturation est invalide."); + return; } + + + 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 = "" - if (document.getElementsByName("client_invoice_nom")) { - client_invoice_nom = document.getElementsByName("client_invoice_nom")[0].value; - } + var client_invoice_nom = p_client_invoice_nom; + form.append("invoice_nom", client_invoice_nom); - var client_invoice_siret = "" - if (document.getElementsByName("client_invoice_siret")) { - client_invoice_siret = document.getElementsByName("client_invoice_siret")[0].value; - } + var client_invoice_siret = p_client_invoice_siret; + + form.append("invoice_siret", client_invoice_siret); - var client_invoice_tva = "" - if (document.getElementsByName("client_invoice_tva")) { - client_invoice_tva = document.getElementsByName("client_invoice_tva")[0].value; - } + 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 = "" - if (document.getElementsByName("client_invoice_adresse")) { - client_invoice_adresse = document.getElementsByName("client_invoice_adresse")[0].value; - } + var client_invoice_adresse = p_client_invoice_adresse; + + form.append("invoice_adresse", client_invoice_adresse); - var client_invoice_ville = "" - if (document.getElementsByName("client_invoice_ville")) { - client_invoice_ville = document.getElementsByName("client_invoice_ville")[0].value; - } + var client_invoice_ville = p_client_invoice_ville; + form.append("invoice_ville", client_invoice_ville); - var client_invoice_code_postal = "" - if (document.getElementsByName("client_invoice_email")) { - client_invoice_code_postal = document.getElementsByName("client_invoice_code_postal")[0].value; - } + var client_invoice_code_postal = p_client_invoice_code_postal; + + form.append("invoice_code_postal", client_invoice_code_postal); - var client_invoice_pays = "" - if (document.getElementsByName("client_invoice_pays")) { - client_invoice_pays = document.getElementsByName("client_invoice_pays")[0].value; - } + var client_invoice_pays = p_client_invoice_pays; + + form.append("invoice_pays", client_invoice_pays); @@ -1862,7 +1888,8 @@ const AddParnerClient = (props) => { setdatamodification_invoice("0"); alert(" Les données de facturation ont été mises à jour.") Disable_invoice_fields(); - alert(res.data.message); + sethas_client_invoice_email(""); + alert(res.data.message); } @@ -2234,6 +2261,7 @@ const AddParnerClient = (props) => { var include_com = "0" if (is_contact_include_com) { include_com = "1"; + setclient_has_communication_contact(""); } form.append("include_com", include_com); @@ -2510,14 +2538,9 @@ const AddParnerClient = (props) => { const [is_contact_include_com, setis_contact_include_com] = useState(false); const New_civilite = [ - { "id": "Mme", "label": "Mme", "value": "Mme" }, - { "id": "M", "label": "M", "value": "M" }, - { "id": "Neutre", "label": "Neutre", "value": "Neutre" }, - { "id": "mme", "label": "Mme", "value": "mme" }, { "id": "m", "label": "M", "value": "m" }, { "id": "neutre", "label": "Neutre", "value": "neutre" }, - { "id": "", "label": "", "value": "" }, ] @@ -3139,7 +3162,7 @@ const AddParnerClient = (props) => { DataEditMode(); if (p_client_is_financeur === true) setp_client_is_financeur(false) - else { + else { setp_client_is_financeur(true); } @@ -3266,18 +3289,36 @@ const AddParnerClient = (props) => { {String(props.new_customer) !== "1" &&
Pour utiliser votre tableau de bord, Merci de le configurer à partir du menu : "Configuration" == > "Tableau de bord"
Pour utiliser votre tableau de bord, Merci de le configurer à partir du menu : "Configuration" == > "Tableau de bord"
- -