Browse Source

Bug 18789: Send Koha::Patron object to the templates

In order to simplify and make uniform the code, the controller scripts send
a Koha::Patron object to the templates instead of all attributes of a patron.

That will make the code much more easier to maintain and will be less
error-prone.

The variable "patron" sent to the templates is supposed to represent the
patron the librarian is editing the detail.

In the members module and some scripts of the circulation module, the
patron's detail are sent one by one to the template. That leads to
frustration from developpers (making sure everything is passed from all
scripts) and to regression (we got tone of bugs in the last year because
of this way to do).
With this patch set it will be easy access patron's detail, passing only
1 variable from the controllers.

Test plan:
Play with the patron and circulation module and make sur the detail of
the patron you are editing/seeing info are correctly displayed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
18.05.x
Jonathan Druart 4 years ago
parent
commit
0ab22e1c7c
  1. 5
      acqui/acqui-home.pl
  2. 3
      acqui/booksellers.pl
  3. 3
      admin/aqbudgets.pl
  4. 5
      circ/branchtransfers.pl
  5. 15
      circ/overdue.pl
  6. 8
      circ/transferstoreceive.pl
  7. 6
      circ/waitingreserves.pl
  8. 4
      koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
  9. 66
      koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
  10. 22
      koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
  11. 22
      koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
  12. 20
      koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
  13. 18
      koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
  14. 18
      koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
  15. 18
      koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
  16. 20
      koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
  17. 22
      koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
  18. 20
      koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc
  19. 20
      koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc
  20. 26
      koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc
  21. 20
      koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc
  22. 18
      koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
  23. 18
      koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
  24. 18
      koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
  25. 22
      koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
  26. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
  27. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
  28. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
  29. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
  30. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
  31. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
  32. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
  33. 10
      koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
  34. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
  35. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
  36. 16
      koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
  37. 12
      koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
  38. 12
      koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
  39. 10
      koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
  40. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
  41. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
  42. 20
      koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
  43. 118
      koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
  44. 21
      koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
  45. 26
      koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
  46. 9
      koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
  47. 9
      koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
  48. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
  49. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
  50. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
  51. 50
      koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
  52. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
  53. 12
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
  54. 4
      members/boraccount.pl
  55. 18
      members/deletemem.pl
  56. 26
      members/discharge.pl
  57. 6
      members/files.pl
  58. 7
      members/housebound.pl
  59. 4
      members/mancredit.pl
  60. 5
      members/maninvoice.pl
  61. 22
      members/member-flags.pl
  62. 24
      members/member-password.pl
  63. 15
      members/moremember.pl
  64. 4
      members/notices.pl
  65. 13
      members/pay.pl
  66. 5
      members/paycollect.pl
  67. 26
      members/printfeercpt.pl
  68. 25
      members/printinvoice.pl
  69. 8
      members/purchase-suggestions.pl
  70. 35
      members/readingrec.pl
  71. 15
      members/routing-lists.pl
  72. 11
      members/statistics.pl
  73. 9
      members/summary-print.pl
  74. 2
      opac/opac-detail.pl
  75. 4
      opac/opac-reserve.pl
  76. 22
      reserve/request.pl
  77. 3
      reviews/reviewswaiting.pl
  78. 10
      tools/viewlog.pl

5
acqui/acqui-home.pl

@ -72,10 +72,7 @@ foreach my $budget ( @{$budget_arr} ) {
my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
if ( $patron ) {
# FIXME should pass the entire object into budget_owner
$budget->{budget_owner_firstname} = $patron->firstname;
$budget->{budget_owner_surname} = $patron->surname;
$budget->{budget_owner_borrowernumber} = $patron->borrowernumber;
$budget->{budget_owner} = $patron;
}
if ( !defined $budget->{budget_amount} ) {

3
acqui/booksellers.pl

@ -138,8 +138,7 @@ for my $vendor (@suppliers) {
$basket->{$_} ||= 0;
}
if ( $patron ) {
$basket->{authorisedby_firstname} = $patron->firstname;
$basket->{authorisedby_surname} = $patron->surname;
$basket->{authorisedby} = $patron;
}
if ($basket->{basketgroupid}) {
my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});

3
admin/aqbudgets.pl

@ -117,8 +117,7 @@ if ($op eq 'add_form') {
exit;
}
$dropbox_disabled = BudgetHasChildren($budget_id);
my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
$budget->{budget_owner_name} = ( $patron ? $patron->firstname . ' ' . $patron->surname : '' );
$budget->{budget_owner} = Koha::Patrons->find( $budget->{budget_owner_id} );
}
# build budget hierarchy

5
circ/branchtransfers.pl

@ -210,10 +210,7 @@ foreach my $code ( keys %$messages ) {
$err{borrowernumber} = $messages->{'WasReturned'};
my $patron = Koha::Patrons->find( $messages->{'WasReturned'} );
if ( $patron ) { # Just in case...
$err{title} = $patron->title;
$err{firstname} = $patron->firstname;
$err{surname} = $patron->surname;
$err{cardnumber} = $patron->cardnumber;
$err{patron} = $patron;
}
}
$err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );

15
circ/overdue.pl

@ -300,27 +300,12 @@ if ($noreport) {
push @overduedata, {
patron => scalar Koha::Patrons->find( $data->{borrowernumber} ),
duedate => $data->{date_due},
borrowernumber => $data->{borrowernumber},
barcode => $data->{barcode},
cardnumber => $data->{cardnumber},
itemnum => $data->{itemnumber},
issuedate => output_pref({ dt => dt_from_string( $data->{issuedate} ), dateonly => 1 }),
borrowertitle => $data->{borrowertitle},
surname => $data->{surname},
firstname => $data->{firstname},
streetnumber => $data->{streetnumber},
streettype => $data->{streettype},
address => $data->{address},
address2 => $data->{address2},
city => $data->{city},
zipcode => $data->{zipcode},
country => $data->{country},
phone => $data->{phone},
email => $data->{email},
biblionumber => $data->{biblionumber},
title => $data->{title},
author => $data->{author},
branchcode => $data->{branchcode},
homebranchcode => $data->{homebranchcode},
holdingbranchcode => $data->{holdingbranchcode},
itemcallnumber => $data->{itemcallnumber},

8
circ/transferstoreceive.pl

@ -114,13 +114,7 @@ while ( my $library = $libraries->next ) {
# we check if we have a reserv for this transfer
my $holds = $item->current_holds;
if ( my $first_hold = $holds->next ) {
my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
# FIXME The full patron object should be passed to the template
$getransf{'borrowernum'} = $patron->borrowernumber;
$getransf{'borrowername'} = $patron->surname;
$getransf{'borrowerfirstname'} = $patron->firstname;
$getransf{'borrowermail'} = $patron->email if $patron->email;
$getransf{'borrowerphone'} = $patron->phone;
$getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );
}
push( @transferloop, \%getransf );
}

6
circ/waitingreserves.pl

@ -130,11 +130,7 @@ while ( my $hold = $holds->next ) {
$getreserv{'dotransfer'} = 1;
}
my $borEmail = $patron->first_valid_email_address;
if ( $borEmail ) {
$getreserv{'borrowermail'} = $borEmail;
}
$getreserv{patron} = $patron;
if ($today > $calcDate) {
if ($cancelall) {

4
koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc

@ -40,7 +40,7 @@
<td>[% d.created | $KohaDates %]</td>
[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
<td>
<a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
<a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
<i class="fa fa-trash"></i> Remove
</a>
</td>
@ -53,7 +53,7 @@
[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
<p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
<form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
<input type="hidden" name="action" value="add" />
<fieldset class="rows" id="manual_restriction_form">
<legend>Add manual restriction</legend>

66
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc

@ -1,5 +1,5 @@
[% USE Koha %]
[% IF ( borrowernumber ) %]
[% IF ( patron.borrowernumber ) %]
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
<!--[if IE 6]>
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
@ -9,7 +9,7 @@
[% IF ( patronimages ) %]
[% IF ( picture ) %]
<li>
<img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname | html %] [% surname | html %] ([% cardnumber | html %])" />
<img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" id="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
</li>
[% ELSE %]
<li id="patronbasics">
@ -23,36 +23,36 @@
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% IF ( phone || mobile || phonepro ) %]<li class="patronphone">
[% IF ( phone ) %]
<a href="tel:[% phone | url %]">[% phone | html %]</a>
[% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
[% IF ( patron.phone ) %]
<a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a>
[% ELSE %]
[% IF ( mobile ) %]
<a href="tel:[% mobile | url %]">[% mobile | html %]</a>
[% IF ( patron.mobile ) %]
<a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a>
[% ELSE %]
[% IF ( phonepro ) %]
<a href="tel:[% phonepro | url %]">[% phonepro | html %]</a>
[% IF ( patron.phonepro ) %]
<a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a>
[% END %]
[% END %]
[% END %]</li>[% END %]
[% IF ( email ) %]
<li class="email"> <a href="mailto:[% email | url %]" title="[% email | html %]">[% email | html %]</a></li>
[% IF ( patron.email ) %]
<li class="email"> <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a></li>
[% ELSE %]
[% IF ( emailpro ) %]
<li class="email"> <a href="mailto:[% emailpro | url %]" title="[% emailpro | html %]">[% emailpro | html %]</a></li>
[% IF ( patron.emailpro ) %]
<li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li>
[% END %]
[% END %]
[% UNLESS ( address or address2 ) %]
[% UNLESS ( patron.address or patron.address2 ) %]
<li><span class="empty" id="noaddressstored">No address stored.</span></li>
[% END %]
[% UNLESS ( city ) %]
[% UNLESS ( patron.city ) %]
<li><span class="empty" id="nocitystored">No city stored.</span></li>
[% END %]
[% UNLESS ( phone or mobile or phonepro) %]
[% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %]
<li> <span class="empty">No phone stored.</span></li>
[% END %]
[% UNLESS ( email or emailpro) %]
[% UNLESS ( patron.email or patron.emailpro) %]
<li> <span class="empty">No email stored.</span></li>
[% END %]
@ -63,29 +63,29 @@
[% END %]
[% END %]
[% END %][% END %]
<li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>
<li class="patronlibrary">Home library: [% Branches.GetName( branchcode ) %]</li>
<li class="patroncategory">Category: [% patron.category.description %] ([% patron.categorycode %])</li>
<li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) %]</li>
</ul></div>
<div id="menu">
<ul>
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
[% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %]
[% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&amp;batch=1">Batch check out</a></li>
[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a></li>
[% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %]
[% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]&amp;batch=1">Batch check out</a></li>
[% END %]
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Details</a></li>
[% END %]
[% IF ( CAN_user_updatecharges ) %]
[% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
[% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Fines</a></li>
[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
[% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]
[% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber %]">Routing lists</a></li>[% END %]
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF ( intranetreadinghistory ) %]
[% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
[% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber %]">Circulation history</a></li>
[% END %]
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
@ -94,28 +94,28 @@
[% END %]
[% END %]
[% 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=[% borrowernumber %]&amp;src=circ">Modification log</a></li>
[% 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=[% patron.borrowernumber %]&amp;src=circ">Modification log</a></li>
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">Notices</a></li>
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
[% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">Statistics</a></li>
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF ( EnableBorrowerFiles ) %]
[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber %]">Files</a></li>
[% END %]
[% END %]
[% IF CAN_user_borrowers_edit_borrowers %]
[% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
[% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li>
[% END %]
[% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharges</a></li>
[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharges</a></li>
[% END %]
[% IF Koha.Preference('HouseboundModule') %]
[% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">Housebound</a></li>
[% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">Housebound</a></li>
[% END %]
[% IF Koha.Preference('ILLModule') %]
<li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% borrowernumber %]">Interlibrary loans</a></li>

22
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc

@ -8,7 +8,7 @@
<label for="B_address">
[% END %]
Address: </label>
<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
<input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
[% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -24,7 +24,7 @@
<select name="B_streettype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == B_streettype %]
[% IF roadtype.authorised_value == patron.B_streettype %]
<option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
[% ELSE %]
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
@ -43,7 +43,7 @@
<label for="B_streetnumber">
[% END %]
Street Number: </label>
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
[% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -56,7 +56,7 @@
<label for="B_address2">
[% END %]
Address 2: </label>
<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
<input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
[% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -68,7 +68,7 @@
<label for="B_zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
[% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -80,7 +80,7 @@
<label for="B_city">
[% END %]
City: </label>
<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
<input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
[% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -92,7 +92,7 @@
<label for="B_state">
[% END %]
State: </label>
<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
<input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
[% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -104,7 +104,7 @@
<label for="B_country">
[% END %]
Country: </label>
<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
<input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
[% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -116,7 +116,7 @@
<label for="B_phone">
[% END %]
Phone: </label>
<input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
<input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
[% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -128,7 +128,7 @@
<label for="B_email">
[% END %]
Email: </label>
<input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
<input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
[% END %]
[% UNLESS nocontactnote %]
@ -139,7 +139,7 @@
<label for="contactnote">
[% END %]
Contact note: </label>
<textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
<textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote %]</textarea>
[% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

22
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc

@ -9,7 +9,7 @@
<label for="B_streetnumber">
[% END %]
Street Number: </label>
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
[% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -25,7 +25,7 @@
<select name="B_streettype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == B_streettype %]
[% IF roadtype.authorised_value == patron.B_streettype %]
<option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
[% ELSE %]
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
@ -44,7 +44,7 @@
<label for="B_address">
[% END %]
Address: </label>
<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
<input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
[% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -57,7 +57,7 @@
<label for="B_address2">
[% END %]
Address 2: </label>
<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
<input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
[% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -69,7 +69,7 @@
<label for="B_zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
[% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -81,7 +81,7 @@
<label for="B_city">
[% END %]
City: </label>
<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
<input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
[% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -93,7 +93,7 @@
<label for="B_state">
[% END %]
State: </label>
<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
<input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
[% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -105,7 +105,7 @@
<label for="B_country">
[% END %]
Country: </label>
<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
<input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
[% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -117,7 +117,7 @@
<label for="B_phone">
[% END %]
Phone: </label>
<input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
<input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
[% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -129,7 +129,7 @@
<label for="B_email">
[% END %]
Email: </label>
<input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
<input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
[% END %]
[% UNLESS nocontactnote %]
@ -140,7 +140,7 @@
<label for="contactnote">
[% END %]
Contact note: </label>
<textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
<textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote %]</textarea>
[% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

20
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc

@ -8,7 +8,7 @@
<label for="B_streetnumber">
[% END %]
Street Number: </label>
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
<input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
[% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -24,7 +24,7 @@
<select name="B_streettype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == B_streettype %]
[% IF roadtype.authorised_value == patron.B_streettype %]
<option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
[% ELSE %]
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
@ -43,7 +43,7 @@
<label for="B_address">
[% END %]
Address: </label>
<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
<input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
[% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -55,7 +55,7 @@
<label for="B_address2">
[% END %]
Address 2: </label>
<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
<input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
[% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -67,7 +67,7 @@
<label for="B_city">
[% END %]
City: </label>
<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
<input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
[% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -79,7 +79,7 @@
<label for="B_state">
[% END %]
State: </label>
<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
<input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
[% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -91,7 +91,7 @@
<label for="B_zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
[% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -103,7 +103,7 @@
<label for="B_country">
[% END %]
Country: </label>
<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
<input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
[% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -115,7 +115,7 @@
<label for="B_phone">
[% END %]
Phone: </label>
<input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
<input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
[% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -127,7 +127,7 @@
<label for="B_email">
[% END %]
Email: </label>
<input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
<input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
[% END %]
[% UNLESS nocontactnote %]

18
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc

@ -8,7 +8,7 @@
<label for="altcontactsurname">
[% END %]
Surname:</label>
<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -20,7 +20,7 @@
<label for="altcontactfirstname">
[% END %]
First name:</label>
<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -32,7 +32,7 @@
<label for="altcontactaddress1">
[% END %]
Address:</label>
<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -44,7 +44,7 @@
<label for="altcontactaddress2">
[% END %]
Address 2:</label>
<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -56,7 +56,7 @@
<label for="altcontactzipcode">
[% END %]
ZIP/Postal code:</label>
<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -68,7 +68,7 @@
<label for="altcontactaddress3">
[% END %]
City:</label>
<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -80,7 +80,7 @@
<label for="altcontactstate">
[% END %]
State:</label>
<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
<input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -92,7 +92,7 @@
<label for="altcontactcountry">
[% END %]
Country:</label>
<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -104,7 +104,7 @@
<label for="altcontactphone">
[% END %]
Phone:</label>
<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
<input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

18
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc

@ -8,7 +8,7 @@
<label for="altcontactsurname">
[% END %]
Surname:</label>
<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -20,7 +20,7 @@
<label for="altcontactfirstname">
[% END %]
First name:</label>
<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -32,7 +32,7 @@
<label for="altcontactaddress1">
[% END %]
Address:</label>
<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -44,7 +44,7 @@
<label for="altcontactaddress2">
[% END %]
Address 2:</label>
<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -56,7 +56,7 @@
<label for="altcontactzipcode">
[% END %]
ZIP/Postal code:</label>
<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -68,7 +68,7 @@
<label for="altcontactaddress3">
[% END %]
City:</label>
<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -80,7 +80,7 @@
<label for="altcontactstate">
[% END %]
State:</label>
<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
<input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -92,7 +92,7 @@
<label for="altcontactcountry">
[% END %]
Country:</label>
<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -104,7 +104,7 @@
<label for="altcontactphone">
[% END %]
Phone:</label>
<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
<input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

18
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc

@ -8,7 +8,7 @@
<label for="altcontactsurname">
[% END %]
Surname:</label>
<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -20,7 +20,7 @@
<label for="altcontactfirstname">
[% END %]
First name:</label>
<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -32,7 +32,7 @@
<label for="altcontactaddress1">
[% END %]
Address:</label>
<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -44,7 +44,7 @@
<label for="altcontactaddress2">
[% END %]
Address 2:</label>
<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -56,7 +56,7 @@
<label for="altcontactaddress3">
[% END %]
City:</label>
<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -68,7 +68,7 @@
<label for="altcontactstate">
[% END %]
State:</label>
<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
<input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -80,7 +80,7 @@
<label for="altcontactzipcode">
[% END %]
ZIP/Postal code:</label>
<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -92,7 +92,7 @@
<label for="altcontactcountry">
[% END %]
Country:</label>
<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -104,7 +104,7 @@
<label for="altcontactphone">
[% END %]
Phone:</label>
<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
<input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

20
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc

@ -1,16 +1,16 @@
[% IF ( address or address2 ) %]
[% IF ( address ) %]
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% IF streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
[% IF patron.streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
[% END %]
<li class="patronaddress1">[% address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF streetnumber %] [% streetnumber %][% END %]</li>
<li class="patronaddress1">[% patron.address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF patron.streetnumber %] [% patron.streetnumber %][% END %]</li>
[% END %]
[% IF ( address2 ) %]
<li class="patronaddress2">[% address2 %]</li>
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.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>
[% IF ( patron.city ) %]<li class="patroncity">
[%IF ( patron.zipcode ) %][% patron.zipcode %] [% END %][% patron.city %][% IF ( patron.state ) %]</br>[% patron.state %][% END %]
[% IF ( patron.country ) %]<br />[% patron.country %][% END %]</li>
[% END %]

22
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc

@ -1,19 +1,19 @@
[% IF ( address or address2 ) %]
[% IF ( address ) %]
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% IF streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
[% IF patron.streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
[% END %]
<li class="patronaddress1">[% IF streetnumber %][% streetnumber %] [% END %]
<li class="patronaddress1">[% IF patron.streetnumber %][% patron.streetnumber %] [% END %]
[%IF roadtype_desc %][% roadtype_desc %] [% END %]
[% address %]
[% patron.address %]
</li>
[% END %]
[% IF ( address2 ) %]
<li class="patronaddress2">[% address2 %]</li>
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.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>
[% IF ( patron.city ) %]
<li class="patroncity">[%IF ( patron.zipcode ) %][% patron.zipcode %] [% END %][% patron.city %][% IF ( patron.state ) %]</br>[% patron.state %][% END %]
[% IF ( patron.country ) %]<br />[% patron.country %][% END %]</li>
[% END %]

20
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc

@ -1,16 +1,16 @@
[% IF ( address or address2 ) %]
[% IF ( address ) %]
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% IF streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
[% IF patron.streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
[% END %]
<li class="patronaddress1">[% if (streetnumber) %][% streetnumber |html %][% end %] [% address |html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end %]</li>
<li class="patronaddress1">[% if (patron.streetnumber) %][% patron.streetnumber |html %][% end %] [% patron.address |html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end %]</li>
[% END %]
[% IF ( address2 ) %]
<li class="patronaddress2">[% address2 |html %]</li>
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.address2 |html %]</li>
[% END %]
[% END %]
[% IF ( city ) %]<li class="patroncity">
[% city |html %][% IF ( state ) %], [% state |html %][% END %]
[% zipcode |html %][% IF ( country ) %], [% country |html %][% END %]</li>
[% IF ( patron.city ) %]<li class="patroncity">
[% patron.city |html %][% IF ( patron.state ) %], [% patron.state |html %][% END %]
[% patron.zipcode |html %][% IF ( patron.country ) %], [% patron.country |html %][% END %]</li>
[% END %]

20
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc

@ -1,16 +1,16 @@
[% IF ( B_address or B_address2 ) %]
[% IF ( B_address ) %]
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% B_address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF B_streetnumber %] [% B_streetnumber %][% END %]</li>
<li class="patronaddress1">[% patron.B_address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber %][% END %]</li>
[% END %]
[% IF ( B_address2 ) %]
<li class="patronaddress2">[% B_address2 %]</li>
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 %]</li>
[% END %]
[% END %]
[% IF ( B_city ) %]<li class="patroncity">
[%IF ( B_zipcode ) %][% B_zipcode %] [% END %][% B_city %][% IF ( B_state ) %]</br>[% B_state %][% END %]
[% IF ( B_country ) %]<br />[% B_country %][% END %]</li>
[% IF ( patron.B_city ) %]<li class="patroncity">
[%IF ( patron.B_zipcode ) %][% patron.B_zipcode %] [% END %][% patron.B_city %][% IF ( patron.B_state ) %]</br>[% patron.B_state %][% END %]
[% IF ( patron.B_country ) %]<br />[% patron.B_country %][% END %]</li>
[% END %]

26
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc

@ -1,21 +1,21 @@
[% IF ( B_address or B_address2 ) %]
[% IF ( B_address ) %]
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% IF B_streetnumber %][% B_streetnumber %][% END %]
<li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber %][% END %]
[%IF roadtype_desc %][% roadtype_desc %] [% END %]
[% B_address %]
[% patron.B_address %]
</li>
[% END %]
[% IF ( B_address2 ) %]
<li class="patronaddress2">[% B_address2 %]</li>
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 %]</li>
[% END %]
[% END %]
[% IF ( B_city ) %]
<li class="patroncity">[%IF ( B_zipcode ) %][% B_zipcode %] [% END %]
[% B_city %]
[% IF ( B_state ) %]</br>[% B_state %][% END %]
[% IF ( B_country ) %]<br />[% B_country %][% END %]</li>
[% IF ( patron.B_city ) %]
<li class="patroncity">[%IF ( patron.B_zipcode ) %][% patron.B_zipcode %] [% END %]
[% patron.B_city %]
[% IF ( patron.B_state ) %]</br>[% patron.B_state %][% END %]
[% IF ( patron.B_country ) %]<br />[% patron.B_country %][% END %]</li>
[% END %]

20
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc

@ -1,16 +1,16 @@
[% IF ( B_address or B_address2 ) %]
[% IF ( B_address ) %]
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% if (B_streetnumber) %][% B_streetnumber |html %][% end %] [% B_address |html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end %]</li>
<li class="patronaddress1">[% if (patron.B_streetnumber) %][% patron.B_streetnumber |html %][% end %] [% patron.B_address |html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end %]</li>
[% END %]
[% IF ( B_address2 ) %]
<li class="patronaddress2">[% B_address2 |html %]</li>
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 |html %]</li>
[% END %]
[% END %]
[% IF ( B_city ) %]<li class="patroncity">
[% B_city |html %][% IF ( B_state ) %], [% B_state |html %][% END %]
[% B_zipcode |html %][% IF ( B_country ) %], [% B_country |html %][% END %]</li>
[% IF ( patron.B_city ) %]<li class="patroncity">
[% patron.B_city |html %][% IF ( patron.B_state ) %], [% patron.B_state |html %][% END %]
[% patron.B_zipcode |html %][% IF ( patron.B_country ) %], [% patron.B_country |html %][% END %]</li>
[% END %]

18
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc

@ -12,7 +12,7 @@
<select name="streettype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == streettype %]
[% IF roadtype.authorised_value == patron.streettype %]
<option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
[% ELSE %]
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
@ -31,7 +31,7 @@
<label for="address">
[% END %]
Address: </label>
<input type="text" id="address" name="address" size="35" value="[% address %]" />
<input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -43,7 +43,7 @@
<label for="streetnumber">
[% END %]
Street number: </label>
<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -55,7 +55,7 @@
<label for="address2">
[% END %]
Address 2: </label>
<input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
<input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -67,7 +67,7 @@
<label for="zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
<input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -79,12 +79,12 @@
<label for="city">
[% END %]
City: </label>
<input type="text" id="city" name="city" size="20" value="[% city %]" />
<input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
[% IF cities.count %]or choose
<select id="select_city" name="select_city">
<option value="|||"></option>
[% FOREACH c IN cities %]
[% IF c.city_name == city && c.city_state == state && c.city_zipcode == zipcode %]
[% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
<option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
[% ELSE %]
<option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
@ -105,7 +105,7 @@
<label for="state">
[% END %]
State: </label>
<input type="text" name="state" id="state" size="20" value="[% state %]" />
<input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -117,7 +117,7 @@
<label for="country">
[% END %]
Country: </label>
<input type="text" name="country" id="country" size="20" value="[% country %]" />
<input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

18
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc

@ -8,7 +8,7 @@
<label for="streetnumber">
[% END %]
Street number: </label>
<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
[% END %]
@ -23,7 +23,7 @@
<select name="streettype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == streettype %]
[% IF roadtype.authorised_value == patron.streettype %]
<option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
[% ELSE %]
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
@ -42,7 +42,7 @@
<label for="address">
[% END %]
Address: </label>
<input type="text" id="address" name="address" size="35" value="[% address %]" />
<input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -54,7 +54,7 @@
<label for="address2">
[% END %]
Address 2: </label>
<input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
<input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -66,7 +66,7 @@
<label for="zipcode">
[% END %]
ZIP/Postal code: </label>
<input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
<input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -78,12 +78,12 @@
<label for="city">
[% END %]
City: </label>
<input type="text" id="city" name="city" size="20" value="[% city %]" />
<input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
[% IF cities.count %]or choose
<select id="select_city" name="select_city">
<option value="|||"></option>
[% FOREACH c IN cities %]
[% IF c.city_name == city && c.city_state == state && c.city_zipcode == zipcode %]
[% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
<option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
[% ELSE %]
<option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
@ -104,7 +104,7 @@
<label for="state">
[% END %]
State: </label>
<input type="text" name="state" id="state" size="20" value="[% state %]" />
<input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -116,7 +116,7 @@
<label for="country">
[% END %]
Country: </label>
<input type="text" name="country" id="country" size="20" value="[% country %]" />
<input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]

18
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc

@ -8,7 +8,7 @@
<label for="streetnumber">
[% END %]
Street number: </label>
<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
</li>
[% END %]
@ -24,7 +24,7 @@
<select name="streettype">
<option value=""></option>
[% FOR roadtype IN roadtypes %]
[% IF roadtype.authorised_value == streettype%]
[% IF roadtype.authorised_value == patron.streettype %]
<option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
[% ELSE %]
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>