Lines 167-187
if( !$expdays ) {
Link Here
|
167 |
|
167 |
|
168 |
my $admin_adress = C4::Context->preference('KohaAdminEmailAddress'); |
168 |
my $admin_adress = C4::Context->preference('KohaAdminEmailAddress'); |
169 |
warn 'getting upcoming membership expires' if $verbose; |
169 |
warn 'getting upcoming membership expires' if $verbose; |
170 |
my $upcoming_mem_expires = C4::Members::GetUpcomingMembershipExpires({ branch => $branch, before => $before, after => $after }); |
170 |
my $upcoming_mem_expires = Koha::Patrons->search_upcoming_membership_expires({ 'me.branchcode' => $branch, before => $before, after => $after }); |
171 |
warn 'found ' . scalar( @$upcoming_mem_expires ) . ' soon expiring members' |
171 |
warn 'found ' . $upcoming_mem_expires->count . ' soon expiring members' |
172 |
if $verbose; |
172 |
if $verbose; |
173 |
|
173 |
|
174 |
# main loop |
174 |
# main loop |
175 |
$letter_type = 'MEMBERSHIP_EXPIRY' if !$letter_type; |
175 |
$letter_type = 'MEMBERSHIP_EXPIRY' if !$letter_type; |
176 |
foreach my $recent ( @$upcoming_mem_expires ) { |
176 |
while ( my $recent = $upcoming_mem_expires->next ) { |
177 |
my $from_address = $recent->{'branchemail'} || $admin_adress; |
177 |
my $from_address = $recent->library->branchemail || $admin_adress; |
178 |
my $letter = C4::Letters::GetPreparedLetter( |
178 |
my $letter = C4::Letters::GetPreparedLetter( |
179 |
module => 'members', |
179 |
module => 'members', |
180 |
letter_code => $letter_type, |
180 |
letter_code => $letter_type, |
181 |
branchcode => $recent->{'branchcode'}, |
181 |
branchcode => $recent->branchcode, |
182 |
tables => { |
182 |
tables => { |
183 |
borrowers => $recent->{'borrowernumber'}, |
183 |
borrowers => $recent->borrowernumber, |
184 |
branches => $recent->{'branchcode'}, |
184 |
branches => $recent->branchcode, |
185 |
}, |
185 |
}, |
186 |
); |
186 |
); |
187 |
last if !$letter; # Letters.pm already warned, just exit |
187 |
last if !$letter; # Letters.pm already warned, just exit |
Lines 190-196
foreach my $recent ( @$upcoming_mem_expires ) {
Link Here
|
190 |
} else { |
190 |
} else { |
191 |
C4::Letters::EnqueueLetter({ |
191 |
C4::Letters::EnqueueLetter({ |
192 |
letter => $letter, |
192 |
letter => $letter, |
193 |
borrowernumber => $recent->{'borrowernumber'}, |
193 |
borrowernumber => $recent->borrowernumber, |
194 |
from_address => $from_address, |
194 |
from_address => $from_address, |
195 |
message_transport_type => 'email', |
195 |
message_transport_type => 'email', |
196 |
}); |
196 |
}); |
197 |
- |
|
|