verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Show isEqualizated on addresses list #302. CR: Javi

This commit is contained in:
Joan Sanchez 2018-05-29 13:36:41 +02:00
parent e14ab33b9c
commit 4dd5019ae0
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/client/src/address/index/index.html
View File

@ -27,10 +27,21 @@
</i> </i>
</vn-none> </vn-none>
<vn-one border-solid-right> <vn-one border-solid-right>
<div><b>{{::address.nickname}}</b></div> <vn-horizontal>
<div>{{::address.street}}</div> <vn-one>
<div>{{::address.city}}, {{::address.province}}</div> <div><b>{{::address.nickname}}</b></div>
<div>{{::address.phone}}, {{::address.mobile}}</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-one>
<vn-vertical vn-one pad-medium-h> <vn-vertical vn-one pad-medium-h>
<vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}"> <vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}">

10
e2e/helpers/selectors.js
View File

@ -82,7 +82,7 @@ export default {
}, },
clientAddresses: { clientAddresses: {
addressesButton: `${components.vnMenuItem}[ui-sref="client.card.address.index"]`, 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`, defaultCheckboxInput: `${components.vnCheck}[label='Default'] > label > input`,
consigneeInput: `${components.vnTextfield}[name="nickname"]`, consigneeInput: `${components.vnTextfield}[name="nickname"]`,
streetAddressInput: `${components.vnTextfield}[name="street"]`, 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)`, agenctySecondOption: `${components.vnAutocomplete}[field="$ctrl.address.agencyModeFk"] vn-drop-down ul > li:nth-child(2)`,
phoneInput: `${components.vnTextfield}[name="phone"]`, phoneInput: `${components.vnTextfield}[name="phone"]`,
mobileInput: `${components.vnTextfield}[name="mobile"]`, 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', 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']`, firstEditButton: `vn-client-address-index ${components.vnIconButton}[icon='edit']`,
secondEditButton: `vn-horizontal:nth-child(3) > vn-one > vn-horizontal > a > ${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`, 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`, firstObservationTypeSelect: `${components.vnAutocomplete}[field="observation.observationTypeFk"]:nth-child(1) input`,
firstObservationTypeSelectOptionOne: `${components.vnAutocomplete}[field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(1)`, 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`, firstObservationDescriptionInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Description"] > div > input`,

4
e2e/paths/ticket-module/03_list_sale.spec.js
View File

@ -51,7 +51,7 @@ describe('Ticket', () => {
.wait(selectors.ticketSales.firstSaleText) .wait(selectors.ticketSales.firstSaleText)
.getInnerText(selectors.ticketSales.firstSaleText) .getInnerText(selectors.ticketSales.firstSaleText)
.then(value => { .then(value => {
expect(value).toContain('Color Yellow'); expect(value).toContain('Yellow');
expect(value).toContain('5'); expect(value).toContain('5');
expect(value).toContain('€1.50'); expect(value).toContain('€1.50');
expect(value).toContain('0 %'); expect(value).toContain('0 %');
@ -64,7 +64,7 @@ describe('Ticket', () => {
.wait(selectors.ticketSales.secondSaleText) .wait(selectors.ticketSales.secondSaleText)
.getInnerText(selectors.ticketSales.secondSaleText) .getInnerText(selectors.ticketSales.secondSaleText)
.then(value => { .then(value => {
expect(value).toContain('Color Yellow'); expect(value).toContain('Yellow');
expect(value).toContain('2'); expect(value).toContain('2');
expect(value).toContain('€1.50'); expect(value).toContain('€1.50');
expect(value).toContain('0 %'); expect(value).toContain('0 %');