diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index a6687fdcb..679a170bb 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -21,23 +21,23 @@ export default {
acceptButton: '.vn-confirm.shown button[response=accept]'
},
clientsIndex: {
- searchClientInput: `vn-textfield input`,
+ searchClientInput: 'vn-topbar [name="searchString"]',
searchButton: 'vn-searchbar vn-icon[icon="search"]',
searchResult: 'vn-client-index .vn-item',
createClientButton: `vn-float-button`,
othersButton: 'vn-left-menu li[name="Others"] > a'
},
createClientView: {
- name: `vn-textfield input[name="name"]`,
- taxNumber: `vn-textfield input[name="fi"]`,
- socialName: `vn-textfield input[name="socialName"]`,
- street: `vn-textfield input[name="street"]`,
- postcode: `vn-textfield input[name="postcode"]`,
- city: `vn-textfield input[name="city"]`,
+ name: `vn-client-create [name="name"]`,
+ taxNumber: 'vn-client-create [name="fi"]',
+ socialName: 'vn-client-create [name="socialName"]',
+ street: 'vn-client-create [name="street"]',
+ postcode: 'vn-client-create [name="postcode"]',
+ city: 'vn-client-create [name="city"]',
province: `vn-autocomplete[ng-model="$ctrl.client.provinceFk"]`,
country: `vn-autocomplete[ng-model="$ctrl.client.countryFk"]`,
- userName: `vn-textfield input[name="userName"]`,
- email: `vn-textfield input[name="email"]`,
+ userName: 'vn-client-create [name="userName"]',
+ email: 'vn-client-create [name="email"]',
salesPersonAutocomplete: `vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]`,
createButton: `button[type=submit]`,
cancelButton: 'vn-button[href="#!/client/index"]'
@@ -48,24 +48,24 @@ export default {
},
clientBasicData: {
basicDataButton: 'vn-left-menu a[ui-sref="client.card.basicData"]',
- nameInput: 'vn-textfield[ng-model="$ctrl.client.name"] input',
- contactInput: 'vn-textfield[ng-model="$ctrl.client.contact"] input',
- phoneInput: 'vn-textfield[ng-model="$ctrl.client.phone"] input',
- mobileInput: 'vn-textfield[ng-model="$ctrl.client.mobile"] input',
- emailInput: 'vn-textfield[ng-model="$ctrl.client.email"] input',
+ nameInput: 'vn-client-basic-data [name="name"]',
+ contactInput: 'vn-client-basic-data [name="contact"]',
+ phoneInput: 'vn-client-basic-data [name="phone"]',
+ mobileInput: 'vn-client-basic-data [name="mobile"]',
+ emailInput: 'vn-client-basic-data [name="email"]',
salesPersonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
channelAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.contactChannelFk"]',
saveButton: `button[type=submit]`
},
clientFiscalData: {
fiscalDataButton: 'vn-left-menu a[ui-sref="client.card.fiscalData"]',
- socialNameInput: `vn-textfield input[name="socialName"]`,
- fiscalIdInput: `vn-textfield input[name="fi"]`,
+ socialNameInput: 'vn-client-fiscal-data [name="socialName"]',
+ fiscalIdInput: 'vn-client-fiscal-data [name="fi"]',
equalizationTaxCheckbox: 'vn-check[ng-model="$ctrl.client.isEqualizated"]',
acceptPropagationButton: '.vn-confirm.shown button[response=accept]',
- addressInput: `vn-textfield input[name="street"]`,
- postcodeInput: `vn-textfield input[name="postcode"]`,
- cityInput: `vn-textfield input[name="city"]`,
+ addressInput: 'vn-client-fiscal-data [name="street"]',
+ postcodeInput: 'vn-client-fiscal-data [name="postcode"]',
+ cityInput: 'vn-client-fiscal-data [name="city"]',
provinceAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.provinceFk"]',
countryAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.countryFk"]',
activeCheckbox: 'vn-check[label="Active"]',
@@ -79,17 +79,17 @@ export default {
},
clientBillingData: {
payMethodAutocomplete: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.payMethodFk"]',
- IBANInput: `vn-client-billing-data vn-textfield input[name="iban"]`,
- dueDayInput: `vn-client-billing-data vn-input-number input[name="dueDay"]`,
+ IBANInput: 'vn-client-billing-data [name="iban"]',
+ dueDayInput: 'vn-client-billing-data [name="dueDay"]',
receivedCoreLCRCheckbox: 'vn-client-billing-data vn-check[label="Received LCR"]',
receivedCoreVNLCheckbox: 'vn-client-billing-data vn-check[label="Received core VNL"]',
receivedB2BVNLCheckbox: 'vn-client-billing-data vn-check[label="Received B2B VNL"]',
swiftBicAutocomplete: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.bankEntityFk"]',
clearswiftBicButton: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.bankEntityFk"] .icons > vn-icon[icon=clear]',
newBankEntityButton: 'vn-client-billing-data vn-icon-button[vn-tooltip="New bank entity"] > button',
- newBankEntityName: '.vn-dialog.shown vn-textfield[label="Name"] input',
- newBankEntityBIC: '.vn-dialog.shown vn-textfield[label="Swift / BIC"] input',
- newBankEntityCode: '.vn-dialog.shown vn-textfield[label="Entity Code"] input',
+ newBankEntityName: '.vn-dialog.shown [name="name"]',
+ newBankEntityBIC: '.vn-dialog.shown [name="bic"]',
+ newBankEntityCode: '.vn-dialog.shown [name="id"]',
acceptBankEntityButton: '.vn-dialog.shown button[response="accept"]',
saveButton: `button[type=submit]`
},
@@ -97,26 +97,26 @@ export default {
addressesButton: 'vn-left-menu a[ui-sref="client.card.address.index"]',
createAddress: `vn-client-address-index vn-float-button`,
defaultCheckboxInput: 'vn-check[label="Default"]',
- consigneeInput: `vn-textfield input[name="nickname"]`,
- streetAddressInput: `vn-textfield input[name="street"]`,
- postcodeInput: `vn-textfield input[name="postalCode"]`,
- cityInput: `vn-textfield input[name="city"]`,
+ consigneeInput: '[name="nickname"]',
+ streetAddressInput: '[name="street"]',
+ postcodeInput: '[name="postalCode"]',
+ cityInput: '[name="city"]',
provinceAutocomplete: 'vn-autocomplete[ng-model="$ctrl.address.provinceFk"]',
agencyAutocomplete: 'vn-autocomplete[ng-model="$ctrl.address.agencyModeFk"]',
- phoneInput: `vn-textfield input[name="phone"]`,
- mobileInput: `vn-textfield input[name="mobile"]`,
+ phoneInput: '[name="phone"]',
+ mobileInput: '[name="mobile"]',
defaultAddress: 'vn-client-address-index div:nth-child(1) div[name="street"]',
secondMakeDefaultStar: 'vn-client-address-index vn-card div:nth-child(2) vn-icon-button[icon="star_border"]',
firstEditAddress: 'vn-client-address-index div:nth-child(1) > a',
secondEditAddress: 'vn-client-address-index div:nth-child(2) > a',
activeCheckbox: 'vn-check[label="Enabled"]',
equalizationTaxCheckbox: 'vn-client-address-edit vn-check[label="Is equalizated"]',
- firstObservationTypeAutocomplete: 'vn-client-address-edit [name=observations] :nth-child(1) [ng-model="observation.observationTypeFk"]',
- firstObservationDescriptionInput: 'vn-client-address-edit [name=observations] :nth-child(1) [ng-model="observation.description"] input',
- secondObservationTypeAutocomplete: 'vn-client-address-edit [name=observations] :nth-child(2) [ng-model="observation.observationTypeFk"]',
- secondObservationDescriptionInput: 'vn-client-address-edit [name=observations] :nth-child(2) [ng-model="observation.description"] input',
+ firstObservationTypeAutocomplete: 'vn-client-address-edit [name=observations] vn-horizontal:nth-child(1) [ng-model="observation.observationTypeFk"]',
+ firstObservationDescriptionInput: 'vn-client-address-edit [name=observations] vn-horizontal:nth-child(1) [name="description"]',
+ secondObservationTypeAutocomplete: 'vn-client-address-edit [name=observations] vn-horizontal:nth-child(2) [ng-model="observation.observationTypeFk"]',
+ secondObservationDescriptionInput: 'vn-client-address-edit [name=observations] vn-horizontal:nth-child(2) [name="description"]',
addObservationButton: 'vn-client-address-edit div[name="observations"] vn-icon-button[icon="add_circle"]',
- saveButton: `button[type=submit]`,
+ saveButton: 'button[type=submit]',
cancelCreateAddressButton: 'button[ui-sref="client.card.address.index"]',
cancelEditAddressButton: 'vn-client-address-edit > form > vn-button-bar > vn-button > button',
watcher: 'vn-client-address-edit vn-watcher'
@@ -124,27 +124,27 @@ export default {
clientWebAccess: {
webAccessButton: 'vn-left-menu a[ui-sref="client.card.webAccess"]',
enableWebAccessCheckbox: 'vn-check[label="Enable web access"]',
- userNameInput: `vn-textfield input[name="name"]`,
- saveButton: `button[type=submit]`
+ userNameInput: 'vn-client-web-access [name="name"]',
+ saveButton: 'button[type=submit]'
},
clientNotes: {
- addNoteFloatButton: `vn-float-button`,
+ addNoteFloatButton: 'vn-float-button',
noteInput: 'vn-textarea[label="Note"]',
- saveButton: `button[type=submit]`,
+ saveButton: 'button[type=submit]',
firstNoteText: 'vn-client-note .text'
},
clientCredit: {
- addCreditFloatButton: `vn-float-button`,
- creditInput: `vn-input-number input[name="credit"]`,
- saveButton: `button[type=submit]`,
+ addCreditFloatButton: 'vn-float-button',
+ creditInput: 'vn-client-credit-create [name="credit"]',
+ saveButton: 'button[type=submit]',
firstCreditText: 'vn-client-credit-index vn-card vn-table vn-tbody > vn-tr'
},
clientGreuge: {
- addGreugeFloatButton: `vn-float-button`,
- amountInput: `vn-input-number input[name="amount"]`,
- descriptionInput: `vn-textfield input[name="description"]`,
+ addGreugeFloatButton: 'vn-float-button',
+ amountInput: 'vn-client-greuge-create [name="amount"]',
+ descriptionInput: 'vn-client-greuge-create [name="description"]',
typeAutocomplete: 'vn-autocomplete[ng-model="$ctrl.greuge.greugeTypeFk"]',
- saveButton: `button[type=submit]`,
+ saveButton: 'button[type=submit]',
firstGreugeText: 'vn-client-greuge-index vn-card vn-table vn-tbody > vn-tr'
},
clientMandate: {
@@ -165,7 +165,7 @@ export default {
companyAutocomplete: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyFk"]',
newPaymentButton: `vn-float-button`,
newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
- newPaymentAmountInput: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.receipt.amountPaid"] input',
+ newPaymentAmountInput: '.vn-dialog.shown [name="amountPaid"]',
saveButton: '.vn-dialog.shown vn-button[label="Save"]',
firstBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)'
@@ -187,7 +187,7 @@ export default {
searchResultPreviewButton: 'vn-item-index .buttons > [icon="desktop_windows"]',
searchResultCloneButton: 'vn-item-index .buttons > [icon="icon-clone"]',
acceptClonationAlertButton: '.vn-confirm.shown [response="accept"]',
- searchItemInput: 'vn-searchbar vn-textfield input',
+ searchItemInput: 'vn-searchbar [name="searchString"]',
searchButton: 'vn-searchbar vn-icon[icon="search"]',
closeItemSummaryPreview: '.vn-popup.shown',
fieldsToShowButton: 'vn-item-index vn-table > div > div > vn-icon-button[icon="menu"]',
@@ -209,18 +209,18 @@ export default {
saveFieldsButton: '.vn-dialog.shown vn-horizontal:nth-child(16) > vn-button > button'
},
itemCreateView: {
- temporalName: `vn-textfield input[name="provisionalName"]`,
+ temporalName: 'vn-item-create [name="provisionalName"]',
typeAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]',
intrastatAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.intrastatFk"]',
originAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]',
- createButton: `button[type=submit]`,
+ createButton: 'button[type=submit]',
cancelButton: 'vn-button[ui-sref="item.index"]'
},
itemDescriptor: {
goBackToModuleIndexButton: 'vn-item-descriptor a[href="#!/item/index"]',
moreMenu: 'vn-item-descriptor vn-icon-menu[icon=more_vert]',
moreMenuRegularizeButton: '.vn-drop-down.shown li[name="Regularize stock"]',
- regularizeQuantityInput: '.vn-dialog.shown tpl-body > div > vn-textfield input',
+ regularizeQuantityInput: '.vn-dialog.shown [name="quantity"]',
regularizeWarehouseAutocomplete: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.warehouseFk"]',
editButton: 'vn-item-descriptor vn-float-button[icon="edit"]',
regularizeSaveButton: '.vn-dialog.shown tpl-buttons > button',
@@ -232,11 +232,11 @@ export default {
goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]',
typeAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]',
intrastatAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.intrastatFk"]',
- nameInput: 'vn-textfield[label="Name"] input',
- relevancyInput: 'vn-input-number[ng-model="$ctrl.item.relevancy"] input',
+ nameInput: 'vn-item-basic-data [name="name"]',
+ relevancyInput: 'vn-item-basic-data [name="relevancy"]',
originAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]',
expenceAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.expenceFk"]',
- longNameInput: 'vn-textfield[ng-model="$ctrl.item.longName"] input',
+ longNameInput: 'vn-item-basic-data [name="longName"]',
isActiveCheckbox: 'vn-check[label="Active"]',
priceInKgCheckbox: 'vn-check[label="Price in kg"]',
submitBasicDataButton: `button[type=submit]`
@@ -245,47 +245,47 @@ export default {
goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]',
tagsButton: 'vn-left-menu a[ui-sref="item.card.tags"]',
fourthTagAutocomplete: 'vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete[ng-model="itemTag.tagFk"]',
- fourthValueInput: 'vn-item-tags vn-horizontal:nth-child(4) > vn-textfield[label="Value"] input',
- fourthRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(4) > vn-textfield[label="Relevancy"] input',
+ fourthValueInput: 'vn-item-tags vn-horizontal:nth-child(4) [name="value"]',
+ fourthRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(4) [name="priority"]',
fourthRemoveTagButton: 'vn-item-tags vn-horizontal:nth-child(4) vn-icon-button[icon="delete"]',
fifthTagAutocomplete: 'vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete[ng-model="itemTag.tagFk"]',
- fifthValueInput: 'vn-item-tags vn-horizontal:nth-child(5) > vn-textfield[label="Value"] input',
- fifthRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(5) > vn-textfield[label="Relevancy"] input',
+ fifthValueInput: 'vn-item-tags vn-horizontal:nth-child(5) [name="value"]',
+ fifthRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(5) [name="priority"]',
sixthTagAutocomplete: 'vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete[ng-model="itemTag.tagFk"]',
- sixthValueInput: 'vn-item-tags vn-horizontal:nth-child(6) > vn-textfield[label="Value"] input',
- sixthRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(6) > vn-textfield[label="Relevancy"] input',
+ sixthValueInput: 'vn-item-tags vn-horizontal:nth-child(6) [name="value"]',
+ sixthRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(6) [name="priority"]',
seventhTagAutocomplete: 'vn-item-tags vn-horizontal:nth-child(7) > vn-autocomplete[ng-model="itemTag.tagFk"]',
- seventhValueInput: 'vn-item-tags vn-horizontal:nth-child(7) > vn-textfield[label="Value"] input',
- seventhRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(7) > vn-textfield[label="Relevancy"] input',
+ seventhValueInput: 'vn-item-tags vn-horizontal:nth-child(7) [name="value"]',
+ seventhRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(7) [name="priority"]',
addItemTagButton: 'vn-item-tags vn-icon-button[icon="add_circle"]',
- submitItemTagsButton: `vn-item-tags button[type=submit]`
+ submitItemTagsButton: 'vn-item-tags button[type=submit]'
},
itemTax: {
undoChangesButton: 'vn-item-tax vn-button-bar > vn-button[label="Undo changes"]',
firstClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(1) > vn-autocomplete[ng-model="tax.taxClassFk"]',
secondClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(2) > vn-autocomplete[ng-model="tax.taxClassFk"]',
thirdClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(3) > vn-autocomplete[ng-model="tax.taxClassFk"]',
- submitTaxButton: `vn-item-tax button[type=submit]`
+ submitTaxButton: 'vn-item-tax button[type=submit]'
},
itemBarcodes: {
addBarcodeButton: 'vn-item-barcode vn-icon[icon="add_circle"]',
- thirdCodeInput: `vn-item-barcode vn-horizontal:nth-child(3) > vn-textfield input`,
- submitBarcodesButton: `vn-item-barcode button[type=submit]`,
+ thirdCodeInput: 'vn-item-barcode vn-horizontal:nth-child(3) [name="code"]',
+ submitBarcodesButton: 'vn-item-barcode button[type=submit]',
firstCodeRemoveButton: 'vn-item-barcode vn-horizontal vn-none vn-icon[icon="delete"]'
},
itemNiches: {
addNicheButton: 'vn-item-niche vn-icon[icon="add_circle"]',
firstWarehouseAutocomplete: 'vn-item-niche vn-autocomplete[ng-model="niche.warehouseFk"]',
- firstCodeInput: 'vn-item-niche vn-horizontal:nth-child(1) > vn-textfield[label="Code"] input',
+ firstCodeInput: 'vn-item-niche vn-horizontal:nth-child(1) [name="code"]',
secondWarehouseAutocomplete: 'vn-item-niche vn-horizontal:nth-child(2) > vn-autocomplete[ng-model="niche.warehouseFk"]',
- secondCodeInput: 'vn-item-niche vn-horizontal:nth-child(2) > vn-textfield[label="Code"] input',
+ secondCodeInput: 'vn-item-niche vn-horizontal:nth-child(2) [name="code"]',
secondNicheRemoveButton: 'vn-item-niche vn-horizontal:nth-child(2) > vn-none > vn-icon-button[icon="delete"]',
thirdWarehouseAutocomplete: 'vn-item-niche vn-horizontal:nth-child(3) > vn-autocomplete[ng-model="niche.warehouseFk"]',
- thirdCodeInput: 'vn-item-niche vn-horizontal:nth-child(3) > vn-textfield[label="Code"] input',
- submitNichesButton: `vn-item-niche button[type=submit]`
+ thirdCodeInput: 'vn-item-niche vn-horizontal:nth-child(3) [name="code"]',
+ submitNichesButton: 'vn-item-niche button[type=submit]'
},
itemBotanical: {
- botanicalInput: `vn-item-botanical vn-horizontal:nth-child(1) > vn-textfield input`,
+ botanicalInput: 'vn-item-botanical vn-horizontal:nth-child(1) [name="botanical"]',
genusAutocomplete: 'vn-item-botanical vn-autocomplete[ng-model="$ctrl.botanical.genusFk"]',
speciesAutocomplete: 'vn-item-botanical vn-autocomplete[ng-model="$ctrl.botanical.specieFk"]',
submitBotanicalButton: `vn-item-botanical button[type=submit]`
@@ -326,20 +326,19 @@ export default {
},
ticketsIndex: {
openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]',
- advancedSearchInvoiceOut: 'vn-ticket-search-panel vn-textfield[ng-model="filter.refFk"] input',
+ advancedSearchInvoiceOut: 'vn-ticket-search-panel [name="refFk"]',
newTicketButton: 'vn-ticket-index > a',
searchResult: 'vn-ticket-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr',
searchResultDate: 'vn-ticket-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(5)',
- searchTicketInput: `vn-searchbar input`,
- searchWeeklyTicketInput: `vn-searchbar input`,
+ searchTicketInput: 'vn-searchbar [name="searchString"]',
searchWeeklyClearInput: 'vn-searchbar vn-icon[icon=clear]',
advancedSearchButton: 'vn-ticket-search-panel button[type=submit]',
searchButton: 'vn-searchbar vn-icon[icon="search"]',
searchWeeklyButton: 'vn-searchbar vn-icon[icon="search"]',
moreMenu: 'vn-ticket-index vn-icon-menu[icon=more_vert]',
menuWeeklyTickets: 'vn-left-menu [ui-sref="ticket.weekly.index"]',
- sixthWeeklyTicket: 'vn-ticket-weekly-index vn-table vn-tr:nth-child(6) vn-autocomplete[ng-model="weekly.weekDay"] input',
+ sixthWeeklyTicket: 'vn-ticket-weekly-index vn-table vn-tr:nth-child(6) [name="weekDay"]',
weeklyTicket: 'vn-ticket-weekly-index vn-table > div > vn-tbody > vn-tr',
firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-tr:nth-child(1) vn-icon-button[icon="delete"]',
acceptDeleteTurn: '.vn-confirm.shown button[response="accept"]'
@@ -379,7 +378,7 @@ export default {
firstNoteRemoveButton: 'vn-icon[icon="delete"]',
addNoteButton: 'vn-icon[icon="add_circle"]',
firstNoteTypeAutocomplete: 'vn-autocomplete[ng-model="observation.observationTypeFk"]',
- firstDescriptionInput: 'vn-textfield[label="Description"] input',
+ firstDescriptionInput: 'vn-ticket-observation [name="description"]',
submitNotesButton: `button[type=submit]`
},
ticketExpedition: {
@@ -391,7 +390,7 @@ export default {
ticketPackages: {
packagesButton: 'vn-left-menu a[ui-sref="ticket.card.package"]',
firstPackageAutocomplete: 'vn-autocomplete[label="Package"]',
- firstQuantityInput: 'vn-input-number[ng-model="package.quantity"] input',
+ firstQuantityInput: 'vn-ticket-package vn-horizontal:nth-child(1) [name="quantity"]',
firstRemovePackageButton: 'vn-icon-button[vn-tooltip="Remove package"]',
addPackageButton: 'vn-icon-button[vn-tooltip="Add package"]',
clearPackageAutocompleteButton: 'vn-autocomplete[label="Package"] .icons > vn-icon[icon=clear]',
@@ -410,7 +409,7 @@ export default {
moreMenuReserve: '.vn-drop-down.shown li[name="Mark as reserved"]',
moreMenuUnmarkReseved: '.vn-drop-down.shown li[name="Unmark as reserved"]',
moreMenuUpdateDiscount: '.vn-drop-down.shown li[name="Update discount"]',
- moreMenuUpdateDiscountInput: '.vn-dialog.shown form vn-ticket-sale-edit-discount vn-input-number[ng-model="$ctrl.newDiscount"] input',
+ moreMenuUpdateDiscountInput: 'vn-ticket-sale-edit-discount [name="newDiscount"]',
transferQuantityInput: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable > span > text',
transferQuantityCell: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable',
firstSaleClaimIcon: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(1) vn-icon[icon="icon-claims"]',
@@ -418,15 +417,15 @@ export default {
firstSaleText: 'vn-table div > vn-tbody > vn-tr:nth-child(1)',
firstSaleThumbnailImage: 'vn-ticket-sale:nth-child(1) vn-tr:nth-child(1) vn-td:nth-child(3) > img',
firstSaleZoomedImage: 'body > div > div > img',
- firstSaleQuantity: 'vn-input-number[ng-model="sale.quantity"]:nth-child(1) input',
+ firstSaleQuantity: 'vn-ticket-sale [name="quantity"]',
firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(5)',
firstSaleQuantityClearInput: 'vn-textfield[ng-model="sale.quantity"] div.suffix > i',
firstSaleIdAutocomplete: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > vn-autocomplete',
idAutocompleteFirstResult: '.vn-drop-down.shown li',
firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(7) > span',
- firstSalePriceInput: '.vn-popover.shown vn-input-number input',
+ firstSalePriceInput: '.vn-popover.shown [name="editedPrice"]',
firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(8) > span',
- firstSaleDiscountInput: 'vn-ticket-sale:nth-child(1) vn-ticket-sale-edit-discount vn-input-number input',
+ firstSaleDiscountInput: '.vn-popover.shown [name="newDiscount"]',
firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(9)',
firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td:nth-child(2) > vn-icon:nth-child(3)',
firstSaleColour: 'vn-ticket-sale vn-tr:nth-child(1) vn-fetched-tags section',
@@ -482,10 +481,10 @@ export default {
ticketRequests: {
addRequestButton: 'vn-ticket-request-index > a > vn-float-button > button',
request: 'vn-ticket-request-index vn-table vn-tr',
- descriptionInput: 'vn-ticket-request-create > form > div > vn-card > vn-horizontal:nth-child(1) > vn-textfield input',
+ descriptionInput: 'vn-ticket-request-create [name="description"]',
atenderAutocomplete: 'vn-ticket-request-create vn-autocomplete[ng-model="$ctrl.ticketRequest.attenderFk"]',
- quantityInput: 'vn-ticket-request-create vn-input-number input[name=quantity]',
- priceInput: 'vn-ticket-request-create vn-input-number input[name=price]',
+ quantityInput: 'vn-ticket-request-create [name=quantity]',
+ priceInput: 'vn-ticket-request-create [name=price]',
firstRemoveRequestButton: 'vn-ticket-request-index vn-icon[icon="delete"]:nth-child(1)',
saveButton: 'vn-ticket-request-create button[type=submit]',
firstDescription: 'vn-ticket-request-index vn-table vn-tr:nth-child(1) > vn-td:nth-child(2)',
@@ -501,11 +500,11 @@ export default {
addServiceButton: 'vn-ticket-service vn-icon-button[vn-tooltip="Add service"] > button',
firstAddDescriptionButton: 'vn-ticket-service vn-icon-button[vn-tooltip="New service type"]',
firstDescriptionAutocomplete: 'vn-ticket-service vn-autocomplete[ng-model="service.description"]',
- firstQuantityInput: 'vn-ticket-service vn-input-number[label="Quantity"] input',
- firstPriceInput: 'vn-ticket-service vn-input-number[label="Price"] input',
+ firstQuantityInput: 'vn-ticket-service [name="quantity"]',
+ firstPriceInput: 'vn-ticket-service [name="price"]',
firstVatTypeAutocomplete: 'vn-ticket-service vn-autocomplete[label="Tax class"]',
fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(1) vn-icon-button[icon="delete"]',
- newDescriptionInput: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.newServiceType.name"] input',
+ newDescriptionInput: '.vn-dialog.shown [name="name"]',
serviceLine: 'vn-ticket-service > form > vn-card > vn-one:nth-child(2) > vn-horizontal',
saveServiceButton: `button[type=submit]`,
saveDescriptionButton: '.vn-dialog.shown tpl-buttons > button'
@@ -517,7 +516,7 @@ export default {
saveStateButton: `button[type=submit]`
},
claimsIndex: {
- searchClaimInput: `vn-searchbar input`,
+ searchClaimInput: 'vn-searchbar [name="searchString"]',
searchResult: 'vn-claim-index vn-card > vn-table > div > vn-tbody > a',
searchButton: 'vn-searchbar vn-icon[icon="search"]'
},
@@ -547,12 +546,12 @@ export default {
},
claimDetail: {
secondItemDiscount: 'vn-claim-detail > vn-vertical > vn-card > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(6) > span',
- discountInput: '.vn-popover.shown vn-input-number[ng-model="$ctrl.newDiscount"] input',
+ discountInput: '.vn-popover.shown [name="newDiscount"]',
discoutPopoverMana: '.vn-popover.shown .content > div > vn-horizontal > h5',
addItemButton: 'vn-claim-detail a vn-float-button',
firstClaimableSaleFromTicket: '.vn-dialog.shown vn-tbody > vn-tr',
claimDetailLine: 'vn-claim-detail > vn-vertical > vn-card > vn-vertical > vn-table > div > vn-tbody > vn-tr',
- firstItemQuantityInput: 'vn-claim-detail vn-tr:nth-child(1) vn-input-number[ng-model="saleClaimed.quantity"] input',
+ firstItemQuantityInput: 'vn-claim-detail vn-tr:nth-child(1) [name="quantity"]',
totalClaimed: 'vn-claim-detail > vn-vertical > vn-card > vn-vertical > vn-horizontal > div > vn-label-value:nth-child(2) > section > span',
secondItemDeleteButton: 'vn-claim-detail > vn-vertical > vn-card > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(8) > vn-icon-button > button > vn-icon > i'
},
@@ -569,7 +568,7 @@ export default {
secondClaimResponsibleAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimResponsibleFk"]',
secondClaimWorkerAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.workerFk"]',
secondClaimRedeliveryAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimRedeliveryFk"]',
- saveDevelopmentButton: `button[type=submit]`
+ saveDevelopmentButton: 'button[type=submit]'
},
claimAction: {
importClaimButton: 'vn-claim-action vn-button[label="Import claim"]',
@@ -584,9 +583,8 @@ export default {
searchResult: 'vn-order-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
searchResultDate: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(4)',
searchResultAddress: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(6)',
- searchOrderInput: `vn-order-index vn-textfield input`,
searchButton: 'vn-searchbar vn-icon[icon="search"]',
- createOrderButton: `vn-float-button`,
+ createOrderButton: 'vn-float-button',
},
orderDescriptor: {
returnToModuleIndexButton: 'vn-order-descriptor a[ui-sref="order.index"]',
@@ -597,18 +595,18 @@ export default {
addressAutocomplete: 'vn-autocomplete[label="Address"]',
agencyAutocomplete: 'vn-autocomplete[label="Agency"]',
landedDatePicker: 'vn-date-picker[label="Landed"]',
- createButton: `button[type=submit]`,
+ createButton: 'button[type=submit]',
cancelButton: 'vn-button[href="#!/client/index"]'
},
orderCatalog: {
orderByAutocomplete: 'vn-autocomplete[label="Order by"]',
plantRealmButton: 'vn-order-catalog > vn-side-menu vn-icon[icon="icon-plant"]',
typeAutocomplete: 'vn-autocomplete[data="$ctrl.itemTypes"]',
- itemIdInput: 'vn-catalog-filter vn-textfield[ng-model="$ctrl.itemFk"] input',
- itemTagValueInput: 'vn-catalog-filter vn-textfield[ng-model="$ctrl.value"] input',
+ itemIdInput: 'vn-catalog-filter [name="itemFk"]',
+ itemTagValueInput: 'vn-catalog-filter [name="value"]',
openTagSearch: 'vn-catalog-filter > div > vn-vertical > vn-textfield[ng-model="$ctrl.value"] .append i',
tagAutocomplete: 'vn-order-catalog-search-panel vn-autocomplete[ng-model="filter.tagFk"]',
- tagValueInput: 'vn-order-catalog-search-panel vn-textfield[ng-model="filter.value"] input',
+ tagValueInput: 'vn-order-catalog-search-panel [name="value"]',
searchTagButton: 'vn-order-catalog-search-panel button[type=submit]',
thirdFilterRemoveButton: 'vn-catalog-filter .chips > vn-chip:nth-child(3) vn-icon[icon=cancel]',
fourthFilterRemoveButton: 'vn-catalog-filter .chips > vn-chip:nth-child(4) vn-icon[icon=cancel]',
@@ -635,7 +633,7 @@ export default {
createdDatePicker: 'vn-route-create vn-date-picker[ng-model="$ctrl.route.created"]',
vehicleAutoComplete: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
agencyAutoComplete: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]',
- descriptionInput: 'vn-route-create vn-textfield[ng-model="$ctrl.route.description"] input',
+ descriptionInput: 'vn-route-create [name="description"',
submitButton: 'vn-route-create button[type=submit]'
},
routeDescriptor: {
@@ -648,11 +646,11 @@ export default {
workerAutoComplete: 'vn-route-basic-data vn-autocomplete[ng-model="$ctrl.route.workerFk"]',
vehicleAutoComplete: 'vn-route-basic-data vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
agencyAutoComplete: 'vn-route-basic-data vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]',
- kmStartInput: 'vn-route-basic-data vn-input-number[ng-model="$ctrl.route.kmStart"] input',
- kmEndInput: 'vn-route-basic-data vn-input-number[ng-model="$ctrl.route.kmEnd"] input',
+ kmStartInput: 'vn-route-basic-data [name="kmStart"]',
+ kmEndInput: 'vn-route-basic-data [name="kmEnd"]',
createdDateInput: 'vn-route-basic-data vn-date-picker[ng-model="$ctrl.route.created"]',
- startedHourInput: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.started"] input',
- finishedHourInput: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.finished"] input',
+ startedHourInput: 'vn-route-basic-data [name="started"]',
+ finishedHourInput: 'vn-route-basic-data [name="finished"]',
saveButton: 'vn-route-basic-data button[type=submit]'
},
routeTickets: {
@@ -667,7 +665,7 @@ export default {
confirmButton: '.vn-confirm.shown button[response="accept"]'
},
workerPbx: {
- extensionInput: 'vn-worker-pbx vn-textfield[ng-model="$ctrl.worker.sip.extension"] input',
+ extensionInput: 'vn-worker-pbx [name="extension"]',
saveButton: 'vn-worker-pbx button[type=submit]'
},
workerTimeControl: {
@@ -723,7 +721,7 @@ export default {
acceptDeleteDialog: '.vn-confirm.shown button[response="accept"]'
},
invoiceOutIndex: {
- searchInvoiceOutInput: `vn-searchbar input`,
+ searchInvoiceOutInput: 'vn-searchbar [name="searchString"]',
searchButton: 'vn-searchbar vn-icon[icon="search"]',
searchResult: 'vn-invoice-out-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
},
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index 2ee454c0d..81f8299b0 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -81,8 +81,6 @@