Merge pull request #10 from doofinder/feed-rf

New package.
doofinder · Aug 11, 2016 · eae0eb9 · eae0eb9
2 parents d0de74d + ef7a87a
commit eae0eb9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/dfTools.class.php b/dfTools.class.php
@@ -401,7 +401,7 @@ public static function getAvailableProductsForLanguage($id_lang, $id_shop, $limi
         pl.meta_title,
         pl.meta_keywords,
         pl.meta_description,
-
+        GROUP_CONCAT(tag.name SEPARATOR '/') AS tags,
         pl.link_rewrite,
         cl.link_rewrite AS cat_link_rew,
 
@@ -420,9 +420,14 @@ public static function getAvailableProductsForLanguage($id_lang, $id_shop, $limi
           ON (p.id_category_default = cl.id_category AND cl.id_shop = _ID_SHOP_ AND cl.id_lang = _ID_LANG_)
         LEFT JOIN (_DB_PREFIX_image im INNER JOIN _DB_PREFIX_image_shop ims ON im.id_image = ims.id_image)
           ON (p.id_product = im.id_product AND ims.id_shop = _ID_SHOP_ AND _IMS_COVER_)
+        LEFT JOIN (_DB_PREFIX_tag tag INNER JOIN _DB_PREFIX_product_tag pt ON tag.id_tag = pt.id_tag AND tag.id_lang = _ID_LANG_)
+          ON (pt.id_product = p.id_product)
+
       WHERE
         __IS_ACTIVE__
         __VISIBILITY__
+      GROUP BY
+        p.id_product
       ORDER BY
         p.id_product
     ";
@@ -447,7 +452,7 @@ public static function getAvailableProductsForLanguage($id_lang, $id_shop, $limi
         pl.meta_title,
         pl.meta_keywords,
         pl.meta_description,
-
+        GROUP_CONCAT(tag.name SEPARATOR '/') AS tags,
         pl.link_rewrite,
         cl.link_rewrite AS cat_link_rew,
 
@@ -470,6 +475,8 @@ public static function getAvailableProductsForLanguage($id_lang, $id_shop, $limi
           ON (p.id_product = pa.id_product)
         LEFT JOIN _DB_PREFIX_product_attribute_image pa_im 
           ON (pa_im.id_product_attribute = pa.id_product_attribute)
+        LEFT JOIN (_DB_PREFIX_tag tag INNER JOIN _DB_PREFIX_product_tag pt ON tag.id_tag = pt.id_tag AND tag.id_lang = _ID_LANG_)
+          ON (pt.id_product = p.id_product)  
       WHERE
         __IS_ACTIVE__
         __VISIBILITY__
@@ -511,6 +518,7 @@ public static function getAvailableProductsForLanguage($id_lang, $id_shop, $limi
                                         '__ID_CATEGORY_DEFAULT__' => $id_category_default,
                                         '__IS_ACTIVE__' => $is_active,
                                         '__VISIBILITY__' => $visibility));
+
 
     return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
   }

diff --git a/dist/doofinder-p1.5-latest.zip b/dist/doofinder-p1.5-latest.zip
diff --git a/doofinder.php b/doofinder.php
@@ -43,7 +43,7 @@ class Doofinder extends Module
 
   const GS_SHORT_DESCRIPTION = 1;
   const GS_LONG_DESCRIPTION = 2;
-  const VERSION = "2.1.5";
+  const VERSION = "2.1.6";
 
   const YES = 1;
   const NO = 0;

diff --git a/feed.php b/feed.php
@@ -118,7 +118,7 @@ function slugify($text)
 $header = array('id', 'title', 'link', 'description', 'alternate_description',
                 'meta_keywords', 'meta_title', 'meta_description', 'image_link',
                 'categories', 'availability', 'brand', 'mpn',
-                'extra_title_1', 'extra_title_2');
+                'extra_title_1', 'extra_title_2', 'tags');
 
 
 if ($cfg_display_prices)
@@ -279,7 +279,10 @@ function slugify($text)
     echo dfTools::cleanReferences($product_title).TXT_SEPARATOR;
 
     // EXTRA_TITLE_2
-    echo dfTools::splitReferences($product_title);
+    echo dfTools::splitReferences($product_title).TXT_SEPARATOR;
+
+    // TAGS
+    echo $row['tags'];
 
     // PRODUCT PRICE & ON SALE PRICE
     if ($cfg_display_prices && !$cfg_product_variations)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doofinder-for-prestashop",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.5.0",