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

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 1ae28d8cdea854e95a0b3736f82217311c908ef1..9c8167ac80017506bb11bf6a162708b34bc9d8ba 100644 (file)
--- 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) {