projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#38314: Declined payment shows card as tokenized after first attempt
[freeside.git]
/
FS
/
FS
/
contact.pm
diff --git
a/FS/FS/contact.pm
b/FS/FS/contact.pm
index
38b7fd7
..
6120480
100644
(file)
--- a/
FS/FS/contact.pm
+++ b/
FS/FS/contact.pm
@@
-837,6
+837,7
@@
sub send_reset_email {
#die "selfservice-password_reset_msgnum unset" unless $msgnum;
return { 'error' => "selfservice-password_reset_msgnum unset" } unless $msgnum;
my $msg_template = qsearchs('msg_template', { msgnum => $msgnum } );
#die "selfservice-password_reset_msgnum unset" unless $msgnum;
return { 'error' => "selfservice-password_reset_msgnum unset" } unless $msgnum;
my $msg_template = qsearchs('msg_template', { msgnum => $msgnum } );
+ return { 'error' => "selfservice-password_reset_msgnum cannot be loaded" } unless $msg_template;
my %msg_template = (
'to' => join(',', map $_->emailaddress, @contact_email ),
'cust_main' => $cust_main,
my %msg_template = (
'to' => join(',', map $_->emailaddress, @contact_email ),
'cust_main' => $cust_main,
@@
-846,11
+847,14
@@
sub send_reset_email {
if ( $opt{'queue'} ) { #or should queueing just be the default?
if ( $opt{'queue'} ) { #or should queueing just be the default?
+ my $cust_msg = $msg_template->prepare( %msg_template );
+ my $error = $cust_msg->insert;
+ return { 'error' => $error } if $error;
my $queue = new FS::queue {
my $queue = new FS::queue {
- 'job' => 'FS::
Misc::process_send_email
',
+ 'job' => 'FS::
cust_msg::process_send
',
'custnum' => $cust_main ? $cust_main->custnum : '',
};
'custnum' => $cust_main ? $cust_main->custnum : '',
};
- $queue->insert( $
msg_template->prepare( %msg_template )
);
+ $queue->insert( $
cust_msg->custmsgnum
);
} else {
} else {