From c00a09b06df4f1643587e6b0e7d34784ca5cb8a9 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 20 Nov 2024 12:09:49 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=BE=20-=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BF=D0=BE=20?=
 =?utf8?q?=D0=B0=D1=80=D1=82=D0=B8=D0=BA=D1=83=D0=BB=D1=83,=20=D0=BD=D0=B0?=
 =?utf8?q?=D0=B4=D0=BF=D0=B8=D1=81=D1=8C=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?=
 =?utf8?q?=D0=B0,=20=D0=B0=D1=80=D1=82=D0=B8=D0=BA=D1=83=D0=BB=D1=8B=20?=
 =?utf8?q?=D0=B2=20=D1=81=D0=B5=D0=BB=D0=B5=D0=BA=D1=82=D0=B0=D1=85=20?=
 =?utf8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5?=
 =?utf8?q?=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?utf8?q?=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Product1cReplacementSearch.php          | 2 +-
 erp24/views/crud/product1c-replacement/_form.php      | 5 +++--
 erp24/views/crud/product1c-replacement/multy-form.php | 8 +++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/erp24/records/Product1cReplacementSearch.php b/erp24/records/Product1cReplacementSearch.php
index 60cab06e..c7fe607a 100644
--- a/erp24/records/Product1cReplacementSearch.php
+++ b/erp24/records/Product1cReplacementSearch.php
@@ -64,7 +64,7 @@ class Product1cReplacementSearch extends Product1cReplacement
 
         $query->andFilterWhere(['ilike', 'guid', $this->guid])
             ->andFilterWhere(['ilike', 'guid_replacement', $this->guid_replacement])
-            ->andFilterWhere(['ilike', 'products_1c.name', $this->productName])
+            ->orFilterWhere(['ilike', 'products_1c.articule', $this->guid])
             ->orFilterWhere(['ilike', 'products_1c.name', $this->guid]);
 
 
diff --git a/erp24/views/crud/product1c-replacement/_form.php b/erp24/views/crud/product1c-replacement/_form.php
index 0d40c5c7..27faa68b 100644
--- a/erp24/views/crud/product1c-replacement/_form.php
+++ b/erp24/views/crud/product1c-replacement/_form.php
@@ -16,7 +16,7 @@ $this->registerJsFile('/js/crud/product1cReplacement/_form.js', ['position' => \
 <div class="product1-creplacement-form p-4">
 
     <?php $form = ActiveForm::begin(['id' => 'product-replacement-form']); ?>
-    <div class="row">
+    <div class="row mb-3">
 
     <div class="col-6">
 
@@ -42,7 +42,7 @@ $this->registerJsFile('/js/crud/product1cReplacement/_form.js', ['position' => \
                 ],
             ],
         ]) ?>
-
+        <p class="text-danger">Внимание! Если товар не найден, проверьте общий список - возможно товар уже присутствует в списке замен</p>
         </div>
     </div>
 
@@ -84,6 +84,7 @@ $this->registerJsFile('/js/crud/product1cReplacement/_form.js', ['position' => \
                 ],
             ],
         ]) ?>
+
     </div>
     </div>
 
diff --git a/erp24/views/crud/product1c-replacement/multy-form.php b/erp24/views/crud/product1c-replacement/multy-form.php
index 73165498..d2d599cc 100644
--- a/erp24/views/crud/product1c-replacement/multy-form.php
+++ b/erp24/views/crud/product1c-replacement/multy-form.php
@@ -48,8 +48,14 @@ $this->registerJsFile('/js/crud/product1cReplacement/multy-form.js', ['position'
         <div id="guid-replacement-container" class="col-6">
             <?php foreach ($replacements as $key => $replacement): ?>
                 <?php
+                if($replacement->replacementProduct) {
+                    $replacementArticule = $replacement->replacementProduct->articule ? (' (' .  $replacement->replacementProduct->articule . ')') : '';
+                    $replacementName = $replacement->replacementProduct->name ? ($replacement->replacementProduct->name . $replacementArticule) : $replacementArticule;
+                } else {
+                    $replacementName = 'Неизвестно';
+                }
+
 
-                $replacementName = $replacement->replacementProduct ? $replacement->replacementProduct->name : 'Неизвестно';
                 ?>
             <div class="guid-replacement-group row" style="position: relative;">
                 <?= Html::hiddenInput('Product1cReplacement[replacement_ids][]', $replacement->id) ?>
-- 
2.39.5