From f24824381a32719d7cba73d532fcdcba03d1da83 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 26 Apr 2013 09:30:23 +0200 Subject: [PATCH] [PASSED QA] Bug 10724: Pending orders: add basket group name in filters This patch adds a new filter "basket group name" for pending orders searches. Test plan: Try different filters and check that results are consistent. Try to filter by basket group name. Signed-off-by: Pierre Angot Signed-off-by: Katrin Fischer Applied on top of patches for bug 10723. Passes all tests and QA script. Note: It's a bit irritating that the basket name is not shown in the list of pending orders, so there is no way to check the results are correct without checking from another page. --- acqui/parcel.pl | 3 + .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 76 ++++++++++---------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 27be3c8..028e957 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -208,12 +208,14 @@ if(!defined $invoice->{closedate}) { my $ean = $input->param('eanfilter') || ''; my $basketname = $input->param('basketfilter') || ''; my $orderno = $input->param('orderfilter') || ''; + my $basketgroupname = $input->param('basketgroupnamefilter') || ''; $pendingorders = SearchOrders({ booksellerid => $booksellerid, basketname => $basketname, ordernumber => $orderno, search => $search, ean => $ean, + basketgroupname => $basketgroupname, pending => 1, }); $template->param( @@ -221,6 +223,7 @@ if(!defined $invoice->{closedate}) { eanfilter => $ean, basketfilter => $basketname, orderfilter => $orderno, + basketgroupnamefilter => $basketgroupname, ); }else{ $pendingorders = SearchOrders({ 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 174a6bf..250cc96 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -196,7 +196,7 @@ [% FOREACH loop_order IN loop_orders %] - [% loop_order.basketno %] + [% loop_order.basketname %] ([% loop_order.basketno %]) [% loop_order.ordernumber %] [% loop_order.title |html %] @@ -301,10 +301,10 @@ - - [% FOREACH loop_receive IN loop_received %] + + [% FOREACH loop_receive IN loop_received %] - [% loop_receive.basketno %] + [% loop_receive.basketname %] ([% loop_receive.basketno %]) [% loop_receive.ordernumber %] [% loop_receive.title |html %] [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] @@ -364,45 +364,41 @@
-
- -

Filter

- -
    - -
  1. - - -
  2. - -
  3. - - -
  4. - -
  5. - - -
  6. - [% IF (UNIMARC) %] +
    +

    Filter

    +
      +
    1. + + +
    2. +
    3. + + +
    4. +
    5. + + +
    6. +
    7. + + +
    8. + [% IF (UNIMARC) %]
    9. - - + +
    10. - [% END %] -
    -
    - - - - Clear -
    - - -
    - + [% END %] +
+
+ + + + Clear +
+
+ [% INCLUDE 'acquisitions-menu.inc' %]
[% INCLUDE 'intranet-bottom.inc' %] - -- 1.7.9.5