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

7773-testToMaster_2430 #2774

Merged
alexm merged 368 commits from 7773-testToMaster_2430 into master 2024-07-23 06:21:03 +00:00
Conversation 0 Commits 368 Files Changed 248 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e48263636 - Show all commits

10
modules/ticket/back/models/sale.js
View File

@ -83,19 +83,19 @@ module.exports = Self => {
const [itemInfo] = await models.Sale.rawSql(`SELECT available FROM tmp.ticketCalculateItem`, null, ctx.options); const [itemInfo] = await models.Sale.rawSql(`SELECT available FROM tmp.ticketCalculateItem`, null, ctx.options);
const available = itemInfo?.available; const available = itemInfo?.available;
// if ((!isReduction && !available) || available < quantityAdded) if ((!isReduction && !available) || available < quantityAdded)
// throw new UserError(`This item is not available`); throw new UserError(`This item is not available`);
if (await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*')) return; if (await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*')) return;
const today = new Date(); const now = Date.vnNew();
const minQuantity = await models.ItemMinimumQuantity.findOne({ const minQuantity = await models.ItemMinimumQuantity.findOne({
fields: ['quantity'], fields: ['quantity'],
where: { where: {
itemFk: itemId, itemFk: itemId,
started: {lte: today}, started: {lte: now},
or: [ or: [
{ended: {gte: today}}, {ended: {gte: now}},
{ended: null} {ended: null}
], ],
// eslint-disable-next-line no-dupe-keys // eslint-disable-next-line no-dupe-keys