Bug 21221: Shortcut memberentry scripts if patron does not exist

[koha.git] / members / notices.pl

diff --git a/members/notices.pl b/members/notices.pl
index 897da9e..ac6748c 100755 (executable)
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -19,55 +19,53 @@
 # 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;
 
 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;
-
-# Getting the messages
-my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
-
-# Bug 12426 - Allow resending of messages in Notices tab
-if ($input->param('resendnotice')) {
-    foreach my $message (@$queued_messages){
-        # resendnotice must be in this borrower's queue - we don't want to make it
-        # possible to change any message just by changing resendnotice id.
-        if ($message->{message_id} == $input->param('resendnotice')) {
-            # We also only want to resend messages in failed status
-            last unless $message->{status} eq "failed";
+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 } );
 
-            # Modify the message in $queued_message to have its new pending status
-            $message->{status} = 'pending' if (C4::Letters::ResendMessage($message->{message_id}));
-            last;
-        }
+# 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});
+
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = GetBorrowerAttributes($borrowernumber);
     $template->param(
@@ -76,16 +74,11 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     );
 }
 
-$template->param(%$borrower);
-
 $template->param(
+    patron             => $patron,
     QUEUED_MESSAGES    => $queued_messages,
     borrowernumber     => $borrowernumber,
     sentnotices        => 1,
-    branchname         => GetBranchName($borrower->{'branchcode'}),
-    categoryname       => $borrower->{'description'},
-    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
-    RoutingSerials => C4::Context->preference('RoutingSerials'),
 );
 output_html_with_http_headers $input, $cookie, $template->output;