projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add test for prorate-deferred behavior
[freeside.git]
/
httemplate
/
misc
/
cust-part_pkg.cgi
diff --git
a/httemplate/misc/cust-part_pkg.cgi
b/httemplate/misc/cust-part_pkg.cgi
index
afe8e42
..
8a46c1d
100644
(file)
--- a/
httemplate/misc/cust-part_pkg.cgi
+++ b/
httemplate/misc/cust-part_pkg.cgi
@@
-23,7
+23,10
@@
if ( $classnum > 0 ) {
} #else -1, all classes, so don't set classnum
my @part_pkg = qsearch({
} #else -1, all classes, so don't set classnum
my @part_pkg = qsearch({
+ 'select' => 'part_pkg.*, setup_option.optionvalue AS _setup_fee,
+ recur_option.optionvalue AS _recur_fee',
'table' => 'part_pkg',
'table' => 'part_pkg',
+ 'addl_from' => FS::part_pkg->join_options_sql,
'hashref' => \%hash,
'extra_sql' =>
' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( 'null'=>1 ).
'hashref' => \%hash,
'extra_sql' =>
' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( 'null'=>1 ).
@@
-37,7
+40,8
@@
my $date_format = $conf->config('date_format') || '%m/%d/%Y';
my $default_start_date = $conf->exists('order_pkg-no_start_date')
? ''
my $default_start_date = $conf->exists('order_pkg-no_start_date')
? ''
- : $cust_main->next_bill_date;
+ : $cust_main ? $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
#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
@@
-55,6
+59,7
@@
my @return = map {
( $_->pkgpart,
$_->pkg_comment,
$_->can_discount,
( $_->pkgpart,
$_->pkg_comment,
$_->can_discount,
+ ($_->start_on_hold ? 1 : 0),
$_->can_start_date(
num_ncancelled_pkgs => $num_ncancelled_pkgs,
),
$_->can_start_date(
num_ncancelled_pkgs => $num_ncancelled_pkgs,
),