From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Sat, 27 Apr 2024 21:07:54 +0000 (+0300)
Subject: правки по открытия и закрытия смены десктоп
X-Git-Tag: 1.1~81^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=4b7d3182caf79ceff308d41f1429a95215b74f95;p=erp24_rep%2Fyii-erp24%2F.git

правки по открытия и закрытия смены десктоп
---

diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php
index d8919987..757ea113 100644
--- a/erp24/api2/controllers/BonusController.php
+++ b/erp24/api2/controllers/BonusController.php
@@ -24,10 +24,10 @@ use yii_app\services\LogService;
 
 class BonusController extends BaseController
 {
-    private static $LOG = "/var/www/www-root/data/www/erp.bazacvetov24.ru/yii_app/api2/log.txt";
+    private static $LOG = "/var/www/erp24/api2/log.txt";
     private static $USERS_AUTH_CALL_LOG2 =
 //        '/tmp/users_auth_call_log2.txt';
-        "/var/www/www-root/data/www/erp.bazacvetov24.ru/yii_app/api2/users_auth_call_log2.txt";
+        "/var/www/erp24/api2/users_auth_call_log2.txt";
 
     private static $YEAR_PERIOD = 366;
     private static $FIRST_SALE_PROCENT = 0.1;
diff --git a/erp24/api3/modules/v1/models/timetable/Timetable.php b/erp24/api3/modules/v1/models/timetable/Timetable.php
index 71ba9352..0e441d30 100644
--- a/erp24/api3/modules/v1/models/timetable/Timetable.php
+++ b/erp24/api3/modules/v1/models/timetable/Timetable.php
@@ -30,7 +30,8 @@ class Timetable extends \yii_app\records\TimetableV3
             [['work_time'], 'number', 'min' => 0, 'max' => 24],
             [['comment'], 'string'],  // ???
             [['comment'], 'default', 'value' => ''], // ???
-            [['date_add', 'datetime_start', 'datetime_end'], 'datetime', 'format' => 'yyyy-M-d HH:mm:ss'],
+            [['datetime_start', 'datetime_end'], 'datetime', 'format' => 'yyyy-M-d HH:mm:ss'],
+//            [['date_add', 'datetime_start', 'datetime_end'], 'datetime', 'format' => 'yyyy-M-d HH:mm:ss'],
             ['slot_type_id', 'in', 'range' => array_keys(self::slotTypeName())],
             [['datetime_start', 'datetime_end'], 'required'],
             [['tabel'], 'validateTimetableIntersection', 'skipOnEmpty' => false,],
diff --git a/erp24/config/web.php b/erp24/config/web.php
index 8bfe7688..5d0ba8fb 100644
--- a/erp24/config/web.php
+++ b/erp24/config/web.php
@@ -11,7 +11,7 @@ $config = [
         '@bower' => '@vendor/bower-asset',
         '@npm'   => '@vendor/npm-asset',
         '@uploads' => dirname(__DIR__) . "/uploads",
-        '@data-path' => dirname(__DIR__, 2) . "/data",
+        '@data-path' => dirname(__DIR__, 1) . "/data",
         '@uploads-images-path' => "@uploads/images",
     ],
     'modules' => [
diff --git a/erp24/forms/timetable/StartForm.php b/erp24/forms/timetable/StartForm.php
index 3345973a..ec4a06f9 100755
--- a/erp24/forms/timetable/StartForm.php
+++ b/erp24/forms/timetable/StartForm.php
@@ -220,13 +220,14 @@ class StartForm extends Model
 
     private function generateFilePath(): string
     {
+        $dataPath = \Yii::getAlias('@data-path');
         $Y = date("Y");
         $m = date("m");
-        if (!is_dir("data/admin/$Y/$m")) {
-            mkdir("data/admin/$Y/$m", 0777, true);
+        if (!is_dir($dataPath."/admin/$Y/$m")) {
+            mkdir($dataPath."/admin/$Y/$m", 0777, true);
         }
         $fileName = $_SESSION["admin_id"] . '-' . date("YmdHis") . '.jpg';
-        return "data/admin/$Y/$m/$fileName";
+        return $dataPath."/admin/$Y/$m/$fileName";
     }
 
     public function getStore()
diff --git a/erp24/records/AdminCheckin.php b/erp24/records/AdminCheckin.php
index 85c0c5e9..d7ee4df8 100755
--- a/erp24/records/AdminCheckin.php
+++ b/erp24/records/AdminCheckin.php
@@ -77,7 +77,7 @@ class AdminCheckin extends ActiveRecord
     public function rules()
     {
         return [
-            [['id', 'admin_id', 'device_id', 'replaced_admin_id', 'plan_id', 'store_id', 'type_id', 'd_id', 'ball', 'status'], 'integer'],
+            [['admin_id', 'device_id', 'replaced_admin_id', 'plan_id', 'store_id', 'type_id', 'd_id', 'ball', 'status'], 'integer'],
             [['lat', 'lon'], 'double'],
             [['comment', 'photo'], 'string'],
             [['date'], 'date', 'format' => 'yyyy-M-d'],
diff --git a/erp24/records/Timetable.php b/erp24/records/Timetable.php
index 7da52600..e9c96bee 100755
--- a/erp24/records/Timetable.php
+++ b/erp24/records/Timetable.php
@@ -256,7 +256,8 @@ class Timetable extends ActiveRecord
             [['comment'], 'string'],
             [['comment'], 'default', 'value' => ''],
             [['status'], 'in', 'range' => array_keys(self::statuses())],
-            [['date_add', 'datetime_start', 'datetime_end'], 'date', 'format' => 'php:Y-m-d H:i:s'],
+            [['datetime_start', 'datetime_end'], 'date', 'format' => 'php:Y-m-d H:i:s'],
+//            [['date_add', 'datetime_start', 'datetime_end'], 'date', 'format' => 'php:Y-m-d H:i:s'],
             [['datetime_start', 'datetime_end'], 'required'],
             [['admin_id', 'store_id'], function() {
                 /** @var Admin $admin */