X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=5b763f4648a492c58a3940e89a5bdcece3a7f93c;hb=603ab05edf8172ff3de2d9b11117261e2e56c42d;hp=e2e25cf3e2d876215b025d68b218c2c757932bea;hpb=102792a89f2cbff8c95f2c343d6bd069a8de54dc;p=koha.git

diff --git a/members/moremember.pl b/members/moremember.pl
index e2e25cf3e2..5b763f4648 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -38,6 +38,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Members;
 use C4::Members::Attributes;
+use C4::Members::AttributeTypes;
 use C4::Dates;
 use C4::Reserves;
 use C4::Circulation;
@@ -61,13 +62,14 @@ my $dbh = C4::Context->dbh;
 my $input = new CGI;
 $debug or $debug = $input->param('debug') || 0;
 my $print = $input->param('print');
+my $override_limit = $input->param("override_limit") || 0;
 my @failedrenews = $input->param('failedrenew');
 my @failedreturns = $input->param('failedreturn');
 my $error = $input->param('error');
-my @renew_failed;
-for my $renew (@failedrenews) { $renew_failed[$renew] = 1; }
-my @return_failed;
-for my $failedret (@failedreturns) { $return_failed[$failedret] = 1; }
+my %renew_failed;
+for my $renew (@failedrenews) { $renew_failed{$renew} = 1; }
+my %return_failed;
+for my $failedret (@failedreturns) { $return_failed{$failedret} = 1; }
 
 my $template_name;
 
@@ -200,7 +202,9 @@ if ( C4::Context->preference("IndependantBranches") ) {
     unless ( $userenv->{flags} == 1 ) {
         $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} );
     }
-    $samebranch = 1 if ( $userenv->{flags} == 1 );
+    $samebranch = 1 if ( $userenv->{flags} % 2 == 1 );
+}else{
+    $samebranch = 1;
 }
 my $branchdetail = GetBranchDetail( $data->{'branchcode'});
 $data->{'branchname'} = $branchdetail->{branchname};
@@ -214,7 +218,8 @@ my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
 
 # current issues
 #
-my ( $count, $issue ) = GetPendingIssues($borrowernumber);
+my $issue = GetPendingIssues($borrowernumber);
+my $count = scalar(@$issue);
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
 my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
 my @issuedata;
@@ -225,30 +230,54 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     my $datedue = $issue->[$i]{'date_due'};
     $issue->[$i]{'date_due'} = C4::Dates->new($issue->[$i]{'date_due'},'iso')->output('syspref');
     $issue->[$i]{'issuedate'} = C4::Dates->new($issue->[$i]{'issuedate'},'iso')->output('syspref');
+    my $biblionumber = $issue->[$i]{'biblionumber'};
     my %row = %{ $issue->[$i] };
     $totalprice += $issue->[$i]{'replacementprice'};
     $row{'replacementprice'} = $issue->[$i]{'replacementprice'};
+    # item lost, damaged loops
+    if ($row{'itemlost'}) {
+        my $fw = GetFrameworkCode($issue->[$i]{'biblionumber'});
+        my $category = GetAuthValCode('items.itemlost',$fw);
+        my $lostdbh = C4::Context->dbh;
+        my $sth = $lostdbh->prepare("select lib from authorised_values where category=? and authorised_value =? ");
+        $sth->execute($category, $row{'itemlost'});
+        my $loststat = $sth->fetchrow;
+        if ($loststat) {
+           $row{'itemlost'} = $loststat;
+        }
+    }
+    if ($row{'damaged'}) {
+        my $fw = GetFrameworkCode($issue->[$i]{'biblionumber'});
+        my $category = GetAuthValCode('items.damaged',$fw);
+        my $damageddbh = C4::Context->dbh;
+        my $sth = $damageddbh->prepare("select lib from authorised_values where category=? and authorised_value =? ");
+        $sth->execute($category, $row{'damaged'});
+        my $damagedstat = $sth->fetchrow;
+        if ($damagedstat) {
+           $row{'itemdamaged'} = $damagedstat;
+        }
+    }
+    # end lost, damaged
     if ( $datedue lt $today ) {
         $overdues_exist = 1;
         $row{'red'} = 1;    #print "<font color=red>";
 	}
