From a8cdad27bacbb759e70e5b75ee482c6e4b696478 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Thu, 6 Feb 2025 10:29:58 +0300 Subject: [PATCH] finish bon de commande --- gestion/lib/Db/Bdd.php | 11 ++++++++- gestion/lib/Service/InvoicePdfHandler.php | 8 ++++++- .../20250206-ADD-ORDER-AND-CASE-NUMBER.sql | 6 +++++ gestion/templates/content/factureshow.php | 23 ++++++++++++++++--- 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 gestion/lib/Sql/20250206-ADD-ORDER-AND-CASE-NUMBER.sql diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index bbbfc05..da90361 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -47,7 +47,8 @@ class Bdd { "portal_code","alarm_code","funeral_code", "product_brand","product_reference", "fk_user_uuid", - "phone_number","address",'postal_code','city','email','siret_number','tva_intracommu'); + "phone_number","address",'postal_code','city','email','siret_number','tva_intracommu', + 'order_number','case_number'); $this->whiteTable = array( "client", "lieu", "trajet", "devis", "produit_devis", "facture", "produit", "configuration", "ligne_trajet", "thanato", "article", "defunt", "article_devis", "bibliotheque", "bijou_defunt", "obs_defunt", "hypo_defunt", "client_group_discount","client_group", @@ -536,6 +537,8 @@ class Bdd { .$this->tableprefix."facture.date, ".$this->tableprefix."devis.num as dnum, comment, date_paiement, type_paiement, id_devis, ".$this->tableprefix."client.nom, prenom, entreprise," .$this->tableprefix."devis.comment as dcomment,".$this->tableprefix."lieu.nom as lieu, ".$this->tableprefix."lieu.adresse as adresse_soin," .$this->tableprefix."defunt.nom as nom_defunt, " + .$this->tableprefix."devis.order_number as order_number, " + .$this->tableprefix."devis.case_number as case_number, " .$this->tableprefix."facture_payment_type.facture_payment_type_label as facture_payment_type_label FROM (".$this->tableprefix."facture LEFT JOIN ".$this->tableprefix."devis on ".$this->tableprefix."facture.id_devis = ".$this->tableprefix."devis.id @@ -2868,6 +2871,8 @@ class Bdd { devis.num as calendar_uuid, devis.comment as devis_comment, devis.id_client as devis_id_client, + devis.order_number as order_number, + devis.case_number as case_number, client.nom as client_nom, client.prenom as client_prenom, client.entreprise as client_entreprise, @@ -2932,6 +2937,8 @@ class Bdd { devis.num as calendar_uuid, devis.comment as devis_comment, devis.id_client as devis_id_client, + devis.order_number as order_number, + devis.case_number as case_number, client.nom as client_nom, client.prenom as client_prenom, client.entreprise as client_entreprise, @@ -3019,6 +3026,8 @@ class Bdd { devis.date as devis_date, devis.num as calendar_uuid, devis.comment as devis_comment, + devis.order_number as order_number, + devis.case_number as case_number, client.nom as client_nom, client.entreprise as client_entreprise, client.adresse as client_adresse, diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php index 6dc1e3f..56631a5 100644 --- a/gestion/lib/Service/InvoicePdfHandler.php +++ b/gestion/lib/Service/InvoicePdfHandler.php @@ -145,7 +145,7 @@ class InvoicePdfHandler extends FPDF { } private function DrawInvoiceInfoTable(){ - $this->setY(70); + $this->setY(67); $factureDatePaiement = $this->factureData['date_paiement']; $factureDatePaiement = DateTime::createFromFormat('Y-m-d',$factureDatePaiement); $factureDateEcheance = $factureDatePaiement; @@ -164,6 +164,12 @@ class InvoicePdfHandler extends FPDF { $this->Cell(40, 7, $this->factureData['num'], 1, 0, 'C'); $this->Cell(40, 7, $factureDateEcheance, 1, 1, 'C'); + $this->Ln(2); + $orderNumber = ($this->factureData['order_number'] == "" || $this->factureData['order_number'] == "-" ) ? "Aucun" : $this->factureData['order_number']; + $caseNumber = ($this->factureData['case_number'] == "" || $this->factureData['case_number'] == "-") ? "Aucun" : $this->factureData['case_number']; + $this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Bon de commande: ".$orderNumber),0,1,'C'); + $this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Numéro de dossier: ".$caseNumber),0,1,'C'); + $this->Ln(8); } diff --git a/gestion/lib/Sql/20250206-ADD-ORDER-AND-CASE-NUMBER.sql b/gestion/lib/Sql/20250206-ADD-ORDER-AND-CASE-NUMBER.sql new file mode 100644 index 0000000..0293d45 --- /dev/null +++ b/gestion/lib/Sql/20250206-ADD-ORDER-AND-CASE-NUMBER.sql @@ -0,0 +1,6 @@ +alter table oc_gestion_devis +add column order_number VARCHAR(255) DEFAULT '', +add column case_number VARCHAR(255) DEFAULT ''; + +update oc_gestion_devis set order_number = comment; +update oc_gestion_devis set order_number = '' where order_number = '-' or order_number = 'Commentaire' or order_number = 'New comment'; \ No newline at end of file diff --git a/gestion/templates/content/factureshow.php b/gestion/templates/content/factureshow.php index 69a85a3..1488a39 100644 --- a/gestion/templates/content/factureshow.php +++ b/gestion/templates/content/factureshow.php @@ -56,10 +56,27 @@
-
-
dcomment == "" ) ? "-" : $_['facture'][0]->dcomment ; ?>
-
+ +
+ order_number == "" ) ? "-" : $_['facture'][0]->order_number ; ?> +
+
+
+
+
+ +
+ case_number == "" ) ? "-" : $_['facture'][0]->case_number ; ?> +
+
+

Articles