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

(-)a/circ/circulation.pl (-1 / +3 lines)
Lines 534-540 $template->param( Link Here
534
    state              => $borrower->{'state'},
534
    state              => $borrower->{'state'},
535
    zipcode           => $borrower->{'zipcode'},
535
    zipcode           => $borrower->{'zipcode'},
536
    country           => $borrower->{'country'},
536
    country           => $borrower->{'country'},
537
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
537
    phone             => $borrower->{'phone'},
538
    mobile            => $borrower->{'mobile'},
539
    phonepro          => $borrower->{'phonepro'},
538
    cardnumber        => $borrower->{'cardnumber'},
540
    cardnumber        => $borrower->{'cardnumber'},
539
    othernames        => $borrower->{'othernames'},
541
    othernames        => $borrower->{'othernames'},
540
    amountold         => $amountold,
542
    amountold         => $amountold,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-2 / +2 lines)
Lines 20-26 Link Here
20
            <li class="patronaddress2">[% address2 %]</li>
20
            <li class="patronaddress2">[% address2 %]</li>
21
        [% END %]
21
        [% END %]
22
    [% ELSE %]
22
    [% ELSE %]
23
            <li><span class="empty" id="noadressstored">No address stored.</span></li>
23
            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
24
    [% END %]
24
    [% END %]
25
    <li class="patroncity">[% IF ( city ) %]
25
    <li class="patroncity">[% IF ( city ) %]
26
            [% city %][% IF ( state ) %], [% state %][% END %]
26
            [% city %][% IF ( state ) %], [% state %][% END %]
Lines 83-89 Link Here
83
    [% IF EnableBorrowerFiles %]
83
    [% IF EnableBorrowerFiles %]
84
        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
84
        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
85
    [% END %]
85
    [% END %]
86
    [% IF (  suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase<br/>suggestions</a></li>
86
    [% IF (  suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
87
</ul></div>
87
</ul></div>
88
[% END %]
88
[% END %]
89
89
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-2 / +3 lines)
Lines 1-7 Link Here
1
[%# duplicates circ-menu.inc but assumes all borrower attributes are in a borrower variable rather than
1
[%# duplicates circ-menu.inc but assumes all borrower attributes are in a borrower variable rather than
2
in the global namespace %]
2
in the global namespace %]
3
[% IF borrower %]
3
[% IF borrower %]
4
<div class="patroninfo"><h5>[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])</h5>
4
<div class="patroninfo"><h5>[% borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %] ([% borrower.cardnumber %])</h5>
5
<!--[if IE 6]>
5
<!--[if IE 6]>
6
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
6
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
7
}</style>
7
}</style>
Lines 76-87 in the global namespace %] Link Here
76
    [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrower.borrowernumber %]">Circulation history</a></li>[% END %]
76
    [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrower.borrowernumber %]">Circulation history</a></li>[% END %]
77
    [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrower.borrowernumber %]&amp;src=circ">Modification log</a></li>[% END %]
77
    [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrower.borrowernumber %]&amp;src=circ">Modification log</a></li>[% END %]
78
    [% IF ( EnhancedMessagingPreferences ) %]
78
    [% IF ( EnhancedMessagingPreferences ) %]
79
    [% END %]
80
    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrower.borrowernumber %]">Notices</a></li>
79
    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrower.borrowernumber %]">Notices</a></li>
80
    [% END %]
81
    [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrower.borrowernumber %]">Statistics</a></li>
81
    [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrower.borrowernumber %]">Statistics</a></li>
82
    [% IF EnableBorrowerFiles %]
82
    [% IF EnableBorrowerFiles %]
83
        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrower.borrowernumber %]">Files</a></li>
83
        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrower.borrowernumber %]">Files</a></li>
84
    [% END %]
84
    [% END %]
