X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=6a3de7ea96b766019ef4e93f6e78f036ebb904ef;hb=3691bd8419ee9a481b95af525bc7e0c08f4c4640;hp=2dfcc9509ceffe620997f2b165d7fd13f878ae89;hpb=f05931e05154cc85df4036fe7c4acdfc0ddb5995;p=koha.git

diff --git a/members/moremember.pl b/members/moremember.pl
index 2dfcc9509c..6a3de7ea96 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -42,7 +42,6 @@ use C4::Output;
 use C4::Members;
 use C4::Members::Attributes;
 use C4::Members::AttributeTypes;
-use C4::Dates;
 use C4::Reserves;
 use C4::Circulation;
 use C4::Koha;
@@ -52,7 +51,7 @@ use C4::Branch; # GetBranchName
 use C4::Form::MessagingPreferences;
 use List::MoreUtils qw/uniq/;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
-use Koha::Borrower::Debarments qw(GetDebarments IsDebarred);
+use Koha::Patron::Debarments qw(GetDebarments IsDebarred);
 use Module::Load;
 if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
     load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );
@@ -130,15 +129,13 @@ my $category_type = $data->{'category_type'};
 
 $debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
 foreach (qw(dateenrolled dateexpiry dateofbirth)) {
-		my $userdate = $data->{$_};
-		unless ($userdate) {
-			$debug and warn sprintf "Empty \$data{%12s}", $_;
-			$data->{$_} = '';
-			next;
-		}
-		$userdate = C4::Dates->new($userdate,'iso')->output('syspref');
-		$data->{$_} = $userdate || '';
-		$template->param( $_ => $userdate );
+    my $userdate = $data->{$_};
+    unless ($userdate) {
+        $debug and warn sprintf "Empty \$data{%12s}", $_;
+        $data->{$_} = '';
+        next;
+    }
+    $template->param( $_ => dt_from_string( $userdate ) );
 }
 $data->{'IS_ADULT'} = ( $data->{'categorycode'} ne 'I' );
 
@@ -150,15 +147,13 @@ if ( IsDebarred($borrowernumber) ) {
     $template->param( 'userdebarred' => 1, 'flagged' => 1 );
     my $debar = $data->{'debarred'};
     if ( $debar ne "9999-12-31" ) {
-        $template->param( 'userdebarreddate' => C4::Dates::format_date($debar) );
+        $template->param( 'userdebarreddate' => output_pref( { dt => dt_from_string( $debar ), dateonly => 1 } ) );
         $template->param( 'debarredcomment'  => $data->{debarredcomment} );
     }
 }
 
-$data->{'ethnicity'} = fixEthnicity( $data->{'ethnicity'} );
 $data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};
 
-my $catcode;
 if ( $category_type eq 'C') {
    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
    my $cnt = scalar(@$catcodes);
@@ -167,10 +162,6 @@ if ( $category_type eq 'C') {
    $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
 }
 
-
-if ( $data->{'ethnicity'} || $data->{'ethnotes'} ) {
-    $template->param( printethnicityline => 1 );
-}
 my ( $count, $guarantees ) = GetGuarantees( $data->{'borrowernumber'} );
 if ( $count ) {
     $template->param( isguarantee => 1 );
@@ -205,7 +196,7 @@ else {
 	}
 }
 
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' || $category_type eq 'I' );
+$template->param( adultborrower => 1 ) if ( $category_type eq 'A' || $category_type eq 'I' );
 
 my %bor;
 $bor{'borrowernumber'} = $borrowernumber;
@@ -224,8 +215,8 @@ if ( C4::Context->preference("IndependentBranches") ) {
 else {
     $samebranch = 1;
 }
-my $branchdetail = GetBranchDetail( $data->{'branchcode'});
-@{$data}{keys %$branchdetail} = values %$branchdetail; # merge in all branch columns
+my $library = Koha::Libraries->find( $data->{branchcode})->unblessed;
+@{$data}{keys %$library} = values %$library; # merge in all branch columns
 
 my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
@@ -257,13 +248,16 @@ my $relatives_issues_count =
   Koha::Database->new()->schema()->resultset('Issue')
   ->count( { borrowernumber => \@relatives } );
 
-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;
 my $overdues_exist = 0;
 my $totalprice = 0;
 
+# Calculate and display patron's age
+my $dateofbirth = $data->{ 'dateofbirth' };
+my $age = GetAge($dateofbirth);
+$template->param( age => $age );
+
 ### ###############################################################################
 # BUILD HTML
 # show all reserves of this borrower, and the position of the reservation ....
@@ -342,14 +336,12 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) {
 $template->param( $data->{'categorycode'} => 1 ); 
 $template->param(
     detailview => 1,
-    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
-    roadtype        => $roadtype,
     borrowernumber  => $borrowernumber,
     othernames      => $data->{'othernames'},
     categoryname    => $data->{'description'},
     was_renewed     => $input->param('was_renewed') ? 1 : 0,
     branch          => $branch,
-    todaysdate      => C4::Dates->today(),
+    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
     totalprice      => sprintf("%.2f", $totalprice),
     totaldue        => sprintf("%.2f", $total),
     totaldue_raw    => $total,
@@ -358,6 +350,7 @@ $template->param(
     is_child        => ($category_type eq 'C'),
     samebranch      => $samebranch,
     quickslip       => $quickslip,
+    privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
     activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
     AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
     SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),