merging katipo changes...
[koha.git] / circ / circulation.pl
index 8ec321f..4647b2c 100755 (executable)
 #!/usr/bin/perl
 
-use CGI qw/:standard/;
+# 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
+
+# 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::Members;
 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;
+use Date::Manip;
+use C4::Biblio;
+use C4::Reserves2;
+use C4::Circulation::Date;
+
+#
+# PARAMETERS READING
+#
+my $query = new CGI;
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => 'circ/circulation.tmpl',
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { circulate => 1 },
+    }
+);
+my $branches = getbranches();
+# my $printers = getprinters();
+# my $printer = getprinter($query, $printers);
+
+my $findborrower = $query->param('findborrower');
+$findborrower =~ s|,| |g;
+$findborrower =~ s|'| |g;
+my $borrowernumber = $query->param('borrnumber');
+# new op dev the branch and the printer are now defined by the userenv
+my $branch = C4::Context->userenv->{'branch'};
+my $printer=C4::Context->userenv->{'branchprinter'};
 
+my $barcode = $query->param('barcode') || '';
+my $year=$query->param('year');
+my $month=$query->param('month');
+my $day=$query->param('day');
+my $stickyduedate=$query->param('stickyduedate');
+my $issueconfirmed = $query->param('issueconfirmed');
+my $cancelreserve  = $query->param('cancelreserve');
+my $organisation   = $query->param('organisations');
+my $print = $query->param('print');
 
-my %env;
-my $headerbackgroundcolor='#99cc33';
-my $circbackgroundcolor='#ffffcc';
-my $circbackgroundcolor='white';
-my $linecolor1='#bbbbbb';
-my $linecolor2='#dddddd';
-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='';
+#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');
+# }
+
+my %env; # FIXME env is used as an "environment" variable. Could be dropped probably...
+#
+my $print; 
+$env{'branchcode'}= $branch;
+$env{'printer'}= $printer;
+# $env{'queue'}=$printer;
+
+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] ) );
+
+# check and see if we should print
+if ( $barcode eq '' && $print eq 'maybe' ) {
+    $print = 'yes';
 }
-$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";
+
+my $inprocess = $query->param('inprocess');
+if ($barcode eq ''){
+        $inprocess='';
 }
