gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 16911: ->get_expiry_date accepts strings 

To make sure nothing else will be broken, it's certainly better to
handle date strings in a first phase.

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2016-07-20 19:03:53 +01:00 committed by Kyle M Hall
parent f48409bb8d
commit dde9fe1e98
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Koha/Patron/Category.pm
View File

@ -189,6 +189,7 @@ sub get_expiry_date {
my ($self, $date ) = @_;
if ( $self->enrolmentperiod ) {
$date ||= dt_from_string;
$date = dt_from_string( $date ) unless ref $date;
return $date->add( months => $self->enrolmentperiod );
} else {
return $self->enrolmentperioddate;

6
t/db_dependent/Koha/Patron/Categories.t
View File

@ -59,7 +59,7 @@ is( $retrieved_category_1->checkprevcheckout, 'inherit', 'Koha::Patron::Category
is( $retrieved_category_2->checkprevcheckout, 'inherit', 'Koha::Patron::Category->store should default checkprevcheckout to inherit' );
subtest 'get_expiry_date' => sub {
plan tests => 4;
plan tests => 5;
my $next_month = dt_from_string->add( months => 1 );
my $next_year = dt_from_string->add( months => 12 );
my $yesterday = dt_from_string->add( days => -1 );
@ -76,6 +76,10 @@ subtest 'get_expiry_date' => sub {
$category->enrolmentperiod( 12 )->store;
is( $category->get_expiry_date, $next_year, 'With enrolmentperiod defined and no parameter, ->get_expiry_date should return today + enrolmentperiod' );
is( $category->get_expiry_date( $yesterday ), $next_year->clone->add( days => -1 ), 'With enrolmentperiod defined and a date given in parameter, ->get_expiry_date should take this date + enrolmentperiod' );
my $hardcoded_date = '2000-01-31';
is( $category->get_expiry_date( $hardcoded_date ), dt_from_string( $hardcoded_date )->add( months => 12 ), 'get_expiry_date accepts strings as well' );
$category->delete;
};