# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
use C4::Auth;
use C4::Output;
use CGI qw ( -utf8 );
use C4::Members;
-use C4::Branch;
use C4::Letters;
use C4::Members::Attributes qw(GetBorrowerAttributes);
+use Koha::Patrons;
+use Koha::Patron::Categories;
-use C4::Dates qw/format_date/;
my $input=new CGI;
my $borrowernumber = $input->param('borrowernumber');
-#get borrower details
-my $borrower = GetMember(borrowernumber => $borrowernumber);
+my $patron = Koha::Patrons->find( $borrowernumber );
+unless ( $patron ) {
+ print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
+ exit;
+}
+my $borrower = $patron->unblessed;
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/notices.tt",
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/notices.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {borrowers => 1},
+ flagsrequired => {borrowers => 'edit_borrowers'},
debug => 1,
});
-$template->param( $borrower );
-my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
-$template->param( picture => 1 ) if $picture;
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
+
+# Allow resending of messages in Notices tab
+my $op = $input->param('op') || q{};
+if ( $op eq 'resend_notice' ) {
+ my $message_id = $input->param('message_id');
+ my $message = C4::Letters::GetMessage( $message_id );
+ if ( $message->{borrowernumber} = $borrowernumber ) {
+ 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");
+ }
+}
# Getting the messages
my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
-$template->param( %{$borrower} );
if (C4::Context->preference('ExtendedPatronAttributes')) {
my $attributes = GetBorrowerAttributes($borrowernumber);
);
}
-# Computes full borrower address
-my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} );
-my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
-
$template->param(
- QUEUED_MESSAGES => $queued_messages,
- borrowernumber => $borrowernumber,
- sentnotices => 1,
- branchname => GetBranchName($borrower->{'branchcode'}),
- categoryname => $borrower->{'description'},
- address => $address,
- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
- RoutingSerials => C4::Context->preference('RoutingSerials'),
+ patron => $patron,
+ QUEUED_MESSAGES => $queued_messages,
+ borrowernumber => $borrowernumber,
+ sentnotices => 1,
);
output_html_with_http_headers $input, $cookie, $template->output;