wr76595 (bug 4157): Control barcode display with a borrower attribute

[koha_gimpoz] / opac / opac-user.pl

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 5601e85..c16eaaf 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -27,6 +27,8 @@ use C4::Koha;
 use C4::Circulation;
 use C4::Reserves;
 use C4::Members;
+use C4::Members::AttributeTypes;
+use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
 use C4::Output;
 use C4::Biblio;
 use C4::Items;
@@ -34,6 +36,8 @@ use C4::Dates qw/format_date/;
 use C4::Letters;
 use C4::Branch; # GetBranches
 
+use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
+
 my $query = new CGI;
 
 BEGIN {
@@ -108,7 +112,7 @@ my @issuedat;
 my $itemtypes = GetItemTypes();
 my ($issues) = GetPendingIssues($borrowernumber);
 if ($issues){
-       foreach my $issue ( sort sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) {
+       foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) {
                # check for reserves
                my ( $restype, $res ) = CheckReserves( $issue->{'itemnumber'} );
                if ( $restype ) {
@@ -167,6 +171,13 @@ $template->param( issues_count => $count );
 $template->param( OVERDUES       => \@overdues );
 $template->param( overdues_count => $overdues_count );
 
+my $show_barcode = C4::Members::AttributeTypes::AttributeTypeExists( ATTRIBUTE_SHOW_BARCODE );
+if ($show_barcode) {
+    my $patron_show_barcode = GetBorrowerAttributeValue($borrowernumber, ATTRIBUTE_SHOW_BARCODE);
+    undef $show_barcode if defined($patron_show_barcode) && !$patron_show_barcode;
+}
+$template->param( show_barcode => 1 ) if $show_barcode;
+
 # load the branches
 my $branches = GetBranches();
 my @branch_loop;
@@ -228,7 +239,7 @@ foreach my $res (@reserves) {
             $res->{'wait'}= 1; 
             $res->{'holdingbranch'}=$item->{'holdingbranch'};
             $res->{'biblionumber'}=$item->{'biblionumber'};
-            $res->{'barcodenumber'} = $item->{'barcode'};
+            $res->{'barcode'} = $item->{'barcode'};
             $res->{'wbrcode'} = $res->{'branchcode'};
             $res->{'itemnumber'}    = $res->{'itemnumber'};
             $res->{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};