-foreach (keys %$printers) {
-    (next) unless ($_);
-    $printercount++;
-    my $selected='';
-    ($selected='selected') if ($_ eq $oldprinter);
-    $printeroptions.="<option value=$_ $selected>$printers->{$_}->{'printername'}\n";
+else {
 }
-if ($printercount==1) {
-    ($printer)=keys %$printers;
+
+if ($barcode eq '' && $query->param('charges') eq 'yes'){
+        $template->param( PAYCHARGES=>'yes',
+        bornum=>$borrowernumber);
+   }
+
+if ( $print eq 'yes' && $borrowernumber ne '' ) {
+    printslip( \%env, $borrowernumber );
+    $query->param( 'borrnumber', '' );
+    $borrowernumber = '';
 }
-if ($branchcount==1) {
-    ($branch)=keys %$branches;
+
+#
+# STEP 2 : FIND BORROWER
+# if there is a list of find borrowers....
+#
+my $borrowerslist;
+my $message;
+if ($findborrower) {
+    my ( $count, $borrowers ) =
+      BornameSearch( \%env, $findborrower, 'cardnumber', 'web' );
+    my @borrowers = @$borrowers;
+    if ( $#borrowers == -1 ) {
+        $query->param( 'findborrower', '' );
+        $message = "'$findborrower'";
+    }
+    elsif ( $#borrowers == 0 ) {
+        $query->param( 'borrnumber', $borrowers[0]->{'borrowernumber'} );
+        $query->param( 'barcode',    '' );
+        $borrowernumber = $borrowers[0]->{'borrowernumber'};
+    }
+    else {
+        $borrowerslist = \@borrowers;
+    }
 }
 
+# get the borrower information.....
+my $borrower;
+my $picture;
+my @lines;
+if ($borrowernumber) {
+    $borrower = getpatroninformation( \%env, $borrowernumber, 0 );
+    my ( $od, $issue, $fines ) = borrdata2( \%env, $borrowernumber );
+    my $warningdate =
+      DateCalc( $borrower->{'expiry'},
+        "- " . C4::Context->preference('NotifyBorrowerDeparture') . "  days" );
+    my $warning = Date_Cmp( ParseDate("today"), $warningdate );
+    if ( $warning > 0 ) {
 
-my $branchname='';
-my $printername='';
-if ($branch && $printer) {
-    $branchname=$branches->{$branch}->{'branchname'};
-    $printername=$printers->{$printer}->{'printername'};
+        #borrowercard expired
+        $template->param( warndeparture => $warning );
+    }
+    my ($reserved_num,$reserved_waiting) = CheckWaiting($borrowernumber);
+    if ($reserved_num > 0) {
+           for (my $i = 0; $i < $reserved_num; $i++) {
+                     my ($count,$line) = getbiblio($reserved_waiting->[$i]->{'biblionumber'});
+                     push(@lines, $line);
+           }
+          # warn Dumper(@lines);
+    }
+    
+    $template->param(
+        overduecount => $od,
+        issuecount   => $issue,
+        finetotal    => $fines,
+       returned_reserve => \@lines,
+    );
+    my $htdocs = C4::Context->config('intrahtdocs');
+    $picture = "/borrowerimages/" . $borrowernumber . ".jpg";
+    if ( -e $htdocs . "$picture" ) {
+        $template->param( picture => $picture );
+    }
 }
 
+#
+# STEP 3 : ISSUING
+#
+#
 
-my $branchcookie=$query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
-my $printercookie=$query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
+if ($barcode) {
+    $barcode = cuecatbarcodedecode($barcode);
+    my ( $datedue, $invalidduedate ) = fixdate( $year, $month, $day );
+    if ($issueconfirmed) {
+        issuebook( \%env, $borrower, $barcode, $datedue, $cancelreserve );
+       $inprocess=1;
+    }
+    else {
+        my ( $error, $question ) =
+          canbookbeissued( \%env, $borrower, $barcode, $year, $month, $day, $inprocess );
+        my $noerror    = 1;
+        my $noquestion = 1;
+        foreach my $impossible ( keys %$error ) {
+            $template->param(
+                $impossible => $$error{$impossible},
+                IMPOSSIBLE  => 1
+            );
+            $noerror = 0;
+        }
+        foreach my $needsconfirmation ( keys %$question ) {
+            $template->param(
+                $needsconfirmation => $$question{$needsconfirmation},
+                NEEDSCONFIRMATION  => 1
+            );
+            $noquestion = 0;
+        }
+        $template->param(
+            day   => $day,
+            month => $month,
+            year  => $year
+        );
+        if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
+            issuebook( \%env, $borrower, $barcode, $datedue );
+           $inprocess=1;
+        }
+    }
+}
 
-print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie]);
-#print $query->dump;
-print startpage();
-print startmenu('circulation');
+# reload the borrower info for the sake of reseting the flags.....
+if ($borrowernumber) {
+    $borrower = getpatroninformation( \%env, $borrowernumber, 0 );
+}
 
+##################################################################################
+# BUILD HTML
+# show all reserves of this borrower, and the position of the reservation ....
+if ($borrowernumber) {
+# new op dev
+# now we show the status of the borrower's reservations
+       my @borrowerreserv = FastFindReserves(0,$borrowernumber);
+       my @reservloop;
+       foreach my $num_res (@borrowerreserv) {
+               my %getreserv;
+               my %env;
+               my $getiteminfo = getiteminformation(\%env,$num_res->{'itemnumber'});
+               my $itemtypeinfo = getitemtypeinfo($getiteminfo->{'itemtype'});
+               my ($transfertwhen,$transfertfrom,$transfertto) = checktransferts($num_res->{'itemnumber'});
 
-print << "EOF";
-<center>
-<p>
-<table border=0 width=100% cellspacing=0 bgcolor=$headerbackgroundcolor background=$backgroundimage>
-<tr>
-<th width=5%></th>
-<th width=30%><font color=black>$branchname</font></th>
-<th width=10%>
-       <a href=circulation.pl?module=issues&branch=$branch&printer=$printer><font color=black><img src=/images/issues.gif border=0 height=40></font></a>
-</th>
-<th width=10%>
-    <a href=circulation.pl?selectnewbranchprinter=1><font color=black>Branch/Printer</font></a>
-</th>
-<th width=10%>
-    <a href=circulation.pl?module=returns&branch=$branch&printer=$printer><font color=black><img src=/images/returns.gif border=0 height=40></font></a>
-</th>
-<th width=30%><font color=black>$printername</font></th>
-<th width=5%></th>
-</tr>
-</table>
+               $getreserv{waiting} = 0;
+               $getreserv{transfered} = 0;
+               $getreserv{nottransfered} = 0;
 
+               $getreserv{reservedate} = format_date($num_res->{'reservedate'});
+               $getreserv{biblionumber} = $getiteminfo->{'biblionumber'};
+               $getreserv{title} = $getiteminfo->{'title'};
+               $getreserv{itemtype} = $itemtypeinfo->{'description'};
+               $getreserv{author} = $getiteminfo->{'author'};
+               $getreserv{barcodereserv} = $getiteminfo->{'barcode'};
+               $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
+#              check if we have a waitin status for reservations
+               if ($num_res->{'found'} eq 'W'){
+                       $getreserv{color} = 'reserved';
+                       $getreserv{waiting} = 1; 
+               }
 
-<br>
-EOF
+#              check transfers with the itemnumber foud in th reservation loop
+               if ($transfertwhen){
+               $getreserv{color} = 'transfered';
+               $getreserv{transfered} = 1;
+               $getreserv{datesent} = format_date($transfertwhen);
+               $getreserv{frombranch} = getbranchname($transfertfrom);
+               }
 
+               if (($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'}) and not $transfertwhen){
+               $getreserv{nottransfered} = 1;
+               $getreserv{nottransferedby} = getbranchname($getiteminfo->{'holdingbranch'});
+               }
 
-if ($printer && $branch) {
+#              if we don't have a reserv on item, we put the biblio infos and the waiting position     
+               if ($getiteminfo->{'title'} eq '' ){
+                       my $getbibinfo = bibitemdata($num_res->{'biblionumber'});
+                       my $getbibtype = getitemtypeinfo($getbibinfo->{'itemtype'});
+                       $getreserv{color} = 'inwait';
+                       $getreserv{title} = $getbibinfo->{'title'};
+                       $getreserv{waitingposition} = $num_res->{'priority'};
+                       $getreserv{nottransfered} = 0;
+                       $getreserv{itemtype} = $getbibtype->{'description'};
+                       $getreserv{author} = $getbibinfo->{'author'};
+                       $getreserv{itemcallnumber} = '----------';
+                       
+               }
 
-    SWITCH: {
-       if ($query->param('module') eq 'issues') { issues(); last SWITCH; }
-       if ($query->param('module') eq 'returns') { returns(); last SWITCH; }
-       issues();
-    }
-} 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
-    }
+               push(@reservloop, \%getreserv);
+       }
+       # return result to the template
+       $template->param(reservloop => \@reservloop);
 
-    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
-    }
-    print << "EOF";
-    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
 }
 
 
