From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 13 Oct 2025 06:58:42 +0000 (+0300)
Subject: Добавляем статусы через отношения
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1a316435bff1615f53b26bb465497efcd5d395a0;p=erp24_rep%2Fyii-erp24%2F.git

Добавляем статусы через отношения
---

diff --git a/erp24/api2/controllers/OrdersController.php b/erp24/api2/controllers/OrdersController.php
index 8c534c2c..66986f73 100644
--- a/erp24/api2/controllers/OrdersController.php
+++ b/erp24/api2/controllers/OrdersController.php
@@ -242,7 +242,7 @@ class OrdersController extends BaseController
 
             $orders = MarketplaceOrders::find()
                 ->with('items')
-                ->with('status1c')
+                ->with('status1C')
                 ->where(['store_id' => $storeId])
                 ->andWhere(['>=', 'creation_date', $startTime->format('Y-m-d H:i:s')])
                 ->andWhere(['<=', 'creation_date', $currentTime->format('Y-m-d H:i:s')])
@@ -267,7 +267,7 @@ class OrdersController extends BaseController
 
                 $result[] = [
                     'order_id' => $order->guid,
-                    'status' => $order->status1c ? $order->status1C->status_id : null,
+                    'status' => $order->status1C ? $order->status1C->status_id : null,
                     'items' => $items,
                 ];
             }
diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index e136c714..9c60953b 100644
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -187,7 +187,7 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
         return $this->hasMany(MarketplaceOrderItems::class, ['order_id' => 'id']);
     }
 
-    public function getStatus1c()
+    public function getStatus1C()
     {
         return $this->hasOne(MarketplaceOrder1cStatuses::class, ['id' => 'status_processing_1c']);
     }