View | Details | Raw Unified | Return to bug 10067
Collapse All | Expand All

(-)a/circ/circulation.pl (-8 / +16 lines)
Lines 55-61 use Date::Calc qw( Link Here
55
);
55
);
56
use List::MoreUtils qw/uniq/;
56
use List::MoreUtils qw/uniq/;
57
57
58
59
#
58
#
60
# PARAMETERS READING
59
# PARAMETERS READING
61
#
60
#
Lines 156-162 $findborrower =~ s|,| |g; Link Here
156
$branch  = C4::Context->userenv->{'branch'};  
155
$branch  = C4::Context->userenv->{'branch'};  
157
$printer = C4::Context->userenv->{'branchprinter'};
156
$printer = C4::Context->userenv->{'branchprinter'};
158
157
159
160
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
158
# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
161
if (C4::Context->preference("AutoLocation") != 1) {
159
if (C4::Context->preference("AutoLocation") != 1) {
162
    $template->param(ManualLocation => 1);
160
    $template->param(ManualLocation => 1);
Lines 176-182 my $stickyduedate = $query->param('stickyduedate') || $session->param('stickydu Link Here
176
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
174
my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
177
$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); }
175
$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); }
178
    if ( $duedatespec );
176
    if ( $duedatespec );
179
177
my $restoreduedatespec  = $query->param('restoreduedatespec') || $session->param('stickyduedate') || $duedatespec;
178
if ($restoreduedatespec eq "highholds_empty") {
179
    undef $restoreduedatespec;
180
}
180
my $issueconfirmed = $query->param('issueconfirmed');
181
my $issueconfirmed = $query->param('issueconfirmed');
181
my $cancelreserve  = $query->param('cancelreserve');
182
my $cancelreserve  = $query->param('cancelreserve');
182
my $print          = $query->param('print') || q{};
183
my $print          = $query->param('print') || q{};
Lines 577-582 my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree Link Here
577
578
578
$template->param(%$borrower);
579
$template->param(%$borrower);
579
580
581
# Restore date if changed by holds and/or save stickyduedate to session
582
if ($restoreduedatespec || $stickyduedate) {
583
    $duedatespec = $restoreduedatespec || $duedatespec;
584
585
    if ($stickyduedate) {
586
        $session->param( 'stickyduedate', $duedatespec );
587
    }
588
} elsif (defined($duedatespec) && !defined($restoreduedatespec)) {
589
    undef $duedatespec;
590
}
591
580
$template->param(
592
$template->param(
581
    lib_messages_loop => $lib_messages_loop,
593
    lib_messages_loop => $lib_messages_loop,
582
    bor_messages_loop => $bor_messages_loop,
594
    bor_messages_loop => $bor_messages_loop,
Lines 595-600 $template->param( Link Here
595
    barcodes          => $barcodes,
607
    barcodes          => $barcodes,
596
    stickyduedate     => $stickyduedate,
608
    stickyduedate     => $stickyduedate,
597
    duedatespec       => $duedatespec,
609
    duedatespec       => $duedatespec,
610
    restoreduedatespec => $restoreduedatespec,
598
    message           => $message,
611
    message           => $message,
599
    totaldue          => sprintf('%.2f', $total),
612
    totaldue          => sprintf('%.2f', $total),
600
    inprocess         => $inprocess,
613
    inprocess         => $inprocess,
Lines 612-622 $template->param( Link Here
612
    relatives_borrowernumbers => \@relatives,
625
    relatives_borrowernumbers => \@relatives,
613
);
626
);
614
627
615
# save stickyduedate to session
616
if ($stickyduedate) {
617
    $session->param( 'stickyduedate', $duedatespec );
618
}
619
620
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
628
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
621
$template->param( picture => 1 ) if $picture;
629
$template->param( picture => 1 ) if $picture;
622
630
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-9 / +13 lines)
Lines 315-327 $(document).ready(function() { Link Here
315
[% IF HIGHHOLDS %]
315
[% IF HIGHHOLDS %]
316
	<script language="JavaScript" type="text/javascript">
316
	<script language="JavaScript" type="text/javascript">
317
	$(document).ready(function() {
317
	$(document).ready(function() {
318
		$("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
318
            $("input[name=duedatespec]:hidden").val('[% HIGHHOLDS.returndate %]');
319
            if ('[% duedatespec %]' === '') {
320
                $("input[name=restoreduedatespec]:hidden").val('highholds_empty');
321
            } else {
322
                $("input[name=restoreduedatespec]:hidden").val('[% duedatespec %]');
323
            }
319
	});
324
	});
320
	</script>
325
	</script>
321
[% END %]
326
[% END %]
322
327
323
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
328
[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
324
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
329
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
330
    <input type="hidden" name="restoreduedatespec" />
325
331
326
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
332
[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
327
333
Lines 366-371 $(document).ready(function() { Link Here
366
372
367
[% IF ( RESERVED ) %]
373
[% IF ( RESERVED ) %]
368
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
374
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
375
    <input type="hidden" name="restoreduedatespec" />
369
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
376
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
370
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
377
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
371
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
378
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 375-380 $(document).ready(function() { Link Here
375
382
376
[% IF ( RESERVE_WAITING ) %]
383
[% IF ( RESERVE_WAITING ) %]
377
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
384
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
385
    <input type="hidden" name="restoreduedatespec" />
378
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
386
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
379
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
387
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
380
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
388
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 386-391 $(document).ready(function() { Link Here
386
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
394
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
387
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
395
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
388
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
396
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
397
    <input type="hidden" name="restoreduedatespec" />
389
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
398
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
390
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
399
    [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
391
        [% IF ( RENEW_ISSUE ) %]
400
        [% IF ( RENEW_ISSUE ) %]
Lines 434-439 $(document).ready(function() { Link Here
434
                    <br />
443
                    <br />
435
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
444
                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off">
436
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
445
                    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
446
                        <input type="hidden" name="restoreduedatespec" />
437
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
447
                        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
438
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
448
                        <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
439
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
449
                        <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 545-555 No patron matched <span class="ex">[% message %]</span> Link Here
545
</h4>
555
</h4>
546
[% END %]
556
[% END %]
547
557
548
549
[% IF ( borrowers ) %]
558
[% IF ( borrowers ) %]
550
[% INCLUDE 'patron-toolbar.inc' %]
559
[% INCLUDE 'patron-toolbar.inc' %]
551
560
552
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
561
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
562
    <input type="hidden" name="restoreduedatespec" />
553
<fieldset id="circ_circulation_selectborrower" class="brief">
563
<fieldset id="circ_circulation_selectborrower" class="brief">
554
    <legend>Patron selection</legend>
564
    <legend>Patron selection</legend>
555
565
Lines 605-612 No patron matched <span class="ex">[% message %]</span> Link Here
605
615
606
[% END %]
616
[% END %]
607
617
608
609
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
618
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
619
    <input type="hidden" name="restoreduedatespec" />
610
[% IF ( issue ) %]
620
[% IF ( issue ) %]
611
    <fieldset id="circ_circulation_issue" class="lastchecked">
621
    <fieldset id="circ_circulation_issue" class="lastchecked">
612
[% ELSE %]
622
[% ELSE %]
Lines 791-798 No patron matched <span class="ex">[% message %]</span> Link Here
791
            </li>
801
            </li>
792
			[% END %]
802
			[% END %]
793
803
794
795
796
			</ul>
804
			</ul>
797
        </div>
805
        </div>
798
806
Lines 860-866 No patron matched <span class="ex">[% message %]</span> Link Here
860
     <!-- /If flagged -->[% END %]
868
     <!-- /If flagged -->[% END %]
861
869
862
	
870
	
863
864
</div>
871
</div>
865
</div>
872
</div>
866
873
Lines 976-983 No patron matched <span class="ex">[% message %]</span> Link Here
976
</div></div>
983
</div></div>
977
[% END %]
984
[% END %]
978
985
979
980
981
</div>
986
</div>
982
</div>
987
</div>
983
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
988
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
984
- 

Return to bug 10067