Attachment #69883 for bug #19532

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

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql (+1 lines)
	1	INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('UseRecalls','1',NULL,'Enable or disable recalls','YesNo');

Lines 585-590 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
585	('UseICU','0','1','Tell Koha if ICU indexing is in use for Zebra or not.','YesNo'),	585	('UseICU','0','1','Tell Koha if ICU indexing is in use for Zebra or not.','YesNo'),
586	('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'),	586	('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'),
587	('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'),	587	('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'),
		588	('UseRecalls', '1', NULL, 'Enable or disable recalls', 'YesNo'),
588	('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'),	589	('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'),
589	('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'),	590	('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'),
590	('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'),	591	('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'),

Lines 120-125 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +3 lines)
120	[% IF Koha.Preference('ILLModule') %]	120	[% IF Koha.Preference('ILLModule') %]
121	<li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% borrowernumber %]">Interlibrary loans</a></li>	121	<li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% borrowernumber %]">Interlibrary loans</a></li>
122	[% END %]	122	[% END %]
123	<li><a href="/cgi-bin/koha/members/recallshistory.pl">Recalls history</a></li>	123	[% IF Koha.Preference('UseRecalls') %]
		124	<li><a href="/cgi-bin/koha/members/recallshistory.pl">Recalls history</a></li>
		125	[% END %]
124	</ul></div>	126	</ul></div>
125	[% END %]	127	[% END %]

Lines 49-57 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-3 / +5 lines)
49	[% IF Koha.Preference('OnSiteCheckouts') %]	49	[% IF Koha.Preference('OnSiteCheckouts') %]
50	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>	50	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
51	[% END %]	51	[% END %]
52	<li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>	52	[% IF Koha.Preference('UseRecalls') %]
53	<li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>	53	<li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>
54	<li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>	54	<li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>
		55	<li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>
		56	[% END %]
55	</ul>	57	</ul>
56		58
57	</div>	59	</div>

Lines 23-28 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc (+3 lines)
23	[% IF Koha.Preference('HouseboundModule') %]	23	[% IF Koha.Preference('HouseboundModule') %]
24	[% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">Housebound</a></li>	24	[% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">Housebound</a></li>
25	[% END %]	25	[% END %]
		26	[% IF Koha.Preference('UseRecalls') %]
		27	<li><a href="/cgi-bin/koha/members/recallshistory.pl">Recalls history</a></li>
		28	[% END %]
26	</ul>	29	</ul>
27	</div>	30	</div>
28	[% END %]	31	[% END %]





    Checkout Policy:
        -
            - Mark a recall as problematic if it has been waiting to be picked up for
            - pref: RecallsMaxPickUpDelay
            - class: integer
            - days.
        -
            - pref: AllowTooManyOverride
              choices:
                  yes: Allow

                  yes: Enable
                  no: Disable
            - "housebound module"
    Recalls:
        -
            - pref: UseRecalls
              choices:
                  yes: Use
                  no: "Don't use"
            - recalls
        -
            - Mark a recall as problematic if it has been waiting to be picked up for
            - pref: RecallsMaxPickUpDelay
            - class: integer
            - days.
    Article Requests:
        -
            - pref: ArticleRequests

Lines 55-63 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-3 / +5 lines)
55	[% IF Koha.Preference('OnSiteCheckouts') %]	55	[% IF Koha.Preference('OnSiteCheckouts') %]
56	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>	56	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
57	[% END %]	57	[% END %]
58	<li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>	58	[% IF Koha.Preference('UseRecalls') %]
59	<li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>	59	<li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>
60	<li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>	60	<li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>
		61	<li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>
		62	[% END %]
