From b02a4231729d875ccf5e25511374377fe0315786 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Fri, 6 Jan 2023 13:51:00 +0000 Subject: [PATCH] Bug 32450: Noissuescharge debit type exclusions Currently the debit types to be excluded from the noissuescharge syspref are hardcoded in non_issues_charges which gives no flexibility for selecting which debit types should be included. This patch amends the subrout ine to use a database flag to identify which debit types should be included. It also adds a column to the table in the Debit Types area of System Preferences which shows which debit types are included. The ability to edit all debit types has been added rather than just the non-system ones and the flag to include/exclude the debit type from noissuescharge can be changed by clicking that edit button. Test plan: 1) Choose a patron and add some fines to this patron that have different debit_types 2) Navigate to system preferences and observe that currently you can only amend the noissuescharge included debit types using three preferences: ManInvInNoissuesCharge, RentalsInNoissuesCharge, HoldsInNoissuesCharge 3) Apply both commits attached to this bug 4) Navigate as above and observe that these three system preferences are now gone 5) Navigate to Debit Types in System Preferences, the table should have a column called No issues charge that shows whether a debit_type is Included or Not included 6) Click the edit button and there should be a checkbox for Included in noissuescharge 7) Change some of the debit_types using this option and observe that the patron you added fines to will either be blocked from checkouts or able to checkout depending on which debit_types you include and the value of these fines. --- Koha/Account.pm | 22 +++++-------------- admin/debit_types.pl | 2 ++ .../prog/en/modules/admin/debit_types.tt | 18 ++++++++++++++- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Koha/Account.pm b/Koha/Account.pm index e37e6465969..517138fe41f 100644 --- a/Koha/Account.pm +++ b/Koha/Account.pm @@ -28,6 +28,7 @@ use C4::Letters; use C4::Log qw( logaction ); use C4::Stats qw( UpdateStats ); use C4::Overdues qw(GetFine); +use C4::Context; use Koha::Patrons; use Koha::Account::Lines; @@ -702,31 +703,18 @@ my $non_issues_charges = $self->non_issues_charges Calculates amount immediately owing by the patron - non-issue charges. -Charges exempt from non-issue are: -* Res (holds) if HoldsInNoissuesCharge syspref is set to false -* Rent (rental) if RentalsInNoissuesCharge syspref is set to false -* Manual invoices if ManInvInNoissuesCharge syspref is set to false +Charges can be set as exempt from non-issue by editing the debit type in the Debit Types area of System Preferences. =cut sub non_issues_charges { my ($self) = @_; - - #NOTE: With bug 23049 these preferences could be moved to being attached - #to individual debit types to give more flexability and specificity. - my @not_fines; - push @not_fines, 'RESERVE' - unless C4::Context->preference('HoldsInNoissuesCharge'); - push @not_fines, ( 'RENT', 'RENT_DAILY', 'RENT_RENEW', 'RENT_DAILY_RENEW' ) - unless C4::Context->preference('RentalsInNoissuesCharge'); - unless ( C4::Context->preference('ManInvInNoissuesCharge') ) { - my @man_inv = Koha::Account::DebitTypes->search({ is_system => 0 })->get_column('code'); - push @not_fines, @man_inv; - } + + my @blocking_debit_types = Koha::Account::DebitTypes->search({ restricts_checkouts => 1 }, { columns => 'code' })->get_column('code'); return $self->lines->search( { - debit_type_code => { -not_in => \@not_fines } + debit_type_code => { -in => \@blocking_debit_types } }, )->total_outstanding; } diff --git a/admin/debit_types.pl b/admin/debit_types.pl index 40210479a1f..d44402f4af8 100755 --- a/admin/debit_types.pl +++ b/admin/debit_types.pl @@ -77,6 +77,7 @@ elsif ( $op eq 'add_validate' ) { my $can_be_invoiced = $input->param('can_be_invoiced') || 0; my $can_be_sold = $input->param('can_be_sold') || 0; my $default_amount = $input->param('default_amount') || undef; + my $restricts_checkouts = $input->param('restricts_checkouts') || 0; my @branches = grep { $_ ne q{} } $input->multi_param('branches'); if ( not defined $debit_type ) { @@ -86,6 +87,7 @@ elsif ( $op eq 'add_validate' ) { $debit_type->can_be_invoiced($can_be_invoiced); $debit_type->can_be_sold($can_be_sold); $debit_type->default_amount($default_amount); + $debit_type->restricts_checkouts($restricts_checkouts); try { $debit_type->store; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index 546e51e00ed..85e91c97364 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -122,6 +122,14 @@ [% END %] +
  • + + [% IF debit_type.restricts_checkouts %] + + [% ELSE %] + + [% END %] +