From 5fe8ed79f08688f5c3fc021f12501a68aed6e688 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 4 Mar 2025 16:50:24 +0300 Subject: [PATCH] =?utf8?q?ERP-302=20=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?utf8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B1=D1=83?= =?utf8?q?=D0=BA=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/BouquetComposition.php | 1 + erp24/views/bouquet/index.php | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php index 9ca3377d..4b9ba74f 100644 --- a/erp24/records/BouquetComposition.php +++ b/erp24/records/BouquetComposition.php @@ -454,6 +454,7 @@ class BouquetComposition extends ActiveRecord */ public static function disabledButtons(bool $isCreate = false): bool { + return false; if ($isCreate) { return false; } diff --git a/erp24/views/bouquet/index.php b/erp24/views/bouquet/index.php index 75200de8..675475e1 100644 --- a/erp24/views/bouquet/index.php +++ b/erp24/views/bouquet/index.php @@ -196,12 +196,13 @@ $this->title = 'Содержание матрицы';
" . Html::a('Редактировать', Url::to(['/bouquet/view', 'id' => $model['id']]), [ - 'class' => 'btn btn-warning btn-edit' . - ((Yii::$app->request->get('year') < date('Y') || // Если год в прошлом → disabled - (Yii::$app->request->get('year') == date('Y') && Yii::$app->request->get('month') < date('m')) || - (Yii::$app->request->get('year') == date('Y') && Yii::$app->request->get('month') == date('m') && BouquetComposition::disabledButtons()) || - (Yii::$app->request->get('year') == date('Y') && Yii::$app->request->get('month') == date('m') + 1 &&BouquetComposition::disabledButtons()) - ) ? ' disabled' : ''), + 'class' => 'btn btn-warning btn-edit' +// . +// ((Yii::$app->request->get('year') < date('Y') || // Если год в прошлом → disabled +// (Yii::$app->request->get('year') == date('Y') && Yii::$app->request->get('month') < date('m')) || +// (Yii::$app->request->get('year') == date('Y') && Yii::$app->request->get('month') == date('m') && BouquetComposition::disabledButtons()) || +// (Yii::$app->request->get('year') == date('Y') && Yii::$app->request->get('month') == date('m') + 1 &&BouquetComposition::disabledButtons()) +// ) ? ' disabled' : ''), ]) . "
-- 2.39.5