diff --git a/package-lock.json b/package-lock.json index 5b60a8e..0f2209a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -139,7 +139,7 @@ "recharts": "^2.1.14", "redux": "^4.1.2", "router": "^1.3.5", - "rsuite": "^5.18.0", + "rsuite": "^5.40.0", "semantic-ui-react": "^2.1.2", "state-pool": "^0.6.0", "styled-components": "^5.3.5", @@ -4811,7 +4811,8 @@ }, "node_modules/@juggle/resize-observer": { "version": "3.4.0", - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz", + "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==" }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.4", @@ -7779,12 +7780,15 @@ }, "node_modules/@rsuite/icon-font": { "version": "4.0.0", - "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)" + "resolved": "https://registry.npmjs.org/@rsuite/icon-font/-/icon-font-4.0.0.tgz", + "integrity": "sha512-rZTgpTH3H3HLczCA2rnkWfoMKm0ZXoRzsrkVujfP/FfslnKUMvO6w56pa8pCvhWGpNEPUsLS2ULnFGpTEcup/Q==" }, "node_modules/@rsuite/icons": { - "version": "1.0.2", - "license": "MIT", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@rsuite/icons/-/icons-1.0.3.tgz", + "integrity": "sha512-qkjYFn1v5YV9eH57Q4AJ8CwsQYfILun2wdoxhQg5+xYxkIu6UyF8vTMmpOzLvcybTE7D8STm4dH7vhpyhPOC7g==", "dependencies": { + "@babel/runtime": "^7.12.1", "@rsuite/icon-font": "^4.0.0", "classnames": "^2.2.5", "insert-css": "^2.0.0", @@ -14501,10 +14505,11 @@ } }, "node_modules/dom-lib": { - "version": "3.1.5", - "license": "MIT", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/dom-lib/-/dom-lib-3.1.6.tgz", + "integrity": "sha512-xXEhStHDoAyfhnz8mqDwZ9rnqdqz/9BcrKd1UEw6BlA/l17emFb2dK7q8IX8ArU31pScSU9otEnL6wzvpoT5aw==", "dependencies": { - "@babel/runtime": "^7.19.4" + "@babel/runtime": "^7.20.0" } }, "node_modules/dom-serializer": { @@ -19326,7 +19331,8 @@ }, "node_modules/insert-css": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/insert-css/-/insert-css-2.0.0.tgz", + "integrity": "sha512-xGq5ISgcUP5cvGkS2MMFLtPDBtrtQPSFfC6gA6U8wHKqfjTIMZLZNxOItQnoSjdOzlXOLU/yD32RKC4SvjNbtA==" }, "node_modules/install": { "version": "0.13.0", @@ -37751,6 +37757,14 @@ "react": ">=16.8" } }, + "node_modules/react-use-set": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/react-use-set/-/react-use-set-1.0.0.tgz", + "integrity": "sha512-6BBbOcWc/tOKuwd9gDtdunvOr/g40S0SkCBYvrSJvpI0upzNlHmLoeDvylnoP8PrjQXItClAFxseVGGhEkk7kw==", + "peerDependencies": { + "react": ">=16.8.0" + } + }, "node_modules/react-video-js-player": { "version": "1.1.1", "license": "ISC", @@ -40577,10 +40591,11 @@ "license": "MIT" }, "node_modules/rsuite": { - "version": "5.22.1", - "license": "MIT", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/rsuite/-/rsuite-5.40.0.tgz", + "integrity": "sha512-zhfbbhuWKXjTrvWnFw6Cu+FOHGZlPRwUkP8lnhTmfCI5r4Mp10J4ShgfdeGeqWEMwq9Hz58I540WoDV20PZseQ==", "dependencies": { - "@babel/runtime": "^7.19.4", + "@babel/runtime": "^7.20.1", "@juggle/resize-observer": "^3.4.0", "@rsuite/icons": "^1.0.2", "@types/chai": "^4.3.3", @@ -40592,9 +40607,10 @@ "dom-lib": "^3.1.3", "lodash": "^4.17.11", "prop-types": "^15.8.1", - "react-window": "^1.8.7", - "rsuite-table": "^5.8.0", - "schema-typed": "^2.0.3" + "react-use-set": "^1.0.0", + "react-window": "^1.8.8", + "rsuite-table": "^5.12.0", + "schema-typed": "^2.1.3" }, "peerDependencies": { "react": ">=16.8.0", @@ -40602,8 +40618,9 @@ } }, "node_modules/rsuite-table": { - "version": "5.8.0", - "license": "MIT", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/rsuite-table/-/rsuite-table-5.12.0.tgz", + "integrity": "sha512-Di7PPjVgoAYs+FANJ37xKfcInw/MK7+wvxDEVDvfsM0zCiXGTnfQMv+ahXEcBAEU776fMlLAQWbCpXIUzXCHFg==", "dependencies": { "@babel/runtime": "^7.12.5", "@juggle/resize-observer": "^3.3.1", @@ -40621,7 +40638,8 @@ }, "node_modules/rsuite-table/node_modules/react-is": { "version": "17.0.2", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, "node_modules/run-async": { "version": "2.4.1", @@ -40802,11 +40820,9 @@ } }, "node_modules/schema-typed": { - "version": "2.0.3", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.16.0" - } + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/schema-typed/-/schema-typed-2.1.3.tgz", + "integrity": "sha512-Nk0LLOq0L64HaQsXQGAZ8Z176tDE4jewsxyWe+6QvidNiC33DMaWFg+LaLWJ85uPPBtqBBJlCq9W4c1KEA88WA==" }, "node_modules/schema-utils": { "version": "2.7.1", @@ -49416,7 +49432,9 @@ } }, "@juggle/resize-observer": { - "version": "3.4.0" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz", + "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==" }, "@leichtgewicht/ip-codec": { "version": "2.0.4" @@ -51293,11 +51311,16 @@ } }, "@rsuite/icon-font": { - "version": "4.0.0" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@rsuite/icon-font/-/icon-font-4.0.0.tgz", + "integrity": "sha512-rZTgpTH3H3HLczCA2rnkWfoMKm0ZXoRzsrkVujfP/FfslnKUMvO6w56pa8pCvhWGpNEPUsLS2ULnFGpTEcup/Q==" }, "@rsuite/icons": { - "version": "1.0.2", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@rsuite/icons/-/icons-1.0.3.tgz", + "integrity": "sha512-qkjYFn1v5YV9eH57Q4AJ8CwsQYfILun2wdoxhQg5+xYxkIu6UyF8vTMmpOzLvcybTE7D8STm4dH7vhpyhPOC7g==", "requires": { + "@babel/runtime": "^7.12.1", "@rsuite/icon-font": "^4.0.0", "classnames": "^2.2.5", "insert-css": "^2.0.0", @@ -55771,9 +55794,11 @@ } }, "dom-lib": { - "version": "3.1.5", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/dom-lib/-/dom-lib-3.1.6.tgz", + "integrity": "sha512-xXEhStHDoAyfhnz8mqDwZ9rnqdqz/9BcrKd1UEw6BlA/l17emFb2dK7q8IX8ArU31pScSU9otEnL6wzvpoT5aw==", "requires": { - "@babel/runtime": "^7.19.4" + "@babel/runtime": "^7.20.0" } }, "dom-serializer": { @@ -58966,7 +58991,9 @@ } }, "insert-css": { - "version": "2.0.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/insert-css/-/insert-css-2.0.0.tgz", + "integrity": "sha512-xGq5ISgcUP5cvGkS2MMFLtPDBtrtQPSFfC6gA6U8wHKqfjTIMZLZNxOItQnoSjdOzlXOLU/yD32RKC4SvjNbtA==" }, "install": { "version": "0.13.0", @@ -70692,6 +70719,12 @@ "version": "1.4.0", "requires": {} }, + "react-use-set": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/react-use-set/-/react-use-set-1.0.0.tgz", + "integrity": "sha512-6BBbOcWc/tOKuwd9gDtdunvOr/g40S0SkCBYvrSJvpI0upzNlHmLoeDvylnoP8PrjQXItClAFxseVGGhEkk7kw==", + "requires": {} + }, "react-video-js-player": { "version": "1.1.1", "requires": { @@ -72615,9 +72648,11 @@ } }, "rsuite": { - "version": "5.22.1", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/rsuite/-/rsuite-5.40.0.tgz", + "integrity": "sha512-zhfbbhuWKXjTrvWnFw6Cu+FOHGZlPRwUkP8lnhTmfCI5r4Mp10J4ShgfdeGeqWEMwq9Hz58I540WoDV20PZseQ==", "requires": { - "@babel/runtime": "^7.19.4", + "@babel/runtime": "^7.20.1", "@juggle/resize-observer": "^3.4.0", "@rsuite/icons": "^1.0.2", "@types/chai": "^4.3.3", @@ -72629,13 +72664,16 @@ "dom-lib": "^3.1.3", "lodash": "^4.17.11", "prop-types": "^15.8.1", - "react-window": "^1.8.7", - "rsuite-table": "^5.8.0", - "schema-typed": "^2.0.3" + "react-use-set": "^1.0.0", + "react-window": "^1.8.8", + "rsuite-table": "^5.12.0", + "schema-typed": "^2.1.3" } }, "rsuite-table": { - "version": "5.8.0", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/rsuite-table/-/rsuite-table-5.12.0.tgz", + "integrity": "sha512-Di7PPjVgoAYs+FANJ37xKfcInw/MK7+wvxDEVDvfsM0zCiXGTnfQMv+ahXEcBAEU776fMlLAQWbCpXIUzXCHFg==", "requires": { "@babel/runtime": "^7.12.5", "@juggle/resize-observer": "^3.3.1", @@ -72647,7 +72685,9 @@ }, "dependencies": { "react-is": { - "version": "17.0.2" + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" } } }, @@ -72750,10 +72790,9 @@ } }, "schema-typed": { - "version": "2.0.3", - "requires": { - "@babel/runtime": "^7.16.0" - } + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/schema-typed/-/schema-typed-2.1.3.tgz", + "integrity": "sha512-Nk0LLOq0L64HaQsXQGAZ8Z176tDE4jewsxyWe+6QvidNiC33DMaWFg+LaLWJ85uPPBtqBBJlCq9W4c1KEA88WA==" }, "schema-utils": { "version": "2.7.1", diff --git a/package.json b/package.json index 1b035e6..bfe95e8 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "recharts": "^2.1.14", "redux": "^4.1.2", "router": "^1.3.5", - "rsuite": "^5.18.0", + "rsuite": "^5.40.0", "semantic-ui-react": "^2.1.2", "state-pool": "^0.6.0", "styled-components": "^5.3.5", diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index d1f4240..07824de 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -408,7 +408,7 @@ const AddParnerClient = (props) => { Get_List_Contact_Of_client_Part(); - window.scrollTo(0, 0); + } else { setformedit_mode("1"); setformedit_mode_invoice("1"); @@ -1975,11 +1975,12 @@ const AddParnerClient = (props) => { -
+
+ Email
{
-
+
Nom
{
-
+
Raison sociale
{
-
+
N° Siret
{ />
-
+
N° TVA
{ />
-
+
Adresse
{ onChange={(e) => setclient_adresse(e.target.value)} />
-
+
ville
{ onChange={(e) => setclient_ville(e.target.value)} />
-
+
Code Postal
{ onChange={(e) => setclient_code_postal(e.target.value)} />
-
+
Pays
{ />
-
+
Telephone
{ />
-
+
Email
{ shrink: true, }} disabled={false} - className="disabled_style" + className="disabled_style enable_style" value={p_client_website} onChange={(e) => setclient_website(e.target.value)} /> @@ -2219,11 +2220,11 @@ const AddParnerClient = (props) => { {String(submenu).trim() === "submenu_donnee_client" &&
-
+
Email
{
-
+
Nom
{
-
+
Raison sociale
{
-
+
N° Siret
{ />
-
+
N° TVA
{ />
-
+
Adresse
{ onChange={(e) => setclient_adresse(e.target.value)} />
-
+
Ville
{ onChange={(e) => setclient_ville(e.target.value)} />
-
+
Code Postal
{ onChange={(e) => setclient_code_postal(e.target.value)} />
-
+
Pays
{ />
-
+
Telephone
{ />
-
+
Site web
{ {String(submenu).trim() === "submenu_donnees_facturation" &&
-
+
Email de Facturation
{
-
+
Nom de Facturation
{ -
+
N° Siret Facturation
{ />
-
+
N° TVA Facturation
{ />
-
+
Adresse
{ onChange={(e) => setclient_invoice_adresse(e.target.value)} />
-
+
Ville
{ onChange={(e) => setclient_invoice_ville(e.target.value)} />
-
+
Code Postal
{ onChange={(e) => setclient_invoice_code_postal(e.target.value)} />
-
+
Pays
{
} {String(addcontact) === "1" &&
-
Email
+
Email
{ />
- {String(formedit_mode_contact) === "1" &&
- Civilité
+ {String(formedit_mode_contact) === "1" &&
+ Civilité
{
} - {String(formedit_mode_contact) !== "1" &&
- Civilité
+ {String(formedit_mode_contact) !== "1" &&
+ Civilité
{
} -
- Nom
+
+ Nom
{
-
- Prenom
+
+ Prenom
{
-
- Fonction
+
+ Fonction
{
-
- N° Siret
+
+ N° Siret
{ />
-
- N° TVA
+
+ N° TVA
{ />
-
- Adresse
+
+ Adresse
{ onChange={(e) => setcontact_adresse(e.target.value)} />
-
- ville
+
+ ville
{ onChange={(e) => setcontact_ville(e.target.value)} />
-
- Code Postal
+
+ Code Postal
{ onChange={(e) => setcontact_code_postal(e.target.value)} />
-
- Pays
+
+ Pays
{ />
-
- Telephone
+
+ Telephone
{ value={p_contact_telephone} onChange={(e) => setcontact_telephone(e.target.value)} /> -
+
-
- Téléphone Mobile
+
+ Téléphone Mobile
{ if (mylocal_document.nom) setp_one_detail_nom(mylocal_document.nom); - + if (mylocal_document.type_doc) @@ -821,8 +821,6 @@ const Config_Documents = (props) => { } - - if (p_one_detail_nom) form.append("nom", p_one_detail_nom); else { @@ -965,9 +963,9 @@ const Config_Documents = (props) => { return; } - - if (p_detail_nom) - form.append("nom", p_detail_nom); + + if (p_one_detail_nom) + form.append("nom", p_one_detail_nom); else { alert(" Vous devez definir un nom de document"); return; @@ -1184,7 +1182,7 @@ const Config_Documents = (props) => { const [display_add_one_document, setdisplay_add_one_document] = React.useState(); function Get_And_Display_Selected_Document() { setdisplay_add_one_document("1"); - console.log(" ## selecte_defaul_doc_to_add = ", selecte_defaul_doc_to_add); + setadd_one_document("1"); setdisplay_detail_document("0"); setselected_id(selecte_defaul_doc_to_add); @@ -1706,7 +1704,7 @@ const Config_Documents = (props) => {
- +
Nom document
{
- +
Type de document
{
- Code Document
+ Code Document
{
- Sujet
+ Sujet
{
- {String(partner_document_data_edit_mode) === "1" && -
Choisir un champ
- { - setp_champ_table(e.target.value); - }} - > + {String(partner_document_data_edit_mode) === "1" && +
Choisir un champ
+ { + setp_champ_table(e.target.value); + }} + > - {Get_Given_Personnalisable_Collection_and_Fields_result && - Get_Given_Personnalisable_Collection_and_Fields_result.filter((local_mymanager) => JSON.parse(local_mymanager).courrier_template_ref_interne === p_detail_ref_interne).map((mycollection) => ( - - {JSON.parse(mycollection).nom_champ_fonctionel}   + {Get_Given_Personnalisable_Collection_and_Fields_result && + Get_Given_Personnalisable_Collection_and_Fields_result.filter((local_mymanager) => JSON.parse(local_mymanager).courrier_template_ref_interne === p_detail_ref_interne).map((mycollection) => ( + + {JSON.parse(mycollection).nom_champ_fonctionel}   - - ))} - + + ))} + -
} +
} {String(partner_document_data_edit_mode) === "1" &&
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 0526f0d..9faa883 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -2697,6 +2697,7 @@ const DisplayPartnerSession = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetSessionFormation/"; + setLoading(true); axios.post(myurl, form).then(res => { if (String(res.data.status) === "true") { @@ -2704,6 +2705,7 @@ const DisplayPartnerSession = (props) => { //console.log(" In GetCurrentSession res.data.message r_class = " + res.data.message); //console.log(" In GetCurrentSession res.data.message len = " + String(res.data.message).length); + setLoading(false); setGetCurrentSession_api("true"); if (String(res.data.message).length > 0) { setGetCurrentSession_result(res.data.message); @@ -2864,17 +2866,20 @@ const DisplayPartnerSession = (props) => { } } else if (String(res.data.status) === String("Err_Connexion")) { + setLoading(false); alert('Erreur: ' + res.data.message); history.push("/Connexion"); } else { + setLoading(false); setGetCurrentSession_api("false"); setGetCurrentSession_message(res.data.message); alert("Erreur : " + res.data.message); } }).catch((error) => { + setLoading(false); console.warn('Not good man :( GetCurrentSession = ', error); setGetCurrentSession_api("false"); diff --git a/src/components/Partner.js b/src/components/Partner.js index 4180d4d..f24b733 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -38,7 +38,7 @@ import { FcList, FcGraduationCap, FcMultipleDevices, FcCurrencyExchange, FcMoneyTransfer, FcFeedback, FcKey, FcVideoCall, FcSettings, FcBusinesswoman, FcServices, FcCollect, FcCandleSticks, FcKindle, - FcFlowChart, FcReading + FcFlowChart, FcReading, FcFinePrint } from "react-icons/fc"; import { BsTools } from "react-icons/bs"; @@ -737,12 +737,12 @@ const Partner = (props) => {
} -
+
{parntername && {parntername} - {String(partnerPackService).toUpperCase()} ({parnternbformation})} {!parntername && Partenaire }
-
+
Mon Compte
{String(menu) !== "infopartner" &&
MES INFORMATIONS
} {String(menu) === "infopartner" &&
MES INFORMATIONS
} @@ -752,16 +752,11 @@ const Partner = (props) => { {String(menu) === "abonnement" &&
ABONNEMENT
}
- {String(menu) !== "facture" &&
FACTURATION
} - {String(menu) === "facture" &&
FACTURATION
} + {String(menu) !== "facture" &&
FACTURE MYSY
} + {String(menu) === "facture" &&
FACTURE MYSY
}
- - {String(menu) !== "pricing" &&
MES PRIX
} - {String(menu) === "pricing" &&
MES PRIX
} -
- - +
Mes Formations
{String(menu) !== "creation" &&
CREER FORMATION
} {String(menu) === "creation" &&
CREER FORMATION
} @@ -793,13 +788,7 @@ const Partner = (props) => { {String(menu) === "statistique" &&
STATISTIQUES
}
-
Ma config
-
-
- {String(menu) !== "mes_clients" &&
   MES DOCUMENTS
} - {String(menu) === "mes_clients" &&
    MES DOCUMENTS
} -
Mes Clients
@@ -812,14 +801,14 @@ const Partner = (props) => {

- {String(menu) !== "mes_devis" &&
   MES DEVIS
} - {String(menu) === "mes_devis" &&
    MES DEVIS
} + {String(menu) !== "pricing" &&
    MES PRIX CLIENT
} + {String(menu) === "pricing" &&
   MES PRIX CLIENT
}

- {String(menu) !== "mes_cmd" &&
   MES COMMANDES
} - {String(menu) === "mes_cmd" &&
    MES COMMANDES
} + {String(menu) !== "mes_cmd" &&
   MES COMMANDES & DEVIS
} + {String(menu) === "mes_cmd" &&
    MES COMMANDES & DEVIS
}
@@ -846,7 +835,13 @@ const Partner = (props) => { {String(menu) === "statistique" &&
    CONFIGURATION
}
} +
Ma config
+
+
+ {String(menu) !== "mes_clients" &&
   MES DOCUMENTS
} + {String(menu) === "mes_clients" &&
    MES DOCUMENTS
} +

diff --git a/src/components/Partner_Client.js b/src/components/Partner_Client.js index 2e0f558..c6e7733 100644 --- a/src/components/Partner_Client.js +++ b/src/components/Partner_Client.js @@ -395,16 +395,18 @@ const Partner_Client = (props) => { function handleClick_edit_session_From_Line(selected_row_id) { if (rows_list_clients[selected_row_id]) { - window.scrollTo({ - top: 600, - left: 0, - behavior: "smooth", - }); + var line = JSON.parse(rows_list_clients[selected_row_id]); var clientmail = String(line.email); setClient_email(clientmail); setEdite_Client("1"); + + window.scrollTo({ + top: 800, + left: 0, + behavior: "smooth", + }); @@ -651,8 +653,11 @@ const Partner_Client = (props) => { onSelectionModelChange={(newSelectionModel) => { setSelectionModel(newSelectionModel); - if (newSelectionModel.length === 1) + if (newSelectionModel.length === 1){ + handleClick_edit_session_From_Line(newSelectionModel); + } + else{ setEdite_Client(); } @@ -717,7 +722,7 @@ const Partner_Client = (props) => { {String(Edite_Client) === "2" &&
Detail client : {Client_email}
-
&nbs;
+
 
diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index a2668d5..62603bd 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -774,9 +774,12 @@ const Partner_Commande = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Given_Partner_Order/"; + setLoading(true); + axios.post(myurl, form).then(res => { if (String(res.data.status) === "true") { + setLoading(false); //console.log(" In Get_Order_Data res.data.status = " + res.data.status); //console.log(" In Get_Order_Data res.data.message r_class = " + res.data.message); setGetAttendee_api("true"); @@ -979,17 +982,20 @@ const Partner_Commande = (props) => { } else if (String(res.data.status) === String("Err_Connexion")) { + setLoading(false); alert('Erreur: ' + res.data.message); history.push("/Connexion"); } else { + setLoading(false); setGetAttendee_api("false"); setGetAttendee_message(res.data.message); alert(res.data.message); } }).catch((error) => { + setLoading(false); console.warn('Not good man :( Get_Order_Data = ', error); setGetAttendee_api("false"); alert(" Impossible de recuperer les données de la commande / devis"); @@ -1615,7 +1621,7 @@ const Partner_Commande = (props) => { form.append("order_header_condition_paiement", ""); if (p_detail_header_date_expiration_val) - form.append("order_header_date_expiration", p_detail_header_date_expiration_val); + form.append("order_header_date_expiration", p_detail_header_date_expiration); else form.append("order_header_date_expiration", ""); @@ -2208,10 +2214,8 @@ const Partner_Commande = (props) => { } Compute_Partner_Order(); - Get_Order_Data(selected_id); - Get_Partner_Orders_Lines_from_header_id(selected_id); - + } const [Compute_Partner_Order_api, setCompute_Partner_Order_api] = useState(); @@ -2238,6 +2242,9 @@ const Partner_Commande = (props) => { if (String(res.data.status) === String("true")) { setCompute_Partner_Order_api("true"); setCompute_Partner_Order_result(res.data.message); + Get_Order_Data(selected_id); + Get_Partner_Orders_Lines_from_header_id(selected_id); + alert(res.data.message); } else if (String(res.data.status) === String("Err_Connexion")) { @@ -3619,7 +3626,7 @@ const Partner_Commande = (props) => { { setp_detail_header_date_expiration_val(format(date, 'dd/MM/yyyy')); setOrder_data_changed("1"); @@ -4315,7 +4322,7 @@ const Partner_Commande = (props) => {
-
diff --git a/src/components/Recherche_new_v2.js b/src/components/Recherche_new_v2.js index c7c0bec..4d13fc0 100644 --- a/src/components/Recherche_new_v2.js +++ b/src/components/Recherche_new_v2.js @@ -3003,7 +3003,7 @@ const Recherche_new_v2 = () => {
- Une plateforme idéale pour vous gérer vos sessions de formation : + Une plateforme idéale pour gérer vos sessions de formation :
  • Les inscriptions
  • Les émargements