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

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

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) {