From 5582fea2f5fb17b91d4da9fc07abfb95986d1270 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 4 Dec 2024 17:13:36 +0300
Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B3=D1=83?=
 =?utf8?q?=D0=B8=D0=B4=20=D0=B8=D0=B7=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?=
 =?utf8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE?=
 =?utf8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../views/crud/product1c-replacement/index.php | 18 +++++++++---------
 .../crud/product1c-replacement/update.php      |  2 +-
 .../views/crud/product1c-replacement/view.php  | 10 ++--------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/erp24/views/crud/product1c-replacement/index.php b/erp24/views/crud/product1c-replacement/index.php
index a34bbc34..f298a46d 100644
--- a/erp24/views/crud/product1c-replacement/index.php
+++ b/erp24/views/crud/product1c-replacement/index.php
@@ -39,9 +39,10 @@ $this->params['breadcrumbs'][] = $this->title;
 
                     $product = $model->product;
                     if ($product) {
-                        $codeProduct = $product->code ? (', ' . $product->code) : '';
-                        $articuleProduct = $product->articule ? (', ' . $product->articule) : '';
-                        return Html::encode($product->name . ' (' . $model->guid . $codeProduct . $articuleProduct . ')');
+                        $codeProduct = $product->code ?  ('Код: ' . $product->code ) : '';
+                        $articuleProduct = $product->articule ? ('Артикул: ' . $product->articule) : '';
+                        $comaSeparated = ($product->code && $product->articule) ? ', ' : '';
+                        return Html::encode($product->name . ' (' . $codeProduct . $comaSeparated . $articuleProduct . ')');
                     }
                     return Html::encode($model->guid);
                 },
@@ -54,14 +55,13 @@ $this->params['breadcrumbs'][] = $this->title;
                     if (!empty($guidReplacements)) {
                         $listItems = '<ul>';
                         foreach ($guidReplacements as $replacementGuid) {
-
                             $replacementProduct = Products1c::findOne(['id' => $replacementGuid, 'tip' => 'products']);
                             if ($replacementProduct) {
-
-                                $code = $replacementProduct->code ? (', ' . $replacementProduct->code) : '';
-                                $articule = $replacementProduct->articule ? (', ' . $replacementProduct->articule) : '';
-
-                                $listItems .= '<li>' . Html::encode($replacementProduct->name . ' (' . $replacementGuid . $code . $articule . ')') . '</li> <br>';
+                                $code = $replacementProduct->code ? ( 'Код: ' . $replacementProduct->code) : '';
+                                $articule = $replacementProduct->articule ? ('Артикул: ' . $replacementProduct->articule) : '';
+                                $comaSeparated = ($replacementProduct->code && $replacementProduct->articule) ? ', ' : '';
+                                $listItems .= '<li>' . Html::encode($replacementProduct->name . ' (' . $code
+                                                                     . $comaSeparated . $articule . ')') . '</li> <br>';
                             } else {
                                 $listItems .= '<li>' . Html::encode($replacementGuid) . '</li>';
                             }
diff --git a/erp24/views/crud/product1c-replacement/update.php b/erp24/views/crud/product1c-replacement/update.php
index 3f6ff8dd..e1bcf4e7 100644
--- a/erp24/views/crud/product1c-replacement/update.php
+++ b/erp24/views/crud/product1c-replacement/update.php
@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = 'Update';
     <?= Html::a('Отмена', ['index'], ['class' => 'btn btn-danger mb-4']) ?>
     <h1><?= Html::encode($this->title) ?> <br>
         <?= $model->product->name ?>
-        (<?= $model->product->id ?>, <?= $model->product->articule ?>) </h1>
+        <?= $model->product->articule ? ( '(Артикул: ' . $model->product->articule . ')') : '' ?> </h1>
 
     <?= $this->render('multy-form', [
         'model' => $model,
diff --git a/erp24/views/crud/product1c-replacement/view.php b/erp24/views/crud/product1c-replacement/view.php
index 290656ed..babebf2d 100644
--- a/erp24/views/crud/product1c-replacement/view.php
+++ b/erp24/views/crud/product1c-replacement/view.php
@@ -20,20 +20,15 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="product1-creplacement-view p-4">
     <?= Html::a('Назад', ['index'], ['class' => 'btn btn-danger mb-4']) ?>
     <h1>Замены для <?= Html::encode($this->title) ?></h1>
-
     <p>
         <?= Html::a('Редактировать', ['update', 'id' => $model->guid], ['class' => 'btn btn-primary']) ?>
-
-
         <?= Html::a('Просмотр логов', ['log-history', 'guid' => $model->guid], ['class' => 'btn btn-success']) ?>
     </p>
 
     <div id="grid-container">
     <?= GridView::widget([
         'dataProvider' => $replacements,
-
         'columns' => [
-
             [
                 'label' => 'GUIDы замены',
                 'attribute' => 'replacement_guid',
@@ -41,10 +36,9 @@ $this->params['breadcrumbs'][] = $this->title;
 
                     $product = Products1c::findOne(['id' => $model->guid_replacement, 'tip' => 'products']);
                     if ($product) {
-
-                        $code = $product->code ? (', ' . $product->code) : '';
+                        $code = $product->code ?  $product->code : '';
                         $articule = $product->articule ? (', ' . $product->articule) : '';
-                        return Html::encode($product->name . ' (' . $model->guid . $code . $articule . ')');
+                        return Html::encode($product->name . ' (' . $code . $articule . ')');
                     }
                     return Html::encode($model->guid_replacement);
                 },
-- 
2.39.5