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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-81 / +83 lines)
Lines 183-189 $(document).ready(function () { Link Here
183
183
184
[% IF ( collectionItemNeedsTransferred ) %]
184
[% IF ( collectionItemNeedsTransferred ) %]
185
 <div id="rotating-collection" class="dialog message">
185
 <div id="rotating-collection" class="dialog message">
186
        <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) %]</h3>
186
        <h3>Transferring item to: [% Branches.GetName( collectionBranch ) %]</h3>
187
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
187
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
188
            <p>This item is part of a rotating collection.</p>
188
            <p>This item is part of a rotating collection.</p>
189
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% collectionBranch %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
189
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% collectionBranch %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
Lines 229-260 $(document).ready(function () { Link Here
229
[% IF ( WrongTransfer ) %]
229
[% IF ( WrongTransfer ) %]
230
    <div id="return2" class="dialog message">
230
    <div id="return2" class="dialog message">
231
        <!-- WrongTransfer -->
231
        <!-- WrongTransfer -->
232
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) %]</h3>
232
        <h3>Transferring item to: [% Branches.GetName( TransferWaitingAt ) %]</h3>
233
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
233
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
234
        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% TransferWaitingAt %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
234
        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% TransferWaitingAt %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
235
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
235
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
236
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
236
        [% IF ( wborcnum ) %]<h5>Hold for:</h5>
237
        <ul>
237
            <ul>
238
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
238
                <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
239
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
239
                [% INCLUDE display_holdpatron_address %]
240
            [% INCLUDE display_holdpatron_address %]
240
                [% IF ( wborphone ) %]
241
            [% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
241
                    <li>[% wborphone %]</li>
242
            [% IF ( wboremail ) %]<li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>[% END %]
242
                [% END %]
243
        </ul>
243
                [% IF ( wboremail ) %]
244
244
                    <li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>
245
    <form method="post" action="returns.pl" class="confirm">
245
                [% END %]
246
            <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem %]" />
246
            </ul>
247
            <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" />
247
248
            <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" />
248
            <form method="post" action="returns.pl" class="confirm">
249
            <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
249
                <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem %]" />
250
            <input type="hidden" name="print_slip" value="0" />
250
                <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" />
251
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
251
                <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" />
252
            <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
252
                <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
253
            <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm</button>
253
                <input type="hidden" name="print_slip" value="0" />
254
        <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
254
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
255
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
255
                <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
256
    </form>
256
                <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm</button>
257
    [% END %]</div>
257
                <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
258
                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
259
            </form>
260
        [% END %]
261
    </div>
