Attachment #76831 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 601-606 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

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

Lines 121-126 Link Here

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

Lines 36-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-3 / +5 lines)
36	[% IF Koha.Preference('OnSiteCheckouts') %]	36	[% IF Koha.Preference('OnSiteCheckouts') %]
37	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>	37	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
38	[% END %]	38	[% END %]
39	<li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>	39	[% IF Koha.Preference('UseRecalls') %]
40	<li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>	40	<li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>
41	<li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>	41	<li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>
		42	<li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>
		43	[% END %]
42	</ul>	44	</ul>
43		45
44	</div>	46	</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 818-824 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)
818	[% END %]	818	[% END %]
819	</li>	819	</li>
820		820
821	[% IF recalls.count %]	821	[% IF Koha.Preference('UseRecalls') && recalls.count %]
822	<li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>	822	<li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
823	[% END %]	823	[% END %]
824		824
Lines 932-938 No patron matched <span class="ex">[% message \| html %]</span> Link Here
932	[% END %]	932	[% END %]
933	</div> <!-- reservesloop -->	933	</div> <!-- reservesloop -->
934		934
935	[% IF recalls.count %]	935	[% IF Koha.Preference('UseRecalls') && recalls.count %]
936	[% INCLUDE 'recalls.inc' %]	936	[% INCLUDE 'recalls.inc' %]
937	[% END %]	937	[% END %]
938		938

Lines 27-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt (-2 / +4 lines)
27	<div class="yui-g">	27	<div class="yui-g">
28		28
29	<h1>Overdue recalls</h1>	29	<h1>Overdue recalls</h1>
30		30	[% IF Koha.Preference('UseRecalls') %]
31	[% IF recalls.count %]	31	[% IF recalls.count %]
32		32
33	<form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">	33	<form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">
Lines 102-108 Link Here
102	<div class="dialog message">There are no overdue recalls.</div>	102	<div class="dialog message">There are no overdue recalls.</div>
103		103
104	[% END %]	104	[% END %]
105		105	[% ELSE %]
		106	<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>
		107	[% END %]
106	</div>	108	</div>
107	</div>	109	</div>
108		110




            <div class="yui-g">

                <h1>Recalls queue</h1>
                [% IF Koha.Preference('UseRecalls') %]
                    [% IF recalls.count %]
                        <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' %]
                            <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 %]
                    </form>

                [% 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>
                    <div class="dialog message">No recalls have been made.</div>

                [% END %]

            </div>
        </div>


Lines 39-45 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt (-1 / +4 lines)
39	<div class="yui-g">	39	<div class="yui-g">
40		40
41	<h1>Recalls awaiting pickup</h1>	41	<h1>Recalls awaiting pickup</h1>
42		42	[% IF Koha.Preference('UseRecalls') %]
43	[% IF recalls.size > 0 %]	43	[% IF recalls.size > 0 %]
44		44
45	<div id="results" class="toptabs">	45	<div id="results" class="toptabs">
Lines 152-157 Link Here
152		152
153	[% END %]	153	[% END %]
154		154
		155	[% ELSE %]
		156	<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>
		157	[% END %]
155	</div>	158	</div>
156	</div>	159	</div>
157		160

Lines 626-631 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +4 lines)
626	[% END %]	626	[% END %]
627	</li>	627	</li>
628	[% END %]	628	[% END %]
		629	[% IF Koha.Preference('UseRecalls') && recalls.count %]
		630	<li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
		631	[% END %]
629	[% IF Koha.Preference('ArticleRequests') %]	632	[% IF Koha.Preference('ArticleRequests') %]
630	<li>	633	<li>
631	<a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>	634	<a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
Lines 742-748 Link Here
742	[% END %]	745	[% END %]
743	</div> [% # /div#reserves %]	746	</div> [% # /div#reserves %]
744	[% END %]	747	[% END %]
745	[% IF recalls %]	748	[% IF Koha.Preferernce('UseRecalls') && recalls %]
746	[% INCLUDE 'recalls.inc' %]	749	[% INCLUDE 'recalls.inc' %]
747	[% END %]	750	[% END %]
748		751

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-4 / +7 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-20 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">
Lines 26-33 Link Here
26		26
27	<h1>Recalls history</h1>	27	<h1>Recalls history</h1>
28		28
29	[% INCLUDE 'recalls.inc' %]	29	[% IF Koha.Preference('UseRecalls') %]
30		30	[% INCLUDE 'recalls.inc' %]
		31	[% ELSE %]
		32	<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>
		33	[% END %]
31	</div>	34	</div>
32	</div>	35	</div>
33		36

Lines 124-135 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc (-5 / +7 lines)
124	<a href="/cgi-bin/koha/opac-illrequests.pl">your interlibrary loan requests</a></li>	124	<a href="/cgi-bin/koha/opac-illrequests.pl">your interlibrary loan requests</a></li>
125	[% END %]	125	[% END %]
126		126
127	[% IF ( recallsview ) %]	127	[% IF Koha.Preference('UseRecalls') %]
128	<li class="active">	128	[% IF ( recallsview ) %]
129	[% ELSE %]	129	<li class="active">
130	<li>	130	[% ELSE %]
		131	<li>
		132	[% END %]
		133	<a href="/cgi-bin/koha/opac-recalls.pl">your recalls history</a></li>
131	[% END %]	134	[% END %]
132	<a href="/cgi-bin/koha/opac-recalls.pl">your recalls history</a></li>
133	</ul>	135	</ul>
134	</div>	136	</div>
135	[% END %]	137	[% END %]

Lines 24-29 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (+4 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	[% IF Koha.Preference('UseRecalls') %]
27	[% IF error %]	28	[% IF error %]
28	<div class="dialog alert">	29	<div class="dialog alert">
29	[% IF error == 'notloggedin' %]	30	[% IF error == 'notloggedin' %]
Lines 52-57 Link Here
52	[% END %]	53	[% END %]
53		54
54	[% END %]	55	[% END %]
		56	[% ELSE %]
		57	Recalls have not been enabled. Please contact your library.
		58	[% END %]
55	</div> <!-- / #discharge -->	59	</div> <!-- / #discharge -->
56	</div> <!-- / .span10 -->	60	</div> <!-- / .span10 -->
57	</div> <!-- / .row-fluid -->	61	</div> <!-- / .row-fluid -->

Lines 26-32 Link Here

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

Lines 159-165 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +2 lines)
159	[% END %]	159	[% END %]
160		160
161	[% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]	161	[% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
162	[% IF ( RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count %])</a></li>[% END %]	162	[% IF ( Koha.Preference('UseRecalls') && RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count %])</a></li>[% END %]
163	[% 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 %]	163	[% 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 %]
164	[% IF ( OverDriveCirculation ) %]	164	[% IF ( OverDriveCirculation ) %]
165	<li><a href="#opac-user-overdrive">OverDrive Account</a></li>	165	<li><a href="#opac-user-overdrive">OverDrive Account</a></li>
Lines 791-797 Link Here
791	</div> <!-- / #opac-user-holds -->	791	</div> <!-- / #opac-user-holds -->
792	[% END # / #RESERVES.count %]	792	[% END # / #RESERVES.count %]
793		793
794	[% IF RECALLS.count %]	794	[% IF Koha.Preference('UseRecalls') && RECALLS.count %]
795	<div id="opac-user-recalls">	795	<div id="opac-user-recalls">
796	<table id="recalls-table" class="table table-bordered table-striped">	796	<table id="recalls-table" class="table table-bordered table-striped">
797	<caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>	797	<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 709-715 if ( not $viewallitems and @items > $max_items_to_display ) { Link Here

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

Return to bug 19532

Lines 160-170 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-5 / +12 lines)
160		160
161	Checkout Policy:	161	Checkout Policy:
162	-	162	-
163	- Mark a recall as problematic if it has been waiting to be picked up for
164	- pref: RecallsMaxPickUpDelay
165	- class: integer
166	- days.
167	-
168	- pref: AllowTooManyOverride	163	- pref: AllowTooManyOverride
169	choices:	164	choices:
170	yes: Allow	165	yes: Allow
Lines 923-928 Circulation: Link Here
923	yes: Enable	918	yes: Enable
924	no: Disable	919	no: Disable
925	- "housebound module"	920	- "housebound module"
		921	Recalls:
		922	-
		923	- pref: UseRecalls
		924	choices:
		925	yes: Use
		926	no: "Don't use"
		927	- recalls
		928	-
		929	- Mark a recall as problematic if it has been waiting to be picked up for
		930	- pref: RecallsMaxPickupDelay
		931	- class: integer
		932	- days.
926	Article Requests:	933	Article Requests:
927	-	934	-
928	- pref: ArticleRequests	935	- pref: ArticleRequests

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

(-)a/members/recallshistory.pl (-2 / +22 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;