diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js
index e3bfad8..9dee00c 100644
--- a/src/components/Partner_Commande.js
+++ b/src/components/Partner_Commande.js
@@ -68,10 +68,10 @@ const Partner_Commande = (props) => {
const columns = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'order_header_ref_interne', headerName: 'Reference', width: 150, hide: false, editable: true },
- { field: 'order_header_type', headerName: 'Type', width: 150, hide: false, editable: true },
+ { field: 'order_header_ref_interne', headerName: 'Reference', width: 100, hide: false, editable: true },
+ { field: 'order_header_type', headerName: 'Type', width: 100, hide: false, editable: true },
{
- field: 'order_header_status', headerName: 'Statut', width: 150, hide: false, editable: true,
+ field: 'order_header_status', headerName: 'Statut', width: 100, hide: false, editable: true,
valueFormatter: (params) => {
if (String(params.value) === "-1")
return "Annulé";
@@ -88,10 +88,10 @@ const Partner_Commande = (props) => {
},
},
- { field: 'order_header_client_id', headerName: 'Client_Id', width: 150, hideable: false, },
- { field: 'order_header_client_nom', headerName: 'Nom Client', width: 150, hideable: false, },
- { field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 150, hideable: false, },
- { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, hideable: false, },
+ { field: 'order_header_client_id', headerName: 'Client_Id', width: 150, hide: true },
+ { field: 'order_header_client_nom', headerName: 'Nom Client', width: 150, hideable: false, flex: 1 },
+ { field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 150, hide: true },
+ { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, hideable: false, flex: 1 },
{ field: 'order_header_date_cmd', headerName: 'Date', width: 150, hide: false, editable: true },
{ field: 'order_header_date_expiration', headerName: 'Date Expiration', width: 150, hide: false, editable: true },
@@ -182,14 +182,15 @@ const Partner_Commande = (props) => {
{ field: '_id', headerName: '_id', hide: true, editable: false },
{ field: 'id', headerName: 'id', hide: true, editable: false },
{ field: 'order_line_formation', headerName: 'intenal_url', width: 0, hide: true, editable: false },
- { field: 'order_line_formation_title', headerName: 'Titre', width: 150, hide: false, editable: false },
- { field: 'order_line_formation_duration', headerName: 'Durée', width: 150, hide: false, editable: false },
+ { field: 'order_line_formation_title', headerName: 'Titre', width: 250, hide: false, editable: false, flex: 1 },
+ { field: 'order_line_formation_external_code', headerName: 'Code Formation', width: 150, hide: false, editable: false },
+ { field: 'order_line_formation_duration', headerName: 'Durée', width: 80, hide: false, editable: false },
- { field: 'order_line_qty', headerName: 'Qte', width: 150, hide: false, editable: false },
- { field: 'order_line_prix_unitaire', headerName: 'Prix Unit.', width: 150, hide: false, editable: false },
- { field: 'order_header_id', headerName: 'Id_Entete', width: 150, hideable: false, editable: false },
- { field: 'order_header_ref_interne', headerName: 'Ref_Interne', width: 150, hideable: false, editable: false },
- { field: 'order_line_type', headerName: 'Type', width: 150, hide: false, editable: false },
+ { field: 'order_line_qty', headerName: 'Qte', width: 100, hide: false, editable: false },
+ { field: 'order_line_prix_unitaire', headerName: 'Prix Unit.', width: 100, hide: false, editable: false },
+ { field: 'order_header_id', headerName: 'Id_Entete', hide: true },
+ { field: 'order_header_ref_interne', headerName: 'Ref_Interne', hide: true },
+ { field: 'order_line_type', headerName: 'Type', width: 100, hide: false, editable: false },
{
field: 'order_line_status', headerName: 'Statut', width: 150, hide: false, editable: true,
valueFormatter: (params) => {
@@ -398,6 +399,17 @@ const Partner_Commande = (props) => {
setp_filtre4();
setp_filtre4_value();
+
+ clean_order_detail_fields();
+ setsubmenu();
+ setorder_data_edit_mode();
+ setorder_data_edit_mode();
+ setdisplay_detail_order();
+ setadd_One_Order();
+ setSelectionModel([]);
+ setselectionModel_order_lines([]);
+
+ Getall_Parter_Orders_No_Filter();
}
@@ -556,6 +568,74 @@ const Partner_Commande = (props) => {
}
+ const [Getall_Parter_Orders_With_Filter_api, setGetall_Parter_Orders_With_Filter_api] = useState();
+ const [Getall_Parter_Orders_With_Filter_message, setGetall_Parter_Orders_With_Filter_message] = useState();
+ const [Getall_Parter_Orders_With_Filter_result, setGetall_Parter_Orders_With_Filter_result] = useState();
+ function Getall_Parter_Orders_With_Filter(event) {
+
+ var form = new FormData();
+
+ // Recuperation des parametres
+ var filtre1 = p_filtre1;
+ var filtre2 = p_filtre2;
+ var filtre3 = p_filtre3;
+ var filtre4 = p_filtre4;
+
+ var filtre1_value = "";
+ var filtre2_value = "";
+ var filtre3_value = "";
+ var filtre4_value = "";
+ // Recuperation des valeurs de filtres
+
+ if (p_filtre1_value) {
+ filtre1_value = p_filtre1_value;
+ form.append(filtre1, filtre1_value);
+ }
+
+ if (p_filtre2_value) {
+ filtre2_value = p_filtre2_value;
+ form.append(filtre2, filtre2_value);
+ }
+
+ if (p_filtre3_value) {
+ filtre3_value = p_filtre3_value;
+ form.append(filtre3, p_filtre3_value);
+ }
+
+ if (p_filtre4_value) {
+ filtre4_value = p_filtre4_value;
+ form.append(filtre4, p_filtre4_value);
+ }
+
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Partner_Order_with_filter/";
+
+ axios.post(myurl, form).then(res => {
+
+ if (String(res.data.status) === String("true")) {
+ //console.log(" In Getall_Parter_Orders_With_Filter res.data.status = " + res.data.status);
+ //console.log(" In Getall_Parter_Orders_With_Filter res.data.message r_class = " + res.data.message);
+ setGetall_Parter_Orders_With_Filter_api("true");
+ setGetall_Parter_Orders_With_Filter_result(res.data.message);
+ setRows(res.data.message);
+ }
+ else {
+ setGetall_Parter_Orders_With_Filter_api("false");
+ setGetall_Parter_Orders_With_Filter_message(res.data.message);
+ alert(res.data.message);
+ }
+
+ }).catch((error) => {
+ console.warn('Not good man :( Getall_Parter_Orders_With_Filter = ', error);
+ setGetall_Parter_Orders_With_Filter_api("false");
+ alert(" Impossible de recuperer la liste des commandes et devis");
+ //setmyApimyApiMessage("")
+ })
+ }
+
+
const [session_file_name, setsession_file_name] = useState();
const [liste_sessions_file_change_api, setliste_sessions_file_change_api] = useState();
const [liste_sessions_file_change_result, setliste_sessions_file_change_result] = useState();
@@ -1155,9 +1235,18 @@ const Partner_Commande = (props) => {
}
const [add_One_Order, setadd_One_Order] = useState();
+
+
function submenu_add_one_order() {
+ setp_add_cmd_header_order_type("commande");
setDialog_Detail_Commande_open(true);
+ }
+
+
+ function submenu_add_one_quotation() {
+ setp_add_cmd_header_order_type("devis");
+ setDialog_Detail_Commande_open(true);
}
@@ -2614,10 +2703,10 @@ const Partner_Commande = (props) => {
-
+
-
+
@@ -2634,233 +2723,227 @@ const Partner_Commande = (props) => {
Nouvelle Commande
-
- Ajout d'une commande / devis
-
-
-
- {
- setp_add_cmd_header_client_id(e.target.value);
- /*setp_add_line_item_internal_url(e.target.value);
- const div1 = document.getElementById("mysy_item_class");
- const mysy_item_class_title = div1.getAttribute('mysy_item_class_title');
- setp_add_line_item_title(mysy_item_class_title);
- //console.log(" Selected title = ", mysy_item_class_title); */
- }
- }
- >
- {Get_List_Partner_Clients_result &&
- Get_List_Partner_Clients_result.map((myclient) => (
-
- ))}
-
-
- {/*p_add_cmd_header_client_id &&
-
-
Adresse client
-
-
-
Adresse Facturation
-
-
-
*/}
-
-
- Date cmd
-
-
{
- setp_add_cmd_header_date_cmd(format(date, 'dd/MM/yyyy'));
-
- }
- }
- showTimeSelect={false}
- //filterTime={filterPassedTime_start}
- dateFormat="dd/MM/yyyy"
- className="disabled_style enable_style"
- locale='fr-FR'
+ Client
+
-
-
- Date expiration
-
- {
- setp_add_cmd_header_date_expiration_cmd(format(date, 'dd/MM/yyyy'));
-
+ //variant="standard"
+ value={p_add_cmd_header_client_id}
+ onChange={(e) => {
+ setp_add_cmd_header_client_id(e.target.value);
+ /*setp_add_line_item_internal_url(e.target.value);
+ const div1 = document.getElementById("mysy_item_class");
+ const mysy_item_class_title = div1.getAttribute('mysy_item_class_title');
+ setp_add_line_item_title(mysy_item_class_title);
+ //console.log(" Selected title = ", mysy_item_class_title); */
}
}
- showTimeSelect={false}
- //filterTime={filterPassedTime_start}
- dateFormat="dd/MM/yyyy"
- className="disabled_style enable_style"
- locale='fr-FR'
- fullWidth
- />
+ >
+ {Get_List_Partner_Clients_result &&
+ Get_List_Partner_Clients_result.map((myclient) => (
+
+ ))}
+
+
-
{
- setp_add_cmd_header_description(e.target.value);
+ Date cmd
- }
- }
- />
+ {
+ setp_add_cmd_header_date_cmd(format(date, 'dd/MM/yyyy'));
- {
- setp_add_cmd_header_ref_client(e.target.value);
+ }
+ }
+ showTimeSelect={false}
+ //filterTime={filterPassedTime_start}
+ dateFormat="dd/MM/yyyy"
+ className="disabled_style enable_style"
+ style={{ "width": "100%" }}
+ locale='fr-FR'
+ fullWidth
+ />
+
- }
- }
- />
+ Date expiration
- {
- setp_add_cmd_header_vendeur_id(e.target.value);
+ {
+ setp_add_cmd_header_date_expiration_cmd(format(date, 'dd/MM/yyyy'));
- }
- }
- >
- {Getall_Training_Employee_No_Filter_result &&
- Getall_Training_Employee_No_Filter_result.map((myclient) => (
-
- ))}
-
+ locale='fr-FR'
+ fullWidth
+ />
+
+
+
+ Description
+ {
+ setp_add_cmd_header_description(e.target.value);
+
+ }
+ }
+ />
+
+
+ Ref. externe
+ {
+ setp_add_cmd_header_ref_client(e.target.value);
+
+ }
+ }
+ />
+
+
+ Vendeur
+
+ {
+ setp_add_cmd_header_vendeur_id(e.target.value);
+
+ }
+ }
+ >
+ {Getall_Training_Employee_No_Filter_result &&
+ Getall_Training_Employee_No_Filter_result.map((myclient) => (
+
+ ))}
+
+
+
+ Conditions Paiement
+
+ {
+ setp_add_cmd_header_condition_paiement(e.target.value);
+
+ }
+ }
- {
- setp_add_cmd_header_condition_paiement(e.target.value);
+ />
- }
- }
- label="Conditions Paiement"
- variant="standard"
+
- />
+ Type
- {
- setp_add_cmd_header_order_type(e.target.value);
+
-
-
-
-
+ />
-
+ Emplacement
+
+ >
+
+
+
+
+
+
+
+ Commentaire
+
@@ -2869,10 +2952,10 @@ const Partner_Commande = (props) => {
-
+
-
+
@@ -2897,10 +2980,10 @@ const Partner_Commande = (props) => {
}}
>
-
-
+
+
+
-
@@ -2977,10 +3060,10 @@ const Partner_Commande = (props) => {
}}
>
-
-
+
+
+
-
@@ -3057,10 +3140,10 @@ const Partner_Commande = (props) => {
setp_filtre3(e.target.value)
}}
>
-
-
+
+
+
-
@@ -3123,12 +3206,12 @@ const Partner_Commande = (props) => {
-
- Annuler
+ Annuler
@@ -3150,32 +3233,20 @@ const Partner_Commande = (props) => {
width: '100%',
paddingRight: '1px',
- // Gestion des cellule a distance ou presentiel
- '& .cell--distantiel': {
- backgroundColor: '#AFE1AF',
- color: 'black',
+ // Gestion des cellule "statut"
+ '& .cell--status--encours': {
+ backgroundColor: '#E6F7C8',
+ color: '#1a3e72',
+ fontWeight: 'light',
},
-
- '& .cell--presentiel': {
- backgroundColor: '#AFE1AF',
- color: 'black',
+ '& .cell--status--traite': {
+ backgroundColor: '#E6CEAA',
+ color: '#F9E79F',
+ fontWeight: 'light',
},
- // gestion couleur des lignes avec le statut d'inscription
- '& .line--statut--annule': {
- backgroundColor: '#D8D8D8',
- color: 'white',
- },
- '& .line--statut--inscrit': {
- backgroundColor: '#CEF6D8',
- color: 'black',
- },
- '& .line--statut--preinscrit': {
- backgroundColor: '#F7F2E0',
- color: 'black',
- },
/*"& .MuiDataGrid-virtualScrollerRenderZone": {
"& .MuiDataGrid-row": {
@@ -3235,26 +3306,24 @@ const Partner_Commande = (props) => {
}}
//sx={datagridSx}
getCellClassName={(params) => {
- //field === 'distantiel'
- if (params.field === 'distantiel' && String(params.value) === "1") {
- return 'cell--distantiel';
- }
- if (params.field === "presentiel" && String(params.value) == "1") {
- return 'cell--presentiel';
- }
- //field === "statut"
- if (params.field === "status" && String(params.value) == "0") {
- return 'cell--statut--preinscrit';
+ //field === "order_header_status"
+ if (params.field === "order_header_status" && String(params.value) == "0") {
+ return 'cell--status--brouillon';
}
- if (params.field === "status" && String(params.value) == "1") {
- return 'cell--statut--inscrit';
+ if (params.field === "order_header_status" && String(params.value) == "1") {
+
+ return 'cell--status--encours';
}
- if (params.field === "status" && String(params.value) == "-1") {
- return 'cell--statut--annule';
+ if (params.field === "order_header_status" && String(params.value) == "2") {
+ return 'cell--status--traite';
+ }
+
+ if (params.field === "order_header_status" && String(params.value) == "3") {
+ return 'cell--status--facture';
}
}}
@@ -3286,22 +3355,22 @@ const Partner_Commande = (props) => {
-
+ */}
-
@@ -3324,15 +3393,14 @@ const Partner_Commande = (props) => {
{String(submenu) === "detail_order" && String(add_One_Order) !== "1" &&
-
Affichage detaillé d'une commande / devis
+
-
Entete de commande
-
-
Commande
-
-
+
+ Menu Commande
+
+
@@ -3715,107 +3783,106 @@ const Partner_Commande = (props) => {
}
{String(header_submenu) === "detail" &&
-
+ {/*
Mettre a jour prix
Imprimer pdf
envoyer par mail
+
*/}
+
+
+ {String(order_data_edit_mode) === "1" &&
Type de Reduction (entete)
+
+
}
+
+ {String(order_data_edit_mode) !== "1" &&
Type de Reduction (entete)
+
+
+
}
+
+
+
Valeur reduction (entete)
+
-
- {String(order_data_edit_mode) === "1" &&
Type de Reduction (entete)
-
-
-
Les Totaux
+
+
+
Total Ligne HT avant reduction
{
/>
-
-
Entete : Total reduction
{
}
{String(header_submenu) === "facturation" &&
-
Facturation :
-
Adresse
-
-
Lieu / livraison :
-
Adresse
-
+
Ville
+
+
+
Pays
+
+
+
+
+
Adresse Livraison
+
+
+
Code postal
+
+
+
Ville
+
+
+
Pays
+
+
+
+
}
@@ -4124,7 +4189,7 @@ const Partner_Commande = (props) => {
Confirmer
{String(selected_order_header_type) === "devis" &&
Convertir en Cmd }
Annuler
-
+
Supprimer }
@@ -4169,6 +4234,12 @@ const Partner_Commande = (props) => {
)}
+
+
+
Mettre a jour prix
+
Imprimer pdf
+
envoyer par mail
+
@@ -4210,9 +4281,9 @@ const Partner_Commande = (props) => {
-
Lignes de commande
+
-
+
{
order_line_formation_title: JSON.parse(item).title,
order_line_formation_duration: JSON.parse(item).duration_concat,
order_line_comment: JSON.parse(item).order_line_comment,
+ order_line_formation_external_code: JSON.parse(item).order_line_formation_external_code,
}
))}
diff --git a/src/styles/components/_partner_commande.scss b/src/styles/components/_partner_commande.scss
index 0eeeba6..6d28527 100644
--- a/src/styles/components/_partner_commande.scss
+++ b/src/styles/components/_partner_commande.scss
@@ -2126,6 +2126,32 @@
text-align: left !important;
}
+ .bton_enreg_dialog {
+ border-radius: 5rem;
+ font-size: small;
+ background: #81BC3A !important;
+ text-align: center;
+ height: 2.5rem;
+ width: 80%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+
+ .bton_annule_dialog {
+ border-radius: 5rem;
+ font-size: small;
+ background: lightgray !important;
+ text-align: right;
+ height: 2.5rem;
+ width: 80%;
+ color: black;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+
}
// end media
@@ -2185,6 +2211,11 @@
margin-left: .35em;
}
+ .MuiSelect-select{
+ height: 3rem !important;
+
+ }
+
}
@@ -2209,6 +2240,7 @@
.css-9ddj71-MuiInputBase-root-MuiOutlinedInput-root {
height: 3.5rem !important;
+ font-size: small !important;
}