X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=af3d32411154162cf59b34daaece93ce5ab50775;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=faae4d7f449785bbed18fad828a50cbc51b2df99;hpb=f2502c94998c5a60e6ec038e64decc5fb64e5b6a;p=srvgit

diff --git a/members/moremember.pl b/members/moremember.pl
index faae4d7f44..af3d324111 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -22,87 +22,39 @@
 
 =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::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers );
 use C4::Form::MessagingPreferences;
-use List::MoreUtils qw/uniq/;
-use C4::Members::Attributes qw(GetBorrowerAttributes);
-use Koha::AuthorisedValues;
+use List::MoreUtils qw( uniq );
+use Scalar::Util qw( looks_like_number );
+use Koha::Patron::Attribute::Types;
+use Koha::Patron::Debarments qw( GetDebarments );
+use Koha::Patron::Messages;
 use Koha::CsvProfiles;
-use Koha::Patron::Debarments qw(GetDebarments);
-use Koha::Patron::Images;
-use Module::Load;
-if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
-    load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );
-}
-#use Smart::Comments;
-#use Data::Dumper;
-use DateTime;
-use Koha::DateUtils;
-use Koha::Database;
+use Koha::Holds;
 use Koha::Patrons;
-use Koha::Patron::Categories;
+use Koha::Patron::Files;
 use Koha::Token;
-
-use vars qw($debug);
-
-BEGIN {
-	$debug = $ENV{DEBUG} || 0;
-}
-
-my $dbh = C4::Context->dbh;
+use Koha::Checkouts;
 
 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 => 1 };
+
+if (defined $print and $print eq "brief") {
+        $template_name = "members/moremember-brief.tt";
 } else {
-    $template_name = "members/moremember.tt";
-    $flagsrequired = { borrowers => 1 };
+        $template_name = "members/moremember.tt";
 }
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -110,193 +62,78 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => $template_name,
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => $flagsrequired,
-        debug           => 1,
+        flagsrequired   => { borrowers => 'edit_borrowers' },
     }
 );
 my $borrowernumber = $input->param('borrowernumber');
-$borrowernumber = HTML::Entities::encode($borrowernumber);
 my $error = $input->param('error');
 $template->param( error => $error ) if ( $error );
 
-my $patron        = Koha::Patrons->find($borrowernumber);
-unless ( $patron ) {
-    $template->param (unknowuser => 1);
-    output_html_with_http_headers $input, $cookie, $template->output;
-    exit;
-}
-
-my $issues        = $patron->checkouts;
-my $balance       = $patron->account->balance;
-$template->param(
-    issuecount => $issues->count,
-    fines      => $balance,
-);
+my $patron         = Koha::Patrons->find( $borrowernumber );
+my $logged_in_user = Koha::Patrons->find( $loggedinuser );
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
 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)) {
-    my $userdate = $data->{$_};
-    unless ($userdate) {
-        $debug and warn sprintf "Empty \$data{%12s}", $_;
-        $data->{$_} = '';
-        next;
-    }
-    $data->{$_} = dt_from_string( $userdate );
-}
-$data->{'IS_ADULT'} = ( $data->{'categorycode'} ne 'I' );
 
-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,
-        flagged => 1,
-        debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
+        'debarments'      => scalar GetDebarments({ borrowernumber => $borrowernumber }),
+        'userdebarred'    => $patron->debarred,
+        'debarredcomment' => $patron->debarredcomment,
     );
-    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};
-
-if ( $category_type eq 'C') {
-    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
-    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
-    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
-}
+$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 } );
-
-$template->param( adultborrower => 1 ) if ( $category_type eq 'A' || $category_type eq 'I' );
-
-my %bor;
-$bor{'borrowernumber'} = $borrowernumber;
-
-# Converts the branchcode to the branch name
-my $samebranch;
-if ( C4::Context->preference("IndependentBranches") ) {
-    my $userenv = C4::Context->userenv;
-    if ( C4::Context->IsSuperLibrarian() ) {
-        $samebranch = 1;
-    }
-    else {
-        $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
-
-my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
-
-# 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);
-    $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 } ) );
-}
-
-# current alert subscriptions
-my $alerts = getalert($borrowernumber);
-foreach (@$alerts) {
-    $_->{ $_->{type} } = 1;
-    $_->{relatedto} = findrelatedto( $_->{type}, $_->{externalid} );
-}
-
-# Add sync data to the user data
-if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
-    my $sync = NLGetSyncDataFromBorrowernumber( $borrowernumber );
-    if ( $sync ) {
-        $data->{'sync'}       = $sync->sync;
-        $data->{'syncstatus'} = $sync->syncstatus;
-        $data->{'lastsync'}   = $sync->lastsync;
-    }
+if ( !$patron->is_valid_age ) {
+    $template->param( age_limitations => 1 );
+    $template->param( age_low => $patron->category->dateofbirthrequired );
+    $template->param( age_high => $patron->category->upperagelimit );
 }
 
-# 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
-$template->param( picture => 1 ) if $patron->image;
 # 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);
-
 if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
