From: Alexander Smirnov Date: Fri, 31 Jan 2025 14:31:17 +0000 (+0300) Subject: [ERP-301] итого X-Git-Tag: 1.7~25^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=4a5e466a489bdf9ff837b1f72e4ee5d1d2497aad;p=erp24_rep%2Fyii-erp24%2F.git [ERP-301] итого --- diff --git a/erp24/actions/payroll/ListShiftAdminsAction.php b/erp24/actions/payroll/ListShiftAdminsAction.php index 5d38f758..70125a84 100644 --- a/erp24/actions/payroll/ListShiftAdminsAction.php +++ b/erp24/actions/payroll/ListShiftAdminsAction.php @@ -75,8 +75,8 @@ class ListShiftAdminsAction extends Action } } //die; -// echo "
"; var_dump($adminPayroll); die;
+//        echo "
"; var_dump($sumColumnByAlias); die;
 
-        return $this->controller->render('list-shift-admins', compact('model', 'adminGroups', 'adminPayroll'));
+        return $this->controller->render('list-shift-admins', compact('model', 'adminGroups', 'adminPayroll', 'sumColumnByAlias'));
     }
 }
\ No newline at end of file
diff --git a/erp24/views/payroll/list-shift-admins.php b/erp24/views/payroll/list-shift-admins.php
index 33298424..b5c56b6e 100644
--- a/erp24/views/payroll/list-shift-admins.php
+++ b/erp24/views/payroll/list-shift-admins.php
@@ -9,6 +9,7 @@ use dosamigos\datetimepicker\DateTimePicker;
 /* @var $model DynamicModel */
 /* @var $adminGroups array */
 /* @var $adminPayroll array */
+/* @var $sumColumnByAlias array */
 
 $this->registerJsFile('/js/xlsx.full.min.js', ['position' => \yii\web\View::POS_END]);
 $this->registerJsFile('/js/payroll/list-shift-admins.js', ['position' => \yii\web\View::POS_END]);
@@ -92,6 +93,19 @@ $this->registerJsFile('/js/payroll/list-shift-admins.js', ['position' => \yii\we
                     
                 
             
+            
+                
+                    
+                    
+                    
+                    
+                    
+                    Итого:
+                    
+                    
+                    
+                
+