From c7e24bc220519d676b3773de4cc693d17664a353 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Tue, 8 Mar 2016 15:13:00 -0600
Subject: RT#21463 Option to show disabled package definitions [recently added
 select/addl_from defaults copied to xmlhttp]

---
 httemplate/misc/xmlhttp-part_pkg.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/httemplate/misc/xmlhttp-part_pkg.cgi b/httemplate/misc/xmlhttp-part_pkg.cgi
index 187833025..885d3460f 100644
--- a/httemplate/misc/xmlhttp-part_pkg.cgi
+++ b/httemplate/misc/xmlhttp-part_pkg.cgi
@@ -3,6 +3,10 @@
 
 # default returned records must maintain consistency with /elements/select-part_pkg.html
 
+my $select = 'part_pkg.*, setup_option.optionvalue AS _setup_fee,
+                          recur_option.optionvalue AS _recur_fee';
+my $addl_from .= FS::part_pkg->join_options_sql;
+
 my $extra_sql = ' WHERE ' . FS::part_pkg->curuser_pkgs_sql;
 
 # equivalent to agent_virt=1 and agent_null=1 in /elements/select-table.html
@@ -13,6 +17,8 @@ $extra_sql .= ' AND ' .
 
 my @records = qsearch( {
   'table'     => 'part_pkg',
+  'select'    => $select,
+  'addl_from' => $addl_from,
   'hashref'   => {},
   'extra_sql' => $extra_sql,
   'order_by'  => "ORDER BY pkg",
@@ -26,6 +32,4 @@ my @return = map {
   }
 } @records;
 
-print STDERR Dumper(\@return);
-
 </%init>
-- 
cgit v1.2.1