diff options
author | Jonathan Prykop <jonathan@freeside.biz> | 2015-06-25 00:51:02 -0500 |
---|---|---|
committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-07-03 20:54:02 -0500 |
commit | 196f6896e5da5151228ac6b923c52aa1dc90cd78 (patch) | |
tree | 2780c5db907ad1454a7ef38e4f0cbd49472810e5 /FS/FS/msg_template.pm | |
parent | 4fe1fa31dffa6689d9cb88e2a0cda408b826b89d (diff) |
RT#34078: Payment History Report / Statement [refactor to not use msg_template]
Diffstat (limited to 'FS/FS/msg_template.pm')
-rw-r--r-- | FS/FS/msg_template.pm | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm index fe8cbeb..c52b633 100644 --- a/FS/FS/msg_template.pm +++ b/FS/FS/msg_template.pm @@ -269,19 +269,7 @@ invoicing_list addresses. Multiple addresses may be comma-separated. =item substitutions -A hash reference of additional string substitutions - -=item sub_param - -A hash reference, keys are the names of existing substitutions, -values are an addition parameter object to pass to the subroutine -for that substitution, e.g. - - 'sub_param' => { - 'payment_history' => { - 'start_date' => 1434764295, - }, - }, +A hash reference of additional substitutions =back @@ -339,10 +327,7 @@ sub prepare { } elsif( ref($name) eq 'ARRAY' ) { # [ foo => sub { ... } ] - my @subparam = (); - push(@subparam, $opt{'sub_param'}->{$name->[0]}) - if $opt{'sub_param'} && $opt{'sub_param'}->{$name->[0]}; - $hash{$prefix.($name->[0])} = $name->[1]->($obj,@subparam); + $hash{$prefix.($name->[0])} = $name->[1]->($obj); } else { warn "bad msg_template substitution: '$name'\n"; @@ -355,10 +340,7 @@ sub prepare { $hash{$_} = $opt{substitutions}->{$_} foreach keys %{$opt{substitutions}}; } - foreach my $key (keys %hash) { - next if $self->no_encode($key); - $hash{$key} = encode_entities($_ || ''); - }; + $_ = encode_entities($_ || '') foreach values(%hash); ### # clean up template @@ -527,13 +509,6 @@ my $usage_warning = sub { #my $conf = new FS::Conf; -# for substitutions that handle their own encoding -sub no_encode { - my $self = shift; - my $field = shift; - return ($field eq 'payment_history'); -} - #return contexts and fill-in values # If you add anything, be sure to add a description in # httemplate/edit/msg_template.html. @@ -592,12 +567,6 @@ sub substitutions { [ selfservice_server_base_url => sub { $conf->config('selfservice_server-base_url') #, shift->agentnum) } ], - [ payment_history => sub { - my $cust_main = shift; - my $param = shift || {}; - #html works, see no_encode method - return '<PRE>' . encode_entities($cust_main->payment_history_text($param)) . '</PRE>'; - } ], ], # next_bill_date 'cust_pkg' => [qw( |