Updates
[koha.git] / circ / circulation.pl
index 28466fa..b67a318 100755 (executable)
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# Please use 8-character tabs for this file (indents are every 4 characters)
 
 #written 8/5/2002 by Finlay
 #script to execute issuing of books
@@ -27,33 +28,44 @@ 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 $branches = getbranches();
 my $printers = getprinters(\%env);
 
-my $query = new CGI;
-
-my $branch = $query->param("branch");
-my $printer = $query->param("printer");
+my $branch = getbranch($query, $branches);
+my $printer = getprinter($query, $printers);
 
-($branch) || ($branch=$query->cookie('branch')) ;
-($printer) || ($printer=$query->cookie('printer')) ;
 
 #set up cookie.....
-my $info = '';
 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');
+       $branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
+       $printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
 }
 
 $env{'branchcode'}=$branch;
@@ -61,8 +73,7 @@ $env{'printer'}=$printer;
 $env{'queue'}=$printer;
 
 my @datearr = localtime(time());
-my $tday = localtime(time());
-warn "today: $tday \n";
+# 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;
 
@@ -72,34 +83,32 @@ my $borrowerslist;
 # if there is a list of find borrowers....
 my $findborrower = $query->param('findborrower');
 if ($findborrower) {
-    my ($borrowers, $flags) = findborrower(\%env, $findborrower);
-    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;
-    }
+       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;
+       }
 }
 
-my $borrowernumber = $query->param('borrnumber');    
-my $bornum = $query->param('borrnumber');    
+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';
+       $print = 'yes';
 }
 if ($print eq 'yes' && $borrowernumber ne ''){
-    printslip(\%env,$borrowernumber);    
-    $query->param('borrnumber','');
-    $borrowernumber='';
+       printslip(\%env,$borrowernumber);
+       $query->param('borrnumber','');
+       $borrowernumber='';
 }
-    
-
 
 # get the borrower information.....
 my $borrower;
@@ -111,16 +120,14 @@ if ($borrowernumber) {
 # get the responses to any questions.....
 my %responses;
 foreach (sort $query->param) {
-    if ($_ =~ /response-(\d*)/) {
-       $responses{$1} = $query->param($_);
-    }
+       if ($_ =~ /response-(\d*)/) {
+               $responses{$1} = $query->param($_);
+       }
 }
 if (my $qnumber = $query->param('questionnumber')) {
-    $responses{$qnumber} = $query->param('answer');
+       $responses{$qnumber} = $query->param('answer');
 }
 
-
-
 my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
 
 my $year=$query->param('year');
@@ -129,175 +136,45 @@ my $day=$query->param('day');
 
 # 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);
-    }
+       $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);
+       ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
 }
 
-
 ##################################################################################
 # HTML code....
 
