Glami, Google: fixed ItemsGroup generating

inteve · Apr 14, 2020 · 69c6679 · 69c6679
1 parent 9925cb1
commit 69c6679
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 4 deletions.
diff --git a/src/Feeds/Glami/GlamiFeed.php b/src/Feeds/Glami/GlamiFeed.php
@@ -46,8 +46,6 @@ public function generate(IOutput $output)
 				} else {
 					$this->generateItem($item, $output);
 				}
-
-				$output->output("</SHOPITEM>\n");
 			}
 
 			$output->output('</SHOP>');
@@ -124,5 +122,7 @@ private function generateItem($item, IOutput $output)
 					],
 				]);
 			}
+
+			$output->output("</SHOPITEM>\n");
 		}
 	}
diff --git a/src/Feeds/GoogleMerchant/GoogleMerchantFeed.php b/src/Feeds/GoogleMerchant/GoogleMerchantFeed.php
@@ -159,8 +159,6 @@ public function generate(IOutput $output)
 				} else {
 					$this->generateItem($item, $output);
 				}
-
-				$output->output("</entry>\n");
 			}
 
 			$output->output('</feed>');
@@ -225,5 +223,7 @@ private function generateItem($item, IOutput $output)
 				// identifiers
 				'g:identifier_exists' => !$item->hasIdentifiers() ? 'no' : NULL,
 			]);
+
+			$output->output("</entry>\n");
 		}
 	}
