Merge branch 'develop'

ShopBundle/Repository/ReductionCatalogRepository.php

@@ -45,7 +45,6 @@ class ReductionCatalogRepository extends BaseRepository implements DefaultReposi
 
         public function getReductionCatalogByProductFamilyConditions($productFamilyIds, $user)
         {
-                dump($user);
 
                 $query = $this->findByMerchantQuery();
                 $query->andWhere('e.status = 1');

ShopBundle/Twig/BridgeTwigExtension.php

@@ -31,7 +31,6 @@ class BridgeTwigExtension extends AbstractExtension
                         new TwigFunction('getUnitsList', [$this, 'getUnitsList']),
                         new TwigFunction('getTaxRatesList', [$this, 'getTaxRatesList']),
                         new TwigFunction('getElementByDevAlias', [$this, 'getElementByDevAlias']),
-                        new TwigFunction('get_form_newsletter', [$this, 'getFormNewsletter']),
                 );
         }