+
[% INCLUDE 'circ-toolbar.inc' %]
Sent notices for [% firstname %] [% surname %]
+
- | Subject |
- Content |
+ Notice |
Type |
Status |
Time |
+[% IF ( QUEUED_MESSAGES ) %]
[% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %]
- | [% QUEUED_MESSAGE.subject %] |
- [% QUEUED_MESSAGE.content %] |
- [% QUEUED_MESSAGE.message_transport_type %] |
- [% QUEUED_MESSAGE.status %] |
+
+ [% QUEUED_MESSAGE.subject %]
+
+ [% QUEUED_MESSAGE.content FILTER html_line_break %]
+
+ |
+
+ [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email
+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print
+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed
+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms
+ [% ELSE %][% QUEUED_MESSAGE.message_transport_type %][% END %]
+ |
+
+ [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
+ [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
+ [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
+ [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
+ [% ELSE %][% QUEUED_MESSAGE.status %][% END %]
+ |
[% QUEUED_MESSAGE.time_queued %] |
[% END %]
+ [% ELSE %]
+ | There is no record of any messages that have been sent to this patron. |
+ [% END %]
diff --git a/members/messaging.pl b/members/messaging.pl
deleted file mode 100755
index 8791dcf69a..0000000000
--- a/members/messaging.pl
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2008 LibLime
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-use strict;
-use warnings;
-
-use CGI;
-use C4::Context;
-use C4::Auth;
-use C4::Output;
-use C4::Members;
-use C4::Members::Messaging;
-use C4::Dates;
-use C4::Reserves;
-use C4::Circulation;
-use C4::Koha;
-use C4::Letters;
-use C4::Biblio;
-use C4::Reserves;
-use C4::Branch; # GetBranchName
-
-use Data::Dumper;
-
-use vars qw($debug);
-
-BEGIN {
- $debug = $ENV{DEBUG} || 0;
-}
-
-my $dbh = C4::Context->dbh;
-
-my $query = CGI->new();
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- {
- template_name => 'members/messaging.tmpl',
- query => $query,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { borrowers => 1 },
- debug => 1,
- }
-);
-my $borrowernumber = $query->param('borrowernumber');
-my $borrower = GetMember( 'borrowernumber' => $borrowernumber );
-my $branch = C4::Context->userenv->{'branch'};
-
-$template->param( $borrower );
-
-$borrower = GetMemberDetails( $borrowernumber );
-
-
- if ( $borrower->{'category_type'} eq 'C') {
- my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
- my $cnt = scalar(@$catcodes);
- $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
- $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1;
- }
-
-my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
-$template->param( picture => 1 ) if $picture;
-
-# get some recent messages sent to this borrower for display:
-my $message_queue = C4::Letters::GetQueuedMessages( { borrowernumber => $query->param('borrowernumber') } );
-
-$template->param( messagingview => 1,
- message_queue => $message_queue,
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
- borrowernumber => $borrowernumber,
- branchname => GetBranchName($borrower->{'branchcode'}),
- dateformat => C4::Context->preference("dateformat"),
- categoryname => $borrower->{'description'},
- $borrower->{'categorycode'} => 1,
-);
-
-#$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
-# ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'};
-
-$template->param( %{ $borrower } );
-$template->param(
- messagingview => 1,
- is_child => ($borrower->{'category_type'} eq 'C'),
- );
-
-output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/members/notices.pl b/members/notices.pl
index 088d5a85f9..79555814cc 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -56,7 +56,9 @@ $template->param( %{$borrower} );
$template->param(
QUEUED_MESSAGES => $queued_messages,
borrowernumber => $borrowernumber,
- sentnotices => 1
+ sentnotices => 1,
+ branchname => GetBranchName($borrower->{'branchcode'}),
+ categoryname => $borrower->{'description'},
);
output_html_with_http_headers $input, $cookie, $template->output;