From 492b601255e1d7083f31c407d63c6a26bc655e96 Mon Sep 17 00:00:00 2001 From: Babak Alizadeh Date: Sat, 7 Dec 2024 12:57:40 +0000 Subject: [PATCH] bug fix in avatar controller for not exist files --- hesabixCore/src/Controller/AvatarController.php | 2 +- hesabixCore/src/Controller/PrintersController.php | 2 +- hesabixCore/templates/pdf/printers/sell.html.twig | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hesabixCore/src/Controller/AvatarController.php b/hesabixCore/src/Controller/AvatarController.php index cf43567..c27efe7 100644 --- a/hesabixCore/src/Controller/AvatarController.php +++ b/hesabixCore/src/Controller/AvatarController.php @@ -24,7 +24,7 @@ class AvatarController extends AbstractController if (!$bid) return new BinaryFileResponse(dirname(__DIR__, 3) . '/hesabixArchive/avatars/default.png'); $fileAdr = dirname(__DIR__, 3) . '/hesabixArchive/avatars/' . $bid->getAvatar(); - if (!$bid->getAvatar()) + if (!$bid->getAvatar() || !file_exists($fileAdr)) return new BinaryFileResponse(dirname(__DIR__, 3) . '/hesabixArchive/avatars/default.png'); $response = new BinaryFileResponse($fileAdr); return $response; diff --git a/hesabixCore/src/Controller/PrintersController.php b/hesabixCore/src/Controller/PrintersController.php index f5a6bf7..5fd06f0 100644 --- a/hesabixCore/src/Controller/PrintersController.php +++ b/hesabixCore/src/Controller/PrintersController.php @@ -229,7 +229,7 @@ class PrintersController extends AbstractController #[Route('/api/print/last', name: 'app_print_last')] public function app_print_last(Provider $provider, Request $request, Access $access, Log $log, EntityManagerInterface $entityManager): Response { - $acc = $access->hasRole('join'); + $acc = $access->hasRole('owner'); if (!$acc) throw $this->createAccessDeniedException(); $printer = $entityManager->getRepository(Printer::class)->findBy([ diff --git a/hesabixCore/templates/pdf/printers/sell.html.twig b/hesabixCore/templates/pdf/printers/sell.html.twig index 77b0921..c6e7570 100644 --- a/hesabixCore/templates/pdf/printers/sell.html.twig +++ b/hesabixCore/templates/pdf/printers/sell.html.twig @@ -274,12 +274,14 @@ حمل و نقل: {{transfer | number_format}} + {% if doc.amount != (doc.amount + discount) %} +

+ مبلغ کل بدون تخفیف: + {{ (doc.amount + discount) | number_format}} +

+ {% endif %}

- مبلغ کل بدون تخفیف: - {{ (doc.amount + discount) | number_format}} -

-

- جمع کل قابل پرداخت: + جمع کل: {{ doc.amount | number_format }}