Merge branch 'develop'

ShopBundle/Repository/ProductFamilyRepository.php

@@ -75,6 +75,7 @@ class ProductFamilyRepository extends BaseRepository implements DefaultRepositor
                 $query->andWhere('e.status = 1');
                 $query->andWhere(':now <= e.propertyNoveltyExpirationDate')
                         ->setParameter('now', new \DateTime()) ;
+                $query->orderBy('e.createdAt', 'DESC');
 
                 return $query->getQuery()->getResult() ;
         }

ShopBundle/Resources/views/backend/merchant/panel_general.html.twig

@@ -12,12 +12,16 @@
         <div class="col-12">
             {{ form_row(form.merchantConfigs['second-line-element-menu']) }}
         </div>
-        <div class="col-12">
-            {{ form_row(form.merchantConfigs['message-global-alert-type']) }}
-        </div>
-        <div class="col-12">
-            {{ form_row(form.merchantConfigs['message-global-alert']) }}
-        </div>
+        {% if form.merchantConfigs['message-global-alert-type'] is defined %}
+            <div class="col-12">
+                {{ form_row(form.merchantConfigs['message-global-alert-type']) }}
+            </div>
+        {% endif %}
+        {% if form.merchantConfigs['message-global-alert'] is defined %}
+            <div class="col-12">
+                {{ form_row(form.merchantConfigs['message-global-alert']) }}
+            </div>
+        {% endif %}
         {{ macros.card_end() }}
     </div>
 </div>