From: fomichev Date: Mon, 28 Apr 2025 10:39:57 +0000 (+0300) Subject: Ссылка на зкгрузку фото X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0a4f678e945967ce45dd0aa56b5e27cbbe301c2b;p=erp24_rep%2Fyii-erp24%2F.git Ссылка на зкгрузку фото --- 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,