Bug 15548: Move new patron related code to Patron*

[koha.git] / members / discharge.pl

diff --git a/members/discharge.pl b/members/discharge.pl
index 2144af9..5684a37 100755 (executable)
--- a/members/discharge.pl
+++ b/members/discharge.pl
@@ -36,7 +36,7 @@ use C4::Output;
 use C4::Members;
 use C4::Reserves;
 use C4::Letters;
-use Koha::Borrower::Discharge;
+use Koha::Patron::Discharge;
 
 use Koha::DateUtils;
 
@@ -57,7 +57,7 @@ if ( $input->param('borrowernumber') ) {
     # Getting member data
     $data = GetMember( borrowernumber => $borrowernumber );
 
-    my $can_be_discharged = Koha::Borrower::Discharge::can_be_discharged({
+    my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({
         borrowernumber => $borrowernumber
     });
 
@@ -67,18 +67,17 @@ 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::Patron::Discharge::is_discharged({
             borrowernumber => $borrowernumber,
-            validated      => 1,
         });
         unless ($is_discharged) {
-            Koha::Borrower::Discharge::discharge({
+            Koha::Patron::Discharge::discharge({
                 borrowernumber => $borrowernumber
             });
         }
         eval {
-            my $pdf_path = Koha::Borrower::Discharge::generate_as_pdf(
-                { borrowernumber => $borrowernumber, } );
+            my $pdf_path = Koha::Patron::Discharge::generate_as_pdf(
+                { borrowernumber => $borrowernumber, branchcode => $data->{'branchcode'} } );
 
             binmode(STDOUT);
             print $input->header(
@@ -98,6 +97,14 @@ if ( $input->param('borrowernumber') ) {
         }
     }
 
+    # Already generated discharges
+    my $validated_discharges = Koha::Patron::Discharge::get_validated({
+        borrowernumber => $borrowernumber,
+    });
+
+    my ($picture, $dberror) = GetPatronImage($borrowernumber);
+    $template->param( picture => 1 ) if $picture;
+
     $template->param(
         borrowernumber    => $borrowernumber,
         biblionumber      => $data->{'biblionumber'},
@@ -111,6 +118,8 @@ if ( $input->param('borrowernumber') ) {
         category_type     => $data->{'category_type'},
         categoryname      => $data->{'description'},
         address           => $data->{'address'},
+        streetnumber      => $data->{streetnumber},
+        streettype        => $data->{streettype},
         address2          => $data->{'address2'},
         city              => $data->{'city'},
         zipcode           => $data->{'zipcode'},
@@ -120,6 +129,7 @@ if ( $input->param('borrowernumber') ) {
         branchcode        => $data->{'branchcode'},
         has_reserves      => $has_reserves,
         can_be_discharged => $can_be_discharged,
+        validated_discharges => $validated_discharges,
     );
 }