From 54b52815f60b8de46b34e459039d1bafe0fbcaf0 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Tue, 2 Aug 2022 17:05:39 +1200 Subject: [PATCH] Bug 25560: Define item-type specific rules in UpdateNotForLoanStatusOnCheckin This enhancement respects the 'item-level_itypes' syspref, so will look at the authoritative item type when determining to update the notforloan status. Test plan: 1. Set -1 to 'Ordered', and 1 to 'Not for Loan' in Administration > Authorised values > NOT_LOAN 2. Make sure the 'item-level_itypes' syspref is set to 'specific item' 3. Add the following rules in UpdateNotForLoanStatusOnCheckin system preference: -1: 0 4. Apply patch & update database cd installer/data/mysql sudo koha-shell ./updatedatabase.pl 5. Restart plack 6. Observe the UpdateNotForLoanStatusOnCheckin syspref values have updated to the following format: _ALL_: -1: 0 7. Check in an 'Ordered' item of any item type and confirm it is changed to 'Available for loan' (NOT_LOAN=0) 8. Reset the UpdateNotForLoanStatusOnCheckin syspref to: _ALL_: -1: 0 CD: -1: 2 2: 0 9. Check-in an 'ordered' (NOT_LOAN=-1) CD item (item level itype='CD') and observe the item's notforloan status updates to 'Staff collection' (NOT_LOAN=2). This is because the _ALL_ rule does not override all other rules. 10. Check-in a 'Staff collection' (NOT_LOAN=2) CD item (item level itype='CD') and observe the item's notforloan status updates to 'Available for loan' (NOT_LOAN=0) 11. Check-in a 'Staff collection' (NOT_LOAN=2) DVD item (item level itype='DVD') and observe the items notforloan status does not change 12. Check-in an 'ordered' (NOT_LOAN=-1) DVD item (item level itype='DVD') and observe the items notforloan status updates to 'Available for loan' (NOT_LOAN=0) Sponsored-By: Waikato Institute of Technology, NZ Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- C4/Circulation.pm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 386738a098..2ebe5cbe6e 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2226,11 +2226,21 @@ sub AddReturn { warn "Unable to parse UpdateNotForLoanStatusOnCheckin syspref : $@"; } else { - foreach my $key ( keys %$rules ) { - if ( $item->notforloan eq $key ) { - $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} }; - $item->notforloan($rules->{$key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1 }) unless $rules->{$key} eq 'ONLYMESSAGE'; - last; + if ( defined $rules->{$item->itype} ) { + foreach my $notloan_rule_key (keys %{ $rules->{$item->itype}} ) { + if ( $item->notforloan eq $notloan_rule_key ) { + $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$item->itype}->{$notloan_rule_key} }; + $item->notforloan($rules->{$item->itype}->{$notloan_rule_key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1 }); + last; + } + } + } elsif ( defined $rules->{'_ALL_'} ) { + foreach my $notloan_rule_key (keys %{ $rules->{'_ALL_'}} ) { + if ( $item->notforloan eq $notloan_rule_key ) { + $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{'_ALL_'}->{$notloan_rule_key} }; + $item->notforloan($rules->{'_ALL_'}->{$notloan_rule_key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1 }); + last; + } } } } -- 2.39.5