Merge branch '1.3' into 1.4

* 1.3: Quick fix for the scenario Added productTaxon to product list query to prevent an SQL error
Shasthojoy · Jan 31, 2019 · 3791ebc · 3791ebc
2 parents ebc9590 + a446c04
commit 3791ebc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/features/product/viewing_products/viewing_products_from_taxon_and_children.feature b/features/product/viewing_products/viewing_products_from_taxon_and_children.feature
@@ -23,9 +23,6 @@ Feature: Viewing products from taxon children
         And the store has a product "T-Shirt Watermelon" available in "Poland" channel
         And this product belongs to "T-Shirts"
         And this product belongs to "Men"
-        And the store has a product "T-Shirt Lemon" available in "Poland" channel
-        And this product belongs to "T-Shirts"
-        And this product belongs to "Men"
 
     @ui
     Scenario: Viewing products from taxon children
@@ -35,4 +32,3 @@ Feature: Viewing products from taxon children
         And I should see the product "T-Shirt Apple"
         And I should see the product "T-Shirt Pear"
         And I should see the product "T-Shirt Watermelon"
-        And I should see the product "T-Shirt Lemon"
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductRepository.php
@@ -73,6 +73,7 @@ public function createShopListQueryBuilder(
         $queryBuilder = $this->createQueryBuilder('o')
             ->distinct()
             ->addSelect('translation')
+            ->addSelect('productTaxon')
             ->innerJoin('o.translations', 'translation', 'WITH', 'translation.locale = :locale')
             ->innerJoin('o.productTaxons', 'productTaxon');