X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=d78cc1fd570bd03566a90fa2221cee7147e0e95e;hb=42678f3abfce12c49d23edbe58d228cd46463997;hp=3928286b13c4cea0812d8fd66f0b5ebb588ba640;hpb=e901ae15de6717f8594bd80ecfb0c5e8a23b8af5;p=koha_fer diff --git a/members/moremember.pl b/members/moremember.pl index 3928286b13..d78cc1fd57 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -47,13 +47,11 @@ use C4::Circulation; use C4::Koha; use C4::Letters; use C4::Biblio; -use C4::Reserves; use C4::Branch; # GetBranchName -use C4::Overdues qw/CheckBorrowerDebarred/; use C4::Form::MessagingPreferences; use List::MoreUtils qw/uniq/; use C4::Members::Attributes qw(GetBorrowerAttributes); - +use Koha::Borrower::Debarments qw(GetDebarments); #use Smart::Comments; #use Data::Dumper; use DateTime; @@ -119,7 +117,6 @@ my $borrowernumber = $input->param('borrowernumber'); #start the page and read in includes my $data = GetMember( 'borrowernumber' => $borrowernumber ); -my $reregistration = $input->param('reregistration'); if ( not defined $data ) { $template->param (unknowuser => 1); @@ -127,11 +124,6 @@ if ( not defined $data ) { exit; } -# re-reregistration function to automatic calcul of date expiry -if ( $reregistration eq 'y' ) { - $data->{'dateexpiry'} = ExtendMemberSubscriptionTo( $borrowernumber ); -} - my $category_type = $data->{'category_type'}; ### $category_type @@ -154,7 +146,7 @@ for (qw(gonenoaddress lost borrowernotes)) { $data->{$_} and $template->param(flagged => 1) and last; } -my $debar = CheckBorrowerDebarred($borrowernumber); +my $debar = $data->{'debarred'}; if ($debar) { $template->param( 'userdebarred' => 1, 'flagged' => 1 ); if ( $debar ne "9999-12-31" ) { @@ -219,13 +211,16 @@ $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 ) { + if ( C4::Context->IsSuperLibrarian() ) { + $samebranch = 1; + } + else { $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} ); } - $samebranch = 1 if ( $userenv->{flags} % 2 == 1 ); -}else{ +} +else { $samebranch = 1; } my $branchdetail = GetBranchDetail( $data->{'branchcode'}); @@ -237,6 +232,19 @@ my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} ); $template->param( lib1 => $lib1 ) if ($lib1); $template->param( lib2 => $lib2 ) if ($lib2); +# If printing a page, send the account informations to the template +if ($print eq "page") { + foreach my $accountline (@$accts) { + $accountline->{amount} = sprintf '%.2f', $accountline->{amount}; + $accountline->{amountoutstanding} = sprintf '%.2f', $accountline->{amountoutstanding}; + + if ($accountline->{accounttype} ne 'F' && $accountline->{accounttype} ne 'FU'){ + $accountline->{printtitle} = 1; + } + } + $template->param( accounts => $accts ); +} + # Show OPAC privacy preference is system preference is set if ( C4::Context->preference('OPACPrivacy') ) { $template->param( OPACPrivacy => 1); @@ -251,7 +259,7 @@ my $relissue = []; if ( @borrowernumbers ) { $relissue = GetPendingIssues(@borrowernumbers); } -my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} ); +my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); my $today = DateTime->now( time_zone => C4::Context->tz); $today->truncate(to => 'day'); my @borrowers_with_issues; @@ -281,7 +289,7 @@ if ($borrowernumber) { foreach (qw(waiting transfered nottransfered)) { $getreserv{$_} = 0; } - $getreserv{reservedate} = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref'); + $getreserv{reservedate} = $num_res->{'reservedate'}; foreach (qw(biblionumber title author itemcallnumber )) { $getreserv{$_} = $getiteminfo->{$_}; } @@ -309,6 +317,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 '' ) { @@ -316,6 +326,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'}; @@ -324,6 +335,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 ); } @@ -343,14 +356,17 @@ foreach (@$alerts) { my $candeleteuser; my $userenv = C4::Context->userenv; -if($userenv->{flags} % 2 == 1){ +if ( C4::Context->IsSuperLibrarian() ) { $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} ) { +} +else { + if ( C4::Auth::getuserflags( $userenv->{flags}, $userenv->{number} )->{borrowers} ) { $candeleteuser = 1; - }else{ + } + else { $candeleteuser = 0; } } @@ -358,7 +374,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'}; @@ -408,13 +424,12 @@ $template->param( $data->{'categorycode'} => 1 ); $template->param( detailview => 1, AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), CANDELETEUSER => $candeleteuser, - roaddetails => $roaddetails, + roadtype => $roadtype, borrowernumber => $borrowernumber, othernames => $data->{'othernames'}, categoryname => $data->{'description'}, - reregistration => $reregistration, + was_renewed => $input->param('was_renewed') ? 1 : 0, branch => $branch, todaysdate => C4::Dates->today(), totalprice => sprintf("%.2f", $totalprice), @@ -427,13 +442,13 @@ $template->param( StaffMember => ($category_type eq 'S'), is_child => ($category_type eq 'C'), # reserveloop => \@reservedata, - dateformat => C4::Context->preference("dateformat"), - "dateformat_" . (C4::Context->preference("dateformat") || '') => 1, samebranch => $samebranch, quickslip => $quickslip, activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'), + RoutingSerials => C4::Context->preference('RoutingSerials'), + debarments => GetDebarments({ borrowernumber => $borrowernumber }), ); $template->param( $error => 1 ) if $error; @@ -455,10 +470,7 @@ sub build_issue_data { if ($issue->{issuedate} ) { $issuedate = $issue->{issuedate}->clone(); } - - $issue->{date_due} = output_pref( $issue->{date_due} ); - $issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate}; - 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}; @@ -521,6 +533,15 @@ sub build_issue_data { $row{"norenew_reason_$renewerror"} = 1 if $renewerror; $row{renew_failed} = $renew_failed{ $issue->{itemnumber} }; $row{return_failed} = $return_failed{ $issue->{barcode} }; + ($row{'renewcount'},$row{'renewsallowed'},$row{'renewsleft'}) = C4::Circulation::GetRenewCount($issue->{'borrowernumber'},$issue->{'itemnumber'}); #Add renewal count to item data display + + $row{'soonestrenewdate'} = output_pref( + C4::Circulation::GetSoonestRenewDate( + $issue->{borrowernumber}, + $issue->{itemnumber} + ) + ); + push( @{$localissue}, \%row ); } return $localissue;