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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-172 / +98 lines)
Lines 57-114 Link Here
57
                        [% END %]
57
                        [% END %]
58
58
59
                        [% IF hold_auto_filled %]
59
                        [% IF hold_auto_filled %]
60
                            <div class="dialog alert hold-auto-filled">
61
                                [% IF ( reservenotes ) %]
62
                                    <h4>Notes: [% reservenotes | html %]</h4>
63
                                [% END %]
64
                                <h3>Hold filled for:</h3>
65
                                <ul>
66
                                    <li>
67
                                        [% INCLUDE 'patron-title.inc' patron=patron %]
68
                                        <span class="patron-category"> - [% patron.category.description | html %]</span>
69
                                    </li>
70
71
                                    [% INCLUDE display_holdpatron_address %]
72
60
73
                                    [% IF ( patron.phone ) %]
61
                            <div id="holds-auto-fill" class="modal audio-alert-action" tabindex="-1" role="dialog" aria-labelledby="HoldsAutoFillLabel">
74
                                        <li>[% patron.phone | html %]</li>
62
                                <div class="modal-dialog" role="document">
75
                                    [% END %]
63
                                    <div class="modal-content">
64
                                        <div class="modal-header">
65
                                            <h3 class="modal-title" id="HoldsAutoFillLabel">
66
                                                Hold found:
67
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
68
                                                <div class="hold-found-barcode">
69
                                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% itembarcode | html %]</a>
70
                                                </div>
71
                                            </h3>
72
                                        </div>
73
                                        <div class="modal-body">
74
                                            [% IF ( reservenotes ) %]
75
                                                <h4>Notes: [% reservenotes | html %]</h4>
76
                                            [% END %]
76
77
77
                                    [% IF ( patron.email ) %]
78
                                            <h4>Hold for: </h4>
78
                                        <li>
79
                                            <ul>
79
                                            [% IF ( transfertodo ) %]
80
                                                <li>
80
                                                [% patron.email | html %]
81
                                                    [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]
82
                                                    <span class="patron-category"> - [% patron.category.description | html %]</span>
83
                                                </li>
84
                                                [% INCLUDE display_holdpatron_address %]
85
                                                [% IF ( patron.phone ) %]
86
                                                    <li>[% patron.phone | html %]</li>
87
                                                [% END %]
88
                                                [% IF ( patron.email ) %]
89
                                                    <li>
90
                                                        [% IF ( diffbranch ) %]
91
                                                            [% patron.email | html %]
92
                                                        [% ELSE %]
93
                                                            <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
94
                                                        [% END %]
95
                                                    </li>
96
                                                [% END %]
97
                                                [% UNLESS ( diffbranch) %]
98
                                                    [% INCLUDE display_bormessagepref %]
99
                                                [% END %]
100
                                                [% IF ( patron.debarred ) %]
101
                                                    <li class="error">Patron is RESTRICTED</li>
102
                                                [% END %]
103
                                                [% IF ( patron.gonenoaddress ) %]
104
                                                    <li class="error">Patron's address is in doubt</li>
105
                                                [% END %]
106
                                            </ul>
107
                                            [% IF ( diffbranch ) %]
108
                                                <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
81
                                            [% ELSE %]
109
                                            [% ELSE %]
82
                                                <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
110
                                                <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
83
                                            [% END %]
111
                                            [% END %]
84
                                        </li>
112
                                        </div>
85
                                    [% END %]
113
                                        <div class="modal-footer">
86
114
                                            <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
87
                                    [% UNLESS ( transfertodo) %]
115
                                            <button type="button" data-dismiss="modal" class="btn btn-default print print-slip"><i class="fa fa-print"></i> Print slip and continue</button>
88
                                        [% INCLUDE display_bormessagepref %]
116
                                        </div>
89
                                    [% END %]
117
                                    </div> <!-- /.modal-content -->
90
118
                                </div> <!-- /.modal-dialog -->
91
                                    [% IF ( patron.debarred ) %]
119
                            </div> <!-- /#holds-auto-fill -->
92
                                        <li class="error">Patron is RESTRICTED</li>
93
                                    [% END %]
94
95
                                    [% IF ( patron.gonenoaddress ) %]
96
                                        <li class="error">Patron's address is in doubt</li>
97
                                    [% END %]
98
                                </ul>
99
100
                                [% IF ( transfertodo ) %]
101
                                    <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
