Bug 17600: Standardize our EXPORT_OK

[srvgit] / members / pay.pl

diff --git a/members/pay.pl b/members/pay.pl
index 00e6f7b..2718116 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -28,10 +28,10 @@
 
 use Modern::Perl;
 
-use URI::Escape;
+use URI::Escape qw( uri_escape_utf8 uri_unescape );
 use C4::Context;
-use C4::Auth;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers );
 use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
@@ -39,9 +39,10 @@ use C4::Stats;
 use C4::Koha;
 use C4::Overdues;
 use Koha::Patrons;
+use Koha::Items;
 
 use Koha::Patron::Categories;
-use URI::Escape;
+use URI::Escape qw( uri_escape_utf8 uri_unescape );
 
 our $input = CGI->new;
 
@@ -50,9 +51,7 @@ our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'members/pay.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
-        debug           => 1,
     }
 );
 
@@ -64,9 +63,11 @@ if ( !$borrowernumber ) {
 }
 
 my $payment_id = $input->param('payment_id');
+our $change_given = $input->param('change_given');
+our @renew_results = $input->multi_param('renew_result');
 
 # get borrower details
-my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $logged_in_user = Koha::Patrons->find( $loggedinuser );
 our $patron         = Koha::Patrons->find($borrowernumber);
 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
@@ -77,13 +78,13 @@ our $branch = C4::Context->userenv->{'branch'};
 
 if ( $input->param('paycollect') ) {
     print $input->redirect(
-        "/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber");
+        "/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber&change_given=$change_given");
 }
 elsif ( $input->param('payselected') ) {
     payselected({ params => \@names });
 }
 elsif ( $input->param('writeoff_selected') ) {
-    payselected({ params => \@names, type => 'writeoff' });
+    payselected({ params => \@names, type => 'WRITEOFF' });
 }
 elsif ( $input->param('woall') ) {
     writeoff_all(@names);
@@ -92,33 +93,37 @@ elsif ( $input->param('apply_credits') ) {
     apply_credits({ patron => $patron, cgi => $input });
 }
 elsif ( $input->param('confirm_writeoff') ) {
+    my $item_id         = $input->param('itemnumber');
     my $accountlines_id = $input->param('accountlines_id');
     my $amount          = $input->param('amountwrittenoff');
     my $payment_note    = $input->param("payment_note");
 
     my $accountline = Koha::Account::Lines->find( $accountlines_id );
 
+    $amount = $accountline->amountoutstanding if (abs($amount - $accountline->amountoutstanding) < 0.01) && C4::Context->preference('RoundFinesAtPayment');
     if ( $amount > $accountline->amountoutstanding ) {
         print $input->redirect( "/cgi-bin/koha/members/paycollect.pl?"
               . "borrowernumber=$borrowernumber"
               . "&amount=" . $accountline->amount
               . "&amountoutstanding=" . $accountline->amountoutstanding
-              . "&accounttype=" . $accountline->accounttype
+              . "&debit_type_code=" . $accountline->debit_type_code
               . "&accountlines_id=" . $accountlines_id
+              . "&change_given=" . $change_given
               . "&writeoff_individual=1"
               . "&error_over=1" );
 
     } else {
-        Koha::Account->new( { patron_id => $borrowernumber } )->pay(
+        $payment_id = Koha::Account->new( { patron_id => $borrowernumber } )->pay(
             {
                 amount     => $amount,
-                lines      => [ scalar Koha::Account::Lines->find($accountlines_id) ],
-                type       => 'writeoff',
+                lines      => [ Koha::Account::Lines->find($accountlines_id) ],
+                type       => 'WRITEOFF',
                 note       => $payment_note,
                 interface  => C4::Context->interface,
+                item_id    => $item_id,
                 library_id => $branch,
             }
-        );
+        )->{payment_id};
     }
 }
 
@@ -132,9 +137,27 @@ for (@names) {
     }
 }
 
+# Populate an arrayref with everything we need to display any
+# renew results that occurred based on what we were passed
+my $renew_results_display = [];
+foreach my $renew_result(@renew_results) {
+    my ($itemnumber, $success, $info) = split(/,/, $renew_result);
+    my $item = Koha::Items->find($itemnumber);
+    if ($success) {
+        $info = uri_unescape($info);
+    }
+    push @{$renew_results_display}, {
+        item => $item,
+        success => $success,
+        info => $info
+    };
+}
+
 $template->param(
     finesview  => 1,
     payment_id => $payment_id,
+    change_given => $change_given,
+    renew_results => $renew_results_display
 );
 
 add_accounts_to_template();
@@ -188,7 +211,7 @@ sub redirect_to_paycollect {
       "/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber";
     $redirect .= q{&};
     $redirect .= "$action=1";
-    $redirect .= get_for_redirect( 'accounttype', "accounttype$line_no", 0 );
+    $redirect .= get_for_redirect( 'debit_type_code', "debit_type_code$line_no", 0 );
     $redirect .= get_for_redirect( 'amount', "amount$line_no", 1 );
     $redirect .=
       get_for_redirect( 'amountoutstanding', "amountoutstanding$line_no", 1 );
@@ -198,6 +221,7 @@ sub redirect_to_paycollect {
     $redirect .= get_for_redirect( 'accountlines_id', "accountlines_id$line_no", 0 );
     $redirect .= q{&} . 'payment_note' . q{=} . uri_escape_utf8( scalar $input->param("payment_note_$line_no") );
     $redirect .= '&remote_user=';
+    $redirect .= "change_given=$change_given";
     $redirect .= $user;
     return print $input->redirect($redirect);
 }
@@ -217,8 +241,8 @@ sub writeoff_all {
             Koha::Account->new( { patron_id => $borrowernumber } )->pay(
                 {
                     amount => $amount,
-                    lines  => [ scalar Koha::Account::Lines->find($accountlines_id) ],
-                    type   => 'writeoff',
+                    lines  => [ Koha::Account::Lines->find($accountlines_id) ],
+                    type   => 'WRITEOFF',
                     note   => $payment_note,
                     interface  => C4::Context->interface,
                     library_id => $branch,
@@ -235,7 +259,7 @@ sub payselected {
     my $parameters = shift;
 
     my @params = @{ $parameters->{params} };
-    my $type = $parameters->{type} || 'payment';
+    my $type = $parameters->{type} || 'PAYMENT';
 
     my $amt    = 0;
     my @lines_to_pay;