From a5dc704574d18660ff1fc9775e6b44a67b67b6d4 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Fri, 31 Jan 2025 18:21:32 +0300 Subject: [PATCH] =?utf8?q?[ERP-301]=20=D0=B1=D0=B0=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../actions/payroll/ListShiftAdminsAction.php | 1 + erp24/views/payroll/list-shift-admins.php | 22 +++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/erp24/actions/payroll/ListShiftAdminsAction.php b/erp24/actions/payroll/ListShiftAdminsAction.php index ebf70324..e5833f21 100644 --- a/erp24/actions/payroll/ListShiftAdminsAction.php +++ b/erp24/actions/payroll/ListShiftAdminsAction.php @@ -57,6 +57,7 @@ class ListShiftAdminsAction extends Action ->asArray() ->all(); + $sumColumnByAlias = []; foreach ($adminPayroll as $key => $rowAdmins) { $payrollIds = $rowAdmins['id']; $adminIdRow = $rowAdmins['admin_id']; diff --git a/erp24/views/payroll/list-shift-admins.php b/erp24/views/payroll/list-shift-admins.php index 72e54ac6..c0291bf5 100644 --- a/erp24/views/payroll/list-shift-admins.php +++ b/erp24/views/payroll/list-shift-admins.php @@ -82,14 +82,14 @@ $this->registerJsFile('/js/payroll/list-shift-admins.js', ['position' => \yii\we - - - - - - - - + + + + + + + + @@ -101,9 +101,9 @@ $this->registerJsFile('/js/payroll/list-shift-admins.js', ['position' => \yii\we Итого: - - - + + + -- 2.39.5