Bug 14368: [Follow-up] Fix workflow

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

diff --git a/members/discharge.pl b/members/discharge.pl
index d1a021d..ad8408b 100755 (executable)
--- a/members/discharge.pl
+++ b/members/discharge.pl
@@ -67,9 +67,8 @@ if ( $input->param('borrowernumber') ) {
 
     # Generating discharge if needed
     if ( $input->param('discharge') and $can_be_discharged ) {
-        my $is_discharged = Koha::Borrower::Discharge::count({
+        my $is_discharged = Koha::Borrower::Discharge::is_discharged({
             borrowernumber => $borrowernumber,
-            validated      => 1,
         });
         unless ($is_discharged) {
             Koha::Borrower::Discharge::discharge({

diff --git a/t/db_dependent/Borrower_Discharge.t b/t/db_dependent/Borrower_Discharge.t
index 97b22d7..ce96b22 100644 (file)
--- a/t/db_dependent/Borrower_Discharge.t
+++ b/t/db_dependent/Borrower_Discharge.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl;
 
 use Modern::Perl;
-use Test::More tests => 15;
+use Test::More tests => 17;
 use Test::Warn;
 use MARC::Record;
 
@@ -73,6 +73,12 @@ Koha::Borrower::Debarments::DelUniqueDebarment( { 'borrowernumber' => $borrower-
 ok( !Koha::Borrower::Debarments::IsDebarred( $borrower->{borrowernumber} ), 'The debarment has been lifted' );
 ok( !Koha::Borrower::Discharge::is_discharged( { borrowernumber => $borrower->{borrowernumber} } ), 'The patron is not discharged after the restriction has been lifted' );
 
+# Verify that the discharge works multiple times
+Koha::Borrower::Discharge::request({ borrowernumber => $borrower->{borrowernumber} });
+is(scalar( @{ Koha::Borrower::Discharge::get_pendings() }), 1, 'There is a pending discharge request (second time)');
+Koha::Borrower::Discharge::discharge( { borrowernumber => $borrower->{borrowernumber} } );
+is_deeply( Koha::Borrower::Discharge::get_pendings(), [], 'There is no pending discharge request (second time)');
+
 # Check if PDF::FromHTML is installed.
 my $check = eval { require PDF::FromHTML; };