ffzg/recall_notices.pl: added --interval and --dedup

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

diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl
index 5955a3e..4e8381b 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::Borrower::Discharge;
+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,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' ) {
-    my $success = Koha::Borrower::Discharge::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 );
     }
@@ -56,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 $pdf_path = Koha::Borrower::Discharge::generate_as_pdf({
+        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);
@@ -83,14 +107,6 @@ elsif ( $op eq 'get' ) {
     }
 }
 else {
-    my $pending = Koha::Borrower::Discharge::count({
-        borrowernumber => $loggedinuser,
-        pending        => 1,
-    });
-    my $available = Koha::Borrower::Discharge::count({
-        borrowernumber => $loggedinuser,
-        validated      => 1,
-    });
     $template->param(
         available => $available,
         pending   => $pending,
@@ -99,4 +115,4 @@ else {
 
 $template->param( dischargeview => 1 );
 
-output_html_with_http_headers $input, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $template->output, undef, { force_no_caching => 1 };