From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 25 Jun 2025 15:00:32 +0000 (+0300)
Subject: Правки по логике статусов
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=bc0443fd5c0a126bd3c47a2e200e72154989af64;p=erp24_rep%2Fyii-erp24%2F.git

Правки по логике статусов
---

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 566af9fe..4931db5a 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -2472,7 +2472,7 @@ class MarketplaceService
             $createChecks->store_id = $eit->export_val ?? '';
             $createChecks->delivery_date = $marketplaceOrder->delivery_to;
             $createChecks->check_id = DataHelper::createGuidMy('02');
-
+            $createChecks->guid = $createChecks->check_id;
             $createChecks->type = 'Продажа';
             $items = [];
             foreach ($marketplaceOrder->items as $item) {
@@ -2502,11 +2502,11 @@ class MarketplaceService
             if ($createChecks->save()) {
                 $marketplaceOrder->check_guid = $createChecks->check_id;
                 if (!$marketplaceOrder->save()) {
-                    Yii::warning("Ошибка сохранения check_guid для заказа" . $marketplaceOrder->id  . ' ' . Json::encode($marketplaceOrder->getErrors()));
+                    Yii::warning("Ошибка сохранения check_guid для заказа " . $marketplaceOrder->id  . ' ' . Json::encode($marketplaceOrder->getErrors()));
                 }
                 return true;
             } else {
-                Yii::warning("Ошибка создания чека для заказа id" . $marketplaceOrder->id  . ' ' . Json::encode($createChecks->getErrors()));
+                Yii::warning("Ошибка создания чека для заказа id  " . $marketplaceOrder->id  . ' ' . Json::encode($createChecks->getErrors()));
             }
         }
 
diff --git a/erp24/views/marketplace-orders/index.php b/erp24/views/marketplace-orders/index.php
index 103693eb..61d414d3 100644
--- a/erp24/views/marketplace-orders/index.php
+++ b/erp24/views/marketplace-orders/index.php
@@ -181,7 +181,7 @@ YiiAsset::register($this);
                     }
 
                     if ($check->status == 1) {
-                        return $check->guid
+                        return $check->name
                             ? 'Создан в 1С'
                             : 'Отправлен в 1С';
                     }
diff --git a/erp24/views/marketplace-orders/view.php b/erp24/views/marketplace-orders/view.php
index c6ffae9b..0b871b0a 100644
--- a/erp24/views/marketplace-orders/view.php
+++ b/erp24/views/marketplace-orders/view.php
@@ -108,7 +108,7 @@ $this->params['breadcrumbs'][] = $this->title;
                     }
 
                     if ($check->status == 1) {
-                        return $check->guid
+                        return $check->name
                             ? 'Создан в 1С'
                             : 'Отправлен в 1С';
                     }