use Koha::List::Patron;
use Koha::Libraries;
use Koha::Patron::Categories;
+use Koha::Patron::Debarments;
use Koha::Patrons;
my $input = new CGI;
}
);
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+
my %cookies = parse CGI::Cookie($cookie);
my $sessionID = $cookies{'CGISESSID'}->value;
my $dbh = C4::Context->dbh;
my $patron_list_id = $input->param('patron_list_id');
my @borrowers;
my @cardnumbers;
- my @notfoundcardnumbers;
+ my ( @notfoundcardnumbers, @from_another_group_of_libraries );
# Get cardnumbers from a file or the input area
my @contentlist;
my $max_nb_attr = 0;
for my $cardnumber ( @cardnumbers ) {
- my $borrower = GetBorrowerInfos( cardnumber => $cardnumber );
- if ( $borrower ) {
- $max_nb_attr = scalar( @{ $borrower->{patron_attributes} } )
- if scalar( @{ $borrower->{patron_attributes} } ) > $max_nb_attr;
- push @borrowers, $borrower;
+ my $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
+ if ( $patron ) {
+ if ( $logged_in_user->can_see_patron_infos( $patron ) ) {
+ $patron = $patron->unblessed;
+ $patron->{patron_attributes} = C4::Members::Attributes::GetBorrowerAttributes( $patron->{borrowernumber} );
+ $max_nb_attr = scalar( @{ $patron->{patron_attributes} } )
+ if scalar( @{ $patron->{patron_attributes} } ) > $max_nb_attr;
+ push @borrowers, $patron;
+ } else {
+ push @notfoundcardnumbers, $cardnumber;
+ }
} else {
push @notfoundcardnumbers, $cardnumber;
}
# Construct drop-down list values
my $branches = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;
my @branches_option;
- push @branches_option, { value => $_->{value}, lib => $_->{branchname} } for @$branches;
+ push @branches_option, { value => $_->{branchcode}, lib => $_->{branchname} } for @$branches;
unshift @branches_option, { value => "", lib => "" };
my @categories_option;
push @categories_option, { value => $_->categorycode, lib => $_->description } for @patron_categories;
type => "text",
mandatory => ( grep /opacnote/, @mandatoryFields ) ? 1 : 0,
}
+ ,
+ {
+ name => "debarred",
+ type => "date",
+ mandatory => ( grep /debarred/, @mandatoryFields ) ? 1 : 0,
+ }
+ ,
+ {
+ name => "debarredcomment",
+ type => "text",
+ mandatory => ( grep /debarredcomment/, @mandatoryFields ) ? 1 : 0,
+ },
);
$template->param('patron_attributes_codes', \@patron_attributes_codes);
my @disabled = $input->multi_param('disable_input');
my $infos;
- for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote/ ) {
+ for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote debarred debarredcomment/ ) {
my $value = $input->param($field);
$infos->{$field} = $value if $value;
$infos->{$field} = "" if grep { /^$field$/ } @disabled;
}
- for my $field ( qw( dateenrolled dateexpiry ) ) {
+ for my $field ( qw( dateenrolled dateexpiry debarred ) ) {
$infos->{$field} = dt_from_string($infos->{$field}) if $infos->{$field};
}
for my $borrowernumber ( @borrowernumbers ) {
# If at least one field are filled, we want to modify the borrower
if ( defined $infos ) {
+ # If a debarred date or debarred comment has been submitted make a new debarment
+ if ( $infos->{debarred} || $infos->{debarredcomment} ) {
+ AddDebarment(
+ {
+ borrowernumber => $borrowernumber,
+ type => 'MANUAL',
+ comment => $infos->{debarredcomment},
+ expiration => $infos->{debarred},
+ });
+ }
+
+ # If debarment date or debarment comment are disabled then remove all debarrments
+ if ( grep { /debarred/ } @disabled ) {
+ eval {
+ my $debarrments = GetDebarments( { borrowernumber => $borrowernumber } );
+ foreach my $debarment (@$debarrments) {
+ DelDebarment( $debarment->{'borrower_debarment_id'} );
+ }
+ };
+ }
+
$infos->{borrowernumber} = $borrowernumber;
- my $success = ModMember(%$infos);
- if (!$success) {
- my $borrowerinfo = GetBorrowerInfos( borrowernumber => $borrowernumber );
- $infos->{cardnumber} = $borrowerinfo->{cardnumber} || '';
+ eval { Koha::Patrons->find( $borrowernumber )->set($infos)->store; };
+ if ( $@ ) { # FIXME We could provide better error handling here
+ my $patron = Koha::Patrons->find( $borrowernumber );
+ $infos->{cardnumber} = $patron ? $patron->cardnumber || '' : '';
push @errors, { error => "can_not_update", borrowernumber => $infos->{borrowernumber}, cardnumber => $infos->{cardnumber} };
}
}
my $borrower_categorycode = Koha::Patrons->find( $borrowernumber )->categorycode;
my $i=0;
for ( @attributes ) {
+ next unless $_;
my $attribute;
$attribute->{code} = $_;
$attribute->{attribute} = $attr_values[$i];
};
push @errors, { error => $@ } if $@;
} else {
- # Attribute's value is empty, we don't want to modify it
- ++$i and next if not $attribute->{attribute};
-
eval {
C4::Members::Attributes::UpdateBorrowerAttribute( $borrowernumber, $attribute );
};
my @borrowers;
my $max_nb_attr = 0;
for my $borrowernumber ( @borrowernumbers ) {
- my $borrower = GetBorrowerInfos( borrowernumber => $borrowernumber );
- if ( $borrower ) {
- $max_nb_attr = scalar( @{ $borrower->{patron_attributes} } )
- if scalar( @{ $borrower->{patron_attributes} } ) > $max_nb_attr;
- push @borrowers, $borrower;
+ my $patron = Koha::Patrons->find( $borrowernumber );
+ if ( $patron ) {
+ $patron = $patron->unblessed;
+ $patron->{patron_attributes} = C4::Members::Attributes::GetBorrowerAttributes( $patron->{borrowernumber} );
+ $max_nb_attr = scalar( @{ $patron->{patron_attributes} } )
+ if scalar( @{ $patron->{patron_attributes} } ) > $max_nb_attr;
+ push @borrowers, $patron;
}
}
my @patron_attributes_option;
$template->param( borrowers => \@borrowers );
$template->param( attributes_header => \@attributes_header );
- $template->param( borrowers => \@borrowers );
$template->param( errors => \@errors );
} else {
);
output_html_with_http_headers $input, $cookie, $template->output;
exit;
-
-sub GetBorrowerInfos {
- my ( %info ) = @_;
- my $borrower = Koha::Patrons->find( \%info );
- my $catdesc = $borrower->category->description;
- if ( $borrower ) {
- $borrower = $borrower->unblessed;
- for ( qw(dateenrolled dateexpiry) ) {
- my $userdate = $borrower->{$_};
- unless ($userdate && $userdate ne "0000-00-00" and $userdate ne "9999-12-31") {
- $borrower->{$_} = '';
- next;
- }
- $borrower->{$_} = $userdate || '';
- }
- $borrower->{category_description} = $catdesc;
- my $attr_loop = C4::Members::Attributes::GetBorrowerAttributes( $borrower->{borrowernumber} );
- $borrower->{patron_attributes} = $attr_loop;
- }
- return $borrower;
-}
projects / koha-ffzg.git / blobdiff