From 3536892d6a938a16a545ba77128efbdea836e26b Mon Sep 17 00:00:00 2001 From: cherif Date: Wed, 19 Jul 2023 10:01:35 +0200 Subject: [PATCH] 19/07/2023 - 10h --- src/components/DisplayDetailClass_new_v2.js | 39 ++++++++++++++------- src/components/GestionAdministrative.js | 8 +++-- src/components/Inscription_Information.js | 17 +++++---- src/components/Pricing.js | 2 +- src/styles/components/_inscription.scss | 4 ++- src/styles/components/_partner_client.scss | 28 +++++++++++++++ src/styles/index.scss | 1 + 7 files changed, 75 insertions(+), 24 deletions(-) create mode 100644 src/styles/components/_partner_client.scss diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index d7cae4d..a7d224c 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -286,6 +286,9 @@ const DisplayDetailClass_new_v2 = (props) => { const [partnair_name, setpartnair_name] = useState(); const [website_partenaire, setwebsite_partenaire] = useState(); + const [class_sales_price, setclass_sales_price] = useState("0"); + + function Display(e) { var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_class/"; var form = new FormData(); @@ -414,10 +417,20 @@ const DisplayDetailClass_new_v2 = (props) => { setisdatadock(JSON.parse(res.data.message).isdatadock); } + if (JSON.parse(res.data.message).business_prices && JSON.parse(res.data.message).business_prices.length == 1 ) { + setclass_sales_price(JSON.parse(res.data.message).business_prices[0].discounted_price); + + }else{ + setclass_sales_price(JSON.parse(res.data.message).price); + setclass_sales_price(JSON.parse(res.data.message).price); + } + + if (JSON.parse(res.data.message).isqualiopi) { setisqualiopi(JSON.parse(res.data.message).isqualiopi); } + if (JSON.parse(res.data.message).iscertitrace) { setiscertitrace(JSON.parse(res.data.message).iscertitrace); } @@ -469,19 +482,19 @@ const DisplayDetailClass_new_v2 = (props) => { var main_h_px; - console.log("nb_partner_certificat = ", JSON.parse(res.data.message).nb_partner_certificat); + //console.log("nb_partner_certificat = ", JSON.parse(res.data.message).nb_partner_certificat); if (window.screen.width < 601) { var decalage_pr_certificat = parseInt(String(JSON.parse(res.data.message).nb_partner_certificat)) * 150; - console.log("decalage_pr_certificat = ", decalage_pr_certificat); + //console.log("decalage_pr_certificat = ", decalage_pr_certificat); var local_val = parseInt(String(JSON.parse(res.data.message).nb_pave_a_afficher)); - console.log("### local_val = ", local_val) + //console.log("### local_val = ", local_val) if (local_val >= 5) { - console.log(" ON PASSE  au MAX") + //console.log(" ON PASSE  au MAX") var local_tmp_val = 2300 + decalage_pr_certificat; var local_main_h_px = 4000 + decalage_pr_certificat; //console.log("### local_tmp_val = ", local_tmp_val, " local_main_h_px = ",local_main_h_px); @@ -497,7 +510,7 @@ const DisplayDetailClass_new_v2 = (props) => { } } else { - console.log(" ON PASSE  au MIN"); + //console.log(" ON PASSE  au MIN"); var local_tmp_val = 2100 + decalage_pr_certificat; var local_main_h_px = 4800 + decalage_pr_certificat; @@ -520,7 +533,7 @@ const DisplayDetailClass_new_v2 = (props) => { var local_val = parseInt(String(JSON.parse(res.data.message).nb_pave_a_afficher)); if (local_val >= 5) { - console.log(" ON PASSE  au MAX") + //console.log(" ON PASSE  au MAX") local_tmp = "2000px"; main_h_px = "2700px"; @@ -614,7 +627,7 @@ const DisplayDetailClass_new_v2 = (props) => { }).catch((error) => { - console.warn('Not good man :( Display = '); + console.warn('Not good man :( Display = ', error); //console.log(error); setmyApiResponse("false"); @@ -1405,13 +1418,13 @@ const DisplayDetailClass_new_v2 = (props) => { {String(inscritpion) === "2" &&
+ Close_info_form={Close_info_form} trainig_price={class_sales_price} />
} {String(inscritpion) === "1" &&
+ Close_info_form={Close_inscrip_form} trainig_price={class_sales_price} />
@@ -1861,14 +1874,14 @@ const DisplayDetailClass_new_v2 = (props) => {
{String(inscritpion) === "1" &&
+ Close_info_form={Close_info_form} trainig_price={class_sales_price} />
} {String(inscritpion) === "2" &&
+ Close_info_form={Close_inscrip_form} trainig_price={class_sales_price} />
@@ -1878,7 +1891,7 @@ const DisplayDetailClass_new_v2 = (props) => { && String(action).toLocaleLowerCase() !== "evaluation" &&
- +
} @@ -2045,7 +2058,7 @@ const DisplayDetailClass_new_v2 = (props) => { {String(DetailTraining["price"]) && String(DetailTraining["price"]) !== String("0") && DetailTraining.business_prices && Object.keys(DetailTraining.business_prices).length > 0 && DetailTraining["price"] &&
- + diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index 05da963..9041820 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -3216,6 +3216,7 @@ function GestionAdministrative(props) { //console.log(" In SendEvaluationEmail res.data.message r_class = " + res.data.message); setSendEvaluationEmail_api("true"); setSendEvaluationEmail_result(res.data.message); + alert(" La demande a été correctement envoyée"); } else if (String(res.data.status) === String("Err_Connexion")) { alert('Erreur: ' + res.data.message); @@ -3224,6 +3225,7 @@ function GestionAdministrative(props) { else { setSendEvaluationEmail_api("false"); setSendEvaluationEmail_message(res.data.message); + alert(" Erreur : "+res.data.message); } }).catch((error) => { @@ -3514,11 +3516,11 @@ function GestionAdministrative(props) { const actionmass_evaluation = (event) => { const value = event.target.value; - console.log(" ### actionmass_evaluation = ", value); + //console.log(" ### actionmass_evaluation = ", value); if (String(value) === "demande evaluation") { setactionmass_eval_val(value); - console.log(" ### LAAA = ", value); + //console.log(" ### LAAA = ", value); } else { @@ -5022,7 +5024,7 @@ function GestionAdministrative(props) { prenom: JSON.parse(item).prenom, email: JSON.parse(item).email, eval_date: String(JSON.parse(item).eval_date).substring(0, 10), - eval_eval: String(JSON.parse(item).eval_eval).replace(/(<([^>]+)>)/ig, ''), + eval_eval: parse(String(JSON.parse(item).eval_eval).replace(/(<([^>]+)>)/ig, '')), eval_note: JSON.parse(item).eval_note, eval_pedagogie: JSON.parse(item).eval_pedagogie, diff --git a/src/components/Inscription_Information.js b/src/components/Inscription_Information.js index bf42b26..60d5f03 100644 --- a/src/components/Inscription_Information.js +++ b/src/components/Inscription_Information.js @@ -37,7 +37,8 @@ function Inscription_Information(props) { const [action, setaction] = useState(props.action); const [class_internal_url, setclass_internal_url] = useState(props.internal_url); - + ; + const modefinancement = [ { value: 'cpf', @@ -175,6 +176,8 @@ function Inscription_Information(props) { formData.append('opco', opco); formData.append('session_id', session); formData.append('class_internal_url', props.internal_url); + formData.append('price', props.trainig_price); + fetch( url, @@ -278,19 +281,23 @@ function Inscription_Information(props) { //setmyApimyApiMessage("") }) } + const [class_sales_price, setclass_sales_price] = useState("0"); useEffect(() => { + if (String(props.action).toLocaleLowerCase() !== "inscription" && String(props.action).toLocaleLowerCase() !== "information") { + CheckEvaluationToken(); + setclass_sales_price(props.trainig_price); } GetCurrentClass_trainingsession(); GetListOpco(); - + }, []); @@ -588,7 +595,6 @@ function Inscription_Information(props) { }); - }; const [RatingValue, setRatingValue] = useState(0); @@ -651,7 +657,6 @@ function Inscription_Information(props) { - {(String(RecordData_status) === "false" || String(RecordData_status).length === 0) && String(action).toLocaleLowerCase() === "inscription" && @@ -678,7 +683,7 @@ function Inscription_Information(props) { -
- +