Кодировка

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index a1348634d7269fc84e81d48ee3dc5b45f564a83f..8186ad2c39bed6c35011ca53d49241d106f27f32 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -116,8 +116,8 @@ class MarketplaceService
         $xml->addAttribute('date', date('Y-m-d\TH:i:sP'));
 
         $shop = $xml->addChild('shop');
-        $shop->addChild('name', 'База Цветов 24');
-        $shop->addChild('company', 'База Цветов 24');
+        $shop->addChild('name', htmlspecialchars('База Цветов 24', ENT_XML1 | ENT_COMPAT, 'UTF-8'));
+        $shop->addChild('company', htmlspecialchars('База Цветов 24', ENT_XML1 | ENT_COMPAT, 'UTF-8'));
         $shop->addChild('url', 'https://bazacvetov24.ru');
 
         // Добавление валюты
@@ -128,10 +128,10 @@ class MarketplaceService
 
         // Добавление категорий
         $categories = $shop->addChild('categories');
-        $category = $categories->addChild('category', 'Букеты');
+        $category = $categories->addChild('category', htmlspecialchars('Букеты', ENT_XML1 | ENT_COMPAT, 'UTF-8'));
         $category->addAttribute('id', '1');
 
-        // Добавление информации о доставке???
+        // Добавление информации о доставке
         $deliveryOptions = $shop->addChild('delivery-options');
         $deliveryOption = $deliveryOptions->addChild('option');
         $deliveryOption->addAttribute('cost', '200');
@@ -143,8 +143,7 @@ class MarketplaceService
             $offer = $offers->addChild('offer');
             $offer->addAttribute('id', $product['id']);
             $offer->addAttribute('available', $product['available'] ? 'true' : 'false');
-            $offer->addChild('name', htmlspecialchars($product['name']));
-            //TODO добавить url на конкректный букет
+            $offer->addChild('name', htmlspecialchars($product['name'], ENT_XML1 | ENT_COMPAT, 'UTF-8'));
             $offer->addChild('url', 'https://bazacvetov24.ru/flowers/' . $product['id']);
             $offer->addChild('price', $product['price']);
             $offer->addChild('currencyId', 'RUR');
@@ -158,11 +157,10 @@ class MarketplaceService
             $offerDeliveryOption->addAttribute('days', '1');
             $offerDeliveryOption->addAttribute('order-before', '18');
 
-            $offer->addChild('description', htmlspecialchars($product['description']));
+            $offer->addChild('description', htmlspecialchars($product['description'], ENT_XML1 | ENT_COMPAT, 'UTF-8'));
             $offer->addChild('weight', $product['weight']);
             $offer->addChild('qty', $product['qty']);
             $offer->addChild('minorder', $product['minorder']);
-            $offer->addChild('available', $product['available'] ? 'true' : 'false');
 
             if ($product['oldprice']) {
                 $offer->addChild('oldprice', $product['oldprice']);
@@ -170,9 +168,10 @@ class MarketplaceService
 
             foreach ($product['composition'] as $component) {
                 $consist = $offer->addChild('consist', $component['quantity']);
-                $consist->addAttribute('name', htmlspecialchars($component['name']));
-                $consist->addAttribute('unit', $component['unit']);
+                $consist->addAttribute('name', htmlspecialchars($component['name'], ENT_XML1 | ENT_COMPAT, 'UTF-8'));
+                $consist->addAttribute('unit', htmlspecialchars($component['unit'], ENT_XML1 | ENT_COMPAT, 'UTF-8'));
             }
+
             foreach ($product['pictures'] as $picture) {
                 $offer->addChild('picture', $picture);
             }
@@ -181,7 +180,8 @@ class MarketplaceService
         return $xml->asXML();
     }
 
-    // Приватные статические вспомогательные методы
+
+
     private static function getProductPictureUrl($productId) {
         return ['https://bazacvetov24.ru/products/5339/51-roza-premium_3326_md.jpg'];
     }