From 8d2f18a7ec88c6aba62c18c78016b0b30799af67 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Tue, 1 Jul 2025 17:09:37 +0300
Subject: [PATCH] =?utf8?q?ERP-433=20=D0=9E=D1=82=D1=87=D0=B5=D1=82=20?=
 =?utf8?q?=D0=BF=D0=BE=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA=D0=B0=D0=BC?=
 =?utf8?q?=20=D0=B1=D1=83=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB?=
 =?utf8?q?=D1=8F=20=D0=9C=D0=9F=20=D0=B8=20=D0=BF=D1=80=D0=B8=D1=87=D0=B8?=
 =?utf8?q?=D0=BD=D0=B0=D0=BC,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BB=D0=BE?=
 =?utf8?q?=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=BE?=
 =?utf8?q?=D1=85=D0=BE=D0=B4=D0=B8=D1=82.=20=D0=92=D0=BE=D0=B7=D0=BC=D0=BE?=
 =?utf8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D1=80=D1=83=D1=87=D0=BD?=
 =?utf8?q?=D0=BE=D0=B9=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?=
 =?utf8?q?=20=D0=B8=D0=B7=20ERP=20=D0=B2=20Excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/marketplace/ReportAction.php | 2 +-
 erp24/views/marketplace/report.php         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/erp24/actions/marketplace/ReportAction.php b/erp24/actions/marketplace/ReportAction.php
index 8a48bde5..bc885cf1 100644
--- a/erp24/actions/marketplace/ReportAction.php
+++ b/erp24/actions/marketplace/ReportAction.php
@@ -35,7 +35,7 @@ class ReportAction extends Action
                 new \yii\db\Expression("
             CASE 
                 WHEN mep.id IS NULL AND p.price IS NULL THEN 
-                    'Не имеет состава букета в MatrixErpProperty и нет цена'
+                    'Не имеет состава букета в MatrixErpProperty и нет цены'
                 WHEN mep.id IS NULL THEN 
                     'Не имеет состава букета в MatrixErpProperty'
                 WHEN p.price IS NULL THEN 
diff --git a/erp24/views/marketplace/report.php b/erp24/views/marketplace/report.php
index 4195a3e9..3df942c6 100644
--- a/erp24/views/marketplace/report.php
+++ b/erp24/views/marketplace/report.php
@@ -24,17 +24,16 @@ $this->params['breadcrumbs'][] = $this->title;
                 'attribute' => 'is_valid',
                 'label' => 'Активен ли букет на МП?',
                 'value' => function ($model) {
-                    return $model->is_valid ? 'Да' : 'Нет';
+                    return $model['is_valid'] ? 'Да' : 'Нет';
                 }
             ],
             [
                 'attribute' => 'reason',
                 'label' => 'Причина не активности',
                 'value' => function ($model) {
-                    return $model->reason;
+                    return $model['reason'] ?? '';
                 }
             ],
-            'reason',
         ],
     ]); ?>
 
-- 
2.39.5