Bug 16845: Remove unused C4::Members::ModPrivacy

[srvgit] / C4 / Members.pm

diff --git a/C4/Members.pm b/C4/Members.pm
index 383799d..8d3df66 100644 (file)
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -41,6 +41,7 @@ use Koha::Patron::Debarments qw(IsDebarred);
 use Text::Unaccent qw( unac_string );
 use Koha::AuthUtils qw(hash_password);
 use Koha::Database;
+use Koha::Holds;
 use Koha::List::Patron;
 
 our (@ISA,@EXPORT,@EXPORT_OK,$debug);
@@ -725,6 +726,7 @@ sub AddMember {
     # get only the columns of Borrower
     my @columns = $schema->source('Borrower')->columns;
     my $new_member = { map { join(' ',@columns) =~ /$_/ ? ( $_ => $data{$_} )  : () } keys(%data) } ;
+    $new_member->{checkprevcheckout} ||= 'inherit';
     delete $new_member->{borrowernumber};
 
     my $rs = $schema->resultset('Borrower');
@@ -1660,18 +1662,16 @@ sub DelMember {
     my $borrowernumber = shift;
     #warn "in delmember with $borrowernumber";
     return unless $borrowernumber;    # borrowernumber is mandatory.
+    # Delete Patron's holds
+    my @holds = Koha::Holds->search({ borrowernumber => $borrowernumber });
+    $_->delete for @holds;
 
-    my $query = qq|DELETE 
-          FROM  reserves 
-          WHERE borrowernumber=?|;
-    my $sth = $dbh->prepare($query);
-    $sth->execute($borrowernumber);
-    $query = "
+    my $query = "
        DELETE
        FROM borrowers
        WHERE borrowernumber = ?
    ";
-    $sth = $dbh->prepare($query);
+    my $sth = $dbh->prepare($query);
     $sth->execute($borrowernumber);
     logaction("MEMBERS", "DELETE", $borrowernumber, "") if C4::Context->preference("BorrowersLog");
     return $sth->rows;
@@ -1990,27 +1990,6 @@ sub GetBorrowersNamesAndLatestIssue {
     return $results;
 }
 
-=head2 ModPrivacy
-
-  my $success = ModPrivacy( $borrowernumber, $privacy );
-
-Update the privacy of a patron.
-
-return :
-true on success, false on failure
-
-=cut
-
-sub ModPrivacy {
-    my $borrowernumber = shift;
-    my $privacy = shift;
-    return unless defined $borrowernumber;
-    return unless $borrowernumber =~ /^\d+$/;
-
-    return ModMember( borrowernumber => $borrowernumber,
-                      privacy        => $privacy );
-}
-
 =head2 IssueSlip
 
   IssueSlip($branchcode, $borrowernumber, $quickslip)