Show enumchron, copynumber in opac detail iff present.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 3992205..0b5d90a 100755 (executable)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -171,19 +171,27 @@
     <table>
         <tr>
             <!-- TMPL_IF NAME="item-level_itypes" --><th>Item type</th><!-- /TMPL_IF -->
-            <th>Location</th>
-            <th>Status</th>
-            <th>Date Due</th>
-                       <th>Last Seen</th>
-            <!-- TMPL_IF NAME="serial" --><th>Copy / Vol</th>
-            <th>Published</th><!-- /TMPL_IF -->
+                         <!-- TMPL_IF NAME="itemdata_ccode" --><th>Collection</th><!-- /TMPL_IF -->
+              <th>Location</th>
+                         <!-- TMPL_IF NAME="itemdata_enumchron" --><th>Vol Info</th><!-- /TMPL_IF -->
+                         <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy</th><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="serial" -->
+                         <th>Serial Data</th>
+              <th>Published</th><!-- /TMPL_IF -->
+              <th>Status</th>
+              <th>Date Due</th>
         </tr>
         <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
         <tr>
 
             <!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" -->
                     </td><!-- /TMPL_IF -->
-            <td><!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR name="location_description" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --></td>
+            <!-- TMPL_IF NAME="itemdata_ccode" --><td><!-- TMPL_VAR NAME="ccode" --></td><!-- /TMPL_IF -->
+                       <td><!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR name="location_description" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --></td>
+                       <!-- TMPL_IF NAME="itemdata_enumchron" --><td><!-- TMPL_VAR name="enumchron" --></td><!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="itemdata_copynumber" --><td><!-- TMPL_VAR name="copynumber" --></td><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="serial" --><td><!-- TMPL_VAR NAME="serialseq" --> </td>
+                       <td><!-- TMPL_VAR NAME="publisheddate" --> </td><!-- /TMPL_IF -->
             <td><!-- TMPL_IF name="bi_notforloan" -->
                     Not for loan
                 <!-- TMPL_ELSE -->
@@ -206,9 +214,6 @@
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_IF --></td>
             <td><!-- TMPL_VAR NAME="datedue" --></td>
-                       <td><!-- TMPL_VAR NAME="datelastseen" --></td>
-            <!-- TMPL_IF NAME="serial" --><td><!-- TMPL_VAR NAME="serialseq" --> </td>
-                       <td><!-- TMPL_VAR NAME="publisheddate" --> </td><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="type" -->
             <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a></td>
             <!-- /TMPL_IF -->

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index b3f6d65..d68f759 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -109,7 +109,8 @@ if (C4::Context->preference("RequestOnOpac")) {
 }
 
 my $norequests = 1;
-foreach my $itm (@items) {
+my %itemfields;
+for my $itm (@items) {
      $norequests = 0 && $norequests
        if ( (not $itm->{'wthdrawn'} )
          || (not $itm->{'itemlost'} )
@@ -124,11 +125,11 @@ foreach my $itm (@items) {
     $itm->{'location_description'} = GetAuthorisedValueDesc('','',   $itm->{'location'} ,'','','LOC');
     $itm->{'imageurl'}    = $imgdir."/".$itemtypes->{ $itm->{itype} }->{'imageurl'};     
     $itm->{'description'} = $itemtypes->{$itemtype}->{'description'};
-
+       $itemfields{ccode} = 1 if($itm->{ccode});
+       $itemfields{enumchron} = 1 if($itm->{enumchron});
+       $itemfields{copynumber} = 1 if($itm->{copynumber});
 }
 
-$template->param( norequests => $norequests, RequestOnOpac=>$RequestOnOpac );
-
 ## get notes and subjects from MARC record
     my $dbh              = C4::Context->dbh;
     my $marcflavour      = C4::Context->preference("marcflavour");
@@ -145,6 +146,11 @@ $template->param( norequests => $norequests, RequestOnOpac=>$RequestOnOpac );
         MARCAUTHORS => $marcauthorsarray,
         MARCSERIES  => $marcseriesarray,
         MARCURLS    => $marcurlsarray,
+               norequests => $norequests,
+               RequestOnOpac=>$RequestOnOpac,
+               itemdata_ccode => $itemfields{ccode},
+               itemdata_enumchron => $itemfields{enumchron},
+               itemdata_copynumber => $itemfields{copynumber},
     );
 
 foreach ( keys %{$dat} ) {