61	</ul>	63	</ul>
62		64
63	</div>	65	</div>

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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
944	[% END %]	944	[% END %]
945	</li>	945	</li>
946		946
947	[% IF recalls.count %]	947	[% IF Koha.Preference('UseRecalls') && recalls.count %]
948	<li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>	948	<li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
949	[% END %]	949	[% END %]
950		950
Lines 1058-1064 No patron matched <span class="ex">[% message \| html %]</span> Link Here
1058	[% END %]	1058	[% END %]
1059	</div> <!-- reservesloop -->	1059	</div> <!-- reservesloop -->
1060		1060
1061	[% IF recalls.count %]	1061	[% IF Koha.Preference('UseRecalls') && recalls.count %]
1062	[% INCLUDE 'recalls.inc' %]	1062	[% INCLUDE 'recalls.inc' %]
1063	[% END %]	1063	[% END %]
1064		1064

Lines 28-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt (+8 lines)
28		28
29	<h1>Overdue recalls</h1>	29	<h1>Overdue recalls</h1>
30		30
		31	[% IF Koha.Preference('UseRecalls') %]
		32
31	[% IF recalls.count %]	33	[% IF recalls.count %]
32		34
33	<form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">	35	<form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">
Lines 103-108 Link Here
103		105
104	[% END %]	106	[% END %]
105		107
		108	[% ELSE %]
		109
		110	<div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
		111
		112	[% END %]
		113
106	</div>	114	</div>
107	</div>	115	</div>
108		116





                <h1>Recalls queue</h1>

                [% IF Koha.Preference('UseRecalls') %]

                    [% IF recalls.count %]
                        <input type="hidden" name="op" value="cancel_multiple_recalls">

                        <form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">
                            <input type="hidden" name="op" value="cancel_multiple_recalls">

                            <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>

                            [% INCLUDE 'recalls-reports.inc' %]
                            <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                        </fieldset>
                    </form>

                            <fieldset class="action">
                                <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                            </fieldset>
                        </form>

                    [% ELSE %]

                        <div class="dialog message">No recalls have been made.</div>

                    [% END %]

                [% ELSE %]

                    <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
                [% END %]

            </div>

Lines 40-45 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt (+7 lines)
40		40
41	<h1>Recalls awaiting pickup</h1>	41	<h1>Recalls awaiting pickup</h1>
42		42
		43	[% IF Koha.Preference('UseRecalls') %]
		44
43	[% IF recalls.size > 0 %]	45	[% IF recalls.size > 0 %]
44		46
45	<div id="results" class="toptabs">	47	<div id="results" class="toptabs">
Lines 152-157 Link Here
152		154
153	[% END %]	155	[% END %]
154		156
		157	[% ELSE %]
		158
		159	<div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
		160	[% END %]
		161
155	</div>	162	</div>
156	</div>	163	</div>
157		164

Lines 516-522 function validate1(date) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
516	<a href="#reserves" id="holds-tab">0 Holds</a>	516	<a href="#reserves" id="holds-tab">0 Holds</a>
517	[% END %]	517	[% END %]
518	</li>	518	</li>
519	[% IF recalls.count %]	519	[% IF Koha.Preference('UseRecalls') && recalls.count %]
520	<li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>	520	<li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
521	[% END %]	521	[% END %]
522	[% IF Koha.Preference('ArticleRequests') %]	522	[% IF Koha.Preference('ArticleRequests') %]
Lines 631-637 function validate1(date) { Link Here
631	[% ELSE %]<p>Patron has nothing on hold.</p>[% END %]	631	[% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
632	</div>	632	</div>
633		633
634	[% IF recalls %]	634	[% IF Koha.Preference('UseRecalls') && recalls %]
635	[% INCLUDE 'recalls.inc' %]	635	[% INCLUDE 'recalls.inc' %]
636	[% END %]	636	[% END %]
637		637




[% 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 %]/[% theme %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]

<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
    <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo;
    Recalls history for [% INCLUDE 'patron-title.inc' %]
</div>

<div id="doc3" class="yui-t2">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">

            [% INCLUDE 'members-toolbar.inc' %]

            <h1>Recalls history</h1>

            [% IF Koha.Preference('UseRecalls') %]

                [% INCLUDE 'recalls.inc' %]

            [% ELSE %]

                <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>

            [% END %]

            </div>
        </div>

Lines 114-125 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc (-5 / +7 lines)
114	<a href="/cgi-bin/koha/opac-illrequests.pl">your interlibrary loan requests</a></li>	114	<a href="/cgi-bin/koha/opac-illrequests.pl">your interlibrary loan requests</a></li>
115	[% END %]	115	[% END %]
116		116
117	[% IF ( recallsview ) %]	117	[% IF Koha.Preference('UseRecalls') %]
118	<li class="active">	118	[% IF ( recallsview ) %]
119	[% ELSE %]	119	<li class="active">
120	<li>	120	[% ELSE %]
		121	<li>
		122	[% END %]
		123	<a href="/cgi-bin/koha/opac-recalls.pl">your recalls history</a></li>
121	[% END %]	124	[% END %]
122	<a href="/cgi-bin/koha/opac-recalls.pl">your recalls history</a></li>
123		125
124	</ul>	126	</ul>
125	</div>	127	</div>

Lines 24-29 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (+10 lines)
24	<div class="span10">	24	<div class="span10">
25	<div id="discharge" class="maincontainer">	25	<div id="discharge" class="maincontainer">
26	<h1>Recall an item</h1>	26	<h1>Recall an item</h1>
		27
		28	[% IF Koha.Preference('UseRecalls') %]
		29
27	[% IF error %]	30	[% IF error %]
28	<div class="dialog alert">	31	<div class="dialog alert">
29	[% IF error == 'notloggedin' %]	32	[% IF error == 'notloggedin' %]
Lines 52-57 Link Here
52	[% END %]	55	[% END %]
53		56
54	[% END %]	57	[% END %]
		58
		59	[% ELSE %]
		60
		61	Recalls have not been enabled. Please contact your library.
		62
		63	[% END %]
		64
55	</div> <!-- / #discharge -->	65	</div> <!-- / #discharge -->
56	</div> <!-- / .span10 -->	66	</div> <!-- / .span10 -->
57	</div> <!-- / .row-fluid -->	67	</div> <!-- / .row-fluid -->

Lines 27-32 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt (+8 lines)
27		27
28	<h2>Recalls history</h2>	28	<h2>Recalls history</h2>
29		29
		30	[% IF Koha.Preference('UseRecalls') %]
		31
30	[% IF RECALLS.count %]	32	[% IF RECALLS.count %]
31	<div id="opac-user-recalls">	33	<div id="opac-user-recalls">
32	<table id="recalls-table" class="table table-bordered table-striped">	34	<table id="recalls-table" class="table table-bordered table-striped">
Lines 114-119 Link Here
114	</div>	116	</div>
115	[% END # / # RECALLS.count %]	117	[% END # / # RECALLS.count %]
116		118
		119	[% ELSE %]
		120
		121	Recalls have not been enabled. Please contact your library.
		122
		123	[% END %]
		124
117	</div> <!-- /#recalls -->	125	</div> <!-- /#recalls -->
118	</div> <!-- /.span10 -->	126	</div> <!-- /.span10 -->
119	</div> <!-- /.row-fluid -->	127	</div> <!-- /.row-fluid -->

Lines 154-160 Using this account is not recommended because some parts of Koha will not functi Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +2 lines)
154	[% END %]	154	[% END %]
155		155
156	[% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]	156	[% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
157	[% IF ( RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count %])</a></li>[% END %]	157	[% IF ( Koha.Preference('UseRecalls') && RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count %])</a></li>[% END %]
158	[% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count %])</a></li>[% END %]	158	[% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count %])</a></li>[% END %]
159	[% IF ( OverDriveCirculation ) %]	159	[% IF ( OverDriveCirculation ) %]
160	<li><a href="#opac-user-overdrive">OverDrive Account</a></li>	160	<li><a href="#opac-user-overdrive">OverDrive Account</a></li>
Lines 778-784 Using this account is not recommended because some parts of Koha will not functi Link Here
778	</div> <!-- / #opac-user-holds -->	778	</div> <!-- / #opac-user-holds -->
779	[% END # / #RESERVES.count %]	779	[% END # / #RESERVES.count %]
780		780
781	[% IF RECALLS.count %]	781	[% IF Koha.Preference('UseRecalls') && RECALLS.count %]
782	<div id="opac-user-recalls">	782	<div id="opac-user-recalls">
783	<table id="recalls-table" class="table table-bordered table-striped">	783	<table id="recalls-table" class="table table-bordered table-striped">
784	<caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>	784	<caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>





my $patron = Koha::Patrons->find($loggedinuser);

$template->param( picture => 1 ) if $patron->image;

$template->param(
    recalls         => $recalls,
    recallsview     => 1,
    borrowernumber  => $loggedinuser,
    title           => $patron->title,
    initials        => $patron->initials,
    surname         => $patron->surname,
    firstname       => $patron->firstname,
    cardnumber      => $patron->cardnumber,
    categorycode    => $patron->categorycode,
    category_type   => $patron->category->category_type,
    categoryname    => $patron->category->description,
    address         => $patron->address,
    streetnumber    => $patron->streetnumber,
    streettype      => $patron->streettype,
    address2        => $patron->address2,
    city            => $patron->city,
    zipcode         => $patron->zipcode,
    country         => $patron->country,
    phone           => $patron->phone,
    email           => $patron->email,
    branchcode      => $patron->branchcode
);

output_html_with_http_headers $input, $cookie, $template->output;

Lines 705-711 if ( not $viewallitems and @items > $max_items_to_display ) { Link Here

(-)a/opac/opac-detail.pl (-2 / +1 lines)
705	if grep /^$itm->{itemnumber}$/, @itemnumbers_on_order;	705	if grep /^$itm->{itemnumber}$/, @itemnumbers_on_order;
706	}	706	}
707		707
708	if ( $itm->{datedue} && $borrowernumber && $itm->{borrowernumber} != $borrowernumber ) {	708	if ( $itm->{datedue} && $borrowernumber && $itm->{borrowernumber} != $borrowernumber && C4::Context->preference('UseRecalls') ) {
709	$itm->{avail_for_recall} = 1;	709	$itm->{avail_for_recall} = 1;
710	}	710	}
711		711
712	-

Return to bug 19532

Lines 153-163 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-5 / +12 lines)
153		153
154	Checkout Policy:	154	Checkout Policy:
155	-	155	-
156	- Mark a recall as problematic if it has been waiting to be picked up for
157	- pref: RecallsMaxPickUpDelay
158	- class: integer
159	- days.
160	-
161	- pref: AllowTooManyOverride	156	- pref: AllowTooManyOverride
162	choices:	157	choices:
163	yes: Allow	158	yes: Allow
Lines 873-878 Circulation: Link Here
873	yes: Enable	868	yes: Enable
874	no: Disable	869	no: Disable
875	- "housebound module"	870	- "housebound module"
		871	Recalls:
		872	-
		873	- pref: UseRecalls
		874	choices:
		875	yes: Use
		876	no: "Don't use"
		877	- recalls
		878	-
		879	- Mark a recall as problematic if it has been waiting to be picked up for
		880	- pref: RecallsMaxPickUpDelay
		881	- class: integer
		882	- days.