-    my @classes = uniq( map {$_->{class}} @$attributes );
+    my @attributes = $patron->extended_attributes->as_list; # FIXME Must be improved!
+    my @classes = uniq( map {$_->type->class} @attributes );
     @classes = sort @classes;
 
     my @attributes_loop;
     for my $class (@classes) {
         my @items;
-        for my $attr (@$attributes) {
-            push @items, $attr if $attr->{class} eq $class
+        for my $attr (@attributes) {
+            push @items, $attr if $attr->type->class eq $class
         }
         my $av = Koha::AuthorisedValues->search({ category => 'PA_CLASS', authorised_value => $class });
         my $lib = $av->count ? $av->next->lib : $class;
@@ -309,12 +146,12 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     }
 
     $template->param(
-        ExtendedPatronAttributes => 1,
         attributes_loop => \@attributes_loop
     );
 
-    my @types = C4::Members::AttributeTypes::GetAttributeTypes();
-    if (scalar(@types) == 0) {
+    my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+    my $nb_of_attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id)->count;
+    if ( $nb_of_attribute_types == 0 ) {
         $template->param(no_patron_attribute_types => 1);
     }
 }
@@ -322,43 +159,120 @@ 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(SMSnumber     => $data->{'smsalertnumber'});
-    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
 }
 
 if ( C4::Context->preference("ExportCircHistory") ) {
     $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
 }
 
+my $patron_messages = Koha::Patron::Messages->search(
+    {
+        'me.borrowernumber' => $patron->borrowernumber,
+    },
+    {
+        join => 'manager',
+        '+select' => ['manager.surname', 'manager.firstname' ],
+        '+as' => ['manager_surname', 'manager_firstname'],
+    }
+);
+
+if( $patron_messages->count > 0 ){
+    $template->param( patron_messages => $patron_messages );
+}
+
 # Display the language description instead of the code
 # Note that this is certainly wrong
 my ( $subtag, $region ) = split '-', $patron->lang;
 my $translated_language = C4::Languages::language_get_description( $subtag, $subtag, 'language' );
 
+# if the expiry date is before today ie they have expired
+if ( $patron->is_expired || $patron->is_going_to_expire ) {
+    $template->param(
+        flagged => 1
+    );
+}
+
+my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds
+my $waiting_holds = $holds->waiting;
+$template->param(
+    holds_count  => $holds->count(),
+    WaitingHolds => $waiting_holds,
+);
+
+my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
+$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
+if ( defined $no_issues_charge_guarantees ) {
+    my $guarantees_non_issues_charges = 0;
+    my $guarantees = $patron->guarantee_relationships->guarantees;
+    while ( my $g = $guarantees->next ) {
+        $guarantees_non_issues_charges += $g->account->non_issues_charges;
+    }
+    if ( $guarantees_non_issues_charges > $no_issues_charge_guarantees ) {
+        $template->param(
+            charges_guarantees    => 1,
+            chargesamount_guarantees => $guarantees_non_issues_charges,
+        );
+    }
+}
+
+if ( $patron->has_overdues ) {
+    $template->param( odues => 1 );
+}
+my $issues = $patron->checkouts;
+
+my $balance = 0;
+$balance = $patron->account->balance;
+
+my $account = $patron->account;
+if( ( my $owing = $account->non_issues_charges ) > 0 ) {
+    my $noissuescharge = C4::Context->preference("noissuescharge") || 5; # FIXME If noissuescharge == 0 then 5, why??
+    $template->param(
+        charges => 1,
+        chargesamount => $owing,
+    )
+} elsif ( $balance < 0 ) {
+    $template->param(
+        credits => 1,
+        creditsamount => -$balance,
+    );
+}
+
+# if the expiry date is before today ie they have expired
+if ( $patron->is_expired ) {
+    #borrowercard expired, no issues
+    $template->param(
+        expired => "1",
+    );
+}
+# check for NotifyBorrowerDeparture
+elsif ( $patron->is_going_to_expire ) {
+    # borrower card soon to expire warn librarian
+    $template->param( "warndeparture" => $patron->dateexpiry ,
+                    );
+    if (C4::Context->preference('ReturnBeforeExpiry')){
+        $template->param("returnbeforeexpiry" => 1);
+    }
+}
+
+
+my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
+
 $template->param(
     patron          => $patron,
+    issuecount      => $patron->checkouts->count,
+    holds_count     => $patron->holds->count,
+    fines           => $patron->account->balance,
     translated_language => $translated_language,
     detailview      => 1,
-    borrowernumber  => $borrowernumber,
-    othernames      => $data->{'othernames'},
-    categoryname    => $patron->category->description,
     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',
-    is_child        => $category_type eq 'C',
     $category_type  => 1, # [% IF ( I ) %] = institutional/organisation
-    samebranch      => $samebranch,
-    quickslip       => $quickslip,
     housebound_role => scalar $patron->housebound_role,
-    privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
-    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
     relatives_issues_count => $relatives_issues_count,
     relatives_borrowernumbers => \@relatives,
+    logged_in_user => $logged_in_user,
+    files => Koha::Patron::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(),
+    #debarments                => scalar GetDebarments({ borrowernumber => $borrowernumber }),
+    has_modifications         => $has_modifications,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;