add borrower note to check-in
[koha.git] / circ / returns.pl
index 5482b87..b05f566 100755 (executable)
@@ -1,10 +1,8 @@
 #!/usr/bin/perl
 
-#written 11/3/2002 by Finlay
-#script to execute returns of books
-
-
 # Copyright 2000-2002 Katipo Communications
+#           2006 SAN-OP
+#           2007 BibLibre, Paul POULAIN
 #
 # This file is part of Koha.
 #
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+=head1 returns.pl
+
+script to execute returns of books
+
+=cut
+
 use strict;
 use CGI;
-use C4::Circulation::Circ2;
-use C4::Search;
+use C4::Context;
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
+use C4::Circulation;
+use C4::Dates qw/format_date/;
+use Date::Calc qw/Add_Delta_Days/;
+use C4::Calendar;
 use C4::Print;
-use C4::Reserves2;
-
-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();
-my $printers = getprinters(\%env);
-
-my $branch = $query->param("branch");
-my $printer = $query->param("printer");
+use C4::Reserves;
+use C4::Biblio;
+use C4::Items;
+use C4::Members;
+use C4::Branch; # GetBranchName
+use C4::Koha;   # FIXME : is it still useful ?
+
+my $query = new CGI;
+
+if (!C4::Context->userenv){
+       my $sessionID = $query->cookie("CGISESSID");
+       my $session = get_session($sessionID);
+       if ($session->param('branch') eq 'NO_LIBRARY_SET'){
+               # no branch set we can't return
+               print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
+               exit;
+       }
+} 
 
-($branch) || ($branch=$query->cookie('branch')) ;
-($printer) || ($printer=$query->cookie('printer')) ;
+#getting the template
+my ( $template, $librarian, $cookie ) = get_template_and_user(
+    {
+        template_name   => "circ/returns.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { circulate => 1 },
+    }
+);
 
+#####################
+#Global vars
+my $branches = GetBranches();
+my $printers = GetPrinters();
 
+#my $branch  = C4::Context->userenv?C4::Context->userenv->{'branch'}:"";
+my $printer = C4::Context->userenv?C4::Context->userenv->{'branchprinter'}:"";
+my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
 #
 # Some code to handle the error if there is no branch or printer setting.....
 #
 
-
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
-
 # Set up the item stack ....
-my $ritext = '';
 my %returneditems;
 my %riduedate;
 my %riborrowernumber;
-foreach ($query->param) {
+my @inputloop;
+foreach ( $query->param ) {
     (next) unless (/ri-(\d*)/);
-    my $counter=$1;
-    (next) if ($counter>20);
-    my $barcode=$query->param("ri-$counter");
-    my $duedate=$query->param("dd-$counter");
-    my $borrowernumber=$query->param("bn-$counter");
+    my %input;
+    my $counter = $1;
+    (next) if ( $counter > 20 );
+    my $barcode        = $query->param("ri-$counter");
+    my $duedate        = $query->param("dd-$counter");
+    my $borrowernumber = $query->param("bn-$counter");
     $counter++;
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-    $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";
-}
 
-# Collect a few messages here...
-my $messagetext='';
-my $reservetext='';
+    # decode barcode
+    $barcode = barcodedecode($barcode) if(C4::Context->preference('itemBarcodeInputFilter'));
+
+    ######################
+    #Are these lines still useful ?
+    $returneditems{$counter}    = $barcode;
+    $riduedate{$counter}        = $duedate;
+    $riborrowernumber{$counter} = $borrowernumber;
+
+    #######################
+    $input{counter}        = $counter;
+    $input{barcode}        = $barcode;
+    $input{duedate}        = $duedate;
+    $input{borrowernumber} = $borrowernumber;
+    push( @inputloop, \%input );
+}
 
 ############
 # Deal with the requests....
