projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 7977: Followup patch addressing items pointed out by Jonathan Druart
[koha.git]
/
opac
/
opac-userupdate.pl
diff --git
a/opac/opac-userupdate.pl
b/opac/opac-userupdate.pl
index
aa5858a
..
b37d88c
100755
(executable)
--- a/
opac/opac-userupdate.pl
+++ b/
opac/opac-userupdate.pl
@@
-40,7
+40,7
@@
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
template_name => "opac-userupdate.tmpl",
query => $query,
type => "opac",
template_name => "opac-userupdate.tmpl",
query => $query,
type => "opac",
- authnotrequired =>
( C4::Context->preference("OpacPublic") ? 1 : 0 )
,
+ authnotrequired =>
0
,
flagsrequired => { borrow => 1 },
debug => 1,
}
flagsrequired => { borrow => 1 },
debug => 1,
}
@@
-48,6
+48,7
@@
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
# get borrower information ....
my ( $borr ) = GetMemberDetails( $borrowernumber );
# get borrower information ....
my ( $borr ) = GetMemberDetails( $borrowernumber );
+my ( $patronemail ) = GetFirstValidEmailAddress($borrowernumber);
my $lib = GetBranchDetail($borr->{'branchcode'});
# handle the new information....
my $lib = GetBranchDetail($borr->{'branchcode'});
# handle the new information....
@@
-80,14
+81,17
@@
if ( !$updateemailaddress || $updateemailaddress eq '' ) {
exit;
}
exit;
}
+if ( !$patronemail || $patronemail eq '' ) {
+ $patronemail = $updateemailaddress;
+};
+
if ( $query->param('modify') ) {
# get all the fields:
my $message = <<"EOF";
if ( $query->param('modify') ) {
# get all the fields:
my $message = <<"EOF";
-Patron $borr->{'cardnumber'}
+Patron $borr->{'cardnumber'} has requested to change her/his personal details.
+Please check these new details and make the changes to these fields:
-has requested to change her/his personal details.
-Please check these new details and make the changes:
EOF
my $streetnumber = $borr->{'streetnumber'} || '';
EOF
my $streetnumber = $borr->{'streetnumber'} || '';
@@
-108,16
+112,17
@@
EOF
$borrowerfield = format_date( $borr->{'dateofbirth'} ) || '';
}
$borrowerfield = format_date( $borr->{'dateofbirth'} ) || '';
}
- if($borrowerfield eq $newfield) {
- $message .= "$field : $borrowerfield --> $newfield\n";
- } else {
- $message .= uc($field) . " : $borrowerfield --> $newfield\n";
+ if($borrowerfield ne $newfield) {
+ $message .= $field . " : $borrowerfield --> $newfield\n";
}
}
}
}
+
+ $message .= "\nEdit this patron's record: http://".C4::Context->preference('staffClientBaseURL ')."/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=".$borr->{'borrowernumber'}."&categorycode=".$borr->{'categorycode'} if C4::Context->preference('staffClientBaseURL ');
+
$message .= "\n\nThanks,\nKoha\n\n";
my %mail = (
To => $updateemailaddress,
$message .= "\n\nThanks,\nKoha\n\n";
my %mail = (
To => $updateemailaddress,
- From => $
updateemailaddress
,
+ From => $
patronemail
,
Subject => "User Request for update of Record.",
Message => $message,
'Content-Type' => 'text/plain; charset="utf8"',
Subject => "User Request for update of Record.",
Message => $message,
'Content-Type' => 'text/plain; charset="utf8"',
@@
-136,9
+141,6
@@
EOF
}
}
}
}
-$borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
-$borr->{'dateexpiry'} = format_date( $borr->{'dateexpiry'} );
-$borr->{'dateofbirth'} = format_date( $borr->{'dateofbirth'} );
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
$borr->{'branchname'} = GetBranchName($borr->{'branchcode'});
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
$borr->{'branchname'} = GetBranchName($borr->{'branchcode'});
@@
-165,6
+167,15
@@
for (@{ $checkout_prefs->{transports} }) {
$borr->{"items_borrowed_$_"} = 1;
}
$borr->{"items_borrowed_$_"} = 1;
}
+if (C4::Context->preference('OPACpatronimages')) {
+ my ($image, $dberror) = GetPatronImage($borr->{'cardnumber'});
+ if ($image) {
+ $template->param(
+ display_patron_image => 1
+ );
+ }
+}
+
my @bordat;
$bordat[0] = $borr;
my @bordat;
$bordat[0] = $borr;