diff --git a/.gitignore b/.gitignore index d316c39..3ca13c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -hesabixArchive/ hesabixBackup/ backup/ .idea/ diff --git a/hesabixArchive/seal/default.png b/hesabixArchive/seal/default.png new file mode 100644 index 0000000..6e20299 Binary files /dev/null and b/hesabixArchive/seal/default.png differ diff --git a/hesabixArchive/seal/index.php b/hesabixArchive/seal/index.php new file mode 100755 index 0000000..b3d9bbc --- /dev/null +++ b/hesabixArchive/seal/index.php @@ -0,0 +1 @@ +createNotFoundException(); + $fileAdr = __DIR__ . '/../../../hesabixArchive/avatars/default.png'; $response = new BinaryFileResponse($fileAdr); return $response; } + #[Route('/front/seal/file/get/{id}', name: 'front_seal_file_get')] + public function front_seal_file_get(EntityManagerInterface $entityManager, string $id = '0'): BinaryFileResponse + { + $bid = $entityManager->getRepository(Business::class)->find($id); + if (!$bid) + return new BinaryFileResponse(dirname(__DIR__, 3) . '/hesabixArchive/seal/default.png'); + $fileAdr = dirname(__DIR__, 3) . '/hesabixArchive/seal/' . $bid->getSealFile(); + if (!$bid->getAvatar() || !file_exists($fileAdr)) + return new BinaryFileResponse(dirname(__DIR__, 3) . '/hesabixArchive/seal/default.png'); + $response = new BinaryFileResponse($fileAdr); + return $response; + } + + #[Route('/api/seal/get/file/{id}', name: 'api_seal_get_file')] public function api_seal_get_file(string $id = null): BinaryFileResponse { diff --git a/hesabixCore/src/Controller/BuyController.php b/hesabixCore/src/Controller/BuyController.php index 3914923..464fa40 100644 --- a/hesabixCore/src/Controller/BuyController.php +++ b/hesabixCore/src/Controller/BuyController.php @@ -442,10 +442,10 @@ class BuyController extends AbstractController foreach ($doc->getHesabdariRows() as $item) { if ($item->getPerson()) { $person = $item->getPerson(); - } elseif ($item->getRef()->getCode() == 90) { - $discount = $item->getBd(); } elseif ($item->getRef()->getCode() == 51) { - $transfer = $item->getBs(); + $discount = $item->getBs(); + } elseif ($item->getRef()->getCode() == 90) { + $transfer = $item->getBd(); } } $pdfPid = 0; diff --git a/hesabixCore/templates/pdf/base.html.twig b/hesabixCore/templates/pdf/base.html.twig index 04c8ee0..a638383 100644 --- a/hesabixCore/templates/pdf/base.html.twig +++ b/hesabixCore/templates/pdf/base.html.twig @@ -32,7 +32,7 @@ - +

{{bid.name}}

diff --git a/hesabixCore/templates/pdf/posPrinters/sell.html.twig b/hesabixCore/templates/pdf/posPrinters/sell.html.twig index 131aeb7..11447af 100644 --- a/hesabixCore/templates/pdf/posPrinters/sell.html.twig +++ b/hesabixCore/templates/pdf/posPrinters/sell.html.twig @@ -123,7 +123,7 @@ {% if printInvoice%}

{{ bid.name }}

- +
@@ -228,7 +228,7 @@
{% endif %} diff --git a/hesabixCore/templates/pdf/printers/buy.html.twig b/hesabixCore/templates/pdf/printers/buy.html.twig index bedf801..068845d 100644 --- a/hesabixCore/templates/pdf/printers/buy.html.twig +++ b/hesabixCore/templates/pdf/printers/buy.html.twig @@ -26,7 +26,7 @@ - +

صورتحساب خرید کالا و خدمات

@@ -297,7 +297,7 @@ مهر و امضا خریدار
- +

diff --git a/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig b/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig index 75521b2..9fb309e 100644 --- a/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig +++ b/hesabixCore/templates/pdf/printers/repservice/invoice.html.twig @@ -29,7 +29,7 @@ - +

{{ bid.name }}

@@ -170,7 +170,7 @@
{{ doc.submitter.fullname }}
- + diff --git a/hesabixCore/templates/pdf/printers/rfbuy.html.twig b/hesabixCore/templates/pdf/printers/rfbuy.html.twig index 7bb795c..85e2f77 100644 --- a/hesabixCore/templates/pdf/printers/rfbuy.html.twig +++ b/hesabixCore/templates/pdf/printers/rfbuy.html.twig @@ -26,7 +26,7 @@ - +

صورتحساب برگشت از خرید کالا و خدمات

@@ -297,7 +297,7 @@ مهر و امضا خریدار
- +

diff --git a/hesabixCore/templates/pdf/printers/rfsell.html.twig b/hesabixCore/templates/pdf/printers/rfsell.html.twig index 4bb7d52..fd14e75 100644 --- a/hesabixCore/templates/pdf/printers/rfsell.html.twig +++ b/hesabixCore/templates/pdf/printers/rfsell.html.twig @@ -26,7 +26,7 @@ - +

صورتحساب برگشت از فروش کالا و خدمات

@@ -302,7 +302,7 @@ مهر و امضا فروشنده:
- + diff --git a/hesabixCore/templates/pdf/printers/sell.html.twig b/hesabixCore/templates/pdf/printers/sell.html.twig index dd32d23..7019db5 100644 --- a/hesabixCore/templates/pdf/printers/sell.html.twig +++ b/hesabixCore/templates/pdf/printers/sell.html.twig @@ -26,7 +26,7 @@ - +

صورتحساب فروش کالا و خدمات

@@ -304,7 +304,7 @@ مهر و امضا فروشنده:
- + diff --git a/hesabixCore/templates/pdf/printers/storeroom/input.html.twig b/hesabixCore/templates/pdf/printers/storeroom/input.html.twig index b9599ad..983802e 100644 --- a/hesabixCore/templates/pdf/printers/storeroom/input.html.twig +++ b/hesabixCore/templates/pdf/printers/storeroom/input.html.twig @@ -26,7 +26,7 @@ - +

{{ bid.name }}

@@ -185,7 +185,7 @@ {{doc.storeroom.manager}}
- +