85
    [% IF (  suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrower.borrowernumber %]">Purchase<br/>suggestions</a></li>
85
</ul></div>
86
</ul></div>
86
[% END %]
87
[% END %]
87
88
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-1 / +1 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Borrowers &rsaquo; Create manual credit</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Create manual credit</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
//<![CDATA[
5
//<![CDATA[
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-1 / +1 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Borrowers &rsaquo; Create manual invoice</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Create manual invoice</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
4
<script type="text/javascript">
5
//<![CDATA[
5
//<![CDATA[
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +1 lines)
Lines 176-183 function validate1(date) { Link Here
176
176
177
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
177
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
178
178
179
<p class="address">[% streetnumber %]
179
<p class="address">
180
        [% IF roadtype %][% roadtype %][% END %]
181
        [% address %]<br />
180
        [% address %]<br />
182
        [% IF ( address2 ) %][% address2 %]<br />[% END %]
181
        [% IF ( address2 ) %][% address2 %]<br />[% END %]
183
    	[% IF ( city ) %][% city %][% END %] 
182
    	[% IF ( city ) %][% city %][% END %] 
(-)a/members/boraccount.pl (-1 / +8 lines)
Lines 103-108 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
103
    );
103
    );
104
}
104
}
105
105
106
# Computes full borrower address
107
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
108
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
109
106
$template->param(
110
$template->param(
107
    finesview           => 1,
111
    finesview           => 1,
108
    firstname           => $data->{'firstname'},
112
    firstname           => $data->{'firstname'},
Lines 113-126 $template->param( Link Here
113
    categorycode        => $data->{'categorycode'},
117
    categorycode        => $data->{'categorycode'},
114
    category_type       => $data->{'category_type'},
118
    category_type       => $data->{'category_type'},
115
    categoryname		=> $data->{'description'},
119
    categoryname		=> $data->{'description'},
116
    address             => $data->{'address'},
120
    address             => $address,
117
    address2            => $data->{'address2'},
121
    address2            => $data->{'address2'},
118
    city                => $data->{'city'},
122
    city                => $data->{'city'},
119
    state               => $data->{'state'},
123
    state               => $data->{'state'},
120
    zipcode             => $data->{'zipcode'},
124
    zipcode             => $data->{'zipcode'},
121
    country             => $data->{'country'},
125
    country             => $data->{'country'},
122
    phone               => $data->{'phone'},
126
    phone               => $data->{'phone'},
127
    phonepro            => $data->{'phonepro'},
128
    mobile              => $data->{'mobile'},
123
    email               => $data->{'email'},
129
    email               => $data->{'email'},
130
    emailpro            => $data->{'emailpro'},
124
    branchcode          => $data->{'branchcode'},
131
    branchcode          => $data->{'branchcode'},
125
	branchname			=> GetBranchName($data->{'branchcode'}),
132
	branchname			=> GetBranchName($data->{'branchcode'}),
126
    total               => sprintf("%.2f",$total),
133
    total               => sprintf("%.2f",$total),
(-)a/members/files.pl (-1 / +6 lines)
Lines 118-128 else { Link Here
118
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
118
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
119
    $template->param( picture => 1 ) if $picture;
119
    $template->param( picture => 1 ) if $picture;
120
120
121
    # Computes full borrower address
122
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
123
    my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
124
121
    $template->param(
125
    $template->param(
122
        files => Koha::Borrower::Files->new( borrowernumber => $borrowernumber )
126
        files => Koha::Borrower::Files->new( borrowernumber => $borrowernumber )
123
          ->GetFilesInfo(),
127
          ->GetFilesInfo(),
124
128
125
        errors => \%errors
129
        errors => \%errors,
130
        address => $address,
126
    );
131
    );
127
    output_html_with_http_headers $cgi, $cookie, $template->output;
132
    output_html_with_http_headers $cgi, $cookie, $template->output;
128
}
133
}
(-)a/members/mancredit.pl (-2 / +10 lines)
Lines 87-110 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
87
        extendedattributes => $attributes
87
        extendedattributes => $attributes
88
    );
88
    );
89
}
89
}
90
    
