Исправления

diff --git a/erp24/records/Product1cReplacementSearch.php b/erp24/records/Product1cReplacementSearch.php
index 862f0a1f0f05be0d3574074ac11404d0de3bd6f9..60cab06ed3ccbc8cd1364ff60077ab8f499f3e51 100644 (file)
--- 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 82f39b9b89e30dc3b69ea1023f2625f5d7360659..2d29b076568df0ae1e03409b9f590665b9849c18 100644 (file)
--- 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 52a54412752d52e94ef1f3d905c21290fb18577c..593904cc668be19ce3730ec027a4ac146cb3fef5 100644 (file)
--- 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 ad0b6405c72ba41cf0757f93cc13104d33ec9c48..50332337432bc6982d874c8cf3090278eba6e317 100644 (file)
--- 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,