View | Details | Raw Unified | Return to bug 10843
Collapse All | Expand All

(-)a/C4/Letters.pm (-1 / +1 lines)
Lines 613-619 sub _parseletter { Link Here
613
        my @waitingdate = split /-/, $values->{'waitingdate'};
613
        my @waitingdate = split /-/, $values->{'waitingdate'};
614
614
615
        my $dt = dt_from_string();
615
        my $dt = dt_from_string();
616
        $dt->add( days => C4::Context->preference('ReservesMaxPickUpDelay') );
616
        $dt->add( days => C4::Context->preference('ReservesMaxPickUpDelay') || 0);
617
        $values->{'expirationdate'} = output_pref( $dt, undef, 1 );
617
        $values->{'expirationdate'} = output_pref( $dt, undef, 1 );
618
618
619
        $values->{'waitingdate'} = output_pref( dt_from_string( $values->{'waitingdate'} ), undef, 1 );
619
        $values->{'waitingdate'} = output_pref( dt_from_string( $values->{'waitingdate'} ), undef, 1 );
(-)a/t/Letters.t (-5 / +14 lines)
Lines 3-13 Link Here
3
# This Koha test module is a stub!
3
# This Koha test module is a stub!
4
# Add more tests here!!!
4
# Add more tests here!!!
5
5
6
use strict;
6
use Modern::Perl;
7
use warnings;
7
use DBI;
8
use Test::MockModule;
8
use Test::MockModule;
9
use Test::More tests => 2;
9
use Test::More tests => 4;
10
10
use t::lib::Mocks;
11
my $module = new Test::MockModule('C4::Context');
11
my $module = new Test::MockModule('C4::Context');
12
$module->mock(
12
$module->mock(
13
    '_new_dbh',
13
    '_new_dbh',
Lines 32-34 $dbh->{mock_add_resultset} = $mock_letters; Link Here
32
my $letters = C4::Letters::GetLetters();
32
my $letters = C4::Letters::GetLetters();
33
33
34
is( $letters->{ISBN}, 'book', 'HASH ref of ISBN is book' );
34
is( $letters->{ISBN}, 'book', 'HASH ref of ISBN is book' );
35
- 
35
36
# Regression test for bug 10843
37
# $dt->add takes a scalar, not undef
38
my $letter;
39
t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', undef);
40
$letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
41
is( ref($letter), 'HASH');
42
t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 1);
43
$letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
44
is( ref($letter), 'HASH');

Return to bug 10843