[freeside-commits] branch master updated. e03f1de6578f009f306d92ec713b533e799330cd

Ivan ivan at 420.am
Tue Aug 12 15:31:00 PDT 2014


The branch, master has been updated
       via  e03f1de6578f009f306d92ec713b533e799330cd (commit)
      from  7ff3a40dfb8e6d5cc15e87346f447b1d6806e39c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e03f1de6578f009f306d92ec713b533e799330cd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Aug 12 15:31:00 2014 -0700

    agent wholesale bulk billing: respect date_format setting for details, RT#30484

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index b122ff1..bc3c374 100644
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -56,6 +56,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;
 
@@ -137,8 +138,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;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_pkg/agent.pm |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list