From 154bcdeced3a4359c2d617ebd6c3d66f89018814 Mon Sep 17 00:00:00 2001 From: marina Date: Fri, 21 Feb 2025 10:46:18 +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 | 7 +++++++ erp24/views/bouquet/_form.php | 5 +++-- erp24/views/bouquet/_product_list.php | 3 ++- erp24/views/bouquet/create.php | 3 ++- erp24/views/bouquet/index.php | 2 +- erp24/views/bouquet/view.php | 3 ++- erp24/web/js/bouquet/bouquet.js | 1 + 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php index 0d8e0c5e..622d545f 100644 --- a/erp24/records/BouquetComposition.php +++ b/erp24/records/BouquetComposition.php @@ -213,4 +213,11 @@ class BouquetComposition extends ActiveRecord $years = range($currentYear - 5, $currentYear + 5); return array_combine($years, $years); } + + public static function disabledButtons($isCreate = false) + { + if ($isCreate || date('d') < 10) { + return false; + } + } } diff --git a/erp24/views/bouquet/_form.php b/erp24/views/bouquet/_form.php index 89503e5c..9bad651c 100644 --- a/erp24/views/bouquet/_form.php +++ b/erp24/views/bouquet/_form.php @@ -79,7 +79,8 @@ $form = ActiveForm::begin([ render('_product_list', [ 'model' => $model, - 'bouquetCompositionProducts' => $bouquetCompositionProducts + 'bouquetCompositionProducts' => $bouquetCompositionProducts, + 'disabledButtons' => BouquetComposition::disabledButtons() ]); ?> @@ -247,7 +248,7 @@ $form = ActiveForm::begin([
- 'btn btn-success w-100']) ?> + 'btn btn-success w-100', 'disabled' => $disabledButtons]) ?>
\ No newline at end of file diff --git a/erp24/views/bouquet/_product_list.php b/erp24/views/bouquet/_product_list.php index 9d6bc353..d1b16019 100644 --- a/erp24/views/bouquet/_product_list.php +++ b/erp24/views/bouquet/_product_list.php @@ -10,6 +10,7 @@
@@ -33,6 +34,6 @@
- id"), ['class' => $model ? 'btn btn-warning w-100' : 'btn btn-warning w-100 disabled']) ?> + id"), ['class' => $model && !BouquetComposition::disabledButtons()? 'btn btn-warning w-100' : 'btn btn-warning w-100 disabled']) ?>
\ No newline at end of file diff --git a/erp24/views/bouquet/create.php b/erp24/views/bouquet/create.php index 2f88ad8d..59997c07 100644 --- a/erp24/views/bouquet/create.php +++ b/erp24/views/bouquet/create.php @@ -31,7 +31,8 @@ $this->registerJsFile('/js/bouquet/bouquet.js', ['position' => \yii\web\View::PO 'videoUrls' => [], 'processUrls' => [], 'availableItems' => $availableItems, - 'model' => null + 'model' => null, + 'disabledButtons' => \yii_app\records\BouquetComposition::disabledButtons(true) ]); ?> diff --git a/erp24/views/bouquet/index.php b/erp24/views/bouquet/index.php index c4520913..a783c7c0 100644 --- a/erp24/views/bouquet/index.php +++ b/erp24/views/bouquet/index.php @@ -57,7 +57,7 @@ $this->title = 'Содержание матрицы'; ]) ?>
- 'text-decoration-none', 'target' => '_blank']) ?> + 'text-decoration-none', 'target' => '_blank', 'disabled' => BouquetComposition::disabledButtons()]) ?>
diff --git a/erp24/views/bouquet/view.php b/erp24/views/bouquet/view.php index 48851bd6..66387c36 100644 --- a/erp24/views/bouquet/view.php +++ b/erp24/views/bouquet/view.php @@ -28,7 +28,8 @@ $this->registerJsFile('/js/bouquet/bouquet.js', ['position' => \yii\web\View::PO 'photoUrls' => $photoUrls, 'photoFiles' => $photoFiles, 'videoUrls' => $videoUrls, - 'processUrls' => $processUrls + 'processUrls' => $processUrls, + 'disabledButtons' => \yii_app\records\BouquetComposition::disabledButtons(), ]); ?> diff --git a/erp24/web/js/bouquet/bouquet.js b/erp24/web/js/bouquet/bouquet.js index 4b273deb..be53e056 100644 --- a/erp24/web/js/bouquet/bouquet.js +++ b/erp24/web/js/bouquet/bouquet.js @@ -56,6 +56,7 @@ $('.calculate-btn').on('click', function () { }); } }); + $('.cost-value').text(null); $('.selfcost-value').text(null); $('.markup-value').text(null); -- 2.39.5