Optimize "Customer has a referring customer" condition, RT#74452

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

diff --git a/httemplate/search/sales_commission.html b/httemplate/search/sales_commission.html
index 57b6cdc..3401954 100644 (file)
--- a/httemplate/search/sales_commission.html
+++ b/httemplate/search/sales_commission.html
@@ -1,20 +1,19 @@
 % if ( $salesnum ) {
-<% $cgi->redirect($sales_link->[0] . $salesnum) %>
+%   my $url = 'sales_pkg_class.html?' . $cgi->query_string;
+<% $cgi->redirect($url) %>
 % } else {
-<& elements/search.html,
-     'title'         => $title,
-     'name_singular' => 'sales person',
-     'header'        => [ 'Sales person', 'One-Time Sales', 'Recurring Sales', 'Commission', ],
-     'fields'        => [ 'salesperson',
-                          $sales_sub_maker->('setup'),
-                          $sales_sub_maker->('recur'),
-                          $commission_sub,
-                        ],
-     'links'         => [ '', $sales_link, $sales_link, $commission_link ],
-     'align'         => 'lrrr',
-     'query'         => \%query,
-     'count_query'   => $count_query,
-     'disableable'   => 1,
+<& elements/commission.html,
+  'title'         => $title,
+  'name_singular' => 'sales person',
+  'header'        => [ 'Sales person' ],
+  'fields'        => [ 'salesperson' ],
+  'links'         => [ '' ],
+  'align'         => 'l',
+  'query'         => \%query,
+  'count_query'   => $count_query,
+  'disableable'   => 1,
+  'sales_detail_link'   => $sales_link,
+  'credit_detail_link'  => $commission_link,
 &>
 % }
 <%init>
@@ -24,12 +23,6 @@ die "access denied"
 
 my $conf = new FS::Conf;
 
-my $money_char = $conf->config('money_char') || '$';
-
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
-
-my $date_format = $conf->config('date_format') || '%m/%d/%Y';
-
 my %query = ( 'table' => 'sales' );
 my $count_query = "SELECT COUNT(*) FROM sales";
 
@@ -46,56 +39,17 @@ if ( $cgi->param('salesnum') =~ /^(\d+)$/ ) {
 }
 
 my $title = 'Sales person commission';
-$title .= ': '. time2str($date_format, $beginning). ' to '.
-                time2str($date_format, $ending)
-  if $beginning;
-
-my $paid = $cgi->param('paid') ? 1 : 0;
-$title .= ' - paid sales only' if $paid;
 
 my $cust_main_sales = $cgi->param('cust_main_sales') eq 'Y' ? 'Y' : '';
+$query{'cust_main_sales'} = $cust_main_sales;
 
 my $sales_link = [ 'sales_pkg_class.html?'.
-                   # pass all of our parameters along
-                   $cgi->query_string. ';salesnum=',
+                   "cust_main_sales=$cust_main_sales;salesnum=",
                    'salesnum'
                  ];
 
-my $sales_sub_maker = sub {
-  my $field = shift;
-  sub {
-    my $sales = shift;
-
-    #efficiency improvement: ask the db for a sum instead of all the records
-    my $total = 0;
-    my @cust_bill_pkg = $sales->cust_bill_pkg(
-      $beginning,
-      $ending,
-      'cust_main_sales' => $cust_main_sales,
-      'paid' => $paid,
-    );
-    $total += $_->get($field) foreach @cust_bill_pkg;
-
-    $money_char. sprintf('%.2f', $total);
-  };
-};
-
-my $commission_sub = sub {
-  my $sales = shift;
-
-  #efficiency improvement: ask the db for a sum instead of all the records
-  my $total_credit = 0;
-  my @cust_credit  = $sales->cust_credit( $beginning, $ending );
-  $total_credit += $_->amount foreach @cust_credit;
-
-  $money_char. sprintf('%.2f', $total_credit);
-};
-
 my $commission_link = [ 'cust_credit.html?'.
-                          "begin=$beginning;".
-                          "end=$ending;".
-                          "cust_main_sales=$cust_main_sales;".
-                          'commission_salesnum=',
+                        "cust_main_sales=$cust_main_sales;commission_salesnum=",
                         'salesnum'
                       ];