From 0a4f678e945967ce45dd0aa56b5e27cbbe301c2b Mon Sep 17 00:00:00 2001 From: fomichev Date: Mon, 28 Apr 2025 13:39:57 +0300 Subject: [PATCH] =?utf8?q?=D0=A1=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20=D0=BD?= =?utf8?q?=D0=B0=20=D0=B7=D0=BA=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20?= =?utf8?q?=D1=84=D0=BE=D1=82=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 0215f131..05a75bd2 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -797,6 +797,12 @@ class DataController extends BaseController $deliveryToDate = $deliveryTo[0]; $deliveryToTime = $deliveryTo[1]; } + if(TelegramService::isDevEnv()){ + $baseUrl = 'https://media.dev.erp-flowers.ru'; + } else { + $baseUrl = 'https://media.erp-flowers.ru'; + } + $photoLink = $baseUrl . '/marketplace/upload?guid=' . $marketplaceOrder->guid; $result[] = [ 'id' => $marketplaceOrder->guid, @@ -814,6 +820,7 @@ class DataController extends BaseController 'delivery_time' => $deliveryToTime ?? '', 'delivery_type' => $delivery_type, 'items' => $itemsFiltered, + 'photo_link' => $photoLink, // 'marketplace_order_id' => $marketplaceOrder->marketplace_order_id, // 'status_id' => $marketplaceOrder->status_id, // 'substatus_id' => $marketplaceOrder->substatus_id, -- 2.39.5