From a4da023bae60098aa518203b0d79a2d8420e215d Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 8 Mar 2022 13:42:38 +0000 Subject: [PATCH] Bug 30237: Reference new WELCOME notice This patch updates all references to the former ACCTDETAILS notice to use the new WELCOME email notice instead. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Fridolin Somers --- Koha/Patrons/Import.pm | 4 ++-- .../intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 2 +- members/memberentry.pl | 2 +- misc/import_patrons.pl | 2 +- opac/opac-memberentry.pl | 2 +- opac/opac-registration-verify.pl | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm index ae5ebe6058..6bd7e3d648 100644 --- a/Koha/Patrons/Import.pm +++ b/Koha/Patrons/Import.pm @@ -442,7 +442,7 @@ sub import_patrons { next LINE unless $success; - # Send ACCTDETAILS welcome email is the user is new and we're set to send mail + # Send WELCOME welcome email is the user is new and we're set to send mail if ($send_welcome && $is_new) { my $emailaddr = $patron->notice_email_address; @@ -451,7 +451,7 @@ sub import_patrons { eval { my $letter = GetPreparedLetter( module => 'members', - letter_code => 'ACCTDETAILS', + letter_code => 'WELCOME', branchcode => $patron->branchcode,, lang => $patron->lang || 'default', tables => { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 459e707cd3..1446b72b27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -349,7 +349,7 @@
  • - ACCTDETAILS notice is used + WELCOME notice is used
  • diff --git a/members/memberentry.pl b/members/memberentry.pl index bea2390701..e4f56a470d 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -468,7 +468,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ eval { my $letter = GetPreparedLetter( module => 'members', - letter_code => 'ACCTDETAILS', + letter_code => 'WELCOME', branchcode => $patron->branchcode,, lang => $patron->lang || 'default', tables => { diff --git a/misc/import_patrons.pl b/misc/import_patrons.pl index 19b0ffab3f..6dc037d6bb 100755 --- a/misc/import_patrons.pl +++ b/misc/import_patrons.pl @@ -150,7 +150,7 @@ Retain extended patron attributes for existing patrons being overwritten =item B<-en|--email-new> -Send the ACCTDETAILS welcome email to new users +Send the WELCOME notice email to new users =item B<-v|--verbose> diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 3eb94b2ab6..66a6484719 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -253,7 +253,7 @@ if ( $action eq 'create' ) { eval { my $letter = GetPreparedLetter( module => 'members', - letter_code => 'ACCTDETAILS', + letter_code => 'WELCOME', branchcode => $patron->branchcode,, lang => $patron->lang || 'default', tables => { diff --git a/opac/opac-registration-verify.pl b/opac/opac-registration-verify.pl index 90eb16e629..4c7c8d0dd0 100755 --- a/opac/opac-registration-verify.pl +++ b/opac/opac-registration-verify.pl @@ -94,7 +94,7 @@ if ( eval { my $letter = GetPreparedLetter( module => 'members', - letter_code => 'ACCTDETAILS', + letter_code => 'WELCOME', branchcode => $patron->branchcode,, lang => $patron->lang || 'default', tables => { -- 2.39.5