From 59ca86546319454e9d9218a46bc716f216f7e654 Mon Sep 17 00:00:00 2001 From: cherif Date: Thu, 9 Nov 2023 23:03:14 +0100 Subject: [PATCH] 09/11/2023 - 23h --- src/components/Partner_Commande.js | 158 +++++++++++++++++-- src/styles/components/_partner_commande.scss | 26 +++ 2 files changed, 171 insertions(+), 13 deletions(-) diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index 32ae349..b825d90 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -319,10 +319,12 @@ const Partner_Commande = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_Partner_Order_Header_And_Lines/"; + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Delete_Order_Header_AndLine_Data res.data.status = " + res.data.status); //console.log(" In Delete_Order_Header_AndLine_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setDelete_Order_Header_AndLine_Data_api("true"); setDelete_Order_Header_AndLine_Data_result(res.data.message); @@ -352,7 +354,7 @@ const Partner_Commande = (props) => { } }).catch((error) => { - + setLoading(false); console.log('Delete_Order_Header_AndLine_Data : Not good man :( Delete_Order_Header_AndLine_Data = ' + error); setDelete_Order_Header_AndLine_Data_api("false"); if (local_order_type == "devis") @@ -439,10 +441,12 @@ const Partner_Commande = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_Partner_Order_Line/"; + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Delete_Order_Line_Data res.data.status = " + res.data.status); //console.log(" In Delete_Order_Line_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setDelete_Order_Line_Data_api("true"); setDelete_Order_Line_Data_result(res.data.message); @@ -460,6 +464,7 @@ const Partner_Commande = (props) => { }).catch((error) => { + setLoading(false); console.log('Delete_Order_Line_Data : Not good man :( Delete_Order_Line_Data = ' + error); setDelete_Order_Line_Data_api("false"); alert(" Impossible de supprimer la ligne"); @@ -1194,7 +1199,41 @@ const Partner_Commande = (props) => { if (mylocalclient) { if (mylocalclient.email) { setp_detail_header_email_client(mylocalclient.email); - //console.log(" ### mylocalclient.email = ", mylocalclient.email); + } + + // Recuperation de l'adresse de facturation + if (mylocalclient.invoice_adresse) { + setp_detail_header_fact_adr(mylocalclient.invoice_adresse); + } + + if (mylocalclient.invoice_code_postal) { + setp_detail_header_fact_code_postal(mylocalclient.invoice_code_postal); + } + + if (mylocalclient.invoice_ville) { + setp_detail_header_fact_ville(mylocalclient.invoice_ville); + } + + if (mylocalclient.invoice_pays) { + setp_detail_header_fact_pays(mylocalclient.invoice_pays); + } + + + // Recuperation de l'adresse du lieu de formation (par defaut adresse de la societe) + if (mylocalclient.adr_adresse) { + setp_detail_header_liv_adr(mylocalclient.adr_adresse); + } + + if (mylocalclient.adr_code_postal) { + setp_detail_header_liv_code_postal(mylocalclient.adr_code_postal); + } + + if (mylocalclient.adr_ville) { + sep_detail_header_liv_ville(mylocalclient.adr_ville); + } + + if (mylocalclient.adr_pays) { + setp_detail_header_liv_pays(mylocalclient.adr_pays); } } } @@ -1433,6 +1472,7 @@ const Partner_Commande = (props) => { const [p_detail_header_liv_code_postal, setp_detail_header_liv_code_postal] = useState(); const [p_detail_header_liv_ville, sep_detail_header_liv_ville] = useState(); const [p_detail_header_liv_pays, setp_detail_header_liv_pays] = useState(); + const [p_detail_header_total_ht, setp_detail_header_total_ht] = useState(); const [p_detail_header_total_tax, setp_detail_header_total_tax] = useState(); const [p_detail_header_total_ttc, setp_detail_header_total_ttc] = useState(); @@ -1895,7 +1935,7 @@ const Partner_Commande = (props) => { form.append("order_header_montant_reduction", ""); - console.log(" form == ", form); + //console.log(" form == ", form); var myurl = ""; if (String(p_detail_header_type) === "commande") @@ -1906,11 +1946,12 @@ const Partner_Commande = (props) => { alert(" Type de commande inconnu."); return; } - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Update_One_Order_Data res.data.status = " + res.data.status); //console.log(" In Update_One_Order_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setUpdate_One_Order_Data_api("true"); setUpdate_One_Order_Data_result(res.data.message); @@ -1940,6 +1981,7 @@ const Partner_Commande = (props) => { }).catch((error) => { + setLoading(false); console.warn('UpdateStagiaireData : Not good man :( Update_One_Order_Data = ' + error); setUpdate_One_Order_Data_api("false"); alert(" Impossible de faire la mise à jour"); @@ -2060,11 +2102,12 @@ const Partner_Commande = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_Partner_Order_Line/"; - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Add_Update_One_Order_Line_Data res.data.status = " + res.data.status); //console.log(" In Add_Update_One_Order_Line_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setAdd_Update_One_Order_Line_Data_api("true"); setAdd_Update_One_Order_Line_Data_result(res.data.message); @@ -2085,6 +2128,7 @@ const Partner_Commande = (props) => { }).catch((error) => { + setLoading(false); console.warn('UpdateStagiaireData : Not good man :( Add_Update_One_Order_Line_Data = ' + error); setAdd_Update_One_Order_Line_Data_api("false"); alert(" Impossible d'ajouter / mettre à jour la ligne"); @@ -2183,7 +2227,14 @@ const Partner_Commande = (props) => { form.append("order_header_vendeur_id", p_add_cmd_header_vendeur_id); form.append("order_header_type", p_add_cmd_header_order_type); form.append("order_header_email_client", p_detail_header_email_client); - + form.append("order_header_adr_fact_adresse", p_detail_header_fact_adr); + form.append("order_header_adr_fact_code_postal", p_detail_header_fact_code_postal); + form.append("order_header_adr_fact_ville", p_detail_header_fact_ville); + form.append("order_header_adr_fact_pays", p_detail_header_fact_pays); + form.append("order_header_adr_liv_adresse", p_detail_header_liv_adr); + form.append("order_header_adr_liv_code_postal", p_detail_header_liv_code_postal); + form.append("order_header_adr_liv_ville", p_detail_header_liv_ville); + form.append("order_header_adr_liv_pays", p_detail_header_liv_pays); if (!p_add_cmd_header_client_id || String(p_add_cmd_header_client_id).length < 2) { @@ -2204,10 +2255,12 @@ const Partner_Commande = (props) => { return; } + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Add_Update_One_Order_Line_Data res.data.status = " + res.data.status); //console.log(" In Add_Update_One_Order_Line_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setAdd_Dialog_Detail_Order_api("true"); setAdd_Dialog_Detail_Order_result(res.data.message); @@ -2238,6 +2291,7 @@ const Partner_Commande = (props) => { }).catch((error) => { + setLoading(false); console.warn('Add_Dialog_Detail_Order : Not good man :( Add_Dialog_Detail_Order = ' + error); setAdd_Dialog_Detail_Order_api("false"); @@ -2283,6 +2337,16 @@ const Partner_Commande = (props) => { setp_add_cmd_header_ref_client(); setp_add_cmd_header_condition_paiement(); + setp_detail_header_fact_adr(); + setp_detail_header_fact_code_postal(); + setp_detail_header_fact_ville(); + setp_detail_header_fact_pays(); + + setp_detail_header_liv_adr(); + setp_detail_header_liv_code_postal(); + sep_detail_header_liv_ville(); + setp_detail_header_liv_pays(); + } const [header_submenu, setheader_submenu] = useState(""); @@ -2491,12 +2555,15 @@ const Partner_Commande = (props) => { var url = process.env.REACT_APP_API_URL + "myclass/api/GerneratePDF_Partner_Order/" + stored_cookie + "/" + selected_id; - console.log(" nom_fichier_cmd = ", nom_fichier_cmd, " --- selected_id = ", selected_id, " --- url =", url); + //console.log(" nom_fichier_cmd = ", nom_fichier_cmd, " --- selected_id = ", selected_id, " --- url =", url); + setLoading(true); axios.get(url, { responseType: 'blob', },) .then((res) => { + setLoading(false); fileDownload(res.data, nom_fichier_cmd) }).catch((error) => { + setLoading(false); console.error('Error:', error); }); @@ -2519,11 +2586,12 @@ const Partner_Commande = (props) => { //console.log("### form = ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Send_Partner_Order_By_Email/"; - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Add_Update_One_Order_Line_Data res.data.status = " + res.data.status); //console.log(" In Add_Update_One_Order_Line_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setSend_Order_By_Email_api("true"); setSend_Order_By_Email_message(res.data.message); @@ -2537,6 +2605,7 @@ const Partner_Commande = (props) => { }).catch((error) => { + setLoading(false); console.warn('Send_Order_By_Email : Not good man :( Send_Order_By_Email = ' + error); setSend_Order_By_Email_api("false"); @@ -2565,12 +2634,13 @@ const Partner_Commande = (props) => { //console.log("### form = ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Confirm_Partner_Order_Header_And_Lines/"; - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Add_Update_One_Order_Line_Data res.data.status = " + res.data.status); //console.log(" In Add_Update_One_Order_Line_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setConfirm_Order_Data_api("true"); setConfirm_Order_Data_message(res.data.message); @@ -2587,6 +2657,7 @@ const Partner_Commande = (props) => { }).catch((error) => { + setLoading(false); console.warn('Confirm_Order_Data : Not good man :( Confirm_Order_Data = ' + error); setConfirm_Order_Data_api("false"); @@ -2602,6 +2673,58 @@ const Partner_Commande = (props) => { } + + const [Make_Order_Ready_To_Invoice_api, setMake_Order_Ready_To_Invoice_api] = useState(); + const [Make_Order_Ready_To_Invoice_message, setMake_Order_Ready_To_Invoice_message] = useState(); + const [Make_Order_Ready_To_Invoice_result, setMake_Order_Ready_To_Invoice_result] = useState(); + function Make_Order_Ready_To_Invoice() { + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("order_header_id", selected_id); + + + //console.log("### form = ", form); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Order_Ready_To_Invoice/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + //console.log(" In Add_Update_One_Order_Line_Data res.data.status = " + res.data.status); + //console.log(" In Add_Update_One_Order_Line_Data res.data.message r_class = " + res.data.message); + + setLoading(false); + if (String(res.data.status) === String("true")) { + setMake_Order_Ready_To_Invoice_api("true"); + setMake_Order_Ready_To_Invoice_message(res.data.message); + Getall_Training_Employee_No_Filter(); + Display_Detail_Order_data(selected_id); + alert(res.data.message); + } + else { + setMake_Order_Ready_To_Invoice_api("false"); + setMake_Order_Ready_To_Invoice_message(res.data.message); + + alert(res.data.message); + } + + }).catch((error) => { + + setLoading(false); + console.warn('Make_Order_Ready_To_Invoice : Not good man :( Make_Order_Ready_To_Invoice = ' + error); + setMake_Order_Ready_To_Invoice_api("false"); + + if (String(p_add_cmd_header_order_type) === "devis") { + alert(" Impossible de confirmer le devis"); + } else if (String(p_add_cmd_header_order_type) === "commande") { + alert(" Impossible de confirmer la commande"); + } + + }) + + + } + const [Cancel_Order_Data_api, setCancel_Order_Data_api] = useState(); const [Cancel_Order_Data_message, setCancel_Order_Data_message] = useState(); const [Cancel_Order_Data_result, setCancel_Order_Data_result] = useState(); @@ -2616,11 +2739,12 @@ const Partner_Commande = (props) => { //console.log("### form = ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Annule_Partner_Order_Header_And_Lines/"; - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Add_Update_One_Order_Line_Data res.data.status = " + res.data.status); //console.log(" In Add_Update_One_Order_Line_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setCancel_Order_Data_api("true"); setCancel_Order_Data_message(res.data.message); @@ -2637,6 +2761,7 @@ const Partner_Commande = (props) => { }).catch((error) => { + setLoading(false); console.warn('Cancel_Order_Data : Not good man :( Cancel_Order_Data = ' + error); setCancel_Order_Data_api("false"); @@ -2824,7 +2949,7 @@ const Partner_Commande = (props) => {
} - + {
- {String(p_detail_header_statut_label).toLowerCase() !== "traité" && - String(p_detail_header_statut_label).toLowerCase() !== "facturé" && } + {String(p_detail_header_statut_label).toLowerCase() === "brouillon" && + String(p_detail_header_statut_label).toLowerCase() !== "facturé" && + } + + {String(p_detail_header_statut_label).toLowerCase() === "en cours" && + String(p_detail_header_type).toLowerCase() === "commande" && + } + + {String(selected_order_header_type) === "commande" && String(p_detail_header_statut_label).toLowerCase() === "traité" && } diff --git a/src/styles/components/_partner_commande.scss b/src/styles/components/_partner_commande.scss index bf1a29a..31995df 100644 --- a/src/styles/components/_partner_commande.scss +++ b/src/styles/components/_partner_commande.scss @@ -262,6 +262,13 @@ width: 100%; } + .bton_put_to_invoice { + background: #d5f38f; + color: black; + width: 100%; + } + + .bton_import_excel { background: #c8cfd5; color: black; @@ -832,6 +839,13 @@ width: 100%; } + .bton_put_to_invoice { + background: #d5f38f; + color: black; + width: 100%; + } + + .bton_import_excel { background: #c8cfd5; color: black; @@ -1430,6 +1444,12 @@ width: 100%; } + .bton_put_to_invoice { + background: #d5f38f; + color: black; + width: 100%; + } + .bton_import_excel { background: #c8cfd5; color: black; @@ -1945,6 +1965,12 @@ width: 25% !important; } + .bton_put_to_invoice { + background: #d5f38f; + color: black; + width: 25% !important; + } + .bton_import_excel { background: #c8cfd5; color: black;