-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;
+if ($borrower) {
 
+# get each issue of the borrower & separate them in todayissues & previous issues
+    my @todaysissues;
+    my @previousissues;
+    my $issueslist = getissues($borrower);
 
-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");
-       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";
+    # split in 2 arrays for today & previous
+    my $dbh = C4::Context->dbh;
+    foreach my $it ( keys %$issueslist ) {
+        my $issuedate = $issueslist->{$it}->{'timestamp'};
+        $issuedate =~ s/-//g;
+        $issuedate = substr( $issuedate, 0, 8 );
+        if ( $todaysdate == $issuedate ) {
+               ($issueslist->{$it}->{'charge'}, $issueslist->{$it}->{'itemtype_charge'})=calc_charges($dbh,$issueslist->{$it}->{'itemnumber'},$borrower->{'borrowernumber'});
+               $issueslist->{$it}->{'charge'} = sprintf("%.2f",$issueslist->{$it}->{'charge'});
+               ($issueslist->{$it}->{'can_renew'}, $issueslist->{$it}->{'can_renew_error'}) =renewstatus(\%env,$borrower->{'borrowernumber'}, $issueslist->{$it}->{'itemnumber'});
+               my ($restype,$reserves)=CheckReserves($issueslist->{$it}->{'itemnumber'});
+               if ($restype){
+                   $issueslist->{$it}->{'can_renew'}=0;
+               }
+               push @todaysissues, $issueslist->{$it};
+        }
+        else {
+                ($issueslist->{$it}->{'charge'}, $issueslist->{$it}->{'itemtype_charge'})=calc_charges($dbh,$issueslist->{$it}->{'itemnumber'},$borrower->{'borrowernumber'});
+               $issueslist->{$it}->{'charge'} = sprintf("%.2f",$issueslist->{$it}->{'charge'});
+               ($issueslist->{$it}->{'can_renew'}, $issueslist->{$it}->{'can_renew_error'}) =renewstatus(\%env,$borrower->{'borrowernumber'}, $issueslist->{$it}->{'itemnumber'});
+               my ($restype,$reserves)=CheckReserves($issueslist->{$it}->{'itemnumber'});
+               if ($restype){
+                   $issueslist->{$it}->{'can_renew'}=0;
+               }
+               push @previousissues, $issueslist->{$it};
+        }
     }
-    if (my $barcode=$query->param('barcode')) {
-       $ritext.="<input type=hidden name=ri-0 value=$barcode>\n";
-       $returneditems{0}=$barcode;
+    my $od;    # overdues
+    my $i = 0;
+    my $togglecolor;
+
+    # parses today & build Template array
+    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 ) {
+            $od = 1;
+        }
+        else {
+            $od = 0;
+        }
+        if ( $i % 2 ) {
+            $togglecolor = 0;
+        }
+        else {
+            $togglecolor = 1;
+        }
+        $book->{'togglecolor'} = $togglecolor;
+        $book->{'od'}          = $od;
+        $book->{'dd'}          = $dd;
+        if ( $book->{'author'} eq '' ) {
+            $book->{'author'} = ' ';
+        }
+        push @realtodayissues, $book;
+        $i++;
     }
