From 20f1c9719a3609b0f73d341030a18811858715e8 Mon Sep 17 00:00:00 2001
From: Eivin Giske Skaaren <eskaaren@yahoo.no>
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
---
 circ/circulation.pl                                      |   13 +++++++++++--
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt    |   14 ++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index ab6db3b..2d0b967 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);
@@ -138,6 +136,7 @@ $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 $restoreduedatespec = $query->param('restoreduedatespec') || $session->param('stickyduedate');
 my $issueconfirmed = $query->param('issueconfirmed');
 my $cancelreserve  = $query->param('cancelreserve');
 my $print          = $query->param('print') || q{};
@@ -534,6 +533,15 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree
 
 $template->param(%$borrower);
 
+unless ($stickyduedate eq 'on') {
+    $duedatespec = '';
+} else {
+    if ($restoreduedatespec) {
+        $duedatespec = $restoreduedatespec;
+    }
+    $session->param( 'stickyduedate', $duedatespec );
+}
+
 $template->param(
     lib_messages_loop => $lib_messages_loop,
     bor_messages_loop => $bor_messages_loop,
@@ -552,6 +560,7 @@ $template->param(
     barcode           => $barcode,
     stickyduedate     => $stickyduedate,
     duedatespec       => $duedatespec,
+    restoreduedatespec => $restoreduedatespec,
     message           => $message,
     totaldue          => sprintf('%.2f', $total),
     inprocess         => $inprocess,
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 35447b7..14823ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -300,13 +300,14 @@ $(document).ready(function() {
 [% IF HIGHHOLDS %]
 	<script language="JavaScript" type="text/javascript">
 	$(document).ready(function() {
-		$("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
+            $("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
 	});
 	</script>
 [% END %]
 
 [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
+    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
 
 [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
 
@@ -353,6 +354,7 @@ $(document).ready(function() {
     [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
     <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
     <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
+    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
     <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
     [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
         [% IF ( RENEW_ISSUE ) %]
@@ -403,6 +405,7 @@ $(document).ready(function() {
                     [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
                         <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
                         <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
+                        <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
                         <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
                         <input type="hidden" name="branch" value="[% branch %]" />
                         <input type="hidden" name="barcode" value="[% book.barcode %]" />
@@ -508,11 +511,11 @@ No patron matched <span class="ex">[% message %]</span>
 </h4>
 [% END %]
 
-
 [% IF ( borrowers ) %]
 [% INCLUDE 'patron-toolbar.inc' %]
 
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
+    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
 <fieldset id="circ_circulation_selectborrower" class="brief">
     <legend>Patron selection</legend>
 
@@ -563,8 +566,8 @@ No patron matched <span class="ex">[% message %]</span>
 
 [% END %]
 
-
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
+    <input type="hidden" name="restoreduedatespec" value="[% duedatespec %]" />
 [% IF ( issue ) %]
     <fieldset id="circ_circulation_issue" class="lastchecked">
 [% ELSE %]
@@ -748,8 +751,6 @@ No patron matched <span class="ex">[% message %]</span>
             </li>
 			[% END %]
 
-
-
 			</ul>
         </div>
 
@@ -808,7 +809,6 @@ No patron matched <span class="ex">[% message %]</span>
      <!-- /If flagged -->[% END %]
 
 	
-
 </div>
 </div>
 
@@ -922,8 +922,6 @@ No patron matched <span class="ex">[% message %]</span>
 </div></div>
 [% END %]
 
-
-
 </div>
 </div>
 [% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
-- 
1.7.10.4