Attachment #163621 for bug #36376

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

Lines 305-310 if ($patron) { Link Here

(-)a/circ/circulation.pl (+3 lines)
305	$template->param( age_high => $patron->category->upperagelimit );	305	$template->param( age_high => $patron->category->upperagelimit );
306	}	306	}
307		307
		308	unless ( Koha::Patron::Categories->search_with_library_limits( { 'me.categorycode' => $patron->categorycode } )->count ) {
		309	$template->param( limited_category => 1 );
		310	}
308	}	311	}
309		312
310	#	313	#




[% USE raw %]
[% USE Branches %]
[% USE Categories %]
[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
[% SET return_claims = patron.return_claims %]
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]

[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || limited_category || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %]
    <h3>Attention</h3>
    <ul>
        [% IF ( has_modifications ) %]

            </li>
        [% END %]

        [% IF limited_category %]
            <li class="limited_category">
                <span class="circ-hlt">The patron's current category ([% Categories.GetName(patron.categorycode) | html %]) is limited to other libraries.</span>
                <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3" class="btn btn-default btn-xs">Change category</a>
            </li>
        [% END %]

        [% IF ( charges ) %]
            [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
        [% END %]

Lines 37-42 use List::MoreUtils qw( uniq ); Link Here

(-)a/members/moremember.pl (-1 / +5 lines)
37	use Scalar::Util qw( looks_like_number );	37	use Scalar::Util qw( looks_like_number );
38	use Koha::Patron::Attribute::Types;	38	use Koha::Patron::Attribute::Types;
39	use Koha::Patron::Restriction::Types;	39	use Koha::Patron::Restriction::Types;
		40	use Koha::Patron::Categories;
40	use Koha::Patron::Messages;	41	use Koha::Patron::Messages;
41	use Koha::CsvProfiles;	42	use Koha::CsvProfiles;
42	use Koha::Holds;	43	use Koha::Holds;
Lines 132-137 if ( !$patron->is_valid_age ) { Link Here
132	$template->param( age_high => $patron->category->upperagelimit );	133	$template->param( age_high => $patron->category->upperagelimit );
133	}	134	}
134		135
		136	unless ( Koha::Patron::Categories->search_with_library_limits( { 'me.categorycode' => $patron->categorycode } )->count ) {
		137	$template->param( limited_category => 1 );
		138	}
		139
135	if (C4::Context->preference('ExtendedPatronAttributes')) {	140	if (C4::Context->preference('ExtendedPatronAttributes')) {
136	my @attributes = $patron->extended_attributes->as_list; # FIXME Must be improved!	141	my @attributes = $patron->extended_attributes->as_list; # FIXME Must be improved!
137	my @classes = uniq( map {$_->type->class} @attributes );	142	my @classes = uniq( map {$_->type->class} @attributes );
138	-

Return to bug 36376

Lines 1-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-1 / +9 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Branches %]	2	[% USE Branches %]
		3	[% USE Categories %]
3	[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]	4	[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
4	[% SET return_claims = patron.return_claims %]	5	[% SET return_claims = patron.return_claims %]
5	[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]	6	[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
6		7
7	[% IF ( has_modifications \|\| warndeparture \|\| returnbeforeexpiry \|\| expired \|\| patron.gonenoaddress \|\| patron.lost \|\| userdebarred \|\| odues \|\| ( return_claims.count > ClaimReturnedWarningThreshold ) \|\| age_limitations \|\| charges \|\| charges_guarantors_guarantees \|\| charges_guarantees \|\| credits ) %]	8	[% IF ( has_modifications \|\| warndeparture \|\| returnbeforeexpiry \|\| expired \|\| patron.gonenoaddress \|\| patron.lost \|\| userdebarred \|\| odues \|\| ( return_claims.count > ClaimReturnedWarningThreshold ) \|\| age_limitations \|\| limited_category \|\| charges \|\| charges_guarantors_guarantees \|\| charges_guarantees \|\| credits ) %]
8	<h3>Attention</h3>	9	<h3>Attention</h3>
9	<ul>	10	<ul>
10	[% IF ( has_modifications ) %]	11	[% IF ( has_modifications ) %]
Lines 97-102 Link Here
97	</li>	98	</li>
98	[% END %]	99	[% END %]
99		100
		101	[% IF limited_category %]
		102	<li class="limited_category">
		103	<span class="circ-hlt">The patron's current category ([% Categories.GetName(patron.categorycode) \| html %]) is limited to other libraries.</span>
		104	<a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&borrowernumber=[% patron.borrowernumber \| uri %]&step=3" class="btn btn-default btn-xs">Change category</a>
		105	</li>
		106	[% END %]
		107
100	[% IF ( charges ) %]	108	[% IF ( charges ) %]
101	[% INCLUDE 'blocked-fines.inc' fines = chargesamount %]	109	[% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
102	[% END %]	110	[% END %]