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

(-)a/circ/circulation.pl (-2 / +4 lines)
Lines 261-267 if ($findborrower) { Link Here
261
}
261
}
262
262
263
# get the borrower information.....
263
# get the borrower information.....
264
my $patron;
264
if ($borrowernumber) {
265
if ($borrowernumber) {
266
    $patron = Koha::Patrons->find( $borrowernumber );
265
    $borrower = GetMemberDetails( $borrowernumber, 0 );
267
    $borrower = GetMemberDetails( $borrowernumber, 0 );
266
    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
268
    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
267
269
Lines 299-305 if ($borrowernumber) { Link Here
299
        finetotal    => $fines
301
        finetotal    => $fines
300
    );
302
    );
301
303
302
    my $patron = Koha::Patrons->find( $borrowernumber );
303
    if ( $patron and $patron->is_debarred ) {
304
    if ( $patron and $patron->is_debarred ) {
304
        $template->param(
305
        $template->param(
305
            'userdebarred'    => $borrower->{debarred},
306
            'userdebarred'    => $borrower->{debarred},
Lines 596-602 my $view = $batch Link Here
596
597
597
my @relatives;
598
my @relatives;
598
if ( $borrowernumber ) {
599
if ( $borrowernumber ) {
599
    if ( my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ) ) {
600
    if ( $patron ) {
600
        if ( my $guarantor = $patron->guarantor ) {
601
        if ( my $guarantor = $patron->guarantor ) {
601
            push @relatives, $guarantor->borrowernumber;
602
            push @relatives, $guarantor->borrowernumber;
602
            push @relatives, $_->borrowernumber for $patron->siblings;
603
            push @relatives, $_->borrowernumber for $patron->siblings;
Lines 626-631 if ($restoreduedatespec || $stickyduedate) { Link Here
626
}
627
}
627
628
628
$template->param(
629
$template->param(
630
    patron            => $patron,
629
    librarian_messages => $librarian_messages,
631
    librarian_messages => $librarian_messages,
630
    patron_messages   => $patron_messages,
632
    patron_messages   => $patron_messages,
631
    borrower          => $borrower,
633
    borrower          => $borrower,
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 44-54 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
44
('AmazonLocale','US','US|CA|DE|FR|JP|UK','Use to set the Locale of your Amazon.com Web Services','Choice'),
44
('AmazonLocale','US','US|CA|DE|FR|JP|UK','Use to set the Locale of your Amazon.com Web Services','Choice'),
45
('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'),
45
('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'),
46
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
46
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
47
('AudioAlerts','0','','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','YesNo'),
48
('ArticleRequests', '0', NULL, 'Enables the article request feature', 'YesNo'),
47
('ArticleRequests', '0', NULL, 'Enables the article request feature', 'YesNo'),
49
('ArticleRequestsMandatoryFields', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''yes''', 'multiple'),
48
('ArticleRequestsMandatoryFields', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''yes''', 'multiple'),
50
('ArticleRequestsMandatoryFieldsItemsOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple'),
49
('ArticleRequestsMandatoryFieldsItemsOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple'),
51
('ArticleRequestsMandatoryFieldsRecordOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''bib_only''', 'multiple'),
50
('ArticleRequestsMandatoryFieldsRecordOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''bib_only''', 'multiple'),
51
('AudioAlerts','0','','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','YesNo'),
52
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
52
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
53
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
53
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
54
('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
54
('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc (+91 lines)
Line 0 Link Here
1
<div id="article-requests">
2
[% IF patron.article_requests_current.count %]
3
    <table id="article-requests-table" class="table table-bordered table-striped">
4
        <thead>
5
            <tr>
6
                <th class="anti-the">Record title</th>
7
                <th class="psort">Placed on</th>
8
                <th class="anti-the">Title</th>
9
                <th>Author</th>
10
                <th>Volume</th>
11
                <th>Issue</th>
12
                <th>Date</th>
13
                <th>Pages</th>
14
                <th>Chapters</th>
15
                <th>Notes</th>
16
                <th>Status</th>
17
                <th>Pickup library</th>
18
            </tr>
19
        </thead>
20
21
        <tbody>
22
            [% FOREACH ar IN patron.article_requests_current %]
23
                <tr>
24
                    <td class="article-request-title">
25
                        <a class="article-request-title" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber %]">
26
                            [% ar.biblio.title %]
27
                            [% ar.item.enumchron %]
28
                        </a>
29
                        [% ar.biblio.author %]
30
                        [% IF ar.itemnumber %] <i>(only [% ar.item.barcode %])</i>[% END %]
31
                    </td>
32
33
                    <td class="article-request-created_on">
34
                        [% ar.created_on | $KohaDates %]
35
                    </td>
36
37
                    <td class="article-request-title">
38
                        [% ar.title %]
39
                    </td>
40
41
                    <td class="article-request-author">
42
                        [% ar.author %]
43
                    </td>
44
45
                    <td class="article-request-volume">
46
                        [% ar.volume %]
47
                    </td>
48
49
                    <td class="article-request-issue">
50
                        [% ar.issue %]
51
                    </td>
52
53
                    <td class="article-request-date">
54
                        [% ar.date %]
55
                    </td>
56
57
                    <td class="article-request-pages">
58
                        [% ar.pages %]
59
                    </td>
60
61
                    <td class="article-request-chapters">
62
                        [% ar.chapters %]
63
                    </td>
64
65
                    <td class="article-request-patron-notes">
66
                        [% ar.patron_notes %]
67
                    </td>
68
69
                    <td class="article-request-status">
70
                        [% IF ar.status == 'PENDING' %]
71
                            Pending
72
                        [% ELSIF ar.status == 'PROCESSING' %]
73
                            Processing
74
                        [% ELSIF ar.status == 'COMPLETED' %]
75
                            Completed
76
                        [% ELSIF ar.status == 'CANCELED' %]
77
                            Canceled
78
                        [% END %]
79
                    </td>
80
81
                    <td class="article-request-branchcode">
82
                        [% ar.branch.branchname %]
83
                    </td>
84
                </tr>
85
            [% END %]
86
        </tbody>
87
    </table>
88
    [% ELSE %]
89
        Patron has no current article requests.
90
    [% END %]
91
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (-4 / +4 lines)
Lines 252-273 Link Here
252
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="ar-actions">
252
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="ar-actions">
253
                                                    <li>
253
                                                    <li>
254
                                                        <a class="ar-process-request" href="#" onclick="Process( [% ar.id %], $(this) ); return false;">
254
                                                        <a class="ar-process-request" href="#" onclick="Process( [% ar.id %], $(this) ); return false;">
255
                                                            <i class="icon-ok-circle"></i>
255
                                                            <i class="fa fa-cog"></i>
256
                                                            Process request
256
                                                            Process request
257
                                                        </a>
257
                                                        </a>
258
258
259
                                                        <a class="ar-complete-request" href="#" onclick="Complete( [% ar.id %], $(this) ); return false;">
259
                                                        <a class="ar-complete-request" href="#" onclick="Complete( [% ar.id %], $(this) ); return false;">
260
                                                            <i class="icon-ok-circle"></i>
260
                                                            <i class="fa fa-check-circle"></i>
261
                                                            Complete request
261
                                                            Complete request
262
                                                        </a>
262
                                                        </a>
263
263
264
                                                        <a class="ar-cancel-request" href="#" onclick="Cancel( [% ar.id %], $(this) ); return false;">
264
                                                        <a class="ar-cancel-request" href="#" onclick="Cancel( [% ar.id %], $(this) ); return false;">
265
                                                            <i class="icon-remove-circle"></i>
265
                                                            <i class="fa fa-minus-circle"></i>
266
                                                            Cancel request
266
                                                            Cancel request
267
                                                        </a>
267
                                                        </a>
268
268
269
                                                        <a class="ar-print-request" href="#" onclick="PrintSlip('article-request-slip.pl?id=[% ar.id %]'); return false;">
269
                                                        <a class="ar-print-request" href="#" onclick="PrintSlip('article-request-slip.pl?id=[% ar.id %]'); return false;">
270
                                                            <i class="icon-print"></i>
270
                                                            <i class="fa fa-print"></i>
271
                                                            Print slip
271
                                                            Print slip
272
                                                        </a>
272
                                                        </a>
273
                                                    </li>
273
                                                    </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+11 lines)
Lines 896-901 No patron matched <span class="ex">[% message | html %]</span> Link Here
896
        [% ELSE %]
896
        [% ELSE %]
897
            <a href="#reserves" id="holds-tab">0 Holds</a>
897
            <a href="#reserves" id="holds-tab">0 Holds</a>
898
        [% END %]
898
        [% END %]
899
    </li>
900
901
    [% IF Koha.Preference('ArticleRequests') %]
902
        <li>
903
            <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
904
        </li>
905
    [% END %]
899
906
900
    <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
907
    <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
901
</ul>
908
</ul>
Lines 984-989 No patron matched <span class="ex">[% message | html %]</span> Link Here
984
[% END %]
991
[% END %]
985
</div> <!-- reservesloop -->
992
</div> <!-- reservesloop -->
986
993
994
[% IF Koha.Preference('ArticleRequests') %]
995
    [% INCLUDE 'patron-article-requests.inc' %]
996
[% END %]
997
987
[% ELSIF borrowernumber %]
998
[% ELSIF borrowernumber %]
988
    <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
999
    <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
989
[% END %] <!-- borrowernumber and borrower-->
1000
[% END %] <!-- borrowernumber and borrower-->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+10 lines)
Lines 513-518 function validate1(date) { Link Here
513
                <a href="#reserves" id="holds-tab">0 Holds</a>
513
                <a href="#reserves" id="holds-tab">0 Holds</a>
514
            [% END %]
514
            [% END %]
515
        </li>
515
        </li>
516
        [% IF Koha.Preference('ArticleRequests') %]
517
            <li>
518
                <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
519
            </li>
520
        [% END %]
516
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
521
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
517
    </ul>
522
    </ul>
518
523
Lines 604-609 function validate1(date) { Link Here
604
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
609
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
605
	</div>
610
	</div>
606
611
612
613
[% IF Koha.Preference('ArticleRequests') %]
614
    [% INCLUDE 'patron-article-requests.inc' %]
615
[% END %]
616
607
</div>
617
</div>
608
[% END %] <!-- unknowuser -->
618
[% END %] <!-- unknowuser -->
609
619
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 lines)
Lines 722-728 Using this account is not recommended because some parts of Koha will not functi Link Here
722
                            <div id="opac-user-article-requests">
722
                            <div id="opac-user-article-requests">
723
                                <table id="article-requests-table" class="table table-bordered table-striped">
723
                                <table id="article-requests-table" class="table table-bordered table-striped">
724
                                    <caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>
724
                                    <caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>
725
                                    <!-- RESERVES TABLE ROWS -->
726
                                    <thead>
725
                                    <thead>
727
                                        <tr>
726
                                        <tr>
728
                                            <th class="anti-the">Record title</th>
727
                                            <th class="anti-the">Record title</th>
(-)a/members/moremember.pl (-3 / +3 lines)
Lines 323-331 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
323
}
323
}
324
324
325
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
325
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
326
$template->param( $data->{'categorycode'} => 1 ); 
326
$template->param( $data->{'categorycode'} => 1 );
327
$template->param(
327
$template->param(
328
    detailview => 1,
328
    patron          => $patron,
329
    detailview      => 1,
329
    borrowernumber  => $borrowernumber,
330
    borrowernumber  => $borrowernumber,
330
    othernames      => $data->{'othernames'},
331
    othernames      => $data->{'othernames'},
331
    categoryname    => $data->{'description'},
332
    categoryname    => $data->{'description'},
332
- 

Return to bug 14610