From d714c34f5934e073b762af5e11f196ef546c67bd Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Wed, 6 Feb 2019 11:42:22 +0100
Subject: [PATCH] #1049 ticket.sale

---
 modules/ticket/front/sale/index.html | 98 +++++++++++++---------------
 modules/ticket/front/sale/style.scss | 18 +++--
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 0d8f21e1f..bb66831f8 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -6,44 +6,51 @@
 <vn-vertical>
     <vn-card pad-large>
         <vn-vertical>
-            <vn-tool-bar margin-medium-bottom>
-                <vn-button 
-                    disabled="!$ctrl.isEditable" 
-                    label="Ok" 
-                    ng-click="$ctrl.onStateOkClick()"
-                    vn-tooltip="Change ticket state to 'Ok'">
-                </vn-button>
-                <vn-button-menu 
-                    disabled="!$ctrl.isEditable"
-                    label="State"
-                    url="/ticket/api/States/alertLevelIs0"
-                    on-change="$ctrl.onStateChange(value)">
-                </vn-button-menu>
-                <vn-button-menu
-                    ng-show="$ctrl.isChecked"
-                    vn-id="more-button"
-                    label="More"
-                    show-filter="false"
-                    value-field="callback"
-                    translate-fields="['name']"
-                    on-change="$ctrl.onMoreChange(value)"
-                    on-open="$ctrl.onMoreOpen()">
-                </vn-button-menu>
-                <vn-button 
-                    disabled="!$ctrl.isChecked || !$ctrl.isEditable"
-                    ng-click="$ctrl.showRemoveLinesDialog()" 
-                    vn-tooltip="Remove lines" 
-                    tooltip-position="up"
-                    icon="delete">
-                </vn-button>
-                <vn-button 
-                    disabled="!$ctrl.isChecked || !$ctrl.isEditable"
-                    ng-click="$ctrl.showTransferPopover($event);" 
-                    vn-tooltip="Transfer lines" 
-                    tooltip-position="right"
-                    icon="call_split">
-                </vn-button>
-            </vn-tool-bar>
+            <vn-horizontal class="header">
+                <vn-tool-bar margin-medium-bottom>
+                    <vn-button 
+                        disabled="!$ctrl.isEditable" 
+                        label="Ok" 
+                        ng-click="$ctrl.onStateOkClick()"
+                        vn-tooltip="Change ticket state to 'Ok'">
+                    </vn-button>
+                    <vn-button-menu 
+                        disabled="!$ctrl.isEditable"
+                        label="State"
+                        url="/ticket/api/States/alertLevelIs0"
+                        on-change="$ctrl.onStateChange(value)">
+                    </vn-button-menu>
+                    <vn-button-menu
+                        ng-show="$ctrl.isChecked"
+                        vn-id="more-button"
+                        label="More"
+                        show-filter="false"
+                        value-field="callback"
+                        translate-fields="['name']"
+                        on-change="$ctrl.onMoreChange(value)"
+                        on-open="$ctrl.onMoreOpen()">
+                    </vn-button-menu>
+                    <vn-button 
+                        disabled="!$ctrl.isChecked || !$ctrl.isEditable"
+                        ng-click="$ctrl.showRemoveLinesDialog()" 
+                        vn-tooltip="Remove lines" 
+                        tooltip-position="up"
+                        icon="delete">
+                    </vn-button>
+                    <vn-button 
+                        disabled="!$ctrl.isChecked || !$ctrl.isEditable"
+                        ng-click="$ctrl.showTransferPopover($event);" 
+                        vn-tooltip="Transfer lines" 
+                        tooltip-position="right"
+                        icon="call_split">
+                    </vn-button>
+                </vn-tool-bar>
+                <vn-one class="taxes" ng-if="$ctrl.sales.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.total | currency: 'EUR':2}}</strong></p>
+                </vn-one>
+            </vn-horizontal>
             <vn-table model="model">
                 <vn-thead>
                     <vn-tr>
@@ -142,21 +149,6 @@
                     No results
                 </vn-empty-rows>
             </vn-table>
-            <div class="totals"
-                ng-if="$ctrl.sales.length > 0">
-                <p>
-                    <vn-label translate>Subtotal</vn-label> 
-                    <span>{{$ctrl.subTotal | currency: 'EUR':2}}</span>
-                </p>
-                <p>
-                    <vn-label translate>VAT</vn-label> 
-                    <span>{{$ctrl.VAT | currency: 'EUR':2}}</span>
-                </p>
-                <p>
-                    <vn-label><strong>Total</strong></vn-label> 
-                    <strong>{{$ctrl.total | currency: 'EUR':2}}</strong>
-                </p>
-            </div>
         </vn-vertical>
     </vn-card>
     <vn-item-descriptor-popover vn-id="descriptor"
diff --git a/modules/ticket/front/sale/style.scss b/modules/ticket/front/sale/style.scss
index b47957122..3687bb121 100644
--- a/modules/ticket/front/sale/style.scss
+++ b/modules/ticket/front/sale/style.scss
@@ -1,10 +1,15 @@
 @import "variables";
 vn-ticket-sale {
+    .header {
+        justify-content: space-between !important;
+        align-items: center;
+    }
+
     vn-popover.edit {
         div.popover{
             width: 200px;
         }
-    
+
         vn-horizontal.header{
             background-color: $main-01;
             h5{
@@ -85,13 +90,16 @@ vn-ticket-sale {
             max-width: 50px;
         }
     }
-
-    .totals {
+    .taxes {
+        max-width: 10em;
+        border: .1em solid #CCC;
         text-align: right;
+        padding: .5em !important;
+
 
         & > p {
-            margin: 0;
-            margin-top: 1em;
+            font-size: 1.2em;
+            margin: .2em;
         }
     }
 }
\ No newline at end of file