Merge branch 'develop'

ShopBundle/Resources/views/backend/order/macros.html.twig

@@ -282,17 +282,45 @@
         {% block class %}bg-danger{% endblock %}
         {% block icon %}euro-sign{% endblock %}
         {% block infoBox %}
-            Total produits après réduc TTC :
-            <strong class="float-right"> ${order.totalOrderProductsWithTaxAndReductions} €</strong><br/>
-
-            Total marge produits :
-            <strong class="float-right">${order.totalMargin} € / ${order.totalMarginPercent} %</strong><br/>
-
-            Frais de livraisons TTC :
-            <strong class="float-right">${order.deliveryPriceWithTaxAndReduction} €</strong><br/>
-
-            Total commandes  :
-            <strong class="float-right"> ${order.totalWithTax} €</strong><br/>
+            <table style="width: 100%">
+                <tr>
+                    <td>
+                        Total produits TTC :<i class="icon info" data-toggle="tooltip" title="Après reduction"></i>
+                    </td>
+                    <td>
+                        <strong class="float-right"> ${order.totalOrderProductsWithTaxAndReductions} €</strong><br/>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        Total marge produits :
+                    </td>
+                    <td>
+                        <strong class="float-right">${order.totalMargin} € / ${order.totalMarginPercent} %</strong><br/>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        Frais de livraisons TTC :
+                    </td>
+                    <td>
+                        <strong class="float-right">${order.deliveryPriceWithTaxAndReduction} €</strong><br/>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        Total commandes  :
+                    </td>
+                    <td>
+                        <strong class="float-right"> ${order.totalWithTax} €</strong><br/>
+                    </td>
+                </tr>
+
+
+            </table>
 
         {% endblock %}
     {% endembed %}