Add features on extends fields

Author: zawaze

Config/module.xml

@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <authors>
         <author>
             <name>Bertrand TOURLONIAS</name>

Service/Provider/ProductProvider.php

@@ -15,6 +15,8 @@
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\Map\AttributeAvI18nTableMap;
 use Thelia\Model\Map\AttributeI18nTableMap;
+use Thelia\Model\Map\FeatureAvI18nTableMap;
+use Thelia\Model\Map\FeatureI18nTableMap;
 use Thelia\Model\TaxRuleQuery;
 use Thelia\TaxEngine\Calculator;
 use Thelia\Tools\MoneyFormat;
@@ -78,13 +80,14 @@ public function getDataGenerator(GoogleshoppingxmlFeed $feed, MoneyFormat $money
             $extraStaticFields = $this->getExtraStaticFields();
 
             $extraAttributeFields = $this->getExtraAttributeFields($row['id'], $locale);
+            $extraFeatureFields = $this->getExtraFeatureFields($row['id'], $locale);
 
             yield (new GoogleProductModel(
                 $taxCalculator,
                 $moneyFormat,
                 $shipping,
                 $feed->getCurrency(),
-                array_merge($extraStaticFields, $extraAttributeFields),
+                array_merge($extraStaticFields, $extraAttributeFields, $extraFeatureFields),
                 'g:')
             )->build($row);
         }
@@ -101,26 +104,50 @@ private function getExtraStaticFields()
             ->toArray();
     }
 
-    private function getExtraAttributeFields(int $pseId, string $locale ='en_US')
+    private function getExtraAttributeFields(int $pseId, string $locale = 'en_US')
     {
         return GoogleshoppingxmlGoogleFieldAssociationQuery::create()
             ->select(['value', 'google_field'])
             ->addAsColumn('value', AttributeAvI18nTableMap::COL_TITLE)
             ->addAsColumn('google_field', GoogleshoppingxmlGoogleFieldAssociationTableMap::COL_GOOGLE_FIELD)
             ->useAttributeQuery()
-                ->useAttributeCombinationQuery()
-                    ->useAttributeAvQuery()
-                        ->useAttributeAvI18nQuery()
+            ->useAttributeCombinationQuery()
+            ->useAttributeAvQuery()
+            ->useAttributeAvI18nQuery()
+            ->filterByLocale($locale)
+            ->endUse()
+            ->endUse()
+            ->useProductSaleElementsQuery()
+            ->filterById($pseId)
+            ->endUse()
+            ->endUse()
+            ->endUse()
+            ->find()
+            ->toArray();
+    }
+
+    private function getExtraFeatureFields(int $pseId, string $locale = 'en_US')
+    {
+        return GoogleshoppingxmlGoogleFieldAssociationQuery::create()
+            ->select(['value', 'google_field'])
+            ->addAsColumn('value', FeatureAvI18nTableMap::COL_TITLE)
+            ->addAsColumn('google_field', GoogleshoppingxmlGoogleFieldAssociationTableMap::COL_GOOGLE_FIELD)
+            ->useFeatureQuery()
+                ->useFeatureProductQuery()
+                    ->useFeatureAvQuery()
+                        ->useFeatureAvI18nQuery()
                             ->filterByLocale($locale)
                         ->endUse()
                     ->endUse()
-                    ->useProductSaleElementsQuery()
-                        ->filterById($pseId)
+                    ->useProductQuery()
+                        ->useProductSaleElementsQuery()
+                            ->filterById($pseId)
+                        ->endUse()
                     ->endUse()
                 ->endUse()
             ->endUse()
             ->find()
-        ->toArray();
+            ->toArray();
     }
 
     /**