This patch displays the address information in the left column of the patron's pages using the new system preference.
The address is formatted in member-display-address-style-us.inc and member-display-address-style-de.inc
To test:
- Apply patch on top of 1st and 2nd patch
- Select 'German style' in system preference 'addressformat' in I18N/L10N
- Verify that the address information displays properly in the left column of all patron's pages.
- Verify that the address displays properly in the main area of moremember.pl as well (Note: In right column, Alternate address /contact are not yet touched))
- Switch system preference to US style, repeat checks
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
AMending without changes to put this patch at the end of the patch list / Marc
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
if($bor_messages_loop){ $template->param(flagged => 1 ); }
-# Computes full borrower address
-my @fulladdress;
-push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} );
-push @fulladdress, C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} ) if ( $borrower->{'streettype'} );
-push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} );
-
my $fast_cataloging = 0;
if (defined getframeworkinfo('FA')) {
$fast_cataloging = 1
Koha::Database->new()->schema()->resultset('Issue')
->count( { borrowernumber => \@relatives } );
+my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
+
+$template->param(%$borrower);
+
$template->param(
lib_messages_loop => $lib_messages_loop,
bor_messages_loop => $bor_messages_loop,
branchname => GetBranchName($borrower->{'branchcode'}),
printer => $printer,
printername => $printer,
- firstname => $borrower->{'firstname'},
- surname => $borrower->{'surname'},
- showname => $borrower->{'showname'},
- category_type => $borrower->{'category_type'},
was_renewed => $query->param('was_renewed') ? 1 : 0,
expiry => format_date($borrower->{'dateexpiry'}),
- categorycode => $borrower->{'categorycode'},
- categoryname => $borrower->{description},
- address => join(' ', @fulladdress),
- address2 => $borrower->{'address2'},
- email => $borrower->{'email'},
- emailpro => $borrower->{'emailpro'},
- borrowernotes => $borrower->{'borrowernotes'},
- city => $borrower->{'city'},
- state => $borrower->{'state'},
- zipcode => $borrower->{'zipcode'},
- country => $borrower->{'country'},
- phone => $borrower->{'phone'},
- mobile => $borrower->{'mobile'},
- phonepro => $borrower->{'phonepro'},
- cardnumber => $borrower->{'cardnumber'},
- othernames => $borrower->{'othernames'},
+ roadtype => $roadtype,
amountold => $amountold,
barcode => $barcode,
stickyduedate => $stickyduedate,
}</style>
<![endif]-->
<ul class="patronbriefinfo">
-[% IF ( patronimages ) %]
-[% IF ( picture ) %]
-<li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
-[% ELSE %]
-<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
-[% END %]
-[% END %]
- [% IF ( address or address2 ) %]
- [% IF ( address ) %]
- <li class="patronaddress1">[% address %]</li>
- [% END %]
- [% IF ( address2 ) %]
- <li class="patronaddress2">[% address2 %]</li>
+ [% IF ( patronimages ) %]
+ [% IF ( picture ) %]
+ <li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
+ [% ELSE %]
+ <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
[% END %]
- [% ELSE %]
- <li><span class="empty" id="noaddressstored">No address stored.</span></li>
[% END %]
- <li class="patroncity">[% IF ( city ) %]
- [% city %][% IF ( state ) %], [% state %][% END %]
- [% zipcode %][% IF ( country ) %], [% country %][% END %]
+ [% IF Koha.Preference( 'addressformat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
[% ELSE %]
- <span class="empty" id="nocitystored">No city stored.</span>
- [% END %]</li>
- <li class="patronphone">[% IF ( phone ) %]
+ [% INCLUDE 'member-display-address-style-us.inc' %]
+ [% END %]
+
+ [% IF ( phone ) %]<li class="patronphone">
[% phone %]
[% ELSE %]
[% IF ( mobile ) %]
[% ELSE %]
[% IF ( phonepro ) %]
[% phonepro %]
- [% ELSE %]
- <span class="empty" id="nophonestored">No phone stored.</span>
[% END %]
- [% END %]
- [% END %]</li>
+ [% END %]</li>
+ [% END %]
[% IF ( email ) %]
<li class="email"> <a href="mailto:[% email %]" title="[% email %]">[% email %]</a></li>
[% ELSE %]
[% IF ( emailpro ) %]
<li class="email"> <a href="mailto:[% emailpro %]" title="[% emailpro %]">[% emailpro %]</a></li>
- [% ELSE %]
- <li> <span class="empty">No email stored.</span> </li>
[% END %]
[% END %]
+
+ [% UNLESS ( address or address2 ) %]
+ <li><span class="empty" id="noaddressstored">No address stored.</span></li>
+ [% END %]
+ [% UNLESS ( city ) %]
+ <li><span class="empty" id="nocitystored">No city stored.</span></li>
+ [% END %]
+ [% UNLESS ( phone or mobile or phonepro) %]
+ <li> <span class="empty">No phone stored.</span></li>
+ [% END %]
+ [% UNLESS ( email or emailpro) %]
+ <li> <span class="empty">No email stored.</span></li>
+ [% END %]
+
[% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
[% IF ( extendedattribute.display_checkout ) %]
[% IF ( extendedattribute.value ) %]
}</style>
<![endif]-->
<ul class="patronbriefinfo">
-[% IF ( patronimages ) %]
-[% IF borrower.has_picture %]
-<li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrower.borrowernumber %]" id="patronimage" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
-[% ELSE %]
-<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
-[% END %]
-[% END %]
- [% IF ( borrower.address or borrower.address2 ) %]
- [% IF ( borrower.address ) %]
- <li class="patronaddress1">[% borrower.address %]</li>
- [% END %]
- [% IF ( borrower.address2 ) %]
- <li class="patronaddress2">[% borrower.address2 %]</li>
+ [% IF ( patronimages ) %]
+ [% IF borrower.has_picture %]
+ <li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrower.borrowernumber %]" id="patronimage" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
+ [% ELSE %]
+ <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
[% END %]
- [% ELSE %]
- <li><span class="empty" id="noaddressstored">No address stored.</span></li>
[% END %]
- <li class="patroncity">
- [% IF borrower.city %]
- [% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
- [% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
+
+ [% IF Koha.Preference( 'addressformat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
[% ELSE %]
- <span class="empty" id="nocitystored">No city stored.</span>
- [% END %]</li>
- <li class="patronphone">[% IF borrower.phone %]
- [% borrower.phone %]
+ [% INCLUDE 'member-display-address-style-us.inc' %]
+ [% END %]
+
+ [% IF ( phone ) %]<li class="patronphone">
+ [% phone %]
[% ELSE %]
- [% IF borrower.mobile %]
- [% borrower.mobile %]
+ [% IF ( mobile ) %]
+ [% mobile %]
[% ELSE %]
- [% IF borrower.phonepro %]
- [% borrower.phonepro %]
- [% ELSE %]
- <span class="empty" id="nophonestored">No phone stored.</span>
+ [% IF ( phonepro ) %]
+ [% phonepro %]
[% END %]
- [% END %]
- [% END %]</li>
- [% IF borrower.email %]
- <li class="email"> <a href="mailto:[% borrower.email %]" title="[% borrower.email %]">[% borrower.email %]</a></li>
+ [% END %]</li>
+ [% END %]
+ [% IF ( email ) %]
+ <li class="email"> <a href="mailto:[% email %]" title="[% email %]">[% email %]</a></li>
[% ELSE %]
- [% IF borrower.emailpro %]
- <li class="email"> <a href="mailto:[% borrower.emailpro %]" title="[% borrower.emailpro %]">[% borrower.emailpro %]</a></li>
- [% ELSE %]
- <li> <span class="empty">No email stored.</span> </li>
+ [% IF ( emailpro ) %]
+ <li class="email"> <a href="mailto:[% emailpro %]" title="[% emailpro %]">[% emailpro %]</a></li>
[% END %]
[% END %]
+
+ [% UNLESS ( address or address2 ) %]
+ <li><span class="empty" id="noaddressstored">No address stored.</span></li>
+ [% END %]
+ [% UNLESS ( city ) %]
+ <li><span class="empty" id="nocitystored">No city stored.</span></li>
+ [% END %]
+ [% UNLESS ( phone or mobile or phonepro) %]
+ <li> <span class="empty">No phone stored.</span></li>
+ [% END %]
+ [% UNLESS ( email or emailpro) %]
+ <li> <span class="empty">No email stored.</span></li>
+ [% END %]
+
+
+
[% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN borrower.extendedattributes %]
[% IF ( extendedattribute.display_checkout ) %]
[% IF ( extendedattribute.value ) %]
--- /dev/null
+[% IF ( address or address2 ) %]
+ [% IF ( address ) %]
+ <li class="patronaddress1">[% address %][%if (roadtype) %] [% roadtype %][% end %][% if (streetnumber) %] [% streetnumber %][% end %]</li>
+ [% END %]
+ [% IF ( address2 ) %]
+ <li class="patronaddress2">[% address2 %]</li>
+ [% END %]
+[% END %]
+[% IF ( city ) %]<li class="patroncity">
+ [%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) %]</br>[% state %][% END %]
+ [% IF ( country ) %]<br />[% country %][% END %]</li>
+[% END %]
--- /dev/null
+[% IF ( address or address2 ) %]
+ [% IF ( address ) %]
+ <li class="patronaddress1">[% if (streetnumber) %][% streetnumber %][% end %] [% address %][%if (roadtype) %] [% roadtype %][% end %]</li>
+ [% END %]
+ [% IF ( address2 ) %]
+ <li class="patronaddress2">[% address2 %]</li>
+ [% END %]
+[% END %]
+[% IF ( city ) %]<li class="patroncity">
+ [% city %][% IF ( state ) %], [% state %][% END %]
+ [% zipcode %][% IF ( country ) %], [% country %][% END %]</li>
+[% END %]
+[% USE Koha %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' %]</title>
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Patrons › Create manual credit</title>
[% INCLUDE 'doc-head-close.inc' %]
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Patrons › Create manual invoice</title>
[% INCLUDE 'doc-head-close.inc' %]
[% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %]
-<p class="address">
- [% address %]<br />
- [% IF ( address2 ) %][% address2 %]<br />[% END %]
- [% IF ( city ) %][% city %][% END %]
- [% IF ( state ) %][% state %][% END %]
- [% IF ( zipcode ) %][% zipcode %]<br />[% END %]
- [% IF ( country ) %][% country %][% END %]</p>
+ <div class = "address">
+ [% IF Koha.Preference( 'addressformat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-display-address-style-us.inc' %]
+ [% END %]
+ </div>
<div class="rows">
<ol>
+[% USE Koha %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Patrons › Pay Fines for [% borrower.firstname %] [% borrower.surname %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</div>
</div>
-
<div class="yui-b">
-[% INCLUDE 'circ-menu.tt' %]
+[% INCLUDE 'circ-menu.inc' %]
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Patrons › Collect fine payment for [% borrower.firstname %] [% borrower.surname %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</div>
<div class="yui-b">
-[% INCLUDE 'circ-menu.tt' %]
+[% INCLUDE 'circ-menu.inc' %]
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Patrons › Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</title>
[% INCLUDE 'doc-head-close.inc' %]
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Patrons ›
[% IF ( unknowuser ) %]
+[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>
Koha › Tools ›
);
}
-# Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
-my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+
+#workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad
+$template->param(%$data);
$template->param(
finesview => 1,
- firstname => $data->{'firstname'},
- surname => $data->{'surname'},
- othernames => $data->{'othernames'},
borrowernumber => $borrowernumber,
- cardnumber => $data->{'cardnumber'},
- categorycode => $data->{'categorycode'},
- category_type => $data->{'category_type'},
- categoryname => $data->{'description'},
- address => $address,
- address2 => $data->{'address2'},
- city => $data->{'city'},
- state => $data->{'state'},
- zipcode => $data->{'zipcode'},
- country => $data->{'country'},
- phone => $data->{'phone'},
- phonepro => $data->{'phonepro'},
- mobile => $data->{'mobile'},
- email => $data->{'email'},
- emailpro => $data->{'emailpro'},
- branchcode => $data->{'branchcode'},
- branchname => GetBranchName($data->{'branchcode'}),
+ roadtype => $roadtype,
+ branchname => GetBranchName($data->{'branchcode'}),
total => sprintf("%.2f",$total),
totalcredit => $totalcredit,
is_child => ($data->{'category_type'} eq 'C'),
reverse_col => $reverse_col,
accounts => $accts,
- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+ activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
RoutingSerials => C4::Context->preference('RoutingSerials'),
);
my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
$template->param( picture => 1 ) if $picture;
-if (C4::Context->preference('ExtendedPatronAttributes')) {
- my $attributes = GetBorrowerAttributes($borrowernumber);
- $template->param(
- ExtendedPatronAttributes => 1,
- extendedattributes => $attributes
- );
-}
+ if (C4::Context->preference('ExtendedPatronAttributes')) {
+ my $attributes = GetBorrowerAttributes($borrowernumber);
+ $template->param(
+ ExtendedPatronAttributes => 1,
+ extendedattributes => $attributes
+ );
+ }
-# Computes full borrower address
-my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
-my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
+ $template->param(%$data);
$template->param(
- finesview => 1,
+ finesview => 1,
borrowernumber => $borrowernumber,
- firstname => $data->{'firstname'},
- surname => $data->{'surname'},
- othernames => $data->{'othernames'},
- cardnumber => $data->{'cardnumber'},
- categorycode => $data->{'categorycode'},
- category_type => $data->{'category_type'},
- categoryname => $data->{'description'},
- address => $address,
- address2 => $data->{'address2'},
- city => $data->{'city'},
- state => $data->{'state'},
- zipcode => $data->{'zipcode'},
- country => $data->{'country'},
- phone => $data->{'phone'},
- phonepro => $data->{'phonepro'},
- mobile => $data->{'mobile'},
- email => $data->{'email'},
- emailpro => $data->{'emailpro'},
- branchcode => $data->{'branchcode'},
- branchname => GetBranchName($data->{'branchcode'}),
- is_child => ($data->{'category_type'} eq 'C'),
- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
- RoutingSerials => C4::Context->preference('RoutingSerials'),
+ categoryname => $data->{'description'},
+ roadtype => $roadtype,
+ branchname => GetBranchName($data->{'branchcode'}),
+ is_child => ($data->{'category_type'} eq 'C'),
+ activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+ RoutingSerials => C4::Context->preference('RoutingSerials'),
);
output_html_with_http_headers $input, $cookie, $template->output;
}
my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
$template->param( picture => 1 ) if $picture;
-if (C4::Context->preference('ExtendedPatronAttributes')) {
- my $attributes = GetBorrowerAttributes($borrowernumber);
- $template->param(
- ExtendedPatronAttributes => 1,
- extendedattributes => $attributes
- );
-}
-
-# Computes full borrower address
-my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
-my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+ if (C4::Context->preference('ExtendedPatronAttributes')) {
+ my $attributes = GetBorrowerAttributes($borrowernumber);
+ $template->param(
+ ExtendedPatronAttributes => 1,
+ extendedattributes => $attributes
+ );
+ }
- $template->param(
- finesview => 1,
- borrowernumber => $borrowernumber,
- firstname => $data->{'firstname'},
- surname => $data->{'surname'},
- othernames => $data->{'othernames'},
- cardnumber => $data->{'cardnumber'},
- categorycode => $data->{'categorycode'},
- category_type => $data->{'category_type'},
- categoryname => $data->{'description'},
- address => $address,
- address2 => $data->{'address2'},
- city => $data->{'city'},
- state => $data->{'state'},
- zipcode => $data->{'zipcode'},
- country => $data->{'country'},
- phone => $data->{'phone'},
- phonepro => $data->{'phonepro'},
- mobile => $data->{'mobile'},
- email => $data->{'email'},
- emailpro => $data->{'emailpro'},
- branchcode => $data->{'branchcode'},
- branchname => GetBranchName($data->{'branchcode'}),
- is_child => ($data->{'category_type'} eq 'C'),
- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
+ $template->param(%$data);
+ $template->param(
+ finesview => 1,
+ borrowernumber => $borrowernumber,
+ categoryname => $data->{'description'},
+ branchname => GetBranchName($data->{'branchcode'}),
+ roadtype => $roadtype,
+ is_child => ($data->{'category_type'} eq 'C'),
+ activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
RoutingSerials => C4::Context->preference('RoutingSerials'),
);
output_html_with_http_headers $input, $cookie, $template->output;
$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
}
-# Computes full borrower address
-my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
-
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children)
$template->param( $data->{'categorycode'} => 1 );
$template->param(
overdues_exist => $overdues_exist,
StaffMember => ($category_type eq 'S'),
is_child => ($category_type eq 'C'),
- samebranch => $samebranch,
- quickslip => $quickslip,
+ samebranch => $samebranch,
+ quickslip => $quickslip,
activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
relatives_issues_count => $relatives_issues_count,
relatives_borrowernumbers => \@relatives,
- address => $address
);
output_html_with_http_headers $input, $cookie, $template->output;
# Getting the messages
my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
-$template->param( %{$borrower} );
if (C4::Context->preference('ExtendedPatronAttributes')) {
my $attributes = GetBorrowerAttributes($borrowernumber);
);
}
-# Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} );
-my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
+$template->param(%$borrower);
$template->param(
- QUEUED_MESSAGES => $queued_messages,
- borrowernumber => $borrowernumber,
- sentnotices => 1,
- branchname => GetBranchName($borrower->{'branchcode'}),
- categoryname => $borrower->{'description'},
- address => $address,
- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
- RoutingSerials => C4::Context->preference('RoutingSerials'),
+ QUEUED_MESSAGES => $queued_messages,
+ borrowernumber => $borrowernumber,
+ sentnotices => 1,
+ branchname => GetBranchName($borrower->{'branchcode'}),
+ categoryname => $borrower->{'description'},
+ roadtype => $roadtype,
+ activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+ RoutingSerials => C4::Context->preference('RoutingSerials'),
);
output_html_with_http_headers $input, $cookie, $template->output;
}
}
borrower_add_additional_fields($borrower);
+
+ #workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad
+ $template->param(%$borrower);
+
$template->param(
accounts => $accounts,
borrower => $borrower,
if ($picture) {
$b_ref->{has_picture} = 1;
}
-
- # Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
- $b_ref->{address} = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
+ $b_ref->{roadtype} = $roadtype;
if (C4::Context->preference('ExtendedPatronAttributes')) {
$b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
borrower_add_additional_fields($borrower);
+#workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad
+$template->param(%$borrower);
+
+
$template->param(
borrowernumber => $borrowernumber, # some templates require global
borrower => $borrower,
$b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
}
- # Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
- $b_ref->{address} = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
+ $b_ref->{roadtype} = $roadtype;
$b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
return;
# Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
-my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
-$template->param( address => $address );
+$template->param( roadtype => $roadtype );
my ($picture, $dberror) = GetPatronImage($borrowernumber);
$template->param( picture => 1 ) if $picture;
}
-# Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
-my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+$template->param(%$data);
$template->param(
readingrecordview => 1,
- title => $data->{title},
- initials => $data->{initials},
- surname => $data->{surname},
- othernames => $data->{othernames},
borrowernumber => $borrowernumber,
- firstname => $data->{firstname},
- cardnumber => $data->{cardnumber},
- categorycode => $data->{categorycode},
- category_type => $data->{category_type},
categoryname => $data->{description},
- address => $address,
- address2 => $data->{address2},
- city => $data->{city},
- state => $data->{state},
- zipcode => $data->{zipcode},
- country => $data->{country},
- phone => $data->{phone},
- phonepro => $data->{phonepro},
- mobile => $data->{mobile},
- email => $data->{email},
- emailpro => $data->{emailpro},
- branchcode => $data->{branchcode},
+ roadtype => $roadtype,
is_child => ( $data->{category_type} eq 'C' ),
branchname => $branches->{ $data->{branchcode} }->{branchname},
loop_reading => $issues,
##################################################################################
-# Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
-my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
+$template->param(%$borrower);
$template->param(
-
findborrower => $findborrower,
borrower => $borrower,
borrowernumber => $borrowernumber,
branch => $branch,
branchname => GetBranchName($borrower->{'branchcode'}),
- title => $borrower->{'title'},
- initials => $borrower->{'initials'},
- firstname => $borrower->{'firstname'},
- surname => $borrower->{'surname'},
- othernames => $borrower->{'othernames'},
- categorycode => $borrower->{'categorycode'},
categoryname => $borrower->{description},
- address => $address,
- address2 => $borrower->{'address2'},
- phone => $borrower->{'phone'},
- phonepro => $borrower->{'phonepro'},
- mobile => $borrower->{'mobile'},
- email => $borrower->{'email'},
- emailpro => $borrower->{'emailpro'},
- borrowernotes => $borrower->{'borrowernotes'},
- city => $borrower->{'city'},
- state => $borrower->{'state'},
- zipcode => $borrower->{'zipcode'},
- country => $borrower->{'country'},
- cardnumber => $borrower->{'cardnumber'},
- RoutingSerials => C4::Context->preference('RoutingSerials'),
+ roadtype => $roadtype,
+ RoutingSerials => C4::Context->preference('RoutingSerials'),
);
if (C4::Context->preference('ExtendedPatronAttributes')) {
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
$template->param( picture => 1 ) if $picture;
-# Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
-my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
+$template->param(%$borrower);
$template->param(
- statisticsview => 1,
- datas => $datas,
- address => $address,
- column_names => \@statistic_column_names,
+ statisticsview => 1,
+ datas => $datas,
+ roadtype => $roadtype,
+ column_names => \@statistic_column_names,
count_total_issues => $count_total_issues,
count_total_issues_returned => $count_total_issues_returned,
count_total_precedent_state => $count_total_precedent_state,
);
}
- # Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
- my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+ $template->param(%$data);
$template->param(
menu => 1,
- title => $data->{'title'},
- initials => $data->{'initials'},
- surname => $data->{'surname'},
- othernames => $data->{'othernames'},
borrowernumber => $borrowernumber,
- firstname => $data->{'firstname'},
- cardnumber => $data->{'cardnumber'},
- categorycode => $data->{'categorycode'},
- category_type => $data->{'category_type'},
categoryname => $data->{'description'},
- address => $address,
- address2 => $data->{'address2'},
- city => $data->{'city'},
- state => $data->{'state'},
- zipcode => $data->{'zipcode'},
- country => $data->{'country'},
- phone => $data->{'phone'},
- phonepro => $data->{'phonepro'},
- mobile => $data->{'mobile'},
- email => $data->{'email'},
- emailpro => $data->{'emailpro'},
- branchcode => $data->{'branchcode'},
+ roadtype => $roadtype,
branchname => GetBranchName( $data->{'branchcode'} ),
RoutingSerials => C4::Context->preference('RoutingSerials'),
);