Merge branch 'develop'

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -401,6 +401,7 @@ field:
         quantityProduct: Quantité (en rapport à l'unité)
         unit: Unité
     OrderShop:
+        hasReach: Étape atteinte
         deliveryTrucks: Véhicules de livraison
         createdAt: Date de création
         updatedAt: Date de modification

ShopBundle/Resources/views/backend/order/list-fields/field_hasreach.html.twig

@@ -0,0 +1,18 @@
+{% if value == 1 %}
+    <span class="badge badge-info">
+        Adresse de livraison
+    </span>
+{% elseif value == 2 %}
+    <span class="badge badge-warning">
+        Adresse de facturation
+    </span>
+{% elseif value == 3 %}
+    <span class="badge badge-danger">
+        Page de confirmation
+    </span>
+{% else %}
+    <span class="badge badge-secondary">
+        Aucune
+    </span>
+{% endif %}
+

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

@@ -396,6 +396,29 @@
     {% endembed %}
 {% endmacro %}
 
+{% macro box_step_reach() %}
+    {% embed '@LcShop/backend/default/block/embed_box.twig' %}
+        {% import '@LcShop/backend/order/macros.html.twig' as order_macros %}
+        {% trans_default_domain 'lcshop' %}
+        {% block class %}bg-info{% endblock %}
+        {% block icon %}list-ol{% endblock %}
+        {% block label %}Étape atteinte{% endblock %}
+        {% block value %}
+            <div v-if="order.hasReach == 1">
+                Adresse de livraison
+            </div>
+            <div v-if="order.hasReach == 2">
+                Adresse de facturation
+            </div>
+            <div v-if="order.hasReach == 3">
+                Page de paiement
+            </div>
+            <div v-if="order.hasReach ==null">
+                Aucune
+            </div>
+        {% endblock %}
+    {% endembed %}
+{% endmacro %}
 
 
 {% macro box_payments() %}

ShopBundle/Resources/views/backend/order/show-cart.html.twig

@@ -32,7 +32,9 @@
                     {{ order_macros.box_delivery_slot() }}
                 </div>
             </template>
-
+            <div class="col-3">
+                {{ order_macros.box_step_reach() }}
+            </div>
 
             <div class="col-12">
                 {{ macros.card_start('OrderShop.resume') }}