From b9f814e57ff86065760ebbdab2d950bed8de1a53 Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Fri, 18 Jul 2008 12:54:03 -0500 Subject: [PATCH] fix for bug 2371: Change fine block message behavior... This adds a variable to the checkout form, debt_confirmed, that is 1 when the de bt block message has been canceled for this session. Signed-off-by: Joshua Ferraro --- circ/circulation.pl | 8 ++++++-- .../prog/en/modules/circ/circulation.tmpl | 12 +++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 3f35aa6b2b..7cfa0c473f 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -92,6 +92,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( flagsrequired => { circulate => 1 }, } ); + my $branches = GetBranches(); my $printers = GetPrinters(); @@ -130,6 +131,7 @@ my $cancelreserve = $query->param('cancelreserve'); my $organisation = $query->param('organisations'); my $print = $query->param('print'); my $newexpiry = $query->param('dateexpiry'); +my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice #set up cookie..... # my $branchcookie; @@ -261,6 +263,8 @@ if ($barcode) { my ( $error, $question ) = CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess ); my $noerror = $invalidduedate ? 0 : 1; + + delete $question->{'DEBT'} if ($debt_confirmed); foreach my $impossible ( keys %$error ) { $template->param( $impossible => $$error{$impossible}, @@ -452,7 +456,6 @@ if ($borrower) { # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY $issued_itemtypes_count->{ $it->{'itemtype'} }++; - warn "$todaysdate, $it->{'issuedate'}, $it->{'lastreneweddate'}, $it->{'barcode'}"; if ( $todaysdate eq $it->{'issuedate'} or $todaysdate eq $it->{'lastreneweddate'} ) { push @todaysissues, $it; } else { @@ -713,9 +716,10 @@ $template->param( picture => 1 ) if $picture; $template->param( + debt_confirmed => $debt_confirmed, SpecifyDueDate => C4::Context->preference("SpecifyDueDate"), CircAutocompl => C4::Context->preference("CircAutocompl"), - dateformat => C4::Context->preference("dateformat"), + dateformat => C4::Context->preference("dateformat"), DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index cc32439cc3..1229390a0e 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -112,7 +112,8 @@ $.tablesorter.addParser({ " /> " /> - " /> + + " /> " /> " /> " /> @@ -171,10 +172,10 @@ $.tablesorter.addParser({
  • Patron's card is expired
  • - - -
  • This item belongs to and cannot be issued from this location.
  • - + + +
  • This item belongs to and cannot be issued from this location.
  • + @@ -273,6 +274,7 @@ No patron matched " /> " /> + " /> " /> -- 2.39.5