Bug 8367: (follow-up) Remove unnecessary code and atomic update
Signed-off-by: Emmi Takkinen <emmi.takkinen@koha-suomi.fi> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kelly <kelly@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kelly <kelly@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
c713fa335a
commit
3a1c40a290
2 changed files with 0 additions and 21 deletions
|
@ -1,10 +0,0 @@
|
|||
$DBversion = 'XXX';
|
||||
if( CheckVersion( $DBversion ) ) {
|
||||
$dbh->do(q{
|
||||
INSERT INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value)
|
||||
SELECT u.* FROM (SELECT NULL as branchcode, NULL as categorycode, NULL as itemtype, 'holds_pickup_period' as rule_name, '' as rule_value) u
|
||||
WHERE NOT EXISTS ( SELECT rule_name FROM circulation_rules where rule_name = 'holds_pickup_period' );
|
||||
});
|
||||
|
||||
NewVersion( $DBversion, 8367, "Add holds_pickup_period circulation rule" );
|
||||
}
|
|
@ -339,17 +339,6 @@ sub GetWaitingHolds {
|
|||
|
||||
my $waiting_date = dt_from_string( $issue->{waitingdate}, 'sql' );
|
||||
|
||||
my $rule = Koha::CirculationRules->get_effective_rule({
|
||||
categorycode => $issue->{categorycode},
|
||||
itemtype => $item->effective_itemtype,
|
||||
branchcode => $issue->{branchcode},
|
||||
rule_name => 'holds_pickup_period',
|
||||
});
|
||||
if ( defined($rule) and $rule->rule_value ne '' ){
|
||||
# circulation rule overrides ReservesMaxPickUpDelay
|
||||
$pickupdelay = $rule->rule_value;
|
||||
}
|
||||
|
||||
$issue->{'date_due'} = output_pref({dt => dt_from_string($issue->{expirationdate}), dateformat => 'iso' });
|
||||
$issue->{'level'} = 1; # only one level for Hold Waiting notifications
|
||||
|
||||
|
|
Loading…
Reference in a new issue