Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[#19339577, #21661027] Preserve dropbox/backdate checkin options afte…

…r xfer
  • Loading branch information...
commit 9757bbcfb55fbf9d14f19dd21341d2c6cf68dc2a 1 parent 36fbd11
@ctfliblime authored
View
7 circ/returns.pl
@@ -211,6 +211,7 @@ =head1 returns.pl
my $exemptfine = $query->param('exemptfine');
my $dropboxmode = $query->param('dropboxmode');
my $dotransfer = $query->param('dotransfer');
+my $canceltransfer = $query->param('cancelTransfer');
my $checkin_override_date = $query->param('checkin_override_date');
my $calendar = C4::Calendar->new( branchcode => $userenv_branch );
#dropbox: get last open day (today - 1)
@@ -219,8 +220,10 @@ =head1 returns.pl
my $dropboxdate = $calendar->addDate($today, -1);
$barcode =~ s/^\s*|\s+//g;
-if ($ENV{HTTP_REFERER} =~ /$ENV{SCRIPT_NAME}/) { # get/post to self
- if ($dropboxmode) { $checkin_override_date = $dropboxdate->output(); }
+if ($ENV{HTTP_REFERER} =~ /$ENV{SCRIPT_NAME}/ && !$dotransfer && !$canceltransfer) {
+ if ($dropboxmode) {
+ $checkin_override_date = $dropboxdate->output();
+ }
$session->param('circ_ci_exemptfine', $exemptfine);
$session->param('circ_ci_dropboxmode',$dropboxmode);
$session->param('circ_ci_backdate', $checkin_override_date);
View
11 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -117,6 +117,9 @@ function HaltReturns() {
<input type=hidden name="lost_item_id" value="<TMPL_VAR NAME="lost_item_id">">
<input type=hidden name="itemnumber" value="<TMPL_VAR NAME="itemnumber">">
<input type=hidden name="borrowernumber" value="<TMPL_VAR NAME="borrowernumber">">
+ <input type="hidden" name="exemptfine" value="<TMPL_VAR NAME="exemptfine">"/>
+ <input type="hidden" name="dropboxmode" value="<TMPL_VAR NAME="dropboxmode">"/>
+ <input type="hidden" name="checkin_override_date" value="<TMPL_VAR NAME="checkin_override_date">"/>
<input type="button" value="Remove from patron's Lost Items" onclick="
if(document.foundf) {
document.foundf.lost_item_id.value = '<TMPL_VAR NAME="lost_item_id">';
@@ -217,6 +220,9 @@ function HaltReturns() {
<input type=hidden name="lostborrowernumber" value="">
<input type=hidden name="unlinkFromAccount" value="0">
<input type=hidden name="itemnumber" value="<TMPL_VAR NAME="itemnumber">">
+ <input type="hidden" name="exemptfine" value="<TMPL_VAR NAME="exemptfine">"/>
+ <input type="hidden" name="dropboxmode" value="<TMPL_VAR NAME="dropboxmode">"/>
+ <input type="hidden" name="checkin_override_date" value="<TMPL_VAR NAME="checkin_override_date">"/>
<TMPL_LOOP NAME="inputloop">
<input type="hidden" name="od-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="overdue" -->" />
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -354,6 +360,7 @@ function HaltReturns() {
<input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
<input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
<input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
+ <input type="hidden" name="checkin_override_date" value="<TMPL_VAR NAME="checkin_override_date">"/>
<input type=hidden name="fromqueue" value="<!-- TMPL_VAR NAME="fromqueue" -->">
<input type=hidden name="queue_branchlimit" value="<!-- TMPL_VAR NAME="queue_branchlimit" -->">
<input type=hidden name="queue_currPage" value="<TMPL_VAR NAME="queue_currPage">">
@@ -486,6 +493,9 @@ function HaltReturns() {
<input type=hidden name="tobranch" value="<TMPL_VAR NAME="homebranch">">
<input type=hidden name="transferitem" value="<TMPL_VAR NAME="itemnumber">">
<input type=hidden name="itemnumber" value="<TMPL_VAR NAME="itemnumber">">
+ <input type="hidden" name="exemptfine" value="<TMPL_VAR NAME="exemptfine">"/>
+ <input type="hidden" name="dropboxmode" value="<TMPL_VAR NAME="dropboxmode">"/>
+ <input type="hidden" name="checkin_override_date" value="<TMPL_VAR NAME="checkin_override_date">"/>
<!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="od-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="overdue" -->" />
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -635,6 +645,7 @@ function HaltReturns() {
<input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
<input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
<input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
+ <input type="hidden" name="checkin_override_date" value="<!-- TMPL_VAR Name="checkin_override_date" -->" />
<input type=hidden name="fromqueue" value="<!-- TMPL_VAR NAME="fromqueue" -->">
<input type=hidden name="queue_branchlimit" value="<!-- TMPL_VAR NAME="queue_branchlimit" -->">
<input type=hidden name="queue_currPage" value="<TMPL_VAR NAME="queue_currPage">">
Please sign in to comment.
Something went wrong with that request. Please try again.