Attachment #81681 for bug #19532

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




                [% END %]
                    <td>
                        [% IF recall.is_requested || recall.is_waiting || recall.is_overdue %]
                            <input type="checkbox" value="[% recall.recall_id | html %]" name="recall_ids">
                        [% ELSE %]
                            &nbsp;
                        [% END %]
                    </td>
                    <td class="recall-borrower">
                        <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">
                            [% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.borrowernumber | html %])
                        </a>
                    </td>
                    <td class="recall-title">
                        <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                            [% recall.biblio.title | html %]
                            [% FOREACH s IN recall.biblio.subtitles %]
                                [% s | html %]
                            [% END %]
                            [% recall.item.enumchron | html %]
                        </a>
                        [% recall.biblio.author | html %]
                    </td>

                    <td class="recall-barcode">
                         <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                         [% recall.item.barcode | html %]
                         </a>
                    </td>


                    </td>

                    <td class="recall-waiting">
                        [% IF recall.waitingdate %][% recall.waitingdate | html %][% ELSE %]Not waiting[% END %]
                    </td>

                    <td class="recall-expiry">
                        [% IF ( recall.is_waiting ) %]
                            [% IF ( recall.expirationdate ) %]
                                [% recall.expirationdate | html %]
                            [% ELSE %]
                                Never expires
                            [% END %]
                        [% ELSIF ( recall.has_expired && recall.expirationdate ) %]
                            [% recall.expirationdate | html %]
                        [% ELSE %]
                            -
                        [% END %]
                    </td>

                    <td class="recall-branch">
                        [% recall.library.branchname | html %]
                    </td>

                    <td class="recall-status">


                    <td class="recall-due_date">
                        [% IF ( recall.is_requested ) %]
                            Due to be returned by [% recall.checkout.date_due | html %]
                        [% ELSIF ( recall.is_waiting && recall.expirationdate ) %]
                            Pick up by [% recall.expirationdate | html %]
                        [% ELSE %]
                            -
                        [% END %]


                    <td class="recall-cancel">
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id | html %]"><i class="fa fa-times"></i> Cancel</a>
                        [% END %]
                    </td>





            [% FOREACH recall IN recalls %]
                <tr>
                    <td class="recall-title">
                        <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                            [% recall.biblio.title | html %]
                            [% FOREACH s IN recall.biblio.subtitles %]
                                [% s | html %]
                            [% END %]
                            [% recall.item.enumchron | html %]
                        </a>
                        [% recall.biblio.author | html %]
                    </td>

                    <td class="recall-date">

                    </td>

                    <td class="recall-branch">
                        [% recall.library.branchname | html %]
                    </td>

                    <td class="recall-status">


                    <td class="recall-cancel">
                        [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %]
                            <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id | html %]"><i class="fa fa-times"></i> Cancel</a>
                        [% END %]
                    </td>


Lines 214-222 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +2 lines)
214	<span>Don't allow</span>	214	<span>Don't allow</span>
215	[% END %]	215	[% END %]
216	</td>	216	</td>
217	<td>[% rule.recall_due_date_interval %]</td>	217	<td>[% rule.recall_due_date_interval \| html %]</td>
218	<td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>	218	<td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
219	<td>[% rule.recall_shelf_time %]</td>	219	<td>[% rule.recall_shelf_time \| html %]</td>
220	<td>	220	<td>
221	[% IF rule.article_requests == 'no' %]	221	[% IF rule.article_requests == 'no' %]
222	<span>No</span>	222	<span>No</span>

Lines 489-495 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
489	[% END %]	489	[% END %]
490	[% END %]	490	[% END %]
491	[% IF ( item.recalled ) %]	491	[% IF ( item.recalled ) %]
492	Item recalled (placed [% item.recall.recalldate \| $KohaDates %]) by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber %]">[% item.recall.patron.firstname %] [% item.recall.patron.surname %] ([% item.recall.patron.cardnumber %])</a>	492	Item recalled (placed [% item.recall.recalldate \| $KohaDates %]) by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber \| uri %]">[% item.recall.patron.firstname \| html %] [% item.recall.patron.surname \| html %] ([% item.recall.patron.cardnumber \| html %])</a>
493	[% END %]	493	[% END %]
494	[% UNLESS ( item.itemnotforloan \|\| item.notforloan_per_itemtype \|\| item.onloan \|\| item.itemlost \|\| item.withdrawn \|\| item.damaged \|\| item.transfertwhen \|\| item.reservedate \|\| item.recalled ) %]	494	[% UNLESS ( item.itemnotforloan \|\| item.notforloan_per_itemtype \|\| item.onloan \|\| item.itemlost \|\| item.withdrawn \|\| item.damaged \|\| item.transfertwhen \|\| item.reservedate \|\| item.recalled ) %]
495	Available	495	Available

Lines 828-834 No patron matched <span class="ex">[% message \| html %]</span> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
828	</li>	828	</li>
829		829
830	[% IF Koha.Preference('UseRecalls') && recalls.count %]	830	[% IF Koha.Preference('UseRecalls') && recalls.count %]
831	<li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>	831	<li><a href="#recalls" id="recalls-tab">[% recalls.count \| html %] Recall(s)</a></li>
832	[% END %]	832	[% END %]
833		833
834	[% IF Koha.Preference('ArticleRequests') %]	834	[% IF Koha.Preference('ArticleRequests') %]




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Recall print receipt</title>
[% INCLUDE 'doc-head-close.inc' %]
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | url %][% ELSE %][% interface | url %]/[% theme | uri %]/img/favicon.ico[% END %]" type="image/x-icon" />
[% Asset.css("css/print.css") | $raw %]
[% IF ( Koha.Preference('SlipCSS') ) %]
<link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') | url %]" />
[% END %]

