summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2014-08-12 15:31:01 -0700
committerIvan Kohler <ivan@freeside.biz>2014-08-12 15:31:01 -0700
commit6959e1e35908df64676d9626711e70b66715575d (patch)
treebffe736a8b74a46c7af7b29f3ee0893f16f9ad5e
parentbd876bcd42a0ce8d1e44d87ba6c517cf6106ca37 (diff)
agent wholesale bulk billing: respect date_format setting for details, RT#30484
-rw-r--r--FS/FS/part_pkg/agent.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index 187b2baa8..62cf185ed 100644
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -59,6 +59,7 @@ sub calc_recur {
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
+ my $date_format = $conf->config('date_format') || '%m/%d/%Y';
my $total_agent_charge = 0;
@@ -140,8 +141,8 @@ sub calc_recur {
my $recur_charge += $pkg_recur_charge;
$pkg_details .= $money_char. sprintf('%.2f', $recur_charge ).
- ' ('. time2str('%x', $pkg_start).
- ' - '. time2str('%x', $pkg_end ). ')'
+ ' ('. time2str($date_format, $pkg_start).
+ ' - '. time2str($date_format, $pkg_end ). ')'
if $recur_charge;
$pkg_charge += $recur_charge;