From 3da2aad21bd83063f4a593f516580477c58088d9 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 24 Apr 2025 09:15:20 -0400 Subject: [PATCH] fix add grouped fee --- database/getFeeCategories.js | 4 ++++ database/getFeeCategories.ts | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/database/getFeeCategories.js b/database/getFeeCategories.js index c9bf8ee1..cd652b49 100644 --- a/database/getFeeCategories.js +++ b/database/getFeeCategories.js @@ -16,6 +16,10 @@ export default async function getFeeCategories(filters, options, connectedDataba select feeCategoryId from Fees where recordDelete_timeMillis is null and (burialSiteTypeId is null or burialSiteTypeId = ?))`; sqlParameters.push(filters.burialSiteTypeId); } + if ((filters.feeCategoryId ?? '') !== '') { + sqlWhereClause += ` and feeCategoryId = ?`; + sqlParameters.push(filters.feeCategoryId); + } const feeCategories = database .prepare(`select feeCategoryId, feeCategory, isGroupedFee, orderNumber from FeeCategories diff --git a/database/getFeeCategories.ts b/database/getFeeCategories.ts index ae61c72f..98cadcc6 100644 --- a/database/getFeeCategories.ts +++ b/database/getFeeCategories.ts @@ -44,6 +44,11 @@ export default async function getFeeCategories( sqlParameters.push(filters.burialSiteTypeId) } + if ((filters.feeCategoryId ?? '') !== '') { + sqlWhereClause += ` and feeCategoryId = ?` + sqlParameters.push(filters.feeCategoryId) + } + const feeCategories = database .prepare( `select feeCategoryId, feeCategory, isGroupedFee, orderNumber