From 73592372230098470085a87c9bf4a5da033f2d46 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 8 Mar 2016 18:00:07 +0000 Subject: [PATCH] Bug 14757 [QA Followup] - Change all references to Koha::Borrower to Koha::Patron Signed-off-by: Sean McGarvey --- C4/Letters.pm | 6 +++--- Koha/{Borrower => Patron}/Modification.pm | 2 +- Koha/Patron/Modifications.pm | 2 +- t/db_dependent/Letters/TemplateToolkit.t | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename Koha/{Borrower => Patron}/Modification.pm (96%) diff --git a/C4/Letters.pm b/C4/Letters.pm index 2b71271..9901c25 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -1410,8 +1410,8 @@ sub _get_tt_params { plural => 'biblios', pk => 'biblionumber', }, - borrowers => { #FIXME: Bug 15548 will require this to be updated - module => 'Koha::Borrowers', # to Koha::Patrons + borrowers => { + module => 'Koha::Patrons', singular => 'borrower', plural => 'borrowers', pk => 'borrowernumber', @@ -1465,7 +1465,7 @@ sub _get_tt_params { fk => 'itemnumber', }, borrower_modifications => { - module => 'Koha::Borrower::Modifications', + module => 'Koha::Patron::Modifications', singular => 'patron_modification', plural => 'patron_modifications', fk => 'verification_token', diff --git a/Koha/Borrower/Modification.pm b/Koha/Patron/Modification.pm similarity index 96% rename from Koha/Borrower/Modification.pm rename to Koha/Patron/Modification.pm index 35f56f4..a06aec9 100644 --- a/Koha/Borrower/Modification.pm +++ b/Koha/Patron/Modification.pm @@ -1,4 +1,4 @@ -package Koha::Borrower::Modification; +package Koha::Patron::Modification; # Copyright ByWater Solutions 2014 # diff --git a/Koha/Patron/Modifications.pm b/Koha/Patron/Modifications.pm index cd886a1..31fd61b 100644 --- a/Koha/Patron/Modifications.pm +++ b/Koha/Patron/Modifications.pm @@ -321,7 +321,7 @@ sub _type { =cut sub object_class { - return 'Koha::Borrower::Modification'; + return 'Koha::Patron::Modification'; } 1; diff --git a/t/db_dependent/Letters/TemplateToolkit.t b/t/db_dependent/Letters/TemplateToolkit.t index 4005dbb..c4ecc5f 100644 --- a/t/db_dependent/Letters/TemplateToolkit.t +++ b/t/db_dependent/Letters/TemplateToolkit.t @@ -38,7 +38,7 @@ use Koha::Serial; use Koha::Subscription; use Koha::Suggestion; use Koha::Checkout; -use Koha::Borrower::Modification; +use Koha::Patron::Modification; my $schema = Koha::Database->schema; $schema->storage->txn_begin(); @@ -87,7 +87,7 @@ my $serial = Koha::Serial->new()->store(); my $subscription = Koha::Subscription->new()->store(); my $suggestion = Koha::Suggestion->new()->store(); my $checkout = Koha::Checkout->new( { itemnumber => $item->id() } )->store(); -my $modification = Koha::Borrower::Modification->new( { verification_token => "TEST" } )->store(); +my $modification = Koha::Patron::Modification->new( { verification_token => "TEST" } )->store(); my $prepared_letter; -- 2.1.4