X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fcust-part_pkg.cgi;h=9850fb017aa1d0e7cb6451721b6f16c4fd31e888;hb=284d823cb3413061bdf966c72430c98d128e5aca;hp=a249f033f8d8bfe630a705aff5845e23b8712b1d;hpb=e3c3d86b7091d806af42e40475a28ea8afb5865c;p=freeside.git

diff --git a/httemplate/misc/cust-part_pkg.cgi b/httemplate/misc/cust-part_pkg.cgi
index a249f033f..9850fb017 100644
--- a/httemplate/misc/cust-part_pkg.cgi
+++ b/httemplate/misc/cust-part_pkg.cgi
@@ -20,10 +20,40 @@ my @part_pkg = qsearch({
   'extra_sql' =>
     ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( 'null'=>1 ).
     ' AND '. FS::part_pkg->agent_pkgs_sql( $cust_main->agent ),
+  '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;
+
+#num_billing_pkgs may be slightly better (will allow you to fill in a start
+# date in the weird edge case where you're using sync_next_bill and
+# prorate_defer_bill in flat.pm and there's one-time charges hanging around
+# for this customer but no active ones)
+#but we don't have an easy method for that, and definitely don't want to pull
+# all package objects
+my $num_ncancelled_pkgs = $cust_main ? $cust_main->num_ncancelled_pkgs : 0;
+
+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(
+                        num_ncancelled_pkgs => $num_ncancelled_pkgs,
+                      ),
+                      $start_date,
+                    )
+                  }
+                  #sort { $a->pkg_comment cmp $b->pkg_comment }
+                  @part_pkg;
 
 </%init>