876	Article Requests:	883	Article Requests:
877	-	884	-
878	- pref: ArticleRequests	885	- pref: ArticleRequests

Lines 28-51 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt (-11 / +18 lines)
28		28
29	<h1>Recalls queue</h1>	29	<h1>Recalls queue</h1>
30		30
31	[% IF recalls.count %]	31	[% IF Koha.Preference('UseRecalls') %]
32		32
33	<form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">	33	[% IF recalls.count %]
34	<input type="hidden" name="op" value="cancel_multiple_recalls">
35		34
36	<input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>	35	<form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">
		36	<input type="hidden" name="op" value="cancel_multiple_recalls">
37		37
38	[% INCLUDE 'recalls-reports.inc' %]	38	<input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
39		39
40	<fieldset class="action">	40	[% INCLUDE 'recalls-reports.inc' %]
41	<button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
42	</fieldset>
43	</form>
44		41
45	[% ELSE %]	42	<fieldset class="action">
		43	<button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
		44	</fieldset>
		45	</form>
		46
		47	[% ELSE %]
		48
		49	<div class="dialog message">No recalls have been made.</div>
46		50
47	<div class="dialog message">No recalls have been made.</div>	51	[% END %]
		52
		53	[% ELSE %]
48		54
		55	<div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
49	[% END %]	56	[% END %]
50		57
51	</div>	58	</div>

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-4 / +11 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Recalls history for [% patron.firstname %] [% patron.surname %]</title>	4	<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
5	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
6	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />	6	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
7	[% INCLUDE 'datatables.inc' %]	7	[% INCLUDE 'datatables.inc' %]
Lines 14-32 Link Here
14	<div id="breadcrumbs">	14	<div id="breadcrumbs">
15	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;	15	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
16	<a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo;	16	<a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo;
17	Recalls history for [% patron.firstname %] [% patron.surname %]	17	Recalls history for [% INCLUDE 'patron-title.inc' %]
18	</div>	18	</div>
19		19
20	<div id="doc3" class="yui-t2">	20	<div id="doc3" class="yui-t2">
21	<div id="bd">	21	<div id="bd">
22	<div id="yui-main">	22	<div id="yui-main">
23	<div class="yui-b">	23	<div class="yui-b">
24
25	[% INCLUDE 'members-toolbar.inc' %]	24	[% INCLUDE 'members-toolbar.inc' %]
26		25
27	<h1>Recalls history</h1>	26	<h1>Recalls history</h1>
28		27
29	[% INCLUDE 'recalls.inc' %]	28	[% IF Koha.Preference('UseRecalls') %]
		29
		30	[% INCLUDE 'recalls.inc' %]
		31
		32	[% ELSE %]
		33
		34	<div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
		35
		36	[% END %]
