diff --git a/app/controllers/dashboard.controller.js b/app/controllers/dashboard.controller.js index b7149f5..9143de2 100644 --- a/app/controllers/dashboard.controller.js +++ b/app/controllers/dashboard.controller.js @@ -76,7 +76,7 @@ exports.getEstablishmentDashboard = async (req, res) => { attributes: { include: [ [ - Sequelize.literal(`( SELECT COUNT(*) FROM submission_products AS sp WHERE sp.submission_id = submission.id )`), + Sequelize.literal(`( SELECT COUNT(*) FROM submission_products AS sp WHERE sp.submission_id = submission.id AND sp.is_active = 1 )`), "product_count", ], [ diff --git a/app/controllers/submission.controller.js b/app/controllers/submission.controller.js index a1b694a..e640a87 100644 --- a/app/controllers/submission.controller.js +++ b/app/controllers/submission.controller.js @@ -506,11 +506,11 @@ exports.submissionHistory = async (req, res) => { attributes: { include: [ [ - Sequelize.literal(`(SELECT COUNT(*) FROM submission_products AS sp1 WHERE sp1.submission_id = submission.id)`), + Sequelize.literal(`(SELECT COUNT(*) FROM submission_products AS sp1 WHERE sp1.submission_id = submission.id AND sp1.is_active = 1)`), "product_count" ], [ - Sequelize.literal(`(SELECT ROUND(COALESCE(SUM(sp2.current_cost), 0), 2) FROM submission_products AS sp2 WHERE sp2.submission_id = submission.id)`), + Sequelize.literal(`(SELECT ROUND(COALESCE(SUM(sp2.current_cost), 0), 2) FROM submission_products AS sp2 WHERE sp2.submission_id = submission.id AND sp2.is_active = 1)`), "total_cost" ] ]