258
[% END %]
262
[% END %]
259
263
260
[% IF ( found ) %]
264
[% IF ( found ) %]
Lines 350-356 $(document).ready(function () { Link Here
350
    [% END %]
354
    [% END %]
351
355
352
    [% IF ( diffbranch ) %]
356
    [% IF ( diffbranch ) %]
353
		<!-- diffbranch -->
357
    <!-- diffbranch -->
354
        <div id="transfer-needed" class="dialog message audio-alert-action">
358
        <div id="transfer-needed" class="dialog message audio-alert-action">
355
            <h3>Hold needing transfer found</h3>
359
            <h3>Hold needing transfer found</h3>
356
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
360
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
Lines 389-434 $(document).ready(function () { Link Here
389
            <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
393
            <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
390
            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
394
            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
391
        </form>
395
        </form>
392
		</div>
396
    </div>
393
    [% END %]
397
    [% END %]
394
398
395
    [% IF ( transfer ) %]
399
    [% IF ( transfer ) %]
396
    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
400
    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
397
        <div id="return1" class="dialog message audio-alert-action">
401
        <div id="return1" class="dialog message audio-alert-action">
398
            <h3>Please return item to: [% Branches.GetName( returnbranch ) %]</h3>
402
            <h3>Transferring item to: [% Branches.GetName( returnbranch ) %]</h3>
399
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
403
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
400
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
404
            <button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button>
405
            <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
401
        </div>
406
        </div>
402
    [% END %]
407
    [% END %]
403
408
404
    [% IF ( needstransfer ) %]
409
    [% IF ( needstransfer ) %]
405
	<!-- needstransfer -->
410
    <!-- needstransfer -->
406
    <div id="item-transfer" class="dialog message audio-alert-action"><h3> This item needs to be transferred to [% Branches.GetName( returnbranch ) %]</h3>
411
        <div id="item-transfer" class="dialog message audio-alert-action"><h3> This item needs to be transferred to [% Branches.GetName( returnbranch ) %]</h3>
407
    Transfer now?<br />
412
            Transfer now?<br />
408
    <form method="post" action="returns.pl" name="mainform" id="mainform">
413
            <form method="post" action="returns.pl" name="mainform" id="mainform">
409
    [% IF itemnumber %]
414
                [% IF itemnumber %]
410
        <button type="submit" name="dotransfer" value="Yes" class="print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% returnbranch %]&amp;op=slip"><i class="fa fa-print"></i> Yes, print slip</button>
415
                    <button type="submit" name="dotransfer" value="Yes" class="print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% returnbranch %]&amp;op=slip"><i class="fa fa-print"></i> Yes, print slip</button>
411
    [% END %]
416
                [% END %]
412
    <button type="submit" name="dotransfer" value="Yes" class="submit"><i class="fa fa-check"></i> Yes</button>
417
                <button type="submit" name="dotransfer" value="Yes" class="submit"><i class="fa fa-check"></i> Yes</button>
413
    <button type="submit" name="notransfer" value="No" class="submit"><i class="fa fa-times"></i> No</button>
418
                <button type="submit" name="notransfer" value="No" class="submit"><i class="fa fa-times"></i> No</button>
414
    <input type="hidden" name="tobranch" value="[% returnbranch %]" />
419
                <input type="hidden" name="tobranch" value="[% returnbranch %]" />
415
	<input type="hidden" name="transferitem" value="[% itemnumber %]" />
420
                <input type="hidden" name="transferitem" value="[% itemnumber %]" />
416
        <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
421
                <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
417
        <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
422
                <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
418
        <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
423
                <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
419
	[% FOREACH inputloo IN inputloop %]
424
                [% FOREACH inputloo IN inputloop %]
420
	<input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
425
                    <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
421
	<input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
426
                    <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
422
	<input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
427
                    <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
423
	[% END %]
428
                [% END %]
424
	<input type="hidden" name="barcode" value="0" />
429
                <input type="hidden" name="barcode" value="0" />
425
        <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
430
                <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
426
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
431
                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
427
	</form>   </div>
432
            </form>
433
        </div>
428
    [% END %]
434
    [% END %]
429
435
430
    [% IF ( diffbranch ) %]
436
    [% IF ( diffbranch ) %]
431
	<!-- diffbranch -->
437
    <!-- diffbranch -->
432
        <h3 class="audio-alert-action">Item consigned:</h3>
438
        <h3 class="audio-alert-action">Item consigned:</h3>
433
        <table>
439
        <table>
434
        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a></caption>
440
        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a></caption>
Lines 456-462 $(document).ready(function () { Link Here
456
462
457
    <!-- case of simple return no issue or transfer but with a reservation  -->
463
    <!-- case of simple return no issue or transfer but with a reservation  -->
458
    [% IF ( reserved ) %]
464
    [% IF ( reserved ) %]
459
	<!--  reserved  -->
465
    <!--  reserved  -->
460
        <div id="hold-found2" class="modal fade audio-alert-action">
466
        <div id="hold-found2" class="modal fade audio-alert-action">
461
            <div class="modal-dialog">
467
            <div class="modal-dialog">
462
            <div class="modal-content">
468
            <div class="modal-content">
Lines 655-686 $(document).ready(function () { Link Here
655
<div class="yui-g">
661
<div class="yui-g">
656
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
662
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
657
    <div class="yui-u first">
663
    <div class="yui-u first">
658
            <fieldset>
664
        <fieldset>
659
	<legend>Check in</legend>
665
        <legend>Check in</legend>
660
            <label for="barcode">Enter item barcode: </label>
666
        <label for="barcode">Enter item barcode: </label>
661
			[% IF ( exemptfine ) %]
667
        [% IF ( exemptfine ) %]
662
			<input name="barcode" id="barcode" size="14" class="focus alert"/>
668
            <input name="barcode" id="barcode" size="14" class="focus alert"/>
663
			[% ELSIF ( dropboxmode ) %]
669
        [% ELSIF ( dropboxmode ) %]
664
			<input name="barcode" id="barcode" size="14" class="focus alert"/>
670
            <input name="barcode" id="barcode" size="14" class="focus alert"/>
665
			[% ELSE %]
671
        [% ELSE %]
666
			<input name="barcode" id="barcode" size="14" class="focus"/>
672
            <input name="barcode" id="barcode" size="14" class="focus"/>
667
			[% END %]
673
        [% END %]
668
            <input type="submit" class="submit" value="Submit" />
674
        <input type="submit" class="submit" value="Submit" />
669
675
670
            [% IF Koha.Preference('SpecifyReturnDate') %]
676
        [% IF Koha.Preference('SpecifyReturnDate') %]
671
                <div class="date-select" id="return_date_override_fields">
677
            <div class="date-select" id="return_date_override_fields">
672
                    <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
678
                <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
673
679
                <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override %]" />
674
                    <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override %]" />
680
                <label for="return_date_override_remember"> Remember for next check in:</label>
675
681
                [% IF ( return_date_override_remember ) %]
676
                    <label for="return_date_override_remember"> Remember for next check in:</label>
682
                    <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" checked="checked" />
677
                    [% IF ( return_date_override_remember ) %]
683
                [% ELSE %]
678
                        <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" checked="checked" />
684
                    <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" />
679
                    [% ELSE %]
685
                [% END %]
680
                        <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" />
686
                <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.return_date_override.value = ''; this.form.return_date_override_remember.checked = false; this.form.barcode.focus(); return false;" />
681
                    [% END %]
682
683
                    <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.return_date_override.value = ''; this.form.return_date_override_remember.checked = false; this.form.barcode.focus(); return false;" />
684
            </div>
687
            </div>
685
        [% END %]
688
        [% END %]
686
            [% FOREACH inputloo IN inputloop %]
689
            [% FOREACH inputloo IN inputloop %]
687
- 

Return to bug 18490