From ce2b280903060a37e1cabeba66fc89a833a529a1 Mon Sep 17 00:00:00 2001
From: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Date: Sun, 22 Dec 2013 23:34:18 +0100
Subject: [PATCH] Bug 11435: Show basketgroup information in Acquisition tab in
 catalogue page

This patch adds a new column for displaying information about
basketgroups in the Acquisition tab on catalogue page for a record.

It also adds the number of the basket in the basket column.

If the user does not have group_manage permission, he just see the basketgroup name
and number.

If he has the permission, he can click to display the basketgroup.

If the basket is not in a basketgroup, the column is empty.

To test:

- Use a record in an order, and put the basket in a basketgroup.
- Connect with a user WITHOUT group_manage permission (but with order_manage
  permission).
- Go to the record's detail in catalogue and click on Acquisition tab.
- Check you see the name and number of the basketgroup, with no link
  around it.
- Check the number of the basket is displayed within () after the name of
  the basket
- Click on the basket link, check the basket displayed is the right one.

- Connect with a user WITH group_manage permission.
- Go to the record's detail in catalogue and click on Acquisition tab.
- Check you see a link with the name and number of the basketgroup.
- Click on the link, check the basketgroup displayed is the right one.

- On the basketgroup page, move the basket out of the basketgroup, and
  save the basketgroup.

- Go back to the record's page on the catalogue and click on Acquisition
  tab.
- Check the basketgroup column is empty

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../prog/en/modules/catalogue/detail.tt        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 1a81ef72dd..ceb34fe5c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -261,9 +261,9 @@ function verify_images() {
                 'sDom': 't',
                 'bPaginate': false,
                 'bAutoWidth': false,
-                "aaSorting": [[ 2, "desc" ]],
+                "aaSorting": [[ 3, "desc" ]],
                 "aoColumnDefs": [
-                    { "aTargets": [ 2, 3 ], "sType": "title-string" }
+                    { "aTargets": [ 3, 4 ], "sType": "title-string" }
                 ]
             }));
 
@@ -831,6 +831,7 @@ function verify_images() {
     <table id="orders">
       <thead>
         <tr>
+          <th>Basket group</th>
           <th>Basket</th>
           <th>Order number</th>
           <th>Creation date</th>
@@ -842,10 +843,19 @@ function verify_images() {
       <tbody>
       [% FOR order IN orders %]
           <tr>
+            <td>
+            [% IF (order.basketgroupid) %]
+                [% IF CAN_user_acquisition_group_manage %]
+                    <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% order.id %]&basketgroupid=[% order.basketgroupid %]">[% order.groupname %] ([% order.basketgroupid %])</a>
+                [% ELSE %]
+                    [% order.groupname %] ([% order.basketgroupid %])
+                [% END %]
+            [% END %]
+            </td>
             <td>[% IF CAN_user_acquisition_order_manage %]
-                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno %]">[% order.basketname %]</a>
+                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno %]">[% order.basketname %] ([% order.basketno %])</a>
             [% ELSE %]
-                [% order.basketname %]
+                [% order.basketname %] ([% order.basketno %])
             [% END %]</td>
             <td>[% order.ordernumber %]</td>
             <td><span title="[% order.creationdate %]">[% order.creationdate | $KohaDates%]</span></td>
-- 
2.39.5