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

7953-devToTest_2438 #2942

Merged
alexm merged 199 commits from 7953-devToTest_2438 into test 2024-09-10 07:22:31 +00:00
Conversation 0 Commits 199 Files Changed 1288 +7 -6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dbd8f94555 - Show all commits

1
db/dump/dump.after.sql
View File

@ -1,4 +1,5 @@
CREATE USER 'vn'@'localhost'; CREATE USER 'vn'@'localhost';
INSERT INTO `ormConfig`(`id`,`selectLimit`) VALUES(1,1000);
GRANT SELECT, GRANT SELECT,
INSERT, INSERT,

12
modules/item/back/methods/fixed-price/filter.js
View File

@ -186,12 +186,12 @@ module.exports = Self => {
} }
if (ctx.req.query.showBadDates === 'true') { if (ctx.req.query.showBadDates === 'true') {
stmt.merge({ stmt.merge({
sql: `WHERE sql: ` WHERE
fp.started> util.VN_CURDATE() `}); fp.started> util.VN_CURDATE() `});
} } else
stmt.merge(conn.makeWhere(filter.where));
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeOrderBy(filter.order));
stmt.merge(conn.makeLimit(filter));
const fixedPriceIndex = stmts.push(stmt) - 1; const fixedPriceIndex = stmts.push(stmt) - 1;
const sql = ParameterizedSQL.join(stmts, ';'); const sql = ParameterizedSQL.join(stmts, ';');
const result = await conn.executeStmt(sql, myOptions); const result = await conn.executeStmt(sql, myOptions);