X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmaninvoice.pl;h=e69a1ca348f9d5d626a019e8e4450564d9446c65;hb=c1d9a7dab7d57cca9059e4ccf72b3bfc41bfad5a;hp=9a040b6cc9b98b32b5d8fdd3f101027b8badc3a8;hpb=061f2e9251bcfbb90b2babf3dee8a725b1295ba8;p=koha.git

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 9a040b6cc9..e69a1ca348 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -9,32 +9,35 @@
 #
 # 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 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 3 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.
+# 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.
+# 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;
 
 use C4::Auth;
 use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
 use C4::Items;
-use C4::Branch;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
+use Koha::Patron::Images;
+
+use Koha::Patron::Categories;
 
 my $input=new CGI;
+my $flagsrequired = { borrowers => 1 };
 
 my $borrowernumber=$input->param('borrowernumber');
 
@@ -43,7 +46,7 @@ my $borrowernumber=$input->param('borrowernumber');
 my $data=GetMember('borrowernumber'=>$borrowernumber);
 my $add=$input->param('add');
 if ($add){
-    if(checkauth($input)) {
+    if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
         #  print $input->header;
         my $barcode=$input->param('barcode');
         my $itemnum;
@@ -57,11 +60,11 @@ if ($add){
         my $error   = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
         if ($error) {
             my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-                {   template_name   => "members/maninvoice.tmpl",
+                {   template_name   => "members/maninvoice.tt",
                     query           => $input,
                     type            => "intranet",
                     authnotrequired => 0,
-                    flagsrequired   => { borrowers => 1 },
+                    flagsrequired   => $flagsrequired,
                     debug           => 1,
                 }
             );
@@ -77,14 +80,15 @@ if ($add){
     }
 } else {
 
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "members/maninvoice.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {borrowers => 1, updatecharges => 1},
-					debug => 1,
-					});
+    my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "members/maninvoice.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers => 1,
+                             updatecharges => 'remaining_permissions' },
+        debug           => 1,
+    });
 					
   # get authorised values with type of MANUAL_INV
   my @invoice_types;
@@ -97,37 +101,30 @@ if ($add){
   $template->param( invoice_types_loop => \@invoice_types );
 
     if ( $data->{'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 $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
+        $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
+        $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
     }
 
-    $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
-    $template->param( picture => 1 ) if $picture;
-    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
+    my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
+    $template->param( picture => 1 ) if $patron_image;
+
+    if (C4::Context->preference('ExtendedPatronAttributes')) {
+        my $attributes = GetBorrowerAttributes($borrowernumber);
+        $template->param(
+            ExtendedPatronAttributes => 1,
+            extendedattributes => $attributes
+        );
+    }
 
-	$template->param(
-                borrowernumber => $borrowernumber,
-		firstname => $data->{'firstname'},
-                surname  => $data->{'surname'},
-		cardnumber => $data->{'cardnumber'},
-		categorycode => $data->{'categorycode'},
-		category_type => $data->{'category_type'},
-		categoryname  => $data->{'description'},
-		address => $data->{'address'},
-		address2 => $data->{'address2'},
-		city => $data->{'city'},
-		state => $data->{'state'},
-		zipcode => $data->{'zipcode'},
-		country => $data->{'country'},
-		phone => $data->{'phone'},
-		email => $data->{'email'},
-		branchcode => $data->{'branchcode'},
-		branchname => GetBranchName($data->{'branchcode'}),
-		is_child        => ($data->{'category_type'} eq 'C'),
-        extendedattributes => $attributes,
+    $template->param(%$data);
+    $template->param(
+        finesview      => 1,
+        borrowernumber => $borrowernumber,
+        categoryname   => $data->{'description'},
+        is_child       => ($data->{'category_type'} eq 'C'),
+        RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }