From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 30 Nov 2018 12:11:30 +0000 (+0100)
Subject: notices: add resend button to all pending notices (changes type to email if needed)
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=fe03c61a92769fa994ce5d049b3f4f819819ffea;p=koha.git

notices: add resend button to all pending notices (changes type to email if needed)
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index d774136f28..33dd6e42de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -60,7 +60,7 @@
             [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
             [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
             [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %]
-            [% IF ( QUEUED_MESSAGE.status != 'pending' ) %]
+            [% IF ( QUEUED_MESSAGE.status != 'pending' || QUEUED_MESSAGE.message_transport_type == 'print' ) %]
             <div id="resend_notice[% QUEUED_MESSAGE.message_id | html %]"  class="notice">
                 <form action="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber | html %]" method="POST">
                     <input type="hidden" name="op" value="resend_notice" />
diff --git a/members/notices.pl b/members/notices.pl
index ac6748c31f..cf930528e3 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -57,6 +57,14 @@ if ( $op eq 'resend_notice' ) {
     my $message_id = $input->param('message_id');
     my $message = C4::Letters::GetMessage( $message_id );
     if ( $message->{borrowernumber} = $borrowernumber ) {
+	# XXX FFZG
+	if ( $message->{message_transport_type} eq 'print' ) {
+	    my $dbh = C4::Context->dbh();
+	    my $statement = 'UPDATE message_queue SET message_transport_type = ? WHERE message_id = ?';
+	    my $sth = $dbh->prepare( $statement );
+	    $sth->execute( 'email', $message_id );
+	    warn "XXX force message_transport_type $message_id";
+	}
         C4::Letters::ResendMessage( $message_id );
         # redirect to self to avoid form submission on refresh
         print $input->redirect("/cgi-bin/koha/members/notices.pl?borrowernumber=$borrowernumber");