From c94c332f3f9847607e1b9ad69985164ee400b8a1 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 23 Oct 2024 18:00:28 +0300
Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D1=82=D0=B5?=
 =?utf8?q?=D0=B3=D0=B8=20=D1=81=D0=BE=D0=B3=D1=80=D0=BB=D0=B0=D1=81=D0=BD?=
 =?utf8?q?=D0=BE=20=D1=80=D0=B5=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD=D0=B4=D0=B0?=
 =?utf8?q?=D1=86=D0=B8=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/FlowwowController.php |  2 +-
 erp24/services/MarketplaceService.php        | 22 ++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/erp24/api2/controllers/FlowwowController.php b/erp24/api2/controllers/FlowwowController.php
index 9f7e69cc..db576bc4 100644
--- a/erp24/api2/controllers/FlowwowController.php
+++ b/erp24/api2/controllers/FlowwowController.php
@@ -15,7 +15,7 @@ class FlowwowController extends Controller
     public function actionFeed()
     {
         // Получаем информацию о продуктах
-        $productsInfo = MarketplaceService::getSomeProductsInfo(5);
+        $productsInfo = MarketplaceService::getSomeProductsInfo(6);
 
         // Генерируем XML-фид
         $xmlFeed = MarketplaceService::createXMLFeed($productsInfo);
diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 2a44ec72..41659569 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -150,6 +150,7 @@ class MarketplaceService
 
             // Добавление цены и валюты
             $offer->addChild('price', $product['price']);
+            $offer->addChild('oldPrice', $product['oldprice']);
             $offer->addChild('currencyId', 'RUB');
             $offer->addChild('categoryId', $product['category_id']); // Здесь нужно указать правильный ID категории для продукта
 
@@ -163,15 +164,15 @@ class MarketplaceService
 
             // Добавление веса и количества
             $offer->addChild('weight', $product['weight']);
-            $offer->addChild('qty', $product['qty']);
-            $offer->addChild('amount', $product['amount']);
-            $offer->addChild('cost', $product['amount']);
+          //  $offer->addChild('qty', $product['qty']);
+           // $offer->addChild('amount', $product['amount']);
+         //   $offer->addChild('cost', $product['amount']);
 
             foreach ($product['composition'] as $component) {
                 $consist = $offer->addChild('consist', $component['quantity']);
                 $consist->addAttribute('name', $component['name']);
                 $consist->addAttribute('unit', $component['unit']);
-                $consist->addAttribute('cost', 12);
+             //   $consist->addAttribute('cost', 12);
             }
 
             // Добавление параметров
@@ -197,22 +198,17 @@ class MarketplaceService
     }
 
 
-    private static function sxml_cdata($element, $content) {
-        $dom = dom_import_simplexml($element);
-        $cdata = $dom->ownerDocument->createCDATASection($content);
-        $dom->appendChild($cdata);
-    }
 
     private static function getProductPictureUrl($productId) {
-        return ['https://bazacvetov24.ru/products/5339/51-roza-premium_3326_md.jpg'];
+        return ['https://bazacvetov24.ru/products/8798/29-krasnykh-i-belykh-roz_10919_lg.jpg', 'https://bazacvetov24.ru/products/5339/51-roza-premium_3326_md.jpg'];
     }
     private static function getProductPrice($productId) {
         $price = Prices::find()
             ->where(['product_id' => $productId])
             ->one();
-            return $price['price'] ?? 0;
+            return $price['price'] ?? 10;
     }
-    private static function getProductOldPrice($productId) { return null; }
+    private static function getProductOldPrice($productId) { return 300; }
     private static function getProductDescription($productId) { return 'Описание'; }
     private static function getProductQty($productId) { return 9; }
     private static function getProductWeight($productId) {
@@ -225,7 +221,7 @@ class MarketplaceService
         return 1;
     }
     private static function getProductAvailability($productId) {
-        return false;
+        return true;
     }
 
     private static function getProductMaterial($productId)
-- 
2.39.5