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

#6321 - Negative tickets #1945

Open
jsegarra wants to merge 93 commits from 6321_negative_tickets into dev
pull from: 6321_negative_tickets
merge into: verdnatura:dev
Conversation 0 Commits 93 Files Changed 28 +6 -4
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e45ac6424c - Show all commits

4
modules/ticket/back/methods/sale/replaceItem.js
View File

@ -25,12 +25,12 @@ module.exports = Self => {
root: true root: true
}, },
http: { http: {
path: `/recalculatePrice`, path: `/replaceItem`,
verb: 'POST' verb: 'POST'
} }
}); });
Self.recalculatePrice = async(ctx, saleFk, itemFk, quantity, options) => { Self.replaceItem = async(ctx, saleFk, itemFk, quantity, options) => {
const myOptions = {userId: ctx.req.accessToken.userId}; const myOptions = {userId: ctx.req.accessToken.userId};
let tx; let tx;

1
modules/ticket/back/methods/ticket/itemLackDetail.js
View File

@ -47,6 +47,7 @@ module.exports = Self => {
s.itemFk itemFk, s.itemFk itemFk,
s.price price, s.price price,
al.code alertLevelCode, al.code alertLevelCode,
z.id zoneFk,
z.name zoneName, z.name zoneName,
z.hour theoreticalhour, z.hour theoreticalhour,
cn.isRookie, cn.isRookie,

2
modules/ticket/back/methods/ticket/specs/itemLack.spec.js
View File

@ -1,6 +1,6 @@
const models = require('vn-loopback/server/server').models; const models = require('vn-loopback/server/server').models;
fdescribe('Item Lack', () => { describe('Item Lack', () => {
beforeEach(async() => { beforeEach(async() => {
ctx = { ctx = {
req: { req: {

3
modules/ticket/back/methods/ticket/split.js
View File

@ -36,7 +36,8 @@ module.exports = Self => {
try { try {
const ticketsIds = tickets.map(({ticketFk}, index) => ticketFk); const ticketsIds = tickets.map(({ticketFk}, index) => ticketFk);
const ticketsCount = await Self.rawSql(` const ticketsCount = await Self.rawSql(`
jgallego commented 2024-04-08 12:49:03 +00:00
Review
Copy Link

si el objetivo es contar tickets te sobraria la tabla sale,
si el objetivo es contar sales te sobraria la tabla ticket

si el objetivo es contar tickets te sobraria la tabla sale, si el objetivo es contar sales te sobraria la tabla ticket
Select t.id tid, s.id sid, count(s.id) count from Select t.id tid, s.id sid, count(s.id) count
FROM
vn.ticket t vn.ticket t
LEFT JOIN vn.sale s LEFT JOIN vn.sale s
ON s.ticketFk = t.id ON s.ticketFk = t.id