[ERP-401] delivery_type

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 30a7747fa23c300509e3832c2e75992331525494..9fe93682940163167d22da1fc5993a1bc4669fd2 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -24,6 +24,7 @@ use yii_app\records\EqualizationRemains;
 use yii_app\records\ExportImportTable;
 use yii_app\records\Incoming;
 use yii_app\records\IncomingItems;
+use yii_app\records\MarketplaceOrderDelivery;
 use yii_app\records\MarketplaceOrders;
 use yii_app\records\MarketplaceOrderStatusTypes;
 use yii_app\records\OrdersAmo;
@@ -778,6 +779,9 @@ class DataController extends BaseController
             }
             $eit = ExportImportTable::find()->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $marketplaceOrder->store_id])->one();
             $store_id = $eit->export_val ?? '';
+            $marketplaceOrderDelivery = MarketplaceOrderDelivery::find()->where(['order_id' => $marketplaceOrder->id])->one();
+            /* @var $marketplaceOrderDelivery MarketplaceOrderDelivery */
+            $delivery_type = $marketplaceOrderDelivery && $marketplaceOrderDelivery->type == 'DELIVERY' ? 1 : 2;
             $result[] = [
                 'id' => $marketplaceOrder->guid,
                 'store_id' => $store_id,
@@ -788,6 +792,7 @@ class DataController extends BaseController
                 'cancelled' => false,
                 'marketplace' => $marketplaceOrder->marketplace_id ?? 0,
                 'marketplace_name' => $marketplaceOrder->marketplace_name ?? 'ЯндексМаркет',
+                'delivery_type' => $delivery_type,
                 'items' => $itemsFiltered,
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,