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

(-)a/installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql (+1 lines)
Line 0 Link Here
1
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('UseRecalls','1',NULL,'Enable or disable recalls','YesNo');
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 602-607 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
602
('UseICU','0','1','Tell Koha if ICU indexing is in use for Zebra or not.','YesNo'),
602
('UseICU','0','1','Tell Koha if ICU indexing is in use for Zebra or not.','YesNo'),
603
('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'),
603
('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'),
604
('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'),
604
('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'),
605
('UseRecalls', '1', NULL, 'Enable or disable recalls', 'YesNo'),
605
('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'),
606
('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'),
606
('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'),
607
('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'),
607
('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'),
608
('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +3 lines)
Lines 124-129 Link Here
124
    [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
124
    [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
125
        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | html %]">Interlibrary loans</a></li>
125
        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | html %]">Interlibrary loans</a></li>
126
    [% END %]
126
    [% END %]
127
    <li><a href="/cgi-bin/koha/members/recallshistory.pl">Recalls history</a></li>
127
    [% IF Koha.Preference('UseRecalls') %]
128
        <li><a href="/cgi-bin/koha/members/recallshistory.pl">Recalls history</a></li>
129
    [% END %]
128
</ul></div>
130
</ul></div>
129
[% END %]
131
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-3 / +5 lines)
Lines 39-47 Link Here
39
            [% IF Koha.Preference('OnSiteCheckouts') %]
39
            [% IF Koha.Preference('OnSiteCheckouts') %]
40
                <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
40
                <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
41
            [% END %]
41
            [% END %]
42
            <li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>
42
            [% IF Koha.Preference('UseRecalls') %]
43
            <li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>
43
                <li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li>
44
            <li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>
44
                <li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li>
45
                <li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li>
46
            [% END %]
45
        </ul>
47
        </ul>
46
48
47
    </div>
49
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc (+3 lines)
Lines 23-28 Link Here
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 | html %]">Housebound</a></li>
24
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber | html %]">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 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-5 / +12 lines)
Lines 160-170 Circulation: Link Here
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 955-960 Circulation: Link Here
955
                  yes: Enable
950
                  yes: Enable
956
                  no: Disable
951
                  no: Disable
957
            - "housebound module"
952
            - "housebound module"
953
    Recalls:
954
        -
955
            - pref: UseRecalls
956
             choices:
957
                 yes: Use
958
                 no: "Don't use"
959
            - recalls
960
        -
961
            - Mark a recall as problematic if it has been waiting to be picked up for
962
            - pref: RecallsMaxPickupDelay
963
            - class: integer
964
            - days.
958
    Article Requests:
965
    Article Requests:
959
        -
966
        -
960
            - pref: ArticleRequests
967
            - pref: ArticleRequests
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 819-825 No patron matched <span class="ex">[% message | html %]</span> Link Here
819
        [% END %]
819
        [% END %]
820
    </li>
820
    </li>
821
821
822
    [% IF recalls.count %]
822
    [% IF Koha.Preference('UseRecalls') && recalls.count %]
823
        <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
823
        <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
824
    [% END %]
824
    [% END %]
825
825
Lines 934-940 No patron matched <span class="ex">[% message | html %]</span> Link Here
934
[% END %]
934
[% END %]
935
</div> <!-- reservesloop -->
935
</div> <!-- reservesloop -->
936
936
937
[% IF recalls.count %]
937
[% IF Koha.Preference('UseRecalls') && recalls.count %]
938
    [% INCLUDE 'recalls.inc' %]
938
    [% INCLUDE 'recalls.inc' %]
939
[% END %]
939
[% END %]
940
940
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt (-2 / +4 lines)
Lines 27-33 Link Here
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
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt (-19 / +14 lines)
Lines 27-53 Link Here
27
            <div class="yui-g">
27
            <div class="yui-g">
28
28
29
                <h1>Recalls queue</h1>
29
                <h1>Recalls queue</h1>
30
30
                [% IF Koha.Preference('UseRecalls') %]
31
                [% IF recalls.count %]
31
                    [% IF recalls.count %]
32
32
                        <form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">
33
                    <form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl">
33
                            <input type="hidden" name="op" value="cancel_multiple_recalls">
34
                        <input type="hidden" name="op" value="cancel_multiple_recalls">
34
                            <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
35
35
                            [% INCLUDE 'recalls-reports.inc' %]
36
                        <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
36
                            <fieldset class="action">
37
37
                                <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
38
                        [% INCLUDE 'recalls-reports.inc' %]
38
                            </fieldset>
39
39
                        </form>
40
                        <fieldset class="action">
40
                    [% ELSE %]
41
                            <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
41
                        <div class="dialog message">No recalls have been made.</div>
42
                        </fieldset>
42
                    [% END %]
43
                    </form>
44
45
                [% ELSE %]
43
                [% ELSE %]
46
44
                    <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>
47
                    <div class="dialog message">No recalls have been made.</div>
48
49
                [% END %]
45
                [% END %]
50
51
            </div>
46
            </div>
52
        </div>
47
        </div>
53
48
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt (-1 / +4 lines)
Lines 39-45 Link Here
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
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +4 lines)
Lines 661-666 Link Here
661
                                    [% END %]
661
                                    [% END %]
662
                                </li>
662
                                </li>
663
                            [% END %]
663
                            [% END %]
664
                            [% IF Koha.Preference('UseRecalls') && recalls.count %]
665
                                <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
666
                            [% END %]
664
                            [% IF Koha.Preference('ArticleRequests') %]
667
                            [% IF Koha.Preference('ArticleRequests') %]
665
                                <li>
668
                                <li>
666
                                    <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count | html %] Article requests</a>
669
                                    <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count | html %] Article requests</a>
Lines 777-783 Link Here
777
                                [% END %]
780
                                [% END %]
778
                            </div> [% # /div#reserves %]
781
                            </div> [% # /div#reserves %]
779
                        [% END %]
782
                        [% END %]
780
                        [% IF recalls %]
783
                        [% IF Koha.Preferernce('UseRecalls') && recalls %]
781
                            [% INCLUDE 'recalls.inc' %]
784
                            [% INCLUDE 'recalls.inc' %]
782
                        [% END %]
785
                        [% END %]
783
786
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-4 / +7 lines)
Lines 1-7 Link Here
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
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc (-5 / +7 lines)
Lines 124-135 Link Here
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 %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (+4 lines)
Lines 24-29 Link Here
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 -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt (-2 / +4 lines)
Lines 26-32 Link Here
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 -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +2 lines)
Lines 159-165 Link Here
159
                            [% END %]
159
                            [% END %]
160
160
161
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a></li>[% END %]
161
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a></li>[% END %]
162
                            [% IF ( RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</a></li>[% END %]
162
                            [% IF ( Koha.Preference('UseRecalls') &&  RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</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 | html %])</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 | html %])</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 783-789 Link Here
783
                        </div> <!-- / #opac-user-holds -->
783
                        </div> <!-- / #opac-user-holds -->
784
                        [% END # / #RESERVES.count %]
784
                        [% END # / #RESERVES.count %]
785
785
786
                        [% IF RECALLS.count %]
786
                        [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
787
                            <div id="opac-user-recalls">
787
                            <div id="opac-user-recalls">
788
                                <table id="recalls-table" class="table table-bordered table-striped">
788
                                <table id="recalls-table" class="table table-bordered table-striped">
789
                                    <caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>
789
                                    <caption>Recalls <span class="count">([% RECALLS.count %])</span></caption>
(-)a/members/recallshistory.pl (-2 / +22 lines)
Lines 44-53 my $recalls = Koha::Recalls->search({ borrowernumber => $loggedinuser }); Link Here
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;
(-)a/opac/opac-detail.pl (-2 / +1 lines)
Lines 709-715 if ( not $viewallitems and @items > $max_items_to_display ) { Link Here
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