diff --git a/circ/renew.pl b/circ/renew.pl index 069312f85b..fcc9860a9a 100755 --- a/circ/renew.pl +++ b/circ/renew.pl @@ -24,7 +24,6 @@ use C4::Context; use C4::Auth qw( get_template_and_user ); use C4::Output qw( output_html_with_http_headers ); use C4::Circulation qw( barcodedecode CanBookBeRenewed GetLatestAutoRenewDate AddRenewal ); -use C4::Log qw( logaction ); use Koha::DateUtils qw( dt_from_string ); use Koha::Database; use Koha::BiblioFrameworks; @@ -66,42 +65,19 @@ if ( $op eq 'cud-renew' && $barcode ) { $patron = $checkout->patron; my $borrowernumber = $patron->borrowernumber; - my $user = C4::Context->userenv->{number}; - my $branchcode = C4::Context->userenv->{branch}; - my @message; if ( ( $patron->is_debarred || q{} ) lt dt_from_string()->ymd() ) { my $confirmations; my $can_renew; my $info; ( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit ); - push @{$confirmations}, $override_limit if $override_limit; + push @{$confirmations}, 'RENEWAL_LIMIT' if $override_limit; if ( $error && ( $error eq 'on_reserve' ) ) { if ($override_holds) { $can_renew = 1; $error = undef; - - @message = ("Override Renew hold for another"); - - my $infos = ( - { - message => \@message, - borrowernumber => $borrowernumber, - barcode => $barcode, - manager_id => $user, - branchcode => $branchcode, - } - ); - - my $json_infos = JSON->new->utf8->pretty->encode($infos); - $json_infos =~ s/"/'/g; - - logaction( - "CIRCULATION", "RENEWAL", - $patron->borrowernumber, - $json_infos, - ) if C4::Context->preference("RenewalLog"); + push @{$confirmations}, 'ON_RESERVE'; } else { $can_renew = 0; } @@ -133,27 +109,6 @@ if ( $op eq 'cud-renew' && $barcode ) { } ); $template->param( date_due => $date_due ); - - @message = ("Override limit Renew"); - - my $infos = ( - { - message => \@message, - borrowernumber => $borrowernumber, - barcode => $barcode, - manager_id => $user, - branchcode => $branchcode, - } - ); - - my $json_infos = JSON->new->utf8->pretty->encode($infos); - $json_infos =~ s/"/'/g; - - logaction( - "CIRCULATION", "RENEWAL", - $patron->borrowernumber, - $json_infos, - ) if C4::Context->preference("RenewalLog"); } } else { $error = "patron_restricted"; diff --git a/svc/renew b/svc/renew index a2877d5f7f..c3b8547a06 100755 --- a/svc/renew +++ b/svc/renew @@ -26,7 +26,6 @@ use Try::Tiny; use C4::Circulation qw( AddRenewal CanBookBeRenewed ); use C4::Context; use C4::Auth qw(check_cookie_auth); -use C4::Log qw( logaction ); use Koha::DateUtils qw(output_pref dt_from_string); @@ -54,10 +53,6 @@ my $date_due; if ( $input->param('date_due') ) { $date_due = dt_from_string( scalar $input->param('date_due') ); } -my $borrower = Koha::Patrons->find($borrowernumber); -my $user = C4::Context->userenv->{'number'}; -my $message; -my @message; my $data; $data->{itemnumber} = $itemnumber; @@ -75,56 +70,13 @@ my $confirmations; if ( $data->{error} && $data->{error} eq 'on_reserve' && C4::Context->preference('AllowRenewalOnHoldOverride') ) { $data->{renew_okay} = 1; $data->{error} = undef; - - push @{$confirmations}, 'ON_RESERVE' if $override_limit; - $message = "Override Renew hold for another"; - @message = ("Override Renew hold for another"); - - my $infos = ( - { - message => \@message, - borrowernumber => $borrowernumber, - barcode => $item->barcode, - manager_id => $user, - branchcode => $branchcode, - } - ); - - my $json_infos = JSON->new->utf8->pretty->encode($infos); - $json_infos =~ s/"/'/g; - - logaction( - "CIRCULATION", "RENEWAL", - $borrower->{'borrowernumber'}, - $json_infos, - ) if C4::Context->preference("IssueLog"); + push @{$confirmations}, 'ON_RESERVE'; } if ( $data->{error} && $data->{error} eq 'too_many' && C4::Context->preference('AllowRenewalLimitOverride') ) { $data->{renew_okay} = 1; $data->{error} = undef; - - $message = "Override limit Renew"; - @message = ("Override limit Renew"); - - my $infos = ( - { - message => \@message, - borrowernumber => $borrowernumber, - barcode => $item->barcode, - manager_id => $user, - branchcode => $branchcode, - } - ); - - my $json_infos = JSON->new->utf8->pretty->encode($infos); - $json_infos =~ s/"/'/g; - - logaction( - "CIRCULATION", "RENEWAL", - $borrower->{'borrowernumber'}, - $json_infos, - ) if C4::Context->preference("IssueLog"); + push @{$confirmations}, 'RENEWAL_LIMIT' if $override_limit; } if ( $data->{renew_okay} || ( $seen && $data->{error} eq 'too_unseen' ) ) {