Fix for Bug 5029 - Update patron deletion error page

- Styling error message with "dialog alert" class
- Adding sidebar patron details to match other patron pages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7b3b0c75b3dd21dd9c1899f0e5103c3b8798810)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
index b69fe6c..f0b1d46 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
@@ -12,7 +12,9 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-toolbar.inc" --><h3>Cannot Delete Patron</h3>
+       <!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
+       <div class="dialog alert">
+       <h3>Cannot Delete Patron</h3>
                <ul><!-- TMPL_IF name="ItemsOnIssues" -->
                        <li>Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.</li>
                <!-- /TMPL_IF -->
@@ -22,12 +24,12 @@
                <!-- TMPL_IF name="guarantees" -->
                        <li>Patron's record has guaranteed accounts attached.</li>
                <!-- /TMPL_IF --></ul>
-
+       </div>
 </div>
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/members/deletemem.pl b/members/deletemem.pl
index 53297a3..b1ba709 100755 (executable)
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -29,6 +29,7 @@ use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Members;
+use C4::Branch; # GetBranches
 
 my $input = new CGI;
 
@@ -80,7 +81,28 @@ $sth->execute($member);
 my $data=$sth->fetchrow_hashref;
 if ($countissues > 0 or $flags->{'CHARGES'}  or $data->{'borrowernumber'}){
     #   print $input->header;
-    $template->param(borrowernumber => $member);
+
+    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
+    $template->param( picture => 1 ) if $picture;
+
+    $template->param(borrowernumber => $member,
+        surname => $bor->{'surname'},
+        title => $bor->{'title'},
+        cardnumber => $bor->{'cardnumber'},
+        firstname => $bor->{'firstname'},
+        categorycode => $bor->{'categorycode'},
+        category_type => $bor->{'category_type'},
+        categoryname  => $bor->{'description'},
+        address => $bor->{'address'},
+        address2 => $bor->{'address2'},
+        city => $bor->{'city'},
+        zipcode => $bor->{'zipcode'},
+        country => $bor->{'country'},
+        phone => $bor->{'phone'},
+        email => $bor->{'email'},
+        branchcode => $bor->{'branchcode'},
+        branchname => GetBranchName($bor->{'branchcode'}),
+    );
     if ($countissues >0) {
         $template->param(ItemsOnIssues => $countissues);
     }