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

refs #6254 collection getTickets
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Andrés 2023-09-29 13:47:29 +02:00
parent 41ac907b05
commit 17e6cffa3d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/methods/collection/getTickets.js
View File

@ -27,7 +27,7 @@ module.exports = Self => {
Self.getTickets = async(ctx, id, print, options) => { Self.getTickets = async(ctx, id, print, options) => {
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const origin = ctx.req.headers.origin; const origin = ctx.req.headers.origin;
const $t = ctx.req.__; // $translate const $t = ctx.req.__;
const myOptions = {}; const myOptions = {};
if (typeof options == 'object') if (typeof options == 'object')
@ -59,11 +59,7 @@ module.exports = Self => {
sh.code, sh.code,
IFNULL(p2.code, p.code) parkingCode, IFNULL(p2.code, p.code) parkingCode,
IFNULL(p2.pickingOrder, p.pickingOrder) pickingOrder, IFNULL(p2.pickingOrder, p.pickingOrder) pickingOrder,
<<<<<<< Updated upstream
iss.id itemShelvingSaleFk
=======
iss.id itemShelvingSaleFk, iss.id itemShelvingSaleFk,
>>>>>>> Stashed changes
iss.isPicked iss.isPicked
FROM ticketCollection tc FROM ticketCollection tc
LEFT JOIN collection c ON c.id = tc.collectionFk LEFT JOIN collection c ON c.id = tc.collectionFk