X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=593b0d1156d0cdc4e565d5598b7c052f0a3afde3;hb=109334102fbb29c60fa9a7a762c5e68f4b2ce0be;hp=9f06882b8fd16fad087ce53b73506fae6893e188;hpb=7c05f4fbe41800a9be4b6d4bdc8d7c7ddeb69ef9;p=srvgit

diff --git a/members/moremember.pl b/members/moremember.pl
index 9f06882b8f..593b0d1156 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -22,84 +22,46 @@
 
 =head1 moremember.pl
 
- script to do a borrower enquiry/bring up borrower details etc
- Displays all the details about a borrower
- written 20/12/99 by chris@katipo.co.nz
- last modified 21/1/2000 by chris@katipo.co.nz
- modified 31/1/2001 by chris@katipo.co.nz
-   to not allow items on request to be renewed
-
- needs html removed and to use the C4::Output more, but its tricky
+ script to do a borrower enquiry/bring up patron details etc
+ Displays all the details about a patron
 
 =cut
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use HTML::Entities;
 use C4::Context;
 use C4::Auth;
 use C4::Output;
-use C4::Members;
-use C4::Members::Attributes;
 use C4::Members::AttributeTypes;
-use C4::Reserves;
-use C4::Circulation;
-use C4::Koha;
-use C4::Letters;
-use C4::Biblio;
 use C4::Form::MessagingPreferences;
 use List::MoreUtils qw/uniq/;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
-use Koha::Account::Lines;
-use Koha::AuthorisedValues;
-use Koha::CsvProfiles;
 use Koha::Patron::Debarments qw(GetDebarments);
 use Koha::Patron::Messages;
-#use Smart::Comments;
-#use Data::Dumper;
-use DateTime;
 use Koha::DateUtils;
-use Koha::Database;
+use Koha::CsvProfiles;
 use Koha::Patrons;
-use Koha::Patron::Categories;
 use Koha::Token;
+use Koha::Checkouts;
 
 use vars qw($debug);
 
 BEGIN {
-	$debug = $ENV{DEBUG} || 0;
+    $debug = $ENV{DEBUG} || 0;
 }
 
-my $dbh = C4::Context->dbh;
-
 my $input = CGI->new;
 $debug or $debug = $input->param('debug') || 0;
+
+
 my $print = $input->param('print');
 
 my $template_name;
-my $quickslip = 0;
-
-my $flagsrequired;
-if (defined $print and $print eq "page") {
-    $template_name = "members/moremember-print.tt";
-    # circ staff who process checkouts but can't edit
-    # patrons still need to be able to access print view
-    $flagsrequired = { circulate => "circulate_remaining_permissions" };
-} elsif (defined $print and $print eq "slip") {
-    $template_name = "members/moremember-receipt.tt";
-    # circ staff who process checkouts but can't edit
-    # patrons still need to be able to print receipts
-    $flagsrequired =  { circulate => "circulate_remaining_permissions" };
-} elsif (defined $print and $print eq "qslip") {
-    $template_name = "members/moremember-receipt.tt";
-    $quickslip = 1;
-    $flagsrequired =  { circulate => "circulate_remaining_permissions" };
-} elsif (defined $print and $print eq "brief") {
-    $template_name = "members/moremember-brief.tt";
-    $flagsrequired = { borrowers => 'edit_borrowers' };
+
+if (defined $print and $print eq "brief") {
+        $template_name = "members/moremember-brief.tt";
 } else {
-    $template_name = "members/moremember.tt";
-    $flagsrequired = { borrowers => 'edit_borrowers' };
+        $template_name = "members/moremember.tt";
 }
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -108,12 +70,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => $flagsrequired,
+        flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
 );
 my $borrowernumber = $input->param('borrowernumber');
-$borrowernumber = HTML::Entities::encode($borrowernumber);
 my $error = $input->param('error');
 $template->param( error => $error ) if ( $error );
 
