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] #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