Merge branch 'staging' into production-dv-thanato

HOTFIXESdevis list group facturation redirect

See merge request sottye/hytha35!6

gestion/lib/Constants/BddConstant.php

@@ -8,7 +8,7 @@ abstract class BddConstant
     const DEFAULT_TABLE_PREFIX = "*PREFIX*";
     const DEFAULT_CLIENT_GROUP_NAME = "Nom du groupe";
     const DEFAULT_ADMIN_ID_NEXTCLOUD = 'admin';
-    const DEFAULT_ADMIN_APP_ID_NEXTCLOUD = "Johann";
+    const DEFAULT_ADMIN_APP_ID_NEXTCLOUD = "Vanessa";
 
     const ISLEAVEPROPERTYONVCALENDAR = "ISLEAVE";
 

gestion/lib/Controller/PageController.php

@@ -603,7 +603,7 @@ class PageController extends Controller {
 						$pdf->SetMargins(0,0,0);
 
 						// logo : 80 de largeur et 55 de hauteur
-						$pdf->Image($this->src_path."logo.png", 10, 10, 75, 25);
+						$pdf->Image($this->src_path."logo.png", 4, 2, 50, 35);
 						// adresse du facture
 						$pdf->SetFont('Arial','B',11); $_x = 122 ; $_y = 40;
 						$pdf->SetXY( $_x, $_y ); $pdf->Cell( 100, 8, utf8_decode('Groupe COGF'), 0, 0, ''); $_y += 8;
@@ -658,7 +658,7 @@ class PageController extends Controller {
 							$pdf->SetAutoPagebreak(False);
 							$pdf->SetMargins(0,0,0);
 
-							$pdf->Image($this->src_path."logo.png", 10, 10, 75, 25);
+							$pdf->Image($this->src_path."logo.png", 4, 2, 50, 35);
 
 							// n° page en haute à droite
 							if($nb_page>1){
@@ -865,7 +865,7 @@ class PageController extends Controller {
 							$pdf->SetMargins(0,0,0);
 
 							// logo : 80 de largeur et 55 de hauteur
-        					$pdf->Image($this->src_path."logo.png", 10, 10, 75, 25);
+        					$pdf->Image($this->src_path."logo.png", 4, 2, 50, 35);
 							// adresse du facture
 							$pdf->SetFont('ComicSans','B',11); $_x = 122 ; $_y = 40;
 							$pdf->SetXY( $_x, $_y ); $pdf->Cell( 100, 8, utf8_decode($current_client), 0, 0, ''); $_y += 8;
@@ -920,7 +920,7 @@ class PageController extends Controller {
 								$pdf->SetAutoPagebreak(False);
 								$pdf->SetMargins(0,0,0);
 
-								$pdf->Image($this->src_path."logo.png", 10, 10, 75, 25);
+								$pdf->Image($this->src_path."logo.png", 4, 2, 50, 35);
 
 								// n° page en haute à droite
         						if($nb_page>1){
@@ -1616,9 +1616,7 @@ class PageController extends Controller {
 				$message->attach($content);
 				$message->setSubject($subject);
 				$body_text = $addName ? ($body." de ".$devis['defunt_nom'] ) : $body;
-
-				$signature = $this->mailerService->getFooterContent();
-				
+				$signature = $this->mailerService->getFooterContent($this->getUserNameForEmailSignature());
 				$message->setHtmlBody(
 				"<p>Bonjour.</p>".
 				"<p>$body_text</p>".
@@ -1636,13 +1634,10 @@ class PageController extends Controller {
 			// }
 		}
 	}
-	public function addSignatureEmailLogo (){
-		$signatureImage = $this->getSignature();
-		if (!$signatureImage) {
-			return "";
-		}
-		//Add html img in base 64
-		return "<img style= 'width: 250px;height: 150;' src='data:image/jpeg;base64,".base64_encode($signatureImage)."'>" ;
+	public function getUserNameForEmailSignature (){
+			$configs = json_decode($this->myDb->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
+			$currentConfig = $configs[0];
+			return $currentConfig->nom . " " . $currentConfig->prenom;
 	}
 
 	/**
@@ -2186,7 +2181,7 @@ class PageController extends Controller {
 				// logo : 80 de largeur et 55 de hauteur
 				$logo = $this->getLogo();
 				if($logo != 'nothing'){
-					$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
+					$pdf->Image($this->defaultImagePath."logo.png", 4, 2, 50, 35);
 				}
 				$pdf->setXY(15, 15); $pdf->SetFont('ComicSans', '', 10); $pdf->MultiCell(0, 5, utf8_decode(html_entity_decode("N : ".$numFacture)), '', 'R');
 
@@ -2474,7 +2469,7 @@ class PageController extends Controller {
 			// logo : 80 de largeur et 55 de hauteur
 			$logo = $this->getLogo();
 			if($logo != 'nothing'){
-				$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
+				$pdf->Image($this->defaultImagePath."logo.png", 4, 2, 50, 35);
 			}
 			$pdf->SetY(45); $pdf->SetFont('ComicSans', 'B', 15); $pdf->Cell(0, 10, utf8_decode(html_entity_decode("ATTESTATION BIJOU(X)")), 0, 0, 'C');
 

gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php

@@ -42,7 +42,7 @@ class CareCertificatePdfHandler extends FPDF {
     function Header()
     {
         if($this->logo != "nothing"){
-            $this->Image($this->imagePath."logo.png", 10, 10, 75, 25);
+            $this->Image($this->imagePath."logo.png", 4, 2, 50, 35);
         }
         else{
             $this->Cell(55,30,'');

gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php

@@ -32,7 +32,8 @@ use OCA\Gestion\Helpers\DateHelpers;
 use OCA\Gestion\Helpers\FileExportHelpers;
 use OCA\Gestion\Helpers\PriceHelpers;
 
-class PacemakerCertificatePdfHandler extends FPDF {
+class PacemakerCertificatePdfHandler extends FPDF
+{
 
     private $devisOfDefunt = [];
     private $logo = null;
@@ -42,9 +43,8 @@ class PacemakerCertificatePdfHandler extends FPDF {
     function Header()
     {
         if ($this->logo != "nothing") {
-            $this->Image($this->imagePath."logo.png", 10, 10, 75, 25);
-        }
-        else{
+            $this->Image($this->imagePath . "logo.png", 4, 2, 50, 35);
+        } else {
             $this->Cell(55, 30, '');
         }
     }
@@ -56,13 +56,15 @@ class PacemakerCertificatePdfHandler extends FPDF {
         $this->MultiCell(0, 5, utf8_decode(html_entity_decode($this->devisOfDefunt['configuration']->adresse)), 0, 'C');
     }
 
-    public function SetPacemakerCertificateData(array $devisOfDefunt,$logo = null,$signatureImageExist = false){
+    public function SetPacemakerCertificateData(array $devisOfDefunt, $logo = null, $signatureImageExist = false)
+    {
         $this->devisOfDefunt = $devisOfDefunt;
         $this->logo = $logo;
         $this->signatureImageExist = $signatureImageExist;
     }
 
-    public function SetPacemakerCertificate(){
+    public function SetPacemakerCertificate()
+    {
         $this->AddPage();
         $this->SetMargins(left: 20, top: 0, right: 20);
         $this->SetPacemakerCertificateTitle();
@@ -70,7 +72,8 @@ class PacemakerCertificatePdfHandler extends FPDF {
         $this->SetSigning();
     }
 
-    private function SetSigning(){
+    private function SetSigning()
+    {
         $this->SetXY(140, $this->GetY() + 15);
         $this->Cell(0, 10, 'Cachet et signature');
 
@@ -79,7 +82,8 @@ class PacemakerCertificatePdfHandler extends FPDF {
         }
     }
 
-    private function SetPacemakerCertificateContent(){
+    private function SetPacemakerCertificateContent()
+    {
         $this->SetFont('ComicSans', '', 14);
         $this->MultiCell(0, 7, FileExportHelpers::FormatTextForExport('La Société ' . $this->devisOfDefunt['configuration']->entreprise . ' habilitée sous le numéro ' . $this->devisOfDefunt['thanato_reference'] . ', certifie par la présente que : '));
         $this->SetFont('ComicSans', 'B', 14);
@@ -94,12 +98,22 @@ class PacemakerCertificatePdfHandler extends FPDF {
         $this->MultiCell(0, 6, FileExportHelpers::FormatTextForExport($this->devisOfDefunt['location_of_devis']));
         $this->Ln(6);
         $this->SetFont('ComicSans', '', 14);
-        $this->Cell(0,6, 
+        $this->Cell(
+            0,
+            6,
             FileExportHelpers::FormatTextForExport("Numéro de série : ") .
-        FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_reference_pacemaker']),0,1);
-        $this->Cell(0,6, 
+            FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_reference_pacemaker']),
+            0,
+            1
+        );
+        $this->Cell(
+            0,
+            6,
             FileExportHelpers::FormatTextForExport("Marque du produit : ") .
-        FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_product_brand']),0,1);
+            FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_product_brand']),
+            0,
+            1
+        );
         $this->Cell(0, 12, FileExportHelpers::FormatTextForExport("La présente attestation  est établie pour faire valoir ce que de droit."), 0, 5);
         $this->Ln(5);
 
@@ -108,7 +122,8 @@ class PacemakerCertificatePdfHandler extends FPDF {
         $this->Cell(0, 7, 'le ' . $this->devisOfDefunt['devis_date']->format('d/m/Y'), 0);
     }
 
-    private function SetPacemakerCertificateTitle(){
+    private function SetPacemakerCertificateTitle()
+    {
         $this->SetY(y: 50);
         $this->SetFont('ComicSans', 'B', 20);
         $this->Cell(0, 10, 'ATTESTATION DE RETRAIT DE LA', 0, 1, 'C');
@@ -126,8 +141,7 @@ class PacemakerCertificatePdfHandler extends FPDF {
         $this->MultiCell($w, $h, $text, $border, $align, $fill);
 
         // Reset the line position to the right, like in Cell
-		if( $ln==0 )
-		{
+        if ($ln == 0) {
             $this->SetXY($x, $y);
         }
     }
@@ -150,11 +164,9 @@ class PacemakerCertificatePdfHandler extends FPDF {
         $j = 0;
         $l = 0;
         $nl = 1;
-        while($i<$nb)
-        {
+        while ($i < $nb) {
             $c = $s[$i];
-            if($c=="\n")
-            {
+            if ($c == "\n") {
                 $i++;
                 $sep = -1;
                 $j = $i;
@@ -165,21 +177,17 @@ class PacemakerCertificatePdfHandler extends FPDF {
             if ($c == ' ')
                 $sep = $i;
             $l += $cw[$c];
-            if($l>$wmax)
-            {
-                if($sep==-1)
-                {
+            if ($l > $wmax) {
+                if ($sep == -1) {
                     if ($i == $j)
                         $i++;
-                }
-                else
+                } else
                     $i = $sep + 1;
                 $sep = -1;
                 $j = $i;
                 $l = 0;
                 $nl++;
-            }
-            else
+            } else
                 $i++;
         }
         return $nl;

gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php

@@ -31,7 +31,8 @@ use \FPDF;
 use OCA\Gestion\Helpers\FileExportHelpers;
 use OCA\Gestion\Helpers\PriceHelpers;
 
-class DevisPdfHandler extends FPDF {
+class DevisPdfHandler extends FPDF
+{
 
     private $multipleDevisData = [];
     private $devisData = [];
@@ -40,9 +41,8 @@ class DevisPdfHandler extends FPDF {
     function Header()
     {
         if ($this->logo != "nothing") {
-            $this->Image($this->logoPath."logo.png", 2, 2, 50,35);
-        }
-        else{
+            $this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
+        } else {
             $this->Cell(55, 30, '');
         }
     }
@@ -60,24 +60,28 @@ class DevisPdfHandler extends FPDF {
         $this->Cell(0, 10, utf8_decode(html_entity_decode($this->devisData['configuration']->legal_one)), 0, 0, 'C');
     }
 
-    public function SetDevisPdfData(array $devisData,$logo = null){
+    public function SetDevisPdfData(array $devisData, $logo = null)
+    {
         $this->devisData = $devisData;
         $this->logo = $logo;
     }
 
-    public function SetMultipleDevisPdfData(array $multipleDevisData,$logo = null){
+    public function SetMultipleDevisPdfData(array $multipleDevisData, $logo = null)
+    {
         $this->multipleDevisData = $multipleDevisData;
         $this->logo = $logo;
     }
 
-    private function DrawDevisCompanyAndClientInfo(){
+    private function DrawDevisCompanyAndClientInfo()
+    {
         $this->SetY(40);
         $this->SetFont('ComicSans', '', 12);
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration']->entreprise), 0, 0);
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['client_nom']), 0, 1, 'R');
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration_adresse']), 0, 0);
         $this->Cell(0, 7, trim(FileExportHelpers::FormatTextForExport($this->devisData['client_real_adress'])), 0, 1, 'R');
-        $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration_adresse_city']), 0, 0);border: 
+        $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration_adresse_city']), 0, 0);
+        border:
         $this->Cell(0, 7, trim(FileExportHelpers::FormatTextForExport($this->devisData['client_adress_city'])), 0, 1, 'R');
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($this->devisData['configuration']->telephone), 0, 0);
         $this->Cell(0, 7, 'Siret: ' . $this->devisData['siret'], 0, 1, 'R');
@@ -85,7 +89,8 @@ class DevisPdfHandler extends FPDF {
         $this->Ln(3);
     }
 
-    private function DrawDevisInfoTable(){
+    private function DrawDevisInfoTable()
+    {
         $this->SetFont('ComicSans', 'B', 11);
         $this->Cell(30, 7, 'DATE', 1, 0, 'C');
         $this->Cell(80, 7, 'CLIENT', 1, 0, 'C');
@@ -99,7 +104,8 @@ class DevisPdfHandler extends FPDF {
         $this->Ln(8);
     }
 
-    private function DrawArticlesTable(){
+    private function DrawArticlesTable()
+    {
         $this->SetLineWidth(0.1);
         $this->Rect(10, 105, 190, 100, "D");
         // cadre titre des colonnes
@@ -111,7 +117,8 @@ class DevisPdfHandler extends FPDF {
         $this->Line(175, 105, 175, 205);
     }
 
-    private function DrawArticlesTableHeader(){
+    private function DrawArticlesTableHeader()
+    {
         $tvaValue = $this->devisData["configuration"]->tva_default;
         $this->SetFont('ComicSans', '', 10);
         $this->SetXY(10, 106);
@@ -131,7 +138,8 @@ class DevisPdfHandler extends FPDF {
 
     }
 
-    public function DrawArticlesTableValueAndReturnTotalPrice(){
+    public function DrawArticlesTableValueAndReturnTotalPrice()
+    {
         $this->SetFont('ComicSans', '', 10);
         $tvaValue = $this->devisData["configuration"]->tva_default;
         $totalHt = 0;
@@ -176,7 +184,8 @@ class DevisPdfHandler extends FPDF {
         ];
     }
 
-    private function DrawBankAndTotalPriceInfo($totalPriceArray){
+    private function DrawBankAndTotalPriceInfo($totalPriceArray)
+    {
         $this->SetY(210);
         $this->SetFont('ComicSans', '', 9);
         $this->MultiCell(0, 5, utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de " . $this->devisData['configuration']->entreprise)));
@@ -205,14 +214,16 @@ class DevisPdfHandler extends FPDF {
         }
     }
 
-    public function SetMultipleDevisContent(){
+    public function SetMultipleDevisContent()
+    {
         foreach ($this->multipleDevisData as $devisData) {
             $this->devisData = $devisData;
             $this->SetDevisContent();
         }
     }
 
-    public function SetDevisContent(){
+    public function SetDevisContent()
+    {
         $this->AddPage();
         $this->SetMargins(10, 0, 10);
         $this->DrawDevisCompanyAndClientInfo();
@@ -233,8 +244,7 @@ class DevisPdfHandler extends FPDF {
         $this->MultiCell($w, $h, $text, $border, $align, $fill);
 
         // Reset the line position to the right, like in Cell
-		if( $ln==0 )
-		{
+        if ($ln == 0) {
             $this->SetXY($x, $y);
         }
     }
@@ -257,11 +267,9 @@ class DevisPdfHandler extends FPDF {
         $j = 0;
         $l = 0;
         $nl = 1;
-        while($i<$nb)
-        {
+        while ($i < $nb) {
             $c = $s[$i];
-            if($c=="\n")
-            {
+            if ($c == "\n") {
                 $i++;
                 $sep = -1;
                 $j = $i;
@@ -272,21 +280,17 @@ class DevisPdfHandler extends FPDF {
             if ($c == ' ')
                 $sep = $i;
             $l += $cw[$c];
-            if($l>$wmax)
-            {
-                if($sep==-1)
-                {
+            if ($l > $wmax) {
+                if ($sep == -1) {
                     if ($i == $j)
                         $i++;
-                }
-                else
+                } else
                     $i = $sep + 1;
                 $sep = -1;
                 $j = $i;
                 $l = 0;
                 $nl++;
-            }
-            else
+            } else
                 $i++;
         }
         return $nl;

gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php

@@ -57,7 +57,7 @@ class InvoiceGroupPdfHandler extends FPDF
     function Header()
     {
         if ($this->logo != "nothing") {
-            $this->Image($this->logoPath . "logo.png", 2, 10, 75, 25);
+            $this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
             $this->AddWatermark();
         } else {
             $this->Cell(55, 30, '');

gestion/lib/Service/InvoicePdfHandler.php

@@ -52,7 +52,7 @@ class InvoicePdfHandler extends FPDF
     function Header()
     {
         if ($this->logo != "nothing") {
-            $this->Image($this->logoPath . "logo.png", 2, 10, 75, 25);
+            $this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
             $this->AddWatermark();
         } else {
             $this->Cell(55, 30, '');

gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php

@@ -171,7 +171,7 @@ class InvoiceRecapService {
 
                 // logo : 80 de largeur et 55 de hauteur
                 if($doesLogoExist){
-                    $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
+                    $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
                 }
 
                 //adresse de mon entreprise
@@ -276,7 +276,7 @@ class InvoiceRecapService {
                     $pdf->SetMargins(0,0,10);
 
                     if($doesLogoExist){
-                        $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
+                        $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
                     }
 
                     //adresse de mon entreprise
@@ -589,7 +589,7 @@ class InvoiceRecapService {
 
                     // logo : 80 de largeur et 55 de hauteur
                     if($doesLogoExist){
-                        $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
+                        $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
                     }
 
                     //adresse de mon entreprise
@@ -692,7 +692,7 @@ class InvoiceRecapService {
                         $pdf->SetAutoPagebreak(False);
                         $pdf->SetMargins(0,0,10);
                         if($doesLogoExist){
-                            $pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
+                            $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
                         }
 
                         //adresse de mon entreprise

gestion/lib/Service/MailerService.php

@@ -51,7 +51,7 @@ class MailerService {
 		if (!$signatureImage) {
 			return "";
 		}
-		return "<img style= 'width: 250px;height: 150px;' src='data:image/jpeg;base64,".base64_encode($signatureImage)."'>" ;
+		return "<img width='170' height='80' style= 'width: 170;height: 80px;display:block;' src='data:image/jpeg;base64,".base64_encode($signatureImage)."'>" ;
 	}
     
     private function getSignatureContent(){