-
-my $rejectedtext;
-if ($rejected) {
-    if ($rejected == -1) {
-    } else {
-       $rejectedtext = << "EOF";
-<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
-<tr><th><font color=black size=5>Error Issuing Book</font></th></tr>
-<tr><td><font color=red size=5>$rejected</font></td></tr>
-</table>
-<br>
-EOF
-    }
-}
-
-my $selectborrower;
-if ($borrowerslist) {
-    $selectborrower = <<"EOF";
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<input type=hidden name=branch value=$branch>
-<input type=hidden name=printer value=$printer>
-<table border=1 cellspacing=0 cellpadding=5 bgcolor="#dddddd">
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
-<font color=black><b>Select a borrower</b></font></th></tr>\n
-<tr><td align=center>
-<select name=borrnumber size=7>
-EOF
-    foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
-       $selectborrower .= <<"EOF";
-<option value=$_->{'borrowernumber'}>$_->{'surname'}, $_->{'firstname'} ($_->{'cardnumber'})
-EOF
-    }
-    $selectborrower .= <<"EOF";
-</select><br>
-<input type=submit>
-</td></tr></table>
-EOF
-}
-
-# title....
-my $title = <<"EOF";
-<table align="right"><tr><td>
-<a href=circulation.pl?borrnumber=$borrowernumber&branch=$branch&printer=$printer&print=yes>
-<img src="/images/button-next-borrower.gif" width="171" height="42" border="0" alt="Next Borrower"></a> &nbsp
-<a href=returns.pl>
-<img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
-&nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
-</td></tr></table>
-<FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
-<b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
-<b>Printer:</b> $printers->{$printer}->{'printername'} <br>
-<a href=selectbranchprinter.pl>Change Settings</a></td>
-<input type=hidden name=branch value=$branch>
-<input type=hidden name=printer value=$printer>
-<p>
-EOF
-
-my $titlenoborrower = <<"EOF";
-<table align="right"><tr><td>
-<a href=returns.pl>
-<img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
-&nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
-</td></tr></table>
-<FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
-<b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
-<b>Printer:</b> $printers->{$printer}->{'printername'} <br>
-<a href=selectbranchprinter.pl>Change Settings</a></td>
-<input type=hidden name=branch value=$branch>
-<input type=hidden name=printer value=$printer>
-<p>
-EOF
-
-
-
-my $cardnumberinput = << "EOF";
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<table border=1 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>
-  <input type=hidden name=branch value=$branch>
-<input type=hidden name=printer value=$printer>
-</table>
-</form>
-EOF
-
-my $responsesform = '';
+my %responseform;
+my @responsearray;
 foreach (keys %responses) {
-    $responsesform.="<input type=hidden name=response-$_ value=$responses{$_}>\n";
+#    $responsesform.="<input type=hidden name=response-$_ value=$responses{$_}>\n";
+    $responseform{'name'}=$_;
+    $responseform{'value'}=$responses{$_};
+    push @responsearray,\%responseform;
 }
 my $questionform;
+my $stickyduedate;
 if ($question) {
-    my $stickyduedate=$query->param('stickyduedate');
-    $questionform = <<"EOF";
-<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
-<font size=+2 color=red><b>Issuing Question</b></font></th></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=borrnumber value=$borrowernumber>
-<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=borrnumber value=$borrowernumber>
-<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
+    $stickyduedate=$query->param('stickyduedate');
 }
 
 
 # Barcode entry box, with hidden inputs attached....
+
+# FIXME - How can we move this HTML into the template?  Can we create
+# arrays of the months, dates, etc and use <TMPL_LOOP> in the template to 
+# output the data that's getting built here?
 my $counter = 1;
 my $dayoptions = '';
 my $monthoptions = '';
@@ -328,65 +205,16 @@ my $selected='';
 ($query->param('stickyduedate')) && ($selected='checked');
 
 
