[ERP-148] красивая урл для картинки

diff --git a/erp24/api2/controllers/YandexMarketController.php b/erp24/api2/controllers/YandexMarketController.php
index 52eeb6b47d2ca18921502ccfb2cc7f755b8370a4..6500e703bc4ae5d7bc9d63deb06d37f8bce79ffd 100644 (file)
--- a/erp24/api2/controllers/YandexMarketController.php
+++ b/erp24/api2/controllers/YandexMarketController.php
@@ -101,7 +101,8 @@ class YandexMarketController extends Controller
                     'offerId' => $product->id,
                     'category' => 'Цветы',
                     'marketCategoryId' => '91284',
-                    'name' => $matrixErpByGuid[$product->id]->matrixProperty->display_name ?? $product->name,
+                    'name' => !empty($matrixErpByGuid[$product->id]->matrixProperty->display_name) ?
+                        $matrixErpByGuid[$product->id]->matrixProperty->display_name : $product->name,
                     'basicPrice' => [
                         'currencyId' => Model\CurrencyType::RUR,
                         'value' => $matrixErpByGuid[$product->id]->price->price,
@@ -114,7 +115,7 @@ class YandexMarketController extends Controller
                         'width' => $matrixErpByGuid[$product->id]->matrixProperty->width ?? 20,
                     ]),
                     'description' => $matrixErpByGuid[$product->id]->matrixProperty->description ?? '-',
-                    'pictures' => ['https://media.erp-flowers.ru/media/view-image?id=' . ($matrixErpByGuid[$product->id]->matrixProperty->image_id ?? null)],
+                    'pictures' => ['https://media.erp-flowers.ru/media/view-image/' . ($matrixErpByGuid[$product->id]->matrixProperty->image_id ?? null)],
                 ],
             ]);
         }

diff --git a/erp24/media/config/media.config.php b/erp24/media/config/media.config.php
index 439d3e5f02da896e031ec777a6854f0ac4e48db8..a0df36c0e879dd6740598119da8b3c59025ae749 100644 (file)
--- a/erp24/media/config/media.config.php
+++ b/erp24/media/config/media.config.php
@@ -24,7 +24,9 @@ return [
             'enablePrettyUrl' => true,
             'enableStrictParsing' => false,
             'showScriptName' => false,
-            'rules' => [],
+            'rules' => [
+                'GET media/view-image/<id:\d+>' => 'media/view-image'
+            ],
         ],
         'request' => [
             'scriptUrl' => '/',