Merge branch 'bug_9330' into 3.12-master

[koha.git] / members / members-home.pl

diff --git a/members/members-home.pl b/members/members-home.pl
index db8be4a..1d8f1e5 100755 (executable)
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+# Parts Copyright Biblibre 2010
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -11,9 +12,9 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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;
@@ -25,24 +26,15 @@ use C4::Context;
 use C4::Members;
 use C4::Branch;
 use C4::Category;
+use Koha::Borrower::Modifications;
 
 my $query = new CGI;
-my $quicksearch = $query->param('quicksearch');
 my $branch = $query->param('branchcode');
-my ($template, $loggedinuser, $cookie);
 my $template_name;
 
-if($quicksearch){
-($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {borrowers => 1},
-                 debug => 1,
-                 });
-} else {
-($template, $loggedinuser, $cookie)
+$branch = q{} unless defined $branch;
+
+my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member.tmpl",
                  query => $query,
                  type => "intranet",
@@ -50,45 +42,50 @@ if($quicksearch){
                  flagsrequired => {borrowers => 1},
                  debug => 1,
                  });
-}
 
 my $branches = GetBranches;
 my @branchloop;
-foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-  my $selected = 1 if $branches->{$_}->{branchcode} eq $branch;
-  my %row = ( value => $_,
-        selected => $selected,
+foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
+    push @branchloop, {
+        value      => $_,
+        selected   => ($branches->{$_}->{branchcode} eq $branch),
         branchname => $branches->{$_}->{branchname},
-      );
-  push @branchloop, \%row;
+    };
 }
 
 my @categories;
 my $no_categories;
 my $no_add = 0;
-my $branchloop = (defined $branch?GetBranchesLoop($branch):GetBranchesLoop());
-if(scalar(@$branchloop) < 1){
+if(scalar(@branchloop) < 1){
     $no_add = 1;
     $template->param(no_branches => 1);
-} else {
-    $template->param(branchloop=>\@$branchloop);
+} 
+else {
+    $template->param(branchloop=>\@branchloop);
 }
 
 @categories=C4::Category->all;
-if(scalar(@categories) < 1){ $no_categories = 1; }
+if(scalar(@categories) < 1){ 
+    $no_categories = 1; 
+}
+
 if($no_categories && C4::Context->preference("AddPatronLists")=~/code/){
     $no_add = 1;
     $template->param(no_categories => 1);
-} else {
+} 
+else {
     $template->param(categories=>\@categories);
 }
 
 
+my $pending_borrower_modifications =
+  Koha::Borrower::Modifications->GetPendingModificationsCount( $branch );
+
 $template->param( 
         "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
         no_add => $no_add,
+        pending_borrower_modifications => $pending_borrower_modifications,
             );
-my @letters = map { {letter => $_} } ( 'A' .. 'Z');
-$template->param( letters => \@letters );
+$template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' );
 
 output_html_with_http_headers $query, $cookie, $template->output;