Merge pull request #12 from doofinder/debugging-variations

Bugfix group by including all products with no variations
doofinder · Aug 17, 2016 · 78d4f79 · 78d4f79
2 parents eae0eb9 + 48a2658
commit 78d4f79
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/dfTools.class.php b/dfTools.class.php
@@ -33,7 +33,6 @@
 define('CATEGORY_SEPARATOR', '%%');
 define('CATEGORY_TREE_SEPARATOR', '>');
 define('TXT_SEPARATOR', '|');
-
 class dfTools
 {
   // http://stackoverflow.com/questions/4224141/php-removing-invalid-utf-8-characters-in-xml-using-filter
@@ -471,7 +470,7 @@ 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_product_attribute pa 
+        LEFT OUTER JOIN _DB_PREFIX_product_attribute pa 
           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)
@@ -480,7 +479,7 @@ public static function getAvailableProductsForLanguage($id_lang, $id_shop, $limi
       WHERE
         __IS_ACTIVE__
         __VISIBILITY__
-      GROUP BY pa.id_product_attribute
+      GROUP BY pa.id_product_attribute, p.id_product
       ORDER BY
         p.id_product
     ";
@@ -519,6 +518,7 @@ public static function getAvailableProductsForLanguage($id_lang, $id_shop, $limi
                                         '__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.6";
+  const VERSION = "2.1.7";
 
   const YES = 1;
   const NO = 0;

diff --git a/feed.php b/feed.php
@@ -163,7 +163,7 @@ function slugify($text)
   if(intval($row['id_product']) > 0){
     // ID, TITLE, LINK
 
-    if($cfg_product_variations && isset($row['id_product_attribute']) and intval($row['id_product_attribute']) > 0){
+    if($cfg_product_variations && isset($row['id_product_attribute']) && intval($row['id_product_attribute']) > 0){
       // ID
       echo "VAR-".$row['id_product_attribute'].TXT_SEPARATOR;
       // TITLE

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