diff --git a/tests/FeedGenerator/Feeds/Glami/Glami.phpt b/tests/FeedGenerator/Feeds/Glami/Glami.phpt
@@ -36,6 +36,7 @@ test(function () {
 		->addDelivery('PPL', 69)
 		->addDelivery('CPOST', 59, 99);
 
+	$itemsGroup->addItem($groupItem);
 	$itemsGroup->addItem($groupItem);
 	$items[] = $itemsGroup;
 	$items[] = NULL;
@@ -92,6 +93,40 @@ test(function () {
 		'</DELIVERY>',
 		'</SHOPITEM>',
 
+		'<SHOPITEM>',
+		'<ITEM_ID>001</ITEM_ID>',
+		'<EAN>6417182041488</EAN>',
+		'<PRODUCTNAME>Product ABC</PRODUCTNAME>',
+		'<DESCRIPTION>Lorem ipsum dolor sit amet</DESCRIPTION>',
+		'<CATEGORYTEXT>Glami.cz | Oblečení</CATEGORYTEXT>',
+		'<URL>http://www.example.com/product-abc/</URL>',
+		'<URL_SIZE>http://www.example.com/product-abc/?size=41</URL_SIZE>',
+		'<IMGURL>http://www.example.com/images/product-abc.jpg</IMGURL>',
+		'<IMGURL_ALTERNATIVE>http://www.example.com/images/product-abc-1.jpg</IMGURL_ALTERNATIVE>',
+		'<IMGURL_ALTERNATIVE>http://www.example.com/images/product-abc-2.jpg</IMGURL_ALTERNATIVE>',
+		'<PRICE_VAT>5.00</PRICE_VAT>',
+		'<DELIVERY_DATE>0</DELIVERY_DATE>',
+		'<ITEMGROUP_ID>AB12345</ITEMGROUP_ID>',
+		'<MANUFACTURER>Adidas</MANUFACTURER>',
+		'<PARAM>',
+		'<PARAM_NAME>barva</PARAM_NAME>',
+		'<VAL>modrá</VAL>',
+		'</PARAM>',
+		'<PARAM>',
+		'<PARAM_NAME>velikost</PARAM_NAME>',
+		'<VAL>XXL</VAL>',
+		'</PARAM>',
+		'<DELIVERY>',
+		'<DELIVERY_ID>PPL</DELIVERY_ID>',
+		'<DELIVERY_PRICE>69</DELIVERY_PRICE>',
+		'</DELIVERY>',
+		'<DELIVERY>',
+		'<DELIVERY_ID>CPOST</DELIVERY_ID>',
+		'<DELIVERY_PRICE>59</DELIVERY_PRICE>',
+		'<DELIVERY_PRICE_COD>99</DELIVERY_PRICE_COD>',
+		'</DELIVERY>',
+		'</SHOPITEM>',
+
 		'<SHOPITEM>',
 		'<ITEM_ID>002</ITEM_ID>',
 		'<PRODUCTNAME>Product DEF</PRODUCTNAME>',

diff --git a/tests/FeedGenerator/Feeds/GoogleMerchant/GoogleMerchant.phpt b/tests/FeedGenerator/Feeds/GoogleMerchant/GoogleMerchant.phpt
@@ -33,6 +33,7 @@ test(function () {
 		->setShipping(10, 'USD')
 		->setShippingLabel('Only FedEx');
 
+	$itemsGroup->addItem($groupItem);
 	$itemsGroup->addItem($groupItem);
 	$feed->setItems([$itemsGroup, NULL]);
 	$feed->generate($output);
@@ -66,6 +67,24 @@ test(function () {
 		'<g:shipping_label>Only FedEx</g:shipping_label>',
 		'<g:identifier_exists>no</g:identifier_exists>',
 		'</entry>',
+		'<entry>',
+		'<g:id>001</g:id>',
+		'<g:title>Product ABC</g:title>',
+		'<g:description>Lorem ipsum dolor sit amet</g:description>',
+		'<g:link>http://www.example.com/product-abc/</g:link>',
+		'<g:image_link>http://www.example.com/images/product-abc.jpg</g:image_link>',
+		'<g:availability>in stock</g:availability>',
+		'<g:price>5.00 USD</g:price>',
+		'<g:condition>new</g:condition>',
+		'<g:adult>no</g:adult>',
+		'<g:color>red</g:color>',
+		'<g:gender>male</g:gender>',
+		'<g:size>XXL</g:size>',
+		'<g:item_group_id>AB12345</g:item_group_id>',
+		'<g:shipping>10.00 USD</g:shipping>',
+		'<g:shipping_label>Only FedEx</g:shipping_label>',
+		'<g:identifier_exists>no</g:identifier_exists>',
+		'</entry>',
 		'</feed>',
 		'',
 	]), $output->getOutput());

diff --git a/tests/FeedGenerator/Feeds/Heureka/Heureka.phpt b/tests/FeedGenerator/Feeds/Heureka/Heureka.phpt
@@ -31,6 +31,7 @@ test(function () {
 		->addParameter('size', 'XXL')
 		->addParameter('weight', 10, 'kg');
 
+	$itemsGroup->addItem($groupItem);
 	$itemsGroup->addItem($groupItem);
 	$items[] = $itemsGroup;
 	$items[] = NULL;
@@ -77,6 +78,31 @@ test(function () {
 		'</PARAM>',
 		'</SHOPITEM>',
 
+		'<SHOPITEM>',
+		'<ITEM_ID>001</ITEM_ID>',
+		'<EAN>6417182041488</EAN>',
+		'<PRODUCTNAME>Product ABC</PRODUCTNAME>',
+		'<DESCRIPTION>Lorem ipsum dolor sit amet</DESCRIPTION>',
+		'<CATEGORYTEXT>Electronics | TVs</CATEGORYTEXT>',
+		'<URL>http://www.example.com/product-abc/</URL>',
+		'<IMGURL>http://www.example.com/images/product-abc.jpg</IMGURL>',
+		'<PRICE_VAT>5.00</PRICE_VAT>',
+		'<DELIVERY_DATE>0</DELIVERY_DATE>',
+		'<ITEMGROUP_ID>AB12345</ITEMGROUP_ID>',
+		'<PARAM>',
+		'<PARAM_NAME>color</PARAM_NAME>',
+		'<VAL>red</VAL>',
+		'</PARAM>',
+		'<PARAM>',
+		'<PARAM_NAME>size</PARAM_NAME>',
+		'<VAL>XXL</VAL>',
+		'</PARAM>',
+		'<PARAM>',
+		'<PARAM_NAME>weight</PARAM_NAME>',
+		'<VAL>10kg</VAL>',
+		'</PARAM>',
+		'</SHOPITEM>',
+
 		'<SHOPITEM>',
 		'<ITEM_ID>002</ITEM_ID>',
 		'<PRODUCTNAME>Product DEF</PRODUCTNAME>',

diff --git a/tests/FeedGenerator/Feeds/PostFeed/PostFeed.phpt b/tests/FeedGenerator/Feeds/PostFeed/PostFeed.phpt
@@ -28,6 +28,7 @@ test(function () {
 
 	$groupItem = new PostFeedItem(1, 'Title', new DateTime('2016-02-06 18:00:00+0200', new DateTimeZone('UTC')));
 
+	$itemsGroup->addItem($groupItem);
 	$itemsGroup->addItem($groupItem);
 	$items[] = $itemsGroup;
 	$items[] = NULL;
@@ -52,6 +53,11 @@ test(function () {
 			'title' => 'Title',
 			'date' => '2016-02-06 16:00:00',
 		]) . ',',
+		Json::encode([
+			'id' => 1,
+			'title' => 'Title',
+			'date' => '2016-02-06 16:00:00',
+		]) . ',',
 		Json::encode([
 			'id' => 'item2',
 			'title' => 'Title 2',

diff --git a/tests/FeedGenerator/Feeds/Zbozi/Zbozi.phpt b/tests/FeedGenerator/Feeds/Zbozi/Zbozi.phpt
@@ -29,6 +29,7 @@ test(function () {
 		->addParameter('size', 'XXL')
 		->addParameter('weight', 10, 'kg');
 
+	$itemsGroup->addItem($groupItem);
 	$itemsGroup->addItem($groupItem);
 	$items[] = $itemsGroup;
 	$items[] = NULL;
@@ -74,6 +75,30 @@ test(function () {
 		'</PARAM>',
 		'</SHOPITEM>',
 
+		'<SHOPITEM>',
+		'<ITEM_ID>001</ITEM_ID>',
+		'<PRODUCTNAME>Product ABC</PRODUCTNAME>',
+		'<DESCRIPTION>Lorem ipsum dolor sit amet</DESCRIPTION>',
+		'<URL>http://www.example.com/product-abc/</URL>',
+		'<IMGURL>http://www.example.com/images/product-abc.jpg</IMGURL>',
+		'<PRICE_VAT>5.00</PRICE_VAT>',
+		'<DELIVERY_DATE>0</DELIVERY_DATE>',
+		'<ITEMGROUP_ID>AB12345</ITEMGROUP_ID>',
+		'<PARAM>',
+		'<PARAM_NAME>color</PARAM_NAME>',
+		'<VAL>red</VAL>',
+		'</PARAM>',
+		'<PARAM>',
+		'<PARAM_NAME>size</PARAM_NAME>',
+		'<VAL>XXL</VAL>',
+		'</PARAM>',
+		'<PARAM>',
+		'<PARAM_NAME>weight</PARAM_NAME>',
+		'<VAL>10</VAL>',
+		'<UNIT>kg</UNIT>',
+		'</PARAM>',
+		'</SHOPITEM>',
+
 		'<SHOPITEM>',
 		'<ITEM_ID>002</ITEM_ID>',
 		'<PRODUCTNAME>Product DEF</PRODUCTNAME>',