From d55bd7098b5b083fb290c5545a7f162b2352c210 Mon Sep 17 00:00:00 2001
From: Lyon3 Team <koha@univ-lyon3.fr>
Date: Mon, 19 Dec 2011 18:32:31 +0100
Subject: [PATCH] Add location and callnumber at OPAC subscription view

---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    8 ++++++--
 opac/opac-detail.pl                                |    3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 066f4ff..1254862 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -773,8 +773,12 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <h2>This is a serial</h2>
     <p>There are [% subscriptionsnumber %] subscription(s) associated with this title.</p>
     [% FOREACH subscription IN subscriptions %]
-    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
-    [% IF ( subscription.branchcode ) %]<h3>At branch: [% subscription.branchcode %]</h3>[% END %][% END %]
+    <h3><br>
+    [% IF ( subscription.branchname ) %][% subscription.branchname %][% ELSE %]
+    [% IF ( subscription.branchcode ) %][% subscription.branchcode %][% END %][% END %]
+    [% IF ( subscription.location_description ) %], [% subscription.location_description %][% ELSE %], [% subscription.location %][% END %]
+    [% IF ( subscription.callnumber ) %], [% subscription.callnumber %][% END %]
+    </h3>
     [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes %] </p>[% END %]
     <p>Subscription from: [% subscription.histstartdate %]  to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate %] [% ELSE %] now (current)[% END %]</p>
     [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 8949444..5769480 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -444,6 +444,9 @@ foreach my $subscription (@subscriptions) {
     $cell{histenddate}       = format_date($subscription->{histenddate});
     $cell{branchcode}        = $subscription->{branchcode};
     $cell{branchname}        = GetBranchName($subscription->{branchcode});
+    $cell{location}          = $subscription->{location};
+    $cell{location_description} = $shelflocations->{ $subscription->{'location'} };
+    $cell{callnumber}        = $subscription->{callnumber};
     $cell{hasalert}          = $subscription->{hasalert};
     #get the three latest serials.
     $serials_to_display = $subscription->{opacdisplaycount};
-- 
1.7.2.5