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

Bug 30300: Update the cronjob to respect patron messaging preferences 

Test plan:
1) Apply patch and run updatedatabase
2) In system preferences set MembershipExpiryDaysNotice to 5
3) Choose a patron and edit their expiry date to today's date
4) Ensure that patron has a primary email address
5) Run perl misc/cronjobs/membership_expiry.pl -c -v -before 10 -after 10
6) Check the patron's messages, there should be no expiry notice queued
7) Edit the patron's messaging preferences and select the checkbox for email in the row for 'Patron expiry'
8) Repeat step 5
9) There should be a patron expiry message in the patron's message queue
10) Sign off!

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-07-29 13:12:12 +00:00 committed by Katrin Fischer
parent d3a5ec0c61
commit ae68d05b59
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
1 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
misc/cronjobs/membership_expiry.pl
View File

@ -252,69 +252,56 @@ warn 'found ' . $upcoming_mem_expires->count . ' soon expiring members'
# main loop
my ( $count_skipped, $count_renewed, $count_enqueued ) = ( 0, 0, 0 );
while ( my $recent = $upcoming_mem_expires->next ) {
if ( $active && !$recent->is_active( { months => $active } ) ) {
while ( my $expiring_patron = $upcoming_mem_expires->next ) {
if ( $active && !$expiring_patron->is_active( { months => $active } ) ) {
$count_skipped++;
next;
} elsif ( $inactive && $recent->is_active( { months => $inactive } ) ) {
} elsif ( $inactive && $expiring_patron->is_active( { months => $inactive } ) ) {
$count_skipped++;
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) {
$recent->renew_account;
$expiring_patron->renew_account;
$which_notice = $letter_renew;
$count_renewed++;
} else {
$which_notice = $letter_expiry;
$which_notice = $letter_code || $letter_expiry;
}
my $from_address = $recent->library->from_email_address;
my $letter = C4::Letters::GetPreparedLetter(
my $from_address = $expiring_patron->library->from_email_address;
my $letter_params = {
module => 'members',
letter_code => $which_notice,
branchcode => $recent->branchcode,
lang => $recent->lang,
branchcode => $expiring_patron->branchcode,
lang => $expiring_patron->lang,
borrowernumber => $expiring_patron->borrowernumber,
tables => {
borrowers => $recent->borrowernumber,
branches => $recent->branchcode,
borrowers => $expiring_patron->borrowernumber,
branches => $expiring_patron->branchcode,
},
);
last if !$letter; # Letters.pm already warned, just exit
if ($nomail) {
print $letter->{'content'}."\n";
next;
}
};
C4::Letters::EnqueueLetter({
letter => $letter,
borrowernumber => $recent->borrowernumber,
from_address => $from_address,
message_transport_type => 'email',
});
$count_enqueued++;
my $sending_params = {
letter_params => $letter_params,
message_name => 'Patron_Expiry',
};
if ($recent->smsalertnumber) {
my $smsletter = C4::Letters::GetPreparedLetter(
module => 'members',
letter_code => $which_notice,
branchcode => $recent->branchcode,
lang => $recent->lang,
tables => {
borrowers => $recent->borrowernumber,
branches => $recent->branchcode,
},
message_transport_type => 'sms',
);
if ($smsletter) {
C4::Letters::EnqueueLetter({
letter => $smsletter,
borrowernumber => $recent->borrowernumber,
message_transport_type => 'sms',
});
}
}
my $result = $expiring_patron->queue_notice($sending_params);
$count_enqueued++ if $result->{sent};
}
if ($verbose) {