bug Fixing : 3640

[koha.git] / C4 / Print.pm

diff --git a/C4/Print.pm b/C4/Print.pm
index 957c65b..69986dc 100644 (file)
--- a/C4/Print.pm
+++ b/C4/Print.pm
@@ -17,21 +17,21 @@ package C4::Print;
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
-
 use strict;
-require Exporter;
-
 use C4::Context;
 use C4::Circulation;
+use C4::Members;
+use C4::Dates qw(format_date);
 
 use vars qw($VERSION @ISA @EXPORT);
 
-# set the version for version checking
-# set the version for version checking
-$VERSION = do { my @v = '$Revision$' =~ /\d+/g;
-    shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
-};
+BEGIN {
+       # set the version for version checking
+       $VERSION = 3.01;
+       require Exporter;
+       @ISA    = qw(Exporter);
+       @EXPORT = qw(&remoteprint &printreserve &printslip);
+}
 
 =head1 NAME
 
@@ -49,11 +49,6 @@ The functions in this module handle sending text to a printer.
 
 =over 2
 
-=cut
-
-@ISA    = qw(Exporter);
-@EXPORT = qw(&remoteprint &printreserve &printslip);
-
 =item remoteprint
 
   &remoteprint($items, $borrower);
@@ -71,8 +66,8 @@ from C<&GetBorrowerIssues>.
 =cut
 
 # FIXME - It'd be nifty if this could generate pretty PostScript.
-sub remoteprint {
-    my ($items, $borrower ) = @_;
+sub remoteprint ($$) {
+    my ($items, $borrower) = @_;
 
     (return)
       unless ( C4::Context->boolean_preference('printcirculationslips') );
@@ -125,7 +120,7 @@ sub remoteprint {
         print PRINTER "$itemdata->{'date_due'}\r\n";
         $i++;
     }
-    print PRINTER "\r\n\r\n\r\n\r\n\r\n\r\n\r\n";
+    print PRINTER "\r\n" x 7 ;
     close PRINTER;
 
     #system("lpr /tmp/$file");
@@ -133,20 +128,18 @@ sub remoteprint {
 
 sub printreserve {
     my ( $branchname, $bordata, $itemdata ) = @_;
-    my $file    = time;
     my $printer = '';
     (return) unless ( C4::Context->boolean_preference('printreserveslips') );
     if ( $printer eq "" || $printer eq 'nulllp' ) {
-        open( PRINTER, ">>/tmp/kohares" );
+        open( PRINTER, ">>/tmp/kohares" )
+                 or die "Could not write to /tmp/kohares";
     }
     else {
         open( PRINTER, "| lpr -P $printer >/dev/null" )
           or die "Couldn't write to queue:$!\n";
     }
-    my @da         = localtime( time() );
-    my $todaysdate = "$da[2]:$da[1]  $da[3]/$da[4]/$da[5]";
-
-#(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
+    my @da = localtime();
+    my $todaysdate = "$da[2]:$da[1]  " . C4::Dates->today();
     my $slip = <<"EOF";
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Date: $todaysdate;
@@ -183,34 +176,14 @@ EOF
 =cut
 
 #'
-sub printslip {
-    my ( $borrowernumber ) = @_;
-    my ( $borrower, $flags ) = GetMemberDetails( $borrowernumber);
-    my ($borrowerissues) = GetBorrowerIssues( $borrower );
-    my ($borroweriss2) = GetBorrowerIssues( $borrower );
-    my $i = 0;
-    my @issues;
-
-    foreach ( sort { $a <=> $b } keys %$borrowerissues ) {
-        $issues[$i] = $borrowerissues->{$_};
-        my $dd = $issues[$i]->{'date_due'};
-
-        #convert to nz style dates
-        #this should be set with some kinda config variable
-        my @tempdate = split( /-/, $dd );
-        $issues[$i]->{'date_due'} = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
-        $i++;
-    }
-    foreach ( sort { $a <=> $b } keys %$borroweriss2 ) {
-        $issues[$i] = $borroweriss2->{$_};
-        my $dd = $issues[$i]->{'date_due'};
-
-        #convert to nz style dates
-        #this should be set with some kinda config variable
-        my @tempdate = split( /-/, $dd );
-        $issues[$i]->{'date_due'} = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
-        $i++;
-    }
+sub printslip ($) {
+    my $borrowernumber = shift;
+    my $borrower   = GetMemberDetails($borrowernumber);
+       my $issueslist = GetPendingIssues($borrowernumber); 
+       foreach my $it (@$issueslist){
+               $it->{'date_due'}=format_date($it->{'date_due'});
+    }          
+    my @issues = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @$issueslist;
     remoteprint(\@issues, $borrower );
 }