From 35dda93a30a2d5def575bfab5dd7c271207d8702 Mon Sep 17 00:00:00 2001 From: Babak Alizadeh Date: Sun, 27 Apr 2025 12:32:26 +0000 Subject: [PATCH] bug fix in person recives --- hesabixCore/src/Controller/PersonsController.php | 16 ++++++++-------- webUI/src/i18n/fa_lang.ts | 2 +- webUI/src/views/user/manager/users/list.vue | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hesabixCore/src/Controller/PersonsController.php b/hesabixCore/src/Controller/PersonsController.php index 342bc45..48ae409 100644 --- a/hesabixCore/src/Controller/PersonsController.php +++ b/hesabixCore/src/Controller/PersonsController.php @@ -1091,12 +1091,10 @@ class PersonsController extends AbstractController ->andWhere('d.type = :type') ->andWhere('d.year = :year') ->andWhere('d.money = :money') - ->setParameters([ - 'bid' => $acc['bid'], - 'type' => 'person_receive', - 'year' => $acc['year'], - 'money' => $acc['money'], - ]) + ->setParameter('bid', $acc['bid']) + ->setParameter('type', 'person_receive') + ->setParameter('year', $acc['year']) + ->setParameter('money', $acc['money']) ->orderBy('d.id', 'DESC'); // جست‌وجو @@ -1122,7 +1120,8 @@ class PersonsController extends AbstractController $startOfWeek = $jdate->shamsiDate(0, 0, -$dayOfWeek); $endOfWeek = $jdate->shamsiDate(0, 0, 6 - $dayOfWeek); $queryBuilder->andWhere('d.date BETWEEN :start AND :end') - ->setParameters(['start' => $startOfWeek, 'end' => $endOfWeek]); + ->setParameter('start', $startOfWeek) + ->setParameter('end', $endOfWeek); break; case 'thisMonth': $currentYear = (int) $jdate->jdate('Y', time()); @@ -1131,7 +1130,8 @@ class PersonsController extends AbstractController $startOfMonth = sprintf('%d/%02d/01', $currentYear, $currentMonth); $endOfMonth = sprintf('%d/%02d/%02d', $currentYear, $currentMonth, $daysInMonth); $queryBuilder->andWhere('d.date BETWEEN :start AND :end') - ->setParameters(['start' => $startOfMonth, 'end' => $endOfMonth]); + ->setParameter('start', $startOfMonth) + ->setParameter('end', $endOfMonth); break; case 'all': default: diff --git a/webUI/src/i18n/fa_lang.ts b/webUI/src/i18n/fa_lang.ts index 324e367..c864a40 100644 --- a/webUI/src/i18n/fa_lang.ts +++ b/webUI/src/i18n/fa_lang.ts @@ -277,7 +277,7 @@ const fa_lang = { fetch_data_error: "خطا در گرفتن داده از {url}" }, dialog: { - change_password: 'تغییر کلمه عبور', + change_password_label: 'تغییر کلمه عبور', download: 'دانلود', delete_group: 'حذف گروهی', add_new_transfer: 'سند انتقال جدید', diff --git a/webUI/src/views/user/manager/users/list.vue b/webUI/src/views/user/manager/users/list.vue index 8f1ce98..d4a89c0 100644 --- a/webUI/src/views/user/manager/users/list.vue +++ b/webUI/src/views/user/manager/users/list.vue @@ -145,7 +145,7 @@ loadFromServer();