X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmaninvoice.pl;h=cfd3878b97015b34fcd2d576e2e5a2634cb77807;hb=de03c263f0579d28a735e3b1261121e439263a82;hp=d5cd765f5c1c5b9441ef9b32b644486acbbb325f;hpb=8f4f59a5bbe55ac00b6ebf9595c9028205b8f62e;p=koha_fer

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index d5cd765f5c..cfd3878b97 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -1,10 +1,11 @@
 #!/usr/bin/perl
 
-#wrriten 11/1/2000 by chris@katipo.oc.nz
+#written 11/1/2000 by chris@katipo.oc.nz
 #script to display borrowers account details
 
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -17,52 +18,64 @@
 # 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;
+
 use C4::Auth;
 use C4::Output;
 use CGI;
 use C4::Members;
 use C4::Accounts;
 use C4::Items;
+use C4::Branch;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input=new CGI;
+my $flagsrequired = { borrowers => 1 };
 
 my $borrowernumber=$input->param('borrowernumber');
 
+
 # get borrower details
-my $data=GetMember($borrowernumber,'borrowernumber');
+my $data=GetMember('borrowernumber'=>$borrowernumber);
 my $add=$input->param('add');
 if ($add){
-#  print $input->header;
-    my $barcode=$input->param('barcode');
-	my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
-    my $desc=$input->param('desc');
-    my $amount=$input->param('amount');
-    my $type=$input->param('type');
-    my $error=manualinvoice($borrowernumber,$itemnum,$desc,$type,$amount);
-	if ($error){
-		my ($template, $loggedinuser, $cookie)
-		  = get_template_and_user({template_name => "members/maninvoice.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {borrowers => 1},
-					debug => 1,
-					});
-		if ($error =~ /FOREIGN KEY/ && $error =~ /itemnumber/){
-			$template->param('ITEMNUMBER' => 1);
-		}
-		$template->param('ERROR' => $error);
-        output_html_with_http_headers $input, $cookie, $template->output;
-	}
-	else {
-		print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
-		exit;
-	}
+    if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
+        #  print $input->header;
+        my $barcode=$input->param('barcode');
+        my $itemnum;
+        if ($barcode) {
+            $itemnum = GetItemnumberFromBarcode($barcode);
+        }
+        my $desc=$input->param('desc');
+        my $amount=$input->param('amount');
+        my $type=$input->param('type');
+        my $note    = $input->param('note');
+        my $error   = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
+        if ($error) {
+            my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+                {   template_name   => "members/maninvoice.tmpl",
+                    query           => $input,
+                    type            => "intranet",
+                    authnotrequired => 0,
+                    flagsrequired   => $flagsrequired,
+                    debug           => 1,
+                }
+            );
+            if ( $error =~ /FOREIGN KEY/ && $error =~ /itemnumber/ ) {
+                $template->param( 'ITEMNUMBER' => 1 );
+            }
+            $template->param( 'ERROR' => $error );
+            output_html_with_http_headers $input, $cookie, $template->output;
+        } else {
+            print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+            exit;
+        }
+    }
 } else {
 
 	my ($template, $loggedinuser, $cookie)
@@ -70,10 +83,20 @@ if ($add){
 					query => $input,
 					type => "intranet",
 					authnotrequired => 0,
-					flagsrequired => {borrowers => 1},
+                                      flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
 					debug => 1,
 					});
 					
+  # get authorised values with type of MANUAL_INV
+  my @invoice_types;
+  my $dbh = C4::Context->dbh;
+  my $sth = $dbh->prepare('SELECT * FROM authorised_values WHERE category = "MANUAL_INV"');
+  $sth->execute();
+  while ( my $row = $sth->fetchrow_hashref() ) {
+    push @invoice_types, $row;
+  }
+  $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);
@@ -82,24 +105,38 @@ if ($add){
     }
 
     $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
+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'},
-				    category_description => $data->{'description'},
-				    address => $data->{'address'},
-					address2 => $data->{'address2'},
-				    city => $data->{'city'},
-					zipcode => $data->{'zipcode'},
-					phone => $data->{'phone'},
-					email => $data->{'email'},
-					is_child        => ($data->{'category_type'} eq 'C'),
+                finesview => 1,
+                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'),
+		activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+        RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }