Merge pull request #124 from nochlezhka/cert-photo

Fix client photo path
nochlezhka · Nov 14, 2023 · 8ba7b5e · 8ba7b5e
2 parents 5368e42 + 3868ce0
commit 8ba7b5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/shared/homeless/src/Controller/CRUDController.php b/shared/homeless/src/Controller/CRUDController.php
@@ -54,12 +54,12 @@ public function downloadAction(Request $request): Response
         }
 
         if (!($object instanceof DownloadableInterface)) {
-            throw new \InvalidArgumentException('App\Service\DownloadableInterface expected, '.$object::class.' given');
+            throw new \InvalidArgumentException(DownloadableInterface::class.' expected, '.$object::class.' given');
         }
 
         $html = '';
-        switch ($object::class) {
-            case Certificate::class:
+        switch (true) {
+            case $object instanceof Certificate:
                 if ($request->get('document')) {
                     $document = $this->documentRepository->find($request->get('document'));
                     $object->setDocument($document);
@@ -81,11 +81,11 @@ public function downloadAction(Request $request): Response
                 $this->entityManager->flush();
                 break;
 
-            case GeneratedDocument::class:
+            case $object instanceof GeneratedDocument:
                 $html = $this->renderService->renderGeneratedDocument($object);
                 break;
 
-            case Contract::class:
+            case $object instanceof Contract:
                 $client = $object->getClient();
                 $this->entityManager->initializeObject($client);
                 $html = $this->renderService->renderContract($object, $client, $this->getUser());

diff --git a/shared/homeless/src/Entity/Client.php b/shared/homeless/src/Entity/Client.php
@@ -202,7 +202,7 @@ public function getPhotoPathWeb(): string
 
     public function getPhotoPath(): string
     {
-        return __DIR__.'/../../../public/'.$this->getPhotoPathWeb();
+        return __DIR__.'/../../public/'.$this->getPhotoPathWeb();
     }
 
     public function getPhotoSize(int $width, int $height): array
@@ -226,10 +226,10 @@ public function getPhotoSize(int $width, int $height): array
         return [$width, $height];
     }
 
-    public function getPhotoFileBase64(): ?string
+    public function getPhotoFileBase64(): string
     {
         if (!$this->isImage()) {
-            return null;
+            return '';
         }
 
         return 'data:image/png;base64,'.base64_encode(file_get_contents($this->getPhotoPath()));

diff --git a/shared/homeless/src/Service/RenderService.php b/shared/homeless/src/Service/RenderService.php
@@ -40,12 +40,8 @@ public function renderCertificate(Certificate $certificate, Client $client): ?st
             return null;
         }
 
-        $image = '';
-        [$width, $height] = [0, 0];
-        if (file_exists($client->getPhotoPath())) {
-            $image = $client->getPhotoFileBase64();
-            [$width, $height] = $client->getPhotoSize(300, 350);
-        }
+        $image = $client->getPhotoFileBase64();
+        [$width, $height] = $client->getPhotoSize(300, 350);
 
         return $this->twig->render('/pdf/certificate/layout.html.twig', [
             'contentHeaderLeft' => empty($type->getContentHeaderLeft()) ? '' : $this->twig->createTemplate($type->getContentHeaderLeft())->render(['certificate' => $certificate]),