|
Lines 262-270
my $admin_adress = C4::Context->preference('KohaAdminEmailAddress');
Link Here
|
| 262 |
my @letters; |
262 |
my @letters; |
| 263 |
UPCOMINGITEM: foreach my $upcoming (@$upcoming_dues) { |
263 |
UPCOMINGITEM: foreach my $upcoming (@$upcoming_dues) { |
| 264 |
@letters = (); |
264 |
@letters = (); |
| 265 |
warn 'examining ' . $upcoming->{'itemnumber'} . ' upcoming due items' if $verbose; |
265 |
warn 'examining upcoming due itemnumber: ' . $upcoming->{'itemnumber'} if $verbose; |
| 266 |
|
266 |
|
| 267 |
my $from_address = $upcoming->{branchemail} || $admin_adress; |
267 |
my $from_address = $upcoming->{branchemail} || $admin_adress; |
|
|
268 |
my $reply_address = $upcoming->{branchreplyto} || undef; |
| 268 |
|
269 |
|
| 269 |
my $borrower_preferences; |
270 |
my $borrower_preferences; |
| 270 |
if ( 0 == $upcoming->{'days_until_due'} ) { |
271 |
if ( 0 == $upcoming->{'days_until_due'} ) { |
|
Lines 344-352
UPCOMINGITEM: foreach my $upcoming (@$upcoming_dues) {
Link Here
|
| 344 |
# cache this one to process after we've run through all of the items. |
345 |
# cache this one to process after we've run through all of the items. |
| 345 |
if ($digest_per_branch) { |
346 |
if ($digest_per_branch) { |
| 346 |
$upcoming_digest->{ $upcoming->{branchcode} }->{ $upcoming->{borrowernumber} }->{email} = $from_address; |
347 |
$upcoming_digest->{ $upcoming->{branchcode} }->{ $upcoming->{borrowernumber} }->{email} = $from_address; |
|
|
348 |
$upcoming_digest->{ $upcoming->{branchcode} }->{ $upcoming->{borrowernumber} }->{reply} = |
| 349 |
$reply_address; |
| 347 |
$upcoming_digest->{ $upcoming->{branchcode} }->{ $upcoming->{borrowernumber} }->{count}++; |
350 |
$upcoming_digest->{ $upcoming->{branchcode} }->{ $upcoming->{borrowernumber} }->{count}++; |
| 348 |
} else { |
351 |
} else { |
| 349 |
$upcoming_digest->{ $upcoming->{borrowernumber} }->{email} = $from_address; |
352 |
$upcoming_digest->{ $upcoming->{borrowernumber} }->{email} = $from_address; |
|
|
353 |
$upcoming_digest->{ $upcoming->{borrowernumber} }->{reply} = $reply_address; |
| 350 |
$upcoming_digest->{ $upcoming->{borrowernumber} }->{count}++; |
354 |
$upcoming_digest->{ $upcoming->{borrowernumber} }->{count}++; |
| 351 |
} |
355 |
} |
| 352 |
} else { |
356 |
} else { |
|
Lines 409-414
UPCOMINGITEM: foreach my $upcoming (@$upcoming_dues) {
Link Here
|
| 409 |
letter => $letter, |
413 |
letter => $letter, |
| 410 |
borrowernumber => $upcoming->{'borrowernumber'}, |
414 |
borrowernumber => $upcoming->{'borrowernumber'}, |
| 411 |
from_address => $from_address, |
415 |
from_address => $from_address, |
|
|
416 |
reply_address => $reply_address, |
| 412 |
message_transport_type => $letter->{message_transport_type} |
417 |
message_transport_type => $letter->{message_transport_type} |
| 413 |
} |
418 |
} |
| 414 |
); |
419 |
); |
|
Lines 606-613
sub send_digests {
Link Here
|
| 606 |
|
611 |
|
| 607 |
PATRON: while ( my ( $borrowernumber, $digest ) = each %{ $params->{digests} } ) { |
612 |
PATRON: while ( my ( $borrowernumber, $digest ) = each %{ $params->{digests} } ) { |
| 608 |
@letters = (); |
613 |
@letters = (); |
| 609 |
my $count = $digest->{count}; |
614 |
my $count = $digest->{count}; |
| 610 |
my $from_address = $digest->{email}; |
615 |
my $from_address = $digest->{email}; |
|
|
616 |
my $reply_address = $digest->{reply}; |
| 611 |
|
617 |
|
| 612 |
my %branch_info; |
618 |
my %branch_info; |
| 613 |
my $branchcode; |
619 |
my $branchcode; |
|
Lines 686-691
PATRON: while ( my ( $borrowernumber, $digest ) = each %{ $params->{digests} } )
Link Here
|
| 686 |
letter => $letter, |
692 |
letter => $letter, |
| 687 |
borrowernumber => $borrowernumber, |
693 |
borrowernumber => $borrowernumber, |
| 688 |
from_address => $from_address, |
694 |
from_address => $from_address, |
|
|
695 |
reply_address => $reply_address, |
| 689 |
message_transport_type => $letter->{message_transport_type} |
696 |
message_transport_type => $letter->{message_transport_type} |
| 690 |
} |
697 |
} |
| 691 |
); |
698 |
); |
| 692 |
- |
|
|