From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 20 Nov 2024 09:09:49 +0000 (+0300)
Subject: Добавлено - поиск по артикулу, надпись поиска, артикулы в селектах на странице редакт... 
X-Git-Tag: 1.7~226^2~3
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c00a09b06df4f1643587e6b0e7d34784ca5cb8a9;p=erp24_rep%2Fyii-erp24%2F.git

Добавлено - поиск по артикулу, надпись поиска, артикулы в селектах на странице редактирования
---

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) ?>