diff options
| -rw-r--r-- | FS/FS/Conf.pm | 33 | ||||
| -rw-r--r-- | FS/FS/Upgrade.pm | 18 | ||||
| -rw-r--r-- | FS/FS/cust_pay.pm | 38 |
3 files changed, 74 insertions, 15 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index a4b842322..9b21a5ac6 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -1241,6 +1241,13 @@ and customer address. Include units.', }, { + 'key' => 'payment_receipt', + 'section' => 'notification', + 'description' => 'Send payment receipts.', + 'type' => 'checkbox', + }, + + { 'key' => 'payment_receipt_msgnum', 'section' => 'notification', 'description' => 'Template to use for payment receipts.', @@ -2238,6 +2245,32 @@ and customer address. Include units.', }, { + 'key' => 'selfservice-agent_signup', + 'section' => 'self-service', + 'description' => 'Allow agent signup via self-service.', + 'type' => 'checkbox', + }, + + { + 'key' => 'selfservice-agent_signup-agent_type', + 'section' => 'self-service', + 'description' => 'Agent type when allowing agent signup via self-service.', + 'type' => 'select-sub', + 'options_sub' => sub { require FS::Record; + require FS::agent_type; + map { $_->typenum => $_->atype } + FS::Record::qsearch('agent_type', {} ); # disabled=>'' } ); + }, + 'option_sub' => sub { require FS::Record; + require FS::agent_type; + my $agent = FS::Record::qsearchs( + 'agent_type', { 'typenum'=>shift } + ); + $agent_type ? $agent_type->atype : ''; + }, + }, + + { 'key' => 'card_refund-days', 'section' => 'billing', 'description' => 'After a payment, the number of days a refund link will be available for that payment. Defaults to 120.', diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index 185ba16fc..61a42a60c 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -12,7 +12,7 @@ use FS::svc_domain; $FS::svc_domain::whois_hack = 1; @ISA = qw( Exporter ); -@EXPORT_OK = qw( upgrade_schema upgrade upgrade_sqlradius ); +@EXPORT_OK = qw( upgrade_schema upgrade_config upgrade upgrade_sqlradius ); $DEBUG = 1; @@ -33,6 +33,22 @@ database upgrades. =over 4 +=item upgrade_config + +=cut + +#config upgrades +sub upgrade_config { + my %opt = @_; + + my $conf = new FS::Conf; + + $conf->touch('payment_receipt') + if $conf->exists('payment_receipt_email') + || $conf->config('payment_receipt_msgnum'); + +} + =item upgrade =cut diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm index 186614f5b..1fd39ac67 100644 --- a/FS/FS/cust_pay.pm +++ b/FS/FS/cust_pay.pm @@ -447,17 +447,20 @@ sub send_receipt { my $conf = new FS::Conf; + return unless $conf->exists('payment_receipt'); + my @invoicing_list = $cust_main->invoicing_list_emailonly; return '' unless @invoicing_list; $cust_bill ||= ($cust_main->cust_bill)[-1]; #rather inefficient though? + my $error = ''; + if ( ( exists($opt->{'manual'}) && $opt->{'manual'} ) - || ! $conf->exists('invoice_html_statement') # XXX msg_template + || ! $conf->exists('invoice_html_statement') || ! $cust_bill - ) { - - my $error = ''; + ) + { if ( $conf->exists('payment_receipt_msgnum') && $conf->config('payment_receipt_msgnum') @@ -468,6 +471,7 @@ sub send_receipt { $error = $msg_template->send('cust_main'=> $cust_main, 'object'=> $self); } elsif ( $conf->exists('payment_receipt_email') ) { + my $receipt_template = new Text::Template ( TYPE => 'ARRAY', SOURCE => [ map "$_\n", $conf->config('payment_receipt_email') ], @@ -510,21 +514,27 @@ sub send_receipt { 'body' => [ $receipt_template->fill_in( HASH => \%fill_in ) ], ); - } else { # no payment_receipt_msgnum or payment_receipt_email + } else { - my $queue = new FS::queue { - 'paynum' => $self->paynum, - 'job' => 'FS::cust_bill::queueable_email', - }; + warn "payment_receipt is on, but no payment_receipt_msgnum or invoice_html_statement is configured\n"; - $queue->insert( - 'invnum' => $cust_bill->invnum, - 'template' => 'statement', - ); } + + } else { #not manual + + my $queue = new FS::queue { + 'paynum' => $self->paynum, + 'job' => 'FS::cust_bill::queueable_email', + }; + + $error = $queue->insert( + 'invnum' => $cust_bill->invnum, + 'template' => 'statement', + ); + + } warn "send_receipt: $error\n" if $error; - } #$opt{manual} || no invoice_html_statement || customer has no invoices } =item cust_bill_pay |