diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/elements/select-part_pkg.html | 5 | ||||
| -rw-r--r-- | httemplate/elements/select-table.html | 1 | ||||
| -rw-r--r-- | httemplate/misc/cust-part_pkg.cgi | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/httemplate/elements/select-part_pkg.html b/httemplate/elements/select-part_pkg.html index fb45c0efa..e5692a798 100644 --- a/httemplate/elements/select-part_pkg.html +++ b/httemplate/elements/select-part_pkg.html @@ -155,6 +155,11 @@ if ( exists($opt{'classnum'}) && defined($opt{'classnum'}) ) { die 'Use of toggle_disabled with classnum has not been implemented' if exists $hash{'classnum'}; +$opt{'select'} = 'part_pkg.*, setup_option.optionvalue AS _setup_fee, + recur_option.optionvalue AS _recur_fee' + unless $opt{'select'}; +$opt{'addl_from'} .= FS::part_pkg->join_options_sql; + $opt{'extra_sql'} .= ( keys(%hash) ? ' AND ' : ' WHERE ' ). FS::part_pkg->curuser_pkgs_sql; diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html index 4b6ddb40e..d7ec015f3 100644 --- a/httemplate/elements/select-table.html +++ b/httemplate/elements/select-table.html @@ -182,6 +182,7 @@ if ( $opt{'records'} ) { unless $opt{'presorted'}; } else { @records = qsearch( { + 'select' => $opt{'select'} || '*', 'table' => $opt{'table'}, 'addl_from' => $opt{'addl_from'}, 'hashref' => $hashref, diff --git a/httemplate/misc/cust-part_pkg.cgi b/httemplate/misc/cust-part_pkg.cgi index dc9ba2af1..8a46c1dd3 100644 --- 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({ + 'select' => 'part_pkg.*, setup_option.optionvalue AS _setup_fee, + recur_option.optionvalue AS _recur_fee', 'table' => 'part_pkg', + 'addl_from' => FS::part_pkg->join_options_sql, 'hashref' => \%hash, 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( 'null'=>1 ). |