From: vladfo <fvv2011@gmail.com>
Date: Mon, 30 Sep 2024 08:46:13 +0000 (+0300)
Subject: Поменял integer на int, добавил время во date_to и date_from
X-Git-Tag: 1.5~1^2~5
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=aaf5c9efcd2e4ac734503d33a6b5ebc4ffb35a5f;p=erp24_rep%2Fyii-erp24%2F.git

Поменял integer на int, добавил время во date_to и date_from
---

diff --git a/erp24/controllers/ClusterLinkEditController.php b/erp24/controllers/ClusterLinkEditController.php
index 27529810..b64939a6 100644
--- a/erp24/controllers/ClusterLinkEditController.php
+++ b/erp24/controllers/ClusterLinkEditController.php
@@ -96,13 +96,13 @@ class ClusterLinkEditController extends Controller
             ->all();
 
 
-        $currentDate = Yii::$app->request->get('ClusterSearch')['date'] ?? date('Y-m-d');
+        $currentDate = Yii::$app->request->get('ClusterSearch')['date'] ?? date('Y-m-d H:i:s');
 
 
-        $earliestDateFrom = '2023-05-19';
+        $earliestDateFrom = '2023-05-19 00:00:00';
 
 
-        $specialDate = '2024-09-12';
+        $specialDate = '2024-09-12 00:00:00';
 
 
         if (strtotime($currentDate) < strtotime($earliestDateFrom)) {
@@ -275,11 +275,11 @@ class ClusterLinkEditController extends Controller
         $model = $this->findModel($id);
 
 
-        $requestDate = $date ?? date('Y-m-d');
+        $requestDate = $date ?? date('Y-m-d H:i:s');
 
 
-        $specialDate = '2024-09-12';
-        $earliestDateFrom = '2023-05-19';
+        $specialDate = '2024-09-12 00:00:00';
+        $earliestDateFrom = '2023-05-19 00:00:00';
 
 
 
@@ -354,7 +354,7 @@ class ClusterLinkEditController extends Controller
     {
         $recordId = Yii::$app->request->post('id');
         $newClusterId = Yii::$app->request->post('new_cluster_id');
-        $currentDate = date('Y-m-d');
+        $currentDate = date('Y-m-d H:i:s');
 
 
         $dynamicEntry = StoreDynamic::find()
@@ -382,11 +382,11 @@ class ClusterLinkEditController extends Controller
 
 
             $newDynamicEntry = new StoreDynamic();
-            $newDynamicEntry->value_type = 'integer';
+            $newDynamicEntry->value_type = 'int';
             $newDynamicEntry->value_int = $newClusterId;
             $newDynamicEntry->store_id = $dynamicEntry->store_id;
             $newDynamicEntry->date_from = $currentDate;
-            $newDynamicEntry->date_to = '2100-01-01';
+            $newDynamicEntry->date_to = '2100-01-01 00:00:00';
             $newDynamicEntry->active = 1;
             $newDynamicEntry->category = 1;
             $newDynamicEntry->save(false);
@@ -402,7 +402,7 @@ class ClusterLinkEditController extends Controller
 
     public function actionDeleteStore($id, $cluster_id)
     {
-        $currentDate = date('Y-m-d');
+        $currentDate = date('Y-m-d H:i:s');
 
 
         $dynamicEntry = StoreDynamic::find()
@@ -431,7 +431,7 @@ class ClusterLinkEditController extends Controller
     public function actionAddStore($id)
     {
         $storeId = Yii::$app->request->post('store_id');
-        $currentDate = date('Y-m-d');
+        $currentDate = date('Y-m-d H:i:s');
 
 
         $existingEntry = StoreDynamic::find()
@@ -451,10 +451,10 @@ class ClusterLinkEditController extends Controller
 
         $newDynamicEntry = new StoreDynamic();
         $newDynamicEntry->value_int = $id;
-        $newDynamicEntry->value_type = 'integer';
+        $newDynamicEntry->value_type = 'int';
         $newDynamicEntry->store_id = $storeId;
         $newDynamicEntry->date_from = $currentDate;
-        $newDynamicEntry->date_to = '2100-01-01';
+        $newDynamicEntry->date_to = '2100-01-01 00:00:00';
         $newDynamicEntry->active = 1;
         $newDynamicEntry->category = 1;
         $newDynamicEntry->save(false);