modules/item/back/methods/fixed-price/filter.js

@@ -128,6 +128,9 @@ module.exports = Self => {
                 return {[param]: value};
             }
         });
+        if (ctx.req.query.showBadDates === 'true')
+            where['fp.started'] = {gte: Date.vnNew()};
+
         filter = mergeFilters(filter, {where});
 
         const stmts = [];
@@ -184,14 +187,8 @@ module.exports = Self => {
                 }
             }
         }
-        if (ctx.req.query.showBadDates === 'true') {
-            stmt.merge({
-                sql: ` WHERE
-                fp.started> util.VN_CURDATE() `});
-        } else
-            stmt.merge(conn.makeWhere(filter.where));
-        stmt.merge(conn.makeOrderBy(filter.order));
-        stmt.merge(conn.makeLimit(filter));
+
+        stmt.merge(conn.makeSuffix(filter));
         const fixedPriceIndex = stmts.push(stmt) - 1;
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);