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

Merge pull request 'fixes #5168 Mostrar instance-log en Ticket/Sale solo cuando haya registros' (!1341) from 5168-mostrar-instanceLog into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1341
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Alexandre Riera 2023-02-24 08:34:16 +00:00
parent 36651aa423 6a65c9f0e2
commit e7e7fef285
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
View File

@ -197,6 +197,7 @@ describe('Ticket Edit sale path', () => {
}); });
it('should check in the history that logs has been added', async() => { it('should check in the history that logs has been added', async() => {
await page.reload({waitUntil: ['networkidle0', 'domcontentloaded']});
await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton); await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
await page.waitForSelector(selectors.ticketSales.firstSaleHistory); await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
const result = await page.countElement(selectors.ticketSales.firstSaleHistory); const result = await page.countElement(selectors.ticketSales.firstSaleHistory);

10
modules/ticket/back/methods/ticket/getSales.js
View File

@ -87,6 +87,14 @@ module.exports = Self => {
for (let problem of problems) for (let problem of problems)
saleProblems.set(problem.saleFk, problem); saleProblems.set(problem.saleFk, problem);
const ticketLog = await Self.rawSql(`SELECT DISTINCT changedModelId
FROM ticketLog tl
WHERE changedModel = 'Sale'
AND originFk = ?`, [id], myOptions);
const salesWithLogs = ticketLog.map(sale => {
return sale.changedModelId;
});
for (let sale of sales) { for (let sale of sales) {
const problems = saleProblems.get(sale.id); const problems = saleProblems.get(sale.id);
const itemStock = itemAvailable.get(sale.itemFk); const itemStock = itemAvailable.get(sale.itemFk);
@ -98,6 +106,8 @@ module.exports = Self => {
sale.hasTicketRequest = problems.hasTicketRequest; sale.hasTicketRequest = problems.hasTicketRequest;
sale.hasComponentLack = problems.hasComponentLack; sale.hasComponentLack = problems.hasComponentLack;
} }
if (salesWithLogs.includes(sale.id))
sale.$hasLogs = true;
} }
return sales; return sales;

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

@ -211,7 +211,8 @@
vn-none vn-none
vn-tooltip="History" vn-tooltip="History"
icon="history" icon="history"
ng-click="log.open()"> ng-click="log.open()"
ng-show="sale.$hasLogs">
</vn-icon-button> </vn-icon-button>
<vn-instance-log <vn-instance-log
vn-id="log" vn-id="log"