[freeside-commits] freeside/FS/FS Mason.pm, 1.44, 1.45 msg_template.pm, 1.1, 1.2 Schema.pm, 1.223, 1.224 cust_main.pm, 1.522, 1.523

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv1639/FS/FS

Modified Files:
	Mason.pm msg_template.pm Schema.pm cust_main.pm 
Log Message:
notices, RT#8324

Index: msg_template.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/msg_template.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- msg_template.pm	12 Jul 2010 13:17:42 -0000	1.1
+++ msg_template.pm	13 Jul 2010 11:09:38 -0000	1.2
@@ -2,6 +2,9 @@
 
 use strict;
 use base qw( FS::Record );
+use Text::Template;
+use FS::Misc qw( generate_email send_email );
+use FS::Conf;
 use FS::Record qw( qsearch qsearchs );
 
 =head1 NAME
@@ -130,6 +133,124 @@
   $self->SUPER::check;
 }
 
+=item send OPTION => VALUE, ...
+
+Fills in the template and emails it to the customer.
+
+Options are passed as a list of name/value pairs:
+
+=over 4
+
+=item cust_main
+
+Customer object (required).
+
+=item object
+
+Additional context object (currently, can be a cust_main object, cust_pkg
+object, or cust_bill object).
+
+=back
+
+=cut
+
+sub send {
+  my( $self, %opt ) = @_;
+
+  my $cust_main = $opt{'cust_main'};
+  my $object = $opt{'object'};
+
+  ###
+  # fill-in
+  ###
+
+  my $subs = $self->substitutions;
+  
+  use Data::Dumper;
+  warn Dumper($subs);
+
+  #XXX html escape this stuff
+  my %hash = map { $_ => $cust_main->$_() } @{ $subs->{'cust_main'} };
+  unless ( ! $object || $object->table eq 'cust_main' ) {
+    %hash = ( %hash, map { $_ => $object->$_() } @{ $subs->{$object->table} } );
+  }
+  warn Dumper(\%hash);
+
+  my $subject_tmpl = new Text::Template (
+    TYPE   => 'STRING',
+    SOURCE => $self->subject,
+  );
+  my $subject = $subject_tmpl->fill_in( HASH => \%hash );
+
+  my $body_tmpl = new Text::Template (
+    TYPE   => 'STRING',
+    SOURCE => $self->body,
+  );
+  my $body = $body_tmpl->fill_in( HASH => \%hash );
+
+  ###
+  # and email
+  ###
+
+  my @to = $cust_main->invoicing_list_emailonly;
+  #unless (@to) { #XXX do something }
+
+  my $conf = new FS::Conf;
+
+  send_email(
+    generate_email(
+       #XXX override from in event?
+      'from' => scalar( $conf->config('invoice_from', $cust_main->agentnum) ),
+      'to'   => \@to,
+      'subject'   => $subject,
+      'html_body' => $body,
+      #XXX auto-make a text copy w/HTML::FormatText?
+      #  alas, us luddite mutt/pine users just aren't that big a deal
+    )
+  );
+
+}
+
+#return contexts and fill-in values
+sub substitutions {
+  { 'cust_main' => [qw(
+      display_custnum agentnum agent_name
+
+      last first company
+      name name_short contact contact_firstlast
+      address1 address2 city county state zip
+      country
+      daytime night fax
+
+      has_ship_address
+      ship_last ship_first ship_company
+      ship_name ship_name_short ship_contact ship_contact_firstlast
+      ship_address1 ship_address2 ship_city ship_county ship_state ship_zip
+      ship_country
+      ship_daytime ship_night ship_fax
+
+      payby paymask payname paytype payip
+      num_cancelled_pkgs num_ncancelled_pkgs num_pkgs
+      classname categoryname
+      balance
+      invoicing_list_emailonly
+      cust_status ucfirst_cust_status cust_statuscolor
+    )],
+    #XXX make these pretty: signupdate dundate paydate_monthyear usernum
+    # next_bill_date
+
+    'cust_pkg'  => [qw(
+    )],
+    #XXX these are going to take more pretty-ing up
+
+    'cust_bill' => [qw(
+      invnum
+    )],
+    #XXX not really thinking about cust_bill substitutions quite yet
+
+  };
+}
+
 =back
 
 =head1 BUGS

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -w -d -r1.223 -r1.224
--- Schema.pm	12 Jul 2010 13:17:42 -0000	1.223
+++ Schema.pm	13 Jul 2010 11:09:38 -0000	1.224
@@ -2911,6 +2911,7 @@
         'msgnum',     'serial',     '',      '', '', '',
         'msgname',   'varchar',     '', $char_d, '', '',
         'agentnum',      'int', 'NULL',      '', '', '',
+        'subject',   'varchar', 'NULL',     512, '', '',
         'mime_type', 'varchar',     '', $char_d, '', '',
         'body',         'blob', 'NULL',      '', '', '',
         'disabled',     'char', 'NULL',       1, '', '', 

Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -w -d -r1.44 -r1.45
--- Mason.pm	12 Jul 2010 13:07:39 -0000	1.44
+++ Mason.pm	13 Jul 2010 11:09:38 -0000	1.45
@@ -484,6 +484,7 @@
     escape_flags => { 'js_string' => sub {
                         #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
                         ${$_[0]} =~ s/(['\\])/\\$1/g;
+                        ${$_[0]} =~ s/\r/\\r/g;
                         ${$_[0]} =~ s/\n/\\n/g;
                         ${$_[0]} = "'". ${$_[0]}. "'";
                       },

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -w -d -r1.522 -r1.523
--- cust_main.pm	6 Jul 2010 12:18:10 -0000	1.522
+++ cust_main.pm	13 Jul 2010 11:09:39 -0000	1.523
@@ -2464,6 +2464,17 @@
   qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
 }
 
+=item agent_name
+
+Returns the agent name (see L<FS::agent>) for this customer.
+
+=cut
+
+sub agent_name {
+  my $self = shift;
+  $self->agent->agent;
+}
+
 =item cust_class
 
 Returns the customer class, as an FS::cust_class object, or the empty string