From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 14 Aug 2025 13:25:24 +0000 (+0300)
Subject: Добавление текста если нет данных о доставке
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=9b685a4a3e02add223abea319e6751def3c1738a;p=erp24_rep%2Fyii-erp24%2F.git

Добавление текста если нет данных о доставке
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 40a36f21..3635b46f 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -826,6 +826,11 @@ class DataController extends BaseController
                 if ($marketplaceOrder->marketplace_id == 2) {
                     $delivery = array_intersect_key($delivery, array_flip(['address', 'date', 'notes']));
                 }
+                if (!empty($delivery)) {
+                   $deliveryString = json_encode($delivery, JSON_UNESCAPED_UNICODE);
+                } else {
+                    $deliveryString = 'нет данных';
+                }
 
                 $result[] = [
                     'id' => $marketplaceOrder->guid,
@@ -844,7 +849,7 @@ class DataController extends BaseController
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
                     'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id .
-                        '. Доставка: ' . json_encode($delivery, JSON_UNESCAPED_UNICODE) .
+                        '. Доставка: ' . $deliveryString .
                         ', Товары без артикула: ' . implode(', ', array_map(
                             fn(array $p) => "{$p['product_id']} x{$p['quantity']}",
                             $marketplaceOrder->getProductsWithoutArticule()