Attachment 100392 Details for Bug 24083 – Bug 24083: (follow-up) Fix params to AddRenewal

[patch] Bug 24083: (follow-up) Fix params to AddRenewal

Bug-24083-follow-up-Fix-params-to-AddRenewal.patch (text/plain), 3.44 KB, created by Andrew Isherwood on 2020-03-09 16:06:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2020-03-09 16:06:54 UTC

Size: 3.44 KB

patch

obsolete

>From c5d065be00351ddcaaa1896fdf0a530ea12ec36d Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Mon, 9 Mar 2020 16:04:46 +0000
>Subject: [PATCH] Bug 24083: (follow-up) Fix params to AddRenewal
>
>The merging of Bug 23051 has added a paramter that can be passed to
>C4::AddRenewal. This bug does also, so the offset of this bug's new
>paramter was wrong. This patch fixes it.
>---
> C4/ILSDI/Services.pm                | 2 +-
> circ/renew.pl                       | 1 +
> misc/cronjobs/automatic_renewals.pl | 2 +-
> opac/opac-renew.pl                  | 2 +-
> svc/renew                           | 2 +-
> 5 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
>index 13606fc836..11aabfaea4 100644
>--- a/C4/ILSDI/Services.pm
>+++ b/C4/ILSDI/Services.pm
>@@ -644,7 +644,7 @@ sub RenewLoan {
> 
>     # Add renewal if possible
>     my @renewal = CanBookBeRenewed( $borrowernumber, $itemnumber );
>-    if ( $renewal[0] ) { AddRenewal( $borrowernumber, $itemnumber, undef, undef, undef, 0 ); }
>+    if ( $renewal[0] ) { AddRenewal( $borrowernumber, $itemnumber, undef, undef, undef, undef, 0 ); }
> 
>     my $issue = $item->checkout;
>     return unless $issue; # FIXME should be handled
>diff --git a/circ/renew.pl b/circ/renew.pl
>index 95e8c92bec..9b1f1de9fe 100755
>--- a/circ/renew.pl
>+++ b/circ/renew.pl
>@@ -106,6 +106,7 @@ if ($barcode) {
>                         $branchcode,
>                         $date_due,
>                         undef,
>+                        undef,
>                         !$unseen
>                     );
>                     $template->param( date_due => $date_due );
>diff --git a/misc/cronjobs/automatic_renewals.pl b/misc/cronjobs/automatic_renewals.pl
>index f3e993db15..c07e673d86 100755
>--- a/misc/cronjobs/automatic_renewals.pl
>+++ b/misc/cronjobs/automatic_renewals.pl
>@@ -95,7 +95,7 @@ while ( my $auto_renew = $auto_renews->next ) {
>               $auto_renew->issue_id, $auto_renew->borrowernumber, $auto_renew->itemnumber;
>         }
>         if ($confirm){
>-            my $date_due = AddRenewal( $auto_renew->borrowernumber, $auto_renew->itemnumber, $auto_renew->branchcode, undef, undef, 0 );
>+            my $date_due = AddRenewal( $auto_renew->borrowernumber, $auto_renew->itemnumber, $auto_renew->branchcode, undef, undef, undef, 0 );
>             $auto_renew->auto_renew_error(undef)->store;
>         }
>         push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew;
>diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
>index 37ae1e5970..f2d60e9e89 100755
>--- a/opac/opac-renew.pl
>+++ b/opac/opac-renew.pl
>@@ -82,7 +82,7 @@ else {
>             else {
>                 $branchcode = 'OPACRenew';
>             }
>-            AddRenewal( $borrowernumber, $itemnumber, $branchcode, undef, undef, 0 );
>+            AddRenewal( $borrowernumber, $itemnumber, $branchcode, undef, undef, undef, 0 );
>             push( @renewed, $itemnumber );
>         }
>         else {
>diff --git a/svc/renew b/svc/renew
>index 98d7498a7c..231f217aec 100755
>--- a/svc/renew
>+++ b/svc/renew
>@@ -67,7 +67,7 @@ if ( $data->{error} && $data->{error} eq 'on_reserve' && C4::Context->preference
> }
> 
> if ( $data->{renew_okay} ) {
>-    $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due, undef, $seen );
>+    $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due, undef, undef, $seen );
>     $data->{date_due} = output_pref( { dt => $date_due, as_due_date => 1 } );
> }
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24083: 95861 | 95862 | 95863 | 95864 | 95865 | 95866 | 95867 | 95868 | 98749 | 98750 | 98751 | 98752 | 98765 | 98766 | 98767 | 98768 | 100244 | 100245 | 100246 | 100247 | 100380 | 100381 | 100382 | 100383 | 100392 | 110607 | 110608 | 110609 | 110610 | 110611 | 111147 | 111148 | 111149 | 111150 | 111151 | 111152 | 111283 | 111284 | 111285 | 111286 | 111287 | 111288 | 111289 | 111290 | 111291 | 111292 | 111293 | 111849 | 111850 | 111851 | 111852 | 111853 | 111854 | 111855 | 111856 | 111857 | 111858 | 111859 | 111860 | 112230 | 112231 | 112232 | 112233 | 112234 | 112235 | 112236 | 112237 | 112238 | 112239 | 112240 | 112241 | 112242 | 112243 | 112410 | 112411 | 112412 | 112413 | 112414 | 112415 | 112416 | 112417 | 112418 | 112419 | 112420 | 112421 | 112422 | 112423 | 113073 | 113074 | 113075 | 113076 | 113077 | 113078 | 113079 | 113080 | 113314 | 113315 | 113484 | 113485 | 113486 | 113487 | 113488 | 113489 | 113490 | 113491 | 113492 | 113493 | 113494 | 113546 | 113556 | 113557 | 113814