summaryrefslogtreecommitdiff
path: root/FS/FS
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2016-04-30 18:07:50 -0700
committerMark Wells <mark@freeside.biz>2016-04-30 18:08:03 -0700
commitf13259886f97a172b13c963b6d70a41c25228beb (patch)
treea313bc6c33a6ba6fa1523b299d3b7212fcd07118 /FS/FS
parentd66fbc1d7e47e4356cedf92a397d38aa6b8cb7a4 (diff)
allow sending email to specific contact classes, #33316
Diffstat (limited to 'FS/FS')
-rw-r--r--FS/FS/cust_main.pm67
-rw-r--r--FS/FS/cust_main_Mixin.pm8
-rw-r--r--FS/FS/msg_template/email.pm33
3 files changed, 101 insertions, 7 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3de04f0..ba28f2a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3105,6 +3105,73 @@ sub invoicing_list_emailonly_scalar {
join(', ', $self->invoicing_list_emailonly);
}
+=item contact_list [ CLASSNUM, ... ]
+
+Returns a list of contacts (L<FS::contact> objects) for the customer. If
+a list of contact classnums is given, returns only contacts in those
+classes. If the pseudo-classnum 'invoice' is given, returns contacts that
+are marked as invoice destinations. If '0' is given, also returns contacts
+with no class.
+
+If no arguments are given, returns all contacts for the customer.
+
+=cut
+
+sub contact_list {
+ my $self = shift;
+ my $search = {
+ table => 'contact',
+ select => 'contact.*, cust_contact.invoice_dest',
+ addl_from => ' JOIN cust_contact USING (contactnum)',
+ extra_sql => ' WHERE cust_contact.custnum = '.$self->custnum,
+ };
+
+ my @orwhere;
+ my @classnums;
+ foreach (@_) {
+ if ( $_ eq 'invoice' ) {
+ push @orwhere, 'cust_contact.invoice_dest = \'Y\'';
+ } elsif ( $_ eq '0' ) {
+ push @orwhere, 'cust_contact.classnum is null';
+ } elsif ( /^\d+$/ ) {
+ push @classnums, $_;
+ } else {
+ die "bad classnum argument '$_'";
+ }
+ }
+
+ if (@classnums) {
+ push @orwhere, 'cust_contact.classnum IN ('.join(',', @classnums).')';
+ }
+ if (@orwhere) {
+ $search->{extra_sql} .= ' AND (' .
+ join(' OR ', map "( $_ )", @orwhere) .
+ ')';
+ }
+
+ qsearch($search);
+}
+
+=item contact_list_email [ CLASSNUM, ... ]
+
+Same as L</contact_list>, but returns email destinations instead of contact
+objects.
+
+=cut
+
+sub contact_list_email {
+ my $self = shift;
+ my @contacts = $self->contact_list(@_);
+ my @emails;
+ foreach my $contact (@contacts) {
+ foreach my $contact_email ($contact->contact_email) {
+ push @emails,
+ $contact->firstlast . ' <' . $contact_email->emailaddress . '>';
+ }
+ }
+ @emails;
+}
+
=item referral_custnum_cust_main
Returns the customer who referred this customer (or the empty string, if
diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index bbba8c5..9fc66e0 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -383,6 +383,12 @@ HTML body
Text body
+=item to_contact_classnum
+
+The customer contact class (or classes, as a comma-separated list) to send
+the message to. If unspecified, will be sent to any contacts that are marked
+as invoice destinations (the equivalent of specifying 'invoice').
+
=back
Returns an error message, or false for success.
@@ -406,6 +412,7 @@ sub email_search_result {
my $subject = delete $param->{subject};
my $html_body = delete $param->{html_body};
my $text_body = delete $param->{text_body};
+ my $to_contact_classnum = delete $param->{to_contact_classnum};
my $error = '';
my $job = delete $param->{'job'}
@@ -471,6 +478,7 @@ sub email_search_result {
my $cust_msg = $msg_template->prepare(
'cust_main' => $cust_main,
'object' => $obj,
+ 'to_contact_classnum' => $to_contact_classnum,
);
# For non-cust_main searches, we avoid duplicates based on message
diff --git a/FS/FS/msg_template/email.pm b/FS/FS/msg_template/email.pm
index 4ed582b..47df4db 100644
--- a/FS/FS/msg_template/email.pm
+++ b/FS/FS/msg_template/email.pm
@@ -289,9 +289,25 @@ sub prepare {
my @to;
if ( exists($opt{'to'}) ) {
+
@to = split(/\s*,\s*/, $opt{'to'});
+
} elsif ( $cust_main ) {
- @to = $cust_main->invoicing_list_emailonly;
+
+ if ( $opt{'to_contact_classnum'} ) {
+
+ my $classnum = $opt{'to_contact_classnum'};
+ my @classes = ref($classnum) ? @$classnum : split(',', $classnum);
+ if ( !@classes ) {
+ # traditional behavior: send to invoice email destinations (only)
+ @classes = ( 'invoice' );
+ }
+ @to = $cust_main->contact_list_email(@classes);
+ # not guaranteed to produce contacts, but then customers aren't
+ # guaranteed to have email addresses on file. in that case, env_to
+ # will be null and sending this message will fail.
+ }
+
} else {
die 'no To: address or cust_main object specified';
}
@@ -324,13 +340,16 @@ sub prepare {
);
warn "$me creating message headers\n" if $DEBUG;
+ # strip display-name from envelope addresses
+ # (use Email::Address for this? it chokes on non-ASCII characters in
+ # the display-name, which is not great for us)
my $env_from = $from_addr;
- $env_from =~ s/^\s*//; $env_from =~ s/\s*$//;
- if ( $env_from =~ /^(.*)\s*<(.*@.*)>$/ ) {
- # a common idiom
- $env_from = $2;
- }
-
+ foreach ($env_from, @to) {
+ s/^\s*//;
+ s/\s*$//;
+ s/^(.*)\s*<(.*@.*)>$/$2/;
+ }
+
my $domain;
if ( $env_from =~ /\@([\w\.\-]+)/ ) {
$domain = $1;