Attachment #64213 for bug #18789

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

Lines 607-613 if ( $patron ) { Link Here

(-)a/circ/circulation.pl (-1 lines)
607	categoryname => $patron->category->description,	607	categoryname => $patron->category->description,
608	expiry => $patron->dateexpiry,	608	expiry => $patron->dateexpiry,
609	is_child => ( $patron->category->category_type eq 'C' ),	609	is_child => ( $patron->category->category_type eq 'C' ),
610	picture => ( $patron->image ? 1 : 0 ),
611	);	610	);
612	}	611	}
613		612

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-2 / +2 lines)
7	<![endif]-->	7	<![endif]-->
8	<ul class="patronbriefinfo">	8	<ul class="patronbriefinfo">
9	[% IF ( patronimages ) %]	9	[% IF ( patronimages ) %]
10	[% IF ( picture ) %]	10	[% IF ( patron.image ) %]
11	<li>	11	<li>
12	<img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber \| uri %]" id="patronimage" alt="[% patron.firstname \| html %] [% patron.surname \| html %] ([% patron.cardnumber \| html %])" />	12	<img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber \| uri %]" id="patronimage" alt="[% patron.firstname \| html %] [% patron.surname \| html %] ([% patron.cardnumber \| html %])" />
13	</li>	13	</li>
Lines 92-98 Link Here
92	[% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% patron.borrowernumber %]&src=circ">Modification log</a></li>	92	[% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% patron.borrowernumber %]&src=circ">Modification log</a></li>
93	[% END %]	93	[% END %]
94	[% IF CAN_user_borrowers_edit_borrowers %]	94	[% IF CAN_user_borrowers_edit_borrowers %]
95	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">Notices</a></li>	95	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">Notices</a></li>
96	[% END %]	96	[% END %]
97	[% IF CAN_user_borrowers_edit_borrowers %]	97	[% IF CAN_user_borrowers_edit_borrowers %]
98	[% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">Statistics</a></li>	98	[% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">Statistics</a></li>




        ],
        "bPaginate": false
    }));
    [% IF ( patron.image ) %]
    // new YAHOO.widget.Button("delpicture");   // FIXME: formatting mismatch between YUI and normal button
	$('#delpicture').click(function(){
		 return confirm(_("Are you sure you want to delete this patron image? This cannot be undone."));

    [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
        <form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
            <fieldset class="brief">
            [% IF ( patron.image ) %]
                <legend>Manage patron image</legend>
                <div class="hint">To update the image for [% patron.title | html %] [% patron.surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.
            [% ELSE %]

                    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
                    <input type="submit" value="Upload" class="submit" />
                    <input name="op" type="hidden" value="Upload" />
                    [% IF ( patron.image ) %]<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&amp;borrowernumber=[% patron.borrowernumber %]&amp;csrf_token=[% csrf_token %]" class="delete">Delete</a>[% END %]
                </fieldset>
            </fieldset>
        </form>

<div class="rows"> 
<ol>
    <li><span class="label">Card number: </span>[% patron.cardnumber %]</li>
    <li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>
    <li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>
    <li><span class="label">Registration date: </span>[% patron.dateenrolled | $KohaDates %]</li>

    <li><span class="label">Expiration date: </span>
    [% IF ( was_renewed ) %]
            <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>

    <li><span class="label">First name: </span>[% patron.altcontactfirstname | html %]</li>
    <li><span class="label">Address: </span>[% patron.altcontactaddress1 | html %]</li>
    <li><span class="label">Address 2: </span>[% patron.altcontactaddress2 | html %]</li>
    <li><span class="label">City: </span>[% patron.altcontactaddress3 | html %]</li>
    [% IF ( patron.altcontactstate ) %]<li><span class="label">State: </span>[% patron.altcontactstate | html %]</li>[% END %]
    <li><span class="label">ZIP/Postal code: </span>[% patron.altcontactzipcode | html %]</li>
    [% IF ( patron.altcontactcountry ) %]<li><span class="label">Country: </span>[% patron.altcontactcountry | html %]</li>[% END %]
    [% IF ( patron.altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.altcontactphone | url %]">[% patron.altcontactphone | html %]</a></li>[% END %]
    </ol></div>
</div>

Lines 95-102 foreach my $accountline ( @{$accts}) { Link Here

(-)a/members/boraccount.pl (-2 lines)
95		95
96	$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A\|I)$/ );	96	$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A\|I)$/ );
97		97
98	$template->param( picture => 1 ) if $patron->image;
99
100	if (C4::Context->preference('ExtendedPatronAttributes')) {	98	if (C4::Context->preference('ExtendedPatronAttributes')) {
101	my $attributes = GetBorrowerAttributes($borrowernumber);	99	my $attributes = GetBorrowerAttributes($borrowernumber);
102	$template->param(	100	$template->param(

Lines 109-115 my $op = $input->param('op') \|\| 'delete_confirm'; Link Here

(-)a/members/deletemem.pl (-1 lines)
109	my $dbh = C4::Context->dbh;	109	my $dbh = C4::Context->dbh;
110	my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);	110	my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);
111	if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'} or $is_guarantor or $deletelocal == 0) {	111	if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'} or $is_guarantor or $deletelocal == 0) {
112	$template->param( picture => 1 ) if $patron->image;
113		112
114	$template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A\|I)$/;	113	$template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A\|I)$/;
115		114

Lines 103-110 my @validated_discharges = Koha::Patron::Discharge::get_validated({ Link Here

(-)a/members/discharge.pl (-2 lines)
103	borrowernumber => $borrowernumber,	103	borrowernumber => $borrowernumber,
104	});	104	});
105		105
106	$template->param( picture => 1 ) if $patron->image;
107
108	$template->param(	106	$template->param(
109	patron => $patron,	107	patron => $patron,
110	can_be_discharged => $can_be_discharged,	108	can_be_discharged => $can_be_discharged,

Lines 117-124 else { Link Here

(-)a/members/files.pl (-2 lines)
117	);	117	);
118	}	118	}
119		119
120	$template->param( picture => 1 ) if $patron->image;
121
122	$template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' \|\| $data->{category_type} eq 'I' );	120	$template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' \|\| $data->{category_type} eq 'I' );
123	$template->param(	121	$template->param(
124	files => Koha::Patron::Files->new( borrowernumber => $borrowernumber )	122	files => Koha::Patron::Files->new( borrowernumber => $borrowernumber )




output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );

# Get supporting cast
my ( $branch, $category, $houseboundprofile, $visit );
if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it
    $patron_image = $patron->image;
    $category = Koha::Patron::Categories->new->find($patron->categorycode);
    $houseboundprofile = $patron->housebound_profile;
}


