Bug 3861 cannot place hold in opac

[koha_fer] / opac / opac-userupdate.pl

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index 8664316..b083779 100755 (executable)
--- 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'} ) || '';
         }