Attachment 158612 Details for Bug 35279 – Bug 35279: Add fallback to print for 'Send welcome email'

[patch] Bug 35279: Add fallback to print for 'Send welcome email'

Bug-35279-Add-fallback-to-print-for-Send-welcome-e.patch (text/plain), 3.03 KB, created by David Nind on 2023-11-07 17:37:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-11-07 17:37:36 UTC

Size: 3.03 KB

patch

obsolete

>From 94d90e6bce4326f0d9d46f3ef18537d578eced05 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 7 Nov 2023 14:03:00 +0000
>Subject: [PATCH] Bug 35279: Add fallback to print for 'Send welcome email'
>
>We update the 'Send welcome email' button to read 'Send welcome notice'
>and add a fallback to enqueue a notice for print when the user doesn't
>have an email address defined.
>
>Test plan
>1) Apply patch
>2) Use the 'Henry Acevedo' user who doesn't yet have a valid email
>   address.
>3) Click the 'Send welcome notice' button available from the 'more'
>   menu.
>4) Note that no notice is queued at all.
>5) Copy the content of the 'email' WELCOME notice into the 'print'
>   template.
>5) Repeat step 3.
>6) Note that this time a 'print' type notice is queued for the user.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/includes/members-toolbar.inc      |  2 +-
> members/notices.pl                            | 23 +++++++++++++++++++
> 2 files changed, 24 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index ddb03e62f3..1fc5402c2d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -76,7 +76,7 @@
>                 [% END %]
> 
>                 [% IF CAN_user_borrowers_edit_borrowers %]
>-                    <li><a id="sendwelcome" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]&op=send_welcome">Send welcome email</a></li>
>+                    <li><a id="sendwelcome" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]&op=send_welcome">Send welcome notice</a></li>
>                 [% END %]
> 
>                 [% IF CAN_user_borrowers_edit_borrowers && patron.category.effective_reset_password %]
>diff --git a/members/notices.pl b/members/notices.pl
>index 11f3faa917..adbefc5c39 100755
>--- a/members/notices.pl
>+++ b/members/notices.pl
>@@ -88,6 +88,29 @@ if ( $op eq 'send_welcome' ) {
>                 }
>             );
>         };
>+    } else {
>+        eval {
>+            my $print = GetPreparedLetter(
>+                module      => 'members',
>+                letter_code => 'WELCOME',
>+                branchcode  => $patron->branchcode,,
>+                lang        => $patron->lang || 'default',
>+                tables      => {
>+                    'branches'  => $patron->branchcode,
>+                    'borrowers' => $patron->borrowernumber,
>+                },
>+                want_librarian         => 1,
>+                message_transport_type => 'print'
>+            ) or return;
>+
>+            my $message_id = EnqueueLetter(
>+                {
>+                    letter                 => $print,
>+                    borrowernumber         => $patron->id,
>+                    message_transport_type => 'print'
>+                }
>+            );
>+        };
>     }
> 
>     # redirect to self to avoid form submission on refresh
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35279: 158599 | 158601 | 158612 | 161547