diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 91961c5e3..64fef6690 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -20,7 +20,8 @@ export default { userConfigFirstAutocomplete: '#localWarehouse', userConfigSecondAutocomplete: '#localBank', userConfigThirdAutocomplete: '#localCompany', - acceptButton: '.vn-confirm.shown button[response=accept]' + acceptButton: '.vn-confirm.shown button[response=accept]', + searchButton: 'vn-searchbar vn-icon[icon="search"]', }, clientsIndex: { topbarSearch: 'vn-topbar', diff --git a/e2e/paths/04-item/09_regularize.spec.js b/e2e/paths/04-item/09_regularize.spec.js index 6de995515..fdb1e0184 100644 --- a/e2e/paths/04-item/09_regularize.spec.js +++ b/e2e/paths/04-item/09_regularize.spec.js @@ -124,7 +124,6 @@ describe('Item regularize path', () => { page.waitForNavigation({waitUntil: ['load', 'networkidle0', 'domcontentloaded']}), page.waitToClick(selectors.globalItems.ticketsButton) ]); - await page.waitForTransitionEnd('vn-searchbar'); await page.waitForState('ticket.index'); }); diff --git a/e2e/paths/05-ticket/18_index_payout.spec.js b/e2e/paths/05-ticket/18_index_payout.spec.js index 37e5261dc..24214228b 100644 --- a/e2e/paths/05-ticket/18_index_payout.spec.js +++ b/e2e/paths/05-ticket/18_index_payout.spec.js @@ -20,7 +20,7 @@ describe('Ticket index payout path', () => { }); it('should check the second ticket from a client and 1 of another', async() => { - await page.keyboard.press('Enter'); + await page.waitToClick(selectors.globalItems.searchButton); await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox); await page.waitToClick(selectors.ticketsIndex.sixthTicketCheckbox); await page.waitToClick(selectors.ticketsIndex.payoutButton); diff --git a/e2e/paths/12-entry/03_latestBuys.spec.js b/e2e/paths/12-entry/03_latestBuys.spec.js index e3cfadbcc..33acdb318 100644 --- a/e2e/paths/12-entry/03_latestBuys.spec.js +++ b/e2e/paths/12-entry/03_latestBuys.spec.js @@ -18,7 +18,7 @@ describe('Entry lastest buys path', () => { it('should access the latest buys seccion and search not seeing the edit buys button yet', async() => { await page.waitToClick(selectors.entryLatestBuys.latestBuysSectionButton); await page.waitFor(250); - await page.keyboard.press('Enter'); + await page.waitToClick(selectors.globalItems.searchButton); await page.waitForSelector(selectors.entryLatestBuys.editBuysButton, {visible: false}); }); diff --git a/modules/client/back/methods/client/lastActiveTickets.js b/modules/client/back/methods/client/lastActiveTickets.js index 5f8ef1393..c69c860c9 100644 --- a/modules/client/back/methods/client/lastActiveTickets.js +++ b/modules/client/back/methods/client/lastActiveTickets.js @@ -35,8 +35,9 @@ module.exports = Self => { WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 AND t.id <> ? AND t.warehouseFk = ? ORDER BY t.shipped - LIMIT 3`; + LIMIT 10`; return Self.rawSql(query, [id, ticketId, ticket.warehouseFk]); }; }; + diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index ab3277e31..90cfa39d1 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -323,32 +323,31 @@ icon="info"> - - - - - - - - - - - - - - - + + + Id + Shipped + Agency + Warehouse + Address + + + + + + - - - - - - - -
IdShippedAgencyWarehouseAddress
No results
{{::ticket.id}}{{::ticket.shipped | date: 'dd/MM/yyyy'}}{{::ticket.agencyName}}{{::ticket.warehouseName}}{{::ticket.address}}
+ {{::ticket.id}} + {{::ticket.shipped | date: 'dd/MM/yyyy'}} + {{::ticket.agencyName}} + {{::ticket.warehouseName}} + {{::ticket.address}} + + +