Browse Source

[Global] Bug retour system pay

feature/tableau_edition_avancee
Fab 4 years ago
parent
commit
29b3f9a2e9
5 changed files with 44 additions and 0 deletions
  1. +3
    -0
      ShopBundle/Resources/translations/lcshop.fr.yaml
  2. +37
    -0
      ShopBundle/Resources/views/backend/order/form/modal_orderstatushistories.html.twig
  3. +1
    -0
      ShopBundle/Resources/views/backend/order/macros.html.twig
  4. +1
    -0
      ShopBundle/Resources/views/backend/order/show-cart.html.twig
  5. +2
    -0
      ShopBundle/Resources/views/backend/order/show.html.twig

+ 3
- 0
ShopBundle/Resources/translations/lcshop.fr.yaml View File

@@ -67,6 +67,7 @@ group:
deliveryAddress: Adresse de livraison
complementary: Commandes complémentaires
tickets: Tickets relatif à la commande
orderStatusHistories: Historique de changement de statut
Ticket:
listMessages: Liste des messages
list: Tickets ouverts
@@ -499,6 +500,8 @@ action:
form.empty_value: Aucun(e)
add: Ajouter
valid: Valider
close: Fermer
history: Historique
product:
editStock: Gérer les stocks
editProductFamily: Éditer le produit

+ 37
- 0
ShopBundle/Resources/views/backend/order/form/modal_orderstatushistories.html.twig View File

@@ -0,0 +1,37 @@
{% embed "@LcShop/backend/default/block/embed_modal.twig" %}
{% trans_default_domain 'lcshop' %}
{% block size %}modal-lg{% endblock %}
{% block id %}modal-order-status-histories{% endblock %}
{% block title %}{{ "group.OrderShop.orderStatusHistories"|trans }}{% endblock %}

{% block content %}
<div class="col">
<table class="table table-bordered">
<thead>
<th>Id</th>
<th>Date</th>
<th>Statut</th>
<th>Utilisateur</th>
<th>Origin</th>
</thead>
<tbody>
<template v-for="(orderStatusHistory, i) in order.orderStatusHistories">
<tr>
<td>${orderStatusHistory.id}</td>
<td>${orderStatusHistory.createdAt}</td>
<td>${orderStatusHistory.orderStatus}</td>
<td>${orderStatusHistory.createdBy}</td>
<td>${orderStatusHistory.origin}</td>
</tr>
</template>
</tbody>
</table>
</div>
{% endblock %}

{% block footer %}
<button type="button" class="btn btn-default float-right"
data-dismiss="modal">{{ 'action.close'|trans }}</button>
{% endblock %}

{% endembed %}

+ 1
- 0
ShopBundle/Resources/views/backend/order/macros.html.twig View File

@@ -602,6 +602,7 @@
<strong> ${order.orderStatus}</strong>
{% endblock %}
{% block button %}
{{ order_macros.order_modal_button('#modal-order-status-histories', 'btn-secondary', 'action.history') }}
{{ order_macros.order_modal_button('#modal-order-status') }}
{% endblock %}
{% endembed %}

+ 1
- 0
ShopBundle/Resources/views/backend/order/show-cart.html.twig View File

@@ -90,6 +90,7 @@
{% include '@LcShop/backend/order/form/modal_sendpaymentlink.html.twig' %}
{% endif %}

{% include '@LcShop/backend/order/form/modal_orderstatushistories.html.twig' %}
</div>
</div>
{% endblock %}

+ 2
- 0
ShopBundle/Resources/views/backend/order/show.html.twig View File

@@ -104,6 +104,8 @@
{% include '@LcShop/backend/order/form/modal_sendpaymentlink.html.twig' %}
{% endif %}

{% include '@LcShop/backend/order/form/modal_orderstatushistories.html.twig' %}

</div>
</div>
{% endblock %}

Loading…
Cancel
Save