-       
-    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)) {
-       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
-           }
-       }
-       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>Class</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=/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->{'dewey'} $iteminformation->{'subclass'}</td><td bgcolor=$color><img src=/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;
+
+    # parses previous & build Template array
+    $i = 0;
+    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 = '';
+        my $od     = '';
+        $datedue =~ s/-//g;
+        if ( $datedue < $todaysdate ) {
+            $od = 1;
+        }
+        else {
+            $od = 0;
+        }
+        if ( $i % 2 ) {
+            $togglecolor = 0;
+        }
+        else {
+            $togglecolor = 1;
+        }
+        $book->{'togglecolor'} = $togglecolor;
+        $book->{'dd'}          = $dd;
+        $book->{'od'}          = $od;
+        if ( $book->{'author'} eq '' ) {
+            $book->{'author'} = ' ';
+        }
+        push @realprevissues, $book;
+        $i++;
     }
-    print "</form>\n";
-    print "</td></tr></table>\n";
 }
 
-sub issues {
-    my ($noheader) = shift;
-    my $print=$query->param('print');
-    my $borrowernumber=$query->param('borrnumber');    
-    if ($print eq 'yes'){
-      my ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
-      $env{'todaysissues'}=1;
-      my ($borrowerissues) = currentissues(\%env, $borrower);
-      my $i=0;
-      my @issues;
-      foreach (sort keys %$borrowerissues) {
-        $issues[$i]=$borrowerissues->{$_};
-       #print $issues[$i]->{'date_due'};
-       $i++;
-
-       #print $i;
-      }
-#      print $i;
-      remoteprint(\%env,\@issues,$borrower);
-      $query->param('borrnumber','')
-
-    }
-    unless ($noheader) {
-       print << "EOF";
-    <table border=0 cellpadding=10 cellspacing=0><tr><th background=$backgroundimage><font color=black>Circulation - Issues  
-    </td></tr><tr><td bgcolor=$circbackgroundcolor align=center>
-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'} - $_->{'categorycode'}) ...  $_->{'streetaddress'} ";
     }
-    if (my $borrnumber=$query->param('borrnumber')) {
-       my ($borrower, $flags) = getpatroninformation(\%env,$borrnumber,0);
-#      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')) {
-           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";
-       }
+    $CGIselectborrower = CGI::scrolling_list(
+        -name     => 'borrnumber',
+        -values   => \@values,
+        -labels   => \%labels,
+        -size     => 7,
+        -multiple => 0
+    );
+}
 
