From 5d7aa7e4356e0d014a31c43d4784c2a8d14d843f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Apr 2013 16:57:07 +0200 Subject: [PATCH] Bug 10725: Add filters on the pending orders table Since the parcel.pl script get *all* pending orders, there is no reason not to display all of them. Like that, DataTable manages pagination and sorting correctly (on all data). This patch adds filters on the table header (using columnFilter). Test plan: Try filters on the left of the screen and filters on the table header. Signed-off-by: Pierre Angot Signed-off-by: Katrin Fischer Passes all tests and QA script. Searching and sorting the table works correctly. Larger result sets are a performance problem on this page, I have filed bug 10595 for that. Signed-off-by: Galen Charlton --- acqui/parcel.pl | 2 +- .../prog/en/modules/acqui/parcel.tt | 59 ++++++++++++++----- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 42f2960a4f..839c2a9944 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -203,7 +203,7 @@ for my $item ( @parcelitems ) { push @book_foot_loop, map { $_ } values %foot; my @loop_orders = (); -if(!defined $invoice->{closedate}) { +unless( defined $invoice->{closedate} ) { my $pendingorders; if($op eq "search"){ my $search = $input->param('summaryfilter') || ''; 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 250cc96521..fef72dc82d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -4,6 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'greybox.inc' %]