Bug 10636 - patronimage should have borrowernumber as PK, not cardnumber

[koha.git] / members / moremember.pl

diff --git a/members/moremember.pl b/members/moremember.pl
index 2e5c66a..e7542a2 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -212,7 +212,7 @@ $bor{'borrowernumber'} = $borrowernumber;
 
 # Converts the branchcode to the branch name
 my $samebranch;
-if ( C4::Context->preference("IndependantBranches") ) {
+if ( C4::Context->preference("IndependentBranches") ) {
     my $userenv = C4::Context->userenv;
     unless ( $userenv->{flags} % 2 == 1 ) {
         $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} );
@@ -302,6 +302,8 @@ if ($borrowernumber) {
             $getreserv{nottransferedby} =
                 GetBranchName( $getiteminfo->{'holdingbranch'} );
         }
+        $getreserv{title}          = $getiteminfo->{'title'};
+        $getreserv{subtitle}       = GetRecordValue('subtitle', GetMarcBiblio($getiteminfo->{biblionumber}), GetFrameworkCode($getiteminfo->{biblionumber}));
 
 #              if we don't have a reserv on item, we put the biblio infos and the waiting position
         if ( $getiteminfo->{'title'} eq '' ) {
@@ -309,6 +311,7 @@ if ($borrowernumber) {
             my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
             $getreserv{color}           = 'inwait';
             $getreserv{title}           = $getbibinfo->{'title'};
+            $getreserv{subtitle}        = GetRecordValue('subtitle', GetMarcBiblio($num_res->{biblionumber}), GetFrameworkCode($num_res->{biblionumber}));
             $getreserv{nottransfered}   = 0;
             $getreserv{itemtype}        = $getbibtype->{'description'};
             $getreserv{author}          = $getbibinfo->{'author'};
@@ -317,6 +320,8 @@ if ($borrowernumber) {
         $getreserv{waitingposition} = $num_res->{'priority'};
         $getreserv{suspend} = $num_res->{'suspend'};
         $getreserv{suspend_until} = $num_res->{'suspend_until'};
+        $getreserv{expirationdate} = $num_res->{'expirationdate'};
+        $getreserv{reserve_id} = $num_res->{'reserve_id'};
 
         push( @reservloop, \%getreserv );
     }
@@ -338,7 +343,7 @@ my $candeleteuser;
 my $userenv = C4::Context->userenv;
 if($userenv->{flags} % 2 == 1){
     $candeleteuser = 1;
-}elsif ( C4::Context->preference("IndependantBranches") ) {
+}elsif ( C4::Context->preference("IndependentBranches") ) {
     $candeleteuser = ( $data->{'branchcode'} eq $userenv->{branch} );
 }else{
     if( C4::Auth::getuserflags( $userenv->{flags},$userenv->{number})->{borrowers} ) {
@@ -351,7 +356,7 @@ if($userenv->{flags} % 2 == 1){
 # check to see if patron's image exists in the database
 # basically this gives us a template var to condition the display of
 # patronimage related interface on
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 my $branch=C4::Context->userenv->{'branch'};
@@ -446,8 +451,7 @@ sub build_issue_data {
         if ($issue->{issuedate} ) {
            $issuedate = $issue->{issuedate}->clone();
         }
-
-        my $biblionumber = $issue->{biblionumber};
+        $issue->{subtitle} = GetRecordValue('subtitle', GetMarcBiblio($issue->{biblionumber}), GetFrameworkCode($issue->{biblionumber}));
         $issue->{issuingbranchname} = GetBranchName($issue->{branchcode});
         my %row          = %{$issue};
         $totalprice += $issue->{replacementprice};