=item * Anonymise the borrowers' issues if issue is older than a given date. see C<datefilter1>.
-=item * Delete the borrowers who has not borrowered since a given date. see C<datefilter2>.
+=item * Delete the borrowers who has not borrowed since a given date. see C<datefilter2>.
=back
=cut
-use strict;
+use Modern::Perl;
-#use warnings; FIXME - Bug 2505
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
-use C4::Members; # GetBorrowersWhoHavexxxBorrowed.
+use C4::Members;
use C4::Circulation; # AnonymiseIssueHistory.
-use C4::VirtualShelves (); #no import
use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::Patron::Categories;
+use Koha::Patrons;
use Date::Calc qw/Today Add_Delta_YM/;
+use Koha::Patrons;
+use Koha::List::Patron;
my $cgi = new CGI;
my $params = $cgi->Vars;
my $step = $params->{step} || 1;
-my $not_borrowered_since = # the date which filter on issue history.
- $params->{not_borrowered_since}
- ? dt_from_string $params->{not_borrowered_since}
+my $not_borrowed_since = # the date which filter on issue history.
+ $params->{not_borrowed_since}
+ ? dt_from_string $params->{not_borrowed_since}
: undef;
my $last_issue_date = # the date which filter on borrowers last issue.
$params->{last_issue_date}
$params->{borrower_dateexpiry}
? dt_from_string $params->{borrower_dateexpiry}
: undef;
+my $borrower_lastseen =
+ $params->{borrower_lastseen}
+ ? dt_from_string $params->{borrower_lastseen}
+ : undef;
+my $patron_list_id = $params->{patron_list_id};
my $borrower_categorycode = $params->{'borrower_categorycode'} || q{};
}
);
+my $branch = $params->{ branch } || '*';
+$template->param( current_branch => $branch );
+$template->param( OnlyMine => C4::Context->only_my_library );
+
if ( $step == 2 ) {
my %checkboxes = map { $_ => 1 } split /\0/, $params->{'checkbox'};
- my $totalDel;
- my $membersToDelete;
+ my $patrons_to_delete;
if ( $checkboxes{borrower} ) {
- $membersToDelete = GetBorrowersToExpunge(
- _get_selection_params($not_borrowered_since, $borrower_dateexpiry, $borrower_categorycode)
+ $patrons_to_delete = GetBorrowersToExpunge(
+ _get_selection_params(
+ $not_borrowed_since,
+ $borrower_dateexpiry,
+ $borrower_lastseen,
+ $borrower_categorycode,
+ $patron_list_id,
+ $branch
+ )
);
- _skip_borrowers_with_nonzero_balance( $membersToDelete );
- $totalDel = scalar @$membersToDelete;
-
- }
- my $totalAno;
- my $membersToAnonymize;
- if ( $checkboxes{issue} ) {
- $membersToAnonymize = GetBorrowersWithIssuesHistoryOlderThan($last_issue_date);
- $totalAno = scalar @$membersToAnonymize;
}
+ _skip_borrowers_with_nonzero_balance($patrons_to_delete);
+
+ my $patrons_to_anonymize =
+ $checkboxes{issue}
+ ? $branch eq '*'
+ ? Koha::Patrons->search_patrons_to_anonymise( { before => $last_issue_date } )
+ : Koha::Patrons->search_patrons_to_anonymise( { before => $last_issue_date, library => $branch } )
+ : undef;
$template->param(
- totalToDelete => $totalDel,
- totalToAnonymize => $totalAno,
- memberstodelete_list => $membersToDelete,
- memberstoanonymize_list => $membersToAnonymize,
+ patrons_to_delete => $patrons_to_delete,
+ patrons_to_anonymize => $patrons_to_anonymize,
+ patron_list_id => $patron_list_id,
);
}
# delete members
if ($do_delete) {
- my $membersToDelete = GetBorrowersToExpunge(
- _get_selection_params($not_borrowered_since, $borrower_dateexpiry, $borrower_categorycode)
- );
- _skip_borrowers_with_nonzero_balance( $membersToDelete );
- $totalDel = scalar(@$membersToDelete);
+ my $patrons_to_delete = GetBorrowersToExpunge(
+ _get_selection_params(
+ $not_borrowed_since,
+ $borrower_dateexpiry,
+ $borrower_lastseen,
+ $borrower_categorycode,
+ $patron_list_id,
+ $branch
+ )
+ );
+ _skip_borrowers_with_nonzero_balance($patrons_to_delete);
+
+ $totalDel = scalar(@$patrons_to_delete);
$radio = $params->{'radio'};
for ( my $i = 0 ; $i < $totalDel ; $i++ ) {
$radio eq 'testrun' && last;
- my $borrowernumber = $membersToDelete->[$i]->{'borrowernumber'};
- $radio eq 'trash' && MoveMemberToDeleted( $borrowernumber );
- C4::VirtualShelves::HandleDelBorrower( $borrowernumber );
- DelMember( $borrowernumber );
+ my $borrowernumber = $patrons_to_delete->[$i]->{'borrowernumber'};
+ my $patron = Koha::Patrons->find($borrowernumber);
+ $radio eq 'trash' && $patron->move_to_deleted;
+ $patron->delete;
}
$template->param(
do_delete => '1',
# Anonymising all members
if ($do_anonym) {
#FIXME: anonymisation errors are not handled
- ($totalAno,my $anonymisation_error) = AnonymiseIssueHistory($last_issue_date);
+ my $rows = Koha::Patrons->search_patrons_to_anonymise( { before => $last_issue_date } )->anonymise_issue_history( { before => $last_issue_date } );
$template->param(
- do_anonym => '1',
+ do_anonym => $rows,
);
}
trash => ( $radio eq "trash" ) ? (1) : (0),
testrun => ( $radio eq "testrun" ) ? 1: 0,
);
+} else { # $step == 1
+ my @all_lists = GetPatronLists();
+ my @non_empty_lists;
+ foreach my $list (@all_lists){
+ my @patrons = $list->patron_list_patrons();
+ if( scalar @patrons ) { push(@non_empty_lists,$list) }
+ }
+ $template->param( patron_lists => [ @non_empty_lists ] );
}
+my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
+
$template->param(
step => $step,
- not_borrowered_since => $not_borrowered_since,
+ not_borrowed_since => $not_borrowed_since,
borrower_dateexpiry => $borrower_dateexpiry,
+ borrower_lastseen => $borrower_lastseen,
last_issue_date => $last_issue_date,
- borrower_categorycodes => GetBorrowercategoryList(),
+ borrower_categorycodes => $patron_categories,
borrower_categorycode => $borrower_categorycode,
);
my $borrowers = shift;
my $balance;
@$borrowers = map {
- (undef, undef, $balance) = GetMemberIssuesAndFines( $_->{borrowernumber} );
- ($balance != 0) ? (): ($_);
+ my $patron = Koha::Patrons->find( $_->{borrowernumber} );
+ my $balance = $patron->account->balance;
+ (defined $balance && $balance != 0) ? (): ($_);
} @$borrowers;
}
sub _get_selection_params {
- my ($not_borrowered_since, $borrower_dateexpiry, $borrower_categorycode) = @_;
+ my ($not_borrowed_since, $borrower_dateexpiry, $borrower_lastseen,
+ $borrower_categorycode, $patron_list_id, $branch) = @_;
my $params = {};
- $params->{not_borrowered_since} = output_pref({
- dt => $not_borrowered_since,
+ $params->{not_borrowed_since} = output_pref({
+ dt => $not_borrowed_since,
dateformat => 'iso',
dateonly => 1
- }) if $not_borrowered_since;
+ }) if $not_borrowed_since;
$params->{expired_before} = output_pref({
dt => $borrower_dateexpiry,
dateformat => 'iso',
dateonly => 1
}) if $borrower_dateexpiry;
+ $params->{last_seen} = output_pref({
+ dt => $borrower_lastseen,
+ dateformat => 'iso',
+ dateonly => 1
+ }) if $borrower_lastseen;
$params->{category_code} = $borrower_categorycode if $borrower_categorycode;
+ $params->{patron_list_id} = $patron_list_id if $patron_list_id;
+
+ if ( defined $branch and $branch ne '*' ) {
+ $params->{ branchcode } = $branch;
+ }
return $params;
};
projects / koha.git / blobdiff