-       my $selected='';
-       ($query->param('stickyduedate')) && ($selected='checked');
-       my ($borrower, $flags) = getpatroninformation(\%env,$borrnumber,0);
-       my ($patrontable, $flaginfotable) = patrontable($borrower);
-       print << "EOF";
-       <form method=get>
-    <table border=0 cellpadding=5>
-    <tr>
-       <td align=center valign=top>
-           <table border=0 cellspacing=0 cellpadding=5 bgcolor=#dddddd width=100%>
-               <tr><th align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></th></tr>
-               <tr><td align=center>
-               <table border=0 bgcolor=#dddddd>
-               <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>
-               <br>
-               <input type=checkbox name=stickyduedate $selected> Sticky Due Date
-               </td></tr>
-               </table>
-               </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>
-       <td align=center valign=top>
-       $patrontable
-       <br>
-       <a href=/cgi-bin/koha/circ/circulation.pl?borrnumber=$borrowernumber&module=issues&branch=$branch&printer=$printer&print=yes>Next borrower</a>
-       <br>
-       $flaginfotable
-       </td>
-    </tr>
-    <tr>
-       <td colspan=2 align=center>
-       <table border=0 cellpadding=5 cellspacing=0 width=100% bgcolor=#dddddd>
-           <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% bgcolor=#dddddd>
-           <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
-    } 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'});
-               issues(1);
-               return;
-           } 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 "<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";
-           }
-       } 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>
-</form>
-</td></tr></table>
-EOF
-       }
+#title
+
+my ( $patrontable, $flaginfotable ) = patrontable($borrower);
+my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
+my @temp = split( /\$/, $amountold );
+
+my $CGIorganisations;
+my $member_of_institution;
+if ( C4::Context->preference("memberofinstitution") ) {
+    my $organisations = get_institutions();
+    my @orgs;
+    my %org_labels;
+    foreach my $organisation ( keys %$organisations ) {
+        push @orgs, $organisation;
+        $org_labels{$organisation} =
+          $organisations->{$organisation}->{'surname'};
     }
+    $member_of_institution = 1;
+    $CGIorganisations = CGI::popup_menu(
+        -id       => 'organisations',
+        -name     => 'organisations',
+        -labels   => \%org_labels,
+        -values   => \@orgs,
+
+    );
+}
+
+$amountold = $temp[1];
+$template->param(
+    findborrower      => $findborrower,
+    borrower          => $borrower,
+    borrowernumber    => $borrowernumber,
+    branch            => $branch,
+    printer           => $printer,
+    printername       => $printer,
+    firstname         => $borrower->{'firstname'},
+    surname           => $borrower->{'surname'},
+    categorycode      => $borrower->{'categorycode'},
+    streetaddress     => $borrower->{'streetaddress'},
+    emailaddress      => $borrower->{'emailaddress'},
+    borrowernotes     => $borrower->{'borrowernotes'},
+    city              => $borrower->{'city'},
+    phone             => $borrower->{'phone'},
+    cardnumber        => $borrower->{'cardnumber'},
+    amountold         => $amountold,
+    barcode           => $barcode,
+    stickyduedate     => $stickyduedate,
+    message           => $message,
+    CGIselectborrower => $CGIselectborrower,
+    todayissues       => \@realtodayissues,
+    previssues        => \@realprevissues,
+    inprocess         => $inprocess,
+    memberofinstution => $member_of_institution,                                                                 
+    CGIorganisations => $CGIorganisations, 
+);
+
+# set return date if stickyduedate
+if ($stickyduedate) {
+    my $t_year  = "year" . $year;
+    my $t_month = "month" . $month;
+    my $t_day   = "day" . $day;
+    $template->param(
+        $t_year  => 1,
+        $t_month => 1,
+        $t_day   => 1,
+    );
 }
 
 
