moving more html out of the script
[koha_fer] / circ / circulation.pl
index 2913e31..e1db535 100755 (executable)
 #!/usr/bin/perl
+# Please use 8-character tabs for this file (indents are every 4 characters)
 
-use CGI qw/:standard/;
+#written 8/5/2002 by Finlay
+#script to execute issuing of books
+
+
+# Copyright 2000-2002 Katipo Communications
+#
+# 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 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use strict;
+use CGI;
 use C4::Circulation::Circ2;
+use C4::Search;
 use C4::Output;
 use C4::Print;
 use DBI;
+use C4::Auth;
+use C4::Interface::CGI::Output;
+use C4::Koha;
+use HTML::Template;
+use C4::Date;
+
+my $query=new CGI;
+#my ($loggedinuser, $sessioncookie, $sessionID) = checkauth
+#      ($query, 0, { circulate => 1 });
+
+my ($template, $loggedinuser, $cookie) = get_template_and_user
+    ({
+       template_name   => 'circ/circulation.tmpl',
+       query           => $query,
+       type            => "intranet",
+       authnotrequired => 0,
+       flagsrequired   => { circulate => 1 },
+    });
 
 
 my %env;
-my $headerbackgroundcolor='#99cc33';
-my $circbackgroundcolor='#ffffcc';
-my $circbackgroundcolor='white';
 my $linecolor1='#ffffcc';
 my $linecolor2='white';
