morrning/hesabixCore
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

redesign costs and some bug fix

Browse source
This commit is contained in:
babak alizadeh 2024-07-15 15:52:04 +03:30
parent 7e861c240d
commit 3c50c28d27
2 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hesabixCore/src/Controller/AdminController.php
View file

@ -503,8 +503,9 @@ class AdminController extends AbstractController
#[Route('/api/admin/logs/last', name: 'api_admin_logs_last')] #[Route('/api/admin/logs/last', name: 'api_admin_logs_last')]
public function api_admin_logs_last(Jdate $jdate, EntityManagerInterface $entityManager): JsonResponse public function api_admin_logs_last(Jdate $jdate, EntityManagerInterface $entityManager): JsonResponse
{ {
$logs = $entityManager->getRepository(\App\Entity\Log::class)->findBy([], ['id' => 'ASC'], 250); $logs = $entityManager->getRepository(\App\Entity\Log::class)->findBy([], ['id' => 'DESC'], 250);
$temps = []; $temps = [];
$logs = array_reverse($logs);
foreach ($logs as $log) { foreach ($logs as $log) {
$temp = []; $temp = [];
if ($log->getUser()) if ($log->getUser())

51
hesabixCore/templates/pdf/printers/sell.html.twig
View file

@ -3,12 +3,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<head> <head>
<style> <style>
@page {
margin: 3%;
margin-header: 0;
margin-footer: 0;
}
.center { .center {
text-align: center; text-align: center;
} }
@ -243,14 +237,19 @@
</td> </td>
<td class="item"> <td class="item">
<h4> <h4>
جمع کل: مبلغ کل بدون تخفیف:
{{ (doc.amount + discount) | number_format}}
</h4>
</td>
<td class="item">
<h4>
جمع کل قابل پرداخت:
{{doc.amount | number_format}} {{doc.amount | number_format}}
</h4> </h4>
</td> </td>
</tr> </tr>
<tr class="stimol"> <tr class="stimol">
<td class="item" colspan="4"> <td class="item" colspan="5">
<h4> <h4>
توضیحات: توضیحات:
{{doc.des}} {{doc.des}}
@ -260,7 +259,39 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div style="width:100%;margin-top:20px;text-align:center;"> {% if doc.relatedDocs | length != 0 %}
<h4 class="">
پرداخت‌ها:
</h4>
<div style="width:60%;margin-top:0px;text-align:center;">
<table style="width:100%;">
<thead>
<tr class="stimol" style="background-color:gray;">
<th class="text-white" style="width:80px">ردیف</th>
<th class="text-white">تاریخ</th>
<th class="text-white">مبلغ</th>
<th class="text-white">شرح</th>
</tr>
</thead>
<tbody>
<tbody>
{% set rowIndex = 0 %}
{% for item in doc.relatedDocs%}
{% set rowIndex = rowIndex + 1 %}
<tr class="stimol">
<td class="center item">{{rowIndex}}</td>
<td class="center item">{{item.date}}</td>
<td class="center item">{{ item.amount | number_format }}</td>
<td class="center item">{{ item.des }}</td>
</tr>
{% endfor %}
</tbody>
</tbody>
</table>
</div>
{% endif %}
<div style="width:40%;margin-top:20px;text-align:center;float:left;">
<table style="width:100%;"> <table style="width:100%;">
<tbody> <tbody>
<tr class=""> <tr class="">