Bug 19761: Move template JavaScript to the footer: Serials, part 2

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

diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl
index c9dea91..7653dc6 100755 (executable)
--- a/opac/opac-discharge.pl
+++ b/opac/opac-discharge.pl
@@ -26,14 +26,18 @@ use C4::Context;
 use C4::Output;
 use C4::Log;
 use C4::Debug;
-use C4::Branch;
-use C4::Members;
+use Koha::Patrons;
 use Koha::Patron::Discharge;
 use Koha::DateUtils;
 
 my $input = new CGI;
 
-my $op = $input->param("op");
+unless ( C4::Context->preference('useDischarge') ) {
+    print $input->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
+
+my $op = $input->param("op") || '';
 
 # Getting the template and auth
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
@@ -43,6 +47,11 @@ 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 );
+}
+
 if ( $op eq 'request' ) {
     my $success = Koha::Patron::Discharge::request({
         borrowernumber => $loggedinuser,
@@ -59,10 +68,10 @@ elsif ( $op eq 'get' ) {
     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);
@@ -87,6 +96,8 @@ else {
         borrowernumber => $loggedinuser,
         pending        => 1,
     });
+    # FIXME looks like $available is not needed
+    # If a user is discharged they have a validated discharge available
     my $available = Koha::Patron::Discharge::count({
         borrowernumber => $loggedinuser,
         validated      => 1,