[% INCLUDE 'slip-print.inc' #printThenClose %]


[% IF plain %]
<pre>
[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]
</pre>
[% ELSE %]
[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]

<title>Koha &rsaquo; Circulation &rsaquo; Overdue recalls</title>
[% INCLUDE 'doc-head-close.inc' %]
<style type="text/css"> p { margin-top: 0; }</style>
<link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | uri %]/css/datatables.css" />
[% Asset.js("js/recalls.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
</head>

                                    [% FOREACH recall IN recalls %]
                                        <tr>
                                            <td>
                                                <input type="checkbox" value="[% recall.recall_id | html %]" name="recall_ids">
                                            </td>
                                            <td class="recall-borrower">
                                                <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">
                                                    [% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.borrowernumber | html %])
                                                </a>
                                            </td>
                                            <td class="recall-title">
                                                <a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                                                    [% recall.biblio.title | html %]
                                                    [% FOREACH s IN recall.biblio.subtitles %]
                                                        [% s | html %]
                                                    [% END %]
                                                    [% recall.item.enumchron | html %]
                                                </a>
                                                [% recall.biblio.author | html %]
                                            </td>
                                            <td class="recall-date">
                                                [% recall.recalldate | $KohaDates %]
                                            </td>
                                            <td class="recall-due">
                                                [% recall.checkout.date_due | html %]
                                            </td>
                                            <td class="recall-current-borrower">
                                                <a class="recall-current-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.checkout.borrowernumber | uri %]">
                                                    [% recall.checkout.patron.firstname | html %] [% recall.checkout.patron.surname | html %] ([% recall.checkout.borrowernumber | html %])
                                                </a>
                                            </td>
                                            <td class="recall-branch">
                                                [% recall.library.branchname | html %]
                                            </td>
                                            <td class="recall-cancel">
                                                <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id | html %]"><i class="fa fa-times"></i> Cancel</a>
                                            </td>
                                        </tr>
                                    [% END %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt (-2 / +3 lines)
		1	[% USE raw %]
1	[% USE Asset %]	2	[% USE Asset %]
2	[% USE Koha %]	3	[% USE Koha %]
3	[% USE KohaDates %]	4	[% USE KohaDates %]
Lines 6-12 Link Here
6	<title>Koha &rsaquo; Circulation &rsaquo; Recalls queue</title>	7	<title>Koha &rsaquo; Circulation &rsaquo; Recalls queue</title>
7	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]
8	<style type="text/css"> p { margin-top: 0; }</style>	9	<style type="text/css"> p { margin-top: 0; }</style>
9	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />	10	<link rel="stylesheet" type="text/css" href="[% interface \| url %]/[% theme \| uri %]/css/datatables.css" />
10	</head>	11	</head>
11	<body id="circ_recalls_queue" class="circ">	12	<body id="circ_recalls_queue" class="circ">
12	[% INCLUDE 'header.inc' %]	13	[% INCLUDE 'header.inc' %]
Lines 59-65 Link Here
59	[% MACRO jsinclude BLOCK %]	60	[% MACRO jsinclude BLOCK %]
60	[% INCLUDE 'datatables.inc' %]	61	[% INCLUDE 'datatables.inc' %]
61	[% INCLUDE 'columns_settings.inc' %]	62	[% INCLUDE 'columns_settings.inc' %]
62	[% Asset.js("js/recalls.js") %]	63	[% Asset.js("js/recalls.js") \| $raw %]
63	<script type="text/javascript">	64	<script type="text/javascript">
64	$(document).ready(function() {	65	$(document).ready(function() {
65	$(".old").hide();	66	$(".old").hide();




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]

<title>Koha &rsaquo; Circulation &rsaquo; Recalls awaiting pickup</title>
[% INCLUDE 'doc-head-close.inc' %]
<style type="text/css"> p { margin-top: 0; }</style>
<link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | uri %]/css/datatables.css" />
[% Asset.js("js/recalls.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript">
    $(document).ready(function() {

                <div id="results" class="toptabs">

                    <ul>
                        <li><a href="#recallswaiting">Recalls waiting: [% recalls.size | html %]</a></li>
                        <li><a href="#recallsover">Recalls waiting over [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days: [% over.size | html %]</a></li>
                    </ul>

                    <div id="recallswaiting">

                                    [% FOREACH recall IN recalls %]<tr>
                                        <td>[% recall.waitingdate | $KohaDates %]</td>
                                        <td>
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                                                [% recall.biblio.title | html %]
                                                [% FOREACH s IN recall.biblio.subtitles %]
                                                    [% s | html %]
                                                [% END %]
                                                [% recall.item.enumchron | html %]
                                            </a>
                                            [% recall.biblio.author | html %]
                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
                                        </td>
                                        <td>
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
                                        </td>
                                        <td>[% recall.library.branchname | html %]</td>
                                        <td>
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
                                                <input type="hidden" name="op" value="expire_recall">
                                                <fieldset class="action">
                                                    <button type="submit" class="btn btn-default btn-xs" id="expire_recall"><i class="fa fa-times"></i> Expire</button>


                    <div id="recallsover">
                        [% IF ( over.size > 0 ) %]
                            [% IF ( Koha.Preference('RecallsMaxPickUpDelay') ) %]<p>Recalls listed here have been awaiting pickup for more than [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days.</p>[% END %]
                            <table id="recallsover-table">
                                <thead><tr>
                                    <th class="title-string">Available since</th>

                                    [% FOREACH recall IN over %]<tr>
                                        <td>[% recall.waitingdate | $KohaDates %]</td>
                                        <td>
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                                                [% recall.biblio.title | html %]
                                                [% FOREACH s IN recall.biblio.subtitles %]
                                                    [% s | html %]
                                                [% END %]
                                                [% recall.item.enumchron | html %]
                                            </a>
                                            [% recall.biblio.author | html %]
                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
                                        </td>
                                        <td>
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
                                        </td>
                                        <td>[% recall.library.branchname | html %]</td>
                                        <td>
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
                                                <input type="hidden" name="op" value="expire_recall">
                                                <fieldset class="action">
                                                    <button type="submit" class="btn btn-default btn-xs" id="expire_recall"><i class="fa fa-times"></i> Expire</button>




                        [% IF ( transfertodo ) %]
                            [% patron.email | html %]
                        [% ELSE %]
                            <a id="boremail" href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a>
                        [% END %]
                    </li>
                [% END %]

        <!-- WrongTransfer -->
        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;&amp;branchcode=[% TransferWaitingAt | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | uri %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
        <ul>
            <li><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> </li>
            [% INCLUDE display_holdpatron_address %]
            [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %]
            [% IF ( patron.email ) %]<li><a id="boremail" href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a></li>[% END %]
        </ul>

    <form method="post" action="returns.pl" class="confirm">

                    [% END %]

                    [% IF ( patron.email ) %]
                        <li><a id="boremail" href="mailto:[% patron.email | uri %]">[% patron.email | html %]</a></li>
                    [% END %]

                    [% IF ( patron.debarred ) %]

            <div class="modal-content">
            <form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
                <div class="modal-header">
                    <h3>Recall found  [% IF transfer_recall %] needing transfer to [% Branches.GetName( recall.branchcode ) | html %][% END %]: <br/>
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode |html %]: [% title |html %] </a>
                    </h3>
                </div>

                <div class="modal-body">
                    [% IF ( recallnotes ) %]
                        <h4>Notes: [% recall.recallnotes | html %]</h4>
                    [% END %]
                    <h5>This item has been recalled by:</h5>
                    <li>
                        <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>
                    </li>

                    [% INCLUDE display_holdpatron_address %]

                    [% IF ( patron.phone ) %]
                        <li>[% patron.phone | html %]</li>
                    [% END %]

                    [% IF ( patron.email ) %]
                        <li><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>
                    [% END %]

                    [% IF ( patron.debarred ) %]

                    [% END %]

                    <h4>
                    [% IF transfer_recall %]Transfer to [% Branches.GetName( recall.branchcode ) | html %]
                    [% ELSIF recall.status == 'W' %]Hold for pickup (already waiting) at [% recall.library.branchname | html %]
                    [% ELSE %]Hold for pickup at [% recall.library.branchname | html %][% END %]
                    </h4>

                    <input type="hidden" name="itemnumber" value="[% recall.itemnumber | html %]" />
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" />
                    <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]" />
                    <input type="hidden" name="diffBranch" value="[% recall.branchcode | html %]" />
                    <input type="hidden" name="print_recall_slip" value="0" />
                </div>


                Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]');
            });
            [% IF print_recall_slip %]
                Dopop('recall-pickup-slip.pl?borrowernumber=[% borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]&amp;recall_id=[% recall_id | html %]')    ;
            [% END %]

            [% IF print_slip %]

Lines 662-668 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
662	</li>	662	</li>
663	[% END %]	663	[% END %]
664	[% IF Koha.Preference('UseRecalls') && recalls.count %]	664	[% IF Koha.Preference('UseRecalls') && recalls.count %]
665	<li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>	665	<li><a href="#recalls" id="recalls-tab">[% recalls.count \| html %] Recall(s)</a></li>
666	[% END %]	666	[% END %]
667	[% IF Koha.Preference('ArticleRequests') %]	667	[% IF Koha.Preference('ArticleRequests') %]
668	<li>	668	<li>




[% USE raw %]
[% USE Asset %]
[% USE KohaDates %]
[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% interface | url %]/[% theme | uri %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]
[% Asset.js("js/recalls.js") | $raw %]
</head>
<body id="recalls_history" class="pat">
[% INCLUDE 'header.inc' %]

Lines 38-44 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc (-1 / +1 lines)
38	<span class="item-status checkedout">Checked out</span>	38	<span class="item-status checkedout">Checked out</span>
39	[% END %]	39	[% END %]
40	[% END %]	40	[% END %]
41	[% IF item.avail_for_recall %]<a href="/cgi-bin/koha/opac-recall.pl?itemnumber=[% item.itemnumber %]" class="btn btn-default btn-xs">Recall</a>[% END %]	41	[% IF item.avail_for_recall %]<a href="/cgi-bin/koha/opac-recall.pl?itemnumber=[% item.itemnumber \| uri %]" class="btn btn-default btn-xs">Recall</a>[% END %]
42	[% END %]	42	[% END %]
43		43
44	[% IF NOT ( item.isa('Koha::Item') ) AND item.transfertwhen %] [%# transfertwhen is set in C4::Search, do not have it for course reserves %]	44	[% IF NOT ( item.isa('Koha::Item') ) AND item.transfertwhen %] [%# transfertwhen is set in C4::Search, do not have it for course reserves %]




[% USE Koha %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recall</title>
[% INCLUDE 'doc-head-close.inc' %]
[% BLOCK cssinclude %][% END %]
</head>

<div class="main">
    <ul class="breadcrumb">
        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
        <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Details for: [% biblio.title | html %]</a> <span class="divider">&rsaquo;</span></li>
        <li><a href="/cgi-bin/koha/opac-recall.pl?itemnumber=[% itemnumber | uri %]">Recall item</a></li>
    </ul>

    <div class="container-fluid">

                    [% END %]

                    [% IF success %]
                        <p>Your recall has been placed. The user the item is currently checked out to has been asked to return the item within [% due_interval | html %] [% due_unit | html %], on [% due_date | $KohaDates %].</p>
                        <p>You will be notified when your item is waiting to be picked up at the library.</p>
                    [% ELSIF not error %]
                        <p>All borrowable material is subject to recall if checked out and needed by someone else. We will ask the person who has checked out this item to return it so you may use it.</p>
<hr>
                        [% IF loggedinusername %]
                            <div class="dialog">
                            <p>Place a recall on [% biblio.title | html %] ([% biblio.author | html %])?</p> <a href="/cgi-bin/koha/opac-recall.pl?op=request&itemnumber=[% itemnumber | uri %]" class="btn btn-default btn-sm">Confirm</a> &nbsp; <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Cancel</a>
                            </div>
                        [% ELSE %]
                            <div class="dialog alert">You must be logged in to place a recall.</div>




[% USE KohaDates %]

[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your recalls history</title>
[% INCLUDE 'doc-head-close.inc' %]
[% BLOCK cssinclude %][% END %]
</head>

                                    [% FOREACH RECALL IN RECALLS %]
                                        <tr>
                                            <td class="title">
                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber | uri %]">
                                                    [% RECALL.biblio.title | html %]
                                                    [% FOREACH s IN RECALL.biblio.subtitles %]
                                                        [% s | html %]
                                                    [% END %]
                                                    [% RECALL.item.enumchron | html %]
                                                </a>
                                                [% RECALL.biblio.author | html %]
                                            </td>
                                            <td class="recalldate">
                                                <span title="[% RECALL.recalldate | html %]">
                                                    <span class="tdlabel">Recall date:</span>
                                                    [% RECALL.recalldate | $KohaDates %]
                                                </span>

                                            <td class="expirationdate">
                                                [% IF ( RECALL.is_waiting ) %]
                                                    [% IF ( RECALL.expirationdate ) %]
                                                        <span title="[% RECALL.expirationdate | html %]">
                                                            <span class="tdlabel">Expiration:</span>
                                                            [% RECALL.expirationdate | $KohaDates %]
                                                        </span>

                                                        </span>
                                                    [% END %]
                                                [% ELSIF ( RECALL.expirationdate ) %]
                                                    <span title="[% RECALL.expirationdate | html %]" class="overdue">
                                                        <span class="tdlabel">Expiration:</span>
                                                        [% RECALL.expirationdate | $KohaDates %]
                                                    </span>

                                            </td>
                                            <td class="branch">
                                                <span class="tdlabel">Pick up location:</span>
                                                [% RECALL.library.branchname | html %]
                                            </td>
                                            <td class="status">
                                                <span class="tdlabel">Status:</span>

                                                [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested || RECALL.is_overdue ) ) %]
                                                    <form action="/cgi-bin/koha/opac-recall.pl" method="post">
                                                        <input type="hidden" name="op" value="cancel">
                                                        <input type="hidden" name="recall_id" value="[% RECALL.recall_id | html %]">
                                                        <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber | html %]">
                                                        <button type="submit" name="submit" class="btn btn-xs btn-danger" id="cancel_recall_[% RECALL.recall_id | html %]"><i class="icon-remove icon-white"></i> Cancel</button>
                                                    </form>
                                                [% END %]
                                            </td>





                                                    [% IF ( OPACAmazonCoverImages ) %]
                                                        [% IF ( ISSUE.normalized_isbn ) %]
                                                            <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | uri %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
                                                        [% ELSE %]
                                                            <a href="#"><span class="no-image">No cover image available</span></a>
                                                        [% END %]

                                                        [% IF ( ISSUE.normalized_isbn ) %]
                                                            <div style="display:block;" title="Click to view in Google Books" class="[% ISSUE.normalized_isbn | html %]" id="gbs-thumbnail[% loop.count | html %]"></div>
                                                        [% ELSE %]
                                                            <a href="http://books.google.com/books?q=[% ISSUE.title | uri %]"><span class="no-image">No cover image available</span></a>
                                                        [% END %]
                                                    [% END %]


                                                </td>[% END # / IF JacketImages %]

                                                <td class="title">
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | uri %]">[% ISSUE.title | html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield | html %][% END %]</a>
                                                    [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %]
                                                    [% IF ( ISSUE.recalled ) %]<br /><i>This item has been recalled. Please return by the new due date.</i>[% END %]
                                                </td>


                                                    <td class="note">
                                                        <input type="text" name="note" data-issue_id="[% ISSUE.issue_id | html %]" data-origvalue="[% ISSUE.note | html %]" value="[% ISSUE.note | html %]" readonly>
                                                        <a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id | html %]" style="display:none;">Submit note</a>
                                                        <a class="btn" name="nonjs_submitnote" href="/cgi-bin/koha/opac-issue-note.pl?issue_id=[% ISSUE.issue_id | uri %]">Edit / Create note</a>
                                                    </td>
                                                [% END %]
                                            </tr>

                        [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
                            <div id="opac-user-recalls">
                                <table id="recalls-table" class="table table-bordered table-striped">
                                    <caption>Recalls <span class="count">([% RECALLS.count | html %])</span></caption>
                                    <thead>
                                        <tr>
                                            <th class="anti-the">Title</th>

                                        [% FOREACH RECALL IN RECALLS %]
                                            <tr>
                                                <td class="title">
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber | html %]">
                                                        [% RECALL.biblio.title | html %]
                                                        [% FOREACH s IN RECALL.biblio.subtitles %]
                                                            [% s | html %]
                                                        [% END %]
                                                        [% RECALL.item.enumchron | html %]
                                                    </a>
                                                    [% RECALL.biblio.author | html %]
                                                </td>
                                                <td class="recalldate">
                                                    <span title="[% RECALL.recalldate | html %]">
                                                        <span class="tdlabel">Recall date:</span>
                                                        [% RECALL.recalldate | $KohaDates %]
                                                    </span>

                                                <td class="expirationdate">
                                                    [% IF ( RECALL.is_waiting ) %]
                                                        [% IF ( RECALL.expirationdate ) %]
                                                            <span title="[% RECALL.expirationdate | html %]">
                                                                <span class="tdlabel">Expiration:</span>
                                                                    [% RECALL.expirationdate | $KohaDates %]
                                                            </span>

                                                            </span>
                                                        [% END %]
                                                    [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %]
                                                        <span title="[% RECALL.expirationdate | html %]" class="overdue">
                                                            <span class="tdlabel">Expiration:</span>
                                                            [% RECALL.expirationdate | $KohaDates %]
                                                        </span>

                                                </td>
                                                <td class="branch">
                                                    <span class="tdlabel">Pick up location:</span>
                                                    [% RECALL.library.branchname | html %]
                                                </td>
                                                <td class="status">
                                                    <span class="tdlabel">Status:</span>

                                                    [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested || RECALL.is_overdue || RECALL.status == 'T' ) ) %]
                                                        <form action="/cgi-bin/koha/opac-recall.pl" method="post">
                                                            <input type="hidden" name="op" value="cancel">
                                                            <input type="hidden" name="recall_id" value="[% RECALL.recall_id | html %]">
                                                            <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber | html %]">
                                                            <button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>
                                                        </form>
                                                    [% END %]
