From 4dd5019ae0d77ec9a49c1f6517595f183b376366 Mon Sep 17 00:00:00 2001
From: Joan <joan@verdnatura.es>
Date: Tue, 29 May 2018 13:36:41 +0200
Subject: [PATCH] Show isEqualizated on addresses list #302. CR: Javi

---
 client/client/src/address/index/index.html   | 19 +++++++++++++++----
 e2e/helpers/selectors.js                     | 10 +++++-----
 e2e/paths/ticket-module/03_list_sale.spec.js |  4 ++--
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/client/client/src/address/index/index.html b/client/client/src/address/index/index.html
index 5df34ac32..63b0c404f 100644
--- a/client/client/src/address/index/index.html
+++ b/client/client/src/address/index/index.html
@@ -27,10 +27,21 @@
                         </i>
                     </vn-none>
                     <vn-one border-solid-right>
-                        <div><b>{{::address.nickname}}</b></div>
-                        <div>{{::address.street}}</div>
-                        <div>{{::address.city}}, {{::address.province}}</div>
-                        <div>{{::address.phone}}, {{::address.mobile}}</div>
+                        <vn-horizontal>
+                            <vn-one>
+                                <div><b>{{::address.nickname}}</b></div>
+                                <div name="street">{{::address.street}}</div>
+                                <div>{{::address.city}}, {{::address.province}}</div>
+                                <div>{{::address.phone}}, {{::address.mobile}}</div>
+                            </vn-one>
+                            <vn-one>
+                                <vn-check
+                                    vn-one label="Is equalizated"
+                                    field="address.isEqualizated"
+                                    disabled="true">
+                                </vn-check> 
+                            </vn-one>
+                        </vn-horizontal>
                     </vn-one>
                     <vn-vertical vn-one pad-medium-h>
                         <vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}">
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 1b02658e2..0ec09a7f0 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -82,7 +82,7 @@ export default {
     },
     clientAddresses: {
         addressesButton: `${components.vnMenuItem}[ui-sref="client.card.address.index"]`,
-        createAddress: `${components.vnFloatButton}`,
+        createAddress: `vn-client-address-index ${components.vnFloatButton}`,
         defaultCheckboxInput: `${components.vnCheck}[label='Default'] > label > input`,
         consigneeInput: `${components.vnTextfield}[name="nickname"]`,
         streetAddressInput: `${components.vnTextfield}[name="street"]`,
@@ -94,12 +94,12 @@ export default {
         agenctySecondOption: `${components.vnAutocomplete}[field="$ctrl.address.agencyModeFk"] vn-drop-down ul > li:nth-child(2)`,
         phoneInput: `${components.vnTextfield}[name="phone"]`,
         mobileInput: `${components.vnTextfield}[name="mobile"]`,
-        defaultAddress: 'vn-client-address-index > vn-vertical > vn-card > div > vn-horizontal:nth-child(2) > vn-one > vn-horizontal > vn-one > div:nth-child(2)',
+        defaultAddress: 'vn-client-address-index vn-horizontal:nth-child(2) div[name="street"]',
         secondMakeDefaultStar: 'vn-client-address-index > vn-vertical > vn-card > div > vn-horizontal:nth-child(3) > vn-one > vn-horizontal > vn-none > i',
-        firstEditButton: `${components.vnIconButton}[icon='edit']`,
-        secondEditButton: `vn-horizontal:nth-child(3) > vn-one > vn-horizontal > a > ${components.vnIconButton}[icon='edit']`,
+        firstEditButton: `vn-client-address-index ${components.vnIconButton}[icon='edit']`,
+        secondEditButton: `vn-client-address-index vn-horizontal:nth-child(3) ${components.vnIconButton}[icon='edit']`,
         activeCheckbox: `${components.vnCheck}[label='Enabled'] > label > input`,
-        equalizationTaxCheckboxLabel: `${components.vnCheck}[label='Is equalizated'] > label > input`,
+        equalizationTaxCheckboxLabel: `vn-client-address-edit ${components.vnCheck}[label='Is equalizated'] > label > input`,
         firstObservationTypeSelect: `${components.vnAutocomplete}[field="observation.observationTypeFk"]:nth-child(1) input`,
         firstObservationTypeSelectOptionOne: `${components.vnAutocomplete}[field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(1)`,
         firstObservationDescriptionInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Description"] > div > input`,
diff --git a/e2e/paths/ticket-module/03_list_sale.spec.js b/e2e/paths/ticket-module/03_list_sale.spec.js
index d9cf449a9..4e1ec4e3e 100644
--- a/e2e/paths/ticket-module/03_list_sale.spec.js
+++ b/e2e/paths/ticket-module/03_list_sale.spec.js
@@ -51,7 +51,7 @@ describe('Ticket', () => {
             .wait(selectors.ticketSales.firstSaleText)
             .getInnerText(selectors.ticketSales.firstSaleText)
             .then(value => {
-                expect(value).toContain('Color Yellow');
+                expect(value).toContain('Yellow');
                 expect(value).toContain('5');
                 expect(value).toContain('€1.50');
                 expect(value).toContain('0 %');
@@ -64,7 +64,7 @@ describe('Ticket', () => {
             .wait(selectors.ticketSales.secondSaleText)
             .getInnerText(selectors.ticketSales.secondSaleText)
             .then(value => {
-                expect(value).toContain('Color Yellow');
+                expect(value).toContain('Yellow');
                 expect(value).toContain('2');
                 expect(value).toContain('€1.50');
                 expect(value).toContain('0 %');