Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.

[koha.git] / tools / cleanborrowers.pl

diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
index b483514..3040b1d 100755 (executable)
--- a/tools/cleanborrowers.pl
+++ b/tools/cleanborrowers.pl
@@ -36,12 +36,13 @@ use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
-use C4::Members;        # GetBorrowersWhoHavexxxBorrowed.
+use C4::Members;
 use C4::Circulation;    # AnonymiseIssueHistory.
 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;
@@ -106,19 +107,17 @@ if ( $step == 2 ) {
     }
     _skip_borrowers_with_nonzero_balance($patrons_to_delete);
 
-    my $members_to_anonymize;
-    if ( $checkboxes{issue} ) {
-        if ( $branch eq '*' ) {
-            $members_to_anonymize = GetBorrowersWithIssuesHistoryOlderThan($last_issue_date);
-        } else {
-            $members_to_anonymize = GetBorrowersWithIssuesHistoryOlderThan($last_issue_date, $branch);
-        }
-    }
+    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(
         patrons_to_delete    => $patrons_to_delete,
-        patrons_to_anonymize => $members_to_anonymize,
-        patron_list_id       => $patron_list_id
+        patrons_to_anonymize => $patrons_to_anonymize,
+        patron_list_id       => $patron_list_id,
     );
 }
 
@@ -149,7 +148,6 @@ elsif ( $step == 3 ) {
             my $borrowernumber = $patrons_to_delete->[$i]->{'borrowernumber'};
             my $patron = Koha::Patrons->find($borrowernumber);
             $radio eq 'trash' && $patron->move_to_deleted;
-            C4::Members::HandleDelBorrower($borrowernumber);
             $patron->delete;
         }
         $template->param(
@@ -161,9 +159,9 @@ elsif ( $step == 3 ) {
     # 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,
         );
     }
 
@@ -200,7 +198,8 @@ sub _skip_borrowers_with_nonzero_balance {
     my $borrowers = shift;
     my $balance;
     @$borrowers = map {
-        (undef, undef, $balance) = GetMemberIssuesAndFines( $_->{borrowernumber} );
+        my $patron = Koha::Patrons->find( $_->{borrowernumber} );
+        my $balance = $patron->account->balance;
         (defined $balance && $balance != 0) ? (): ($_);
     } @$borrowers;
 }