From d39646af21f7f5d11ff69cf01d2ae2a73648282e Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 18 Nov 2024 00:15:45 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?utf8?q?=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Product1cReplacementSearch.php      | 5 +++--
 erp24/views/crud/product1c-replacement/_form.php  | 2 +-
 erp24/views/crud/product1c-replacement/create.php | 2 +-
 erp24/views/crud/product1c-replacement/update.php | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/erp24/records/Product1cReplacementSearch.php b/erp24/records/Product1cReplacementSearch.php
index 862f0a1f..60cab06e 100644
--- a/erp24/records/Product1cReplacementSearch.php
+++ b/erp24/records/Product1cReplacementSearch.php
@@ -63,8 +63,9 @@ class Product1cReplacementSearch extends Product1cReplacement
         ]);
 
         $query->andFilterWhere(['ilike', 'guid', $this->guid])
-           // ->andFilterWhere(['ilike', 'guid_replacement', $this->guid_replacement])
-            ->orWhere(['ilike', 'products_1c.name', $this->guid]); // Поиск по имени
+            ->andFilterWhere(['ilike', 'guid_replacement', $this->guid_replacement])
+            ->andFilterWhere(['ilike', 'products_1c.name', $this->productName])
+            ->orFilterWhere(['ilike', 'products_1c.name', $this->guid]);
 
 
         return $dataProvider;
diff --git a/erp24/views/crud/product1c-replacement/_form.php b/erp24/views/crud/product1c-replacement/_form.php
index 82f39b9b..2d29b076 100644
--- a/erp24/views/crud/product1c-replacement/_form.php
+++ b/erp24/views/crud/product1c-replacement/_form.php
@@ -80,7 +80,7 @@ $this->registerJsFile('/js/crud/product1cReplacement/_form.js', ['position' => \
 
     <div class="form-group py-4">
         <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
-        <?= Html::a('Отмена', ['index'], ['class' => 'btn btn-danger']) ?>
+
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/erp24/views/crud/product1c-replacement/create.php b/erp24/views/crud/product1c-replacement/create.php
index 52a54412..593904cc 100644
--- a/erp24/views/crud/product1c-replacement/create.php
+++ b/erp24/views/crud/product1c-replacement/create.php
@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = ['label' => 'Product1c Replacements', 'url' =>
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="product1-creplacement-create p-4">
-
+    <?= Html::a('Отмена', ['index'], ['class' => 'btn btn-danger mb-4']) ?>
     <h1><?= Html::encode($this->title) ?></h1>
 
     <?= $this->render('_form', [
diff --git a/erp24/views/crud/product1c-replacement/update.php b/erp24/views/crud/product1c-replacement/update.php
index ad0b6405..50332337 100644
--- a/erp24/views/crud/product1c-replacement/update.php
+++ b/erp24/views/crud/product1c-replacement/update.php
@@ -5,14 +5,14 @@ use yii\helpers\Html;
 /** @var yii\web\View $this */
 /** @var yii_app\records\Product1cReplacement $model */
 /** @var yii_app\records\Product1cReplacement $replacements */
-$this->title = 'Редактирование замен: ' . $model->product->name;
+$this->title = 'Редактирование замен для: ';
 $this->params['breadcrumbs'][] = ['label' => 'Product1c Replacements', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
 $this->params['breadcrumbs'][] = 'Update';
 ?>
 <div class="product1-creplacement-update p-4">
-    <?= Html::a('Отмена', ['index'], ['class' => 'btn btn-danger my-4']) ?>
-    <h1><?= Html::encode($this->title) ?></h1>
+    <?= Html::a('Отмена', ['index'], ['class' => 'btn btn-danger mb-4']) ?>
+    <h1><?= Html::encode($this->title) ?> <br> <?= $model->product->name ?></h1>
 
     <?= $this->render('multy-form', [
         'model' => $model,
-- 
2.39.5