Browse Source

Merge branch 'develop'

master
Guillaume 4 years ago
parent
commit
7f416244e3
4 changed files with 9 additions and 2 deletions
  1. +1
    -0
      ShopBundle/Controller/Backend/OrderController.php
  2. +2
    -0
      ShopBundle/Resources/views/backend/default/list-fields/field_options_translatable.html.twig
  3. +0
    -2
      ShopBundle/Resources/views/backend/default/list-fields/field_ticket_type.html.twig
  4. +6
    -0
      ShopBundle/Resources/views/backend/order/list-fields/order-payment.html.twig

+ 1
- 0
ShopBundle/Controller/Backend/OrderController.php View File

protected function getOrderShopEntity() protected function getOrderShopEntity()
{ {
$easyadmin = $this->request->attributes->get('easyadmin'); $easyadmin = $this->request->attributes->get('easyadmin');
$this->orderUtils->initOrderShop($easyadmin['item']);
return $easyadmin['item']; return $easyadmin['item'];
} }



+ 2
- 0
ShopBundle/Resources/views/backend/default/list-fields/field_options_translatable.html.twig View File

{% set trans_value = 'field.'~entity_config.name~'.'~field_options.fieldName~'Options.'~value %}
{{ trans_value|trans({}, 'lcshop') }}

+ 0
- 2
ShopBundle/Resources/views/backend/default/list-fields/field_ticket_type.html.twig View File

{% set trans_value = 'field.Ticket.typeOptions.'~value %}
{{ trans_value|trans({}, 'lcshop') }}

+ 6
- 0
ShopBundle/Resources/views/backend/order/list-fields/order-payment.html.twig View File

{% for val in value %}
<span class="badge badge-success">
{% set trad = 'field.default.meanPaymentOptions.'~val.meanPayment %}
{{ trad|trans({}, 'lcshop') }}
</span>
{% endfor %}

Loading…
Cancel
Save