X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fcust-part_pkg.cgi;h=f6e91d93b8b22a5dc82e9b67302b039549899b8c;hb=eaa3f2ea365a7ad41eb687cc7896c4ac1120b5dc;hp=974ac0e87c78a11541ee1e38b8d2d6d7d78ed11a;hpb=c1d8e2288d9b44823bd9216c5e96ba9d052a04bd;p=freeside.git

diff --git a/httemplate/misc/cust-part_pkg.cgi b/httemplate/misc/cust-part_pkg.cgi
index 974ac0e87..f6e91d93b 100644
--- a/httemplate/misc/cust-part_pkg.cgi
+++ b/httemplate/misc/cust-part_pkg.cgi
@@ -23,8 +23,27 @@ my @part_pkg = qsearch({
   'order_by'  => 'ORDER BY pkg',
 });
 
-my @return = map  { $_->pkgpart => $_->pkg_comment }
-             #sort { $a->pkg_comment cmp $b->pkg_comment }
-             @part_pkg;
+my $conf = new FS::Conf;
+
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+my $default_start_date = $conf->exists('order_pkg-no_start_date')
+                           ? ''
+                           : $cust_main->next_bill_date;
+
+my @return = map  {
+                    my $start_date = $_->delay_start_date
+                                   || $default_start_date;
+                    $start_date = time2str($date_format, $start_date)
+                      if $start_date;
+                    ( $_->pkgpart,
+                      $_->pkg_comment,
+                      $_->can_discount,
+                      $_->can_start_date,
+                      $start_date,
+                    )
+                  }
+                  #sort { $a->pkg_comment cmp $b->pkg_comment }
+                  @part_pkg;
 
 </%init>