From: erickson Date: Tue, 15 Sep 2009 16:25:41 +0000 (+0000) Subject: during inspect, return policy data even if the patron is not allowed to checkout... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1d4ccf22dbf1c4fdbe645c46a4fea5d9b10fef1f;p=evergreen%2Fmasslnc.git during inspect, return policy data even if the patron is not allowed to checkout without override git-svn-id: svn://svn.open-ils.org/ILS/trunk@14023 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm index dc6813786f..09f3f7f8cc 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm @@ -894,6 +894,10 @@ sub run_indb_circ_test { return $self->matrix_test_result($results); } +# --------------------------------------------------------------------- +# given a use and copy, this will calculate the circulation policy +# parameters. Only works with in-db circ. +# --------------------------------------------------------------------- sub do_inspect { my $self = shift; @@ -913,17 +917,19 @@ sub do_inspect { push(@{$results->{failure_events}}, $LEGACY_CIRC_EVENT_MAP->{$_->{fail_part}}) for @{$self->matrix_test_result}; - return $results; } - my $duration_rule = $self->circ_matrix_matchpoint->duration_rule; - my $recurring_fine_rule = $self->circ_matrix_matchpoint->recurring_fine_rule; - my $max_fine_rule = $self->circ_matrix_matchpoint->max_fine_rule; - - my $policy = $self->get_circ_policy( - $duration_rule, $recurring_fine_rule, $max_fine_rule); + if($self->circ_matrix_matchpoint) { + my $duration_rule = $self->circ_matrix_matchpoint->duration_rule; + my $recurring_fine_rule = $self->circ_matrix_matchpoint->recurring_fine_rule; + my $max_fine_rule = $self->circ_matrix_matchpoint->max_fine_rule; + + my $policy = $self->get_circ_policy( + $duration_rule, $recurring_fine_rule, $max_fine_rule); + + $$results{$_} = $$policy{$_} for keys %$policy; + } - $$results{$_} = $$policy{$_} for keys %$policy; return $results; }