|
Lines 764-777
sub merge_with {
Link Here
|
| 764 |
$patron->delete(); |
764 |
$patron->delete(); |
| 765 |
|
765 |
|
| 766 |
if ( C4::Context->preference("BorrowersLog") ) { |
766 |
if ( C4::Context->preference("BorrowersLog") ) { |
| 767 |
my $info = |
767 |
my $info = to_json( |
| 768 |
( $patron->firstname // "" ) . " " |
768 |
{ |
| 769 |
. ( $patron->surname // "" ) . " (" |
769 |
patron_firstname => $patron->firstname || "", |
| 770 |
. ( $patron->cardnumber // "" ) . ")" |
770 |
patron_surname => $patron->surname || "", |
| 771 |
. " has been merged into " |
771 |
patron_cardnumber => $patron->cardnumber || "", |
| 772 |
. ( $self->firstname // "" ) . " " |
772 |
merged_firstname => $self->firstname || "", |
| 773 |
. ( $self->surname // "" ) . " (" |
773 |
merged_surname => $self->surname || "", |
| 774 |
. ( $self->cardnumber // "" ) . ")"; |
774 |
merged_cardnumber => $self->cardnumber || "", |
|
|
775 |
}, |
| 776 |
{ pretty => 1, canonical => 1 } |
| 777 |
); |
| 775 |
logaction( "MEMBERS", "PATRON_MERGE", $self->id, $info ); |
778 |
logaction( "MEMBERS", "PATRON_MERGE", $self->id, $info ); |
| 776 |
} |
779 |
} |
| 777 |
} |
780 |
} |
|
Lines 1088-1094
sub set_password {
Link Here
|
| 1088 |
module => 'members', |
1091 |
module => 'members', |
| 1089 |
letter_code => 'PASSWORD_CHANGE', |
1092 |
letter_code => 'PASSWORD_CHANGE', |
| 1090 |
branchcode => $self_from_storage->branchcode, |
1093 |
branchcode => $self_from_storage->branchcode, |
| 1091 |
, |
1094 |
|
| 1092 |
lang => $self_from_storage->lang || 'default', |
1095 |
lang => $self_from_storage->lang || 'default', |
| 1093 |
tables => { |
1096 |
tables => { |
| 1094 |
'branches' => $self_from_storage->branchcode, |
1097 |
'branches' => $self_from_storage->branchcode, |