+# if ($branchcookie) {
+#     $cookie=[$cookie, $branchcookie, $printercookie];
+# }
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
+####################################################################
+# Extra subroutines,,,
+
 sub patrontable {
-    my ($borrower) = @_;
-    my $flags=$borrower->{'flags'};
-    my $flagtext='';
-    my $flaginfotable='';
-    my $flaginfotext='';
+    my ($borrower)    = @_;
+    my $flags         = $borrower->{'flags'};
+    my $flaginfotable = '';
+    my $flaginfotext;
+
+    #my $flaginfotext='';
     my $flag;
-    foreach $flag (sort keys %$flags) {
-       ($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 bgcolor=$color 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 bgcolor=$color valign=top><font color=red>$flag</font></td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n";
-           }
-       } else {
-           if ($flag eq 'CHARGES') {
-               $flaginfotext.="<tr><td valign=top bgcolor=$color>$flag</td><td bgcolor=$color>$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";
-               }
-               $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}<br>$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 bgcolor=$color><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 bgcolor=$color>$iteminformation->{'title'}</td></tr>\n";
-                   }
-               }
-               $itemswaiting.="</table>\n";
-               if ($query->param('module') ne 'returns'){
-                 $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}<br>Overdue items can be seen in the Previous Issues table below</td></tr>\n";
-               } else {
-                 $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n";
-               }
-           } else {
-               $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n";
+    my $color = '';
+    foreach $flag ( sort keys %$flags ) {
+
+        #      my @itemswaiting='';
+        $flags->{$flag}->{'message'} =~ s/\n/<br>/g;
+        if ( $flags->{$flag}->{'noissues'} ) {
+            $template->param(
+                flagged  => 1,
+                noissues => 'true',
+            );
+            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'}
+                );
+            }
+           if ($flag eq 'CREDITS') {
+               $template->param(
+                   credits => 'true',
+                   creditsmsg => $flags->{'CREDITS'}->{'message'}
+               );
            }
-       }
+        }
+        else {
+            if ( $flag eq 'CHARGES' ) {
+                $template->param(
+                    charges    => 'true',
+                    flagged    => 1,
+                    chargesmsg => $flags->{'CHARGES'}->{'message'}
+                );
+            }
+            if ($flag eq 'CREDITS') {
+               $template->param(
+                   credits => 'true',
+                   creditsmsg => $flags->{'CREDITS'}->{'message'}
+                );
+            }
+
+# FIXME this part can be removed if we keep new display of reserves "reservloop"
+#             if ( $flag eq 'WAITING' ) {
+#                 my $items = $flags->{$flag}->{'itemlist'};
+#                 my @itemswaiting;
+#                 foreach my $item (@$items) {
+#                     my ($iteminformation) =
+#                       getiteminformation( \%env, $item->{'itemnumber'}, 0 );
+#                     $iteminformation->{'branchname'} =
+#                       $branches->{ $iteminformation->{'holdingbranch'} }
+#                       ->{'branchname'};
+#                     push @itemswaiting, $iteminformation;
+#                 }
+#                 $template->param(
+#                     flagged      => 1,
+#                     waiting      => 'true',
+#                     waitingmsg   => $flags->{'WAITING'}->{'message'},
+#                     itemswaiting => \@itemswaiting,
+#                 );
+#             }
+            if ( $flag eq 'ODUES' ) {
+                $template->param(
+                    odues    => 'true',
+                    flagged  => 1,
+                    oduesmsg => $flags->{'ODUES'}->{'message'}
+                );
+
+                my $items = $flags->{$flag}->{'itemlist'};
+                {
+                    my @itemswaiting;
+                    foreach my $item (@$items) {
+                        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',
+                    flagged  => 1,
+                    notesmsg => $flags->{'NOTES'}->{'message'}
+                );
+            }
+        }
+    }
+    return ( $patrontable, $flaginfotext );
+}
+
+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;
     }
-    ($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");
-    my $patrontable= << "EOF";
-    <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-    <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Patron Information</b></font></td></tr>
-    <tr><td>
-    <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'}<br>
-       $borrower->{'categorycode'} ";
-     }
-    $patrontable.=<< "EOF";
-    $flagtext
-    </td></tr>
-    </table>
-EOF
-    return($patrontable, $flaginfotext);
 }
+
+# Local Variables:
+# tab-width: 8
+# End: