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

(-)a/circ/circulation.pl (-2 / +4 lines)
Lines 258-264 if ($findborrower) { Link Here
258
}
258
}
259
259
260
# get the borrower information.....
260
# get the borrower information.....
261
my $patron;
261
if ($borrowernumber) {
262
if ($borrowernumber) {
263
    $patron = Koha::Patrons->find( $borrowernumber );
262
    $borrower = GetMemberDetails( $borrowernumber, 0 );
264
    $borrower = GetMemberDetails( $borrowernumber, 0 );
263
    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
265
    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
264
266
Lines 296-302 if ($borrowernumber) { Link Here
296
        finetotal    => $fines
298
        finetotal    => $fines
297
    );
299
    );
298
300
299
    my $patron = Koha::Patrons->find( $borrowernumber );
300
    if ( $patron and $patron->is_debarred ) {
301
    if ( $patron and $patron->is_debarred ) {
301
        $template->param(
302
        $template->param(
302
            'userdebarred'    => $borrower->{debarred},
303
            'userdebarred'    => $borrower->{debarred},
Lines 594-600 my $view = $batch Link Here
594
595
595
my @relatives;
596
my @relatives;
596
if ( $borrowernumber ) {
597
if ( $borrowernumber ) {
597
    if ( my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ) ) {
598
    if ( $patron ) {
598
        if ( my $guarantor = $patron->guarantor ) {
599
        if ( my $guarantor = $patron->guarantor ) {
599
            push @relatives, $guarantor->borrowernumber;
600
            push @relatives, $guarantor->borrowernumber;
600
            push @relatives, $_->borrowernumber for $patron->siblings;
601
            push @relatives, $_->borrowernumber for $patron->siblings;
Lines 623-628 if ($restoreduedatespec || $stickyduedate) { Link Here
623
}
624
}
624
625
625
$template->param(
626
$template->param(
627
    patron            => $patron,
626
    librarian_messages => $librarian_messages,
628
    librarian_messages => $librarian_messages,
627
    patron_messages   => $patron_messages,
629
    patron_messages   => $patron_messages,
628
    borrower          => $borrower,
630
    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/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 892-897 No patron matched <span class="ex">[% message | html %]</span> Link Here
892
        [% ELSE %]
892
        [% ELSE %]
893
            <a href="#reserves" id="holds-tab">0 Holds</a>
893
            <a href="#reserves" id="holds-tab">0 Holds</a>
894
        [% END %]
894
        [% END %]
895
    </li>
896
897
    [% IF Koha.Preference('ArticleRequests') %]
898
        <li>
899
            <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
900
        </li>
901
    [% END %]
895
902
896
    <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
903
    <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
897
</ul>
904
</ul>
Lines 980-985 No patron matched <span class="ex">[% message | html %]</span> Link Here
980
[% END %]
987
[% END %]
981
</div> <!-- reservesloop -->
988
</div> <!-- reservesloop -->
982
989
990
[% IF Koha.Preference('ArticleRequests') %]
991
    [% INCLUDE 'patron-article-requests.inc' %]
992
[% END %]
993
983
[% ELSIF borrowernumber %]
994
[% ELSIF borrowernumber %]
984
    <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
995
    <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
985
[% END %] <!-- borrowernumber and borrower-->
996
[% END %] <!-- borrowernumber and borrower-->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+10 lines)
Lines 484-489 function validate1(date) { Link Here
484
                <a href="#reserves" id="holds-tab">0 Holds</a>
484
                <a href="#reserves" id="holds-tab">0 Holds</a>
485
            [% END %]
485
            [% END %]
486
        </li>
486
        </li>
487
        [% IF Koha.Preference('ArticleRequests') %]
488
            <li>
489
                <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
490
            </li>
491
        [% END %]
487
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
492
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
488
    </ul>
493
    </ul>
489
494
Lines 575-580 function validate1(date) { Link Here
575
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
580
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
576
	</div>
581
	</div>
577
582
583
584
[% IF Koha.Preference('ArticleRequests') %]
585
    [% INCLUDE 'patron-article-requests.inc' %]
586
[% END %]
587
578
</div>
588
</div>
579
[% END %] <!-- unknowuser -->
589
[% END %] <!-- unknowuser -->
580
590
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 lines)
Lines 734-740 Using this account is not recommended because some parts of Koha will not functi Link Here
734
                            <div id="opac-user-article-requests">
734
                            <div id="opac-user-article-requests">
735
                                <table id="article-requests-table" class="table table-bordered table-striped">
735
                                <table id="article-requests-table" class="table table-bordered table-striped">
736
                                    <caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>
736
                                    <caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>
737
                                    <!-- RESERVES TABLE ROWS -->
738
                                    <thead>
737
                                    <thead>
739
                                        <tr>
738
                                        <tr>
740
                                            <th class="anti-the">Record title</th>
739
                                            <th class="anti-the">Record title</th>
(-)a/members/moremember.pl (-3 / +3 lines)
Lines 310-318 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
310
}
310
}
311
311
312
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
312
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
313
$template->param( $data->{'categorycode'} => 1 ); 
313
$template->param( $data->{'categorycode'} => 1 );
314
$template->param(
314
$template->param(
315
    detailview => 1,
315
    patron          => $patron,
316
    detailview      => 1,
316
    borrowernumber  => $borrowernumber,
317
    borrowernumber  => $borrowernumber,
317
    othernames      => $data->{'othernames'},
318
    othernames      => $data->{'othernames'},
318
    categoryname    => $data->{'description'},
319
    categoryname    => $data->{'description'},
319
- 

Return to bug 14610