From febfe464f4174959209c52f72fb2eeecc66c616b Mon Sep 17 00:00:00 2001
From: JoySystem_v <fvv2011@gmail.com>
Date: Wed, 7 Aug 2024 17:53:51 +0300
Subject: [PATCH] =?utf8?q?added=20form=20for=20calculate=20weeks=20of=20cu?=
 =?utf8?q?stom=20mounth=20=D0=B0=20fix=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/motivation/SumSalaryByMonthAction.php | 2 +-
 erp24/controllers/MotivationController.php          | 1 +
 erp24/models/SumSalaryForm.php                      | 2 +-
 erp24/views/motivation/run-sum-salary.php           | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/erp24/actions/motivation/SumSalaryByMonthAction.php b/erp24/actions/motivation/SumSalaryByMonthAction.php
index 4979500e..8936ffaa 100644
--- 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 df9a3d3f..e5c2b34c 100644
--- 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 686eb002..238d0690 100644
--- 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 f07645cb..f35a5140 100644
--- 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 */
-- 
2.39.5