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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-53 / +52 lines)
Lines 95-101 Link Here
95
                                    [% IF ( patron.gonenoaddress ) %]
95
                                    [% IF ( patron.gonenoaddress ) %]
96
                                        <li class="error">Patron's address is in doubt</li>
96
                                        <li class="error">Patron's address is in doubt</li>
97
                                    [% END %]
97
                                    [% END %]
98
                                </li>
98
                                </ul>
99
99
100
                                [% IF ( transfertodo ) %]
100
                                [% IF ( transfertodo ) %]
101
                                    <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
101
                                    <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
Lines 106-113 Link Here
106
                                <a href="#" class="btn btn-default print print-slip">
106
                                <a href="#" class="btn btn-default print print-slip">
107
                                    <i class="fa fa-print"></i> Print
107
                                    <i class="fa fa-print"></i> Print
108
                                </a>
108
                                </a>
109
                            </div>
109
                            </div> <!-- /.hold-auto-filled -->
110
                        [% END %]
110
                        [% END # /IF hold_auto_filled %]
111
111
112
                        [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
112
                        [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
113
                            <div class="dialog alert">
113
                            <div class="dialog alert">
Lines 202-216 Link Here
202
                                                        [% Branches.GetName( rightbranch ) | html %]
202
                                                        [% Branches.GetName( rightbranch ) | html %]
203
                                                    </strong>
203
                                                    </strong>
204
                                                </p>
204
                                                </p>
205
                                            </div>
205
                                            </div> <!-- /.modal-body -->
206
                                            <div class="modal-footer">
206
                                            <div class="modal-footer">
207
                                                <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
207
                                                <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
208
                                            </div>
208
                                            </div>
209
                                        </form>
209
                                        </form> <!-- /#mainform -->
210
                                    </div>
210
                                    </div> <!-- /.modal-content -->
211
                                </div>
211
                                </div> <!-- /.modal-dialog -->
212
                            </div>
212
                            </div> <!-- /#wrong-branch-modal -->
213
                        [% END %]
213
                        [% END # /IF wrongbranch %]
214
214
215
                        <!-- case of a mistake in transfer loop -->
215
                        <!-- case of a mistake in transfer loop -->
216
                        [% IF WrongTransfer && !transfertodo %]
216
                        [% IF WrongTransfer && !transfertodo %]
Lines 246-257 Link Here
246
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
246
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
247
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
247
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
248
                                                [% END %]
248
                                                [% END %]
249
                                            </form>
249
                                            </form> <!-- /mainform -->
250
                                        </div>
250
                                        </div> <!-- /.modal-footer -->
251
                                    </div>
251
                                    </div> <!-- /.modal-content -->
252
                                </div>
252
                                </div> <!-- /.modal-dialog -->
253
                            </div>
253
                            </div> <!-- /#wrong-transfer-modal -->
254
                        [% END %]
254
                        [% END # /IF WrongTransfer && !transfertodo %]
255
255
256
                        [% IF ( found ) %]
256
                        [% IF ( found ) %]
257
                            [% IF ( waiting ) %]
257
                            [% IF ( waiting ) %]
Lines 322-328 Link Here
322
322
323
                                                    <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
323
                                                    <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
324
                                                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
324
                                                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
325
                                                </div>
325
                                                </div> <!-- /.modal-body -->
326
326
327
                                                <div class="modal-footer">
327
                                                <div class="modal-footer">
328
                                                    <input type="hidden" name="cancel_reserve" value="0" />
328
                                                    <input type="hidden" name="cancel_reserve" value="0" />
Lines 339-350 Link Here
339
                                                    <button type="submit" class="btn btn-default deny cancel-hold">
339
                                                    <button type="submit" class="btn btn-default deny cancel-hold">
340
                                                        <i class="fa fa-times"></i> Cancel hold
340
                                                        <i class="fa fa-times"></i> Cancel hold
341
                                                    </button>
341
                                                    </button>
342
                                                </div>
342
                                                </div> <!-- /.modal-footer -->
343
                                            </form>
343
                                            </form> <!-- /.confirm -->
344
                                        </div>
344
                                        </div> <!-- /.modal-content -->
345
                                    </div>
345
                                    </div> <!-- /.modal-dialog -->
346
                                </div>
346
                                </div> <!-- /#hold-found1 -->
347
                            [% END %]
347
                            [% END # /IF waiting %]
348
348
349
                            [% IF ( diffbranch ) %]
349
                            [% IF ( diffbranch ) %]
350
                                <!-- diffbranch -->
350
                                <!-- diffbranch -->
Lines 402-410 Link Here
402
402
403
                                        <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
403
                                        <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
404
                                        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
404
                                        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
405
                                    </form>
405
                                    </form> <!-- /.confirm -->
406
                                </div>
406
                                </div> <!-- /#transfer-needed -->
407
                            [% END %]
407
                            [% END # /IF diffbranch %]
408
408
409
                            [% IF transfer || needstransfer %]
409
                            [% IF transfer || needstransfer %]
410
                                <div id="item-transfer-modal" class="modal fade audio-alert-action">
410
                                <div id="item-transfer-modal" class="modal fade audio-alert-action">
Lines 424-430 Link Here
424
                                                    </p>
424
                                                    </p>
425
                                                    [% IF !transfer %]
425
                                                    [% IF !transfer %]
426
                                                        <p>
426
                                                        <p>
427
                                                        Transfer now?
427
                                                            Transfer now?
428
                                                        </p>
428
                                                        </p>
429
                                                    [% END %]
429
                                                    [% END %]
430
                                                    <input type="hidden" name="tobranch" value="[% returnbranch | html %]" />
430
                                                    <input type="hidden" name="tobranch" value="[% returnbranch | html %]" />
Lines 450-461 Link Here
450
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
450
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
451
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
451
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
452
                                                    [% END %]
452
                                                    [% END %]
453
                                                </div>
453
                                                </div> <!-- /.modal-footer -->
454
                                            </form>
454
                                            </form> <!-- /#mainform -->
455
                                        </div>
455
                                        </div> <!-- /.modal-content -->
456
                                    </div>
456
                                    </div> <!-- /.modal-dialog -->
457
                                </div>
457
                                </div> <!-- /#item-transfer-modal -->
458
                            [% END %]
458
                            [% END # /IF transfer || needstransfer %]
459
459
460
                            [% IF ( diffbranch ) %]
460
                            [% IF ( diffbranch ) %]
461
                                <!-- diffbranch -->
461
                                <!-- diffbranch -->
Lines 481-487 Link Here
481
                                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
481
                                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
482
                                    <input type="hidden" name="barcode" value="0" />
482
                                    <input type="hidden" name="barcode" value="0" />
483
                                </form>
483
                                </form>
484
                            [% END %]
484
                            [% END # /IF diffbranch %]
485
485
486
                            <!-- case of simple return no issue or transfer but with a reservation  -->
486
                            <!-- case of simple return no issue or transfer but with a reservation  -->
487
                            [% IF ( reserved ) %]
487
                            [% IF ( reserved ) %]
Lines 496-502 Link Here
496
                                                        <br/>
496
                                                        <br/>
497
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
497
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
498
                                                        <div class="hold-found-barcode">
498
                                                        <div class="hold-found-barcode">
499
                                                            (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | html %]">[% itembarcode | html %]</a>)
499
                                                            (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% itembarcode | html %]</a>)
500
                                                        </div>
500
                                                        </div>
501
                                                    </h3>
501
                                                    </h3>
502
                                                </div>
502
                                                </div>
Lines 589-601 Link Here
589
                                                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
589
                                                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
590
                                                        <i class="fa fa-times"></i> Ignore
590
                                                        <i class="fa fa-times"></i> Ignore
591
                                                    </button>
591
                                                    </button>
592
                                                </div>
592
                                                </div> <!-- /.modal-footer -->
593
                                            </form>
593
                                            </form> <!-- /.confirm -->
594
                                        </div>
594
                                        </div> <!-- /.modal-content -->
595
                                    </div>
595
                                    </div> <!-- /.modal-dialog -->
596
                                </div>
596
                                </div> <!-- /#hold-found2 -->
597
                            [% END %]
597
                            [% END #/IF reserved %]
598
                        [% END %]
598
                        [% END # /IF found %]
599
599
600
                        [% IF ( errmsgloop ) %]
600
                        [% IF ( errmsgloop ) %]
601
                            <div class="dialog alert audio-alert-warning">
601
                            <div class="dialog alert audio-alert-warning">
Lines 697-705 Link Here
697
                                    [% IF errmsgloo.data_corrupted %]
697
                                    [% IF errmsgloo.data_corrupted %]
698
                                        <p class="problem">The item has not been checked in due to a configuration issue in your system. You must ask an administrator to take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo">about page</a> and search for the "data problems" section</p>
698
                                        <p class="problem">The item has not been checked in due to a configuration issue in your system. You must ask an administrator to take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo">about page</a> and search for the "data problems" section</p>
699
                                    [% END %]
699
                                    [% END %]
700
                                [% END %]
700
                                [% END # /FOREACH errmsgloo %]
701
                            </div>
701
                            </div> <!-- /.dialog.dialog-alert -->
702
                        [% END %]
702
                        [% END #/IF errmsgloop %]
703
703
704
                        [% IF ( checkinmsg ) %]
704
                        [% IF ( checkinmsg ) %]
705
                            [% IF ( checkinmsgtype == 'alert' ) %]
705
                            [% IF ( checkinmsgtype == 'alert' ) %]
Lines 709-715 Link Here
709
                            [% END %]
709
                            [% END %]
710
                                    <p class="problem">[% checkinmsg | html_line_break %]</p>
710
                                    <p class="problem">[% checkinmsg | html_line_break %]</p>
711
                                </div>
711
                                </div>
712
                        [% END%]
712
                        [% END # /IF checkinmsg %]
713
713
714
                        <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
714
                        <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
715
                            <fieldset id="circ_returns_checkin">
715
                            <fieldset id="circ_returns_checkin">
Lines 788-794 Link Here
788
                                                [% END %]
788
                                                [% END %]
789
                                                <label for="return_date_override_remember"> Remember due date for next check in</label>
789
                                                <label for="return_date_override_remember"> Remember due date for next check in</label>
790
                                            </div>
790
                                            </div>
791
                                        </div>
791
                                        </div> <!-- /.date-select -->
792
                                    [% END %]
792
                                    [% END %]
793
793
794
                                    [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %]
794
                                    [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %]
Lines 909-927 Link Here
909
                                        </td>
909
                                        </td>
910
                                        <td class="ci-note">
910
                                        <td class="ci-note">
911
                                            [% IF ( riloo.patron.borrowernotes ) %]
911
                                            [% IF ( riloo.patron.borrowernotes ) %]
912
                                                <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | html %]</p></span>
912
                                                <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | html %]</span></p>
913
                                            [% END %]
913
                                            [% END %]
914
                                            [% IF ( riloo.itemnote ) %]
914
                                            [% IF ( riloo.itemnote ) %]
915
                                                <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</p></span>
915
                                                <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p>
916
                                            [% END %]
916
                                            [% END %]
917
                                            [% IF ( riloo.itemnotes_nonpublic ) %]
917
                                            [% IF ( riloo.itemnotes_nonpublic ) %]
918
                                                <p><span class="circ-hlt item-note-nonpublic">[% riloo.itemnotes_nonpublic | html %]</p></span>
918
                                                <p><span class="circ-hlt item-note-nonpublic">[% riloo.itemnotes_nonpublic | html %]</span></p>
919
                                            [% END %]
919
                                            [% END %]
920
                                        </td>
920
                                        </td>
921
                                    </tr>
921
                                    </tr>
922
                                [% END %]
922
                                [% END # /FOREACH riloo %]
923
                            </table>
923
                            </table> <!-- /#checkedintable -->
924
                        [% END %]
924
                        [% END # /IF riloop %]
925
925
926
                    [% IF Koha.Preference('CircSidebar') %]
926
                    [% IF Koha.Preference('CircSidebar') %]
927
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
927
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
928
- 

Return to bug 23399