From a2125f3d694d8b730f42bfd3efb9e54634293077 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 31 Jan 2025 17:10:08 +0300
Subject: [PATCH] =?utf8?q?[ERP-301]=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?=
 =?utf8?q?=D1=82=D0=B0=D1=80=D0=B8=D0=B9=20=D0=B4=D0=BE=20=D0=B1=D1=83?=
 =?utf8?q?=D0=B4=D1=83=D1=89=D0=B5=D0=B3=D0=BE=20=D1=80=D0=B5=D1=84=D0=B0?=
 =?utf8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/payroll/ListAdminsAction.php  |  4 ++--
 erp24/forms/payroll/YearMonthSearchForm.php | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/erp24/actions/payroll/ListAdminsAction.php b/erp24/actions/payroll/ListAdminsAction.php
index 78142921..2e9922da 100755
--- a/erp24/actions/payroll/ListAdminsAction.php
+++ b/erp24/actions/payroll/ListAdminsAction.php
@@ -111,8 +111,8 @@ class ListAdminsAction extends Action
 
         $adminPayrollQuery = AdminPayroll::find()
             ->andWhere(['admin_payroll.date' => $yearSelect . '-' . $monthWithZeroSelect])
-            ->andFilterWhere(['admin.group_id' => $yearMonthSearchForm->admin_group_id > 0 ? $yearMonthSearchForm->admin_group_id : null])
-            ->andFilterWhere(['like', 'admin.name_full', '%' . $yearMonthSearchForm->admin_name . '%', false])
+//            ->andFilterWhere(['admin.group_id' => $yearMonthSearchForm->admin_group_id > 0 ? $yearMonthSearchForm->admin_group_id : null])
+//            ->andFilterWhere(['like', 'admin.name_full', '%' . $yearMonthSearchForm->admin_name . '%', false])
             ->with('admin')
             ->with('store')
             ->leftJoin('admin','admin_payroll.admin_id = admin.id')
diff --git a/erp24/forms/payroll/YearMonthSearchForm.php b/erp24/forms/payroll/YearMonthSearchForm.php
index 22921057..c2bdbb46 100755
--- a/erp24/forms/payroll/YearMonthSearchForm.php
+++ b/erp24/forms/payroll/YearMonthSearchForm.php
@@ -12,15 +12,15 @@ class YearMonthSearchForm extends Model
     public string $dateFrom;
     public string $dateTo;
     public string $store_id;
-    public string $admin_name;
-    public int $admin_group_id;
+//    public string $admin_name;
+//    public int $admin_group_id;
 
     public function rules(): array
     {
         return [
-            [['year', 'month', 'dateFrom', 'dateTo', 'store_id', 'admin_name'], 'string'],
+            [['year', 'month', 'dateFrom', 'dateTo', 'store_id'/*, 'admin_name'*/], 'string'],
             [['year', 'month'], 'required'],
-            [['admin_group_id'], 'integer'],
+//            [['admin_group_id'], 'integer'],
         ];
     }
     public function __construct()
@@ -34,9 +34,9 @@ class YearMonthSearchForm extends Model
 
         $this->month = date("m", strtotime(date("Y-m-d",time()) . $modifier));
 
-        $this->admin_name = '';
+//        $this->admin_name = '';
 
-        $this->admin_group_id = 0;
+//        $this->admin_group_id = 0;
     }
 
 
@@ -47,8 +47,8 @@ class YearMonthSearchForm extends Model
             'month' => 'Месяц',
             'dateFrom' => 'dateFrom',
             'store_id' => 'Магазин',
-            'admin_name' => 'Фрагмент ФИО',
-            'admin_group_id' => 'Должность'
+//            'admin_name' => 'Фрагмент ФИО',
+//            'admin_group_id' => 'Должность'
         ];
     }
 
-- 
2.39.5