gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 30300: (QA follow-up) Move logic to queue_notice 

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Matt Blenkinsop 2024-10-31 16:11:59 +00:00 committed by Katrin Fischer
parent ae68d05b59
commit 3d3ccd4624
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Koha/Patron.pm
View File

@ -2653,7 +2653,8 @@ sub queue_notice {
message_name => $params->{message_name}
} );
@message_transports = ( keys %{ $messaging_prefs->{transports} } );
$letter_code = $messaging_prefs->{transports}->{$message_transports[0]} unless $letter_code;
$letter_code = $messaging_prefs->{transports}->{ $message_transports[0] } unless $letter_code;
return if ( $params->{message_name} eq 'Patron_Expiry' && !$messaging_prefs );
} else {
@message_transports = @{$params->{message_transports}};
}

25
misc/cronjobs/membership_expiry.pl
View File

@ -261,40 +261,29 @@ while ( my $expiring_patron = $upcoming_mem_expires->next ) {
next;
}
my $messaging_prefs = C4::Members::Messaging::GetMessagingPreferences(
{
borrowernumber => $expiring_patron->borrowernumber,
message_name => "Patron_Expiry",
}
);
my @message_transports = ( keys %{ $messaging_prefs->{transports} } );
my $letter_code = $messaging_prefs->{letter_code};
# Skip this patron if they don't want a notification email for card expiry
next if !$messaging_prefs;
my $which_notice;
if ($renew) {
$expiring_patron->renew_account;
$which_notice = $letter_renew;
$count_renewed++;
} else {
$which_notice = $letter_code || $letter_expiry;
$which_notice = $letter_expiry;
}
my $from_address = $expiring_patron->library->from_email_address;
my $letter_params = {
module => 'members',
letter_code => $which_notice,
branchcode => $expiring_patron->branchcode,
lang => $expiring_patron->lang,
module => 'members',
letter_code => $which_notice,
branchcode => $expiring_patron->branchcode,
lang => $expiring_patron->lang,
borrowernumber => $expiring_patron->borrowernumber,
tables => {
tables => {
borrowers => $expiring_patron->borrowernumber,
branches => $expiring_patron->branchcode,
},
};
my $sending_params = {
letter_params => $letter_params,
message_name => 'Patron_Expiry',