@@ -121,130 +82,54 @@ my $patron         = Koha::Patrons->find( $borrowernumber );
 my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
-my $issues        = $patron->checkouts;
-my $balance       = $patron->account->balance;
-$template->param(
-    issuecount => $issues->count,
-    fines      => $balance,
-);
-
 my $category_type = $patron->category->category_type;
-my $data = $patron->unblessed;
-
-$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
-foreach (qw(dateenrolled dateexpiry dateofbirth)) { # FIXME This should be removed
-    my $userdate = $data->{$_};
-    unless ($userdate) {
-        $debug and warn sprintf "Empty \$data{%12s}", $_;
-        $data->{$_} = '';
-        next;
-    }
-    $data->{$_} = dt_from_string( $userdate );
-}
 
-for (qw(gonenoaddress lost borrowernotes)) {
-	 $data->{$_} and $template->param(flagged => 1) and last;
+for (qw(gonenoaddress lost borrowernotes is_debarred)) {
+    $patron->$_ and $template->param(flagged => 1) and last;
 }
 
 if ( $patron->is_debarred ) {
     $template->param(
-        userdebarred => 1, # FIXME Template should use patron->is_debarred
-        flagged => 1,
         debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
     );
-    my $debar = $data->{'debarred'};
-    if ( $debar ne "9999-12-31" ) {
-        $template->param( 'userdebarreddate' => output_pref( { dt => dt_from_string( $debar ), dateonly => 1 } ) );
-        $template->param( 'debarredcomment'  => $data->{debarredcomment} );
+    if ( $patron->debarred ne "9999-12-31" ) {
+        $template->param( 'userdebarreddate' => $patron->debarred );
     }
 }
-
-$data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};
+$template->param( flagged => 1 ) if $patron->account_locked;
 
 my @relatives;
-if ( my $guarantor = $patron->guarantor ) {
-    $template->param( guarantor => $guarantor );
-    push @relatives, $guarantor->borrowernumber;
-    push @relatives, $_->borrowernumber for $patron->siblings;
-} elsif ( $patron->contactname || $patron->contactfirstname ) {
-    $template->param(
-        guarantor => {
-            firstname => $patron->contactfirstname,
-            surname   => $patron->contactname,
-        }
-    );
-} else {
-    my @guarantees = $patron->guarantees;
-    $template->param( guarantees => \@guarantees );
-    push @relatives, $_->borrowernumber for @guarantees;
-}
-
-my $relatives_issues_count =
-  Koha::Database->new()->schema()->resultset('Issue')
-  ->count( { borrowernumber => \@relatives } );
-
-my %bor;
-$bor{'borrowernumber'} = $borrowernumber;
-
-# Converts the branchcode to the branch name
-my $samebranch;
-if ( C4::Context->preference("IndependentBranches") ) {
-    if ( C4::Context->IsSuperLibrarian() ) {
-        $samebranch = 1;
-    }
-    else {
-        my $userenv = C4::Context->userenv;
-        $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} );
-    }
+my $guarantor_relationships = $patron->guarantor_relationships;
+my @guarantees              = $patron->guarantee_relationships->guarantees;
+my @guarantors              = $guarantor_relationships->guarantors;
+if (@guarantors) {
+    push( @relatives, $_->id ) for @guarantors;
+    push( @relatives, $_->id ) for $patron->siblings();
 }
 else {
-    $samebranch = 1;
-}
-my $library = Koha::Libraries->find( $data->{branchcode})->unblessed;
-@{$data}{keys %$library} = values %$library; # merge in all branch columns # FIXME This is really ugly, we should pass the library instead
-
-# If printing a page, send the account informations to the template
-if (defined $print and $print eq "page") {
-    my $accts = Koha::Account::Lines->search(
-        { borrowernumber => $patron->borrowernumber, amountoutstanding => { '>' => 0 } },
-        { order_by       => { -desc => 'accountlines_id' } }
-    );
-    $template->param( accounts => $accts );
-}
-
-# Show OPAC privacy preference is system preference is set
-if ( C4::Context->preference('OPACPrivacy') ) { # FIXME Should be moved the the template
-    $template->param( OPACPrivacy => 1);
-    $template->param( "privacy".$data->{'privacy'} => 1);
+    push( @relatives, $_->id ) for @guarantees;
 }
