From 448ad31007360e94c40e6150d7ac05f27a885175 Mon Sep 17 00:00:00 2001 From: Nicole Engard Date: Thu, 10 Sep 2009 19:46:50 -0400 Subject: [PATCH] Bugs: 1172 3579 3596 fixes to patron detail in opac This patch makes it so that the patron can see their details even if the OPACPatronDetails sys pref is OFF. It also removed the messaging options from the patron details and leaves them on the messaging tab. Finally it adds in address fields that were missing previously on the update patron form. Signed-off-by: Galen Charlton --- .../opac-tmpl/prog/en/includes/usermenu.inc | 2 - .../prog/en/modules/opac-messaging.tmpl | 2 +- .../prog/en/modules/opac-userupdate.tmpl | 143 +++++++++++------- opac/opac-userupdate.pl | 19 ++- 4 files changed, 102 insertions(+), 64 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc index a8fc320fcd..d4df7c22ad 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc @@ -5,9 +5,7 @@
  • my fines
    • -
  • my personal details
    • -
  • my tags
    • diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl index 53df177be4..f1532e2a90 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl @@ -100,11 +100,11 @@ -
    Cancel
    + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl index 4ae620c1cf..62ec6be1b6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl @@ -9,24 +9,25 @@
    -
    +

    's account ../../images/caret.gif" width="16" height="16" alt=">" border="0" /> Your Personal Details

    +
    -
    Name
    1. " name="firstname" />
      2. +
    2. " name="othernames" />
    3. " name="surname" />
    Contact Information
      -
    1. - +
    2. + " name="streetnumber" /> " id="address" /> " id="address2" />
    3. " name="city" />
      4. @@ -34,71 +35,30 @@
    4. " name="country" />
    5. " name="phone" />
    6. " name="mobile" />
      7. -
    7. " name="fax" />
      8. -
    8. " name="phonepro" />
      9. - +
    9. " name="fax" />
    10. " name="emailaddress" />
      11. -
    -
    - -
    -Items Borrowed Notifications -
      -
    1. - - - - - - -
      2. -
    2. - - - - - - -
      3. -
    -
    - -
    -Items Returned Notifications -
      -
    1. - - - - - - -
      2. -
    2. - - - - - - -
      3. +
    3. " name="emailpro" />
    -Permanent Address +Alternate Contact Information
    1. - - + + " name="B_streetnumber" /> + " name="B_address" /> + " name="B_address2" />
    2. " name="B_city" />
      3. -
    3. " name="B_zipcode" />
      4. -
    4. " name="B_country" />
      5. +
    5. " name="B_zipcode" />
      6. +
    6. " name="B_country" />
      7. +
    7. " name="B_phone" />
      8. +
    8. " name="B_email" />
    @@ -136,6 +96,77 @@
    + +

    To make changes to your record please contact the library.

    +
    +
    +Contact Information +
      +
    1. Name:
      2. +
    2. Other Name:
      3. +
    3. Address:
      4. +
    4.  
      5. +
    5. City, State:
      6. +
    6. Zip Code:
      7. +
    7. Country:
      8. +
    8. Home Phone:
      9. +
    9. Mobile Phone:
      10. +
    10. Work phone:
      11. +
    11. Fax:
      12. +
    12. Email:
      13. +
    13. Work Email:
      14. +
    +
    + +
    +Personal Information +
      +
    1. Date of Birth:
      2. +
    2. Sex: +Female +Male +
      3. +
    +
    +
    + +
    +
    +Alternate Contact Information +
      +
    1. Alternate Address:
      2. +
    2.  
      3. +
    3. City, State:
      4. +
    4. Zip Code:
      5. +
    5. Country:
      6. +
    6. Phone:
      7. +
    7. Email:
      8. +
    +
    + +
    +Library Use: +
      +
    1. Card number:
      2. +
    2. Patron Number:
      3. +
    3. Patron Category: ()
      4. +
    4. Joined:
      5. +
    5. Expires:
      6. + + +
    6. + + + + + +
      7. + + +
    +
    +
    +
    diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl index 866431601a..b083779258 100755 --- a/opac/opac-userupdate.pl +++ b/opac/opac-userupdate.pl @@ -53,13 +53,12 @@ my $lib = GetBranchDetail($borr->{'branchcode'}); # handle the new information.... # collect the form values and send an email. my @fields = ( - 'surname', 'firstname', - 'address','address2','city','zipcode','phone','mobile','fax','phonepro', 'emailaddress','B_streetaddress','B_city','B_zipcode','dateofbirth','sex' + 'surname','firstname','othernames','streetaddress','city','zipcode','country','phone','mobile','fax','phonepro', 'emailaddress','emailpro','B_streetnumber','B_streetaddress','B_city','B_zipcode','B_country','B_phone','B_email','dateofbirth','sex' ); my $update; my $updateemailaddress = $lib->{'branchemail'}; $updateemailaddress = C4::Context->preference('KohaAdminEmailAddress') unless( $updateemailaddress =~ /\w+@\w+/); -if ( $updateemailaddress eq '' ) { +if ( !$updateemailaddress || $updateemailaddress eq '' ) { warn "KohaAdminEmailAddress system preference not set. Couldn't send patron update information for $borr->{'firstname'} $borr->{'surname'} (#$borrowernumber)\n"; my ($template) = get_template_and_user( @@ -91,8 +90,12 @@ has requested to change her/his personal details. Please check these new details and make the changes: EOF + my $streetnumber = $borr->{'streetnumber'} || ''; + my $address = $borr->{'address'} || ''; + my $address2 = $borr->{'address2'} || ''; my $B_streetnumber = $borr->{'B_streetnumber'} || ''; my $B_address = $borr->{'B_address'} || ''; + my $B_address2 = $borr->{'B_address2'} || ''; foreach my $field (@fields) { my $newfield = $query->param($field) || ''; @@ -100,11 +103,17 @@ EOF if($borr->{$field}) { $borrowerfield = $borr->{$field}; } + + # reconstruct the address + if($field eq "streetaddress") { + $borrowerfield = "$streetnumber $address, $address2"; + } + # reconstruct the alternate address if($field eq "B_streetaddress") { - $borrowerfield = "$B_streetnumber $B_address"; + $borrowerfield = "$B_streetnumber $B_address, $B_address2"; } - + if($field eq "dateofbirth") { $borrowerfield = format_date( $borr->{'dateofbirth'} ) || ''; } -- 2.39.5