Bug 17801: Use issuedate for limits in Most Circulated Items

[srvgit] / members / deletemem.pl

diff --git a/members/deletemem.pl b/members/deletemem.pl
index c67586f..389a79c 100755 (executable)
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -28,13 +28,10 @@ use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Members;
-use Module::Load;
+use C4::Suggestions qw( SearchSuggestion );
 use Koha::Patrons;
 use Koha::Token;
-
-if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
-    load Koha::NorwegianPatronDB, qw( NLMarkForDeletion NLSync );
-}
+use Koha::Patron::Categories;
 
 my $input = new CGI;
 
@@ -42,7 +39,6 @@ my ($template, $loggedinuser, $cookie)
                 = get_template_and_user({template_name => "members/deletemem.tt",
                                         query => $input,
                                         type => "intranet",
-                                        authnotrequired => 0,
                                         flagsrequired => {borrowers => 'edit_borrowers'},
                                         debug => 1,
                                         });
@@ -56,32 +52,15 @@ if ( $loggedinuser == $member ) {
     exit 0; # Exit without error
 }
 
-my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $logged_in_user = Koha::Patrons->find( $loggedinuser );
 my $patron         = Koha::Patrons->find( $member );
 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
-# Handle deletion from the Norwegian national patron database, if it is enabled
-# If the "deletelocal" parameter is set to "false", the regular deletion will be
-# short circuited, and only a deletion from the national database can be carried
-# out. If "deletelocal" is set to "true", or not set to anything normal
-# deletion will be done.
-my $deletelocal  = $input->param('deletelocal')  eq 'false' ? 0 : 1; # Deleting locally is the default
-if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
-    if ( $input->param('deleteremote') eq 'true' ) {
-        # Mark for deletion, then try a live sync
-        NLMarkForDeletion( $member );
-        NLSync({ 'borrowernumber' => $member });
-    }
-}
-
-my $issues = GetPendingIssues($member);     # FIXME: wasteful call when really, we only want the count
-my $countissues = scalar(@$issues);
-
-my $flags = C4::Members::patronflags( $patron->unblessed );
+my $debits = $patron->account->outstanding_debits->total_outstanding;
+my $credits = abs $patron->account->outstanding_credits->total_outstanding;
+my $countissues = $patron->checkouts->count;
 my $userenv = C4::Context->userenv;
 
- 
-
 if ($patron->category->category_type eq "S") {
     unless(C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) {
         print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE_STAFF");
@@ -106,37 +85,35 @@ if (C4::Context->preference("IndependentBranches")) {
 
 my $op = $input->param('op') || 'delete_confirm';
 my $dbh = C4::Context->dbh;
-my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);
-if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'}  or $is_guarantor or $deletelocal == 0) {
-    $template->param( picture => 1 ) if $patron->image;
-
-    $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
-
+my $is_guarantor = $patron->guarantee_relationships->count;
+my $countholds = $dbh->selectrow_array("SELECT COUNT(*) FROM reserves WHERE borrowernumber=?", undef, $member);
+
+# Add warning if patron has pending suggestions
+$template->param(
+    pending_suggestions => scalar @{
+    C4::Suggestions::SearchSuggestion(
+            { suggestedby => $member, STATUS => 'ASKED' }
+        )
+    }
+);
+
+$template->param(
+    patron        => $patron,
+    ItemsOnIssues => $countissues,
+    debits        => $debits,
+    credits       => $credits,
+    is_guarantor  => $is_guarantor,
+    ItemsOnHold   => $countholds,
+);
+
+if ( $op eq 'delete_confirm' or $countissues > 0 or $debits or $is_guarantor ) {
     $template->param(
-        patron => $patron,
+        op         => 'delete_confirm',
+        csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID') }),
     );
-    if ($countissues >0) {
-        $template->param(ItemsOnIssues => $countissues);
-    }
-    if ($flags->{'CHARGES'} ne '') {
-        $template->param(charges => $flags->{'CHARGES'}->{'amount'});
-    }
-    if ($is_guarantor) {
-        $template->param(guarantees => 1);
-    }
-    if ($deletelocal == 0) {
-        $template->param(keeplocal => 1);
-    }
-    # This is silly written but reflect the same conditions as above
-    if ( not $countissues > 0 and not $flags->{CHARGES} ne '' and not $is_guarantor and not $deletelocal == 0 ) {
-        $template->param(
-            op         => 'delete_confirm',
-            csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID') }),
-        );
-    }
-} elsif ( $op eq 'delete_confirmed' ) {
 
-    die "Wrong CSRF token"
+} elsif ( $op eq 'delete_confirmed' ) {
+    output_and_exit( $input, $cookie, $template, 'wrong_csrf_token' )
         unless Koha::Token->new->check_csrf( {
             session_id => $input->cookie('CGISESSID'),
             token  => scalar $input->param('csrf_token'),