Bug zozirova erp 175 fixes for tg bot

diff --git a/erp24/api3/core/services/IncomeService.php b/erp24/api3/core/services/IncomeService.php
index 659ce00fbe3e75d93c5eb3800d222759cff70aa9..4aa4211e5c10234828d25795cab578bd8e15222d 100644 (file)
--- a/erp24/api3/core/services/IncomeService.php
+++ b/erp24/api3/core/services/IncomeService.php
@@ -36,7 +36,7 @@ class IncomeService
                 'shift_id' => $fact->shift_id,
                 'salary_shift' => $fact->salary_shift,
                 'price' => $fact->shift_id == 1 ? 125 : 145,
-                'work_hours' => $fact->work_time, 
+                'work_hours' => $fact->work_time,
                 'in_shift' => count($fact->checkIns) == 1,
             ];
         }

diff --git a/erp24/api3/modules/v1/controllers/timetable/FactController.php b/erp24/api3/modules/v1/controllers/timetable/FactController.php
index 261addf996b72950083d34c7f0261a9145581fc7..e149cee202f44f908443b2d76c4a9adfe32fb20f 100644 (file)
--- a/erp24/api3/modules/v1/controllers/timetable/FactController.php
+++ b/erp24/api3/modules/v1/controllers/timetable/FactController.php
@@ -33,10 +33,12 @@ class FactController extends ActiveController
             'class' => \yii\data\ActiveDataFilter::class,
             'searchModel' => $timetableClass,
         ];
-//
-//        $actions['index']['prepareSearchQuery'] = function ($query, $requestParams) {
-//            return $query->andFilterWhere(['tabel' => 1]);
-//        };
+
+        $actions['index']['prepareSearchQuery'] = function ($query, $requestParams) {
+            $query->andFilterWhere(['is_close' => false])
+                ->andFilterWhere(['is_opening' => true]);
+            return $query;
+        };
 
         unset($actions['create'], $actions['delete']);
 

diff --git a/erp24/api3/modules/v1/controllers/timetable/PlanController.php b/erp24/api3/modules/v1/controllers/timetable/PlanController.php
index 208d7f9cb15d26f290308fe8a6afd83a2510e7fc..2d1595d6c401382c1a9d30954b6f03d0a105de71 100644 (file)
--- a/erp24/api3/modules/v1/controllers/timetable/PlanController.php
+++ b/erp24/api3/modules/v1/controllers/timetable/PlanController.php
@@ -38,13 +38,16 @@ class PlanController extends \yii_app\api3\controllers\ActiveController
         ];
 
         $actions['index']['prepareSearchQuery'] = function ($query, $requestParams) {
-            $plans = TimetableFactModel::find()
-                ->andWhere(['admin_id' => $requestParams['filter']['admin_id']])
-                ->select('plan_id')
-                ->column();
+            if ($requestParams['is_get_plan']) {
+                $plans = TimetableFactModel::find()
+                    ->andWhere(['admin_id' => $requestParams['filter']['admin_id']])
+                    ->select('plan_id')
+                    ->column();
 
-            $query->andFilterWhere(['not in', 'id', $plans]);
-            $query->andFilterWhere(['tabel' => 0]);
+                $query->andFilterWhere(['not in', 'id', $plans]);
+                $query->andFilterWhere(['tabel' => 0]);
+                return $query;
+            }
             return $query;
         };