90
91
# Computes full borrower address
92
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
93
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
94
91
    $template->param(
95
    $template->param(
92
        finesview => 1,
96
        finesview => 1,
93
        borrowernumber => $borrowernumber,
97
        borrowernumber => $borrowernumber,
94
        firstname => $data->{'firstname'},
98
        firstname => $data->{'firstname'},
95
        surname  => $data->{'surname'},
99
        surname  => $data->{'surname'},
100
        othernames => $data->{'othernames'},
96
		    cardnumber => $data->{'cardnumber'},
101
		    cardnumber => $data->{'cardnumber'},
97
		    categorycode => $data->{'categorycode'},
102
		    categorycode => $data->{'categorycode'},
98
		    category_type => $data->{'category_type'},
103
		    category_type => $data->{'category_type'},
99
		    categoryname  => $data->{'description'},
104
		    categoryname  => $data->{'description'},
100
		    address => $data->{'address'},
105
            address => $address,
101
		    address2 => $data->{'address2'},
106
		    address2 => $data->{'address2'},
102
		    city => $data->{'city'},
107
		    city => $data->{'city'},
103
		    state => $data->{'state'},
108
		    state => $data->{'state'},
104
		    zipcode => $data->{'zipcode'},
109
		    zipcode => $data->{'zipcode'},
105
		    country => $data->{'country'},
110
		    country => $data->{'country'},
106
		    phone => $data->{'phone'},
111
		    phone => $data->{'phone'},
112
            phonepro => $data->{'phonepro'},
113
            mobile => $data->{'mobile'},
107
		    email => $data->{'email'},
114
		    email => $data->{'email'},
115
            emailpro => $data->{'emailpro'},
108
		    branchcode => $data->{'branchcode'},
116
		    branchcode => $data->{'branchcode'},
109
		    branchname => GetBranchName($data->{'branchcode'}),
117
		    branchname => GetBranchName($data->{'branchcode'}),
110
		    is_child        => ($data->{'category_type'} eq 'C'),
118
		    is_child        => ($data->{'category_type'} eq 'C'),
(-)a/members/maninvoice.pl (-1 / +10 lines)
Lines 115-137 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
115
        extendedattributes => $attributes
115
        extendedattributes => $attributes
116
    );
116
    );
117
}
117
}
118
119
# Computes full borrower address
120
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
121
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
122
118
	$template->param(
123
	$template->param(
119
                finesview => 1,
124
                finesview => 1,
120
                borrowernumber => $borrowernumber,
125
                borrowernumber => $borrowernumber,
121
		firstname => $data->{'firstname'},
126
		firstname => $data->{'firstname'},
122
                surname  => $data->{'surname'},
127
                surname  => $data->{'surname'},
128
        othernames => $data->{'othernames'},
123
		cardnumber => $data->{'cardnumber'},
129
		cardnumber => $data->{'cardnumber'},
124
		categorycode => $data->{'categorycode'},
130
		categorycode => $data->{'categorycode'},
125
		category_type => $data->{'category_type'},
131
		category_type => $data->{'category_type'},
126
		categoryname  => $data->{'description'},
132
		categoryname  => $data->{'description'},
127
		address => $data->{'address'},
133
        address => $address,
128
		address2 => $data->{'address2'},
134
		address2 => $data->{'address2'},
129
		city => $data->{'city'},
135
		city => $data->{'city'},
130
		state => $data->{'state'},
136
		state => $data->{'state'},
131
		zipcode => $data->{'zipcode'},
137
		zipcode => $data->{'zipcode'},
132
		country => $data->{'country'},
138
		country => $data->{'country'},
133
		phone => $data->{'phone'},
139
		phone => $data->{'phone'},
140
        phonepro => $data->{'phonepro'},
141
        mobile => $data->{'mobile'},
134
		email => $data->{'email'},
142
		email => $data->{'email'},
143
        emailpro => $data->{'emailpro'},
135
		branchcode => $data->{'branchcode'},
144
		branchcode => $data->{'branchcode'},
136
		branchname => GetBranchName($data->{'branchcode'}),
145
		branchname => GetBranchName($data->{'branchcode'}),
137
		is_child        => ($data->{'category_type'} eq 'C'),
146
		is_child        => ($data->{'category_type'} eq 'C'),
(-)a/members/member-flags.pl (-1 / +9 lines)
Lines 171-192 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
171
    );
171
    );
