From 47d47f7b4a77761d5617a64212d6b1460fa27adf Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 10 Sep 2013 22:19:56 -0700
Subject: improve performance of package ordering, RT#24955, fallout from
 future start dates, RT#20686

---
 httemplate/misc/cust-part_pkg.cgi | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'httemplate/misc/cust-part_pkg.cgi')

diff --git a/httemplate/misc/cust-part_pkg.cgi b/httemplate/misc/cust-part_pkg.cgi
index 7aebda40c..6c4524cb7 100644
--- a/httemplate/misc/cust-part_pkg.cgi
+++ b/httemplate/misc/cust-part_pkg.cgi
@@ -3,7 +3,6 @@
 
 my( $custnum, $prospectnum, $classnum ) = $cgi->param('arg');
 
-
 my $agent;
 my $cust_main;
 if ( $custnum ) {
@@ -32,10 +31,17 @@ my @part_pkg = qsearch({
   'order_by'  => 'ORDER BY pkg',
 });
 
-my $date_format = FS::Conf->new->config('date_format') || '%m/%d/%Y';
+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 = $_->default_start_date($cust_main);
+                    my $start_date = $_->delay_start_date
+                                   || $default_start_date;
                     $start_date = time2str($date_format, $start_date)
                       if $start_date;
                     ( $_->pkgpart,
-- 
cgit v1.2.1