From 7d2bc25c9567994d9be8cc40c14aecdbeadb0172 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Tue, 19 Feb 2019 17:55:19 +0100
Subject: [PATCH 1/2] #1142 order.line total

---
 e2e/helpers/selectors.js            |  2 +-
 modules/order/front/line/index.html | 17 ++++++-----------
 modules/order/front/line/style.scss | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 77ecc3867..38cc5a2e7 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -489,7 +489,7 @@ export default {
         saveButton: `${components.vnSubmit}`
     },
     orderLine: {
-        orderSubtotal: 'vn-order-line > vn-vertical > vn-card > div > vn-vertical > vn-horizontal > div > span',
+        orderSubtotal: 'vn-order-line vn-horizontal.header p:nth-child(1)',
         firstLineDeleteButton: 'vn-order-line vn-tbody > vn-tr:nth-child(1) vn-icon[icon="delete"]',
         confirmOrder: 'vn-order-line > vn-vertical > vn-button-bar > vn-button > button',
         confirmButton: 'vn-order-line > vn-confirm button[response="ACCEPT"]',
diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html
index c59154e45..d8b27efe3 100644
--- a/modules/order/front/line/index.html
+++ b/modules/order/front/line/index.html
@@ -5,17 +5,12 @@
 <vn-vertical>
     <vn-card pad-large>
         <vn-vertical>
-            <vn-horizontal>
-                <div class="totalBox">
-                    <vn-label translate>Subtotal</vn-label> 
-                    <span>{{$ctrl.subtotal | currency: 'EUR':2}}</span>
-                    <p>
-                        <vn-label translate>VAT</vn-label> 
-                        <span>{{$ctrl.VAT | currency: 'EUR':2}}</span>
-                    </p>
-                    <vn-label><strong>Total</strong></vn-label> 
-                    <strong>{{$ctrl.order.total | currency: 'EUR':2}}</strong>
-                </div>
+            <vn-horizontal class="header">
+                <vn-one class="taxes" ng-if="$ctrl.rows.length > 0">
+                    <p><vn-label translate>Subtotal</vn-label> {{$ctrl.subtotal | currency: 'EUR':2}}</p>
+                    <p><vn-label translate>VAT</vn-label> {{$ctrl.VAT | currency: 'EUR':2}}</p>
+                    <p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.order.total | currency: 'EUR':2}}</strong></p>
+                </vn-one>
             </vn-horizontal>
             <vn-table>
                 <vn-thead>
diff --git a/modules/order/front/line/style.scss b/modules/order/front/line/style.scss
index 31a13d592..6f06532e0 100644
--- a/modules/order/front/line/style.scss
+++ b/modules/order/front/line/style.scss
@@ -6,4 +6,20 @@ vn-order-line{
             height: 50px;
         }
     }
+    .taxes {
+        max-width: 10em;
+        border: .1em solid #CCC;
+        text-align: right;
+        padding: .5em !important;
+
+
+        & > p {
+            font-size: 1.2em;
+            margin: .2em;
+        }
+    }
+    vn-horizontal.header {
+        justify-content: flex-end;
+        margin-bottom: 0.5em;
+    }
 }
\ No newline at end of file

From 0a457602516563eec03360ddbf6177cb2a935c96 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 20 Feb 2019 07:30:40 +0100
Subject: [PATCH 2/2] removed duplicated empty-rows

---
 front/core/components/log/index.html                | 3 ---
 modules/claim/front/index/index.html                | 6 ------
 modules/client/front/credit/index/index.html        | 3 ---
 modules/client/front/mandate/index.html             | 3 ---
 modules/client/front/recovery/index/index.html      | 3 ---
 modules/order/front/index/index.html                | 3 ---
 modules/ticket/front/descriptor/addStowaway.html    | 3 ---
 modules/ticket/front/descriptor/removeStowaway.html | 3 ---
 modules/ticket/front/sale/index.html                | 3 ---
 modules/travel/front/index/index.html               | 3 ---
 10 files changed, 33 deletions(-)

diff --git a/front/core/components/log/index.html b/front/core/components/log/index.html
index eb065c6cb..8211a8e08 100644
--- a/front/core/components/log/index.html
+++ b/front/core/components/log/index.html
@@ -77,9 +77,6 @@
                         </vn-td>
                     </vn-tr>
                 </vn-tbody>
-                <vn-empty-rows ng-if="$ctrl.model.data.length === 0" translate>
-                    No results
-                </vn-empty-rows>
             </vn-table>
         </vn-vertical>
         <vn-pagination model="$ctrl.model"></vn-pagination>
diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html
index f6d27dffb..67aedec4b 100644
--- a/modules/claim/front/index/index.html
+++ b/modules/claim/front/index/index.html
@@ -63,12 +63,6 @@
                     </vn-td>
                 </a>
             </vn-tbody>
-            <vn-empty-rows ng-if="model.data.length === 0" translate>
-                No results
-            </vn-empty-rows>
-            <vn-empty-rows ng-if="model.data === null" translate>
-                Enter a new search
-            </vn-empty-rows>
         </vn-table>
     </vn-card>
     <vn-pagination model="model"></vn-pagination>
diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html
index a68e31d2f..3a9244f86 100644
--- a/modules/client/front/credit/index/index.html
+++ b/modules/client/front/credit/index/index.html
@@ -24,9 +24,6 @@
                         <vn-td>{{::credit.worker.user.nickname}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
-                <vn-empty-rows ng-if="model.data.length === 0" translate>
-                    No results
-                </vn-empty-rows>
             </vn-table>
         </vn-vertical>
         <vn-pagination model="model"></vn-pagination>
diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html
index 69beeaa02..4b290d205 100644
--- a/modules/client/front/mandate/index.html
+++ b/modules/client/front/mandate/index.html
@@ -28,9 +28,6 @@
                         <vn-td>{{::mandate.finished | date:'dd/MM/yyyy HH:mm' || '-'}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
-                <vn-empty-rows ng-if="model.data.length === 0" translate>
-                    No results
-                </vn-empty-rows>
             </vn-table>
         </vn-vertical>
         <vn-pagination model="model"></vn-pagination>
diff --git a/modules/client/front/recovery/index/index.html b/modules/client/front/recovery/index/index.html
index b130d73c2..1e8009429 100644
--- a/modules/client/front/recovery/index/index.html
+++ b/modules/client/front/recovery/index/index.html
@@ -36,9 +36,6 @@
                         <vn-td>{{::recovery.period}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
-                <vn-empty-rows ng-if="model.data.length === 0" translate>
-                    No results
-                </vn-empty-rows>
             </vn-table>          
         </vn-vertical>
         <vn-pagination model="model"></vn-pagination>
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index b136425ab..b2d934ce4 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -66,9 +66,6 @@
                     </vn-td>
                 </vn-tr>
             </vn-tbody>
-            <vn-empty-rows ng-if="model.data === null" translate>
-                Enter a new search
-            </vn-empty-rows>
         </vn-table>
     </vn-card>
     <vn-pagination model="model"></vn-pagination>
diff --git a/modules/ticket/front/descriptor/addStowaway.html b/modules/ticket/front/descriptor/addStowaway.html
index 64bb65554..349ae137e 100644
--- a/modules/ticket/front/descriptor/addStowaway.html
+++ b/modules/ticket/front/descriptor/addStowaway.html
@@ -26,9 +26,6 @@
                         <vn-td number>{{ticket.state.state.name}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
-                <vn-empty-rows ng-if="$ctrl.possibleStowaways.length === 0" translate>
-                    No results
-                </vn-empty-rows>
             </vn-table>
         </vn-horizontal>
     </tpl-body>
diff --git a/modules/ticket/front/descriptor/removeStowaway.html b/modules/ticket/front/descriptor/removeStowaway.html
index 7653d25b7..515d6b2cc 100644
--- a/modules/ticket/front/descriptor/removeStowaway.html
+++ b/modules/ticket/front/descriptor/removeStowaway.html
@@ -25,9 +25,6 @@
                         <vn-td number>{{stowaway.ticket.state.state.name}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
-                <vn-empty-rows ng-if="$ctrl.ticketStowaways.length === 0" translate>
-                    No results
-                </vn-empty-rows>
             </vn-table>
         </vn-horizontal>
     </tpl-body>
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 427ea1958..62dc10294 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -144,9 +144,6 @@
                         </vn-td>
                     </vn-tr>
                 </vn-tbody>
-                <vn-empty-rows ng-if="$ctrl.sales.length === 0" translate>
-                    No results
-                </vn-empty-rows>
             </vn-table>
         </vn-vertical>
     </vn-card>
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 21750fa8b..744b0680d 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -47,9 +47,6 @@
                     <vn-td></vn-td>
                 </vn-tr>
             </vn-tbody>
-            <vn-empty-rows ng-if="!model.data || model.data.length === 0" translate>
-                Enter a new search
-            </vn-empty-rows>
         </vn-table>
     </vn-card>
     <vn-pagination model="model"></vn-pagination>