From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 31 Jan 2025 15:21:32 +0000 (+0300)
Subject: [ERP-301] баги
X-Git-Tag: 1.7~23^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a5dc704574d18660ff1fc9775e6b44a67b67b6d4;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-301] баги
---

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
                 <?php foreach ($adminPayroll as $apr): ?>
                     <tr>
                         <td><?=++$num?></td>
-                        <td><?= $apr['admin_id'] ?></td>
-                        <td><?= $apr['admin']['name_full'] ?></td>
-                        <td><?= $apr['store']['name'] ?></td>
-                        <td><?= $apr['admin']['adminGroup']['name'] ?></td>
-                        <td><?= $apr['admin']['group_name'] ?></td>
-                        <td><?= $apr['column']['Оклад'] ?></td>
-                        <td><?= $apr['column']['Число смен в графике'] ?></td>
-                        <td><?= $apr['column']['Зарплата сотрудника'] ?></td>
+                        <td><?= $apr['admin_id'] ?? '' ?></td>
+                        <td><?= $apr['admin']['name_full'] ?? '' ?></td>
+                        <td><?= $apr['store']['name'] ?? '' ?></td>
+                        <td><?= $apr['admin']['adminGroup']['name'] ?? '' ?></td>
+                        <td><?= $apr['admin']['group_name'] ?? '' ?></td>
+                        <td><?= $apr['column']['Оклад'] ?? '' ?></td>
+                        <td><?= $apr['column']['Число смен в графике'] ?? '' ?></td>
+                        <td><?= $apr['column']['Зарплата сотрудника'] ?? '' ?></td>
                     </tr>
                 <?php endforeach; ?>
             </tbody>
@@ -101,9 +101,9 @@ $this->registerJsFile('/js/payroll/list-shift-admins.js', ['position' => \yii\we
                     <td></td>
                     <td></td>
                     <td><b>Итого:</b></td>
-                    <td><b><?= $sumColumnByAlias[0] ?></b></td>
-                    <td><b><?= $sumColumnByAlias[1] ?></b></td>
-                    <td><b><?= $sumColumnByAlias[2] ?></b></td>
+                    <td><b><?= $sumColumnByAlias[0] ?? '' ?></b></td>
+                    <td><b><?= $sumColumnByAlias[1] ?? '' ?></b></td>
+                    <td><b><?= $sumColumnByAlias[2] ?? '' ?></b></td>
                 </tr>
             </tfooter>
         </table>