refs #6254 collection getTickets

back/methods/collection/getTickets.js

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