From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 15 Jul 2025 07:30:29 +0000 (+0300)
Subject: Добавление адреса в заказ
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=852a5dc09b9ecd1770b9bc48df1dc9afbbdb5757;p=erp24_rep%2Fyii-erp24%2F.git

Добавление адреса в заказ
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 6c2e489e..553fe7a6 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -814,8 +814,11 @@ class DataController extends BaseController
                 $marketplaceOrderDelivery = MarketplaceOrderDelivery::find()->where(['order_id' => $marketplaceOrder->id])->one();
                 /* @var $marketplaceOrderDelivery MarketplaceOrderDelivery */
                 $delivery_type = $marketplaceOrderDelivery && $marketplaceOrderDelivery->type == 'DELIVERY' ? 1 : 2;
-
-                $deliveryToDate = null;
+                $deliveryAddress = $marketplaceOrderDelivery->city .
+                    ", " . $marketplaceOrderDelivery->street .
+                    ", " . $marketplaceOrderDelivery->house .
+                    ", " . $marketplaceOrderDelivery->apartment;
+                    $deliveryToDate = null;
                 $deliveryToTime = null;
                 if ($marketplaceOrder->delivery_to) {
                     $deliveryTo = explode(' ', $marketplaceOrder->delivery_to);
@@ -844,6 +847,8 @@ class DataController extends BaseController
                     'delivery_date' => $deliveryToDate ?? '',
                     'delivery_time' => $deliveryToTime ?? '',
                     'delivery_type' => $delivery_type,
+                    'delivery_address' => $deliveryAddress,
+                    'address' => $deliveryAddress,
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
                     'comment_data' => json_encode([
diff --git a/erp24/views/marketplace-orders/view.php b/erp24/views/marketplace-orders/view.php
index ceababc8..6ddd6b8c 100644
--- a/erp24/views/marketplace-orders/view.php
+++ b/erp24/views/marketplace-orders/view.php
@@ -81,8 +81,6 @@ $this->params['breadcrumbs'][] = $this->title;
                 }
             ],
             'error_text',
-            'number_1c',
-            'seller_id',
             'telegram_error',
             [
                 'attribute' => 'status_1c',
@@ -90,7 +88,6 @@ $this->params['breadcrumbs'][] = $this->title;
                     return MarketplaceOrders::STATUSES_1C[$model->status_1c];
                 }
             ],
-            'error_text',
             'seller_id',
             'number_1c',
             'check_guid',
@@ -122,7 +119,6 @@ $this->params['breadcrumbs'][] = $this->title;
                 },
 
             ],
-            'telegram_error',
             [
                 'attribute' => 'status_processing_1c',
                 'value' => function ($model) {