102
                                [% ELSE %]
103
                                    <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
104
                                [% END %]
105
106
                                <a href="#" class="btn btn-default print print-slip">
107
                                    <i class="fa fa-print"></i> Print
108
                                </a>
109
                            </div> <!-- /.hold-auto-filled -->
110
                        [% END # /IF hold_auto_filled %]
120
                        [% END # /IF hold_auto_filled %]
111
121
122
112
                        [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
123
                        [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
113
                            <div class="dialog alert">
124
                            <div class="dialog alert">
114
                                <strong>Error:</strong>
125
                                <strong>Error:</strong>
Lines 213-257 Link Here
213
                        [% END # /IF wrongbranch %]
224
                        [% END # /IF wrongbranch %]
214
225
215
                        <!-- case of a mistake in transfer loop -->
226
                        <!-- case of a mistake in transfer loop -->
216
                        [% IF WrongTransfer && !transfertodo %]
227
                        [% UNLESS ( hold_auto_filled && diffbranch ) %]
217
                            <div id="wrong-transfer-modal" class="modal fade audio-alert-action">
228
                            [% IF WrongTransfer && !transfertodo %]
218
                                <div class="modal-dialog">
229
                                <div id="wrong-transfer-modal" class="modal fade audio-alert-action">
219
                                    <div class="modal-content">
230
                                    <div class="modal-dialog">
220
                                        <div class="modal-header">
231
                                        <div class="modal-content">
221
                                            <h3>
232
                                            <div class="modal-header">
222
                                                Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]
233
                                                <h3>
223
                                            </h3>
234
                                                    Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]
224
                                        </div>
235
                                                </h3>
225
                                        <div class="modal-body">
236
                                            </div>
226
                                            <p>
237
                                            <div class="modal-body">
227
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
238
                                                <p>
228
                                                    [% itembarcode | html %]: [% title | html %]
239
                                                    <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
229
                                                </a>
240
                                                        [% itembarcode | html %]: [% title | html %]
230
                                            </p>
241
                                                    </a>
231
                                        </div>
242
                                                </p>
232
                                        <div class="modal-footer">
243
                                            </div>
233
                                            <!-- CONFIRM -->
244
                                            <div class="modal-footer">
234
                                            <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
245
                                                <!-- CONFIRM -->
235
                                            <!-- PRINT SLIP -->
246
                                                <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
236
                                            <button type="button" data-dismiss="modal" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
247
                                                <!-- PRINT SLIP -->
237
                                            <!-- CANCEL TRANSFER -->
248
                                                <button type="button" data-dismiss="modal" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
238
                                            <form method="post" action="returns.pl" name="mainform">
249
                                                <!-- CANCEL TRANSFER -->
239
                                                <button class="btn btn-default deny" type="submit"><i class="fa fa-times"></i> Cancel transfer</button>
250
                                                <form method="post" action="returns.pl" name="mainform">
240
                                                <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
251
                                                    <button class="btn btn-default deny" type="submit"><i class="fa fa-times"></i> Cancel transfer</button>
241
                                                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
252
                                                    <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
242
                                                <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
253
                                                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
243
                                                <input type="hidden" name="canceltransfer" value="1" />
254
                                                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
244
                                                [% FOREACH inputloo IN inputloop %]
255
                                                    <input type="hidden" name="canceltransfer" value="1" />
245
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
256
                                                    [% FOREACH inputloo IN inputloop %]
246
                                                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
257
                                                        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
247
                                                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
258
                                                        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
248
                                                [% END %]
259
                                                        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
249
                                            </form> <!-- /mainform -->
260
                                                    [% END %]
250
                                        </div> <!-- /.modal-footer -->
261
                                                </form> <!-- /mainform -->
251
                                    </div> <!-- /.modal-content -->
262
                                            </div> <!-- /.modal-footer -->
252
                                </div> <!-- /.modal-dialog -->
263
                                        </div> <!-- /.modal-content -->
253
                            </div> <!-- /#wrong-transfer-modal -->
264
                                    </div> <!-- /.modal-dialog -->
254
                        [% END # /IF WrongTransfer && !transfertodo %]
265
                                </div> <!-- /#wrong-transfer-modal -->
266
                            [% END # /IF WrongTransfer && !transfertodo %]
267
                        [% END # /UNLESS hold_auto_filled && diffbranch %]
255
268
256
                        [% IF ( found ) %]
269
                        [% IF ( found ) %]
257
                            [% IF ( waiting ) %]
270
                            [% IF ( waiting ) %]
Lines 346-411 Link Here
346
                                </div> <!-- /#hold-found1 -->
359
                                </div> <!-- /#hold-found1 -->
347
                            [% END # /IF waiting %]
360
                            [% END # /IF waiting %]
348
361
349
                            [% IF ( diffbranch ) %]
350
                                <!-- diffbranch -->
351
                                <div id="transfer-needed" class="dialog message audio-alert-action">
352
                                    <h3>Hold needing transfer found</h3>
353
                                    <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
354
                                    <h4>Hold for: </h4>
355
                                    <ul>
356
                                        <li>
357
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span>
358
                                        </li>
359
                                        [% INCLUDE display_holdpatron_address %]
360
                                        [% IF ( patron.phone ) %]
361
                                            <li>[% patron.phone | html %]</li>
362
                                        [% END %]
363
                                        [% IF ( patron.email ) %]
364
                                            <li>
365
                                                [% IF ( transfertodo ) %]
366
                                                    [% patron.email | html %]
367
                                                [% ELSE %]
368
                                                    <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
369
                                                [% END %]
370
                                            </li>
371
                                        [% END %]
372
                                        [% IF ( patron.debarred ) %]
373
                                            <li class="error">Patron is RESTRICTED</li>
374
                                        [% END %]
375
                                        [% IF ( patron.gonenoaddress ) %]
376
                                            <li class="error">Patron's address is in doubt</li>
377
                                        [% END %]
378
                                    </ul>
379
380
                                    [% IF ( transfertodo ) %]
381
                                        <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
382
                                    [% ELSE %]
383
                                        <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
384
                                    [% END %]
385
386
                                    <form method="post" action="returns.pl" class="confirm">
387
                                        <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
388
                                        <input type="hidden" name="print_slip" value="0" />
389
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
390
                                        <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" />
391
                                        <button type="submit" class="print"><i class="fa fa-print"></i> Print slip and continue</button>
392
                                        [% FOREACH inputloo IN inputloop %]
393
                                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
394
                                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
395
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
396
                                        [% END %]
397
                                        <input type="hidden" name="diffBranch" value="[% destbranch | html %]" />
398
                                        <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
399
                                        <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
400
                                        <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" />
401
                                        <input type="hidden" name="barcode" value="0" />
402
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 %]" />
405
                                    </form> <!-- /.confirm -->
406
                                </div> <!-- /#transfer-needed -->
407
                            [% END # /IF diffbranch %]
408
409
                            [% IF transfer || needstransfer %]
362
                            [% IF transfer || needstransfer %]
410
                                <div id="item-transfer-modal" class="modal fade audio-alert-action">
363
                                <div id="item-transfer-modal" class="modal fade audio-alert-action">
411
                                    <div class="modal-dialog">
364
                                    <div class="modal-dialog">
Lines 457-488 Link Here
457
                                </div> <!-- /#item-transfer-modal -->
410
                                </div> <!-- /#item-transfer-modal -->
458
                            [% END # /IF transfer || needstransfer %]
411
                            [% END # /IF transfer || needstransfer %]
459
412
460
                            [% IF ( diffbranch ) %]
461
                                <!-- diffbranch -->
462
                                <h3 class="audio-alert-action">Item consigned:</h3>
463
                                <table>
464
                                    <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a></caption>
465
                                    <tr>
466
                                        <th>Hold for:</th>
467
                                        <td>[% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]</td>
468
                                    </tr>
469
                                </table>
470
                                <form method="post" action="returns.pl">
471
                                    <input type="submit" value="OK" />
472
                                    [% FOREACH inputloo IN inputloop %]
473
                                        [% UNLESS ( inputloo.first ) %]
474
                                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
475
                                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
476
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
477
                                        [% END %]
478
                                    [% END %]
479
480
                                    <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
481
                                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
482
                                    <input type="hidden" name="barcode" value="0" />
483
                                </form>
484
                            [% END # /IF diffbranch %]
485
486
                            <!-- case of simple return no issue or transfer but with a reservation  -->
413
                            <!-- case of simple return no issue or transfer but with a reservation  -->
487
                            [% IF ( reserved ) %]
414
                            [% IF ( reserved ) %]
488
                                <!-- reserved -->
415
                                <!-- reserved -->
489
- 

Return to bug 23434