-my $barcodeentrytext = <<"EOF";
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<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></td></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=borrnumber value=$borrowernumber>
-<input type=hidden name=branch value=$branch>
-<input type=hidden name=printer value=$printer>
-<input type=hidden name=print value=maybe>
-EOF
-if ($flags->{'CHARGES'}){
-    $barcodeentrytext.="<input type=hidden name=charges value=yes>";
-}
-my $amountold=$flags->{'CHARGES'}->{'message'};
-my @temp=split(/\$/,$amountold);
-$amountold=$temp[1];
-$barcodeentrytext.="<input type=hidden name=oldamount value=$amountold>";
-$barcodeentrytext.=<<"EOF";
-</td></tr></table>
-</td></tr></table>
-</form>
-EOF
-
-
-# collect the messages and put into message table....
-my $messagetable;
-if ($message) {
-    $messagetable = << "EOF";
-<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
-<tr><td> $message </td></tr></table>
-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);
@@ -399,142 +227,122 @@ if ($borrower) {
            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'};
-       #convert to nz style dates
-       #this should be set with some kinda config variable         
-       my @tempdate=split(/-/,$dd);
-       $dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
-       $datedue=~s/-//g;
-       if ($datedue < $todaysdate) {
-           $dd="<font color=red>$dd</font>\n";
+       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;
+# FIXME - Instead of declaring the font color here, can we set a variable 
+# that says 'overdue'?  Then the template can check for it: <TMPL_IF
+# NAME="overdue"><font color="red"></TMPL_IF>
+               if ($datedue < $todaysdate) {
+                       $dd="<font color=red>$dd</font>\n";
+               }
+               ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
+               $book->{'dd'}=$dd;
+               $book->{'tcolor'}=$tcolor;
+               if ($book->{'author'} eq ''){
+                   $book->{'author'}=' ';
+               }    
+               push @realtodayissues,$book;
        }
-       ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
-       $todaysissues .=<< "EOF";
-<tr><td bgcolor=$tcolor align=center>$dd</td>
-<td bgcolor=$tcolor align=center>
-<a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
-<td bgcolor=$tcolor>$book->{'title'}</td>
-<td bgcolor=$tcolor>$book->{'author'}</td>
-<td bgcolor=$tcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
-EOF
-    } 
+    
+
+    # 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.
+
+    # 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'};
-       #convert to nz style dates
-       #this should be set with some kinda config variable         
-       my @tempdate=split(/-/,$dd);
-       $dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
-       $datedue=~s/-//g;
+       $dd=format_date($dd);
+       my $pcolor = '';
+       $datedue=~s/-//g;
        if ($datedue < $todaysdate) {
+# FIXME - See line 233 above regarding overdues
            $dd="<font color=red>$dd</font>\n";
        }
-       ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
-       $previssues .= << "EOF";
-<tr><td bgcolor=$pcolor align=center>$dd</td>
-<td bgcolor=$pcolor align=center>
-<a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
-<td bgcolor=$pcolor>$book->{'title'}</td>
-<td bgcolor=$pcolor>$book->{'author'}</td>
-<td bgcolor=$pcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
-EOF
-    }
-}
-
-my $issuedbookstable;
-if ($todaysissues) {
-    $issuedbookstable .= <<"EOF";
-<table border=1 cellpadding=5 cellspacing=0 width=80%>
-<tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>
-<b>Todays Issues</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>
-EOF
-}
-if ($previssues) {
-    $issuedbookstable .= <<"EOF";
-<table border=1 cellpadding=5 cellspacing=0 width=80%>
-<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>
-EOF
+       ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); 
+       $book->{'dd'}=$dd; 
+       $book->{'tcolor'}=$pcolor;
+       if ($book->{'author'} eq ''){
+           $book->{'author'}=' ';
+       }    
+       push @realprevissues,$book
+   }
 }
 
-
-
-
-
-# actually print the page!
-
-
-if ($branchcookie && $printercookie) {
-    print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie]);
-} else {
-    print $query->header();
-}
-
-print startpage();
-my @inp=startmenu('circulation');
-if ($query->param('barcode') eq '' && $query->param('charges') eq 'yes'){
-    my $count=@inp;
-     for (my $i=0;$i<$count;$i++){
-        $inp[$i]=~ s/onLoad=focusinput\(\)/onLoad=focusinput\(\)\;messenger\(\"\/cgi-bin\/koha\/pay.pl?bornum=$bornum\",700,600\)\;window1.focus\(\)/;
-     }
-}
-
-print @inp;
-
-
-#print startmenu('circulation');
-if ($borrower) {
-    print $title;
-} else {
-    print $titlenoborrower;
-}
-
-
-print $info;
-
-if ($question) {
-    print $questionform;
-}
-
-print $rejectedtext;
-print $messagetable;
-
-
-unless ($borrower) {
-    if ($borrowerslist) {
-       print $selectborrower;
-    } else {
-       print $cardnumberinput;
-    }
+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'})";
+       }
+       $CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
+                               -values   => \@values,
+                               -labels   => \%labels,
+                               -size     => 7,
+                               -multiple => 0 );
 }
+#title
 
