bug fix in person recives
This commit is contained in:
parent
41be423953
commit
35dda93a30
|
@ -1091,12 +1091,10 @@ class PersonsController extends AbstractController
|
||||||
->andWhere('d.type = :type')
|
->andWhere('d.type = :type')
|
||||||
->andWhere('d.year = :year')
|
->andWhere('d.year = :year')
|
||||||
->andWhere('d.money = :money')
|
->andWhere('d.money = :money')
|
||||||
->setParameters([
|
->setParameter('bid', $acc['bid'])
|
||||||
'bid' => $acc['bid'],
|
->setParameter('type', 'person_receive')
|
||||||
'type' => 'person_receive',
|
->setParameter('year', $acc['year'])
|
||||||
'year' => $acc['year'],
|
->setParameter('money', $acc['money'])
|
||||||
'money' => $acc['money'],
|
|
||||||
])
|
|
||||||
->orderBy('d.id', 'DESC');
|
->orderBy('d.id', 'DESC');
|
||||||
|
|
||||||
// جستوجو
|
// جستوجو
|
||||||
|
@ -1122,7 +1120,8 @@ class PersonsController extends AbstractController
|
||||||
$startOfWeek = $jdate->shamsiDate(0, 0, -$dayOfWeek);
|
$startOfWeek = $jdate->shamsiDate(0, 0, -$dayOfWeek);
|
||||||
$endOfWeek = $jdate->shamsiDate(0, 0, 6 - $dayOfWeek);
|
$endOfWeek = $jdate->shamsiDate(0, 0, 6 - $dayOfWeek);
|
||||||
$queryBuilder->andWhere('d.date BETWEEN :start AND :end')
|
$queryBuilder->andWhere('d.date BETWEEN :start AND :end')
|
||||||
->setParameters(['start' => $startOfWeek, 'end' => $endOfWeek]);
|
->setParameter('start', $startOfWeek)
|
||||||
|
->setParameter('end', $endOfWeek);
|
||||||
break;
|
break;
|
||||||
case 'thisMonth':
|
case 'thisMonth':
|
||||||
$currentYear = (int) $jdate->jdate('Y', time());
|
$currentYear = (int) $jdate->jdate('Y', time());
|
||||||
|
@ -1131,7 +1130,8 @@ class PersonsController extends AbstractController
|
||||||
$startOfMonth = sprintf('%d/%02d/01', $currentYear, $currentMonth);
|
$startOfMonth = sprintf('%d/%02d/01', $currentYear, $currentMonth);
|
||||||
$endOfMonth = sprintf('%d/%02d/%02d', $currentYear, $currentMonth, $daysInMonth);
|
$endOfMonth = sprintf('%d/%02d/%02d', $currentYear, $currentMonth, $daysInMonth);
|
||||||
$queryBuilder->andWhere('d.date BETWEEN :start AND :end')
|
$queryBuilder->andWhere('d.date BETWEEN :start AND :end')
|
||||||
->setParameters(['start' => $startOfMonth, 'end' => $endOfMonth]);
|
->setParameter('start', $startOfMonth)
|
||||||
|
->setParameter('end', $endOfMonth);
|
||||||
break;
|
break;
|
||||||
case 'all':
|
case 'all':
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -277,7 +277,7 @@ const fa_lang = {
|
||||||
fetch_data_error: "خطا در گرفتن داده از {url}"
|
fetch_data_error: "خطا در گرفتن داده از {url}"
|
||||||
},
|
},
|
||||||
dialog: {
|
dialog: {
|
||||||
change_password: 'تغییر کلمه عبور',
|
change_password_label: 'تغییر کلمه عبور',
|
||||||
download: 'دانلود',
|
download: 'دانلود',
|
||||||
delete_group: 'حذف گروهی',
|
delete_group: 'حذف گروهی',
|
||||||
add_new_transfer: 'سند انتقال جدید',
|
add_new_transfer: 'سند انتقال جدید',
|
||||||
|
|
|
@ -145,7 +145,7 @@ loadFromServer();
|
||||||
<v-list-item
|
<v-list-item
|
||||||
class="text-dark"
|
class="text-dark"
|
||||||
@click="openChangePasswordDialog(item.id)"
|
@click="openChangePasswordDialog(item.id)"
|
||||||
:title="$t('dialog.change_password')"
|
:title="$t('dialog.change_password_label')"
|
||||||
prepend-icon="mdi-lock-reset"
|
prepend-icon="mdi-lock-reset"
|
||||||
/>
|
/>
|
||||||
</v-list>
|
</v-list>
|
||||||
|
|
Loading…
Reference in a new issue