$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
$template->param(
    picture            => $patron_image,
    housebound_profile => $houseboundprofile,
    visit              => $houseboundvisit,
    messages           => \@messages,

Lines 83-89 if ($add){ Link Here

(-)a/members/mancredit.pl (-1 lines)
83	}	83	}
84		84
85	$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A\|I)$/ );	85	$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A\|I)$/ );
86	$template->param( picture => 1 ) if $patron->image;
87		86
88	if (C4::Context->preference('ExtendedPatronAttributes')) {	87	if (C4::Context->preference('ExtendedPatronAttributes')) {
89	my $attributes = GetBorrowerAttributes($borrowernumber);	88	my $attributes = GetBorrowerAttributes($borrowernumber);

Lines 110-116 if ($add){ Link Here

(-)a/members/maninvoice.pl (-1 lines)
110	}	110	}
111		111
112	$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A\|I)$/ );	112	$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A\|I)$/ );
113	$template->param( picture => 1 ) if $patron->image;
114		113
115	if (C4::Context->preference('ExtendedPatronAttributes')) {	114	if (C4::Context->preference('ExtendedPatronAttributes')) {
116	my $attributes = GetBorrowerAttributes($borrowernumber);	115	my $attributes = GetBorrowerAttributes($borrowernumber);

Lines 19-25 use Koha::Patron::Categories; Link Here

(-)a/members/member-flags.pl (-2 lines)
19	use Koha::Patrons;	19	use Koha::Patrons;
20		20
21	use C4::Output;	21	use C4::Output;
22	use Koha::Patron::Images;
23	use Koha::Token;	22	use Koha::Token;
24		23
25	my $input = new CGI;	24	my $input = new CGI;
Lines 185-191 if ($input->param('newflags')) { Link Here
185	}	184	}
186		185
187	$template->param( adultborrower => 1 ) if ( $category_type =~ /^(A\|I)$/ );	186	$template->param( adultborrower => 1 ) if ( $category_type =~ /^(A\|I)$/ );
188	$template->param( picture => 1 ) if $patron->image;
189		187
190	if (C4::Context->preference('ExtendedPatronAttributes')) {	188	if (C4::Context->preference('ExtendedPatronAttributes')) {
191	my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});	189	my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});

