[Koha-patches] [PATCH] [followup 5143] additional fixes for holdsqueue template

[Liz Rea]

This is the correct set, minus the nonsense about boraccount.

---
circ/view_holdsqueue.pl                            |    8 ++++++-
.../prog/en/modules/circ/view_holdsqueue.tmpl      |   22 ++++++++++---------
.../prog/en/modules/members/boraccount.tmpl        |   10 ++++++++-
3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 668bdd1..3023cdf 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -96,7 +96,13 @@ sub GetHoldsQueueItems {
	$sth->execute(@bind_params);
	my $items = [];
    while ( my $row = $sth->fetchrow_hashref ){
-		$row->{reservedate} = format_date($row->{reservedate});
+	$row->{reservedate} = format_date($row->{reservedate});
+	my $record = GetMarcBiblio($row->{biblionumber});
+    if ($record){
+        $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
+	    $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield};
+	    $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield};
+	}
        push @$items, $row;
    }
    return $items;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
index 52ddd85..ca11980 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
@@ -38,30 +38,32 @@
        <th>Collection</th>
        <th>Call Number</th>
        <th>Barcode</th>
-		<th>Patron</th>
+	<th>Patron</th>
        <th>Send To</th>
        <th>Date</th>
    </tr>
	</thead>
-     <tbody><!-- TMPL_LOOP NAME="itemsloop"-->
+    <tbody><!-- TMPL_LOOP NAME="itemsloop"-->
        <tr>
-            <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->"><strong><!-- TMPL_VAR NAME="title" escape="html"--></strong></a></p> 
-			<p><strong><!-- TMPL_VAR NAME="author" --></strong>
-			<!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
-										<!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" -->
-										<!-- TMPL_ELSIF name="copyrightdate"-->, <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF -->
+            <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->"><strong><!-- TMPL_VAR NAME="title" escape="html"--></strong> <!-- TMPL_VAR NAME="subtitle" ESCAPE="HTML"-->
+<!-- TMPL_VAR NAME="parts" --> <!-- TMPL_VAR NAME="numbers" --></a></p>
+                        <p><strong><!-- TMPL_VAR NAME="author" --></strong>
+                        <!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+                                                                                <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" -->
+                                                                                <!-- TMPL_ELSIF name="copyrightdate"-->, <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF -->
                                        <!-- TMPL_IF name="pages" -->: <!-- TMPL_VAR name="pages" --> <!-- /TMPL_IF -->
                                        <!-- TMPL_IF name="size" --><!-- TMPL_VAR name="size" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --></p>
-			</td>
+                        </td>
            <td><!-- TMPL_VAR NAME="ccode" --></td>
            <td><!-- TMPL_VAR NAME="location" --> <!-- TMPL_VAR NAME="itemcallnumber"--> <!-- TMPL_VAR NAME="enumchron" --></td>
            <td>
                <!-- TMPL_IF NAME="item_level_request" -->
-                    <!-- TMPL_VAR NAME="barcode" -->
+                    <em>Only Item: </em><!-- TMPL_VAR NAME="barcode" -->
                <!-- TMPL_ELSE -->
-                    <em>Any available copy</em>
+                    <!-- TMPL_VAR NAME="barcode" --> <em>or Any available copy</em>
                <!-- /TMPL_IF -->
            </td>
+
			<td><p><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->#reserves"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></p> <p><!-- TMPL_VAR NAME="phone" --></p></td>
            <td><!-- TMPL_VAR NAME="pickbranch" --></td>
            <td><!-- TMPL_VAR NAME="reservedate" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index fce5a4d..d0aadb0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -35,6 +35,7 @@
    <!-- TMPL_IF NAME="reverse_col" -->
    <th>&nbsp;</th>
    <!-- /TMPL_IF -->
+    <th>Print</th>
  </tr>

	<!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed -->
@@ -54,12 +55,19 @@
	<!-- /TMPL_IF -->
      </td>
	<!-- /TMPL_IF -->
+<td>
+	<!-- TMPL_IF NAME="payment" -->
+		<a target="_blank" href="printfeercpt.pl?action=print&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&accountno=<!-- TMPL_VAR NAME="accountno"-->">Print</a>
+	<!-- TMPL_ELSE -->
+		&nbsp;
+	<!-- /TMPL_IF -->
+      </td>
    </tr>

  <!-- /TMPL_LOOP -->
<tfoot>
  <tr>
-    <td colspan="3">Total due</td>
+    <td colspan="4">Total due</td>
    <!-- TMPL_IF NAME="totalcredit" --><td colspan="2" class="credit"><!-- TMPL_ELSE --><td colspan="2" class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
  </tr>
  </tfoot>
-- 
1.5.6.5