Merge branch 'refs/heads/develop' into feature_fomichev_erp_149_flowwow_feed

# Conflicts:
#	erp24/api2/config/api2.config.php
#	erp24/controllers/MarketplaceController.php

diff --cc erp24/api2/config/api2.config.php
index 2f396ce9ad1b376a05182ccaf31be009a488d5ef,8cba7a248e2640b216b38afbd61657368ac3afdc..0c314706a6296bca3578fd00f0fc5d5d93bcae11
--- 1/erp24/api2/config/api2.config.php
--- 2/erp24/api2/config/api2.config.php
+++ b/erp24/api2/config/api2.config.php
@@@ -39,7 -39,7 +39,8 @@@ return 
                  'auth' => 'auth/login',
                  'delivery/admin-auth' => 'delivery/admin-auth',
                  ['class' => 'yii\rest\UrlRule', 'controller' => ['task']],
 +                'flowwow/feed/<id:\d+>' => 'flowwow/feed',
+                 'POST data-buh/request/<inn:\d+>' => 'data-buh/request'
              ],
          ],
          'request' => [

diff --cc erp24/controllers/MarketplaceController.php
index 799268c007884e89ddfe68178bccda27e823ea5b,765fad6d0d72b664b6b90cde63285a2c82c5869d..da875e47177b6611e7c753f44a6482b907fdd6e4
--- 1/erp24/controllers/MarketplaceController.php
--- 2/erp24/controllers/MarketplaceController.php
+++ b/erp24/controllers/MarketplaceController.php
@@@ -8,39 -6,9 +8,44 @@@ use yii\web\Response
  
  class MarketplaceController extends Controller
  {
+     public function actions() {
+         return [
+             'priority' => \yii_app\actions\marketplace\PriorityAction::class,
+         ];
++        }
 +    /**
 +     * Экшен для генерации и отображения XML-фида.
 +     *
 +     * @return string
 +     */
 +    public function actionFeed()
 +    {
 +        // Получаем информацию о продуктах
 +        $productsInfo = MarketplaceService::getAllProductsInfo();
 +
 +        // Генерируем XML-фид
 +        $xmlFeed = MarketplaceService::createXMLFeed($productsInfo);
 +
 +        // Устанавливаем заголовок, чтобы отдать XML
 +        Yii::$app->response->format = Response::FORMAT_RAW;
 +        Yii::$app->response->headers->add('Content-Type', 'application/xml; charset=utf-8');
 +
 +        return $xmlFeed;
 +    }
 +
 +
 +    public function actionTestFeed()
 +    {
 +
 +        $productsInfo = MarketplaceService::getSomeProductsInfo(3);
 +
 +
 +        $xmlFeed = MarketplaceService::createXMLFeed($productsInfo);
 +
 +
 +        Yii::$app->response->format = \yii\web\Response::FORMAT_RAW;
 +        Yii::$app->response->headers->add('Content-Type', 'application/xml; charset=utf-8');
 +
 +        return $xmlFeed;
      }
  }