Lines 109-116 if ( $category_type eq 'C') { Link Here

(-)a/members/member-password.pl (-2 lines)
109		109
110	$template->param( adultborrower => 1 ) if ( $category_type =~ /^(A\|I)$/ );	110	$template->param( adultborrower => 1 ) if ( $category_type =~ /^(A\|I)$/ );
111		111
112	$template->param( picture => 1 ) if $patron->image;
113
114	if ( C4::Context->preference('ExtendedPatronAttributes') ) {	112	if ( C4::Context->preference('ExtendedPatronAttributes') ) {
115	my $attributes = GetBorrowerAttributes( $bor->{'borrowernumber'} );	113	my $attributes = GetBorrowerAttributes( $bor->{'borrowernumber'} );
116	$template->param(	114	$template->param(




use Koha::AuthorisedValues;
use Koha::CsvProfiles;
use Koha::Patron::Debarments qw(GetDebarments);
use Koha::Patron::Images;
use Module::Load;
if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
    load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );

    }
}

# check to see if patron's image exists in the database
# basically this gives us a template var to condition the display of
# patronimage related interface on
$template->param( picture => 1 ) if $patron->image;
# Generate CSRF token for upload and delete image buttons
$template->param(
    csrf_token => Koha::Token->new->generate_csrf({ session_id => $input->cookie('CGISESSID'),}),

Lines 48-55 my ($template, $loggedinuser, $cookie) Link Here

(-)a/members/notices.pl (-2 lines)
48	my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";	48	my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
49	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );	49	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
50		50
51	$template->param( picture => 1 ) if $patron->image;
52
53	# Allow resending of messages in Notices tab	51	# Allow resending of messages in Notices tab
54	my $op = $input->param('op') \|\| q{};	52	my $op = $input->param('op') \|\| q{};
55	if ( $op eq 'resend_notice' ) {	53	if ( $op eq 'resend_notice' ) {

Lines 41-47 use C4::Koha; Link Here

(-)a/members/pay.pl (-3 lines)
41	use C4::Overdues;	41	use C4::Overdues;
42	use C4::Members::Attributes qw(GetBorrowerAttributes);	42	use C4::Members::Attributes qw(GetBorrowerAttributes);
43	use Koha::Patrons;	43	use Koha::Patrons;
44	use Koha::Patron::Images;
45		44
46	use Koha::Patron::Categories;	45	use Koha::Patron::Categories;
47	use URI::Escape;	46	use URI::Escape;
Lines 146-153 sub add_accounts_to_template { Link Here
146	}	145	}
147	borrower_add_additional_fields($patron->unblessed);	146	borrower_add_additional_fields($patron->unblessed);
148		147
149	my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
150	$template->param( picture => 1 ) if $patron_image;
151	$template->param(	148	$template->param(
152	accounts => $accounts,	149	accounts => $accounts,
153	patron => $patron,	150	patron => $patron,




use C4::Members::Attributes qw(GetBorrowerAttributes);
use C4::Accounts;
use C4::Koha;
use Koha::Patron::Images;
use Koha::Patrons;
use Koha::Account;


        $b_ref->{adultborrower} = 1;
    }

    my $patron_image = Koha::Patron::Images->find($b_ref->{borrowernumber});
    $template->param( picture => 1 ) if $patron_image;

    if (C4::Context->preference('ExtendedPatronAttributes')) {
        $b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber});
    }

Lines 117-124 for (my $i=0;$i<$numaccts;$i++){ Link Here

(-)a/members/printfeercpt.pl (-2 lines)
117		117
118	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );	118	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );
119		119
120	$template->param( picture => 1 ) if $patron->image;
121
122	$template->param(	120	$template->param(
123	patron => $patron,	121	patron => $patron,
124	finesview => 1,	122	finesview => 1,

Lines 117-124 for ( my $i = 0 ; $i < $numaccts ; $i++ ) { Link Here

(-)a/members/printinvoice.pl (-2 lines)
117		117
118	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );	118	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );
119		119
120	$template->param( picture => 1 ) if $patron->image;
121
122	$template->param(	120	$template->param(
123	patron => $patron,	121	patron => $patron,
124	finesview => 1,	122	finesview => 1,

Lines 61-68 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here

(-)a/members/purchase-suggestions.pl (-2 lines)
61	);	61	);
62	}	62	}
63		63
64	$template->param( picture => 1 ) if $patron->image;
65
66	my $suggestions = SearchSuggestion( { suggestedby => $borrowernumber } );	64	my $suggestions = SearchSuggestion( { suggestedby => $borrowernumber } );
67		65
68	$template->param( suggestions => $suggestions );	66	$template->param( suggestions => $suggestions );

