diff --git a/package-lock.json b/package-lock.json index 0f2209a..c6bbf8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,10 +18,11 @@ "@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.18", - "@fullcalendar/core": "^6.1.8", + "@fullcalendar/core": "^6.1.9", "@fullcalendar/daygrid": "^6.1.8", "@fullcalendar/interaction": "^6.1.8", "@fullcalendar/react": "^6.1.8", + "@fullcalendar/timegrid": "^6.1.9", "@mantine/core": "^4.2.10", "@mantine/hooks": "^4.2.10", "@mantine/rte": "^4.2.10", @@ -2932,19 +2933,19 @@ } }, "node_modules/@fullcalendar/core": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.8.tgz", - "integrity": "sha512-i8JBIvZCWGO9dsMEDcx9bnsQZ9PtGSJdOXGgWbhLaGq2iq41OBdp9g9gM4b/Otv2oK8bL5Gl6CsMmb/HkDtA6Q==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.9.tgz", + "integrity": "sha512-eeG+z9BWerdsU9Ac6j16rpYpPnE0wxtnEHiHrh/u/ADbGTR3hCOjCD9PxQOfhOTHbWOVs7JQunGcksSPu5WZBQ==", "dependencies": { "preact": "~10.12.1" } }, "node_modules/@fullcalendar/daygrid": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.8.tgz", - "integrity": "sha512-kCZxQFKb9Vqa3CZRX0v7rMSJ2mlTt4gDpyLfiNJKxUAq7W51uKurPaFZWicaXy1ESHVBxKNlbx5uNjBpyu50JQ==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.9.tgz", + "integrity": "sha512-o/6joH/7lmVHXAkbaa/tUbzWYnGp/LgfdiFyYPkqQbjKEeivNZWF1WhHqFbhx0zbFONSHtrvkjY2bjr+Ef2quQ==", "peerDependencies": { - "@fullcalendar/core": "~6.1.8" + "@fullcalendar/core": "~6.1.9" } }, "node_modules/@fullcalendar/interaction": { @@ -2965,6 +2966,17 @@ "react-dom": "^16.7.0 || ^17 || ^18" } }, + "node_modules/@fullcalendar/timegrid": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.9.tgz", + "integrity": "sha512-le7UV05wVE1Trdr054kgJXTwa+A1pEI8nlCBnPWdcyrL+dTLoPvQ4AWEVCnV7So+4zRYaCqnqGXfCJsj0RQa0g==", + "dependencies": { + "@fullcalendar/daygrid": "~6.1.9" + }, + "peerDependencies": { + "@fullcalendar/core": "~6.1.9" + } + }, "node_modules/@gatsbyjs/reach-router": { "version": "1.3.9", "license": "MIT", @@ -48167,17 +48179,17 @@ } }, "@fullcalendar/core": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.8.tgz", - "integrity": "sha512-i8JBIvZCWGO9dsMEDcx9bnsQZ9PtGSJdOXGgWbhLaGq2iq41OBdp9g9gM4b/Otv2oK8bL5Gl6CsMmb/HkDtA6Q==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.9.tgz", + "integrity": "sha512-eeG+z9BWerdsU9Ac6j16rpYpPnE0wxtnEHiHrh/u/ADbGTR3hCOjCD9PxQOfhOTHbWOVs7JQunGcksSPu5WZBQ==", "requires": { "preact": "~10.12.1" } }, "@fullcalendar/daygrid": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.8.tgz", - "integrity": "sha512-kCZxQFKb9Vqa3CZRX0v7rMSJ2mlTt4gDpyLfiNJKxUAq7W51uKurPaFZWicaXy1ESHVBxKNlbx5uNjBpyu50JQ==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.9.tgz", + "integrity": "sha512-o/6joH/7lmVHXAkbaa/tUbzWYnGp/LgfdiFyYPkqQbjKEeivNZWF1WhHqFbhx0zbFONSHtrvkjY2bjr+Ef2quQ==", "requires": {} }, "@fullcalendar/interaction": { @@ -48192,6 +48204,14 @@ "integrity": "sha512-E8GQSQyZHkjpwxQW5Vci7iZgN7f33ntuRcvfGii4Fn35t9VHGz2SEyKAWXpVf38elcKTZKVgajU9ipStd+1LEg==", "requires": {} }, + "@fullcalendar/timegrid": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.9.tgz", + "integrity": "sha512-le7UV05wVE1Trdr054kgJXTwa+A1pEI8nlCBnPWdcyrL+dTLoPvQ4AWEVCnV7So+4zRYaCqnqGXfCJsj0RQa0g==", + "requires": { + "@fullcalendar/daygrid": "~6.1.9" + } + }, "@gatsbyjs/reach-router": { "version": "1.3.9", "peer": true, diff --git a/package.json b/package.json index bfe95e8..92021d9 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,11 @@ "@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.18", - "@fullcalendar/core": "^6.1.8", + "@fullcalendar/core": "^6.1.9", "@fullcalendar/daygrid": "^6.1.8", "@fullcalendar/interaction": "^6.1.8", "@fullcalendar/react": "^6.1.8", + "@fullcalendar/timegrid": "^6.1.9", "@mantine/core": "^4.2.10", "@mantine/hooks": "^4.2.10", "@mantine/rte": "^4.2.10", diff --git a/src/components/Partner_Config_Technique.js b/src/components/Partner_Config_Technique.js index d0a0af8..1277442 100644 --- a/src/components/Partner_Config_Technique.js +++ b/src/components/Partner_Config_Technique.js @@ -330,7 +330,7 @@ const Partner_Configuration_Technique = (props) => { form.append("config_name", p_detail_config_point); form.append("config_value", p_detail_config_valeur); - console.log(" form == ", form); + //console.log(" form == ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_Partner_Basic_Setup/"; @@ -665,6 +665,8 @@ const Partner_Configuration_Technique = (props) => { smtp_user   smtp_user_pwd   smtp_count_from_name + smtp_count_port + partner_smtp } diff --git a/src/components/Partner_Facture.js b/src/components/Partner_Facture.js index 404b92c..72dbaa5 100644 --- a/src/components/Partner_Facture.js +++ b/src/components/Partner_Facture.js @@ -462,6 +462,7 @@ const Partner_Facture = (props) => { const [isLoading, setLoading] = useState(); const [p_detail_header_client_nom, setp_detail_header_client_nom] = useState(); + const [p_detail_header_email_client, setp_detail_header_email_client] = useState(); const [p_detail_header_client_nom_id, setp_detail_header_client_nom_id] = useState(); const [p_detail_header_description, setp_detail_header_description] = useState(); @@ -743,6 +744,11 @@ const Partner_Facture = (props) => { } + if (mylocal_order.order_header_email_client) { + setp_detail_header_email_client(mylocal_order.order_header_email_client); + } + + //document.getElementsByName("detail_header_description")[0].value = ""; if (mylocal_order.order_header_description) { setp_detail_header_description(mylocal_order.order_header_description); @@ -1329,6 +1335,12 @@ const Partner_Facture = (props) => { document.getElementsByName("detail_nom_client")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("detail_header_email_client")[0]) { + document.getElementsByName("detail_header_email_client")[0].disabled = true; + document.getElementsByName("detail_header_email_client")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("detail_header_description")[0]) { document.getElementsByName("detail_header_description")[0].disabled = true; document.getElementsByName("detail_header_description")[0].style.backgroundColor = "#ECEFF1"; @@ -1992,6 +2004,23 @@ const Partner_Facture = (props) => { /> +
Email Client
+ +
Commande Ref. Externe
diff --git a/src/components/TestUrl_new.js b/src/components/TestUrl_new.js index dfeed2c..8042c67 100644 --- a/src/components/TestUrl_new.js +++ b/src/components/TestUrl_new.js @@ -24,8 +24,11 @@ import enUS from 'date-fns/locale/en-US' import FullCalendar from "@fullcalendar/react"; import daygridPlugin from "@fullcalendar/daygrid"; import interactionPlugin from "@fullcalendar/interaction"; +import timeGridPlugin from "@fullcalendar/timegrid"; import { v4 as uuid } from "uuid"; import { isCompositeComponent } from "react-dom/test-utils"; +import moment from "moment"; +import allLocales from '@fullcalendar/core/locales-all' const locales = { 'en-US': enUS, @@ -269,8 +272,9 @@ const TestUrl_New = (props) => { const [events, setEvents] = useState([]); const handleSelect = (info) => { const { start, end } = info; - const eventNamePrompt = prompt("Enter, event name"); + const eventNamePrompt = prompt("Enter, Nom evenment_ch"); if (eventNamePrompt) { + console.log("### eventNamePrompt = ", eventNamePrompt, " ### info = ", info); setEvents([ ...events, { @@ -287,7 +291,7 @@ const TestUrl_New = (props) => { const { event } = info; return (
-

{event.title}

+

ch - {event.title}

); }; @@ -334,10 +338,10 @@ const TestUrl_New = (props) => { setGet_Partner_Object_Specific_Fields_api("true"); setGet_Partner_Object_Specific_Fields_result(res.data.message); - + setrows_champs_specifics(res.data.message); - + } else { @@ -356,7 +360,7 @@ const TestUrl_New = (props) => { - + const [rows_champs_specifics, setrows_champs_specifics] = useState([]); @@ -382,11 +386,11 @@ const TestUrl_New = (props) => { function findValueByProperty(data, key, value) { for (var i = 0; i < data.length; i++) { if (data[i][key] == value) { - + var tmp_val = JSON.parse(data[i]); return tmp_val.field_value - + } } return ""; @@ -399,20 +403,20 @@ const TestUrl_New = (props) => { for (let i = 0; i < rows_champs_specifics.length; i++) { - var field_name = JSON.parse(rows_champs_specifics[i]).field_name; - var field_type = JSON.parse(rows_champs_specifics[i]).field_type; + var field_name = JSON.parse(rows_champs_specifics[i]).field_name; + var field_type = JSON.parse(rows_champs_specifics[i]).field_type; var field_label = JSON.parse(rows_champs_specifics[i]).field_label; - var is_mandatory = JSON.parse(rows_champs_specifics[i]).is_mandatory; + var is_mandatory = JSON.parse(rows_champs_specifics[i]).is_mandatory; if (document.getElementsByName(String(field_name))[0]) { var field_value = document.getElementsByName(String(field_name))[0].value; - var new_val = { 'field_name': field_name, 'field_value': field_value, 'field_type':field_type, 'field_label':field_label, 'is_mandatory':is_mandatory } + var new_val = { 'field_name': field_name, 'field_value': field_value, 'field_type': field_type, 'field_label': field_label, 'is_mandatory': is_mandatory } var johnIndex = findIndexByProperty(spec_field_updated_values, 'field_name', field_name); if (johnIndex > -1) { spec_field_updated_values[johnIndex] = new_val; - + } else { spec_field_updated_values.push(new_val); } @@ -488,6 +492,8 @@ const TestUrl_New = (props) => {
{ end: "dayGridMonth dayGridWeek dayGridDay", }} eventContent={(info) => } - plugins={[daygridPlugin, interactionPlugin]} + //plugins={[timeGridPlugin]} + plugins={[timeGridPlugin, daygridPlugin, interactionPlugin]} views={["dayGridMonth", "dayGridWeek", "dayGridDay"]} + slotMinTime="07:00" + slotMaxTime="20:00" + scrollTime='08:00' + + />; + + +
diff --git a/src/styles/components/_testurl_new.scss b/src/styles/components/_testurl_new.scss index c1715c1..4bfe242 100644 --- a/src/styles/components/_testurl_new.scss +++ b/src/styles/components/_testurl_new.scss @@ -1,5 +1,8 @@ .testurl_new { + .fc-view-harness { + height: 35rem !important; + } .Mui-disabled { font-size: small !important; @@ -222,7 +225,7 @@ padding: 5px; } - + .css-1x5jdmq { padding: 6px !important; @@ -417,9 +420,9 @@ font-family: "verdana", "Quicksand", "Signika", sans-serif; margin-top: 0px !important; margin-bottom: 2px !important; - } - - .texte_area_filter_value { + } + + .texte_area_filter_value { float: left !important; width: 100% !important; font-size: x-small !important; @@ -427,11 +430,11 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - - } - - - .filter_bton_add { + + } + + + .filter_bton_add { float: left; width: 40% !important; font-size: xx-large !important; @@ -440,33 +443,33 @@ margin-bottom: 2px !important; text-align: right; cursor: pointer; - } - - - .div_row { + } + + + .div_row { float: left; border-width: 0.01rem; width: 100%; - + border-radius: 1rem; - } - - .div_row_gauche { + } + + .div_row_gauche { float: left; width: 100%; border-radius: 1rem; text-align: left; - } - - .div_row_droite { + } + + .div_row_droite { float: left; width: 100%; border-radius: 1rem; text-align: left; - - } - - .bton_suppr { + + } + + .bton_suppr { background: transparent; color: red; border-radius: 5rem; @@ -477,9 +480,9 @@ margin-left: 10px; margin-right: 10px; margin-bottom: 1rem !important; - } - - .bton_enreg { + } + + .bton_enreg { border-radius: 5rem; font-size: small; background: #81BC3A !important; @@ -488,9 +491,9 @@ width: 100%; color: white; margin-bottom: 1rem !important; - } - - .bton_edit { + } + + .bton_edit { border-radius: 5rem; font-size: small; background: black !important; @@ -499,9 +502,9 @@ width: 100%; color: white; margin-bottom: 1rem !important; - } - - .bton_annule { + } + + .bton_annule { border-radius: 5rem; font-size: small; background: lightgray !important; @@ -510,35 +513,35 @@ width: 100%; color: black; margin-bottom: 1rem !important; - } - - - .css-1t10bd6-MuiFormControl-root-MuiTextField-root fieldset { + } + + + .css-1t10bd6-MuiFormControl-root-MuiTextField-root fieldset { border-color: transparent !important; border-radius: 20px !important; - } - - .disabled_style { + } + + .disabled_style { //background-color: #ECEFF1; font-size: small !important; color: black; width: 100% !important; height: 3.5rem !important; - + //border: none !important; border-radius: 5px; background: white; border: solid gainsboro 1px; - - } - - .training_caract { + + } + + .training_caract { width: 100%; - + float: left; - } - - .css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input .Mui-disabled { + } + + .css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input .Mui-disabled { font: inherit; letter-spacing: inherit; color: currentColor; @@ -558,30 +561,30 @@ height: 3rem !important; padding: 0 !important; padding-left: 5px !important; - } - - .css-11u53oe-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input { + } + + .css-11u53oe-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input { padding: 1px !important; - } - - .block_en_mass { + } + + .block_en_mass { width: 100%; float: left; margin-bottom: 1rem; - } - - .block_en_mass_select { + } + + .block_en_mass_select { width: 100%; float: left; margin-bottom: 1rem; - } - - .block_en_mass_bton_action { + } + + .block_en_mass_bton_action { width: 100%; float: left; margin-bottom: 1rem; padding-top: 0.5rem !important; - } + } } @media only screen and (min-width: 601px) and (max-width: 991px) { @@ -982,9 +985,9 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - } - - .texte_area_filter_value { + } + + .texte_area_filter_value { float: left !important; width: 40% !important; font-size: x-small !important; @@ -992,11 +995,11 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - - } - - - .filter_bton_add { + + } + + + .filter_bton_add { float: left; width: 5% !important; font-size: large !important; @@ -1006,36 +1009,36 @@ text-align: right; cursor: pointer; margin-top: 1rem !important; - } - - .div_row { + } + + .div_row { float: left; //border: 1px solid black; border-width: 0.01rem; width: 100%; //margin-bottom: 1rem; border-radius: 1rem; - } - - .div_row_gauche { + } + + .div_row_gauche { float: left; // border:1px solid black; // border-width:0.01rem; width: 45%; border-radius: 1rem; text-align: left; - } - - .div_row_droite { + } + + .div_row_droite { float: right; //border:1px solid black; //border-width:0.01rem; width: 45%; border-radius: 1rem; text-align: right; - } - - .bton_suppr { + } + + .bton_suppr { background: transparent; color: red; border-radius: 5rem; @@ -1046,9 +1049,9 @@ margin-left: 10px; margin-right: 10px; min-width: 15rem; - } - - .bton_enreg { + } + + .bton_enreg { border-radius: 5rem; font-size: small; background: #81BC3A !important; @@ -1059,9 +1062,9 @@ margin-left: 10px; margin-right: 10px; min-width: 15rem; - } - - .bton_edit { + } + + .bton_edit { border-radius: 5rem; font-size: small; background: black !important; @@ -1072,9 +1075,9 @@ margin-left: 10px; margin-right: 10px; min-width: 15rem; - } - - .bton_annule { + } + + .bton_annule { border-radius: 5rem; font-size: small; background: lightgray !important; @@ -1085,15 +1088,15 @@ margin-left: 10px; margin-right: 10px; min-width: 15rem; - } - - - .css-1t10bd6-MuiFormControl-root-MuiTextField-root fieldset { + } + + + .css-1t10bd6-MuiFormControl-root-MuiTextField-root fieldset { border-color: transparent !important; border-radius: 20px !important; - } - - .disabled_style { + } + + .disabled_style { //background-color: #ECEFF1; font-size: small !important; color: black; @@ -1106,15 +1109,15 @@ border: solid gainsboro 1px; padding-top: 0.5rem !important; border: none !important; - } - - .training_caract { + } + + .training_caract { width: 30%; padding: 5px; float: left; - } - - .css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input .Mui-disabled { + } + + .css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input .Mui-disabled { font: inherit; letter-spacing: inherit; color: currentColor; @@ -1134,31 +1137,31 @@ height: 3rem !important; padding: 0 !important; padding-left: 5px !important; - } - - .css-11u53oe-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input { + } + + .css-11u53oe-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input { padding: 1px !important; - } - - .block_en_mass { + } + + .block_en_mass { width: 50%; float: left; margin-bottom: 1rem; - } - - .block_en_mass_select { + } + + .block_en_mass_select { width: 45%; float: left; margin-bottom: 1rem; - } - - .block_en_mass_bton_action { + } + + .block_en_mass_bton_action { width: 45%; float: left; margin-bottom: 1rem; padding-top: 0.5rem !important; - } - + } + } @media only screen and (min-width: 992px) and (max-width: 1199px) { @@ -1588,9 +1591,9 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - } - - .texte_area_filter_value { + } + + .texte_area_filter_value { float: left !important; width: 40% !important; font-size: x-small !important; @@ -1598,11 +1601,11 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - - } - - - .filter_bton_add { + + } + + + .filter_bton_add { float: left; width: 5% !important; font-size: xx-large !important; @@ -1611,8 +1614,8 @@ margin-bottom: 2px !important; text-align: right; cursor: pointer; - } - + } + .titre1 { font-family: "Quicksand", "Signika", sans-serif; @@ -1624,7 +1627,7 @@ font-style: italic; background-color: gray; font-weight: normal; - } + } } @@ -1792,7 +1795,7 @@ padding-left: 5px !important; } - + .selectsession { width: 90%; @@ -2076,7 +2079,7 @@ .bton_supprime_image_class:hover { box-shadow: 5px 1px 5px 1px rgb(0 0 0 / 25%); } - + .bton_image_class { font-size: small; text-align: center; @@ -2119,9 +2122,9 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - } - - .texte_area_filter_value { + } + + .texte_area_filter_value { float: left !important; width: 40% !important; font-size: x-small !important; @@ -2129,11 +2132,11 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - - } - - - .filter_bton_add { + + } + + + .filter_bton_add { float: left; width: 5% !important; font-size: xx-large !important; @@ -2142,8 +2145,8 @@ margin-bottom: 2px !important; text-align: right; cursor: pointer; - } - + } + .titre1 { font-family: "Quicksand", "Signika", sans-serif; @@ -2155,14 +2158,14 @@ font-style: italic; background-color: gray; font-weight: normal; - } + } - .file_ariane{ + .file_ariane { font-size: large; font-weight: 600; width: 100%; text-align: center; - } + } } @@ -2171,7 +2174,7 @@ .css-1v4ccyo { height: 3.5rem !important; } - + option { font-weight: normal;