From 739c5593e93d579c077b78e9ce4b3d15fa0f7e47 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 27 May 2019 12:10:57 -0300 Subject: [PATCH] Bug 13958: Use SuspensionsCalendar syspref for more granularity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch makes the calculation of suspension expiration configuration detached from the finesCalendar syspref. This way libraries have more flexibility when setting circ rules. I wrote this path as a bugfix, because the recent change pushed by bug 19204 changed this behavior and libraries have been complaining since they got upgraded. It is a minor change, just adding the new syspref, and replacing the single place in which it is used for debarment calculation for the new one. The tests are updated similarly, just adding the new mocked syspref as it was with the old one. To test: - Apply this patches - updatedatabase - Run: $ kshell k$ prove t/db_dependent/Circulation.t => SUCCESS: Tests pass! - Sign off :-D Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Martin Renvoize --- C4/Circulation.pm | 2 +- t/db_dependent/Circulation.t | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 8a8d3ab8fc..2ef62f297e 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2297,7 +2297,7 @@ sub _debar_user_on_return { my $new_debar_dt; # Use the calendar or not to calculate the debarment date - if ( C4::Context->preference('finesCalendar') eq 'noFinesWhenClosed' ) { + if ( C4::Context->preference('SuspensionsCalendar') eq 'noSuspensionsWhenClosed' ) { my $calendar = Koha::Calendar->new( branchcode => $branchcode, days_mode => 'Calendar' diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 764665fba8..7605046f31 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -1854,6 +1854,7 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { $rule->suspension_chargeperiod(1)->store; $rule->firstremind(0)->store; t::lib::Mocks::mock_preference('finesCalendar', 'noFinesWhenClosed'); + t::lib::Mocks::mock_preference('SuspensionsCalendar', 'noSuspensionsWhenClosed'); # Adding a holiday 2 days ago my $calendar = C4::Calendar->new(branchcode => $library->{branchcode}); -- 2.20.1