From 4fea352b083afb6e7edb01ece784f8e902bd1bf8 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 29 Jan 2019 11:28:28 +0000 Subject: [PATCH] Bug 20912: (QA follow-up) Move Fees to Charges:: In preparation for the introduction of Koha::Charges::Fines I have moved this ::Fees class into the Koha::Charges:: namespace Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall --- C4/Circulation.pm | 8 ++++---- Koha/{ => Charges}/Fees.pm | 6 +++--- t/db_dependent/Koha/{ => Charges}/Fees.t | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) rename Koha/{ => Charges}/Fees.pm (97%) rename t/db_dependent/Koha/{ => Charges}/Fees.t (97%) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index d1865411eb..6c7ae420ee 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -59,7 +59,7 @@ use Koha::RefundLostItemFeeRules; use Koha::Account::Lines; use Koha::Account::Offsets; use Koha::Config::SysPrefs; -use Koha::Fees; +use Koha::Charges::Fees; use Carp; use List::MoreUtils qw( uniq any ); use Scalar::Util qw( looks_like_number ); @@ -707,7 +707,7 @@ sub CanBookBeIssued { # So issuingimpossible should be ok. } - my $fees = Koha::Fees->new( + my $fees = Koha::Charges::Fees->new( { patron => $patron, library => $library, @@ -1337,7 +1337,7 @@ sub AddIssue { my $patron = Koha::Patrons->find( $borrower ); my $library = Koha::Libraries->find( $branch ); - my $fees = Koha::Fees->new( + my $fees = Koha::Charges::Fees->new( { patron => $patron, library => $library, @@ -2906,7 +2906,7 @@ sub AddRenewal { } - my $fees = Koha::Fees->new( + my $fees = Koha::Charges::Fees->new( { patron => $patron, library => $library, diff --git a/Koha/Fees.pm b/Koha/Charges/Fees.pm similarity index 97% rename from Koha/Fees.pm rename to Koha/Charges/Fees.pm index 33bf3aa64e..62f534147c 100644 --- a/Koha/Fees.pm +++ b/Koha/Charges/Fees.pm @@ -1,4 +1,4 @@ -package Koha::Fees; +package Koha::Charges::Fees; # Copyright 2018 ByWater Solutions # @@ -27,11 +27,11 @@ use Koha::Exceptions; =head1 NAME -Koha::Feess - Module calculating fees in Koha +Koha::Charges::Fees - Module calculating fees in Koha =head3 new -Koha::Fees->new( +Koha::Charges::Fees->new( { patron => $patron, library => $library, diff --git a/t/db_dependent/Koha/Fees.t b/t/db_dependent/Koha/Charges/Fees.t similarity index 97% rename from t/db_dependent/Koha/Fees.t rename to t/db_dependent/Koha/Charges/Fees.t index db16a8236c..55c324216b 100644 --- a/t/db_dependent/Koha/Fees.t +++ b/t/db_dependent/Koha/Charges/Fees.t @@ -30,7 +30,7 @@ use C4::Calendar; use Koha::DateUtils qw(dt_from_string); BEGIN { - use_ok('Koha::Fees'); + use_ok('Koha::Charges::Fees'); } my $builder = t::lib::TestBuilder->new(); @@ -89,7 +89,7 @@ my $patron = $builder->build_object( my $dt_from = dt_from_string(); my $dt_to = dt_from_string()->add( days => 6 ); -my $fees = Koha::Fees->new( +my $fees = Koha::Charges::Fees->new( { patron => $patron, library => $library, -- 2.17.2 (Apple Git-113)