add seltment to person card

This commit is contained in:
Hesabix 2025-08-18 07:33:23 +00:00
parent a97a29d50e
commit 50ca4045bc
5 changed files with 80 additions and 7 deletions

View file

@ -55,7 +55,7 @@ class AccountingDocService
'person' => $person, 'person' => $person,
'year' => $acc['year'] 'year' => $acc['year']
], [ ], [
'id' => 'DESC' 'id' => 'ASC'
]); ]);
} elseif ($params['type'] == 'bank') { } elseif ($params['type'] == 'bank') {
$bank = $em->getRepository(\App\Entity\BankAccount::class)->findOneBy([ $bank = $em->getRepository(\App\Entity\BankAccount::class)->findOneBy([
@ -68,7 +68,7 @@ class AccountingDocService
'bank' => $bank, 'bank' => $bank,
'year' => $acc['year'] 'year' => $acc['year']
], [ ], [
'id' => 'DESC' 'id' => 'ASC'
]); ]);
} elseif ($params['type'] == 'cashdesk') { } elseif ($params['type'] == 'cashdesk') {
$cashdesk = $em->getRepository(\App\Entity\Cashdesk::class)->findOneBy([ $cashdesk = $em->getRepository(\App\Entity\Cashdesk::class)->findOneBy([
@ -81,7 +81,7 @@ class AccountingDocService
'cashdesk' => $cashdesk, 'cashdesk' => $cashdesk,
'year' => $acc['year'] 'year' => $acc['year']
], [ ], [
'id' => 'DESC' 'id' => 'ASC'
]); ]);
} elseif ($params['type'] == 'salary') { } elseif ($params['type'] == 'salary') {
$salary = $em->getRepository(\App\Entity\Salary::class)->findOneBy([ $salary = $em->getRepository(\App\Entity\Salary::class)->findOneBy([
@ -94,13 +94,29 @@ class AccountingDocService
'salary' => $salary, 'salary' => $salary,
'year' => $acc['year'] 'year' => $acc['year']
], [ ], [
'id' => 'DESC' 'id' => 'ASC'
]); ]);
} else { } else {
return ['error' => 'نوع پشتیبانی نمی‌شود']; return ['error' => 'نوع پشتیبانی نمی‌شود'];
} }
$dataTemp = []; $dataTemp = [];
$runningBalance = 0; // باقی‌مانده تجمعی
foreach ($data as $item) { foreach ($data as $item) {
// محاسبه باقی‌مانده تجمعی
$runningBalance += ($item->getBs() - $item->getBd());
// محاسبه تشخیص بر اساس باقی‌مانده تجمعی
$settlement = '';
if ($runningBalance > 0) {
$settlement = 'بستانکار';
} elseif ($runningBalance < 0) {
$settlement = 'بدهکار';
} else {
$settlement = 'تسویه‌شده';
}
$temp = [ $temp = [
'id' => $item->getId(), 'id' => $item->getId(),
'dateSubmit' => $item->getDoc()->getDateSubmit(), 'dateSubmit' => $item->getDoc()->getDateSubmit(),
@ -111,10 +127,14 @@ class AccountingDocService
'bs' => $item->getBs(), 'bs' => $item->getBs(),
'bd' => $item->getBd(), 'bd' => $item->getBd(),
'code' => $item->getDoc()->getCode(), 'code' => $item->getDoc()->getCode(),
'submitter' => $item->getDoc()->getSubmitter()->getFullName() 'submitter' => $item->getDoc()->getSubmitter()->getFullName(),
'settlement' => $settlement, // ستون تشخیص
'balance' => $runningBalance // ستون باقی‌مانده
]; ];
$dataTemp[] = $temp; $dataTemp[] = $temp;
} }
return $dataTemp;
// معکوس کردن ترتیب برای نمایش جدیدترین‌ها اول
return array_reverse($dataTemp);
} }
} }

View file

@ -721,10 +721,25 @@ class PersonsController extends AbstractController
'تفضیل', 'تفضیل',
'بستانکار', 'بستانکار',
'بدهکار', 'بدهکار',
'تشخیص',
'باقی‌مانده',
'سال مالی', 'سال مالی',
] ]
]; ];
$runningBalance = 0;
foreach ($transactions as $transaction) { foreach ($transactions as $transaction) {
$runningBalance += ($transaction->getBs() - $transaction->getBd());
$settlement = '';
if ($runningBalance > 0) {
$settlement = 'بستانکار';
} elseif ($runningBalance < 0) {
$settlement = 'بدهکار';
} else {
$settlement = 'تسویه‌شده';
}
$arrayEntity[] = [ $arrayEntity[] = [
$transaction->getId(), $transaction->getId(),
$transaction->getDoc()->getDate(), $transaction->getDoc()->getDate(),
@ -732,6 +747,8 @@ class PersonsController extends AbstractController
$transaction->getRef()->getName(), $transaction->getRef()->getName(),
$transaction->getBs(), $transaction->getBs(),
$transaction->getBd(), $transaction->getBd(),
$settlement,
$runningBalance,
$transaction->getYear()->getlabel() $transaction->getYear()->getlabel()
]; ];
} }

