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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Bernat Exposito 2021-01-05 08:04:56 +01:00
parent ccfeea8e74 9aca59e47a
commit 57de04410f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/salix/components/upload-photo/style.scss
View File

@ -17,9 +17,7 @@
& > div > img[ng-src] {
width: 256px;
height: 256px;
display: block;
height: 100%;
width: 100%;
display: block
}
}

9
print/methods/closure.js
View File

@ -73,7 +73,7 @@ module.exports = app => {
}
});
app.get('/api/closure/by-agency', async function(req, res) {
app.get('/api/closure/by-agency', async function(req, res, next) {
try {
const reqArgs = req.args;
if (!reqArgs.agencyModeId)
@ -89,6 +89,7 @@ module.exports = app => {
message: 'Task executed successfully'
});
const agenciesId = reqArgs.agencyModeId.split(',');
const tickets = await db.rawSql(`
SELECT
t.id
@ -97,12 +98,12 @@ module.exports = app => {
JOIN ticketState ts ON ts.ticketFk = t.id
JOIN alertLevel al ON al.alertLevel = ts.alertLevel
WHERE al.code = 'PACKED'
AND t.agencyModeFk = :agencyModeId
AND t.agencyModeFk IN(:agencyModeId)
AND t.warehouseFk = :warehouseId
AND DATE(t.shipped) BETWEEN DATE_ADD(:to, INTERVAL -2 DAY) AND :to
AND t.refFk IS NULL
GROUP BY e.ticketFk`, {
agencyModeId: reqArgs.agencyModeId,
agencyModeId: agenciesId,
warehouseId: reqArgs.warehouseId,
to: reqArgs.to
});
@ -114,7 +115,7 @@ module.exports = app => {
}
});
app.get('/api/closure/by-route', async function(req, res) {
app.get('/api/closure/by-route', async function(req, res, next) {
try {
const reqArgs = req.args;
if (!reqArgs.routeId)