verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

fix test and refactor transferlines #397

Merged
bernat merged 2 commits from 2480-transfer_line into dev 2020-09-30 12:20:14 +00:00
Conversation 0 Commits 2 Files Changed 7 +30 -30
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2e/helpers/selectors.js
View File

@ -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',

1
e2e/paths/04-item/09_regularize.spec.js
View File

@ -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');
});

2
e2e/paths/05-ticket/18_index_payout.spec.js
View File

@ -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);

2
e2e/paths/12-entry/03_latestBuys.spec.js
View File

@ -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});
});

3
modules/client/back/methods/client/lastActiveTickets.js
View File

@ -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]);
};
};

45
modules/ticket/front/sale/index.html
View File

@ -323,32 +323,31 @@
icon="info">
</vn-icon>
</vn-horizontal>
<table class="vn-table">
<thead>
<tr>
<th number>Id</th>
<th number translate>Shipped</th>
<th number translate>Agency</th>
<th number translate>Warehouse</th>
<th number translate>Address</th>
</tr>
</thead>
<tbody>
<tr ng-if="$ctrl.transfer.lastActiveTickets.length === 0" >
<td colspan="4" style="text-align: center" translate>No results</td>
</tr>
<tr
<vn-table class="destinationTable">
<vn-thead>
<vn-tr>
<vn-th number>Id</vn-th>
<vn-th number>Shipped</vn-th>
<vn-th number>Agency</vn-th>
<vn-th number>Warehouse</vn-th>
<vn-th number>Address</vn-th>
</vn-tr>
</vn-thead>
<vn-tbody>
<vn-data-viewer data="$ctrl.transfer.lastActiveTickets">
</vn-data-viewer>
<vn-tr
class="clickable"
ng-repeat="ticket in $ctrl.transfer.lastActiveTickets track by ticket.id"
ng-click="$ctrl.transferSales(ticket.id)">
<td number>{{::ticket.id}}</td>
<td number>{{::ticket.shipped | date: 'dd/MM/yyyy'}}</td>
<td number>{{::ticket.agencyName}}</td>
<td number>{{::ticket.warehouseName}}</td>
<td number>{{::ticket.address}}</td>
</tr>
</tbody>
</table>
<vn-td number>{{::ticket.id}}</vn-td>
<vn-td number>{{::ticket.shipped | date: 'dd/MM/yyyy'}}</vn-td>
<vn-td number>{{::ticket.agencyName}}</vn-td>
<vn-td number>{{::ticket.warehouseName}}</vn-td>
<vn-td number>{{::ticket.address}}</vn-td>
</vn-tr>
</vn-tbody>
</vn-table>
<form name="form">
<vn-horizontal class="vn-py-md">
<vn-input-number vn-one

4
modules/ticket/front/sale/style.scss
View File

@ -80,8 +80,8 @@ vn-ticket-sale {
max-height: 400px;
width: 480px;
}
table {
width: 400px
.destinationTable {
width: 700px
}
}
.vn-popover .edit-popover {