From ed27d83fa51c871769e18c65e09aae2f6eca9322 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 6 Nov 2020 15:16:00 -0300 Subject: [PATCH] Bug 20212: (QA follow-up) Resurrect column filtering This patch adds per-column filtering to the order receiving table. The order cost column proved difficult to filter, because of the syntax DBIC requires for comparing replacement_cost * quantity, and passing that all the way down from the API request to DBIC itself. I'm still looking for options. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize --- Koha/REST/V1/Acquisitions/Orders.pm | 6 +- .../prog/en/modules/acqui/parcel.tt | 156 ++++++++++++------ 2 files changed, 107 insertions(+), 55 deletions(-) diff --git a/Koha/REST/V1/Acquisitions/Orders.pm b/Koha/REST/V1/Acquisitions/Orders.pm index 3fb9b28b22..06e125e24a 100644 --- a/Koha/REST/V1/Acquisitions/Orders.pm +++ b/Koha/REST/V1/Acquisitions/Orders.pm @@ -312,8 +312,10 @@ sub fix_query { my $query = $args->{query}; my $biblioitem_fields = { - 'biblio.isbn' => 'biblio.biblioitem.isbn', - 'biblio.ean' => 'biblio.biblioitem.ean' + 'biblio.isbn' => 'biblio.biblioitem.isbn', + 'biblio.ean' => 'biblio.biblioitem.ean', + 'biblio.publisher' => 'biblio.biblioitem.publisher', + 'biblio.publication_year' => 'biblio.biblioitem.publication_year' }; if ( ref($query) eq 'HASH' ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index c2701a4d69..7f46839411 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -118,6 +118,24 @@     + +
+
+
+   +   +   +
+   +
+
+
+   + +
+   +   + @@ -371,26 +389,71 @@