172
}
172
}
173
173
174
# Computes full borrower address
175
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $bor->{streettype} );
176
my $address = $bor->{'streetnumber'} . " $roadtype " . $bor->{'address'};
177
174
$template->param(
178
$template->param(
175
		borrowernumber => $bor->{'borrowernumber'},
179
		borrowernumber => $bor->{'borrowernumber'},
176
    cardnumber => $bor->{'cardnumber'},
180
    cardnumber => $bor->{'cardnumber'},
177
		surname => $bor->{'surname'},
181
		surname => $bor->{'surname'},
178
		firstname => $bor->{'firstname'},
182
		firstname => $bor->{'firstname'},
183
        othernames => $bor->{'othernames'},
179
		categorycode => $bor->{'categorycode'},
184
		categorycode => $bor->{'categorycode'},
180
		category_type => $bor->{'category_type'},
185
		category_type => $bor->{'category_type'},
181
		categoryname => $bor->{'description'},
186
		categoryname => $bor->{'description'},
182
		address => $bor->{'address'},
187
        address => $address,
183
		address2 => $bor->{'address2'},
188
		address2 => $bor->{'address2'},
184
		city => $bor->{'city'},
189
		city => $bor->{'city'},
185
        state => $bor->{'state'},
190
        state => $bor->{'state'},
186
		zipcode => $bor->{'zipcode'},
191
		zipcode => $bor->{'zipcode'},
187
		country => $bor->{'country'},
192
		country => $bor->{'country'},
188
		phone => $bor->{'phone'},
193
		phone => $bor->{'phone'},
194
        phonepro => $bor->{'phonepro'},
195
        mobile => $bor->{'mobile'},
189
		email => $bor->{'email'},
196
		email => $bor->{'email'},
197
        emailpro => $bor->{'emailpro'},
190
		branchcode => $bor->{'branchcode'},
198
		branchcode => $bor->{'branchcode'},
191
		branchname => GetBranchName($bor->{'branchcode'}),
199
		branchname => GetBranchName($bor->{'branchcode'}),
192
		loop => \@loop,
200
		loop => \@loop,
(-)a/members/member-password.pl (-1 / +8 lines)
Lines 100-105 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
100
    );
100
    );
101
}
101
}
102
102
103
# Computes full borrower address
104
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $bor->{streettype} );
105
my $address = $bor->{'streetnumber'} . " $roadtype " . $bor->{'address'};
106
103
    $template->param( othernames => $bor->{'othernames'},
107
    $template->param( othernames => $bor->{'othernames'},
104
	    surname     => $bor->{'surname'},
108
	    surname     => $bor->{'surname'},
105
	    firstname   => $bor->{'firstname'},
109
	    firstname   => $bor->{'firstname'},
Lines 108-121 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
108
	    categorycode => $bor->{'categorycode'},
112
	    categorycode => $bor->{'categorycode'},
109
	    category_type => $bor->{'category_type'},
113
	    category_type => $bor->{'category_type'},
110
	    categoryname => $bor->{'description'},
114
	    categoryname => $bor->{'description'},
111
	    address => $bor->{'address'},
115
        address => $address,
112
	    address2 => $bor->{'address2'},
116
	    address2 => $bor->{'address2'},
113
	    city => $bor->{'city'},
117
	    city => $bor->{'city'},
114
	    state => $bor->{'state'},
118
	    state => $bor->{'state'},
115
	    zipcode => $bor->{'zipcode'},
119
	    zipcode => $bor->{'zipcode'},
116
	    country => $bor->{'country'},
120
	    country => $bor->{'country'},
117
	    phone => $bor->{'phone'},
121
	    phone => $bor->{'phone'},
122
        phonepro => $bor->{'phonepro'},
123
        mobile => $bor->{'mobile'},
118
	    email => $bor->{'email'},
124
	    email => $bor->{'email'},
125
        emailpro => $bor->{'emailpro'},
119
	    branchcode => $bor->{'branchcode'},
126
	    branchcode => $bor->{'branchcode'},
120
	    branchname => GetBranchName($bor->{'branchcode'}),
127
	    branchname => GetBranchName($bor->{'branchcode'}),
121
	    userid      => $bor->{'userid'},
128
	    userid      => $bor->{'userid'},
(-)a/members/moremember.pl (+4 lines)
Lines 338-343 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
338
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
338
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
339
}
339
}
340
340
341
# Computes full borrower address
342
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
343
341
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
344
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
342
$template->param( $data->{'categorycode'} => 1 ); 
345
$template->param( $data->{'categorycode'} => 1 ); 
343
$template->param(
346
$template->param(
Lines 367-372 $template->param( Link Here
367
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
370
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
368
    relatives_issues_count => $relatives_issues_count,
371
    relatives_issues_count => $relatives_issues_count,
369
    relatives_borrowernumbers => \@relatives,
372
    relatives_borrowernumbers => \@relatives,
373
    address => $address
370
);
374
);
371
375
372
output_html_with_http_headers $input, $cookie, $template->output;
376
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/notices.pl (+5 lines)
Lines 62-73 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
62
    );
62
    );
