From 14f68d7d93cd6e498a7d15cf5ce5b227ed0683a7 Mon Sep 17 00:00:00 2001 From: polo Date: Mon, 3 Jun 2024 00:04:42 +0200 Subject: =?UTF-8?q?mode=20de=20paiement=20non=20hydrat=C3=A9=20quand=20fac?= =?UTF-8?q?ture=20=C3=A0=20partir=20d'un=20devis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/model/DevisFactures.php | 17 ----------------- src/model/Model.php | 8 ++++++-- src/model/Prestations.php | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) (limited to 'src/model') 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) -- cgit v1.2.3