X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=43ebb282b188bd831640ba5dac6b653eca2247ec;hp=9add4b2ad29f6e7f6236a10b991cfcb87e0f1d07;hb=a832fdcc15e848eb6b63998403cad11cf3d6e3c3;hpb=d9f0a98539cd8dd957ea9a4b5d77fbb739d43d2e diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 9add4b2ad..43ebb282b 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -139,7 +139,7 @@ if ( el ) el.scrollIntoView(true); window.location = '<% $cgi->self_url %>;locationnum=' + what.options[what.selectedIndex].value; % $cgi->param('locationnum', $locationnum); } - + % } @@ -302,16 +302,17 @@ if ( $cgi->param('locationnum') =~ /^(\d+)$/ ) { my $total_pkgs = $cust_main->all_pkgs; -my $num_method = $hide_cancelled ? 'ncancelled_pkgs' : 'all_pkgs'; -my $num_pkgs = $cust_main->$num_method({ +my $method = $hide_cancelled ? 'ncancelled_pkgs' : 'all_pkgs'; +my $num_pkgs = $cust_main->$method({ 'addl_from' => $addl_from, 'extra_sql' => $extra_sql, }); my $maxrecords = 10; my $offset = $cgi->param('offset') =~ /^(\d+)$/ ? $1 : 0; +$cgi->delete('offset'); -my @packages = $cust_main->all_pkgs( { +my @packages = $cust_main->$method( { 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs", 'addl_from' => $addl_from. " LEFT JOIN part_pkg_option AS setup_option