From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 25 Oct 2024 11:12:51 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/feature_fomichev_erp_149_flowwow_feed' into... 
X-Git-Tag: 1.6~13^2~26
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1b74475e633ebc94061747c113ab473c692bca8b;p=erp24_rep%2Fyii-erp24%2F.git

Merge remote-tracking branch 'origin/feature_fomichev_erp_149_flowwow_feed' into feature_fomichev_erp_149_flowwow_feed

# Conflicts:
#	erp24/api2/controllers/FlowwowController.php
---

1b74475e633ebc94061747c113ab473c692bca8b
diff --cc erp24/api2/controllers/FlowwowController.php
index cdcd1047,3eb8a582..788ee1f6
--- a/erp24/api2/controllers/FlowwowController.php
+++ b/erp24/api2/controllers/FlowwowController.php
@@@ -17,6 -17,7 +17,8 @@@ class FlowwowController extends Control
  
          $productsInfo = MarketplaceService::getAllProductsInfo($id);
  
+ 
++
          $xmlFeed = MarketplaceService::createXMLFeed($productsInfo);
  
          // Устанавливаем заголовок, чтобы отдать XML