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

(-)a/C4/Circulation.pm (-7 / +10 lines)
Lines 928-940 sub CanBookBeIssued { Link Here
928
                {
928
                {
929
                    # The item is on reserve and waiting, but has been
929
                    # The item is on reserve and waiting, but has been
930
                    # reserved by some other patron.
930
                    # reserved by some other patron.
931
                    $needsconfirmation{RESERVE_WAITING} = 1;
931
                    $issuingimpossible{RESERVE_WAITING} = 1;
932
                    $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
932
                    $issuingimpossible{'resfirstname'} = $resborrower->{'firstname'};
933
                    $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
933
                    $issuingimpossible{'ressurname'} = $resborrower->{'surname'};
934
                    $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
934
                    $issuingimpossible{'rescardnumber'} = $resborrower->{'cardnumber'};
935
                    $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
935
                    $issuingimpossible{'resborrowernumber'} = $resborrower->{'borrowernumber'};
936
                    $needsconfirmation{'resbranchname'} = $branchname;
936
                    $issuingimpossible{'resbranchname'} = $branchname;
937
                    $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'});
937
                    $issuingimpossible{'reswaitingdate'} = format_date($res->{'waitingdate'});
938
                    $issuingimpossible{'resbarcode'} = $item->{'barcode'};
939
                    $issuingimpossible{'restitle'} = $biblioitem->{'title'};
940
                    
938
                }
941
                }
939
                elsif ( $restype eq "Reserved" ) {
942
                elsif ( $restype eq "Reserved" ) {
940
                    # The item is on reserve for someone else.
943
                    # The item is on reserve for someone else.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-12 / +5 lines)
Lines 329-337 function validate1(date) { Link Here
329
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) is currently checked out to this patron.  Renew?</li>
329
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) is currently checked out to this patron.  Renew?</li>
330
[% END %]
330
[% END %]
331
331
332
[% IF ( RESERVE_WAITING ) %]
333
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]</li>
334
[% END %]
335
332
336
[% IF ( RESERVED ) %]
333
[% IF ( RESERVED ) %]
337
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]</li>
334
    <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]</li>
Lines 375-387 function validate1(date) { Link Here
375
    </p>
372
    </p>
376
[% END %]
373
[% END %]
377
374
378
[% IF ( RESERVE_WAITING ) %]
379
    <p>
380
    <input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" />
381
    <label for="cancelreserve">Cancel hold</label>
382
    </p>
383
[% END %]
384
385
    <input type="hidden" name="barcode" value="[% barcode %]" />
375
    <input type="hidden" name="barcode" value="[% barcode %]" />
386
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
376
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
387
    <input type="hidden" name="issueconfirmed" value="1" />
377
    <input type="hidden" name="issueconfirmed" value="1" />
Lines 488-496 function validate1(date) { Link Here
488
            <li>Patron has had overdue items and is blocked for [% USERBLOCKEDREMAINING %] day(s).</li>
478
            <li>Patron has had overdue items and is blocked for [% USERBLOCKEDREMAINING %] day(s).</li>
489
        [% END %]
479
        [% END %]
490
	
480
	
491
	    [% IF ( USERBLOCKEDOVERDUE ) %]
481
        [% IF ( USERBLOCKEDOVERDUE ) %]
492
            <li>Checkouts are BLOCKED because patron has overdue items</li>
482
            <li>Checkouts are BLOCKED because patron has overdue items</li>
493
        [% END %]
483
        [% END %]
484
485
        [% IF ( RESERVE_WAITING ) %]
486
            <li>Item <i>[% restitle %]</i> ( [% resbarcode %] ) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]</li>
487
        [% END %]
494
        </ul>
488
        </ul>
495
489
496
</div></div>
490
</div></div>
497
- 

Return to bug 8559