X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=cf3ab1b48ad0b3ae37aa283c19d9653803ce24e9;hb=44158be319024c0f55be4a2f72f79c6c73dc9c54;hp=dc53f6d5527f1d057bf0f469710265f595657c5c;hpb=4747bfbea3f4abb66d05a2bd1abed69e28a4aa3d;p=freeside.git
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index dc53f6d55..cf3ab1b48 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -174,17 +174,17 @@ Template:
<& /elements/checkboxes.html,
'style' => 'display: inline; vertical-align: top',
'disable_links' => 1,
- 'names_list' => \@contact_checkboxes,
+ 'names_list' => \@optin_checkboxes,
'element_name_prefix' => 'contact_class_',
'checked_callback' => sub {
# Called for each checkbox
# Return true to default as checked, false as unchecked
my($cgi, $name) = @_;
- $name eq 'message'
+ exists $dest_ischecked{$name};
},
&>
-% if ($send_to_domain) {
+% if ($send_to_domain && $cgi->param('custnum')) {
Email to voice
@@ -199,6 +199,27 @@ Template:
% }
+% if (@active_classes) {
+
+
+Contact Type: |
+
+
+ <& /elements/checkboxes.html,
+ 'style' => 'display: inline; vertical-align: top',
+ 'disable_links' => 1,
+ 'names_list' => \@classnum_checkboxes,
+ 'element_name_prefix' => 'contact_class_',
+ 'checked_callback' => sub {
+ # Called for each checkbox
+ # Return true to default as checked, false as unchecked
+ my($cgi, $name) = @_;
+ exists $classnum_ischecked{$name};
+ },
+ &>
+
+ |
+% }
@@ -281,6 +302,8 @@ my $process_url = $opt{'process_url'} || 'process/email-customers.html';
my $title = $opt{'title'} || 'Send customer notices';
push( @no_search_fields, @{$opt{'no_search_fields'}} ) if $opt{'no_search_fields'};
+$m->comp('/elements/handle_uri_query');
+
my $table = $cgi->param('table') or die "'table' required";
my $agent_virt_agentnum = $cgi->param('agent_virt_agentnum') || '';
@@ -303,6 +326,15 @@ else {
@search{keys %search} = map { /\0/ ? [ split /\0/, $_ ] : $_ } values %search;
}
+# rebuild contacts hash
+delete $search{contacts}
+ if exists $search{contacts} && ref $search{contacts};
+$search{'contacts'} = {
+ map { $_ => $search{$_}, }
+ grep { /^(contacts_*)/ && $search{$_} }
+ keys %search
+};
+
&{$opt{'post_search_hook'}}(
'conf' => $conf,
'search' => \%search,
@@ -340,8 +372,32 @@ if ( !$cgi->param('preview') ) {
$body ||= $content->body;
}
+ my $sql_query = "FS::$table"->search(\%search);
+ my $count_query = delete($sql_query->{'count_query'});
+ my $count_sth = dbh->prepare($count_query)
+ or die "Error preparing $count_query: ". dbh->errstr;
+ $count_sth->execute
+ or die "Error executing $count_query: ". $count_sth->errstr;
+ my $count_arrayref = $count_sth->fetchrow_arrayref;
+ $num_cust = $count_arrayref->[0];
+
} else {
+ my @checked_email_dest;
+ my @checked_contact_type;
+ for ($cgi->param) {
+ if (/^contact_class_(.+)$/) {
+ my $f = $1;
+ if ($f eq 'invoice' || $f eq 'message') {
+ push @checked_email_dest, $f;
+ } elsif ( $f =~ /^\d+$/ ) {
+ push @checked_contact_type, $f;
+ }
+ }
+ }
+ $search{with_email_dest} = \@checked_email_dest if @checked_email_dest;
+ $search{with_contact_type} = \@checked_contact_type if @checked_contact_type;
+
my $sql_query = "FS::$table"->search(\%search);
my $count_query = delete($sql_query->{'count_query'});
my $count_sth = dbh->prepare($count_query)
@@ -391,6 +447,8 @@ if ( !$cgi->param('preview') ) {
$sql_query->{'select'} = "$table.*";
$sql_query->{'order_by'} = '';
my $object = qsearchs($sql_query);
+ # Could use better error handling here...
+ die "No customers match the search criteria" unless ref $object;
$cust = $object->cust_main;
my %msgopts = (
'cust_main' => $cust,
@@ -428,23 +486,55 @@ if ( !$cgi->param('preview') ) {
push @contact_classname, 'Message recipients';
} else {
my $contact_class = FS::contact_class->by_key($1);
- push @contact_classname, encode_entities($contact_class->classname);
+ push @contact_classname, encode_entities(
+ $contact_class ? $contact_class->classname : '(none)'
+ );
}
}
}
}
}
-my @contact_checkboxes = (
- [ 'message' => { label => 'Message recipients' } ],
- [ 'invoice' => { label => 'Invoice recipients' } ],
-);
+# Build data structures for "Opt In" and "Contact Type" checkboxes
+#
+# By default, message recipients will be selected, this is a message.
+# By default, all Contact Types will be selected, but this may be
+# overridden by passing 'classnums' get/post values. If no contact
+# types have been defined, the option will not be presented.
+
+my @active_classes = qsearch(contact_class => {disabled => ''} );
+
+my %classnum_ischecked;
+my %dest_ischecked;
+
+$CGI::LIST_CONTEXT_WARN = 0;
+if ( my @in_classnums = $cgi->param('classnums') ) {
+ # Set checked boxes from form input
+ for my $v (@in_classnums) {
+
+ if ( $v =~ /^\d+$/ ) {
+ $classnum_ischecked{$v} = 1
+ } elsif ( $v =~ /^(invoice|message)$/ ) {
+ $dest_ischecked{$v} = 1;
+ }
-foreach my $class (qsearch('contact_class', { disabled => '' })) {
- push @contact_checkboxes, [
- $class->classnum,
- { label => $class->classname }
- ];
+ }
+} else {
+ # Checked boxes default values
+ $classnum_ischecked{$_->classnum} = 1 for @active_classes;
+ $classnum_ischecked{0} = 1;
}
+# At least one destination is required
+$dest_ischecked{message} = 1 unless %dest_ischecked;
+
+my @optin_checkboxes = (
+ [ 'message' => { label => 'Message recipients', desc => 'send this notice to all message recipients for the '.$num_cust.' selected customers.' } ],
+ [ 'invoice' => { label => 'Invoice recipients', desc => 'send this notice to all invoice recipients for the '.$num_cust.' selected customers.' } ],
+);
+my @classnum_checkboxes = (
+ [ '0' => { label => '(None)' }],
+ map { [ $_->classnum => {label => $_->classname} ] } @active_classes,
+);
+
%init>