30		37
31	</div>	38	</div>
32	</div>	39	</div>

Lines 44-53 my $recalls = Koha::Recalls->search({ borrowernumber => $loggedinuser }); Link Here

(-)a/members/recallshistory.pl (-3 / +23 lines)
44		44
45	my $patron = Koha::Patrons->find($loggedinuser);	45	my $patron = Koha::Patrons->find($loggedinuser);
46		46
		47	$template->param( picture => 1 ) if $patron->image;
		48
47	$template->param(	49	$template->param(
48	recalls => $recalls,	50	recalls => $recalls,
49	patron => $patron,	51	recallsview => 1,
50	recallsview => 1	52	borrowernumber => $loggedinuser,
		53	title => $patron->title,
		54	initials => $patron->initials,
		55	surname => $patron->surname,
		56	firstname => $patron->firstname,
		57	cardnumber => $patron->cardnumber,
		58	categorycode => $patron->categorycode,
		59	category_type => $patron->category->category_type,
		60	categoryname => $patron->category->description,
		61	address => $patron->address,
		62	streetnumber => $patron->streetnumber,
		63	streettype => $patron->streettype,
		64	address2 => $patron->address2,
		65	city => $patron->city,
		66	zipcode => $patron->zipcode,
		67	country => $patron->country,
		68	phone => $patron->phone,
		69	email => $patron->email,
		70	branchcode => $patron->branchcode
51	);	71	);
52		72
53	output_html_with_http_headers $input, $cookie, $template->output;	73	output_html_with_http_headers $input, $cookie, $template->output;