From 3a1c40a29056123de507a89156c9118f7c52a17f Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 2 Nov 2022 08:48:19 +1300 Subject: [PATCH] Bug 8367: (follow-up) Remove unnecessary code and atomic update Signed-off-by: Emmi Takkinen Signed-off-by: Nick Clemens Signed-off-by: Kelly Signed-off-by: Katrin Fischer Signed-off-by: Kelly Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../bug_8367-add_holds_pickup_period_circrule.perl | 10 ---------- .../cronjobs/thirdparty/TalkingTech_itiva_outbound.pl | 11 ----------- 2 files changed, 21 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_8367-add_holds_pickup_period_circrule.perl diff --git a/installer/data/mysql/atomicupdate/bug_8367-add_holds_pickup_period_circrule.perl b/installer/data/mysql/atomicupdate/bug_8367-add_holds_pickup_period_circrule.perl deleted file mode 100644 index d7cbe86eee..0000000000 --- a/installer/data/mysql/atomicupdate/bug_8367-add_holds_pickup_period_circrule.perl +++ /dev/null @@ -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" ); -} diff --git a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl b/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl index 2b54af94b1..5f679a9932 100755 --- a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl +++ b/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl @@ -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 -- 2.39.5