X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=286a811f0096854f3f77f232ae7619b7cb27c5f6;hb=f87b75522801ee6d08291bb0eeb6bc38a5b785d5;hp=0811927d20cfc3b63b1b22be7994c6130e348dbf;hpb=5702b149c3178f6e51f75d7138982e8786df31cc;p=koha.git diff --git a/members/moremember.pl b/members/moremember.pl index 0811927d20..286a811f00 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -37,6 +37,8 @@ use C4::Context; 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; @@ -60,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; @@ -101,8 +104,7 @@ if ( $reregistration eq 'y' ) { $data->{'dateexpiry'} = ExtendMemberSubscriptionTo( $borrowernumber ); } -my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} ); -my $category_type = $borrowercategory->{'category_type'}; +my $category_type = $data->{'category_type'}; ### $category_type @@ -131,19 +133,18 @@ $data->{'ethnicity'} = fixEthnicity( $data->{'ethnicity'} ); $data->{ "sex_".$data->{'sex'}."_p" } = 1; my $catcode; -if ( $category_type eq 'C' and $data->{'guarantorid'} ne '0' ) { - my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber'); - foreach (qw(address city B_address B_city phone mobile zipcode)) { - $data->{$_} = $data2->{$_}; - } - my ( $catcodes, $labels ) = - GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); - my $cnt = scalar(@$catcodes); - -# $cnt = 1; - $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1; - - $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; +if ( $category_type eq 'C') { + if ($data->{'guarantorid'} ne '0' ) { + my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber'); + foreach (qw(address city B_address B_city phone mobile zipcode)) { + $data->{$_} = $data2->{$_}; + } + } + my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); + my $cnt = scalar(@$catcodes); + + $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1; + $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; } @@ -201,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}; @@ -215,24 +218,50 @@ 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; +my $overdues_exist = 0; my $totalprice = 0; my $toggle = 0; 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 ""; } - $row{toggle} = $toggle++ % 2; - #find the charge for an item my ( $charge, $itemtype ) = GetIssuingCharges( $issue->[$i]{'itemnumber'}, $borrowernumber ); @@ -243,11 +272,12 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { $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 ); } @@ -271,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 @@ -300,17 +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{itemcallnumber} = '----------'; $getreserv{biblionumber} = $num_res->{'biblionumber'}; } + $getreserv{waitingposition} = $num_res->{'priority'}; push( @reservloop, \%getreserv ); } @@ -336,22 +366,35 @@ my $branch=C4::Context->userenv->{'branch'}; $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(), roaddetails => $roaddetails, borrowernumber => $borrowernumber, + categoryname => $data->{'description'}, reregistration => $reregistration, branch => $branch, totalprice => sprintf( "%.2f", $totalprice ), totaldue => sprintf( "%.2f", $total ), issueloop => \@issuedata, + overdues_exist => $overdues_exist, unvalidlibrarian => $unvalidlibrarian, error => $error, $error => 1, StaffMember => ($category_type eq 'S'), is_child => ($category_type eq 'C'), # reserveloop => \@reservedata, + dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output;