From aaf5c9efcd2e4ac734503d33a6b5ebc4ffb35a5f Mon Sep 17 00:00:00 2001 From: vladfo Date: Mon, 30 Sep 2024 11:46:13 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20int?= =?utf8?q?eger=20=D0=BD=D0=B0=20int,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?utf8?q?=D0=B8=D0=BB=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=B2=D0=BE=20d?= =?utf8?q?ate=5Fto=20=D0=B8=20date=5Ffrom?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../controllers/ClusterLinkEditController.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) 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); -- 2.39.5