From e6e688ff57950fd0b03c0c2e87c907693c0c19d4 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 15 Jul 2025 10:39:06 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=B0=20=D0=B2=20?=
 =?utf8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/DataController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 1ae28d8c..9c8167ac 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -814,10 +814,10 @@ class DataController extends BaseController
                 $marketplaceOrderDelivery = MarketplaceOrderDelivery::find()->where(['order_id' => $marketplaceOrder->id])->one();
                 /* @var $marketplaceOrderDelivery MarketplaceOrderDelivery */
                 $delivery_type = $marketplaceOrderDelivery && $marketplaceOrderDelivery->type == 'DELIVERY' ? 1 : 2;
-                $deliveryAddress = $marketplaceOrderDelivery->city .
-                    ", " . $marketplaceOrderDelivery->street .
-                    ", " . $marketplaceOrderDelivery->house .
-                    ", " . $marketplaceOrderDelivery->apartment;
+                $deliveryAddress = ($marketplaceOrderDelivery->city ?? '') .
+                    ", " . ($marketplaceOrderDelivery->street ?? '') .
+                    ", " . ($marketplaceOrderDelivery->house ?? '') .
+                    ", " . ($marketplaceOrderDelivery->apartment ?? "");
                     $deliveryToDate = null;
                 $deliveryToTime = null;
                 if ($marketplaceOrder->delivery_to) {
-- 
2.39.5