-my $backgroundimage="/images/background-mem.gif";
-my $query=new CGI;
-my $branches=getbranches(\%env);
-my $printers=getprinters(\%env);
-my $branch=$query->param('branch');
-my $printer=$query->param('printer');
-($branch) || ($branch=$query->cookie('branch'));
-($printer) || ($printer=$query->cookie('printer'));
-my ($oldbranch, $oldprinter);
-if ($query->param('selectnewbranchprinter')) {
-    $oldbranch=$branch;
-    $oldprinter=$printer;
-    $branch='';
-    $printer='';
+
+my $branches = getbranches();
+my $printers = getprinters(\%env);
+
+my $branch = getbranch($query, $branches);
+my $printer = getprinter($query, $printers);
+
+
+#set up cookie.....
+my $branchcookie;
+my $printercookie;
+if ($query->param('setcookies')) {
+       $branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
+       $printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
 }
+
 $env{'branchcode'}=$branch;
 $env{'printer'}=$printer;
 $env{'queue'}=$printer;
-my $branchcount=0;
-my $printercount=0;
-my $branchoptions;
-my $printeroptions;
-foreach (keys %$branches) {
-    (next) unless ($_);
-    (next) if (/^TR$/);
-    $branchcount++;
-    my $selected='';
-    ($selected='selected') if ($_ eq $oldbranch);
-    $branchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
-}
-foreach (keys %$printers) {
-    (next) unless ($_);
-    $printercount++;
-    my $selected='';
-    ($selected='selected') if ($_ eq $oldprinter);
-    $printeroptions.="<option value=$_ $selected>$printers->{$_}->{'printername'}\n";
+
+my @datearr = localtime(time());
+# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
+my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
+#warn $todaysdate;
+
+
+my $message;
+my $borrowerslist;
+# if there is a list of find borrowers....
+my $findborrower = $query->param('findborrower');
+if ($findborrower) {
+       my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'web');
+       my @borrowers=@$borrowers;
+       if ($#borrowers == -1) {
+               $query->param('findborrower', '');
+               $message =  "No borrower matched '$findborrower'";
+       } elsif ($#borrowers == 0) {
+               $query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
+               $query->param('barcode','');
+       } else {
+               $borrowerslist = \@borrowers;
+       }
 }
-if ($printercount==1) {
-    ($printer)=keys %$printers;
+
+my $borrowernumber = $query->param('borrnumber');
+my $bornum = $query->param('borrnumber');
+# check and see if we should print
+my $print=$query->param('print');
+my $barcode = $query->param('barcode');
+if ($barcode eq ''  && $print eq 'maybe'){
+       $print = 'yes';
 }
-if ($branchcount==1) {
-    ($branch)=keys %$branches;
+if ($print eq 'yes' && $borrowernumber ne ''){
+       printslip(\%env,$borrowernumber);
+       $query->param('borrnumber','');
+       $borrowernumber='';
 }
 
+# get the borrower information.....
+my $borrower;
+my $flags;
+if ($borrowernumber) {
+    ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
+}
 
-my $branchname='';
-my $printername='';
-if ($branch && $printer) {
-    $branchname=$branches->{$branch}->{'branchname'};
-    $printername=$printers->{$printer}->{'printername'};
+# get the responses to any questions.....
+my %responses;
+foreach (sort $query->param) {
+       if ($_ =~ /response-(\d*)/) {
+               $responses{$1} = $query->param($_);
+       }
+}
+if (my $qnumber = $query->param('questionnumber')) {
+       $responses{$qnumber} = $query->param('answer');
 }
 
+my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
 
-my $branchcookie=$query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
-my $printercookie=$query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
+my $year=$query->param('year');
+my $month=$query->param('month');
+my $day=$query->param('day');
 
-print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie]);
-#print $query->dump;
-print startpage();
-print startmenu('circulation');
+# if the barcode is set
+if ($barcode) {
+       $barcode = cuecatbarcodedecode($barcode);
+       my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
+       unless ($invalidduedate) {
+               $env{'datedue'}=$datedue;
+               my @time=localtime(time);
+               my $date= (1900+$time[5])."-".($time[4]+1)."-".$time[3];
+               ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer, $message)
+                                       = issuebook(\%env, $borrower, $barcode, \%responses, $date);
+       }
+}
 
+# reload the borrower info for the sake of reseting the flags.....
+if ($borrowernumber) {
+       ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
+}
+
+##################################################################################
+# HTML code....
 
-print <<EOF
-<script language="javascript" type="text/javascript">
-<!--
-function messenger(url){
-   window1=window.open(url,"window1","height=700,width=600,left=150,top=50,350,screenY=50");
+my %responseform;
+my @responsearray;
+foreach (keys %responses) {
+#    $responsesform.="<input type=hidden name=response-$_ value=$responses{$_}>\n";
+    $responseform{'name'}=$_;
+    $responseform{'value'}=$responses{$_};
+    push @responsearray,\%responseform;
+}
+my $questionform;
+my $stickyduedate;
+if ($question) {
+    $stickyduedate=$query->param('stickyduedate');
 }
-//-->
-</script>
-EOF
 
-if ($printer && $branch) {
 
-    SWITCH: {
-       if ($query->param('module') eq 'issues') { issues(); last SWITCH; }
-       if ($query->param('module') eq 'returns') { returns(); last SWITCH; }
-       issues();
+# Barcode entry box, with hidden inputs attached....
+my $counter = 1;
+my $dayoptions = '';
+my $monthoptions = '';
+my $yearoptions = '';
+for (my $i=1; $i<32; $i++) {
+    my $selected='';
+    if (($query->param('stickyduedate')) && ($day==$i)) {
+       $selected='selected';
     }
-} else {
-    my ($printerform, $branchform);
-    if ($printercount>1) {
-       $printerform=<<"EOF";
-
-<table border=0 cellspacing=0 cellpadding=5>
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Choose a Printer</font></td></tr>
-<tr><td>
-<select name=printer>
-$printeroptions
-</select>
-</td></tr>
-</table>
-EOF
-    } else {
-       my ($printer) = keys %$printers;
-       $printerform=<<"EOF";
-       <input type=hidden name=printer value=$printer>
-EOF
+    $dayoptions.="<option value=$i $selected>$i";
+}
+foreach (('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec')) {
+    my $selected='';
+    if (($query->param('stickyduedate')) && ($month==$counter)) {
+       $selected='selected';
     }
-
-    if ($branchcount>1) {
-       $branchform=<<"EOF";
-<table border=0 cellpadding=5 cellspacing=0>
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Choose a Branch</font></td></tr>
-<tr><td>
-<select name=branch>
-$branchoptions
-</select>
-</td></tr>
-</table>
-EOF
+    $monthoptions.="<option value=$counter $selected>$_";
+    $counter++;
+}
+for (my $i=$datearr[5]+1900; $i<$datearr[5]+1905; $i++) {
+    my $selected='';
+    if (($query->param('stickyduedate')) && ($year==$i)) {
+       $selected='selected';
     }
-    print << "EOF";
-    <center>
-    Select a branch and a printer
-    <form method=get>
-    <table border=0>
-    <tr><td>
-    $branchform
-    </td><td>
-    $printerform
-    </td></tr>
-    </table>
-    <input type=submit>
-    </form>
-EOF
+    $yearoptions.="<option value=$i $selected>$i";
 }
+my $selected='';
+($query->param('stickyduedate')) && ($selected='checked');
 
 
-print endmenu('circulation');
-print endpage();
-sub default {
-print << "EOF";
-<a href=circulation.pl?module=issues&branch=$branch&printer=$printer>Issues</a>
-<a href=circulation.pl?module=returns&branch=$branch&printer=$printer>Returns</a>
-EOF
-}
+# make the issued books table.....
+my $todaysissues='';
+my $previssues='';
+my @realtodayissues;
+my @realprevissues;
+my $allowborrow;
+my $hash;
+if ($borrower) {
+    ($borrower, $flags,$hash) = getpatroninformation(\%env,$borrowernumber,0);
+    $allowborrow= $hash->{'borrow'};
+    my @todaysissues;
+    my @previousissues;
+    my $issueslist = getissues($borrower);
+    foreach my $it (keys %$issueslist) {
+       my $issuedate = $issueslist->{$it}->{'timestamp'};
+       $issuedate = substr($issuedate, 0, 8);
+       if ($todaysdate == $issuedate) {
+           push @todaysissues, $issueslist->{$it};
+       } else {
+           push @previousissues, $issueslist->{$it};
+       }
+    }
+       my $tcolor = '';
+       my $pcolor = '';
+       foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
+               my $dd = $book->{'date_due'};
+               my $datedue = $book->{'date_due'};
+               $dd=format_date($dd);
+               $datedue=~s/-//g;
+               if ($datedue < $todaysdate) {
+                       $dd="<font color=red>$dd</font>\n";
+               }
+               ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
+               $book->{'dd'}=$dd;
+               $book->{'tcolor'}=$tcolor;
+               push @realtodayissues,$book;
+       }
+    
 
+    # FIXME - For small and private libraries, it'd be nice if this
+    # table included a "Return" link next to each book, so that you
+    # don't have to remember the book's bar code and type it in on the
+    # "Returns" page.
 
-sub decode {
-    ($encoded) = @_;
-    $seq = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-';
-    @s = map { index($seq,$_); } split(//,$encoded);
-    $l = ($#s+1) % 4;
-    if ($l)
-    {
-       if ($l == 1)
-       {
-           print "Error!";
-           return;
+    # This is in the template now, so its possible for a small library to make that link in their
+    # template
+
+    foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
+       my $dd = $book->{'date_due'};
+       my $datedue = $book->{'date_due'};
+       $dd=format_date($dd);
+       my $pcolor = '';
+       $datedue=~s/-//g;
+       if ($datedue < $todaysdate) {
+           $dd="<font color=red>$dd</font>\n";
        }
-       $l = 4-$l;
-       $#s += $l;
-    }
-    $r = '';
-    while ($#s >= 0)
-    {
-       $n = (($s[0] << 6 | $s[1]) << 6 | $s[2]) << 6 | $s[3];
-       $r .=chr(($n >> 16) ^ 67) .
-            chr(($n >> 8 & 255) ^ 67) .
-            chr(($n & 255) ^ 67);
-       @s = @s[4..$#s];
-    }
-    $r = substr($r,0,length($r)-$l);
-    return $r;
+       ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); 
+       $book->{'dd'}=$dd; 
+       $book->{'tcolor'}=$pcolor; 
+       push @realprevissues,$book
+   }
 }
 
-sub returns {
-    my %returneditems;
-    print << "EOF";
-    <table border=0 cellpadding=10 cellspacing=0 cellpadding=5><tr><th background=$backgroundimage>Circulation - Returns</th></tr><tr><td bgcolor=$circbackgroundcolor align=center>
-EOF
-    foreach ($query->param) {
-       (next) unless (/ri-(\d*)/);
-       my $counter=$1;
-       (next) if ($counter>20);
-       my $barcode=$query->param("ri-$counter");
-      # I'm not POSITIVE this decode belongs here - can't tell what causes it to run.
-      # decode cuecat
-      chomp($barcode);
-      @fields = split(/\./,$barcode);
-      @results = map(decode($_), @fields[1..$#fields]);
-      if ($#results == 2)
-      {
-       $barcode=$results[2];
-      }
-      # end decode
-       my $duedate=$query->param("dd-$counter");
-       my $borrowernumber=$query->param("bn-$counter");
-       $counter++;
-       $returneditems{$counter}=$barcode;
-       $riduedate{$counter}=$duedate;
-       $riborrowernumber{$counter}=$borrowernumber;
-       $ritext.="<input type=hidden name=ri-$counter value=$barcode>\n";
-       $ritext.="<input type=hidden name=dd-$counter value=$duedate>\n";
-       $ritext.="<input type=hidden name=bn-$counter value=$borrowernumber>\n";
-    }
-    if (my $barcode=$query->param('barcode')) {
-      # decode cuecat
-      chomp($barcode);
-      @fields = split(/\./,$barcode);
-      @results = map(decode($_), @fields[1..$#fields]);
-      if ($#results == 2)
-      {
-       $barcode=$results[2];
-      }
-      # end decode
-       $ritext.="<input type=hidden name=ri-0 value=$barcode>\n";
-       $returneditems{0}=$barcode;
-    }
-       
-    my $barcodeentrytext= << "EOF";
-    <form method=get>
-    <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-       <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></td></tr>
-       <tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr>
-    </table>
-    <input type=hidden name=module value=returns>
-    <input type=hidden name=branch value=$branch>
-    <input type=hidden name=printer value=$printer>
-    $ritext
-EOF
-    if ((my $barcode=$query->param('barcode')) || (%returneditems)) {
-      # decode cuecat
-      chomp($barcode);
-      @fields = split(/\./,$barcode);
-      @results = map(decode($_), @fields[1..$#fields]);
-      if ($#results == 2)
-      {
-       $barcode=$results[2];
-      }
-      # end decode
-       my ($iteminformation, $borrower, $messages, $overduecharge) = returnbook(\%env, $barcode);
-       
-       (my $nosuchitem=1) unless ($iteminformation);
-       $riborrowernumber{0}=$borrower->{'borrowernumber'};
-       $riduedate{0}=$iteminformation->{'date_due'};
-       $barcodeentrytext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
-       $barcodeentrytext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
-       my @datearr = localtime(time());
-       my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-       my $itemtable=<<"EOF";
-<table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Item Information</font></th></tr>
-<tr><td>
-Title: $iteminformation->{'title'}<br>
-<!--Hlt decided they dont want these showing, uncoment the html to make it work
-
-Author: $iteminformation->{'author'}<br>
-Barcode: <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a><br>
-Date Due: $iteminformation->{'date_due'}-->
-</td></tr>
-</table>
-EOF
-       if ($messages) {
-           my $messagetext='';
-           foreach (@$messages) {
-               $messagetext.="$_<p>\n";
-           }
-           print << "EOF";
-<table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-<tr><th bgcolor=$headerbackgroundcolor $background=$backgroundimage><font color=black>Messages</font></th></tr>
-<tr><td>
-$messagetext
-</td></tr>
-</table>
-<p>
-EOF
-       }
-       if (($nosuchitem) && ($barcode)) {
-           print << "EOF";
-           <table border=0 cellpadding=1>
-           <tr>
-           <td valign=top>
-           $barcodeentrytext
-           </td>
-           <td valign=top>
-           <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-           <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Error</font></th></tr>
-           <tr><td>
-           <table border=0 cellpadding=5>
-           <tr><td>
-           $barcode is not a valid barcode.
-           </td></tr>
-           </table>
-           </td></tr>
-           </table>
-           </td>
-           </tr>
-           </table>
-EOF
-       } elsif ($nosuchitem) {
-           print << "EOF";
-           <table border=0 cellpadding=1>
-           <tr>
-           <td valign=top>
-           $barcodeentrytext
-           </td>
-           </tr>
-           </table>
-EOF
-       } else {
-           if ($borrower->{'borrowernumber'}) {
-               my ($patrontable, $flaginfotext) = patrontable($borrower);
-               print << "EOF";
-               <table border=0 cellpadding=5>
-                   <tr>
-                       <td>
-                       $barcodeentrytext
-                       </td>
-                       <td align=center valign=top>
-                       $itemtable
-                       </td>
-                   </tr>
-                   <tr>
-                       <td valign=top align=center colspan=2>
-                       <table border=0>
-                       <tr><td valign=top>
-                       $patrontable
-                       </td>
-                       <td valign=top>
-                       $flaginfotext
-                       </td>
-                       </tr>
-                       </table>
-                       </td>
-                   </tr>
-               </table>
-               <br>
-EOF
-           } else {
-               print << "EOF";
-               <table border=0 cellpadding=5>
-               <tr><td>
-               $barcodeentrytext
-               </td>
-               <td>
-
-               <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-               <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Error</font></th></tr>
-               <tr><td>
-               <table border=0 cellpadding=5>
-               <tr><td>
-               $iteminformation->{'title'} by $iteminformation->{'author'} was not loaned out.
-               </td></tr>
-               </table>
-               </td></tr>
-               </table>
-               </td>
-               </tr>
-               </table>
-EOF
-           }
+my @values;
+my %labels;
+my $CGIselectborrower;
+if ($borrowerslist) {
+       foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
+               push @values,$_->{'borrowernumber'};
+               $labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ($_->{'cardnumber'})";
        }
-       print << "EOF";
-       <p>
-       <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-       <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Items</font></th></tr>
-       <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr>
-EOF
-       my $color='';
-       foreach (sort {$a <=> $b} keys %returneditems) {
-           ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-           my $barcode=$returneditems{$_};
-           my $duedate=$riduedate{$_};
-           my @datearr = localtime(time());
-           my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-           my $overduetext="$duedate";
-           ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
-           ($duedate) || ($overduetext="<img src=/koha/images/blackdot.gif>");
-           my $borrowernumber=$riborrowernumber{$_};
-           my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
-           my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
-           print "<tr><td bgcolor=$color>$overduetext</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td><td bgcolor=$color>$iteminformation->{'title'}</td><td bgcolor=$color>$iteminformation->{'author'}</td><td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td><td bgcolor=$color><img src=/koha/images/blackdot.gif><a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n";
-       }
-       print "</table>\n";
-    } else {
-       print $barcodeentrytext;
-    }
-    print "</form>\n";
-    print "</td></tr></table>\n";
+       $CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
+                               -values   => \@values,
+                               -labels   => \%labels,
+                               -size     => 7,
+                               -multiple => 0 );
 }
+#title
 
-sub issues {
-    my ($noheader) = shift;
-    my $print=$query->param('print');
-    my $borrowernumber=$query->param('borrnumber');    
-    my $barcode=$query->param('barcode');
-    if ($barcode eq ''){
-      $print='yes';     
-    } elsif ($barcode eq ' '){
-      $query->param('barcode','');
-      $barcode='';
-    }
-    if ($print eq 'yes'){
-      my ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
-      $env{'todaysissues'}=1;
-      my ($borrowerissues) = currentissues(\%env, $borrower);
-      $env{'nottodaysissues'}=1;
-      $env{'todaysissues'}=0;
-      my ($borroweriss2)=currentissues(\%env, $borrower);
-      $env{'nottodaysissues'}=0;
-      my $i=0;
-      my @issues;
-      foreach (sort keys %$borrowerissues) {
-        $issues[$i]=$borrowerissues->{$_};
-       $i++;
-      }
-      foreach (sort keys %$borroweriss2) {
-        $issues[$i]=$borroweriss2->{$_};
-       $i++;
-      }
-      remoteprint(\%env,\@issues,$borrower);
-      $query->param('borrnumber','')
-    }
-    unless ($noheader) {
-      print <<EOF
-      <p align=right>
-      <FONT SIZE=2  face="arial, helvetica">
-      <a href=circulation.pl?borrnumber=$borrowernumber&module=issues&branch=$branch&printer=$printer&print>Next Borrower</a> ||
-      <a href=circulation.pl?module=returns&branch=$branch&printer=$printer>Returns</a></font><p>
-       
-        
-       </p>
-EOF
+my ($patrontable, $flaginfotable) = patrontable($borrower);
+my $amountold=$flags->{'CHARGES'}->{'message'};
+my @temp=split(/\$/,$amountold);
+$amountold=$temp[1];
+$template->param(
+               findborrower => $findborrower,
+               borrower => $borrower,
+               borrowernumber => $borrowernumber,
+               branch => $branch,
+               printer => $printer,
+               branchname => $branches->{$branch}->{'branchname'},
+               printername => $printers->{$printer}->{'printername'},
+               allowborrow =>$allowborrow,
+               #question form
+               question => $question,
+               title => $iteminformation->{'title'},
+               author => $iteminformation->{'author'},
+               firstname => $borrower->{'firstname'},
+               surname => $borrower->{'surname'},
+               categorycode => $borrower->{'categorycode'},
+               question => $question,
+               barcode => $barcode,
+               questionnumber => $questionnumber,
+               dayoptions => $dayoptions,
+               monthoptions => $monthoptions,
+               yearoptions => $yearoptions,
+               stickyduedate => $stickyduedate,
+               rejected => $rejected,
+               message => $message,
+               CGIselectborrower => $CGIselectborrower,
+               amountold => $amountold,
+               todayissues => \@realtodayissues,
+               previssues => \@realprevissues,
+               responseloop => \@responsearray 
+       );
+
+if ($branchcookie) {
+    $cookie=[$cookie, $branchcookie, $printercookie];
+}
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
+####################################################################
+# Extra subroutines,,,
+
+sub cuecatbarcodedecode {
+    my ($barcode) = @_;
+    chomp($barcode);
+    my @fields = split(/\./,$barcode);
+    my @results = map(decode($_), @fields[1..$#fields]);
+    if ($#results == 2){
+       return $results[2];
+    } else {
+       return $barcode;
     }
-    if (my $borrnumber=$query->param('borrnumber')) {
-       my ($borrower, $flags) = getpatroninformation(\%env,$borrnumber,0);
-       my $year=$query->param('year');
-       my $month=$query->param('month');
-       my $day=$query->param('day');
-       if (my $barcode=$query->param('barcode')) {
-          # decode cuecat
-          chomp($barcode);
-          @fields = split(/\./,$barcode);
-          @results = map(decode($_), @fields[1..$#fields]);
-          if ($#results == 2)
-          {
-           $barcode=$results[2];
-          }
-          # end decode
-           my $invalidduedate=0;
-           $env{'datedue'}='';
-           if (($year eq 0) && ($month eq 0) && ($year eq 0)) {
-               $env{'datedue'}='';
-           } else {
-               if (($year eq 0) || ($month eq 0) || ($year eq 0)) {
-                   print "Invalid Due Date Specified. Book was not issued.<p>\n";
-                   $invalidduedate=1;
-               } else {
-                   if (($day>30) && (($month==4) || ($month==6) || ($month==9) || ($month==11))) {
-                       print "Invalid Due Date Specified. Book was not issued. Only 30 days in $month month.<p>\n";
-                       $invalidduedate=1;
-                   } elsif (($day>29) && ($month==2)) {
-                       print "Invalid Due Date Specified. Book was not issued.  Never that many days in February!<p>\n";
-                       $invalidduedate=1;
-                   } elsif (($month==2) && ($day>28) && (($year%4) && ((!($year%100) || ($year%400))))) {
-                       print "Invalid Due Date Specified. Book was not issued.  $year is not a leap year.<p>\n";
-                       $invalidduedate=1;
-                   } else {
-                       $env{'datedue'}="$year-$month-$day";
-                   }
-               }
-           }
-           my %responses;
-           foreach (sort $query->param) {
-               if ($_ =~ /response-(\d*)/) {
-                   $responses{$1}=$query->param($_);
-               }
-           }
-           if (my $qnumber=$query->param('questionnumber')) {
-               $responses{$qnumber}=$query->param('answer');
-           }
-           unless ($invalidduedate) {
-               my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer, $message) = issuebook(\%env, $borrower, $barcode, \%responses);
-               unless ($iteminformation) {
-                   print << "EOF";
-                   <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-                   <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Error</font></th></tr>
-                   <tr><td>
-                   <table border=0 cellpadding=5>
-                   <tr><td>
-                   $barcode is not a valid barcode.
-                   </td></tr>
-                   </table>
-EOF
-               }
-               if ($rejected) {
-                   if ($rejected == -1) {
-                   } else {
-                       print << "EOF"
-                       <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-                       <tr><th bgcolor= background=$backgroundimage><font color=black>Error Issuing Book</font></th></tr>
-                       <tr><td><font color=red>$rejected</font></td></tr>
-                       </table>
-                       <br>
-EOF
-                   }
-               }
-               my $responsesform='';
-               foreach (keys %responses) {
-                   $responsesform.="<input type=hidden name=response-$_ value=$responses{$_}>\n";
-               }
-               if ($question) {
-                   my $stickyduedate=$query->param('stickyduedate');
-                   print << "EOF";
-                   <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-                   <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Issuing Question</b></font></td></tr>
-                   <tr><td>
-                   <table border=0 cellpadding=10>
-                   <tr><td>
-                   Attempting to issue $iteminformation->{'title'} by $iteminformation->{'author'} to $borrower->{'firstname'} $borrower->{'surname'}.
-                   <p>
-                   $question
-                   </td></tr>
-                   </table>
-                   </td></tr>
-
-                   <tr><td align=center>
-                   <table border=0>
-                   <tr><td>
-                   <form method=get>
-                   <input type=hidden name=module value=issues>
-                   <input type=hidden name=borrnumber value=$borrnumber>
-                   <input type=hidden name=barcode value=$barcode>
-                   <input type=hidden name=questionnumber value=$questionnumber>
-                   <input type=hidden name=day value=$day>
-                   <input type=hidden name=month value=$month>
-                   <input type=hidden name=year value=$year>
-                   <input type=hidden name=stickyduedate value=$stickyduedate>
-                   <input type=hidden name=branch value=$branch>
-                   <input type=hidden name=printer value=$printer>
-                   $responsesform
-                   <input type=hidden name=answer value=Y>
-                   <input type=submit value=Yes>
-                   </form>
-                   </td>
-                   <td>
-                   <form method=get>
-                   <input type=hidden name=module value=issues>
-                   <input type=hidden name=borrnumber value=$borrnumber>
-                   <input type=hidden name=barcode value=$barcode>
-                   <input type=hidden name=questionnumber value=$questionnumber>
-                   <input type=hidden name=day value=$day>
-                   <input type=hidden name=month value=$month>
-                   <input type=hidden name=year value=$year>
-                   <input type=hidden name=stickyduedate value=$stickyduedate>
-                   <input type=hidden name=branch value=$branch>
-                   <input type=hidden name=printer value=$printer>
-                   $responsesform
-                   <input type=hidden name=answer value=N>
-                   <input type=submit value=No>
-                   </form>
-                   </td>
-                   </tr>
-                   </table>
-                   </td></tr>
-                   </table>
-                   </td></tr>
-                   </table>
-EOF
-                   return;
-               }
-               if ($message) {
-                   print << "EOF";
-                   <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-                   <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Message</font></th></tr>
-                   <tr><td>$message</td></tr>
-                   </table>
-                   <p>
-EOF
-               }
-           }
-       }
-       my $issueid=$query->param('issueid');
-       ($issueid) || ($issueid=int(rand()*1000000000));
-       my $flag='';
-       my $flagtext='';
-       my $flaginfotext='';
-       foreach $flag (sort keys %$flags) {
-           if ($flags->{$flag}->{'noissues'}) {
-               $flagtext.="<font color=red>$flag</font> ";
-           } else {
-               $flagtext.="$flag ";
-           }
-           $flags->{$flag}->{'message'}=~s/\n/<br>/g;
-           if ($flags->{$flag}->{'noissues'}) {
-               $flaginfotext.="<tr><td bgcolor=red valign=top><font color=black><b>$flag</b></font></td><td bgcolor=red><font color=black><b>$flags->{$flag}->{'message'}</b></font></td></tr>\n";
-           } else {
-               $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n";
-           }
-       }
-       if ($flaginfotext) {
-           $flaginfotext="<table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd><tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><font color=black>Patron Flags</font></th></tr>$flaginfotext</table>\n";
-       }
-       $env{'nottodaysissues'}=1;
-       my ($borrowerissues) = currentissues(\%env, $borrower);
-       $env{'nottodaysissues'}=0;
-       $env{'todaysissues'}=1;
-       my ($today) = currentissues(\%env, $borrower);
-       $env{'todaysissues'}=0;
-       my $previssues='';
-       my @datearr = localtime(time());
-       my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
-       my $color='';
-       foreach (sort keys %$borrowerissues) {
-           ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-           my $bookissue=$borrowerissues->{$_};
-           my $bgcolor='';
-           my $datedue=$bookissue->{'date_due'};
-           my $dd=$bookissue->{'date_due'};
-           $datedue=~s/-//g;
-           if ($datedue < $todaysdate) {
-               $dd="<font color=red>$dd</font>\n";
-           }
-           $previssues.="<tr><td bgcolor=$color align=center>$dd</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td><td bgcolor=$color>$bookissue->{'title'}</td><td bgcolor=$color>$bookissue->{'author'}</td><td bgcolor=$color align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>\n";
-       }
-       my $todaysissues='';
-       $color='';
-       foreach (sort keys %$today) {
-           ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-           my $bookissue=$today->{$_};
-           $todaysissues.="<tr><td bgcolor=$color align=center>$bookissue->{'date_due'}</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td><td bgcolor=$color>$bookissue->{'title'}</td><td bgcolor=$color>$bookissue->{'author'}</td><td bgcolor=$color align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>\n";
-       }
-       for ($i=1; $i<32; $i++) {
-           my $selected='';
-           if (($query->param('stickyduedate')) && ($day==$i)) {
-               $selected='selected';
-           }
-           $dayoptions.="<option value=$i $selected>$i";
-       }
-       my $counter=1;
-       foreach (('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec')) {
-           my $selected='';
-           if (($query->param('stickyduedate')) && ($month==$counter)) {
-               $selected='selected';
-           }
-           $monthoptions.="<option value=$counter $selected>$_";
-           $counter++;
-       }
-       for ($i=$datearr[5]+1900; $i<$datearr[5]+1905; $i++) {
-           my $selected='';
-           if (($query->param('stickyduedate')) && ($year==$i)) {
-               $selected='selected';
-           }
-           $yearoptions.="<option value=$i $selected>$i";
-       }
+}
 
-       my $selected='';
-       ($query->param('stickyduedate')) && ($selected='checked');
-       my ($borrower, $flags) = getpatroninformation(\%env,$borrnumber,0);
-       my ($patrontable, $flaginfotable) = patrontable($borrower);
-       print << "EOF";
-       $patrontable
-       $flaginfotable
-       <FONT SIZE=6><em>Issues</em></FONT> &nbsp; &nbsp;<br> <a href=circulation.pl?selectnewbranchprinter=1><b>Branch:</b></a> $branch,
-        <a href=circulation.pl?selectnewbranchprinter=1><b>Printer:</b></a> $printer<P>
-        <p>
-       <form method=get>
-    <table border=1 cellpadding=5>
-    <tr>
-       <td align=center valign=top>
-           <table border=0 cellspacing=0 cellpadding=5>
-               <tr><th align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></th></tr>
-               <tr><td align=center>
-               <table border=0>
-               <tr><td>Item Barcode:</td><td><input name=barcode size=10></td><td><input type=submit value=Issue></tr>
-               <tr><td colspan=3 align=center>
-               <table border=0 cellpadding=0 cellspacing=0>
-               <tr><td>
-               <select name=day><option value=0>Day$dayoptions</select>
-               </td><td>
-               <select name=month><option value=0>Month$monthoptions</select>
-               </td><td>
-               <select name=year><option value=0>Year$yearoptions</select>
-               </td></tr>
-               </table>
-               <input type=checkbox name=stickyduedate $selected> Sticky Due Date
-               </td></tr>
-             </table>
-               <input type=hidden name=module value=issues>
-       <input type=hidden name=borrnumber value=$borrnumber>
-       <input type=hidden name=branch value=$branch>
-       <input type=hidden name=printer value=$printer>
-       </form>
-       </td>
-
-
-    </tr>
-    </table>
-    </table>
-    
-    <p clear=all>
-<!-- issues tables-->
-       <table border=1 cellpadding=5 cellspacing=0 width=90%>
-       <td colspan=2 align=center>
-       <table border=0 cellpadding=5 cellspacing=0 width=100% > 
-           <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Issues Today</b></font></th></tr>
-           <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr>
-           $todaysissues
-       </table>
-       </td>
-    </tr>
-
-    <tr>
-       <td colspan=2 align=center>
-       <table border=0 cellpadding=5 cellspacing=0 width=100%>
-           <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Previous Issues</b></font></th></tr>
-           <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr>
-           $previssues
-       </table>
-       </td>
-    </tr>
-</table>
-</td></tr></table>
-<p>
-EOF
+sub fixdate {
+    my ($year, $month, $day) = @_;
+    my $invalidduedate;
+    my $date;
+    if (($year eq 0) && ($month eq 0) && ($year eq 0)) {
+       $env{'datedue'}='';
     } else {
-       if (my $findborrower=$query->param('findborrower')) {
-           my ($borrowers, $flags) = findborrower(\%env, $findborrower);
-           my @borrowers=@$borrowers;
-           if ($#borrowers == -1) {
-               $query->param('findborrower', '');
-               print "No borrower matched '$findborrower'<p>\n";
-               issues(1);
-               return;
-           }
-           if ($#borrowers == 0) {
-               $query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
-               $query->param('barcode',' ');
-               issues(1);
-               return;
+       if (($year eq 0) || ($month eq 0) || ($year eq 0)) {
+           $invalidduedate="Invalid Due Date Specified. Book was not issued.<p>\n";
+       } else {
+           if (($day>30) && (($month==4) || ($month==6) || ($month==9) || ($month==11))) {
+               $invalidduedate = "Invalid Due Date Specified. Book was not issued. Only 30 days in $month month.<p>\n";
+           } elsif (($day > 29) && ($month == 2)) {
+               $invalidduedate="Invalid Due Date Specified. Book was not issued.  Never that many days in February!<p>\n";
+           } elsif (($month == 2) && ($day > 28) && (($year%4) && ((!($year%100) || ($year%400))))) {
+               $invalidduedate="Invalid Due Date Specified. Book was not issued.  $year is not a leap year.<p>\n";
            } else {
-               print "<form method=get>\n";
-               print "<input type=hidden name=module value=issues>\n";
-               print "<input type=hidden name=branch value=$branch>\n";
-               print "<input type=hidden name=printer value=$printer>\n";
-               print "<input type=hidden name=barcode value=\" \">\n";
-               print "<table border=0 cellspacing=0 cellpadding=5 bgcolor=#dddddd>";
-               print "<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Select a borrower</b></font></th></tr>\n";
-               print "<tr><td align=center>\n";
-               print "<select name=borrnumber size=7>\n";
-               foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowers) {
-                   print "<option value=$_->{'borrowernumber'}>$_->{'surname'}, $_->{'firstname'} ($_->{'cardnumber'})\n";
-               }
-               print "</select><br>";
-               print "<input type=submit>\n";
-               print "</td></tr></table>\n";
-               print "</td></tr></table>\n";
+               $date="$year-$month-$day";
            }
-       } else {
-           print << "EOF";
-<form method=get>
-<table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Enter borrower card number<br> or partial last name</b></font></td></tr>
-<tr><td><input name=findborrower></td></tr>
-</table>
-<input type=hidden name=module value=issues>
-<input type=hidden name=branch value=$branch>
-<input type=hidden name=printer value=$printer>
-<input type=hidden name=barcode value=" ">
-</form>
-</td></tr></table>
-EOF
        }
     }
+    return ($date, $invalidduedate);
 }
 
 
 sub patrontable {
     my ($borrower) = @_;
-    my $flags=$borrower->{'flags'};
-    my $flagtext='';
+    my $flags = $borrower->{'flags'};
     my $flaginfotable='';
-    my $flaginfotext='';
+    my $flaginfotext;
+    #my $flaginfotext='';
     my $flag;
+    my $color='';
     foreach $flag (sort keys %$flags) {
+       warn $flag;
+       my @itemswaiting='';
        ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-       if ($flags->{$flag}->{'noissues'}) {
-           $flagtext.="<font color=red>$flag</font> ";
-       } else {
-           $flagtext.="$flag ";
-       }
        $flags->{$flag}->{'message'}=~s/\n/<br>/g;
        if ($flags->{$flag}->{'noissues'}) {
-           if ($flag eq 'CHARGES') {
-               $flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n";
-           } else {
-               $flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n";
-           }
+               $template->param(
+                       noissues => 'true',
+                       color => $color,
+                        );
+               if ($flag eq 'CHARGES') {
+                       $template->param(
+                               charges => 'true',
+                               chargesmsg => $flags->{'CHARGES'}->{'message'}
+                                );
+               }
        } else {
-           if ($flag eq 'CHARGES') {
-               $flaginfotext.="<tr><td valign=top>$flag</td><td $flags->{$flag}->{'message'} <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n";
-           } elsif ($flag eq 'WAITING') {
-               my $itemswaiting='';
-               my $items=$flags->{$flag}->{'itemlist'};
-               foreach $item (@$items) {
-                   my ($iteminformation) = getiteminformation($env, $item->{'itemnumber'}, 0);
-                   $itemswaiting.="<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a> $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>\n";
+                if ($flag eq 'CHARGES') {
+                       $template->param(
+                               charges => 'true',
+                               chargesmsg => $flags->{'CHARGES'}->{'message'}
+                        );
                }
-               $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
-           } elsif ($flag eq 'ODUES') {
-               my $items=$flags->{$flag}->{'itemlist'};
-               my $itemswaiting="<table border=0 cellspacing=0 cellpadding=2>\n";
-               my $currentcolor=$color;
-               {
-                   my $color=$currentcolor;
-                   foreach $item (@$items) {
-                       ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-                       my ($iteminformation) = getiteminformation($env, $item->{'itemnumber'}, 0);
-                       $itemswaiting.="<tr><td><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td>$iteminformation->{'title'}</td></tr>\n";
-                   }
+               if ($flag eq 'WAITING') {
+                       my $items=$flags->{$flag}->{'itemlist'};
+                       foreach my $item (@$items) {
+                       my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
+                       $iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'};
+                       push @itemswaiting, $iteminformation;
+                       }
+                       $template->param(
+                               waiting => 'true',
+                               waitingmsg => $flags->{'WAITING'}->{'message'},
+                               itemswaiting => \@itemswaiting,
+                                );
                }
-               $itemswaiting.="</table>\n";
-               if ($query->param('module') ne 'returns'){
-                 $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}, See below</td></tr>\n";
-               } else {
-                 $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n"; 
+               if ($flag eq 'ODUES') {
+                       $template->param(
+                               odues => 'true',
+                               oduesmsg => $flags->{'ODUES'}->{'message'}
+                                );
+
+                       my $items=$flags->{$flag}->{'itemlist'};
+                       my $currentcolor=$color;
+                       {
+                       my $color=$currentcolor;
+                       foreach my $item (@$items) {
+                               ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
+                               my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
+                               push @itemswaiting, $iteminformation;
+                       }
+                       }
+                       if ($query->param('module') ne 'returns'){
+                               $template->param( nonreturns => 'true' );
+                       }
+               }
+               if ($flag eq 'NOTES') {
+                       $template->param(
+                               notes => 'true',
+                               notesmsg => $flags->{'NOTES'}->{'message'}
+                                );
                }
-           } else {
-               $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n";
-           }
        }
     }
-    ($flaginfotext) && ($flaginfotext="<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><b>Flags</b></td></tr>$flaginfotext</table>\n");
-    my $patrontable= << "EOF";
-    <table border=1
-    cellpadding=5 cellspacing=0 align=right>
-    <tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><font color=black><b>Patron Information</b></font></td></tr>
-    <tr><td colspan=2>
-    <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a> $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>
-EOF
-    if ($query->param('module') ne 'returns'){ 
-       $patrontable.="$borrower->{'streetaddress'} $borrower->{'city'} Cat:
-       $borrower->{'categorycode'} ";
-     }
-    $patrontable.=<< "EOF";
-    
-    </td></tr>
-
-EOF
     return($patrontable, $flaginfotext);
 }
+
+
+# FIXME - This clashes with &C4::Print::printslip
+sub printslip {
+    my ($env,$borrowernumber)=@_;
+    my ($borrower, $flags) = getpatroninformation($env,$borrowernumber,0);
+    $env->{'todaysissues'}=1;
+    my ($borrowerissues) = currentissues($env, $borrower);
+    $env->{'nottodaysissues'}=1;
+    $env->{'todaysissues'}=0;
+    my ($borroweriss2)=currentissues($env, $borrower);
+    $env->{'nottodaysissues'}=0;
+    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++;
+    }
+    remoteprint($env,\@issues,$borrower);
+}
+
+# Local Variables:
+# tab-width: 8
+# End: