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

(-)a/t/db_dependent/Letters.t (-10 / +14 lines)
Lines 152-175 $resent = C4::Letters::ResendMessage(); Link Here
152
is( $resent, undef, 'ResendMessage should return undef if not message_id given' );
152
is( $resent, undef, 'ResendMessage should return undef if not message_id given' );
153
153
154
#Test guarantee-guarantor email redirection
154
#Test guarantee-guarantor email redirection
155
$library = $builder->build({
156
    source => 'Branch',
157
});
155
my ($GUARANTEE_EMAIL, $GUARANTOR_EMAIL) = qw| guarantee@example.com guarantor@example.com |;
158
my ($GUARANTEE_EMAIL, $GUARANTOR_EMAIL) = qw| guarantee@example.com guarantor@example.com |;
159
my $guarantor_category = $builder->build({ source => 'Category' });
156
my $guarantor = {
160
my $guarantor = {
157
    email        => $GUARANTOR_EMAIL,
161
    email        => $GUARANTOR_EMAIL,
158
    categorycode => 'PT',
162
    categorycode => categorycode => $guarantor_category,
159
    branchcode   => 'CPL',
163
    branchcode   => branchcode   => $library->{branchcode},
160
    surname      => "Guarantor"
164
    surname      => "Guarantor"
161
};
165
};
162
$guarantor->{'borrowernumber'} = AddMember(%$guarantor);
166
$guarantor->{'borrowernumber'} = AddMember(%$guarantor);
163
my $guarantee = {
167
my $guarantee = {
164
    guarantorid  => $guarantor->{'borrowernumber'},
168
    guarantorid  => $guarantor->{'borrowernumber'},
165
    email        => $GUARANTEE_EMAIL,
169
    email        => $GUARANTEE_EMAIL,
166
    categorycode => 'PT',
170
    categorycode => categorycode => $guarantor_category,
167
    branchcode   => 'CPL',
171
    branchcode   => branchcode   => $library->{branchcode},,
168
    surname      => "Guarantee"
172
    surname      => "Guarantee"
169
};
173
};
170
$guarantee->{'borrowernumber'} = AddMember(%$guarantee);
174
$guarantee->{'borrowernumber'} = AddMember(%$guarantee);
171
175
172
my $GUARANTEE_TO_ADDRESS = 'toto@exemple.com';
176
my $GUARANTEE_TO_ADDRESS = 'guarantor@exemple.com';
173
my $guarantee_message = {
177
my $guarantee_message = {
174
    borrowernumber         => $guarantee->{'borrowernumber'},
178
    borrowernumber         => $guarantee->{'borrowernumber'},
175
    message_transport_type => 'email',
179
    message_transport_type => 'email',
Lines 181-187 my $guarantee_message = { Link Here
181
sub SendToGuarantor {
185
sub SendToGuarantor {
182
    my ($useGuarantor, $message) = @_;
186
    my ($useGuarantor, $message) = @_;
183
    C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' );
187
    C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' );
184
    C4::Context->set_preference( 'EnableRedirectGuaranteeEmail', $useGuarantor );
188
    C4::Context->set_preference( 'RedirectGuaranteeEmail', $useGuarantor );
185
    C4::Context->clear_syspref_cache();
189
    C4::Context->clear_syspref_cache();
186
    my $id = C4::Letters::EnqueueLetter($message);
190
    my $id = C4::Letters::EnqueueLetter($message);
187
    C4::Letters::SendQueuedMessages();
191
    C4::Letters::SendQueuedMessages();
Lines 189-200 sub SendToGuarantor { Link Here
189
    return $result;
193
    return $result;
190
}
194
}
191
my $result = SendToGuarantor(0,$guarantee_message);
195
my $result = SendToGuarantor(0,$guarantee_message);
192
is($result->{'status'}, "sent", "With EnableRedirectGuaranteeEmail off, message is sent.");
196
is($result->{'status'}, "sent", "With RedirectGuaranteeEmail off, message is sent.");
193
is($result->{'to_address'}, $GUARANTEE_TO_ADDRESS, "With EnableRedirectGuaranteeEmail off, Message is sent to the specified to_address.");
197
is($result->{'to_address'}, $GUARANTEE_TO_ADDRESS, "With RedirectGuaranteeEmail off, Message is sent to the specified to_address.");
194
198
195
$result = SendToGuarantor(1,$guarantee_message);
199
$result = SendToGuarantor(1,$guarantee_message);
196
is($result->{'status'}, "sent", "With EnableRedirectGuaranteeEmail on, message is sent.");
200
is($result->{'status'}, "sent", "With RedirectGuaranteeEmail on, message is sent.");
197
is($result->{'to_address'}, $GUARANTOR_EMAIL, "With EnableRedirectGuaranteeEmail on, Message is sent to the guarantor's email address.");
201
is($result->{'to_address'}, $GUARANTOR_EMAIL, "With RedirectGuaranteeEmail on, Message is sent to the guarantor's email address.");
198
202
199
$guarantor->{'email'} = undef;
203
$guarantor->{'email'} = undef;
200
ModMember(%$guarantor);
204
ModMember(%$guarantor);
(-)a/t/db_dependent/Members.t (-8 / +7 lines)
Lines 17-23 Link Here
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use Test::More tests => 65;
20
use Test::More tests => 87;
21
use Test::MockModule;
21
use Test::MockModule;
22
use Data::Dumper qw/Dumper/;
22
use Data::Dumper qw/Dumper/;
23
use C4::Context;
23
use C4::Context;
Lines 139-145 is ($checkcardnum, "2", "Card number is too long"); Link Here
139
139
140
t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'OFF' );
140
t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'OFF' );
141
141
142
C4::Context->set_preference( 'EnableRedirectGuaranteeEmail', 0 );
142
C4::Context->set_preference( 'RedirectGuaranteeEmail', 0 );
143
C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' );
143
C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' );
144
C4::Context->clear_syspref_cache();
144
C4::Context->clear_syspref_cache();
145
145
Lines 157-176 my $GUARANTEE_EMAIL = 'guanrantee@email.test'; Link Here
157
my $guarantee = {
157
my $guarantee = {
158
    guarantorid  => $member->{'borrowernumber'},
158
    guarantorid  => $member->{'borrowernumber'},
159
    emailpro     => $GUARANTEE_EMAIL,
159
    emailpro     => $GUARANTEE_EMAIL,
160
    categorycode => $CATEGORYCODE,
160
    categorycode => $member->{categorycode},
161
    branchcode   => $BRANCHCODE,
161
    branchcode   => $BRANCHCODE,
162
    surname      => "surname"
162
    surname      => "surname"
163
};
163
};
164
$guarantee->{'borrowernumber'} = AddMember(%$guarantee);
164
$guarantee->{'borrowernumber'} = AddMember(%$guarantee);
165
165
166
$notice_email = GetNoticeEmailAddress($guarantee->{'borrowernumber'});
166
$notice_email = GetNoticeEmailAddress($guarantee->{'borrowernumber'});
167
is ($notice_email, $GUARANTEE_EMAIL, "GetNoticeEmailAddress returns correct value when EnableRedirectGuaranteeEmail is disabled");
167
is ($notice_email, $GUARANTEE_EMAIL, "GetNoticeEmailAddress returns correct value when RedirectGuaranteeEmail is disabled");
168
168
169
C4::Context->set_preference( 'EnableRedirectGuaranteeEmail', 1 );
169
C4::Context->set_preference( 'RedirectGuaranteeEmail', 1 );
170
C4::Context->clear_syspref_cache();
170
C4::Context->clear_syspref_cache();
171
171
172
$notice_email = GetNoticeEmailAddress($guarantee->{'borrowernumber'});
172
$notice_email = GetNoticeEmailAddress($guarantee->{'borrowernumber'});
173
is ($notice_email, $EMAILPRO, "GetNoticeEmailAddress returns correct value when EnableRedirectGuaranteeEmail is activated");
173
is ($notice_email, "$GUARANTEE_EMAIL,$EMAILPRO", "GetNoticeEmailAddress returns correct value when RedirectGuaranteeEmail is activated");
174
174
175
175
176
ok(!$member->{is_expired}, "GetMemberDetails() indicates that patron is not expired");
176
ok(!$member->{is_expired}, "GetMemberDetails() indicates that patron is not expired");
Lines 316-322 my $borrower2 = $builder->build({ Link Here
316
        },
316
        },
317
});
317
});
318
318
319
my $guarantee = $builder->build({
319
$guarantee = $builder->build({
320
        source => 'Borrower',
320
        source => 'Borrower',
321
        value  => {
321
        value  => {
322
            categorycode=>'KIDclamp',
322
            categorycode=>'KIDclamp',
323
- 

Return to bug 12532