From 6fb84db73d8184d77c38b057dc8885554c93aeae Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 20 Apr 2020 16:13:35 +0000 Subject: [PATCH] Bug 8367: Add holds_pickup_period circulation rule So that pickup delay can have a different value per patron category, item type or branch. To test: 1) Update database, restart services 2) Set ReservesMaxPickUpDelay syspref (if not already set) 3) Edit your circulation rules and set a value under 'Holds pickup period (day) that is DIFFERENT from ReservesMaxPickUpDelay 4) Place a hold on a biblio 5) Check in an item from that biblio and confirm the hold as waiting 6) Confirm the expiration date is calculated using the 'Holds pickup period' value instead of the ReservesMaxPickUpDelay syspref 7) Revert the waiting status and delete the hold 8) Re-place the hold on the biblio 9) Create a holiday with a date that will overlap with the 'Holds pickup period' 10) Check in an item from that biblio and confirm the hold as waiting 11) Confirm the expiration date is calculated using the 'Holds pickup period' value AND considers the special holiday 12) Confirm tests pass t/db_dependent/Holds/WaitingReserves.t I've also added this to the TalkingTech_itiva_outbound.pl cronjob, I'm not sure how to test this. Please test properly if you can, otherwise maybe put some warns in and confirm the correct expiration date is calculated. Sponsored-by: Catalyst IT --- Koha/CirculationRules.pm | 3 + Koha/Hold.pm | 12 ++++ admin/smart-rules.pl | 2 + .../bug_8367-add_holds_pickup_period_circrule.perl | 6 ++ installer/onboarding.pl | 1 + .../prog/en/modules/admin/smart-rules.tt | 7 ++- .../thirdparty/TalkingTech_itiva_outbound.pl | 12 ++++ t/db_dependent/Holds/WaitingReserves.t | 68 +++++++++++++++++++++- 8 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_8367-add_holds_pickup_period_circrule.perl diff --git a/Koha/CirculationRules.pm b/Koha/CirculationRules.pm index df1314613e..db8aeb39f5 100644 --- a/Koha/CirculationRules.pm +++ b/Koha/CirculationRules.pm @@ -169,6 +169,9 @@ our $RULE_KINDS = { decreaseloanholds => { scope => [ 'branchcode', 'categorycode', 'itemtype' ], }, + holds_pickup_period => { + scope => [ 'branchcode', 'categorycode', 'itemtype' ], + }, # Not included (deprecated?): # * accountsent # * reservecharge diff --git a/Koha/Hold.pm b/Koha/Hold.pm index 892fb20cd5..00981ae13b 100644 --- a/Koha/Hold.pm +++ b/Koha/Hold.pm @@ -196,6 +196,18 @@ sub set_waiting { my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays'); my $expirationdate = $today->clone; + + my $rule = Koha::CirculationRules->get_effective_rule({ + categorycode => $self->borrower->categorycode, + itemtype => $self->item->effective_itemtype, + branchcode => $self->branchcode, + rule_name => 'holds_pickup_period', + }); + if ( defined($rule) and $rule->rule_value ne '' ){ + # circulation rule overrides ReservesMaxPickUpDelay + $max_pickup_delay = $rule->rule_value; + } + $expirationdate->add(days => $max_pickup_delay); if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) { diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl index b1fa57b4da..99bf41c13a 100755 --- a/admin/smart-rules.pl +++ b/admin/smart-rules.pl @@ -290,6 +290,7 @@ elsif ($op eq 'add') { 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; + my $holds_pickup_period = strip_non_numeric($input->param('holds_pickup_period')); $debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty, $maxonsiteissueqty, $cap_fine_to_replacement_price"; my $rules = { @@ -325,6 +326,7 @@ elsif ($op eq 'add') { article_requests => $article_requests, note => $note, decreaseloanholds => $decreaseloanholds, + holds_pickup_period => $holds_pickup_period, }; Koha::CirculationRules->set_rules( 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 new file mode 100644 index 0000000000..2f62aa436d --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_8367-add_holds_pickup_period_circrule.perl @@ -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, 'holds_pickup_period', NULL) }); + + NewVersion( $DBversion, 8367, "Add holds_pickup_period circulation rule" ); +} diff --git a/installer/onboarding.pl b/installer/onboarding.pl index 6680cd94d9..48c48e6b51 100755 --- a/installer/onboarding.pl +++ b/installer/onboarding.pl @@ -288,6 +288,7 @@ if ( $step == 5 ) { reservesallowed => $reservesallowed, suspension_chargeperiod => undef, decreaseloanholds => undef, + holds_pickup_period => undef, } }; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index d41e9ecc50..32c6c9e962 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -126,6 +126,7 @@ Holds per record (count) On shelf holds allowed OPAC item level holds + Holds pickup period (day) Article requests Rental discount (%) Actions @@ -169,8 +170,9 @@ [% SET article_requests = all_rules.$c.$i.article_requests %] [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %] [% SET decreaseloanholds = all_rules.$c.$i.decreaseloanholds %] + [% SET holds_pickup_period = all_rules.$c.$i.holds_pickup_period %] - [% 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 || unseenrenewalsallowed || 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 %] + [% 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 || unseenrenewalsallowed || 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 || holds_pickup_period %] [% IF show_rule %] [% SET row_count = row_count + 1 %] @@ -318,6 +320,7 @@ Don't allow [% END %] + [% holds_pickup_period | html %] [% IF article_requests == 'no' %] No @@ -450,6 +453,7 @@ +