summaryrefslogtreecommitdiff
path: root/FS/FS/msg_template.pm
diff options
context:
space:
mode:
authormark <mark>2011-07-12 07:54:22 +0000
committermark <mark>2011-07-12 07:54:22 +0000
commit0b81782a6257456e04fb8a5a7faf0dbfbf7bc166 (patch)
tree91be38b299086b665d00b07c3152ba9c46465448 /FS/FS/msg_template.pm
parent970dfae19db81ed3afdd9f7e15637907f84d5341 (diff)
credit card expiration event, #13202
Diffstat (limited to 'FS/FS/msg_template.pm')
-rw-r--r--FS/FS/msg_template.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index e90cffd73..65acd9aac 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -249,7 +249,7 @@ sub prepare {
}
}
}
- $_ = encode_entities($_) foreach values(%hash);
+ $_ = encode_entities($_ || '') foreach values(%hash);
###
@@ -386,12 +386,11 @@ sub substitutions {
cust_status ucfirst_cust_status cust_statuscolor
signupdate dundate
- expdate
packages recurdates
),
- # expdate is a special case
- [ signupdate_ymd => sub { time2str('%Y-%m-%d', shift->signupdate) } ],
- [ dundate_ymd => sub { time2str('%Y-%m-%d', shift->dundate) } ],
+ [ expdate => sub { shift->paydate_epoch } ], #compatibility
+ [ signupdate_ymd => sub { $ymd->(shift->signupdate) } ],
+ [ dundate_ymd => sub { $ymd->(shift->dundate) } ],
[ paydate_my => sub { sprintf('%02d/%04d', shift->paydate_monthyear) } ],
[ otaker_first => sub { shift->access_user->first } ],
[ otaker_last => sub { shift->access_user->last } ],