Merge branch 'develop'

ShopBundle/Controller/Backend/OrderController.php

@@ -586,6 +586,7 @@ class OrderController extends AdminController
         protected function getOrderShopEntity()
         {
                 $easyadmin = $this->request->attributes->get('easyadmin');
+                $this->orderUtils->initOrderShop($easyadmin['item']);
                 return $easyadmin['item'];
         }
 

ShopBundle/Resources/views/backend/default/list-fields/field_options_translatable.html.twig

@@ -0,0 +1,2 @@
+{% set trans_value = 'field.'~entity_config.name~'.'~field_options.fieldName~'Options.'~value  %}
+{{ trans_value|trans({}, 'lcshop') }}

ShopBundle/Resources/views/backend/default/list-fields/field_ticket_type.html.twig

@@ -1,2 +0,0 @@
-{% set trans_value = 'field.Ticket.typeOptions.'~value  %}
-{{ trans_value|trans({}, 'lcshop') }}

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

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