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 (-40 / +29 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="submit" class="btn btn-default approve" data-dismiss="modal">
192
            <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt | html %]" />
192
                            <i class="fa fa-check"></i> Confirm
193
            <input type="hidden" name="WT-From" value="[% wtransfertFrom | html %]" />
193
                        </button>
194
            <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
194
                        <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 and confirm
195
            <input type="hidden" name="print_slip" value="0" />
195
196
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
196
                        </button>
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>
198
                </form>
199
        <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
199
            </div>
200
        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
200
        </div>
201
    </form>
201
    </div>
202
    [% END %]</div>
203
[% END %]
202
[% END %]
204
203
205
[% IF ( found ) %]
204
[% IF ( found ) %]
Lines 334-348 Link Here
334
            <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
333
            <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
335
            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
334
            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
336
        </form>
335
        </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>
336
        </div>
347
    [% END %]
337
    [% END %]
348
338
349
- 

Return to bug 21346