diff --git a/gestion/lib/Controller/PageController.php b/gestion/lib/Controller/PageController.php index eabb132..60c264d 100644 --- a/gestion/lib/Controller/PageController.php +++ b/gestion/lib/Controller/PageController.php @@ -1238,7 +1238,7 @@ class PageController extends Controller { * @NoCSRFRequired */ public function getConfiguration() { - $idNextcloud = self::DEFAULT_ADMIN; + $idNextcloud = self::H2F_DEFAULT_ADMIN; return $this->myDb->getConfiguration($idNextcloud); } diff --git a/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php b/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php index e5a2b15..acd271b 100644 --- a/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php +++ b/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", 10, 10, 90, 35); } else{ $this->Cell(55,30,''); diff --git a/gestion/lib/Service/Devis/Pdf/DevisPdfService.php b/gestion/lib/Service/Devis/Pdf/DevisPdfService.php index 07f29a7..43d4c46 100644 --- a/gestion/lib/Service/Devis/Pdf/DevisPdfService.php +++ b/gestion/lib/Service/Devis/Pdf/DevisPdfService.php @@ -104,7 +104,7 @@ class DevisPdfService { public function generateDevisPdfByDevisId($devisId,$idNextCloud){ $storage = $this->rootFolder->getUserFolder($idNextCloud); - $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN)); + $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_H2F_ADMIN)); $currentConfig = $configs[0]; $logo = $this->getLogo(); $devisPdfData = $this->gestionBdd->getDevisPdfDataByDevisId($devisId); @@ -162,7 +162,7 @@ class DevisPdfService { public function generateMultipleDevisPdfByClientAndMonthYear($clientId,$month,$year,$idNextCloud){ $storage = $this->rootFolder->getUserFolder($idNextCloud); - $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN)); + $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_H2F_ADMIN)); $currentConfig = $configs[0]; $logo = $this->getLogo(); $mulitpleDevisData = $this->gestionBdd->getDevisPdfDataByClientAndMonthYear($clientId,$month,$year,$currentConfig); diff --git a/gestion/lib/Service/InvoicePdfService.php b/gestion/lib/Service/InvoicePdfService.php index 3b3dedc..ad03db8 100644 --- a/gestion/lib/Service/InvoicePdfService.php +++ b/gestion/lib/Service/InvoicePdfService.php @@ -69,7 +69,7 @@ class InvoicePdfService { public function generateFacturePdfByFactureId($factureId,$idNextCloud){ $storage = $this->rootFolder->getUserFolder($idNextCloud); - $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN)); + $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_H2F_ADMIN)); $currentConfig = $configs[0]; $logo = $this->getLogo(); $invoicePdfData = $this->gestionBdd->getInvoicePdfData($factureId,$currentConfig); @@ -121,7 +121,7 @@ class InvoicePdfService { public function generateMultipleInvoicePdfByClientAndMonthYear($clientId,$month,$year,$idNextCloud){ $storage = $this->rootFolder->getUserFolder($idNextCloud); - $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN)); + $configs = json_decode($this->gestionBdd->getConfiguration(self::DEFAULT_NEXTCLOUD_H2F_ADMIN)); $currentConfig = $configs[0]; $logo = $this->getLogo(); $invoiceData = $this->gestionBdd->getInvoicePdfDataByClientAndMonthYear($clientId,$month,$year,$currentConfig);