63
}
63
}
64
64
65
# Computes full borrower address
66
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} );
67
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
68
65
$template->param(
69
$template->param(
66
			QUEUED_MESSAGES 	=> $queued_messages,
70
			QUEUED_MESSAGES 	=> $queued_messages,
67
			borrowernumber 		=> $borrowernumber,
71
			borrowernumber 		=> $borrowernumber,
68
			sentnotices 		=> 1,
72
			sentnotices 		=> 1,
69
                        branchname              => GetBranchName($borrower->{'branchcode'}),
73
                        branchname              => GetBranchName($borrower->{'branchcode'}),
70
                        categoryname            => $borrower->{'description'},
74
                        categoryname            => $borrower->{'description'},
75
                        address                 => $address,
71
			activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
76
			activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
72
            RoutingSerials => C4::Context->preference('RoutingSerials'),
77
            RoutingSerials => C4::Context->preference('RoutingSerials'),
73
);
78
);
(-)a/members/pay.pl (+4 lines)
Lines 227-232 sub borrower_add_additional_fields { Link Here
227
        $b_ref->{has_picture} = 1;
227
        $b_ref->{has_picture} = 1;
228
    }
228
    }
229
229
230
    # Computes full borrower address
231
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
232
    $b_ref->{address} = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
233
230
    if (C4::Context->preference('ExtendedPatronAttributes')) {
234
    if (C4::Context->preference('ExtendedPatronAttributes')) {
231
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
235
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
232
        $template->param(
236
        $template->param(
(-)a/members/paycollect.pl (+12 lines)
Lines 25-30 use C4::Auth; Link Here
25
use C4::Output;
25
use C4::Output;
26
use CGI;
26
use CGI;
27
use C4::Members;
27
use C4::Members;
28
use C4::Members::Attributes qw(GetBorrowerAttributes);
28
use C4::Accounts;
29
use C4::Accounts;
29
use C4::Koha;
30
use C4::Koha;
30
use C4::Branch;
31
use C4::Branch;
Lines 175-180 sub borrower_add_additional_fields { Link Here
175
        $b_ref->{has_picture} = 1;
176
        $b_ref->{has_picture} = 1;
176
    }
177
    }
177
178
179
    if (C4::Context->preference('ExtendedPatronAttributes')) {
180
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
181
        $template->param(
182
            ExtendedPatronAttributes => 1,
183
        );
184
    }
185
186
    # Computes full borrower address
187
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
188
    $b_ref->{address} = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
189
178
    $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
190
    $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
179
    return;
191
    return;
180
}
192
}
(-)a/members/purchase-suggestions.pl (+15 lines)
Lines 25-30 use C4::Context; Link Here
25
use C4::Output;
25
use C4::Output;
26
use C4::Branch;
26
use C4::Branch;
27
use C4::Members;
27
use C4::Members;
28
use C4::Members::Attributes qw(GetBorrowerAttributes);
28
use C4::Suggestions;
29
use C4::Suggestions;
29
30
30
my $input = new CGI;
31
my $input = new CGI;
Lines 50-57 $template->param( Link Here
50
    suggestionsview  => 1,
51
    suggestionsview  => 1,
51
    categoryname => $borrower->{'description'},
52
    categoryname => $borrower->{'description'},
52
    branchname   => GetBranchName( $borrower->{'branchcode'} ),
53
    branchname   => GetBranchName( $borrower->{'branchcode'} ),
54
    RoutingSerials => C4::Context->preference('RoutingSerials'),
53
);
55
);
54
56
57
if (C4::Context->preference('ExtendedPatronAttributes')) {
58
    my $attributes = GetBorrowerAttributes($borrowernumber);
59
    $template->param(
60
        ExtendedPatronAttributes => 1,
61
        extendedattributes => $attributes
62
    );
63
}
64
65
# Computes full borrower address
66
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
67
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
68
$template->param( address => $address );
69
55
my ($picture, $dberror) = GetPatronImage($borrowernumber);
70
my ($picture, $dberror) = GetPatronImage($borrowernumber);
56
$template->param( picture => 1 ) if $picture;
71
$template->param( picture => 1 ) if $picture;
57
72
(-)a/members/readingrec.pl (-1 / +9 lines)
Lines 122-127 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
122
    );
122
    );
