From f969323a86b0841bab241639b0ea099fd3cc7351 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 8 Jun 2021 17:30:00 +0200 Subject: [PATCH 1/2] ticket create now takes clientFk from params --- modules/ticket/front/create/card.js | 2 +- modules/ticket/front/index/index.html | 2 +- modules/ticket/front/index/index.js | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/ticket/front/create/card.js b/modules/ticket/front/create/card.js index 188d12d4d..94efe5f12 100644 --- a/modules/ticket/front/create/card.js +++ b/modules/ticket/front/create/card.js @@ -101,7 +101,7 @@ class Controller extends Component { this.$http.get(`Agencies/getAgenciesWithWarehouse`, {params}).then(res => { this.agencies = res.data; - const defaultAgency = this.agencies.find(agency=> { + const defaultAgency = this.agencies.find(agency => { return agency.agencyModeFk == this.defaultAddress.agencyModeFk; }); if (defaultAgency) diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 4865c8c62..acef6cd23 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -166,7 +166,7 @@ vn-tooltip="Payment on account..." tooltip-position="left"> - + Date: Wed, 9 Jun 2021 09:33:33 +0200 Subject: [PATCH 2/2] new ticket index selector updated --- e2e/helpers/selectors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 5060a8921..a5da8dddd 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -474,7 +474,7 @@ export default { advancedSearchDaysOnward: 'vn-ticket-search-panel vn-input-number[ng-model="filter.scopeDays"]', advancedSearchClient: 'vn-ticket-search-panel vn-textfield[ng-model="filter.clientFk"]', advancedSearchButton: 'vn-ticket-search-panel button[type=submit]', - newTicketButton: 'vn-ticket-index a[ui-sref="ticket.create"]', + newTicketButton: 'vn-ticket-index vn-button[icon="add"]', searchResult: 'vn-ticket-index vn-card > vn-table > div > vn-tbody > a.vn-tr', firstTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(1) > vn-td:nth-child(1) > vn-check', secondTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(2) > vn-td:nth-child(1) > vn-check',