X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cust_pkg.html;h=27aececc944e8d6d904dd6ffb5a50c19c1d8b123;hp=b8c32c63142b33f7b6526fafee5bfbd5f689b1ae;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=47c250d15d752e6210b9c044a4a64e2e8992c64e
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index b8c32c631..27aececc9 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -4,15 +4,11 @@
-
+% unless ( $custnum ) {
-
-
- Search options
- |
-
+
-% unless ( $custnum ) {
+ <& /elements/tr-title.html, value => mt('Customer search options') &>
<& /elements/tr-select-agent.html,
'curr_value' => scalar( $cgi->param('agentnum') ),
@@ -49,8 +45,15 @@
'disable_empty' => 1,
&>
+
+
+
% }
+
+
+ <& /elements/tr-title.html, value => mt('Package search options') &>
+
<& /elements/tr-select-sales.html,
'label' => 'Package sales person',
'curr_value' => scalar($cgi->param('salesnum')),
@@ -59,11 +62,10 @@
'disable_empty' => 1,
&>
- <% include( '/elements/tr-select-cust_pkg-status.html',
+ <& /elements/tr-select-cust_pkg-status.html,
'label' => 'Package status',
'onchange' => 'status_changed(this);',
- )
- %>
+ &>
- <% include( '/elements/tr-select-pkg_class.html',
+ <& /elements/tr-select-pkg_class.html,
'pre_options' => [ '0' => 'all' ],
'empty_label' => '(empty class)',
- )
- %>
+ &>
% if ( scalar( qsearch( 'part_pkg_report_option', { 'disabled' => '' } ) ) ) {
- <% include( '/elements/tr-select-table.html',
+ <& /elements/tr-select-table.html,
'label' => 'Report classes',
'table' => 'part_pkg_report_option',
'name_col' => 'name',
'hashref' => { 'disabled' => '' },
'element_name' => 'report_option',
'multiple' => 'multiple',
- )
- %>
+ &>
% }
@@ -178,24 +178,38 @@
- <% include( '/elements/tr-checkbox.html',
+ <& /elements/tr-checkbox.html,
'label' => 'Custom packages',
'field' => 'custom',
'value' => 1,
'onchange' => 'custom_changed(this);',
- )
- %>
+ &>
- <% include( '/elements/tr-selectmultiple-part_pkg.html' ) %>
+ <& /elements/tr-selectmultiple-part_pkg.html &>
-
- |
-
+ <& /elements/tr-title.html, value => mt('Location search options') &>
-
- Display options |
-
- <% include( '/elements/tr-select-cust-fields.html' ) %>
+% my @location_options = qw(cust nocust census nocensus);
+% if ( $conf->config('tax_data_vendor') eq 'cch' ) {
+% push @location_options, 'geocode', 'nogeocode';
+% }
+ <& /elements/tr-checkbox-multiple.html,
+ 'label' => 'Where package location:',
+ 'field' => 'loc',
+ 'options' => \@location_options,
+ 'labels' => { 'cust' => "is the customer's default location",
+ 'nocust' => "is not the customer's default location",
+ 'census' => "has a census tract",
+ 'nocensus' => "does not have a census tract",
+ 'nogeocode'=> 'has an implicit tax location',
+ 'geocode' => 'has a hardcoded tax location',
+ },
+ 'value' => { map { $_ => 0 } @location_options },
+ &>
+
+ <& /elements/tr-title.html, value => mt('Display options') &>
+
+ <& /elements/tr-select-cust-fields.html &>
@@ -246,7 +260,8 @@ my @date_fields = keys %label;
#false laziness w/cust_pkg.cgi
my %disable = (
'all' => {},
- 'not yet billed' => { 'setup'=>1, 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+ 'on hold' => { 'setup'=>1, 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'expire'=>1, 'cancel'=>1, 'dundate'=> 1, },
+ 'not yet billed' => { 'setup'=>1, 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, 'dundate'=>1, },
'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, 'contract_end'=>1, 'dundate'=>1, },
'active' => { 'susp'=>1, 'cancel'=>1 },
'suspended' => { 'cancel'=>1, 'dundate'=>1, },
@@ -265,4 +280,5 @@ my %checkbox = (
'cancel' => 1,
);
+my $conf = FS::Conf->new;
%once>