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

5914-transferInvoiceOut #1761

Merged
jorgep merged 55 commits from 5914-transferInvoiceOut into dev 2023-10-26 12:39:11 +00:00
Conversation 2 Commits 55 Files Changed 30 +5 -11
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e680a6a080 - Show all commits

7
back/models/vn-user.json
View File

@ -23,10 +23,6 @@
"columnName": "name" "columnName": "name"
} }
}, },
"password": {
"type": "string",
"required": true
},
"roleFk": { "roleFk": {
"type": "number", "type": "number",
"mysql": { "mysql": {
@ -42,9 +38,6 @@
"active": { "active": {
"type": "boolean" "type": "boolean"
}, },
"email": {
"type": "string"
},
"created": { "created": {
"type": "date" "type": "date"
}, },

9
modules/ticket/back/methods/ticket/transferSales.js
View File

@ -138,14 +138,15 @@ module.exports = Self => {
// Update original sale // Update original sale
const rest = originalSale.quantity - sale.quantity; const rest = originalSale.quantity - sale.quantity;
query = `UPDATE sale query = `UPDATE sale
SET quantity = ? SET quantity = ?,
originalQuantity = ?
WHERE id = ?`; WHERE id = ?`;
await Self.rawSql(query, [rest, sale.id], options); await Self.rawSql(query, [rest, rest, sale.id], options);
// Clone sale with new quantity // Clone sale with new quantity
query = `INSERT INTO sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, query = `INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, discount, priceFixed,
reserved, isPicked, isPriceFixed, isAdded) reserved, isPicked, isPriceFixed, isAdded)
SELECT itemFk, ?, concept, ?, originalQuantity, price, discount, priceFixed, SELECT itemFk, ?, concept, ?, price, discount, priceFixed,
reserved, isPicked, isPriceFixed, isAdded reserved, isPicked, isPriceFixed, isAdded
FROM sale FROM sale
WHERE id = ?`; WHERE id = ?`;