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..be790eb03 100644 --- a/modules/client/back/methods/client/lastActiveTickets.js +++ b/modules/client/back/methods/client/lastActiveTickets.js @@ -25,6 +25,9 @@ module.exports = Self => { Self.lastActiveTickets = async(id, ticketId) => { const ticket = await Self.app.models.Ticket.findById(ticketId); + let shipped = ticket.shipped; + shipped.setDate(shipped.getDate() + 15); + const query = ` SELECT t.id, t.shipped, a.name AS agencyName, w.name AS warehouseName, ad.city AS address FROM vn.ticket t @@ -32,11 +35,11 @@ module.exports = Self => { JOIN vn.agencyMode a ON t.agencyModeFk = a.id JOIN vn.warehouse w ON t.warehouseFk = w.id JOIN vn.address ad ON t.addressFk = ad.id - WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 + WHERE t.shipped BETWEEN CURDATE() AND ? 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]); + return Self.rawSql(query, [shipped, id, ticketId, ticket.warehouseFk]); }; }; diff --git a/modules/client/back/methods/client/specs/threeLastActive.spec.js b/modules/client/back/methods/client/specs/threeLastActive.spec.js index cd76a0b5b..8a30d0f13 100644 --- a/modules/client/back/methods/client/specs/threeLastActive.spec.js +++ b/modules/client/back/methods/client/specs/threeLastActive.spec.js @@ -2,11 +2,11 @@ const app = require('vn-loopback/server/server'); describe('client lastActiveTickets()', () => { it('should return the last three active tickets', async() => { - const clientId = 109; - const ticketId = 19; + const clientId = 104; + const ticketId = 9; let result = await app.models.Client.lastActiveTickets(clientId, ticketId); - expect(result.length).toEqual(3); + expect(result.length).toEqual(1); }); }); 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 | -
---|---|---|---|---|
No results | -||||
{{::ticket.id}} | -{{::ticket.shipped | date: 'dd/MM/yyyy'}} | -{{::ticket.agencyName}} | -{{::ticket.warehouseName}} | -{{::ticket.address}} | -