mode de paiement non hydraté quand facture à partir d'un devis

5 files changed, 9 insertions, 21 deletions

diff --git a/src/model/DevisFactures.php b/src/model/DevisFactures.php
index c667fb2..967067f 100644
--- a/src/model/DevisFactures.php
+++ b/src/model/DevisFactures.php
@@ -212,21 +212,4 @@ class DevisFactures extends Model
             'total_HT' => $this->total_HT
         ]);
     }
-    
-    //~ public function newRow(array $input)
-    //~ {
-        //~ if($this->table === 'devis') // comme la table 'factures' avec deux champs en plus
-        //~ {
-            //~ $this->hydrate(['ID' => $input[0], 'ID_presta' => $input[1], 'taches' => $input[2], 'machine' => $input[3], 'OS' => $input[4], 'donnees' => $input[5], 'cles_licences' => $input[6], 'total_main_d_oeuvre' => $input[7], 'pieces' => $input[8], 'total_pieces' => $input[9], 'deplacement' => $input[10], 'total_HT' => $input[11]],
-                //~ ['validite_devis' => $input[12], 'signature_devis' => $input[13]]);
-            //~ $this->hydrate(['validite_devis' => $quotations_input[0], 'signature_devis' => $quotations_input[1]]);
-        //~ }
-        //~ elseif($this->table === 'factures')
-        //~ {
-            //~ $this->hydrate(['ID' => $input[0], 'ID_presta' => $input[1], 'taches' => $input[2], 'machine' => $input[3], 'OS' => $input[4], 'donnees' => $input[5], 'cles_licences' => $input[6], 'total_main_d_oeuvre' => $input[7], 'pieces' => $input[8], 'total_pieces' => $input[9], 'deplacement' => $input[10], 'total_HT' => $input[11]]);
-        //~ }
-        //~ $this->hydrate(['ID' => $input[0], 'ID_presta' => $input[1], 'taches' => $input[2], 'machine' => $input[3], 'OS' => $input[4], 'donnees' => $input[5], 'cles_licences' => $input[6], 'total_main_d_oeuvre' => $input[7], 'pieces' => $input[8], 'total_pieces' => $input[9], 'deplacement' => $input[10], 'total_HT' => $input[11]]);
-        //~ $this->create();
-        //~ $this->ID_devis_facture = $this->db->lastInsertId(); // méthode de PDO
-    //~ }
 }
diff --git a/src/model/Model.php b/src/model/Model.php
index fad25b3..9ada9a4 100644
--- a/src/model/Model.php
+++ b/src/model/Model.php
@@ -96,9 +96,13 @@ abstract class Model extends DB
                             $check = $this->hydrate(['taches' => $data_array[0], 'machine' => $data_array[1], 'OS' => $data_array[2], 'donnees' => $data_array[3], 'cles_licences' => $data_array[4], 'total_main_d_oeuvre' => $data_array[5], 'pieces' => $data_array[6], 'total_pieces' => $data_array[7], 'deplacement' => $data_array[8], 'total_HT' => $data_array[9]]);
                         }
                     }
-                    elseif(count($data_array) === 5)
+                    elseif(count($data_array) === 5) // facture à partir d'un devis
                     {
-                        $check = $this->hydrate(['machine' => $data_array[1], 'OS' => $data_array[2], 'donnees' => $data_array[3], 'cles_licences' => $data_array[4]]);
+                        $check = $this->hydrate(['machine' => $data_array[0], 'OS' => $data_array[1], 'donnees' => $data_array[2], 'cles_licences' => $data_array[3]]);
+                        if($check)
+                        {
+                            $check = $Presta->hydrate(['mode_paiement' => $data_array[4]]);
+                        }
                     }
                     else
                     {
diff --git a/src/model/Prestations.php b/src/model/Prestations.php
index 88eb4f0..1666018 100644
--- a/src/model/Prestations.php
+++ b/src/model/Prestations.php
@@ -135,7 +135,7 @@ class Prestations extends Model
     }
     public function setCommentaires(string $value)
     {
-        $this->commentaires = $this->cleanSpecialChars($value); // possibilité que $this->commentaires devienne une chaine vide
+        $this->commentaires = $this->cleanSpecialChars($value); // nettoyage ici parce que pas possible ailleurs
         return $this;
     }
     public function setNumeroPresta($value)
diff --git a/src/sections/2_service.php b/src/sections/2_service.php
index 28fba3f..78e4dd4 100644
--- a/src/sections/2_service.php
+++ b/src/sections/2_service.php
@@ -78,7 +78,6 @@ function newService($Client): array // $Client est un Client ou null
             $PrestaDetails = new DevisFactures('factures');
             $Presta->setTypePresta('facture');
             $answers = exec($FormulaireFactureReduit->get());
-            //$answers = '' + answers[0], answers[1], answers[2], answers[3], '', '', '', '', '', answers[4];
             //var_dump($answers);
             break;
         case ZenitySetup::$menu_enregistrement_entrees[3]: // "CESU"
diff --git a/à faire.txt b/à faire.txt
index 7799ef4..1ef4271 100644
--- a/à faire.txt
+++ b/à faire.txt
@@ -1,5 +1,7 @@
 À FAIRE:
 
+proposer un choix oui/non à la modification du champ devis signé
+
 permettre de modifier le code_presta dans "Modifier une prestation"
 
 si aucun client n'est trouvé, montrer tous les clients