[ERP-331] add items

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index fd52618151ebe4674f2f20a1e0b6944f44bde3cb..ef430f78a3698964de842259209d8238266581c5 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -729,7 +729,7 @@ class DataController extends BaseController
 
 
     private function getMarketplaceOrders(): array {
-        $marketplaceOrders = MarketplaceOrders::find()
+        $marketplaceOrders = MarketplaceOrders::find()->with('items')
             ->where([
                 'status_1c' => MarketplaceOrders::STATUSES_1C_CREATED_IN_ERP
             ])->andWhere([
@@ -762,6 +762,7 @@ class DataController extends BaseController
                 'payment_method' => $marketplaceOrder->payment_method,
                 'cancel_requested' => $marketplaceOrder->cancel_requested,
                 'raw_data' => $marketplaceOrder->raw_data,
+                'items' => Json::encode($marketplaceOrder->items),
             ];
         }
         return $result;

diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index c7b7bf8869ce23af6309e5348592980a45af925f..1f35d42dd0560b042d27916160b04864a899c6a2 100644 (file)
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -118,4 +118,8 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
     {
         return $this->hasOne(MarketplaceOrderStatusTypes::class, ['id' => 'substatus_id']);
     }
+
+    public function getItems() {
+        return $this->hasMany(MarketplaceOrderItems::class, ['order_id' => 'id']);
+    }
 }