View file

@ -81,13 +81,25 @@
<td class="center item">تفضیل</td> <td class="center item">تفضیل</td>
<td class="center item">بدهکار</td> <td class="center item">بدهکار</td>
<td class="center item">بستانکار</td> <td class="center item">بستانکار</td>
<td class="center item">تشخیص</td>
<td class="center item">باقی‌مانده</td>
<td class="center item">شرح سند</td> <td class="center item">شرح سند</td>
</tr> </tr>
{% set sumBs = 0 %} {% set sumBs = 0 %}
{% set sumBd = 0 %} {% set sumBd = 0 %}
{% set runningBalance = 0 %}
{% for item in items %} {% for item in items %}
{% set sumBs = sumBs + item.bs %} {% set sumBs = sumBs + item.bs %}
{% set sumBd = sumBd + item.bd %} {% set sumBd = sumBd + item.bd %}
{% set runningBalance = runningBalance + (item.bs - item.bd) %}
{% set settlement = '' %}
{% if runningBalance > 0 %}
{% set settlement = 'بستانکار' %}
{% elseif runningBalance < 0 %}
{% set settlement = 'بدهکار' %}
{% else %}
{% set settlement = 'تسویه‌شده' %}
{% endif %}
<tr class="stimol"> <tr class="stimol">
<td class="center item">{{ loop.index }}</td> <td class="center item">{{ loop.index }}</td>
<td class="center item">{{ item.doc.code }}</td> <td class="center item">{{ item.doc.code }}</td>
@ -96,6 +108,8 @@
<td class="center item">{{ item.ref.name }}</td> <td class="center item">{{ item.ref.name }}</td>
<td class="center item">{{ item.bd | number_format }}</td> <td class="center item">{{ item.bd | number_format }}</td>
<td class="center item">{{ item.bs | number_format }}</td> <td class="center item">{{ item.bs | number_format }}</td>
<td class="center item">{{ settlement }}</td>
<td class="center item">{{ runningBalance | number_format }}</td>
<td class="center item">{{ item.doc.des }}</td> <td class="center item">{{ item.doc.des }}</td>
</tr> </tr>
{% endfor %} {% endfor %}

View file

@ -779,7 +779,9 @@ const fa_lang = {
"reject_cheque": "برگشت چک", "reject_cheque": "برگشت چک",
"modify_cheque": "ثبت چک", "modify_cheque": "ثبت چک",
"modify_cheque_output": "دریافت چک", "modify_cheque_output": "دریافت چک",
"pass_cheque": "واگذاری چک" "pass_cheque": "واگذاری چک",
"settlement": "تشخیص",
"running_balance": "باقی‌مانده"
}, },
dashboard: { dashboard: {
admin_area: "ناحیه مدیریت", admin_area: "ناحیه مدیریت",

View file

@ -216,6 +216,24 @@
<template v-slot:item.bs="{ item }"> <template v-slot:item.bs="{ item }">
{{ $filters.formatNumber(item.bs) }} {{ $filters.formatNumber(item.bs) }}
</template> </template>
<template v-slot:item.settlement="{ item }">
<v-chip
:color="item.settlement === 'بستانکار' ? 'success' : item.settlement === 'بدهکار' ? 'error' : item.settlement === 'تسویه‌شده' ? 'info' : 'default'"
size="small"
variant="outlined"
>
{{ item.settlement }}
</v-chip>
</template>
<template v-slot:item.balance="{ item }">
<span :class="{
'text-success': item.balance > 0,
'text-danger': item.balance < 0,
'text-dark': item.balance == 0
}">
{{ $filters.formatNumber(item.balance) }}
</span>
</template>
<template v-slot:no-data> <template v-slot:no-data>
{{ $t('pages.person_card.no_data') }} {{ $t('pages.person_card.no_data') }}
</template> </template>
@ -255,6 +273,8 @@ export default {
{ title: this.$t('pages.person_card.detail'), key: "ref", align: "center", sortable: true }, { title: this.$t('pages.person_card.detail'), key: "ref", align: "center", sortable: true },
{ title: this.$t('pages.person_card.debit'), key: "bd", align: "center", sortable: true }, { title: this.$t('pages.person_card.debit'), key: "bd", align: "center", sortable: true },
{ title: this.$t('pages.person_card.credit'), key: "bs", align: "center", sortable: true }, { title: this.$t('pages.person_card.credit'), key: "bs", align: "center", sortable: true },
{ title: this.$t('pages.person_card.settlement'), key: "settlement", align: "center", sortable: true },
{ title: this.$t('pages.person_card.running_balance'), key: "balance", align: "center", sortable: true },
], ],
}; };
}, },