Lines 105-112 if (! $limit){ Link Here

(-)a/members/readingrec.pl (-2 lines)
105	$limit = 'full';	105	$limit = 'full';
106	}	106	}
107		107
108	$template->param( picture => 1 ) if $patron->image;
109
110	if (C4::Context->preference('ExtendedPatronAttributes')) {	108	if (C4::Context->preference('ExtendedPatronAttributes')) {
111	my $attributes = GetBorrowerAttributes($patron->borrowernumber);	109	my $attributes = GetBorrowerAttributes($patron->borrowernumber);
112	$template->param(	110	$template->param(

Lines 89-94 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here

(-)a/members/routing-lists.pl (-2 lines)
89	);	89	);
90	}	90	}
91		91
92	$template->param( picture => 1 ) if $patron and $patron->image;
93
94	output_html_with_http_headers $query, $cookie, $template->output;	92	output_html_with_http_headers $query, $cookie, $template->output;

Lines 84-91 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here

(-)a/members/statistics.pl (-3 lines)
84	);	84	);
85	}	85	}
86		86
87	$template->param( picture => 1 ) if $patron->image;
88
89	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );	87	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );
90		88
91	$template->param(	89	$template->param(
92	-

Return to bug 18789

Lines 73-79 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-7 / +7 lines)
73	],	73	],
74	"bPaginate": false	74	"bPaginate": false
75	}));	75	}));
76	[% IF ( picture ) %]	76	[% IF ( patron.image ) %]
77	// new YAHOO.widget.Button("delpicture"); // FIXME: formatting mismatch between YUI and normal button	77	// new YAHOO.widget.Button("delpicture"); // FIXME: formatting mismatch between YUI and normal button
78	$('#delpicture').click(function(){	78	$('#delpicture').click(function(){
79	return confirm(_("Are you sure you want to delete this patron image? This cannot be undone."));	79	return confirm(_("Are you sure you want to delete this patron image? This cannot be undone."));
Lines 288-294 function validate1(date) { Link Here
288	[% IF ( CAN_user_tools_batch_upload_patron_images ) %]	288	[% IF ( CAN_user_tools_batch_upload_patron_images ) %]
289	<form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">	289	<form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">
290	<fieldset class="brief">	290	<fieldset class="brief">
291	[% IF ( picture ) %]	291	[% IF ( patron.image ) %]
292	<legend>Manage patron image</legend>	292	<legend>Manage patron image</legend>
293	<div class="hint">To update the image for [% patron.title \| html %] [% patron.surname \| html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.	293	<div class="hint">To update the image for [% patron.title \| html %] [% patron.surname \| html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.
294	[% ELSE %]	294	[% ELSE %]
Lines 309-315 function validate1(date) { Link Here
309	<input type="hidden" name="csrf_token" value="[% csrf_token %]" />	309	<input type="hidden" name="csrf_token" value="[% csrf_token %]" />
310	<input type="submit" value="Upload" class="submit" />	310	<input type="submit" value="Upload" class="submit" />
311	<input name="op" type="hidden" value="Upload" />	311	<input name="op" type="hidden" value="Upload" />
312	[% IF ( picture ) %]<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&borrowernumber=[% patron.borrowernumber %]&csrf_token=[% csrf_token %]" class="delete">Delete</a>[% END %]	312	[% IF ( patron.image ) %]<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&borrowernumber=[% patron.borrowernumber %]&csrf_token=[% csrf_token %]" class="delete">Delete</a>[% END %]
313	</fieldset>	313	</fieldset>
314	</fieldset>	314	</fieldset>
315	</form>	315	</form>
Lines 396-405 function validate1(date) { Link Here
396	<div class="rows">	396	<div class="rows">
397	<ol>	397	<ol>
398	<li><span class="label">Card number: </span>[% patron.cardnumber %]</li>	398	<li><span class="label">Card number: </span>[% patron.cardnumber %]</li>
399	<li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>	399	<li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>
400	<li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>	400	<li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>
401	<li><span class="label">Registration date: </span>[% patron.dateenrolled \| $KohaDates %]</li>	401	<li><span class="label">Registration date: </span>[% patron.dateenrolled \| $KohaDates %]</li>
402		402
403	<li><span class="label">Expiration date: </span>	403	<li><span class="label">Expiration date: </span>
404	[% IF ( was_renewed ) %]	404	[% IF ( was_renewed ) %]
405	<strong class="reregistrinfo">[% patron.dateexpiry \| $KohaDates %]</strong>	405	<strong class="reregistrinfo">[% patron.dateexpiry \| $KohaDates %]</strong>
Lines 494-503 function validate1(date) { Link Here
494	<li><span class="label">First name: </span>[% patron.altcontactfirstname \| html %]</li>	494	<li><span class="label">First name: </span>[% patron.altcontactfirstname \| html %]</li>
495	<li><span class="label">Address: </span>[% patron.altcontactaddress1 \| html %]</li>	495	<li><span class="label">Address: </span>[% patron.altcontactaddress1 \| html %]</li>
496	<li><span class="label">Address 2: </span>[% patron.altcontactaddress2 \| html %]</li>	496	<li><span class="label">Address 2: </span>[% patron.altcontactaddress2 \| html %]</li>
497	<li><span class="label">City: </span>[% patron.altcontactaddress3 \| html %]</li>	497	<li><span class="label">City: </span>[% patron.altcontactaddress3 \| html %]</li>
498	[% IF ( patron.altcontactstate ) %]<li><span class="label">State: </span>[% patron.altcontactstate \| html %]</li>[% END %]	498	[% IF ( patron.altcontactstate ) %]<li><span class="label">State: </span>[% patron.altcontactstate \| html %]</li>[% END %]
499	<li><span class="label">ZIP/Postal code: </span>[% patron.altcontactzipcode \| html %]</li>	499	<li><span class="label">ZIP/Postal code: </span>[% patron.altcontactzipcode \| html %]</li>
500	[% IF ( patron.altcontactcountry ) %]<li><span class="label">Country: </span>[% patron.altcontactcountry \| html %]</li>[% END %]	500	[% IF ( patron.altcontactcountry ) %]<li><span class="label">Country: </span>[% patron.altcontactcountry \| html %]</li>[% END %]
501	[% IF ( patron.altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.altcontactphone \| url %]">[% patron.altcontactphone \| html %]</a></li>[% END %]	501	[% IF ( patron.altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.altcontactphone \| url %]">[% patron.altcontactphone \| html %]</a></li>[% END %]
502	</ol></div>	502	</ol></div>
503	</div>	503	</div>

Lines 28-34 use C4::Members; Link Here

(-)a/members/paycollect.pl (-4 lines)
28	use C4::Members::Attributes qw(GetBorrowerAttributes);	28	use C4::Members::Attributes qw(GetBorrowerAttributes);
29	use C4::Accounts;	29	use C4::Accounts;
30	use C4::Koha;	30	use C4::Koha;
31	use Koha::Patron::Images;
32	use Koha::Patrons;	31	use Koha::Patrons;
33	use Koha::Account;	32	use Koha::Account;
34		33
Lines 201-209 sub borrower_add_additional_fields { Link Here
201	$b_ref->{adultborrower} = 1;	200	$b_ref->{adultborrower} = 1;
202	}	201	}
203		202
204	my $patron_image = Koha::Patron::Images->find($b_ref->{borrowernumber});
205	$template->param( picture => 1 ) if $patron_image;
206
207	if (C4::Context->preference('ExtendedPatronAttributes')) {	203	if (C4::Context->preference('ExtendedPatronAttributes')) {
208	$b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber});	204	$b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber});
209	}	205	}

Lines 62-70 my $patron = Koha::Patrons->find($borrowernumber); Link Here

(-)a/members/housebound.pl (-3 / +1 lines)
62	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );	62	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
63		63
64	# Get supporting cast	64	# Get supporting cast
65	my ( $branch, $category, $houseboundprofile, $visit, $patron_image );	65	my ( $branch, $category, $houseboundprofile, $visit );
66	if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it	66	if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it
67	$patron_image = $patron->image;
68	$category = Koha::Patron::Categories->new->find($patron->categorycode);	67	$category = Koha::Patron::Categories->new->find($patron->categorycode);
69	$houseboundprofile = $patron->housebound_profile;	68	$houseboundprofile = $patron->housebound_profile;
70	}	69	}
Lines 170-176 if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) { Link Here
170		169
171	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );	170	$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' \|\| $category->category_type eq 'I' );
172	$template->param(	171	$template->param(
173	picture => $patron_image,
174	housebound_profile => $houseboundprofile,	172	housebound_profile => $houseboundprofile,
175	visit => $houseboundvisit,	173	visit => $houseboundvisit,
176	messages => \@messages,	174	messages => \@messages,

Lines 53-59 use C4::Members::Attributes qw(GetBorrowerAttributes); Link Here

(-)a/members/moremember.pl (-5 lines)
53	use Koha::AuthorisedValues;	53	use Koha::AuthorisedValues;
54	use Koha::CsvProfiles;	54	use Koha::CsvProfiles;
55	use Koha::Patron::Debarments qw(GetDebarments);	55	use Koha::Patron::Debarments qw(GetDebarments);
56	use Koha::Patron::Images;
57	use Module::Load;	56	use Module::Load;
58	if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {	57	if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
59	load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );	58	load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );
Lines 273-282 if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preferen Link Here
273	}	272	}
274	}	273	}
275		274
276	# check to see if patron's image exists in the database
277	# basically this gives us a template var to condition the display of
278	# patronimage related interface on
279	$template->param( picture => 1 ) if $patron->image;
280	# Generate CSRF token for upload and delete image buttons	275	# Generate CSRF token for upload and delete image buttons
281	$template->param(	276	$template->param(
282	csrf_token => Koha::Token->new->generate_csrf({ session_id => $input->cookie('CGISESSID'),}),	277	csrf_token => Koha::Token->new->generate_csrf({ session_id => $input->cookie('CGISESSID'),}),