From 4a151548ac988c0e5af6fdfafac8322b3bbf63f5 Mon Sep 17 00:00:00 2001
From: vladfo <fvv2011@gmail.com>
Date: Mon, 30 Sep 2024 12:51:46 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?=
 =?utf8?q?=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE?=
 =?utf8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=B4=D0=B0=D1=82=20=D0=B4?=
 =?utf8?q?=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?=
 =?utf8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/views/cluster_link_edit/index.php    |  6 +++---
 erp24/views/cluster_link_edit/view-all.php | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/erp24/views/cluster_link_edit/index.php b/erp24/views/cluster_link_edit/index.php
index 8918126a..4c73099f 100644
--- a/erp24/views/cluster_link_edit/index.php
+++ b/erp24/views/cluster_link_edit/index.php
@@ -38,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title;
         ]); ?>
 
         <?= $form->field($searchModel, 'date')->input('date', [
-            'value' => $currentDate,
+            'value' => date('Y-m-d', strtotime($currentDate)),
             'class' => 'form-control',
         ])->label('Дата:') ?>
 
@@ -88,7 +88,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 'buttons' => [
                     'view-all' => function ($url, $model, $key) use ($clusterToManager, $currentDate) {
                         $currentDateStr = date('Y-m-d');
-                        if ($currentDate !== $currentDateStr) {
+                        if (date('Y-m-d', strtotime($currentDate)) !== $currentDateStr) {
                         return Html::a('<svg aria-hidden="true" style="" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M573 241C518 136 411 64 288 64S58 136 3 241a32 32 0 000 30c55 105 162 177 285 177s230-72 285-177a32 32 0 000-30zM288 400a144 144 0 11144-144 144 144 0 01-144 144zm0-240a95 95 0 00-25 4 48 48 0 01-67 67 96 96 0 1092-71z"></path></svg>', [
                             'view-all',
                             'id' => $model->id,
@@ -109,7 +109,7 @@ $this->params['breadcrumbs'][] = $this->title;
                     'update' => function ($url, $model, $key) use ($clusterToManager, $currentDate) {
                         $currentDateStr = date('Y-m-d');
                         // Проверка, является ли текущая дата датой запроса
-                        if ($currentDate === $currentDateStr) {
+                        if (date('Y-m-d', strtotime($currentDate)) === $currentDateStr) {
                             // Ссылка для редактирования с иконкой "Карандаш" (bi-pencil)
                             return Html::a('<svg aria-hidden="true" style="" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M498 142l-46 46c-5 5-13 5-17 0L324 77c-5-5-5-12 0-17l46-46c19-19 49-19 68 0l60 60c19 19 19 49 0 68zm-214-42L22 362 0 484c-3 16 12 30 28 28l122-22 262-262c5-5 5-13 0-17L301 100c-4-5-12-5-17 0zM124 340c-5-6-5-14 0-20l154-154c6-5 14-5 20 0s5 14 0 20L144 340c-6 5-14 5-20 0zm-36 84h48v36l-64 12-32-31 12-65h36v48z"></path></svg>', [
                                 'view-all',
diff --git a/erp24/views/cluster_link_edit/view-all.php b/erp24/views/cluster_link_edit/view-all.php
index dc4289e1..502e554d 100644
--- a/erp24/views/cluster_link_edit/view-all.php
+++ b/erp24/views/cluster_link_edit/view-all.php
@@ -36,8 +36,8 @@ $availableStores = array_filter($storeNames, function ($storeId) use ($storesInC
         <p>
             <?= Html::a('К списку', ['index'], ['class' => 'btn btn-primary']) ?>
 
-            <?php if ($currentDate === date('Y-m-d')): ?>
-                <!-- Если дата текущая, отображаем кнопку добавления и селект -->
+            <?php if (date('Y-m-d', strtotime($currentDate)) === date('Y-m-d')): ?>
+                <!-- Если дата текущая, отображаем кнопку добавления  -->
                 <?= Html::beginForm(['add-store', 'id' => $model->id], 'post', ['class' => 'form-inline']) ?>
                 <?= Html::dropDownList('store_id', null, $availableStores, [
                     'class' => 'form-control',
@@ -77,7 +77,7 @@ $availableStores = array_filter($storeNames, function ($storeId) use ($storesInC
                     'label' => 'Перевести в другой куст',
                     'format' => 'raw',
                     'value' => function ($store) use ($clustersList, $model, $currentDate) {
-                        if ($currentDate !== date('Y-m-d')) {
+                        if (date('Y-m-d', strtotime($currentDate)) !== date('Y-m-d')) {
                             return Html::encode($model->name); // Показываем только имя куста, если дата не текущая
                         }
                         return Html::dropDownList('cluster_id', $store['cluster_id'], $clustersList, [
@@ -94,11 +94,11 @@ $availableStores = array_filter($storeNames, function ($storeId) use ($storesInC
                     'template' => '{delete}',
                     'buttons' => [
                         'delete' => function ($url, $store) use ($model, $currentDate) {
-                            if ($currentDate !== date('Y-m-d')) {
+                            if (date('Y-m-d', strtotime($currentDate)) !== date('Y-m-d')) {
                                 return ''; // Отключаем кнопку удаления, если дата не актуальна
                             }
                             return Html::a(
-                            // Используем встроенный SVG-код для иконки удаления
+
                                 '<svg aria-hidden="true" style="" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M32 464a48 48 0 0048 48h288a48 48 0 0048-48V128H32zm272-256a16 16 0 0132 0v224a16 16 0 01-32 0zm-96 0a16 16 0 0132 0v224a16 16 0 01-32 0zm-96 0a16 16 0 0132 0v224a16 16 0 01-32 0zM432 32H312l-9-19a24 24 0 00-22-13H167a24 24 0 00-22 13l-9 19H16A16 16 0 000 48v32a16 16 0 0016 16h416a16 16 0 0016-16V48a16 16 0 00-16-16z"></path></svg>',
                                 ['delete-store', 'id' => $store['id'], 'cluster_id' => $model->id],
                                 [
-- 
2.39.5