-if ($query->param('resbarcode')) {
-    my $item = $query->param('itemnumber');
-    my $borrnum = $query->param('borrowernumber');
-    my $resbarcode = $query->param('resbarcode');
-# set to waiting....
-    my $iteminfo = getiteminformation(\%env, $item);
-    my $tobranchcd = ReserveWaiting($item, $borrnum);
-    my $branchname = $branches->{$tobranchcd}->{'branchname'};
-    my ($borr) = getpatroninformation(\%env, $borrnum, 0);
-    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
-    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
+
+if ($query->param('WT-itemNumber')){
+       updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
+}
+
+if ( $query->param('resbarcode') ) {
+    my $item           = $query->param('itemnumber');
+    my $borrowernumber = $query->param('borrowernumber');
+    my $resbarcode     = $query->param('resbarcode');
+    my $diffBranchReturned = $query->param('diffBranch');
+    # set to waiting....
+    my $iteminfo   = GetBiblioFromItemNumber($item);
+    # fix up item type for display
+    $iteminfo->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $iteminfo->{'itype'} : $iteminfo->{'itemtype'};
+    my $diffBranchSend;
+    
+#     addin in ModReserveAffect the possibility to check if the document is expected in this library or not,
+# if not we send a value in reserve waiting for not implementting waiting status
+    if ($diffBranchReturned) {
+        $diffBranchSend = $diffBranchReturned;
+    }
+    else {
+        $diffBranchSend = undef;
+    }
+    ModReserveAffect( $item, $borrowernumber,$diffBranchSend);
+#   check if we have other reservs for this document, if we have a return send the message of transfer
+    my ( $messages, $nextreservinfo ) = GetOtherReserves($item);
+
+    my $branchname = GetBranchName( $messages->{'transfert'} );
+    my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
+    my $borcnum = $borr->{'cardnumber'};
+    my $name    =
+      $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
     my $slip = $query->param('resslip');
-    printslip(\%env, $slip);
-    if ($tobranchcd ne $branch) {
-#      my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
-       $reservetext .= <<"EOF";
-<font color='red' size='+2'>Item marked Waiting:</font><br>
-    Item: $iteminfo->{'title'} ($iteminfo->{'author'})<br>
- needs to be transfered to <b>$branchname</b> <br>
-to be picked up by $name ($number).
-<center><form method=post action='returns.pl'>
-$ritext
-<input type=hidden name=barcode value=0>
-<input type=submit value="OK">
-</form></center>
-EOF
+
+
+    if ( $messages->{'transfert'} ) {
+        $template->param(
+            itemtitle      => $iteminfo->{'title'},
+                       itembiblionumber => $iteminfo->{'biblionumber'},
+            iteminfo       => $iteminfo->{'author'},
+            tobranchname   => $branchname,
+            name           => $name,
+            borrowernumber => $borrowernumber,
+            borcnum        => $borcnum,
+            borfirstname   => $borr->{'firstname'},
+            borsurname     => $borr->{'surname'},
+            diffbranch     => 1
+        );
     }
 }
 
-
-my $iteminformation;
 my $borrower;
 my $returned = 0;
 my $messages;
+my $issueinformation;
 my $barcode = $query->param('barcode');
+# strip whitespace
+# $barcode =~ s/\s*//g; - use barcodedecode for this; whitespace is not invalid.
+my $exemptfine = $query->param('exemptfine');
+my $dropboxmode= $query->param('dropboxmode');
+my $calendar = C4::Calendar->new(  branchcode => C4::Context->userenv->{'branch'} );
+       #dropbox: get last open day (today - 1)
+my $dropboxdate = $calendar->addDate(C4::Dates->new(), -1 );
+my $dotransfer = $query->param('dotransfer');
+if ($dotransfer){
+       # An item has been returned to a branch other than the homebranch, and the librarian has choosen to initiate a transfer
+       my $transferitem=$query->param('transferitem');
+       my $tobranch=$query->param('tobranch');
+       ModItemTransfer($transferitem, C4::Context->userenv->{'branch'}, $tobranch); 
+}
+
 # actually return book and prepare item table.....
 if ($barcode) {
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-    ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
-    $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
+    $barcode = barcodedecode($barcode)  if(C4::Context->preference('itemBarcodeInputFilter'));
+#
+# save the return
+#
+    ( $returned, $messages, $issueinformation, $borrower ) =
+      AddReturn( $barcode, C4::Context->userenv->{'branch'}, $exemptfine, $dropboxmode);
+    # get biblio description
+    my $biblio = GetBiblioFromItemNumber($issueinformation->{'itemnumber'});
+    # fix up item type for display
+    $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
+
+    $template->param(
+        title            => $biblio->{'title'},
+        homebranch       => $biblio->{'homebranch'},
+        author           => $biblio->{'author'},
+        itembarcode      => $biblio->{'barcode'},
+        itemtype         => $biblio->{'itemtype'},
+        ccode            => $biblio->{'ccode'},
+        itembiblionumber => $biblio->{'biblionumber'},    
+    );
     if ($returned) {
-       $returneditems{0} = $barcode;
-       $riborrowernumber{0} = $borrower->{'borrowernumber'};
-       $riduedate{0} = $iteminformation->{'date_due'};
-       $ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
-       $ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
-    } elsif (! $messages->{'BadBarcode'}) {
-       $returneditems{0} = $barcode;
-       $riduedate{0} = 0;
-       $ritext.= "<input type=hidden name=dd-0 value=0>\n";
-       if ($messages->{'wthdrawn'}) {
-           $ritext.= "<input type=hidden name=bn-0 value='Item Cancelled'>\n";
-           $riborrowernumber{0} = 'Item Cancelled';
-       } else {
-           $ritext.= "<input type=hidden name=bn-0 value='&nbsp;'>\n";
-           $riborrowernumber{0} = '&nbsp;';
-       }
+        $returneditems{0}    = $barcode;
+        $riborrowernumber{0} = $borrower->{'borrowernumber'};
+        $riduedate{0}        = $issueinformation->{'date_due'};
+        my %input;
+        $input{counter}        = 0;
+        $input{first}          = 1;
+        $input{barcode}        = $barcode;
+        $input{duedate}        = $riduedate{0};
+        $input{borrowernumber} = $riborrowernumber{0};
+        push( @inputloop, \%input );
+
+        # check if the branch is the same as homebranch
+        # if not, we want to put a message
+        if ( $biblio->{'homebranch'} ne C4::Context->userenv->{'branch'} ) {
+            $template->param( homebranch => $biblio->{'homebranch'} );
+        }
+    }
+    elsif ( !$messages->{'BadBarcode'} ) {
+        my %input;
+        $input{counter} = 0;
+        $input{first}   = 1;
+        $input{barcode} = $barcode;
+        $input{duedate} = 0;
+
+        $returneditems{0} = $barcode;
+        $riduedate{0}     = 0;
+        if ( $messages->{'wthdrawn'} ) {
+            $input{withdrawn}      = 1;
+            $input{borrowernumber} = "Item Cancelled";
+            $riborrowernumber{0}   = 'Item Cancelled';
+        }
+        else {
+            $input{borrowernumber} = "&nbsp;";
+            $riborrowernumber{0} = '&nbsp;';
+        }
+        push( @inputloop, \%input );
     }
 }
+$template->param( inputloop => \@inputloop );
+
+my $found    = 0;
+my $waiting  = 0;
+my $reserved = 0;
 
-##################################################################################
-# HTML code....
-# title....
-my $title = <<"EOF";
-<FONT SIZE=6><em>Circulation: Returns</em></FONT><br>
-<b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
-<b>Printer:</b> $printers->{$printer}->{'printername'}<br>
-<a href=selectbranchprinter.pl>Change Settings</a>
-<input type=hidden name=branch value=$branch>
-<input type=hidden name=printer value=$printer>
-<p>
-EOF
-
-my $links = <<"EOF";
-<table align="right"><tr><td>
-<a href=circulation.pl>
-<img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
-&nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
-</td></tr></table>
-EOF
-
-
-my $itemtable;
-if ($iteminformation) {
-    $itemtable = <<"EOF";
-<table border=1 cellpadding=5 cellspacing=0>
-<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
+# new op dev : we check if the document must be returned to his homebranch directly,
+#  if the document is transfered, we have warning message .
+
+if ( $messages->{'WasTransfered'} ) {
+    $template->param(
+        found          => 1,
+        transfer       => 1,
+    );
 }
 
-# Barcode entry box, with hidden inputs attached....
-my $barcodeentrytext = << "EOF";
-<form method=post action=/cgi-bin/koha/circ/returns.pl>
-<table border=1 cellpadding=5 cellspacing=0>
-<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>
-$ritext
-</form>
-EOF
-
-
-if ($messages->{'ResFound'}) {
-    my $res = $messages->{'ResFound'};
-    my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
-    my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
-    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
-    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
-    my ($iteminfo) = getiteminformation(\%env, 0, $barcode);
-
-    if ($res->{'ResFound'} eq "Waiting") {
-       $reservetext = <<"EOF";
-<font color='red' size='+2'>Item marked Waiting:</font><br>
-    Item $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
-is marked waiting at <b>$branchname</b> for $name ($number).
-<center><form method=post action='returns.pl'>
-$ritext
-<input type=hidden name=barcode value=0>
-<input type=submit value="OK">
-</form></center>
-EOF
-    } 
-    if ($res->{'ResFound'} eq "Reserved") {
-       my @da = localtime(time());
-       my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d", ($da[4]+1))."/".($da[5]+1900);
-       my $slip =  <<"EOF";
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Date: $todaysdate;
-
-ITEM RESERVED: 
-$iteminfo->{'title'} ($iteminfo->{'author'})
-barcode: $iteminfo->{'barcode'}
-itemtype: $iteminfo->{'itemtype'} 
-
-COLLECT AT: $branchname
-
-BORROWER:
-$borr->{'title'} $borr->{'firstname'} $borr->{'surname'}
-card number: $borr->{'cardnumber'}
-Phone: $borr->{'phone'}
-$borr->{'streetaddress'}
-$borr->{'suburb'}
-$borr->{'town'}
-$borr->{'emailaddress'}
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-EOF
-
-       $reservetext = <<"EOF";
-<font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <a href=/cgi-bin/koha/detail.pl?bib=$iteminfo->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a> <br>
-for $name ($number) to be collected at <b>$branchname</b>.
-<table cellpadding=5 cellspacing=0>
-<tr><td valign="top">Change status to waiting and print 
-<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
-<td valign="top">
-<form method=post action='returns.pl'>
-$ritext
-<input type=hidden name=itemnumber value=$res->{'itemnumber'}>
-<input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
-<input type=hidden name=resbarcode value=$barcode>
-<input type=hidden name=resslip value="$slip">
-<input type=submit value="Print">
-</form>
-</td></tr>
-</table>
-EOF
-    }
+if ( $messages->{'NeedsTransfer'} ){
+       $template->param(
+               found          => 1,
+               needstransfer  => 1,
+               itemnumber => $issueinformation->{'itemnumber'}
+       );
 }
-my $reservefoundtext;
-if ($reservetext) {
-    $reservefoundtext = <<"EOF";
-<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Reserve Found</font></th></tr>
-<tr><td> $reservetext </td></tr></table>
-EOF
+
+if ( $messages->{'Wrongbranch'} ){
+       $template->param(
+               wrongbranch => 1,
+       );
 }
 
-# collect the messages and put into message table....
-foreach my $code (keys %$messages) {
-    warn $code;
-    if ($code eq 'BadBarcode'){
-       $messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
+# adding a case of wrong transfert, if the document wasn't transfered in the good library (according to branchtransfer (tobranch) BDD)
+
+if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
+       $template->param(
+        WrongTransfer  => 1,
+        TransferWaitingAt => $messages->{'WrongTransfer'},
+        WrongTransferItem => $messages->{'WrongTransferItem'},
+    );
+
+    my $reserve        = $messages->{'ResFound'};
+    my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
+    my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
+    my $name =
+      $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
+        $template->param(
+            wname           => $name,
+            wborfirstname   => $borr->{'firstname'},
+            wborsurname     => $borr->{'surname'},
+            wbortitle       => $borr->{'title'},
+            wborphone       => $borr->{'phone'},
+            wboremail       => $borr->{'email'},
+            wboraddress  => $borr->{'address'},
+            wboraddress2 => $borr->{'address2'},
+            wborcity        => $borr->{'city'},
+            wborzip         => $borr->{'zipcode'},
+            wborrowernumber => $reserve->{'borrowernumber'},
+            wborcnum        => $borr->{'cardnumber'},
+            wtransfertFrom    => C4::Context->userenv->{'branch'},
+        );
+}
+
+
+#
+# reserve found and item arrived at the expected branch
+#
+if ( $messages->{'ResFound'}) {
+    my $reserve        = $messages->{'ResFound'};
+    my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
+    my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
+    if ( $reserve->{'ResFound'} eq "Waiting" ) {
+        if ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ) {
+            $template->param( waiting => 1 );
+        }
+        else {
+            $template->param( waiting => 0 );
+        }
+
+        $template->param(
+            found          => 1,
+            name           => $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'},
+            borfirstname   => $borr->{'firstname'},
+            borsurname     => $borr->{'surname'},
+            bortitle       => $borr->{'title'},
+            borphone       => $borr->{'phone'},
+            boremail       => $borr->{'email'},
+            boraddress  => $borr->{'address'},
+            boraddress2  => $borr->{'address2'},
+            borcity        => $borr->{'city'},
+            borzip         => $borr->{'zipcode'},
+            borrowernumber => $reserve->{'borrowernumber'},
+            borcnum        => $borr->{'cardnumber'},
+            debarred       => $borr->{'debarred'},
+            gonenoaddress  => $borr->{'gonenoaddress'},
+            currentbranch  => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
+            itemnumber       => $reserve->{'itemnumber'},
+            barcode     => $barcode,
+        );
+
     }
-    if ($code eq 'NotIssued'){
-       my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
-       $messagetext .= "<font color='red' size='+2'> Item not on issue. </font> <br>";
+    if ( $reserve->{'ResFound'} eq "Reserved" ) {
+       # my @da         = localtime( time() );
+       # my $todaysdate = sprintf( "%0.2d/%0.2d/%0.4d", ( $datearr[3] + 1 ),( $datearr[4] + 1 ),( $datearr[5] + 1900 ) );
+               # FIXME - use Dates obj , locale. AND, why [4]+1 ??
+        if ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ) {
+            $template->param( intransit => 0 );
+        }
+        else {
+            $template->param( intransit => 1 );
+        }
+
+        $template->param(
+            found          => 1,
+            currentbranch  => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
+            destbranchname =>
+              $branches->{ $reserve->{'branchcode'} }->{'branchname'},
+            destbranch    => $reserve->{'branchcode'},
+            transfertodo => ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ? 0 : 1 ),
+            reserved => 1,
+            resbarcode       => $barcode,
+          #  today            => $todaysdate,
+            itemnumber       => $reserve->{'itemnumber'},
+            borsurname       => $borr->{'surname'},
+            bortitle         => $borr->{'title'},
+            borfirstname     => $borr->{'firstname'},
+            borrowernumber   => $reserve->{'borrowernumber'},
+            borcnum          => $borr->{'cardnumber'},
+            borphone         => $borr->{'phone'},
+            boraddress    => $borr->{'address'},
+            boraddress2    => $borr->{'address2'},
+            borsub           => $borr->{'suburb'},
+            borcity          => $borr->{'city'},
+            borzip           => $borr->{'zipcode'},
+            boremail         => $borr->{'email'},
+            debarred         => $borr->{'debarred'},
+            gonenoaddress    => $borr->{'gonenoaddress'},
+            barcode          => $barcode
+        );
+    }
+}
+
+# Error Messages
+my @errmsgloop;
+foreach my $code ( keys %$messages ) {
+
+    #    warn $code;
+    my %err;
+    my $exit_required_p = 0;
+    if ( $code eq 'BadBarcode' ) {
+        $err{badbarcode} = 1;
+        $err{msg}        = $messages->{'BadBarcode'};
     }
-    if ($code eq 'WasLost'){
-       $messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
+    elsif ( $code eq 'NotIssued' ) {
+        $err{notissued} = 1;
+        $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
     }
-    if ($code eq 'wthdrawn'){
-       $messagetext = "<font color='red' size='+2'> Item Cancelled. </font> <br>";
-       last;
+    elsif ( $code eq 'WasLost' ) {
+        $err{waslost} = 1;
     }
-    if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
-       if ($messages->{'IsPermanent'} ne $branch) {
-           $messagetext .= "<font color='red' size='+2'> Please return to $branches->{$messages->{'IsPermanent'}}->{'branchname'} </font> <br>";
+    elsif ( $code eq 'ResFound' ) {
+        ;    # FIXME... anything to do here?
+    }
+    elsif ( $code eq 'WasReturned' ) {
+        ;    # FIXME... anything to do here?
+    }
+    elsif ( $code eq 'WasTransfered' ) {
+        ;    # FIXME... anything to do here?
+    }
+    elsif ( $code eq 'wthdrawn' ) {
+        $err{withdrawn} = 1;
+        $exit_required_p = 1;
+    }
+    elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) {
+        if ( $messages->{'IsPermanent'} ne C4::Context->userenv->{'branch'} ) {
+            $err{ispermanent} = 1;
+            $err{msg}         =
+              $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
+        }
+    }
+    elsif ( $code eq 'WrongTransfer' ) {
+        ;    # FIXME... anything to do here?
+    }
+    elsif ( $code eq 'WrongTransferItem' ) {
+        ;    # FIXME... anything to do here?
+    }
+       elsif ( $code eq 'NeedsTransfer' ) {
+       }
+       elsif ( $code eq 'Wrongbranch' ) {
        }
+               
+    else {
+        die "Unknown error code $code";    # XXX
     }
+    if (%err) {
+        push( @errmsgloop, \%err );
+    }
+    last if $exit_required_p;
 }
-$messagetext = substr($messagetext, 0, -4);
-
-my $messagetable;
-if ($messagetext) {
-    $messagetable = << "EOF";
-<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
-<tr><td> $messagetext </td></tr></table>
-EOF
-}
-
+$template->param( errmsgloop => \@errmsgloop );
 
 # patrontable ....
-my $borrowertable;
-my $flaginfotable;
 if ($borrower) {
-    $borrowertable = << "EOF";
-<table border=1 cellpadding=5 cellspacing=0>
-<tr><td colspan=2 bgcolor=$headerbackgroundcolor background=$backgroundimage>
-<font color=black><b>Borrower 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>
-</td></tr>
-EOF
     my $flags = $borrower->{'flags'};
-    my $flaginfotext='';
-    my $displayflag = '';
-    my $color = '';
-    foreach my $flag (sort keys %$flags) {
-       ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-       if ($flags->{$flag}->{'noissues'}) {
-           $displayflag = "<font color=red>$flag</font>";
-       } else {
-           $displayflag = $flag;
-       }
-       if ($flag eq 'CHARGES') {
-           $flaginfotext.= <<"EOF";
-<tr><td valign=top>$displayflag</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>
-EOF
-       } elsif ($flag eq 'WAITING') {
-           my $itemswaiting='';
-           my $items = $flags->{$flag}->{'itemlist'};
-           foreach my $item (@$items) {
-               my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-               $itemswaiting .= <<"EOF";
-<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>
-EOF
+    my @flagloop;
+    my $flagset;
+    foreach my $flag ( sort keys %$flags ) {
+        my %flaginfo;
+        unless ($flagset) { $flagset = 1; }
+        $flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
+        $flaginfo{flag}    = $flag;
+        if ( $flag eq 'CHARGES' ) {
+            $flaginfo{msg}            = $flag;
+            $flaginfo{charges}        = 1;
+            $flaginfo{borrowernumber} = $borrower->{borrowernumber};
+        }
+        elsif ( $flag eq 'WAITING' ) {
+            $flaginfo{msg}     = $flag;
+            $flaginfo{waiting} = 1;
+            my @waitingitemloop;
+            my $items = $flags->{$flag}->{'itemlist'};
+            foreach my $item (@$items) {
+                my $biblio =
+                  GetBiblioFromItemNumber( $item->{'itemnumber'});
+                my %waitingitem;
+                $waitingitem{biblionum} = $biblio->{'biblionumber'};
+                $waitingitem{barcode}   = $biblio->{'barcode'};
+                $waitingitem{title}     = $biblio->{'title'};
+                $waitingitem{brname}    =
+                  $branches->{ $biblio->{'holdingbranch'} }
+                  ->{'branchname'};
+                push( @waitingitemloop, \%waitingitem );
             }
-            $flaginfotext.="<tr><td valign=top>$displayflag</td><td>$itemswaiting</td></tr>\n";
-       } elsif ($flag eq 'ODUES') {
-           my $itemsoverdue = '';
-           my $items = $flags->{$flag}->{'itemlist'};
-            foreach my $item (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$items) {
-               my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-                $itemsoverdue .=  <<"EOF";
-<font color=red>$item->{'date_due'}</font>
-<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
-onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
-$iteminformation->{'title'}
-<br>
-EOF
-           }
-           $flaginfotext .= "<tr><td valign=top>$displayflag</td><td>$itemsoverdue</td></tr>\n";
-        } else {
-           $flaginfotext.= <<"EOF";
-<tr><td valign=top>$displayflag</td>
-<td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
-EOF
-       }
-    }
-    if ($flaginfotext) {
-       $borrowertable .= << "EOF";
-<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2>
-<b>Flags</b></td></tr>
-$flaginfotext 
-EOF
+            $flaginfo{itemloop} = \@waitingitemloop;
+        }
+        elsif ( $flag eq 'ODUES' ) {
+            my $items = $flags->{$flag}->{'itemlist'};
+            my @itemloop;
+            foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
+                @$items )
+            {
+                my $biblio =
+                  GetBiblioFromItemNumber( $item->{'itemnumber'});
+                my %overdueitem;
+                $overdueitem{duedate}   = format_date( $item->{'date_due'} );
+                $overdueitem{biblionum} = $biblio->{'biblionumber'};
+                $overdueitem{barcode}   = $biblio->{'barcode'};
+                $overdueitem{title}     = $biblio->{'title'};
+                $overdueitem{brname}    =
+                  $branches->{ $biblio->{'holdingbranch'} }
+                  ->{'branchname'};
+                push( @itemloop, \%overdueitem );
+            }
+            $flaginfo{itemloop} = \@itemloop;
+            $flaginfo{overdue}  = 1;
+        }
+        else {
+            $flaginfo{other} = 1;
+            $flaginfo{msg}   = $flags->{$flag}->{'message'};
+        }
+        push( @flagloop, \%flaginfo );
     }
-    $borrowertable .= "</table>";
+    $template->param(
+        flagset          => $flagset,
+        flagloop         => \@flagloop,
+        riborrowernumber => $borrower->{'borrowernumber'},
+        riborcnum        => $borrower->{'cardnumber'},
+        riborsurname     => $borrower->{'surname'},
+        ribortitle       => $borrower->{'title'},
+        riborfirstname   => $borrower->{'firstname'}
+    );
 }
 
-# the returned items.....
-my $returneditemstable = << "EOF";
-<table border=1 cellpadding=5 cellspacing=0>
-<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='';
-#set up so only the lat 8 returned items display (make for faster loading pages)
-my $count=0;
-foreach (sort {$a <=> $b} keys %returneditems) {
-    if ($count < 8) {
-       ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-       my $barcode = $returneditems{$_};
-       my $duedate = $riduedate{$_};
-       my $overduetext;
+#set up so only the last 8 returned items display (make for faster loading pages)
+my $count = 0;
+my @riloop;
+foreach ( sort { $a <=> $b } keys %returneditems ) {
+    my %ri;
+    if ( $count < 8 ) {
+        my $barcode = $returneditems{$_};
+        my $duedate = $riduedate{$_};
+        my $overduetext;
         my $borrowerinfo;
-       if ($duedate) {
-           my @tempdate = split ( /-/ , $duedate ) ;
-            my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
-            my @datearr = localtime(time());
-            my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-           $overduetext = "$duedatenz";
-           ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
-           ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
-           my ($borrower) = getpatroninformation(\%env, $riborrowernumber{$_}, 0);
-            $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
-        } else {
-            $overduetext = "Not on Issue.";
-           $borrowerinfo = $riborrowernumber{$_};
-       }
-       my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
-       $returneditemstable .= << "EOF";
-<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>
-$borrowerinfo</td></tr>
-EOF
-    } else {
-       last;
+        if ($duedate) {
+            my @tempdate = split( /-/, $duedate );
+            $ri{year}  = $tempdate[0];
+            $ri{month} = $tempdate[1];
+            $ri{day}   = $tempdate[2];
+            my $duedatenz  = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
+            my @datearr    = localtime( time() );
+            my $todaysdate =
+                $datearr[5] . '-'
+              . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
+              . sprintf( "%0.2d", $datearr[3] );
+                 # FIXME - todaysdate isn't used, and what date _is_ it ?
+            $ri{duedate} = format_date($duedate);
+            my ($borrower) =
+              GetMemberDetails( $riborrowernumber{$_}, 0 );
+            $ri{borrowernumber} = $borrower->{'borrowernumber'};
+            $ri{borcnum}        = $borrower->{'cardnumber'};
+            $ri{borfirstname}   = $borrower->{'firstname'};
+            $ri{borsurname}     = $borrower->{'surname'};
+            $ri{bortitle}       = $borrower->{'title'};
+            $ri{bornote}        = $borrower->{'borrowernotes'};
+        }
+        else {
+            $ri{borrowernumber} = $riborrowernumber{$_};
+        }
+
+        #        my %ri;
+        my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($barcode));
+        # fix up item type for display
+        $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
+        $ri{itembiblionumber} = $biblio->{'biblionumber'};
+        $ri{itemtitle}        = $biblio->{'title'};
+        $ri{itemauthor}       = $biblio->{'author'};
+        $ri{itemtype}         = $biblio->{'itemtype'};
+        $ri{ccode}            = $biblio->{'ccode'};
+        $ri{barcode}          = $barcode;
+    }
+    else {
+        last;
     }
     $count++;
+    push( @riloop, \%ri );
 }
-$returneditemstable .= "</table>\n";
-
+$template->param( riloop => \@riloop );
+
+$template->param(
+    genbrname               => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
+    genprname               => $printers->{$printer}->{'printername'},
+    branchname              => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
+    printer                 => $printer,
+    errmsgloop              => \@errmsgloop,
+    exemptfine              => $exemptfine,
+    dropboxmode              => $dropboxmode,
+    dropboxdate                                => $dropboxdate->output(),
+       overduecharges          => $overduecharges,
+);
 
 # actually print the page!
-print $query->header();
-print startpage();
-print startmenu('circulation');
-
-
-#debug
-#    foreach my $key (keys %$messages) {
-#      print "$key : $messages->{$key}<br>";
-#    }
-
-
-print <<"EOF";
-$links
-$title
-
-
-<table cellpadding=5 cellspacing=0 width=100%>
-EOF
-
-if ($reservefoundtext) {
-    print <<"EOF";
-<tr>
-<td colspan=2>$reservefoundtext</td>
-</tr>
-<tr>
-<td colspan=2>$messagetable</td>
-</tr>
-
-EOF
-} else {
-    print <<"EOF";
-<tr>
-<td valign=top align=left>$barcodeentrytext</td>
-<td valign=top align=left>$messagetable</td>
-</tr>
-EOF
-}
-if ($returned) {
-    print <<"EOF";
-<tr>
-<td valign=top align=left>$itemtable</td>
-<td valign=top align=left>$borrowertable</td>
-<tr>
-EOF
-}
-if (%returneditems) {
-    print "<tr><td colspan=2>$returneditemstable</td></tr>";
-}
-
-print "</table>";
-
-print endmenu('circulation');
-print endpage();
-
-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;
-    } 
-} 
-
+output_html_with_http_headers $query, $cookie, $template->output;