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

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 566af9fee62d0f53fa6631aab2684f17b8e263df..4931db5a73364f3da8f9803ff29d2c83bd4ce2ba 100644 (file)
--- 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 103693eb3df2d71018cd232dd33a5099786bbc59..61d414d3412dad3243d11988f74fd404418d924d 100644 (file)
--- 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 c6ffae9b9595d3965bfb56740fcba6881984512c..0b871b0a4ee9b52061695f5e796c4f17379e9d8b 100644 (file)
--- 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С';
                     }