diff --git a/src/main/kotlin/com/restapi/controllers/Filters.kt b/src/main/kotlin/com/restapi/controllers/Filters.kt index 66d18ca..97d8b4d 100644 --- a/src/main/kotlin/com/restapi/controllers/Filters.kt +++ b/src/main/kotlin/com/restapi/controllers/Filters.kt @@ -204,14 +204,10 @@ fun searchDocs(commonFilters: CommonFilters, documentFilters: DocumentFilters): return q.findList() } -fun searchPos(commonFilters: CommonFilters, poFilters: POFilters?): List { - val poFilters = poFilters ?: POFilters() +fun searchPos(commonFilters: CommonFilters, poFilters0: POFilters?): List { + val poFilters = poFilters0 ?: POFilters() val q = database.find(PurchaseOrder::class.java) .where() - .ge("totalAmount", poFilters.totalAmountExceeds) - .le("totalAmount", poFilters.totalAmountLessThan) - .ge("validTill", poFilters.validAfter) - .le("validTill", poFilters.validBefore) .ilike("poNum", "%" + poFilters.poNumLike + "%") .ilike("referenceQuotation", "%" + poFilters.refQuotation + "%") applyFromToHelper(q, commonFilters.from, commonFilters.to, "poDate") diff --git a/src/main/kotlin/com/restapi/controllers/SaleOrder.kt b/src/main/kotlin/com/restapi/controllers/SaleOrder.kt index cf71876..f33471d 100644 --- a/src/main/kotlin/com/restapi/controllers/SaleOrder.kt +++ b/src/main/kotlin/com/restapi/controllers/SaleOrder.kt @@ -25,10 +25,10 @@ object PurchaseOrderCtrl { ctx.json(po).status(HttpStatus.OK) } - data class PF(val common: CommonFilters, val poFilters: POFilters) + data class PoFilterQuery(val common: CommonFilters, val poFilters: POFilters) fun getAll(ctx: Context) { - val filters = ctx.bodyAsClass() + val filters = ctx.bodyAsClass() val pos = searchPos(filters.common, filters.poFilters) val excel = ctx.queryParam("excel") if (excel != null) {