-
-
-if ($borrower) {
-    my ($patrontable, $flaginfotable) = patrontable($borrower);
-    print $patrontable;
-    print $flaginfotable;
-    print $barcodeentrytext;
-    print "<p clear=all><br><br>";
-    print $issuedbookstable;
+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'},
+               streetaddress => $borrower->{'streetaddress'},
+               city => $borrower->{'city'},
+               phone => $borrower->{'phone'},
+               cardnumber => $borrower->{'cardnumber'},
+               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,
+                month=>$month,
+                day=>$day,
+                year=>$year
+                
+       );
+
+if ($branchcookie) {
+    $cookie=[$cookie, $branchcookie, $printercookie];
 }
 
-
-
-
-print endmenu('circulation');
-print endpage();
-
+output_html_with_http_headers $query, $cookie, $template->output;
 
 ####################################################################
 # Extra subroutines,,,
@@ -548,8 +356,8 @@ sub cuecatbarcodedecode {
        return $results[2];
     } else {
        return $barcode;
-    } 
-} 
+    }
+}
 
 sub fixdate {
     my ($year, $month, $day) = @_;
@@ -558,6 +366,13 @@ sub fixdate {
     if (($year eq 0) && ($month eq 0) && ($year eq 0)) {
        $env{'datedue'}='';
     } else {
+       
+# FIXME - Can we set two flags here, one that says 'invalidduedate', so that 
+# the template can check for it, and then one for a particular message?
+# Ex: <TMPL_IF NAME="invalidduedate">  <TMPL_IF NAME="daysinFeb">
+# Invalid Due Date Specified. Book was not issued.  Never that many days
+# in February! </TMPL_IF> </TMPL_IF>
+
        if (($year eq 0) || ($month eq 0) || ($year eq 0)) {
            $invalidduedate="Invalid Due Date Specified. Book was not issued.<p>\n";
        } else {
@@ -580,66 +395,96 @@ sub patrontable {
     my ($borrower) = @_;
     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);
        $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 'GNA'){
+                       $template->param(
+                               gna => 'true'
+                               );
+                       }
+               if ($flag eq 'LOST'){
+                       $template->param(
+                               lost => 'true'
+                       );
+                       }
+               if ($flag eq 'DBARRED'){
+                       $template->param(
+                               dbarred => 'true'
+                       );
+                       }
+               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 my $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=1 cellspacing=0 cellpadding=2>\n";
-               my $currentcolor=$color;
-               {
-                   my $color=$currentcolor;
-                   foreach my $item (@$items) {
-                       ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
+               if ($flag eq 'WAITING') {
+                       my $items=$flags->{$flag}->{'itemlist'};
+                       my @itemswaiting;
+                       foreach my $item (@$items) {
                        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";
-                   }               
+                       $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;
+                           my @itemswaiting;
+                       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\n");
-    $flaginfotext.="</table>";
-    my $patrontable= << "EOF";
-<br><p>
-    <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>$borrower->{'streetaddress'} $borrower->{'city'} Cat: $borrower->{'categorycode'} </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);
@@ -654,7 +499,6 @@ sub printslip {
     foreach (sort {$a <=> $b} keys %$borrowerissues) {
        $issues[$i]=$borrowerissues->{$_};
        my $dd=$issues[$i]->{'date_due'};
-#      warn $_,$dd;
        #convert to nz style dates
        #this should be set with some kinda config variable
        my @tempdate=split(/-/,$dd);
@@ -664,7 +508,6 @@ sub printslip {
     foreach (sort {$a <=> $b} keys %$borroweriss2) {
        $issues[$i]=$borroweriss2->{$_};
        my $dd=$issues[$i]->{'date_due'};
-#      warn $_,$dd;
        #convert to nz style dates
        #this should be set with some kinda config variable
        my @tempdate=split(/-/,$dd);
@@ -673,3 +516,7 @@ sub printslip {
     }
     remoteprint($env,\@issues,$borrower);
 }
+
+# Local Variables:
+# tab-width: 8
+# End: