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

(-)a/circ/circulation.pl (-2 / +4 lines)
Lines 260-266 if ($findborrower) { Link Here
260
}
260
}
261
261
262
# get the borrower information.....
262
# get the borrower information.....
263
my $patron;
263
if ($borrowernumber) {
264
if ($borrowernumber) {
265
    $patron = Koha::Patrons->find( $borrowernumber );
264
    $borrower = GetMemberDetails( $borrowernumber, 0 );
266
    $borrower = GetMemberDetails( $borrowernumber, 0 );
265
    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
267
    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
266
268
Lines 298-304 if ($borrowernumber) { Link Here
298
        finetotal    => $fines
300
        finetotal    => $fines
299
    );
301
    );
300
302
301
    my $patron = Koha::Patrons->find( $borrowernumber );
302
    if ( $patron and $patron->is_debarred ) {
303
    if ( $patron and $patron->is_debarred ) {
303
        $template->param(
304
        $template->param(
304
            'userdebarred'    => $borrower->{debarred},
305
            '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 625-630 if ($restoreduedatespec || $stickyduedate) { Link Here
625
}
626
}
626
627
627
$template->param(
628
$template->param(
629
    patron            => $patron,
628
    librarian_messages => $librarian_messages,
630
    librarian_messages => $librarian_messages,
629
    patron_messages   => $patron_messages,
631
    patron_messages   => $patron_messages,
630
    borrower          => $borrower,
632
    borrower          => $borrower,
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 43-53 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
43
('AmazonLocale','US','US|CA|DE|FR|JP|UK','Use to set the Locale of your Amazon.com Web Services','Choice'),
43
('AmazonLocale','US','US|CA|DE|FR|JP|UK','Use to set the Locale of your Amazon.com Web Services','Choice'),
44
('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'),
44
('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'),
45
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
45
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
46
('AudioAlerts','0','','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','YesNo'),
47
('ArticleRequests', '0', NULL, 'Enables the article request feature', 'YesNo'),
46
('ArticleRequests', '0', NULL, 'Enables the article request feature', 'YesNo'),
48
('ArticleRequestsMandatoryFields', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''yes''', 'multiple'),
47
('ArticleRequestsMandatoryFields', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''yes''', 'multiple'),
49
('ArticleRequestsMandatoryFieldsItemsOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple'),
48
('ArticleRequestsMandatoryFieldsItemsOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple'),
50
('ArticleRequestsMandatoryFieldsRecordOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''bib_only''', 'multiple'),
49
('ArticleRequestsMandatoryFieldsRecordOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''bib_only''', 'multiple'),
50
('AudioAlerts','0','','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','YesNo'),
51
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
51
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
52
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
52
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
53
('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
53
('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 485-490 function validate1(date) { Link Here
485
                <a href="#reserves" id="holds-tab">0 Holds</a>
485
                <a href="#reserves" id="holds-tab">0 Holds</a>
486
            [% END %]
486
            [% END %]
487
        </li>
487
        </li>
488
        [% IF Koha.Preference('ArticleRequests') %]
489
            <li>
490
                <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
491
            </li>
492
        [% END %]
488
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
493
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
489
    </ul>
494
    </ul>
490
495
Lines 576-581 function validate1(date) { Link Here
576
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
581
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
577
	</div>
582
	</div>
578
583
584
585
[% IF Koha.Preference('ArticleRequests') %]
586
    [% INCLUDE 'patron-article-requests.inc' %]
587
[% END %]
588
579
</div>
589
</div>
580
[% END %] <!-- unknowuser -->
590
[% END %] <!-- unknowuser -->
581
591
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 lines)
Lines 735-741 Using this account is not recommended because some parts of Koha will not functi Link Here
735
                            <div id="opac-user-article-requests">
735
                            <div id="opac-user-article-requests">
736
                                <table id="article-requests-table" class="table table-bordered table-striped">
736
                                <table id="article-requests-table" class="table table-bordered table-striped">
737
                                    <caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>
737
                                    <caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>
738
                                    <!-- RESERVES TABLE ROWS -->
739
                                    <thead>
738
                                    <thead>
740
                                        <tr>
739
                                        <tr>
741
                                            <th class="anti-the">Record title</th>
740
                                            <th class="anti-the">Record title</th>
(-)a/members/moremember.pl (-3 / +3 lines)
Lines 320-328 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
320
}
320
}
321
321
322
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
322
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
323
$template->param( $data->{'categorycode'} => 1 ); 
323
$template->param( $data->{'categorycode'} => 1 );
324
$template->param(
324
$template->param(
325
    detailview => 1,
325
    patron          => $patron,
326
    detailview      => 1,
326
    borrowernumber  => $borrowernumber,
327
    borrowernumber  => $borrowernumber,
327
    othernames      => $data->{'othernames'},
328
    othernames      => $data->{'othernames'},
328
    categoryname    => $data->{'description'},
329
    categoryname    => $data->{'description'},
329
- 

Return to bug 14610