added form for calculate weeks of custom mounth а fix issues

diff --git a/erp24/actions/motivation/SumSalaryByMonthAction.php b/erp24/actions/motivation/SumSalaryByMonthAction.php
index 4979500e98808a1669353b15444672d0fdc78dce..8936ffaa8263d10d27993fb9e5de20e793b205d1 100644 (file)
--- a/erp24/actions/motivation/SumSalaryByMonthAction.php
+++ b/erp24/actions/motivation/SumSalaryByMonthAction.php
@@ -46,7 +46,7 @@ class SumSalaryByMonthAction extends Action
             foreach ($motivations as $motivation) {
                 $store_id = $motivation->store_id;
 
-                $records = MotivationService::getRecordsByDateAndStore($startDate, $endDate, $store_id);
+                $records = MotivationService::getTimetableFactRecordsByDateAndStore($startDate, $endDate, $store_id);
                 $vacationSum = MotivationService::getVacationsSum($startDate, $endDate, $store_id);
 
                 $totalSalary = 0;

diff --git a/erp24/controllers/MotivationController.php b/erp24/controllers/MotivationController.php
index df9a3d3fd46233dea01b1f78211bb1b977aee216..e5c2b34c85dcc6d54c34e2fb456548be7cc32a33 100644 (file)
--- a/erp24/controllers/MotivationController.php
+++ b/erp24/controllers/MotivationController.php
@@ -5,6 +5,7 @@ namespace app\controllers;
 use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\filters\VerbFilter;
+use yii_app\models\SumSalaryForm;
 
 
 class MotivationController extends Controller

diff --git a/erp24/models/SumSalaryForm.php b/erp24/models/SumSalaryForm.php
index 686eb002b33ef0e829e000ac517c8807c397ba87..238d0690c7ec524cc1891ee316310356f1a917a6 100644 (file)
--- a/erp24/models/SumSalaryForm.php
+++ b/erp24/models/SumSalaryForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\models;
+namespace yii_app\models;
 
 use yii\base\Model;
 

diff --git a/erp24/views/motivation/run-sum-salary.php b/erp24/views/motivation/run-sum-salary.php
index f07645cbe2e942c9e0167865f84c2759bd24956f..f35a5140e287603d845dfa830c88f562956c086a 100644 (file)
--- a/erp24/views/motivation/run-sum-salary.php
+++ b/erp24/views/motivation/run-sum-salary.php
@@ -1,5 +1,6 @@
 <?php
 use yii\helpers\Html;
+use yii\widgets\ActiveForm;
 
 /* @var $this yii\web\View */
 /* @var $model yii_app\models\SumSalaryForm */