Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 17555: Add Koha::Patron->category

Browse source 
We need to use the DBIx::Class relationship to retrieve the patron
category.
It is more convenient to have a Koha::Patron->category method to
retrieve the category of a given patron.

Test plan:
Make sure that the tests in t/db_dependent/Koha/Patron* return green

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2016-11-04 15:05:08 +00:00 committed by Kyle M Hall
parent 3a6d38cbcb
commit 4277f43a91
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Koha/Patron.pm
View file

@ -93,6 +93,20 @@ sub delete {
return $deleted;
}
=head3 category
my $patron_category = $patron->category
Return the patron category for this patron
=cut
sub category {
my ( $self ) = @_;
return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );
}
=head3 guarantor
Returns a Koha::Patron object for this patron's guarantor
@ -200,8 +214,7 @@ sub wants_check_for_previous_checkout {
return 0 if ($self->checkprevcheckout eq 'no');
# More complex: patron inherits -> determine category preference
my $checkPrevCheckoutByCat = Koha::Patron::Categories
->find($self->categorycode)->checkprevcheckout;
my $checkPrevCheckoutByCat = $self->category->checkprevcheckout;
return 1 if ($checkPrevCheckoutByCat eq 'yes');
return 0 if ($checkPrevCheckoutByCat eq 'no');
@ -304,8 +317,7 @@ sub renew_account {
? dt_from_string( $self->dateexpiry )
: dt_from_string;
}
my $patron_category = Koha::Patron::Categories->find( $self->categorycode ); # FIXME Should be $self->category
my $expiry_date = $patron_category->get_expiry_date($date);
my $expiry_date = $self->category->get_expiry_date($date);
$self->dateexpiry($expiry_date)->store;
@ -440,8 +452,7 @@ Add enrolment fee for a patron if needed.
sub add_enrolment_fee_if_needed {
my ($self) = @_;
my $patron_category = Koha::Patron::Categories->find( $self->categorycode );
my $enrolment_fee = $patron_category->enrolmentfee;
my $enrolment_fee = $self->category->enrolmentfee;
if ( $enrolment_fee && $enrolment_fee > 0 ) {
# insert fee in patron debts
C4::Accounts::manualinvoice( $self->borrowernumber, '', '', 'A', $enrolment_fee );

9
t/db_dependent/Koha/Patrons.t
View file

@ -19,7 +19,7 @@
use Modern::Perl;
use Test::More tests => 11;
use Test::More tests => 12;
use Test::Warn;
use C4::Members;
@ -89,6 +89,13 @@ subtest 'guarantees' => sub {
$_->delete for @guarantees;
};
subtest 'category' => sub {
plan tests => 2;
my $patron_category = $new_patron_1->category;
is( ref( $patron_category), 'Koha::Patron::Category', );
is( $patron_category->categorycode, $category->{categorycode}, );
};
subtest 'siblings' => sub {
plan tests => 7;
my $siblings = $new_patron_1->siblings;