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

(-)a/C4/Letters.pm (-4 / +2 lines)
Lines 35-41 use Date::Calc qw( Add_Delta_Days ); Link Here
35
use Encode;
35
use Encode;
36
use Carp;
36
use Carp;
37
use Koha::Email;
37
use Koha::Email;
38
use Koha::Template::Plugin::KohaDates;
38
use Koha::DateUtils qw( format_sqldatetime );
39
39
40
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
40
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
41
41
Lines 787-795 sub _parseletter { Link Here
787
    my ( $letter, $table, $values ) = @_;
787
    my ( $letter, $table, $values ) = @_;
788
788
789
    if ( $table eq 'borrowers' && $values->{'dateexpiry'} ){
789
    if ( $table eq 'borrowers' && $values->{'dateexpiry'} ){
790
        $values->{'dateexpiry'} = Koha::Template::Plugin::KohaDates
790
        $values->{'dateexpiry'} = format_sqldatetime( $values->{'dateexpiry'} );
791
            ->new()
792
            ->filter($values->{'dateexpiry'});
793
    }
791
    }
794
792
795
    if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
793
    if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
(-)a/C4/Members.pm (-1 / +1 lines)
Lines 1489-1495 sub GetExpiryDate { Link Here
1489
1489
1490
sub GetUpcomingMembershipExpires {
1490
sub GetUpcomingMembershipExpires {
1491
    my $dbh = C4::Context->dbh;
1491
    my $dbh = C4::Context->dbh;
1492
    my $days = C4::Context->preference("MembershipExpiryDaysNotice");
1492
    my $days = C4::Context->preference("MembershipExpiryDaysNotice") || 0;
1493
    my $dateexpiry = DateTime->now()->add(days => $days)->ymd();
1493
    my $dateexpiry = DateTime->now()->add(days => $days)->ymd();
1494
1494
1495
    my $query = "
1495
    my $query = "
(-)a/t/Members.t (-2 / +13 lines)
Lines 23-29 use Test::MockModule; Link Here
23
use t::lib::TestBuilder;
23
use t::lib::TestBuilder;
24
use t::lib::Mocks qw( mock_preference );
24
use t::lib::Mocks qw( mock_preference );
25
25
26
use Test::More tests => 3;
26
use Test::More tests => 5;
27
use Test::MockModule;
27
use Test::MockModule;
28
28
29
BEGIN {
29
BEGIN {
Lines 103-105 my $upcoming_mem_expires = C4::Members::GetUpcomingMembershipExpires(); Link Here
103
is(scalar(@$upcoming_mem_expires), 1, 'Get upcoming membership expires should return 1 borrower.');
103
is(scalar(@$upcoming_mem_expires), 1, 'Get upcoming membership expires should return 1 borrower.');
104
104
105
is($upcoming_mem_expires->[0]{surname}, 'Martin', 'Get upcoming membership expires should return borrower "Martin".');
105
is($upcoming_mem_expires->[0]{surname}, 'Martin', 'Get upcoming membership expires should return borrower "Martin".');
106
- 
106
107
# Test GetUpcomingMembershipExpires() with MembershipExpiryDaysNotice == 0
108
t::lib::Mocks::mock_preference('MembershipExpiryDaysNotice', 0);
109
110
$upcoming_mem_expires = C4::Members::GetUpcomingMembershipExpires();
111
is(scalar(@$upcoming_mem_expires), 0, 'Get upcoming membership expires with 0 MembershipExpiryDaysNotice should return 0.');
112
113
# Test GetUpcomingMembershipExpires() with MembershipExpiryDaysNotice == undef
114
t::lib::Mocks::mock_preference('MembershipExpiryDaysNotice', undef);
115
116
$upcoming_mem_expires = C4::Members::GetUpcomingMembershipExpires();
117
is(scalar(@$upcoming_mem_expires), 0, 'Get upcoming membership expires without MembershipExpiryDaysNotice should return 0.');

Return to bug 6810