From 481c062fe9ee72ffc204b6ccb37a4bfe0c23cadf Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Fri, 26 Apr 2013 09:30:23 +0200
Subject: [PATCH] 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 <tredok.pierre@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
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.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 acqui/parcel.pl                               |  3 +
 .../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 27be3c8d0c..028e95703a 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 174a6bf830..250cc96521 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 @@
     <tbody class="filterclass">
         [% FOREACH loop_order IN loop_orders %]
             <tr>
-                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
+                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
                 <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
                 <td class="summaryfilterclass">
                   <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
@@ -301,10 +301,10 @@
             <th></th>
         </tr>
     </tfoot>
-	<tbody class="filterclass">
-	    [% FOREACH loop_receive IN loop_received %]
+    <tbody class="filterclass">
+        [% FOREACH loop_receive IN loop_received %]
             <tr>
-                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
+                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
                 <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
                 <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
                 [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
@@ -364,45 +364,41 @@
 
 <div class="yui-b">
 <form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
-        <fieldset class="brief">
-
-            <h4>Filter</h4>
-
-	    <ol>
-
-		<li>
-		    <label for="summaryfilter">ISBN, author or title :</label>
-            <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
-		</li>
-
-		<li>
-		    <label for="basketfilter">Basket :</label>
-            <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
-		</li>
-
-		<li>
-            <label for="orderfilter">Order line :</label>
-            <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
-		</li>
-                [% IF (UNIMARC) %]
+  <fieldset class="brief">
+    <h4>Filter</h4>
+    <ol>
+      <li>
+        <label for="summaryfilter">ISBN, author or title :</label>
+        <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
+      </li>
+      <li>
+        <label for="basketfilter">Basket :</label>
+        <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
+      </li>
+      <li>
+          <label for="basketgroupnamefilter">Basket group name :</label>
+          <input type="text" name="basketgroupnamefilter" id="basketgroupnamefilter" value="[% basketgroupnamefilter %]" />
+      </li>
+      <li>
+        <label for="orderfilter">Order line :</label>
+        <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
+      </li>
+      [% IF (UNIMARC) %]
         <li>
-            <label for="eanfilter">EAN :</label>
-            <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
+          <label for="eanfilter">EAN :</label>
+          <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
         </li>
-                [% END %]
-	    </ol>
-		<fieldset class="action">
-        <input type="hidden" value="search" name="op" />
-        <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
-        <input type="submit" value="Filter" />
-        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
-		</fieldset>
-
-
-        </fieldset>
-    </form>
+      [% END %]
+    </ol>
+    <fieldset class="action">
+      <input type="hidden" value="search" name="op" />
+      <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
+      <input type="submit" value="Filter" />
+      <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
+    </fieldset>
+  </fieldset>
+</form>
 [% INCLUDE 'acquisitions-menu.inc' %]
 </div>
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]
- 
-- 
2.39.2