From 3e576f65b2dff4616d8b57d8f31dea1a3a402ffc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Tue, 14 Jun 2016 10:14:29 +0200 Subject: [PATCH] Bug 10760: Alternate Address: Make street number and street type editable Table 'borrowers' contain columns B_streetnumber and B_streettype. This patch makes them editable for alternate address. To test: - Apply patch - Edit a patron's details - Verify that in edit mode for Alternate address, the fields 'street type' and 'street number' appear and follow the settings in sysprefs AddressFormat, BorrowerMandatoryField, BorrowerUnwantedField - Verify that the values are saved correctly. Note: A second patch will follow to manage the display of street number and street type Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall --- .../includes/member-alt-address-style-de.inc | 36 +++++++++++++++++++ .../includes/member-alt-address-style-us.inc | 35 ++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc index 3893497c02..43385f268c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc @@ -12,6 +12,42 @@ [% IF ( mandatoryB_address ) %]Required[% END %] [% END %] + + [% IF roadtypes %] +
  • + [% IF ( mandatoryB_streettype ) %] +
  • + [% END %] + + [% UNLESS noB_streetnumber %] +
  • + [% IF ( mandatoryB_streetnumber ) %] +
  • + [% END %] + [% UNLESS noB_address2 %]
  • [% IF ( mandatoryB_address2 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc index e6b31ff864..7c4adbdc39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc @@ -1,5 +1,40 @@
    Alternate address
      + [% UNLESS noB_streetnumber %] +
    1. + [% IF ( mandatoryB_streetnumber ) %] +
    2. + [% END %] + + [% IF roadtypes %] +
    3. + [% IF ( mandatoryB_streettype ) %] +
    4. + [% END %] + [% UNLESS noB_address %]
    5. [% IF ( mandatoryB_address ) %] -- 2.39.5