Bug 14866: Make high holds work with different item types
To test: 1) Apply patch, update database, restart services 2) Enable decreaseLoanHighHolds sysprefs if not already active 3) Go to circulation rules and set a value under 'Decrease loan holds (day)' that is DIFFERENT from decreaseLoanHighHoldsDuration 4) Check out an item with holds and confirm that the value from the rule is used instead of the system preference 5) Confirm tests pass before and after the patch t/db_dependent/DecreaseLoanHighHolds.t Sponsored-by: Catalyst IT Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com> Signed-off-by: Henry Bolshaw <bolshawh@parliament.uk> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Aleisha Amohia
Jonathan Druart
parent
8bd02f9919
commit
1deb47e793
|
|
@ -1331,15 +1331,31 @@ sub checkHighHolds {
|
|||
my $orig_due = C4::Circulation::CalcDateDue( $issuedate, $itype, $branchcode, $borrower );
|
||||
|
||||
my $decreaseLoanHighHoldsDuration = C4::Context->preference('decreaseLoanHighHoldsDuration');
|
||||
|
||||
my $reduced_datedue = $calendar->addDate( $issuedate, $decreaseLoanHighHoldsDuration );
|
||||
my $rule = Koha::CirculationRules->get_effective_rule(
|
||||
{
|
||||
categorycode => $borrower->{categorycode},
|
||||
itemtype => $item_object->effective_itemtype,
|
||||
branchcode => $branchcode,
|
||||
rule_name => 'decreaseloanholds',
|
||||
}
|
||||
);
|
||||
my $reduced_datedue;
|
||||
my $duration;
|
||||
if ( defined($rule) && $rule->rule_value ne '' ){
|
||||
# overrides decreaseLoanHighHoldsDuration syspref
|
||||
$duration = $rule->rule_value;
|
||||
$reduced_datedue = $calendar->addDate( $issuedate, $rule->rule_value );
|
||||
} else {
|
||||
$duration = $decreaseLoanHighHoldsDuration;
|
||||
$reduced_datedue = $calendar->addDate( $issuedate, $decreaseLoanHighHoldsDuration );
|
||||
}
|
||||
$reduced_datedue->set_hour($orig_due->hour);
|
||||
$reduced_datedue->set_minute($orig_due->minute);
|
||||
$reduced_datedue->truncate( to => 'minute' );
|
||||
|
||||
if ( DateTime->compare( $reduced_datedue, $orig_due ) == -1 ) {
|
||||
$return_data->{exceeded} = 1;
|
||||
$return_data->{duration} = $decreaseLoanHighHoldsDuration;
|
||||
$return_data->{duration} = $duration;
|
||||
$return_data->{due_date} = $reduced_datedue;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -163,6 +163,9 @@ our $RULE_KINDS = {
|
|||
note => { # This is not really a rule. Maybe we will want to separate this later.
|
||||
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
|
||||
},
|
||||
decreaseloanholds => {
|
||||
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
|
||||
},
|
||||
# Not included (deprecated?):
|
||||
# * accountsent
|
||||
# * reservecharge
|
||||
|
|
|
|||
|
|
@ -287,6 +287,7 @@ elsif ($op eq 'add') {
|
|||
my $overduefinescap = $input->param('overduefinescap') || '';
|
||||
my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || '') eq 'on';
|
||||
my $note = $input->param('note');
|
||||
my $decreaseloanholds = $input->param('decreaseloanholds') || undef;
|
||||
$debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty, $maxonsiteissueqty, $cap_fine_to_replacement_price";
|
||||
|
||||
my $rules = {
|
||||
|
|
@ -320,6 +321,7 @@ elsif ($op eq 'add') {
|
|||
cap_fine_to_replacement_price => $cap_fine_to_replacement_price,
|
||||
article_requests => $article_requests,
|
||||
note => $note,
|
||||
decreaseloanholds => $decreaseloanholds,
|
||||
};
|
||||
|
||||
Koha::CirculationRules->set_rules(
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
$DBversion = 'XXX';
|
||||
if( CheckVersion( $DBversion ) ) {
|
||||
$dbh->do(q{INSERT IGNORE INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value) VALUES (NULL, NULL, NULL, 'decreaseloanholds', NULL) });
|
||||
|
||||
NewVersion( $DBversion, 14866, "Add decreaseloanholds circulation rule" );
|
||||
}
|
||||
|
|
@ -287,6 +287,7 @@ if ( $step == 5 ) {
|
|||
rentaldiscount => 0,
|
||||
reservesallowed => $reservesallowed,
|
||||
suspension_chargeperiod => undef,
|
||||
decreaseloanholds => undef,
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@
|
|||
<th>Days mode</th>
|
||||
<th>Unit</th>
|
||||
<th>Hard due date</th>
|
||||
<th>Decreased loan period for high holds (day)</th>
|
||||
<th>Fine amount</th>
|
||||
<th>Fine charging interval</th>
|
||||
<th>When to charge</th>
|
||||
|
|
@ -163,8 +164,9 @@
|
|||
[% SET opacitemholds = all_rules.$c.$i.opacitemholds %]
|
||||
[% SET article_requests = all_rules.$c.$i.article_requests %]
|
||||
[% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
|
||||
[% SET decreaseloanholds = all_rules.$c.$i.decreaseloanholds %]
|
||||
|
||||
[% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount %]
|
||||
[% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount || decreaseloanholds %]
|
||||
[% IF show_rule %]
|
||||
[% SET row_count = row_count + 1 %]
|
||||
<tr row_countd="row_[% row_count | html %]">
|
||||
|
|
@ -242,6 +244,7 @@
|
|||
<span>None defined</span>
|
||||
[% END %]
|
||||
</td>
|
||||
<td>[% decreaseloanholds | html %]</td>
|
||||
<td>[% fine | html %]</td>
|
||||
<td>[% chargeperiod | html %]</td>
|
||||
<td>[% IF chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %]</td>
|
||||
|
|
@ -391,6 +394,7 @@
|
|||
<input type="text" size="10" id="hardduedate" name="hardduedate" value="[% hardduedate | html %]" class="datepicker" />
|
||||
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
||||
</td>
|
||||
<td><input type="text" name="decreaseloanholds" id="decreaseloanholds" size="2" /></td>
|
||||
<td><input type="text" name="fine" id="fine" size="4" /></td>
|
||||
<td><input type="text" name="chargeperiod" id="chargeperiod" size="2" /></td>
|
||||
<td>
|
||||
|
|
@ -465,6 +469,7 @@
|
|||
<th>Days mode</th>
|
||||
<th>Unit</th>
|
||||
<th>Hard due date</th>
|
||||
<th>Decreased loan period for high holds (day)</th>
|
||||
<th>Fine amount</th>
|
||||
<th>Fine charging interval</th>
|
||||
<th>Charge when?</th>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ use Koha::CirculationRules;
|
|||
use t::lib::TestBuilder;
|
||||
use t::lib::Mocks;
|
||||
|
||||
use Test::More tests => 19;
|
||||
use Test::More tests => 21;
|
||||
|
||||
my $dbh = C4::Context->dbh;
|
||||
my $schema = Koha::Database->new()->schema();
|
||||
|
|
@ -109,11 +109,11 @@ Koha::CirculationRules->set_rules(
|
|||
lengthunit => 'days',
|
||||
reservesallowed => '99',
|
||||
holds_per_record => '99',
|
||||
decreaseloanholds => 0,
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
my $orig_due = C4::Circulation::CalcDateDue(
|
||||
dt_from_string(),
|
||||
$item->effective_itemtype,
|
||||
|
|
@ -133,9 +133,27 @@ my $patron_hr = { borrowernumber => $patron->id, branchcode => $library->{branch
|
|||
my $data = C4::Circulation::checkHighHolds( $item_hr, $patron_hr );
|
||||
is( $data->{exceeded}, 1, "Static mode should exceed threshold" );
|
||||
is( $data->{outstanding}, 6, "Should have 6 outstanding holds" );
|
||||
is( $data->{duration}, 1, "Should have duration of 1" );
|
||||
is( $data->{duration}, 0, "Should have duration of 0 because of specific circulation rules" );
|
||||
is( ref( $data->{due_date} ), 'DateTime', "due_date should be a DateTime object" );
|
||||
|
||||
Koha::CirculationRules->set_rules(
|
||||
{
|
||||
branchcode => undef,
|
||||
categorycode => undef,
|
||||
itemtype => $item->itype,
|
||||
rules => {
|
||||
issuelength => '14',
|
||||
lengthunit => 'days',
|
||||
reservesallowed => '99',
|
||||
holds_per_record => '99',
|
||||
decreaseloanholds => undef,
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
$data = C4::Circulation::checkHighHolds( $item_hr, $patron_hr );
|
||||
is( $data->{duration}, 1, "Should have a duration of 1 because no specific circulation rules so defaults to system preference" );
|
||||
|
||||
my $duedate = $data->{due_date};
|
||||
is($duedate->hour, $orig_due->hour, 'New due hour is equal to original due hour.');
|
||||
is($duedate->min, $orig_due->min, 'New due minute is equal to original due minute.');
|
||||
|
|
@ -215,4 +233,17 @@ ok( $needsconfirmation->{HIGHHOLDS}, "High holds checkout needs confirmation" );
|
|||
( undef, $needsconfirmation ) = CanBookBeIssued( $patron_object, $item->barcode, undef, undef, undef, { override_high_holds => 1 } );
|
||||
ok( !$needsconfirmation->{HIGHHOLDS}, "High holds checkout does not need confirmation" );
|
||||
|
||||
Koha::CirculationRules->set_rule(
|
||||
{
|
||||
branchcode => undef,
|
||||
categorycode => undef,
|
||||
itemtype => $item->itype,
|
||||
rule_name => 'decreaseloanholds',
|
||||
rule_value => 2,
|
||||
}
|
||||
);
|
||||
|
||||
$data = C4::Circulation::checkHighHolds( $item_hr, $patron_hr );
|
||||
is( $data->{duration}, 2, "Circulation rules override system preferences" );
|
||||
|
||||
$schema->storage->txn_rollback();
|
||||
|
|
|
|||
Loading…
Reference in New Issue