Merge branch 'develop'

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

@@ -4,10 +4,14 @@
     <div class="col-8">
         {{ macros.card_start('Merchant.maintenance','light') }}
         <div class="col-12">
-            {{ form_row(form.merchantConfigs['maintenance']) }}
+            {% if form.merchantConfigs['maintenance'] is defined %}
+                {{ form_row(form.merchantConfigs['maintenance']) }}
+            {% endif %}
         </div>
         <div class="col-12">
-            {{ form_row(form.merchantConfigs['maintenanceIpAuthorized']) }}
+            {% if form.merchantConfigs['maintenanceIpAuthorized'] is defined %}
+                {{ form_row(form.merchantConfigs['maintenanceIpAuthorized']) }}
+            {% endif %}
         </div>
         {{ macros.card_end() }}
     </div>