From 4f5c1404d75000c67710789147a4b4cf4ed17c6c Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 14 Nov 2019 15:24:08 +0100
Subject: [PATCH] E2E fixes

---
 e2e/helpers/selectors.js                      |  2 +-
 modules/ticket/front/basic-data/index.html    | 26 +++---
 .../front/basic-data/step-two/index.html      | 80 +++++++++----------
 3 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index c83db3b334..d7b41bc643 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -472,7 +472,7 @@ export default {
         zoneAutocomplete: 'vn-autocomplete[ng-model="$ctrl.zoneId"]',
         nextStepButton: 'vn-step-control .buttons > section:last-child vn-button',
         finalizeButton: 'vn-step-control .buttons > section:last-child button[type=submit]',
-        stepTwoTotalPriceDif: 'vn-ticket-basic-data-step-two > form > vn-card > vn-horizontal > table > tfoot > tr > td:nth-child(4)',
+        stepTwoTotalPriceDif: 'vn-ticket-basic-data-step-two vn-tfoot > vn-tr > :nth-child(6)',
         chargesReasonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.ticket.option"]',
     },
     ticketComponents: {
diff --git a/modules/ticket/front/basic-data/index.html b/modules/ticket/front/basic-data/index.html
index 46e2ad6a94..f313110b36 100644
--- a/modules/ticket/front/basic-data/index.html
+++ b/modules/ticket/front/basic-data/index.html
@@ -1,14 +1,12 @@
-<div class="vn-w-md">
-    <vn-button-bar>
-        <vn-step-control 
-            step-count="10" 
-            steps="[
-                {name: 'Basic data', state: 'ticket.card.basicData.stepOne'}, 
-                {name: 'Price difference', state: 'ticket.card.basicData.stepTwo'}, 
-                {name: 'Charge', state: 'ticket.card.basicData.stepThree'}]" 
-            on-step-change="$ctrl.onStepChange(state)"
-            on-step-end="$ctrl.onSubmit()">
-        </vn-step-control>
-    </vn-button-bar>
-    <ui-view></ui-view>
-</div>
+<vn-button-bar>
+    <vn-step-control 
+        step-count="10" 
+        steps="[
+            {name: 'Basic data', state: 'ticket.card.basicData.stepOne'}, 
+            {name: 'Price difference', state: 'ticket.card.basicData.stepTwo'}, 
+            {name: 'Charge', state: 'ticket.card.basicData.stepThree'}]" 
+        on-step-change="$ctrl.onStepChange(state)"
+        on-step-end="$ctrl.onSubmit()">
+    </vn-step-control>
+</vn-button-bar>
+<ui-view></ui-view>
diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html
index ef5b09d4b6..04cb7f2124 100644
--- a/modules/ticket/front/basic-data/step-two/index.html
+++ b/modules/ticket/front/basic-data/step-two/index.html
@@ -1,40 +1,40 @@
-<form name="form">
-    <vn-card class="vn-w-lg vn-pa-lg">
-        <vn-table>
-            <vn-thead>
-                <vn-tr>
-                    <vn-th number>Item</vn-th>
-                    <vn-th style="text-align:center">Description</vn-th>
-                    <vn-th number>Quantity</vn-th>
-                    <vn-th number>Price (PPU)</vn-th>
-                    <vn-th number>New price (PPU)</vn-th>
-                    <vn-th number>Price difference</vn-th>
-                </vn-tr>
-            </vn-thead>
-            <vn-tbody>
-                <vn-tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id">
-                    <vn-td number>{{("000000"+sale.itemFk).slice(-6)}}</vn-td>
-                    <vn-td expand>
-                        <vn-fetched-tags
-                            max-length="6"
-                            item="::sale.item"
-                            name="::sale.concept">
-                        </vn-fetched-tags>
-                    </vn-td>
-                    <vn-td number>{{::sale.quantity}}</vn-td>
-                    <vn-td number>{{::sale.price | currency: 'EUR': 2}}</vn-td>
-                    <vn-td number>{{::sale.component.newPrice | currency: 'EUR': 2}}</vn-td>
-                    <vn-td number>{{::sale.component.difference | currency: 'EUR': 2}}</vn-td>
-                </vn-tr>
-            </vn-tbody>
-            <vn-tfoot>
-                <vn-tr>
-                    <vn-td colspan="3"></vn-td>
-                    <vn-td number><strong>{{$ctrl.totalPrice | currency: 'EUR': 2}}</strong></vn-td>
-                    <vn-td number><strong>{{$ctrl.totalNewPrice | currency: 'EUR': 2}}</strong></vn-td>
-                    <vn-td number><strong>{{$ctrl.totalPriceDifference | currency: 'EUR': 2}}</strong></vn-td>
-                </vn-tr>
-            </vn-tfoot>
-        </vn-table>
-    </vn-card>
-</form>
+<vn-card class="vn-w-lg">
+    <vn-table>
+        <vn-thead>
+            <vn-tr>
+                <vn-th number>Item</vn-th>
+                <vn-th style="text-align:center">Description</vn-th>
+                <vn-th number>Quantity</vn-th>
+                <vn-th number>Price (PPU)</vn-th>
+                <vn-th number>New price (PPU)</vn-th>
+                <vn-th number>Price difference</vn-th>
+            </vn-tr>
+        </vn-thead>
+        <vn-tbody>
+            <vn-tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id">
+                <vn-td number>{{("000000"+sale.itemFk).slice(-6)}}</vn-td>
+                <vn-td expand>
+                    <vn-fetched-tags
+                        max-length="6"
+                        item="::sale.item"
+                        name="::sale.concept">
+                    </vn-fetched-tags>
+                </vn-td>
+                <vn-td number>{{::sale.quantity}}</vn-td>
+                <vn-td number>{{::sale.price | currency: 'EUR': 2}}</vn-td>
+                <vn-td number>{{::sale.component.newPrice | currency: 'EUR': 2}}</vn-td>
+                <vn-td number>{{::sale.component.difference | currency: 'EUR': 2}}</vn-td>
+            </vn-tr>
+        </vn-tbody>
+        <vn-tfoot>
+            <vn-tr>
+                <vn-td></vn-td>
+                <vn-td></vn-td>
+                <vn-td></vn-td>
+                <vn-td number><strong>{{$ctrl.totalPrice | currency: 'EUR': 2}}</strong></vn-td>
+                <vn-td number><strong>{{$ctrl.totalNewPrice | currency: 'EUR': 2}}</strong></vn-td>
+                <vn-td number><strong>{{$ctrl.totalPriceDifference | currency: 'EUR': 2}}</strong></vn-td>
+            </vn-tr>
+        </vn-tfoot>
+    </vn-table>
+</vn-card>