combine ticket notification scrips, #15353

[freeside.git] / httemplate / search / cust_credit_bill_pkg.html

diff --git a/httemplate/search/cust_credit_bill_pkg.html b/httemplate/search/cust_credit_bill_pkg.html
index c699547..622d1cf 100644 (file)
--- a/httemplate/search/cust_credit_bill_pkg.html
+++ b/httemplate/search/cust_credit_bill_pkg.html
@@ -27,7 +27,7 @@
                    sub { sprintf($money_char.'%.2f', shift->amount ) },
 
                    sub { time2str('%b %d %Y', shift->get('cust_credit_date') ) },
-                   'otaker',
+                   sub { shift->cust_credit_bill->cust_credit->otaker },
                    sub { shift->cust_credit_bill->cust_credit->reason },
 
                    sub { $_[0]->pkgnum > 0
@@ -38,8 +38,16 @@
                    sub { time2str('%b %d %Y', shift->_date ) },
                    \&FS::UI::Web::cust_fields,
                  ],
-                 #'sort_fields' => [ #XXX add
-                 #],
+                 'sort_fields' => [
+                   'amount',
+                   'cust_credit_date',
+                   '', #'otaker',
+                   '', #reason
+                   '', #line item description
+                   'invnum',
+                   '_date',
+                   #cust fields
+                 ],
                  'links'       => [
                    '',
                    '',
@@ -345,16 +353,7 @@ my $join_cust =
 
 my $join_pkg;
 
-my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum';
-if ( $cgi->param('iscredit') eq 'rate' ) {
-  $join_cust_bill_pkg .= ', billpkgtaxratelocationnum )';
-} elsif ( $conf->exists('tax-pkg_address') ) {
-  $join_cust_bill_pkg .= ', billpkgtaxlocationnum )';
-  push @where, "billpkgtaxratelocationnum IS NULL";
-} else {
-  $join_cust_bill_pkg .= ' )';
-  push @where, "billpkgtaxratelocationnum IS NULL";
-}
+my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum )';
 
 if ( $cgi->param('nottax') ) {
 
@@ -372,8 +371,18 @@ if ( $cgi->param('nottax') ) {
             $cgi->param('iscredit') eq 'rate') {
 
     $join_pkg .=
-      ' LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum ) '.
-      ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) ';
+      ' LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum ';
+    if ( $cgi->param('iscredit') eq 'rate' ) {
+      $join_pkg .= ', billpkgtaxratelocationnum )';
+    } elsif ( $conf->exists('tax-pkg_address') ) {
+      $join_pkg .= ', billpkgtaxlocationnum )';
+      push @where, "billpkgtaxratelocationnum IS NULL";
+    } else {
+      $join_pkg .= ' )';
+      push @where, "billpkgtaxratelocationnum IS NULL";
+    }
+
+    $join_pkg .= ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) ';
 
   } elsif ( $conf->exists('tax-pkg_address') ) {