From d37ada4d0635de0b4cee4410d363d92a85a44b97 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Fri, 18 Aug 2017 16:13:22 +0400 Subject: [PATCH] refactored order_box and order_item --- templates/web/prod/orders/order_box.html.twig | 3 +- .../web/prod/orders/order_item.html.twig | 1347 +++++++++-------- 2 files changed, 691 insertions(+), 659 deletions(-) diff --git a/templates/web/prod/orders/order_box.html.twig b/templates/web/prod/orders/order_box.html.twig index f10a755750..dcf1b69afc 100644 --- a/templates/web/prod/orders/order_box.html.twig +++ b/templates/web/prod/orders/order_box.html.twig @@ -214,6 +214,7 @@ dateSelection: '{{ start }}', dateSelectionText: '', date: '{{ date }}', - tabSelection: '{{ todo }}' + tabSelection: '{{ todo }}', + noFilterText: '{{ 'order-manager::order-list: no-filter' | trans }}' } diff --git a/templates/web/prod/orders/order_item.html.twig b/templates/web/prod/orders/order_item.html.twig index f68e054cf5..1aa2eac7c0 100644 --- a/templates/web/prod/orders/order_item.html.twig +++ b/templates/web/prod/orders/order_item.html.twig @@ -63,10 +63,6 @@ {{ 'order-manager::order-item: tel' | trans }} {{ order.getUser().getPhone() }} {{ 'order-manager::order-item: address' | trans }} {{ order.getUser().getAddress() }} {{ 'order-manager::order-item: country' | trans }} {{ order.getUser().getCountry() }} - {#
#} - {##} - {#
#} @@ -91,8 +87,7 @@
{{ displayName }} ({{ order.getUser().getEmail() }}) + style="font-size: 12px;color: #4990E2;" href="#" id="email-btn">{{ order.getUser().getEmail() }}) @@ -112,7 +107,7 @@
- {{ 'order-manager::order-item: select-all' |trans }} + {{ 'order-manager::order-item: select-all' |trans }}
@@ -221,683 +216,719 @@
\ No newline at end of file