Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / opac / opac-discharge.pl

diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl
index 6848f8e..75b6af8 100755 (executable)
--- a/opac/opac-discharge.pl
+++ b/opac/opac-discharge.pl
@@ -26,7 +26,7 @@ use C4::Context;
 use C4::Output;
 use C4::Log;
 use C4::Debug;
-use C4::Members;
+use Koha::Patrons;
 use Koha::Patron::Discharge;
 use Koha::DateUtils;
 
@@ -37,7 +37,7 @@ unless ( C4::Context->preference('useDischarge') ) {
     exit;
 }
 
-my $op = $input->param("op");
+my $op = $input->param("op") // '';
 
 # Getting the template and auth
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
@@ -47,11 +47,26 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
     debug         => 1,
 });
 
+my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({ borrowernumber => $loggedinuser });
+if ($can_be_discharged == 0) {
+    $template->param( has_checkouts => 1 );
+}
+
+my $pending = Koha::Patron::Discharge::count({
+    borrowernumber => $loggedinuser,
+    pending        => 1,
+});
+my $available = Koha::Patron::Discharge::is_discharged({borrowernumber => $loggedinuser});
+
 if ( $op eq 'request' ) {
+    if ($pending || $available) {
+        # Request already done
+        print $input->redirect("/cgi-bin/koha/opac-discharge.pl");
+        exit;
+    }
     my $success = Koha::Patron::Discharge::request({
         borrowernumber => $loggedinuser,
     });
-
     if ($success) {
         $template->param( success => 1 );
     }
@@ -60,13 +75,18 @@ if ( $op eq 'request' ) {
     }
 }
 elsif ( $op eq 'get' ) {
+    unless ($available) {
+        # No valid discharge to get
+        print $input->redirect("/cgi-bin/koha/opac-discharge.pl");
+        exit;
+    }
     eval {
 
         # Getting member data
-        my $data = GetMember( borrowernumber => $loggedinuser );
+        my $patron = Koha::Patrons->find( $loggedinuser );
         my $pdf_path = Koha::Patron::Discharge::generate_as_pdf({
             borrowernumber => $loggedinuser,
-            branchcode => $data->{'branchcode'},
+            branchcode => $patron->branchcode,
         });
 
         binmode(STDOUT);
@@ -79,26 +99,18 @@ elsif ( $op eq 'get' ) {
         my @lines = <$fh>;
         close $fh;
         print @lines;
-        exit;
     };
     if ( $@ ) {
         carp $@;
         $template->param( messages => [ {type => 'error', code => 'unable_to_generate_pdf'} ] );
+    } else {
+        # no error, pdf is sent, so stop sending data to browser
+        exit;
     }
 }
 else {
-    my $pending = Koha::Patron::Discharge::count({
-        borrowernumber => $loggedinuser,
-        pending        => 1,
-    });
-    # FIXME looks like $available is not needed
-    # If a patron is discharged he or she has a validated discharge available
-    my $available = Koha::Patron::Discharge::count({
-        borrowernumber => $loggedinuser,
-        validated      => 1,
-    });
     $template->param(
-        available => $available && Koha::Patron::Discharge::is_discharged({borrowernumber => $loggedinuser}),
+        available => $available,
         pending   => $pending,
     );
 }