123
}
123
}
124
124
125
126
# Computes full borrower address
127
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
128
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
129
125
$template->param(
130
$template->param(
126
    readingrecordview => 1,
131
    readingrecordview => 1,
127
    title             => $data->{title},
132
    title             => $data->{title},
Lines 134-147 $template->param( Link Here
134
    categorycode      => $data->{categorycode},
139
    categorycode      => $data->{categorycode},
135
    category_type     => $data->{category_type},
140
    category_type     => $data->{category_type},
136
    categoryname      => $data->{description},
141
    categoryname      => $data->{description},
137
    address           => $data->{address},
142
    address           => $address,
138
    address2          => $data->{address2},
143
    address2          => $data->{address2},
139
    city              => $data->{city},
144
    city              => $data->{city},
140
    state             => $data->{state},
145
    state             => $data->{state},
141
    zipcode           => $data->{zipcode},
146
    zipcode           => $data->{zipcode},
142
    country           => $data->{country},
147
    country           => $data->{country},
143
    phone             => $data->{phone},
148
    phone             => $data->{phone},
149
    phonepro          => $data->{phonepro},
150
    mobile            => $data->{mobile},
144
    email             => $data->{email},
151
    email             => $data->{email},
152
    emailpro             => $data->{emailpro},
145
    branchcode        => $data->{branchcode},
153
    branchcode        => $data->{branchcode},
146
    is_child          => ( $data->{category_type} eq 'C' ),
154
    is_child          => ( $data->{category_type} eq 'C' ),
147
    branchname        => $branches->{ $data->{branchcode} }->{branchname},
155
    branchname        => $branches->{ $data->{branchcode} }->{branchname},
(-)a/members/routing-lists.pl (-1 / +16 lines)
Lines 24-29 use C4::Output; Link Here
24
use C4::Auth qw/:DEFAULT get_session/;
24
use C4::Auth qw/:DEFAULT get_session/;
25
use C4::Branch; # GetBranches
25
use C4::Branch; # GetBranches
26
use C4::Members;
26
use C4::Members;
27
use C4::Members::Attributes qw(GetBorrowerAttributes);
27
use C4::Context;
28
use C4::Context;
28
use C4::Serials;
29
use C4::Serials;
29
use CGI::Session;
30
use CGI::Session;
Lines 111-133 $template->param( Link Here
111
    borrowernumber    => $borrowernumber,
112
    borrowernumber    => $borrowernumber,
112
    branch            => $branch,
113
    branch            => $branch,
113
    branchname        => GetBranchName($borrower->{'branchcode'}),
114
    branchname        => GetBranchName($borrower->{'branchcode'}),
115
    title             => $borrower->{'title'},
116
    initials          => $borrower->{'initials'},
114
    firstname         => $borrower->{'firstname'},
117
    firstname         => $borrower->{'firstname'},
115
    surname           => $borrower->{'surname'},
118
    surname           => $borrower->{'surname'},
119
    othernames        => $borrower->{'othernames'},
116
    categorycode      => $borrower->{'categorycode'},
120
    categorycode      => $borrower->{'categorycode'},
117
    categoryname      => $borrower->{description},
121
    categoryname      => $borrower->{description},
118
    address           => $address,
122
    address           => $address,
119
    address2          => $borrower->{'address2'},
123
    address2          => $borrower->{'address2'},
124
    phone             => $borrower->{'phone'},
125
    phonepro          => $borrower->{'phonepro'},
126
    mobile            => $borrower->{'mobile'},
120
    email             => $borrower->{'email'},
127
    email             => $borrower->{'email'},
121
    emailpro          => $borrower->{'emailpro'},
128
    emailpro          => $borrower->{'emailpro'},
122
    borrowernotes     => $borrower->{'borrowernotes'},
129
    borrowernotes     => $borrower->{'borrowernotes'},
123
    city              => $borrower->{'city'},
130
    city              => $borrower->{'city'},
131
    state             => $borrower->{'state'},
124
    zipcode           => $borrower->{'zipcode'},
132
    zipcode           => $borrower->{'zipcode'},
125
    country           => $borrower->{'country'},
133
    country           => $borrower->{'country'},
126
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
127
    cardnumber        => $borrower->{'cardnumber'},
134
    cardnumber        => $borrower->{'cardnumber'},
128
    RoutingSerials => C4::Context->preference('RoutingSerials'),
135
    RoutingSerials => C4::Context->preference('RoutingSerials'),
129
);
136
);
130
137
138
if (C4::Context->preference('ExtendedPatronAttributes')) {
139
    my $attributes = GetBorrowerAttributes($borrowernumber);
140
    $template->param(
141
        ExtendedPatronAttributes => 1,
142
        extendedattributes => $attributes
143
    );
144
}
145
131
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
146
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
132
$template->param( picture => 1 ) if $picture;
147
$template->param( picture => 1 ) if $picture;
133
148
(-)a/members/statistics.pl (+5 lines)
Lines 94-102 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
94
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
94
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
95
$template->param( picture => 1 ) if $picture;
95
$template->param( picture => 1 ) if $picture;
96
96
97
# Computes full borrower address
98
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
99
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
100
97
$template->param(
101
$template->param(
98
    statisticsview => 1,
102
    statisticsview => 1,
99
    datas          => $datas,
103
    datas          => $datas,
104
    address        => $address,
100
    column_names   => \@statistic_column_names,
105
    column_names   => \@statistic_column_names,
101
    length_keys    => scalar( @statistic_column_names),
106
    length_keys    => scalar( @statistic_column_names),
102
    count_total_issues => $count_total_issues,
107
    count_total_issues => $count_total_issues,
(-)a/tools/viewlog.pl (-3 / +18 lines)
Lines 70-80 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
70
70
71
if ($src eq 'circ') {   # if we were called from circulation, use the circulation menu and get data to populate it -fbcit
71
if ($src eq 'circ') {   # if we were called from circulation, use the circulation menu and get data to populate it -fbcit
72
    use C4::Members;
72
    use C4::Members;
73
    use C4::Members::Attributes qw(GetBorrowerAttributes);
73
    my $borrowernumber = $object;
74
    my $borrowernumber = $object;
74
    my $data = GetMember('borrowernumber'=>$borrowernumber);
75
    my $data = GetMember('borrowernumber'=>$borrowernumber);
75
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
76
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
76
    $template->param( picture => 1 ) if $picture;
77
    $template->param( picture => 1 ) if $picture;
77
    
78
79
    if (C4::Context->preference('ExtendedPatronAttributes')) {
80
        my $attributes = GetBorrowerAttributes($data->{'borrowernumber'});
81
        $template->param(
82
            ExtendedPatronAttributes => 1,
83
            extendedattributes => $attributes
84
        );
85
    }
86
87
    # Computes full borrower address
88
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
89
    my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
90
78
    $template->param(   menu            => 1,
91
    $template->param(   menu            => 1,
79
                        title           => $data->{'title'},
92
                        title           => $data->{'title'},
80
                        initials        => $data->{'initials'},
93
                        initials        => $data->{'initials'},
Lines 86-99 if ($src eq 'circ') { # if we were called from circulation, use the circulatio Link Here
86
                        categorycode    => $data->{'categorycode'},
99
                        categorycode    => $data->{'categorycode'},
87
                        category_type   => $data->{'category_type'},
100
                        category_type   => $data->{'category_type'},
88
                        categoryname	=> $data->{'description'},
101
                        categoryname	=> $data->{'description'},
89
                        address         => $data->{'address'},
102
                        address         => $address,
90
                        address2        => $data->{'address2'},
103
                        address2        => $data->{'address2'},
91
                        city            => $data->{'city'},
104
                        city            => $data->{'city'},
92
                        state           => $data->{'state'},
105
                        state           => $data->{'state'},
93
                        zipcode         => $data->{'zipcode'},
106
                        zipcode         => $data->{'zipcode'},
107
                        country         => $data->{'country'},
94
                        phone           => $data->{'phone'},
108
                        phone           => $data->{'phone'},
95
                        phonepro        => $data->{'phonepro'},
109
                        phonepro        => $data->{'phonepro'},
110
                        mobile          => $data->{'mobile'},
96
                        email           => $data->{'email'},
111
                        email           => $data->{'email'},
112
                        emailpro        => $data->{'emailpro'},
97
                        branchcode      => $data->{'branchcode'},
113
                        branchcode      => $data->{'branchcode'},
98
                        branchname		=> GetBranchName($data->{'branchcode'}),
114
                        branchname		=> GetBranchName($data->{'branchcode'}),
99
                        RoutingSerials => C4::Context->preference('RoutingSerials'),
115
                        RoutingSerials => C4::Context->preference('RoutingSerials'),
100
- 

Return to bug 12542