- 

Return to bug 19532

Lines 74-80 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-22 / +22 lines)
74	[% IF ( transfertodo ) %]	74	[% IF ( transfertodo ) %]
75	[% patron.email \| html %]	75	[% patron.email \| html %]
76	[% ELSE %]	76	[% ELSE %]
77	<a id="boremail" href="mailto:[% patron.email \| html %]">[% patron.email \| html %]</a>	77	<a id="boremail" href="mailto:[% patron.email \| uri %]">[% patron.email \| html %]</a>
78	[% END %]	78	[% END %]
79	</li>	79	</li>
80	[% END %]	80	[% END %]
Lines 176-190 Link Here
176	<!-- WrongTransfer -->	176	<!-- WrongTransfer -->
177	<h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) \| html %]</h3>	177	<h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) \| html %]</h3>
178	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>	178	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>
179	<button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber \| html %]&&branchcode=[% TransferWaitingAt \| html %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button>	179	<button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber \| uri %]&&branchcode=[% TransferWaitingAt \| uri %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
180	<button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber \| html %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>	180	<button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber \| uri %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
181	[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>	181	[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
182	<ul>	182	<ul>
183	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| uri %]">	183	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| uri %]">
184	[% patron.surname \| html %], [% patron.firstname \| html %]</a> ([% patron.cardnumber \| html %]) <span class="patron-category"> - [% patron.category.description \| html %]</span> </li>	184	[% patron.surname \| html %], [% patron.firstname \| html %]</a> ([% patron.cardnumber \| html %]) <span class="patron-category"> - [% patron.category.description \| html %]</span> </li>
185	[% INCLUDE display_holdpatron_address %]	185	[% INCLUDE display_holdpatron_address %]
186	[% IF ( patron.phone ) %]<li>[% patron.phone \| html %]</li>[% END %]	186	[% IF ( patron.phone ) %]<li>[% patron.phone \| html %]</li>[% END %]
187	[% IF ( patron.email ) %]<li><a id="boremail" href="mailto:[% patron.email \| html %]">[% patron.email \| html %]</a></li>[% END %]	187	[% IF ( patron.email ) %]<li><a id="boremail" href="mailto:[% patron.email \| uri %]">[% patron.email \| html %]</a></li>[% END %]
188	</ul>	188	</ul>
189		189
190	<form method="post" action="returns.pl" class="confirm">	190	<form method="post" action="returns.pl" class="confirm">
Lines 235-241 Link Here
235	[% END %]	235	[% END %]
236		236
237	[% IF ( patron.email ) %]	237	[% IF ( patron.email ) %]
238	<li><a id="boremail" href="mailto:[% patron.email \| html %]">[% patron.email \| html %]</a></li>	238	<li><a id="boremail" href="mailto:[% patron.email \| uri %]">[% patron.email \| html %]</a></li>
239	[% END %]	239	[% END %]
240		240
241	[% IF ( patron.debarred ) %]	241	[% IF ( patron.debarred ) %]
Lines 515-544 Link Here
515	<div class="modal-content">	515	<div class="modal-content">
516	<form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">	516	<form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
517	<div class="modal-header">	517	<div class="modal-header">
518	<h3>Recall found [% IF transfer_recall %] needing transfer to [% Branches.GetName( recall.branchcode ) %][% END %]: <br/>	518	<h3>Recall found [% IF transfer_recall %] needing transfer to [% Branches.GetName( recall.branchcode ) \| html %][% END %]: <br/>
519	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode \|html %]: [% title \|html %] </a>	519	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \|html %]: [% title \|html %] </a>
520	</h3>	520	</h3>
521	</div>	521	</div>
522		522
523	<div class="modal-body">	523	<div class="modal-body">
524	[% IF ( recallnotes ) %]	524	[% IF ( recallnotes ) %]
525	<h4>Notes: [% recall.recallnotes %]</h4>	525	<h4>Notes: [% recall.recallnotes \| html %]</h4>
526	[% END %]	526	[% END %]
527	<h5>This item has been recalled by:</h5>	527	<h5>This item has been recalled by:</h5>
528	<li>	528	<li>
529	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.surname %], [% patron.firstname %]</a>	529	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| uri %]">[% patron.surname \| html %], [% patron.firstname \| html %]</a>
530	([% patron.cardnumber %])	530	([% patron.cardnumber \| html %])
531	<span class="patron-category"> - [% patron.category.description %]</span>	531	<span class="patron-category"> - [% patron.category.description \| html %]</span>
532	</li>	532	</li>
533		533
534	[% INCLUDE display_holdpatron_address %]	534	[% INCLUDE display_holdpatron_address %]
535		535
536	[% IF ( patron.phone ) %]	536	[% IF ( patron.phone ) %]
537	<li>[% patron.phone %]</li>	537	<li>[% patron.phone \| html %]</li>
538	[% END %]	538	[% END %]
539		539
540	[% IF ( patron.email ) %]	540	[% IF ( patron.email ) %]
541	<li><a id="boremail" href="mailto:[% patron.email %]">[% patron.email %]</a></li>	541	<li><a id="boremail" href="mailto:[% patron.email \| html %]">[% patron.email \| html %]</a></li>
542	[% END %]	542	[% END %]
543		543
544	[% IF ( patron.debarred ) %]	544	[% IF ( patron.debarred ) %]
Lines 550-565 Link Here
550	[% END %]	550	[% END %]
551		551
552	<h4>	552	<h4>
553	[% IF transfer_recall %]Transfer to [% Branches.GetName( recall.branchcode ) %]	553	[% IF transfer_recall %]Transfer to [% Branches.GetName( recall.branchcode ) \| html %]
554	[% ELSIF recall.status == 'W' %]Hold for pickup (already waiting) at [% recall.library.branchname %]	554	[% ELSIF recall.status == 'W' %]Hold for pickup (already waiting) at [% recall.library.branchname \| html %]
555	[% ELSE %]Hold for pickup at [% recall.library.branchname %][% END %]	555	[% ELSE %]Hold for pickup at [% recall.library.branchname \| html %][% END %]
556	</h4>	556	</h4>
557		557
558	<input type="hidden" name="itemnumber" value="[% recall.itemnumber %]" />	558	<input type="hidden" name="itemnumber" value="[% recall.itemnumber \| html %]" />
559	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />	559	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
560	<input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />	560	<input type="hidden" name="biblionumber" value="[% itembiblionumber \| html %]" />
561	<input type="hidden" name="recall_id" value="[% recall.recall_id %]" />	561	<input type="hidden" name="recall_id" value="[% recall.recall_id \| html %]" />
562	<input type="hidden" name="diffBranch" value="[% recall.branchcode %]" />	562	<input type="hidden" name="diffBranch" value="[% recall.branchcode \| html %]" />
563	<input type="hidden" name="print_recall_slip" value="0" />	563	<input type="hidden" name="print_recall_slip" value="0" />
564	</div>	564	</div>
565		565
Lines 846-852 Link Here
846	Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber \| html %]&biblionumber=[% biblionumber \| html %]');	846	Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber \| html %]&biblionumber=[% biblionumber \| html %]');
847	});	847	});
848	[% IF print_recall_slip %]	848	[% IF print_recall_slip %]
849	Dopop('recall-pickup-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]&recall_id=[% recall_id %]') ;	849	Dopop('recall-pickup-slip.pl?borrowernumber=[% borrowernumber \| html %]&biblionumber=[% biblionumber \| html %]&recall_id=[% recall_id \| html %]') ;
850	[% END %]	850	[% END %]
851		851
852	[% IF print_slip %]	852	[% IF print_slip %]

Lines 214-220 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-18 / +17 lines)
214		214
215	[% IF ( OPACAmazonCoverImages ) %]	215	[% IF ( OPACAmazonCoverImages ) %]
216	[% IF ( ISSUE.normalized_isbn ) %]	216	[% IF ( ISSUE.normalized_isbn ) %]
217	<a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn \| uri %][% AmazonAssocTag \| uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn \| html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>	217	<a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn \| uri %][% AmazonAssocTag \| uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn \| uri %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
218	[% ELSE %]	218	[% ELSE %]
219	<a href="#"><span class="no-image">No cover image available</span></a>	219	<a href="#"><span class="no-image">No cover image available</span></a>
220	[% END %]	220	[% END %]
Lines 224-230 Link Here
224	[% IF ( ISSUE.normalized_isbn ) %]	224	[% IF ( ISSUE.normalized_isbn ) %]
225	<div style="display:block;" title="Click to view in Google Books" class="[% ISSUE.normalized_isbn \| html %]" id="gbs-thumbnail[% loop.count \| html %]"></div>	225	<div style="display:block;" title="Click to view in Google Books" class="[% ISSUE.normalized_isbn \| html %]" id="gbs-thumbnail[% loop.count \| html %]"></div>
226	[% ELSE %]	226	[% ELSE %]
227	<a href="http://books.google.com/books?q=[% ISSUE.title \|url %]"><span class="no-image">No cover image available</span></a>	227	<a href="http://books.google.com/books?q=[% ISSUE.title \| uri %]"><span class="no-image">No cover image available</span></a>
228	[% END %]	228	[% END %]
229	[% END %]	229	[% END %]
230		230
Lines 244-251 Link Here
244	</td>[% END # / IF JacketImages %]	244	</td>[% END # / IF JacketImages %]
245		245
246	<td class="title">	246	<td class="title">
247	<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber \| html %]">[% ISSUE.title \| html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield \| html %][% END %]</a>	247	<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber \| uri %]">[% ISSUE.title \| html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield \| html %][% END %]</a>
248	[% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron %][% END %]	248	[% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron \| html %][% END %]
249	[% IF ( ISSUE.recalled ) %]<br /><i>This item has been recalled. Please return by the new due date.</i>[% END %]	249	[% IF ( ISSUE.recalled ) %]<br /><i>This item has been recalled. Please return by the new due date.</i>[% END %]
250	</td>	250	</td>
251		251
Lines 336-342 Link Here
336	<td class="note">	336	<td class="note">
337	<input type="text" name="note" data-issue_id="[% ISSUE.issue_id \| html %]" data-origvalue="[% ISSUE.note \| html %]" value="[% ISSUE.note \| html %]" readonly>	337	<input type="text" name="note" data-issue_id="[% ISSUE.issue_id \| html %]" data-origvalue="[% ISSUE.note \| html %]" value="[% ISSUE.note \| html %]" readonly>
338	<a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id \| html %]" style="display:none;">Submit note</a>	338	<a class="btn" name="js_submitnote" id="save_[% ISSUE.issue_id \| html %]" style="display:none;">Submit note</a>
339	<a class="btn" name="nonjs_submitnote" href="/cgi-bin/koha/opac-issue-note.pl?issue_id=[% ISSUE.issue_id \| url %]">Edit / Create note</a>	339	<a class="btn" name="nonjs_submitnote" href="/cgi-bin/koha/opac-issue-note.pl?issue_id=[% ISSUE.issue_id \| uri %]">Edit / Create note</a>
340	</td>	340	</td>
341	[% END %]	341	[% END %]
342	</tr>	342	</tr>
Lines 791-797 Link Here
791	[% IF Koha.Preference('UseRecalls') && RECALLS.count %]	791	[% IF Koha.Preference('UseRecalls') && RECALLS.count %]
792	<div id="opac-user-recalls">	792	<div id="opac-user-recalls">
793	<table id="recalls-table" class="table table-bordered table-striped">	793	<table id="recalls-table" class="table table-bordered table-striped">
794	<caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>	794	<caption>Recalls <span class="count">([% RECALLS.count \| html %])</span></caption>
795	<thead>	795	<thead>
796	<tr>	796	<tr>
797	<th class="anti-the">Title</th>	797	<th class="anti-the">Title</th>
Lines 806-822 Link Here
806	[% FOREACH RECALL IN RECALLS %]	806	[% FOREACH RECALL IN RECALLS %]
807	<tr>	807	<tr>
808	<td class="title">	808	<td class="title">
809	<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber %]">	809	<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber \| html %]">
810	[% RECALL.biblio.title %]	810	[% RECALL.biblio.title \| html %]
811	[% FOREACH s IN RECALL.biblio.subtitles %]	811	[% FOREACH s IN RECALL.biblio.subtitles %]
812	[% s %]	812	[% s \| html %]
813	[% END %]	813	[% END %]
814	[% RECALL.item.enumchron %]	814	[% RECALL.item.enumchron \| html %]
815	</a>	815	</a>
816	[% RECALL.biblio.author %]	816	[% RECALL.biblio.author \| html %]
817	</td>	817	</td>
818	<td class="recalldate">	818	<td class="recalldate">
819	<span title="[% RECALL.recalldate %]">	819	<span title="[% RECALL.recalldate \| html %]">
820	<span class="tdlabel">Recall date:</span>	820	<span class="tdlabel">Recall date:</span>
821	[% RECALL.recalldate \| $KohaDates %]	821	[% RECALL.recalldate \| $KohaDates %]
822	</span>	822	</span>
Lines 824-830 Link Here
824	<td class="expirationdate">	824	<td class="expirationdate">
825	[% IF ( RECALL.is_waiting ) %]	825	[% IF ( RECALL.is_waiting ) %]
826	[% IF ( RECALL.expirationdate ) %]	826	[% IF ( RECALL.expirationdate ) %]
827	<span title="[% RECALL.expirationdate %]">	827	<span title="[% RECALL.expirationdate \| html %]">
828	<span class="tdlabel">Expiration:</span>	828	<span class="tdlabel">Expiration:</span>
829	[% RECALL.expirationdate \| $KohaDates %]	829	[% RECALL.expirationdate \| $KohaDates %]
830	</span>	830	</span>
Lines 835-841 Link Here
835	</span>	835	</span>
836	[% END %]	836	[% END %]
837	[% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %]	837	[% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %]
838	<span title="[% RECALL.expirationdate %]" class="overdue">	838	<span title="[% RECALL.expirationdate \| html %]" class="overdue">
839	<span class="tdlabel">Expiration:</span>	839	<span class="tdlabel">Expiration:</span>
840	[% RECALL.expirationdate \| $KohaDates %]	840	[% RECALL.expirationdate \| $KohaDates %]
841	</span>	841	</span>
Lines 845-851 Link Here
845	</td>	845	</td>
846	<td class="branch">	846	<td class="branch">
847	<span class="tdlabel">Pick up location:</span>	847	<span class="tdlabel">Pick up location:</span>
848	[% RECALL.library.branchname %]	848	[% RECALL.library.branchname \| html %]
849	</td>	849	</td>
850	<td class="status">	850	<td class="status">
851	<span class="tdlabel">Status:</span>	851	<span class="tdlabel">Status:</span>
Lines 861-868 Link Here
861	[% IF ( !RECALL.cancellationdate && ( RECALL.is_requested \|\| RECALL.is_overdue \|\| RECALL.status == 'T' ) ) %]	861	[% IF ( !RECALL.cancellationdate && ( RECALL.is_requested \|\| RECALL.is_overdue \|\| RECALL.status == 'T' ) ) %]
862	<form action="/cgi-bin/koha/opac-recall.pl" method="post">	862	<form action="/cgi-bin/koha/opac-recall.pl" method="post">
863	<input type="hidden" name="op" value="cancel">	863	<input type="hidden" name="op" value="cancel">
864	<input type="hidden" name="recall_id" value="[% RECALL.recall_id %]">	864	<input type="hidden" name="recall_id" value="[% RECALL.recall_id \| html %]">
865	<input type="hidden" name="itemnumber" value="[% RECALL.itemnumber %]">	865	<input type="hidden" name="itemnumber" value="[% RECALL.itemnumber \| html %]">
866	<button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>	866	<button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>
867	</form>	867	</form>
868	[% END %]	868	[% END %]
869	-