-    $row{toggle} = $toggle++ % 2;
-
     #find the charge for an item
     my ( $charge, $itemtype ) =
       GetIssuingCharges( $issue->[$i]{'itemnumber'}, $borrowernumber );
 
     my $itemtypeinfo = getitemtypeinfo($itemtype);
     $row{'itemtype_description'} = $itemtypeinfo->{description};
-    $row{'itemtype_image'}       = getitemtypelocation( 'opac', $itemtypeinfo->{imageurl} );
+    $row{'itemtype_image'}       = $itemtypeinfo->{imageurl};
 
     $row{'charge'} = sprintf( "%.2f", $charge );
 
-	my ( $renewokay,$renewerror ) = CanBookBeRenewed( $borrowernumber, $issue->[$i]{'itemnumber'});
+	my ( $renewokay,$renewerror ) = CanBookBeRenewed( $borrowernumber, $issue->[$i]{'itemnumber'}, $override_limit );
 	$row{'norenew'} = !$renewokay;
+	$row{'can_confirm'} = ( !$renewokay && $renewerror ne 'on_reserve' );
 	$row{"norenew_reason_$renewerror"} = 1 if $renewerror;
-	$row{'renew_failed'} = $renew_failed[$issue->[$i]{'itemnumber'}];		
-	$row{'return_failed'} = $return_failed[$issue->[$i]{'barcode'}];   
+	$row{'renew_failed'} = $renew_failed{ $issue->[$i]{'itemnumber'} };
+	$row{'return_failed'} = $return_failed{$issue->[$i]{'barcode'}};   
     push( @issuedata, \%row );
 }
 
@@ -272,9 +301,10 @@ if ($borrowernumber) {
 				$getreserv{$_} = 0;
 		}
         $getreserv{reservedate}  = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref');
-		foreach (qw(biblionumber title author barcodereserv itemcallnumber )) {
+		foreach (qw(biblionumber title author itemcallnumber )) {
 				$getreserv{$_} = $getiteminfo->{$_};
 		}
+        $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
         $getreserv{itemtype}  = $itemtypeinfo->{'description'};
 
         # 		check if we have a waitin status for reservations
@@ -301,16 +331,16 @@ if ($borrowernumber) {
 
 # 		if we don't have a reserv on item, we put the biblio infos and the waiting position
         if ( $getiteminfo->{'title'} eq '' ) {
-            my $getbibinfo = GetBiblioItemData( $num_res->{'biblionumber'} );
+            my $getbibinfo = GetBiblioData( $num_res->{'biblionumber'} );
             my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
             $getreserv{color}           = 'inwait';
             $getreserv{title}           = $getbibinfo->{'title'};
-            $getreserv{waitingposition} = $num_res->{'priority'};
             $getreserv{nottransfered}   = 0;
             $getreserv{itemtype}        = $getbibtype->{'description'};
             $getreserv{author}          = $getbibinfo->{'author'};
             $getreserv{biblionumber}  = $num_res->{'biblionumber'};	
         }
+        $getreserv{waitingposition} = $num_res->{'priority'};
 
         push( @reservloop, \%getreserv );
     }
@@ -326,6 +356,20 @@ foreach (@$alerts) {
     $_->{relatedto} = findrelatedto( $_->{type}, $_->{externalid} );
 }
 
+my $candeleteuser;
+my $userenv = C4::Context->userenv;
+if($userenv->{flags} % 2 == 1){
+    $candeleteuser = 1;
+}elsif ( C4::Context->preference("IndependantBranches") ) {
+    $candeleteuser = ( $data->{'branchcode'} eq $userenv->{branch} );
+}else{
+    if( C4::Auth::getuserflags( $userenv->{flags},$userenv->{number})->{borrowers} ) {
+        $candeleteuser = 1;
+    }else{
+        $candeleteuser = 0;
+    }
+}
+
 # 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
@@ -339,11 +383,17 @@ $template->param($data);
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     $template->param(ExtendedPatronAttributes => 1);
     $template->param(patron_attributes => C4::Members::Attributes::GetBorrowerAttributes($borrowernumber));
+    my @types = C4::Members::AttributeTypes::GetAttributeTypes();
+    if (scalar(@types) == 0) {
+        $template->param(no_patron_attribute_types => 1);
+    }
 }
 
 $template->param(
-	detailview => 1,
-  DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(), 
+    detailview => 1,
+    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
+    DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(),
+    CANDELETEUSER    => $candeleteuser,
     roaddetails      => $roaddetails,
     borrowernumber   => $borrowernumber,
     categoryname	=> $data->{'description'},