From 04082998d61d3f5c68e7493e5b49ee0b5432e8b7 Mon Sep 17 00:00:00 2001
From: Lyon3 Team <koha@univ-lyon3.fr>
Date: Thu, 17 Jan 2013 18:55:01 +0100
Subject: [PATCH] Bug 7654:Add location and callnumber at opac subscription view

---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    8 ++++++--
 opac/opac-detail.pl                                |    4 +++-
 2 files changed, 9 insertions(+), 3 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 bee65c2..dcef82e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -894,10 +894,14 @@ 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 library: [% 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 %][% ELSIF subscription.location %], [% subscription.location %][% END %]
+    [% IF ( subscription.callnumber ) %], [% subscription.callnumber %][% END %]
     [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
     <span style="display:none;"> [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %]</p>[% END %]</span>
+    </h3>
     [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
     <p>Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% 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 8970090..43f741b 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -471,8 +471,10 @@ foreach my $subscription (@subscriptions) {
     $cell{histenddate}       = $subscription->{histenddate};
     $cell{branchcode}        = $subscription->{branchcode};
     $cell{branchname}        = GetBranchName($subscription->{branchcode});
-    $cell{hasalert}          = $subscription->{hasalert};
+    $cell{location}          = $subscription->{location};
+    $cell{location_description} = $shelflocations->{ $subscription->{'location'} };
     $cell{callnumber}        = $subscription->{callnumber};
+    $cell{hasalert}          = $subscription->{hasalert};
     $cell{closed}            = $subscription->{closed};
     #get the three latest serials.
     $serials_to_display = $subscription->{opacdisplaycount};
-- 
1.7.2.5