Lines 26-55 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc (-17 / +17 lines)
26	[% END %]	26	[% END %]
27	<td>	27	<td>
28	[% IF recall.is_requested \|\| recall.is_waiting \|\| recall.is_overdue %]	28	[% IF recall.is_requested \|\| recall.is_waiting \|\| recall.is_overdue %]
29	<input type="checkbox" value="[% recall.recall_id %]" name="recall_ids">	29	<input type="checkbox" value="[% recall.recall_id \| html %]" name="recall_ids">
30	[% ELSE %]	30	[% ELSE %]
31		31
32	[% END %]	32	[% END %]
33	</td>	33	</td>
34	<td class="recall-borrower">	34	<td class="recall-borrower">
35	<a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">	35	<a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber \| uri %]">
36	[% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %])	36	[% recall.patron.firstname \| html %] [% recall.patron.surname \| html %] ([% recall.borrowernumber \| html %])
37	</a>	37	</a>
38	</td>	38	</td>
39	<td class="recall-title">	39	<td class="recall-title">
40	<a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">	40	<a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber \| uri %]">
41	[% recall.biblio.title %]	41	[% recall.biblio.title \| html %]
42	[% FOREACH s IN recall.biblio.subtitles %]	42	[% FOREACH s IN recall.biblio.subtitles %]
43	[% s %]	43	[% s \| html %]
44	[% END %]	44	[% END %]
45	[% recall.item.enumchron %]	45	[% recall.item.enumchron \| html %]
46	</a>	46	</a>
47	[% recall.biblio.author %]	47	[% recall.biblio.author \| html %]
48	</td>	48	</td>
49		49
50	<td class="recall-barcode">	50	<td class="recall-barcode">
51	<a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber %]">	51	<a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber \| uri %]">
52	[% recall.item.barcode %]	52	[% recall.item.barcode \| html %]
53	</a>	53	</a>
54	</td>	54	</td>
55		55
Lines 58-82 Link Here
58	</td>	58	</td>
59		59
60	<td class="recall-waiting">	60	<td class="recall-waiting">
61	[% IF recall.waitingdate %][% recall.waitingdate %][% ELSE %]Not waiting[% END %]	61	[% IF recall.waitingdate %][% recall.waitingdate \| html %][% ELSE %]Not waiting[% END %]
62	</td>	62	</td>
63		63
64	<td class="recall-expiry">	64	<td class="recall-expiry">
65	[% IF ( recall.is_waiting ) %]	65	[% IF ( recall.is_waiting ) %]
66	[% IF ( recall.expirationdate ) %]	66	[% IF ( recall.expirationdate ) %]
67	[% recall.expirationdate %]	67	[% recall.expirationdate \| html %]
68	[% ELSE %]	68	[% ELSE %]
69	Never expires	69	Never expires
70	[% END %]	70	[% END %]
71	[% ELSIF ( recall.has_expired && recall.expirationdate ) %]	71	[% ELSIF ( recall.has_expired && recall.expirationdate ) %]
72	[% recall.expirationdate %]	72	[% recall.expirationdate \| html %]
73	[% ELSE %]	73	[% ELSE %]
74	-	74	-
75	[% END %]	75	[% END %]
76	</td>	76	</td>
77		77
78	<td class="recall-branch">	78	<td class="recall-branch">
79	[% recall.library.branchname %]	79	[% recall.library.branchname \| html %]
80	</td>	80	</td>
81		81
82	<td class="recall-status">	82	<td class="recall-status">
Lines 97-105 Link Here
97		97
98	<td class="recall-due_date">	98	<td class="recall-due_date">
99	[% IF ( recall.is_requested ) %]	99	[% IF ( recall.is_requested ) %]
100	Due to be returned by [% recall.checkout.date_due %]	100	Due to be returned by [% recall.checkout.date_due \| html %]
101	[% ELSIF ( recall.is_waiting && recall.expirationdate ) %]	101	[% ELSIF ( recall.is_waiting && recall.expirationdate ) %]
102	Pick up by [% recall.expirationdate %]	102	Pick up by [% recall.expirationdate \| html %]
103	[% ELSE %]	103	[% ELSE %]
104	-	104	-
105	[% END %]	105	[% END %]
Lines 107-113 Link Here
107		107
108	<td class="recall-cancel">	108	<td class="recall-cancel">
109	[% IF ( !recall.cancellationdate && ( recall.is_requested \|\| recall.is_overdue ) ) %]	109	[% IF ( !recall.cancellationdate && ( recall.is_requested \|\| recall.is_overdue ) ) %]
110	<a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>	110	<a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id \| html %]"><i class="fa fa-times"></i> Cancel</a>
111	[% END %]	111	[% END %]
112	</td>	112	</td>
113		113