From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 21 Apr 2025 08:22:38 +0000 (+0300)
Subject: [ERP-403] total summary
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=61275dfd0677f9ffed99c44522a53dd4828aea36;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-403] total summary
---

diff --git a/erp24/actions/payroll/IndexAction.php b/erp24/actions/payroll/IndexAction.php
index d0ee27be..301c506d 100755
--- a/erp24/actions/payroll/IndexAction.php
+++ b/erp24/actions/payroll/IndexAction.php
@@ -208,6 +208,9 @@ class IndexAction extends Action
             ->indexBy('store_id')
             ->asArray()->all();
 
+        $salesOfflineSum = array_sum(ArrayHelper::getcolumn($salesOffline, 'total'))
+                          -array_sum(ArrayHelper::getcolumn($salesOfflineReturn, 'total'));
+
         $salesOnline = Sales::find()->select(['SUM(summ - skidka) as total', 'store_id'])
             ->andWhere(['between' , 'date', $dateSelectMonthStart, $dateSelectMonthEnd])
             ->andWhere(['operation' => Sales::OPERATION_SALE])
@@ -222,6 +225,9 @@ class IndexAction extends Action
             ->indexBy('store_id')
             ->asArray()->all();
 
+        $salesOnlineSum = array_sum(ArrayHelper::getcolumn($salesOnline, 'total'))
+            -array_sum(ArrayHelper::getcolumn($salesOnlineReturn, 'total'));
+
         return $this->controller->render('/payroll/index', [
             'payrollStore' => $payrollStore,
             'yearMonthSearchForm' => $yearMonthSearchForm,
@@ -233,6 +239,8 @@ class IndexAction extends Action
             'salesOfflineReturn' => $salesOfflineReturn,
             'salesOnline' => $salesOnline,
             'salesOnlineReturn' => $salesOnlineReturn,
+            'salesOfflineSum' => $salesOfflineSum,
+            'salesOnlineSum' => $salesOnlineSum,
         ]);
     }
 }
\ No newline at end of file
diff --git a/erp24/views/payroll/index.php b/erp24/views/payroll/index.php
index 6977bd5a..db05108b 100755
--- a/erp24/views/payroll/index.php
+++ b/erp24/views/payroll/index.php
@@ -20,6 +20,8 @@ use yii_app\forms\payroll\YearMonthSearchForm;
 /* @var $salesOfflineReturn array */
 /* @var $salesOnline array */
 /* @var $salesOnlineReturn array */
+/* @var $salesOfflineSum float */
+/* @var $salesOnlineSum float */
 
 $this->title = 'Зарплаты по магазинам за ' . $monthNameSelect;
 $this->params['breadcrumbs'][] = $this->title;
@@ -117,7 +119,7 @@ if (!empty($payrollStore)){
                         </thead>
                         <tbody>';
 
-
+                        $employeePayroll = 0;
                         $num = 1;
                         foreach ($payrollStore as $key => $payrollStoreRow) {
                             echo "<tr>
@@ -141,6 +143,7 @@ if (!empty($payrollStore)){
                                         $keyNumBody++;
                                     }
                                 }
+                            $employeePayroll += $payrollStoreRowColumn['Зарплата сотрудника'];
                             echo "
                                     </tr>";
 
@@ -152,8 +155,17 @@ if (!empty($payrollStore)){
                                     <td></td>
                         
                             ';
+                        echo "      <td>" . HtmlHelper::getNumberFormat($salesOfflineSum) . "</td>";
+                        echo "      <td>" . HtmlHelper::getNumberFormat($salesOnlineSum) . "</td>";
                             foreach ($sumColumnByAlias as $key => $row) {
                                 echo "<td  class='toggle-column-" . $key . "'>" . HtmlHelper::getNumberFormat($row) . "</td>";
+                                if ($key == 0) {
+//                                    $employeePayroll
+                                    $fot = $salesOfflineSum > 0 ? $employeePayroll * 100 / $salesOfflineSum : 0;
+                                    $fotplus = $salesOnlineSum > 0 ? $employeePayroll * 100 / $salesOnlineSum : 0;
+                                    echo "<td>" . HtmlHelper::getNumberFormat($fot) . "</td>";
+                                    echo "<td>" . HtmlHelper::getNumberFormat($fotplus) . "</td>";
+                                }
                             }
 
                         echo '