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

(-)a/circ/returns.pl (+2 lines)
Lines 448-453 if ( $messages->{'ResFound'}) { Link Here
448
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
448
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
449
            $template->param(
449
            $template->param(
450
                waiting      => ($userenv_branch eq $reserve->{'branchcode'} ? 1 : 0 ),
450
                waiting      => ($userenv_branch eq $reserve->{'branchcode'} ? 1 : 0 ),
451
                transfertodo => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ),
452
                reserved     => 1,
451
            );
453
            );
452
        } elsif ( $reserve->{'ResFound'} eq "Reserved" ) {
454
        } elsif ( $reserve->{'ResFound'} eq "Reserved" ) {
453
            $template->param(
455
            $template->param(
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-79 / +61 lines)
Lines 170-205 Link Here
170
    </div>
170
    </div>
171
[% END %]
171
[% END %]
172
172
173
<!-- case of a mistake in transfer loop -->
173
<!-- Item needs to be transferred -->
174
[% IF ( WrongTransfer ) %]
174
[% IF ( transfer || ( WrongTransfer && !reserved ) ) %]
175
    <div id="return2" class="dialog message">
175
    <div id="transfer1" class="modal fade audio-alert-action">
176
        <!-- WrongTransfer -->
176
        <div class="modal-dialog">
177
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
177
            <div class="modal-content">
178
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
178
                <form method="post" action="returns.pl" class="confirm">
179
        <button type="submit" class="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>
179
                    <div class="modal-header">
180
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
180
                        <h3>
181
[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
181
                            Please return item to: [% Branches.GetName( returnbranch ) | html %]
182
        <ul>
182
                            <br />
183
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">
183
                            <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]
184
            [% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li>
184
                            </a>
185
            [% INCLUDE display_holdpatron_address %]
185
                        </h3>
186
            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
186
                    </div>
187
            [% IF ( patron.email ) %]<li><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>[% END %]
187
                    <div class="modal-body">
188
        </ul>
188
189
189
                    </div>
190
    <form method="post" action="returns.pl" class="confirm">
190
                    <div class="modal-footer">
191
            <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem | html %]" />
191
                        <button type="button" class="openWin btn btn-default print" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip" onclick="this.form.submit();"><i class="fa fa-print"></i> Print slip
192
            <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt | html %]" />
192
                        </button>
193
            <input type="hidden" name="WT-From" value="[% wtransfertFrom | html %]" />
193
                    </div>
194
            <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
194
                </form>
195
            <input type="hidden" name="print_slip" value="0" />
195
            </div>
196
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
196
        </div>
197
            <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
197
    </div>
198
            <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>
199
        <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
200
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
201
    </form>
202
    [% END %]</div>
203
[% END %]
198
[% END %]
204
199
205
[% IF ( found ) %]
200
[% IF ( found ) %]
Lines 295-301 Link Here
295
    [% END %]
290
    [% END %]
296
291
297
    [% IF ( diffbranch ) %]
292
    [% IF ( diffbranch ) %]
298
		<!-- diffbranch -->
293
        <!-- diffbranch -->
299
        <div id="transfer-needed" class="dialog message audio-alert-action">
294
        <div id="transfer-needed" class="dialog message audio-alert-action">
300
            <h3>Hold needing transfer found</h3>
295
            <h3>Hold needing transfer found</h3>
301
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
296
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
Lines 314-353 Link Here
314
            <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
309
            <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
315
        [% END %]
310
        [% END %]
316
311
317
        <form method="post" action="returns.pl" class="confirm">
312
            <form method="post" action="returns.pl" class="confirm">
318
            <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
313
                <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
319
            <input type="hidden" name="print_slip" value="0" />
314
                <input type="hidden" name="print_slip" value="0" />
320
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
315
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
321
            <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" />
316
                <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" />
322
            <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and continue</button>
317
                <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and continue</button>
323
            [% FOREACH inputloo IN inputloop %]
318
                [% FOREACH inputloo IN inputloop %]
324
                <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
319
                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
325
                <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
320
                    <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
326
                <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
321
                    <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
327
            [% END %]
322
                [% END %]
328
            <input type="hidden" name="diffBranch" value="[% destbranch | html %]" />
323
                <input type="hidden" name="diffBranch" value="[% destbranch | html %]" />
329
            <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
324
                <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
330
            <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
325
                <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
331
            <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" />
326
                <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" />
332
            <input type="hidden" name="barcode" value="0" />
327
                <input type="hidden" name="barcode" value="0" />
333
328
                <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
334
            <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
329
                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
335
            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
330
            </form>
336
        </form>
337
		</div>
338
    [% END %]
339
340
    [% IF ( transfer ) %]
341
    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
342
        <div id="return1" class="dialog message audio-alert-action">
343
            <h3>Please return item to: [% Branches.GetName( returnbranch ) | html %]</h3>
344
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
345
            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
346
        </div>
331
        </div>
347
    [% END %]
332
    [% END %]
348
333
349
    [% IF ( needstransfer ) %]
334
    [% IF ( needstransfer ) %]
350
	<!-- needstransfer -->
335
    <!-- needstransfer -->
351
    <div id="item-transfer" class="dialog message audio-alert-action"><h3> This item needs to be transferred to [% Branches.GetName( returnbranch ) | html %]</h3>
336
    <div id="item-transfer" class="dialog message audio-alert-action"><h3> This item needs to be transferred to [% Branches.GetName( returnbranch ) | html %]</h3>
352
    Transfer now?<br />
337
    Transfer now?<br />
353
    <form method="post" action="returns.pl" name="mainform" id="mainform">
338
    <form method="post" action="returns.pl" name="mainform" id="mainform">
Lines 357-379 Link Here
357
    <button type="submit" name="dotransfer" value="Yes" class="submit"><i class="fa fa-check"></i> Yes</button>
342
    <button type="submit" name="dotransfer" value="Yes" class="submit"><i class="fa fa-check"></i> Yes</button>
358
    <button type="submit" name="notransfer" value="No" class="submit"><i class="fa fa-times"></i> No</button>
343
    <button type="submit" name="notransfer" value="No" class="submit"><i class="fa fa-times"></i> No</button>
359
    <input type="hidden" name="tobranch" value="[% returnbranch | html %]" />
344
    <input type="hidden" name="tobranch" value="[% returnbranch | html %]" />
360
	<input type="hidden" name="transferitem" value="[% itemnumber | html %]" />
345
    <input type="hidden" name="transferitem" value="[% itemnumber | html %]" />
361
        <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
346
    <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" />
362
        <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
347
    <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
363
        <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" />
348
    <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" />
364
	[% FOREACH inputloo IN inputloop %]
349
    [% FOREACH inputloo IN inputloop %]
365
	<input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
350
        <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
366
	<input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
351
        <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
367
	<input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
352
        <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
368
	[% END %]
353
    [% END %]
369
	<input type="hidden" name="barcode" value="0" />
354
    <input type="hidden" name="barcode" value="0" />
370
        <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
355
    <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
371
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
356
    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
372
	</form>   </div>
357
    </form></div>
373
    [% END %]
358
    [% END %]
374
359
375
    [% IF ( diffbranch ) %]
360
    [% IF ( diffbranch ) %]
376
	<!-- diffbranch -->
361
        <!-- diffbranch -->
377
        <h3 class="audio-alert-action">Item consigned:</h3>
362
        <h3 class="audio-alert-action">Item consigned:</h3>
378
        <table>
363
        <table>
379
        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% title | html %]</a></caption>
364
        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% title | html %]</a></caption>
Lines 398-407 Link Here
398
        </form>
383
        </form>
399
    [% END %]
384
    [% END %]
400
385
401
402
    <!-- case of simple return no issue or transfer but with a reservation  -->
386
    <!-- case of simple return no issue or transfer but with a reservation  -->
403
    [% IF ( reserved ) %]
387
    [% IF ( reserved ) %]
404
	<!--  reserved  -->
388
        <!--  reserved  -->
405
        <div id="hold-found2" class="modal fade audio-alert-action">
389
        <div id="hold-found2" class="modal fade audio-alert-action">
406
            <div class="modal-dialog">
390
            <div class="modal-dialog">
407
            <div class="modal-content">
391
            <div class="modal-content">
Lines 507-513 Link Here
507
        </div>
491
        </div>
508
    [% END %]
492
    [% END %]
509
[% END %]
493
[% END %]
510
511
[% IF ( errmsgloop ) %]
494
[% IF ( errmsgloop ) %]
512
    <div class="dialog alert audio-alert-warning">
495
    <div class="dialog alert audio-alert-warning">
513
        <h3>Check in message</h3>
496
        <h3>Check in message</h3>
514
- 

Return to bug 21346