KOHA ZS: circ/pendingreserves

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 734b8d7..4bc8fee 100755 (executable)
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -185,6 +185,8 @@ my $strsth =
             reserves.biblionumber,
             reserves.branchcode as l_branch,
             reserves.itemnumber,
+            reserves.timestamp,
+            reserves.reservenotes,
             items.holdingbranch,
             items.homebranch,
             GROUP_CONCAT(DISTINCT $item_type
@@ -229,7 +231,7 @@ if (C4::Context->preference('IndependentBranches')){
     $strsth .= " AND items.holdingbranch=? ";
     push @query_params, C4::Context->userenv->{'branch'};
 }
-$strsth .= " GROUP BY reserves.biblionumber ORDER BY biblio.title ";
+$strsth .= " GROUP BY reserves.biblionumber,reserves.reserve_id ORDER BY biblio.title ";
 
 my $sth = $dbh->prepare($strsth);
 $sth->execute(@query_params);
@@ -263,6 +265,8 @@ while ( my $data = $sth->fetchrow_hashref ) {
             holdingbranch   => $data->{holdingbranch},
             homebranch      => $data->{homebranch},
             itemnumber      => $data->{itemnumber},
+            timestamp       => $data->{timestamp}, # FFZG
+            reservenotes    => $data->{reservenotes}, # FFZG
         }
     );
 }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 930c362..02e94b0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -73,7 +73,14 @@
             <td><p><b>[% reserveloo.pullcount | html %]</b></p></td>
             <td>[% reserveloo.count | html %]</td>
             <td>[% reserveloo.rcount | html %]</td>
-            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | uri %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a></td>
+            <td>
+                               [% reserveloo.timestamp | $KohaDates with_hours => 1 %]
+                               <br>
+                               <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | uri %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a>
+                               <br>
+                               <em>[% reserveloo.reservenotes | html %]</em>
+                       </td>
+
             <td>
             <p>
                 [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]