Merge changes from SS 3.0

i-lateral · Nov 9, 2018 · 4006240 · 4006240
2 parents 14b421c + 0c238ef
commit 4006240
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/_config/shoppingfeed.yml b/_config/shoppingfeed.yml
@@ -13,5 +13,4 @@ After: '#catalogueconfig'
 ---
 SilverCommerce\CatalogueAdmin\Model\CatalogueProduct:
   extensions:
-    - ilateral\SilverStripe\GoogleShoppingFeed\Extensions\Extension
-
+- ilateral\SilverStripe\GoogleShoppingFeed\Extensions\Extension
diff --git a/templates/ilateral/SilverStripe/GoogleShoppingFeed/Control/GoogleShoppingFeedController.ss b/templates/ilateral/SilverStripe/GoogleShoppingFeed/Control/GoogleShoppingFeedController.ss
@@ -7,9 +7,12 @@
 
         <% loop $Items %> 
 			<item>
-				<g:id><% if $StockID %>$StockID<% else %>$ID<% end_if %></g:id>
+				<title>$Title</title>
 				<g:title>$Title</g:title>
+				<description>$Content.Summary</description>
 				<g:description>$Content.Summary</g:description>
+				<g:id><% if $StockID %>$StockID<% else %>$ID<% end_if %></g:id>
+				<link>$AbsoluteLink</link>
 				<g:link>$AbsoluteLink</g:link>
 				<% if $PrimaryImage.exists %><g:image_link>{$PrimaryImage.AbsoluteLink}</g:image_link><% end_if %>
 				<% if $AdditionalImage.exists %><g:additional_image_link>{$AdditionalImage.AbsoluteLink}</g:additional_image_link><% end_if %>