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

(-)a/C4/Overdues.pm (+8 lines)
Lines 23-28 use strict; Link Here
23
#use warnings; FIXME - Bug 2505
23
#use warnings; FIXME - Bug 2505
24
use Date::Calc qw/Today Date_to_Days/;
24
use Date::Calc qw/Today Date_to_Days/;
25
use Date::Manip qw/UnixDate/;
25
use Date::Manip qw/UnixDate/;
26
use List::MoreUtils qw( uniq );
27
26
use C4::Circulation;
28
use C4::Circulation;
27
use C4::Context;
29
use C4::Context;
28
use C4::Accounts;
30
use C4::Accounts;
Lines 927-932 sub GetOverdueMessageTransportTypes { Link Here
927
    while ( my $mtt = $sth->fetchrow ) {
929
    while ( my $mtt = $sth->fetchrow ) {
928
        push @mtts, $mtt;
930
        push @mtts, $mtt;
929
    }
931
    }
932
933
    # Put 'print' in first if exists
934
    # It avoid to sent a print notice with an email or sms template is no email or sms is defined
935
    @mtts = uniq( 'print', @mtts )
936
        if grep {/^print$/} @mtts;
937
930
    return \@mtts;
938
    return \@mtts;
931
}
939
}
932
940
(-)a/t/db_dependent/Overdues.t (-2 / +3 lines)
Lines 38-43 $dbh->do(q| Link Here
38
    ('', 'PT', 1, 'email'),
38
    ('', 'PT', 1, 'email'),
39
    ('', 'PT', 2, 'email'),
39
    ('', 'PT', 2, 'email'),
40
    ('', 'PT', 2, 'sms'),
40
    ('', 'PT', 2, 'sms'),
41
    ('', 'PT', 3, 'sms'),
42
    ('', 'PT', 3, 'email'),
41
    ('', 'PT', 3, 'print'),
43
    ('', 'PT', 3, 'print'),
42
    ('', 'YA', 2, 'sms')
44
    ('', 'YA', 2, 'sms')
43
|);
45
|);
Lines 69-75 $mtts = C4::Overdues::GetOverdueMessageTransportTypes('', 'PT', 2); Link Here
69
is_deeply( $mtts, ['email', 'sms'], 'GetOverdueMessageTransportTypes: second overdue is by email and sms for PT (default)' );
71
is_deeply( $mtts, ['email', 'sms'], 'GetOverdueMessageTransportTypes: second overdue is by email and sms for PT (default)' );
70
72
71
$mtts = C4::Overdues::GetOverdueMessageTransportTypes('', 'PT', 3);
73
$mtts = C4::Overdues::GetOverdueMessageTransportTypes('', 'PT', 3);
72
is_deeply( $mtts, ['print'], 'GetOverdueMessageTransportTypes: third overdue is by print for PT (default)' );
74
is_deeply( $mtts, ['print', 'sms', 'email'], 'GetOverdueMessageTransportTypes: third overdue is by print, sms and email for PT (default). With print in first.' );
73
75
74
76
75
done_testing;
77
done_testing;
76
- 

Return to bug 11696