+$template->param(
+    guarantor_relationships => $guarantor_relationships,
+    guarantees              => \@guarantees,
+);
 
-my $today       = DateTime->now( time_zone => C4::Context->tz);
-$today->truncate(to => 'day');
-my $overdues_exist = 0;
-my $totalprice = 0;
+my $relatives_issues_count =
+    Koha::Checkouts->count({ borrowernumber => \@relatives });
 
 # Calculate and display patron's age
-if ( $data->{dateofbirth} ) {
-    $template->param( age => Koha::Patron->new({ dateofbirth => $data->{dateofbirth} })->get_age );
-}
-
-### ###############################################################################
-# BUILD HTML
-# show all reserves of this borrower, and the position of the reservation ....
-if ($borrowernumber) {
-    $template->param(
-        holds_count => Koha::Database->new()->schema()->resultset('Reserve')
-          ->count( { borrowernumber => $borrowernumber } ) );
+if ( !$patron->is_valid_age ) {
+    $template->param( age_limitations => 1 );
+    $template->param( age_low => $patron->category->dateofbirthrequired );
+    $template->param( age_high => $patron->category->upperagelimit );
 }
+$template->param( age => $patron->get_age );
 
 # Generate CSRF token for upload and delete image buttons
 $template->param(
     csrf_token => Koha::Token->new->generate_csrf({ session_id => $input->cookie('CGISESSID'),}),
 );
 
-
-$template->param(%$data); # FIXME This should be removed and used $patron instead, but too many things are processed above
-
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
     my @classes = uniq( map {$_->{class}} @$attributes );
@@ -267,7 +152,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     }
 
     $template->param(
-        ExtendedPatronAttributes => 1,
         attributes_loop => \@attributes_loop
     );
 
@@ -280,8 +164,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
 if (C4::Context->preference('EnhancedMessagingPreferences')) {
     C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
     $template->param(messaging_form_inactive => 1);
-    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
-    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
 }
 
 if ( C4::Context->preference("ExportCircHistory") ) {
@@ -290,7 +172,7 @@ if ( C4::Context->preference("ExportCircHistory") ) {
 
 my $patron_messages = Koha::Patron::Messages->search(
     {
-        'me.borrowernumber' => $borrowernumber,
+        'me.borrowernumber' => $patron->borrowernumber,
     },
     {
         join => 'manager',
@@ -308,23 +190,23 @@ if( $patron_messages->count > 0 ){
 my ( $subtag, $region ) = split '-', $patron->lang;
 my $translated_language = C4::Languages::language_get_description( $subtag, $subtag, 'language' );
 
-my $total = $patron->account->balance;
+# if the expiry date is before today ie they have expired
+if ( $patron->is_expired || $patron->is_going_to_expire ) {
+    $template->param(
+        flagged => 1
+    );
+}
+
 $template->param(
     patron          => $patron,
+    issuecount      => $patron->checkouts->count,
+    holds_count     => $patron->holds->count,
+    fines           => $patron->account->balance,
     translated_language => $translated_language,
     detailview      => 1,
     was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
-    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
-    totalprice      => sprintf("%.2f", $totalprice),
-    totaldue        => sprintf("%.2f", $total),
-    totaldue_raw    => $total,
-    overdues_exist  => $overdues_exist,
-    StaffMember     => $category_type eq 'S',
     $category_type  => 1, # [% IF ( I ) %] = institutional/organisation
-    samebranch      => $samebranch,
-    quickslip       => $quickslip,
     housebound_role => scalar $patron->housebound_role,
-    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
     relatives_issues_count => $relatives_issues_count,
     relatives_borrowernumbers => \@relatives,
 );