From a9855cb088807d8440818cba9b31021dd3ecddfe Mon Sep 17 00:00:00 2001 From: Eivin Giske Skaaren Date: Mon, 25 May 2015 17:10:54 +0000 Subject: [PATCH] Bug 10067 - decreaseLoanHighHolds messes with specify due date To test: 1. On a branch up to date with master: apply the patch. 2. Try to check out items both with and without holds. (The decreaseLoanHighHolds function should be configured and kick in when testing an item. 3. Expected results are: The due date date field should be cleared after checkout if "Remember for session" is not selected. If it is selected then the chosen date should stay in the field even if the warning about reduced loan time for an item with too many holds is displayed. Also the correct due dates are shown in the table after a checkout. Known limitation: Does not work too well when jumping between different parts of the system as it relies on the values sent to the circulation.pl script. Sponsored-by: Halland County Library Refactored to both fix specific issue where date is changed and still have the old behaviour with date kept intact. --- circ/circulation.pl | 89 +++++++++++--------- .../prog/en/modules/circ/circulation.tt | 18 ++-- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 1071f4f..842ef8f 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -55,7 +55,6 @@ use Date::Calc qw( ); use List::MoreUtils qw/uniq/; - # # PARAMETERS READING # @@ -122,7 +121,6 @@ my $borrowernumber = $query->param('borrowernumber'); $branch = C4::Context->userenv->{'branch'}; $printer = C4::Context->userenv->{'branchprinter'}; - # If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian if (C4::Context->preference("AutoLocation") != 1) { $template->param(ManualLocation => 1); @@ -136,13 +134,14 @@ my $barcode = $query->param('barcode') || q{}; $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace $barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter')); -my $stickyduedate = $query->param('stickyduedate') || $session->param('stickyduedate'); -my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate'); -my $issueconfirmed = $query->param('issueconfirmed'); -my $cancelreserve = $query->param('cancelreserve'); -my $print = $query->param('print') || q{}; -my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice -my $charges = $query->param('charges') || q{}; +my $stickyduedate = $query->param('stickyduedate') || $session->param('stickyduedate'); +my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate'); +my $restoreduedatespec = $query->param('restoreduedatespec') || $session->param('stickyduedate'); +my $issueconfirmed = $query->param('issueconfirmed'); +my $cancelreserve = $query->param('cancelreserve'); +my $print = $query->param('print') || q{}; +my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice +my $charges = $query->param('charges') || q{}; # Check if stickyduedate is turned off if ( $barcode ) { @@ -541,38 +540,48 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree $template->param(%$borrower); +# Restore date if changed by holds +if ($restoreduedatespec) { + $duedatespec = $restoreduedatespec; + + if ($stickyduedate eq 'on') { + $session->param( 'stickyduedate', $duedatespec ); + } +} + $template->param( - lib_messages_loop => $lib_messages_loop, - bor_messages_loop => $bor_messages_loop, - all_messages_del => C4::Context->preference('AllowAllMessageDeletion'), - findborrower => $findborrower, - borrower => $borrower, - borrowernumber => $borrowernumber, - branch => $branch, - branchname => GetBranchName($borrower->{'branchcode'}), - printer => $printer, - printername => $printer, - was_renewed => $query->param('was_renewed') ? 1 : 0, - expiry => format_date($borrower->{'dateexpiry'}), - roadtype => $roadtype, - amountold => $amountold, - barcode => $barcode, - stickyduedate => $stickyduedate, - duedatespec => $duedatespec, - message => $message, - totaldue => sprintf('%.2f', $total), - inprocess => $inprocess, - is_child => ($borrowernumber && $borrower->{'category_type'} eq 'C'), - circview => 1, - soundon => C4::Context->preference("SoundOn"), - fast_cataloging => $fast_cataloging, - CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"), - activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), - SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'), - AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), - RoutingSerials => C4::Context->preference('RoutingSerials'), - relatives_issues_count => $relatives_issues_count, - relatives_borrowernumbers => \@relatives, + lib_messages_loop => $lib_messages_loop, + bor_messages_loop => $bor_messages_loop, + all_messages_del => C4::Context->preference('AllowAllMessageDeletion'), + findborrower => $findborrower, + borrower => $borrower, + borrowernumber => $borrowernumber, + branch => $branch, + branchname => GetBranchName($borrower->{'branchcode'}), + printer => $printer, + printername => $printer, + was_renewed => $query->param('was_renewed') ? 1 : 0, + expiry => format_date($borrower->{'dateexpiry'}), + roadtype => $roadtype, + amountold => $amountold, + barcode => $barcode, + stickyduedate => $stickyduedate, + duedatespec => $duedatespec, + restoreduedatespec => $restoreduedatespec, + message => $message, + totaldue => sprintf('%.2f', $total), + inprocess => $inprocess, + is_child => ($borrowernumber && $borrower->{'category_type'} eq 'C'), + circview => 1, + soundon => C4::Context->preference("SoundOn"), + fast_cataloging => $fast_cataloging, + CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"), + activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), + SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'), + AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), + RoutingSerials => C4::Context->preference('RoutingSerials'), + relatives_issues_count => $relatives_issues_count, + relatives_borrowernumbers => \@relatives, ); # save stickyduedate to session diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 0521d9c..566348d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -310,13 +310,15 @@ $(document).ready(function() { [% IF HIGHHOLDS %] [% END %] [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
+ [% IF (forceallow) %][% END %] @@ -361,6 +363,7 @@ $(document).ready(function() { [% IF ( RESERVED ) %] + @@ -370,6 +373,7 @@ $(document).ready(function() { [% IF ( RESERVE_WAITING ) %] + @@ -379,8 +383,10 @@ $(document).ready(function() { [% IF (forceallow) %][% END %] + + [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %] [% IF ( RENEW_ISSUE ) %] @@ -429,6 +435,7 @@ $(document).ready(function() {
[% IF (forceallow) %][% END %] + @@ -536,11 +543,11 @@ No patron matched [% message %] [% END %] - [% IF ( borrowers ) %] [% INCLUDE 'patron-toolbar.inc' %] +
Patron selection @@ -591,8 +598,8 @@ No patron matched [% message %] [% END %] - + [% IF ( issue ) %]
[% ELSE %] @@ -776,8 +783,6 @@ No patron matched [% message %] [% END %] - - @@ -836,7 +841,6 @@ No patron matched [% message %] [% END %] - @@ -950,8 +954,6 @@ No patron matched [% message %] [% END %] - - [% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]
-- 1.7.10.4