Merge branch 'develop'

Resources/views/admin/order/field/complementary.html.twig

@@ -1,4 +1,22 @@
-{% set value = entity.instance.complementaryOrderShops|length %}
+{% set order_shop = entity.instance %}
+{% set main_order_shop = entity.instance.mainOrderShop %}
+{% if main_order_shop is defined and main_order_shop is not null %}
+    {% if order_shop.getSection() != main_order_shop.getSection() or section_container.solver.isSectionWithdrawal(order_shop.getSection()) %}
+        <span class="badge badge-warning section-{{ main_order_shop.getSection().getDevAlias() }}">
+            Complément {{ main_order_shop.getSection() }}
+        </span>
+    {% else %}
+        <span class="badge badge-warning">Complément</span>
+    {% endif %}
+{% else %}
+    <span class="badge badge-secondary">Principale</span>
+    {% set complementary_order_shops = entity.instance.complementaryOrderShops %}
+    {% if complementary_order_shops and complementary_order_shops|length > 0 %}
+        <span class="badge badge-success section-{{ order_shop.getSection().getDevAlias() }}">{{ complementary_order_shops|length}} complément{% if complementary_order_shops|length > 1 %}s{% endif %}</span>
+    {% endif %}
+{% endif %}
+
+{# {% set value = entity.instance.complementaryOrderShops|length %}
 {% if value > 0  %}
     <span class="badge badge-success">
         {{ value|length }} compléments
@@ -8,3 +26,4 @@
         non
     </span>
 {% endif %}
+#}