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

diff --git a/erp24/records/Product1cReplacementSearch.php b/erp24/records/Product1cReplacementSearch.php
index 60cab06ed3ccbc8cd1364ff60077ab8f499f3e51..c7fe607a0a1a564e177f68b165fe6f25d7a92f63 100644 (file)
--- 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 0d40c5c7333f8f611e4b0cefc6061efd0c9646e3..27faa68b397d5449e594708a7a629ad7fdee6f1c 100644 (file)
--- 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 7316549889cf74b3117feb2d921434d2df134622..d2d599cc25260008ed6277c11ed2b985385ffba5 100644 (file)
--- 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) ?>