X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=0dc65a7885a1624a064378497697e8e8c98cc7cf;hb=5dabafc5e63ae7559ca6d2867e653660b981e639;hp=9add4b2ad29f6e7f6236a10b991cfcb87e0f1d07;hpb=d9f0a98539cd8dd957ea9a4b5d77fbb739d43d2e;p=freeside.git

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 9add4b2ad..0dc65a788 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -139,13 +139,13 @@ if ( el ) el.scrollIntoView(true);
       window.location = '<% $cgi->self_url %>;locationnum=' + what.options[what.selectedIndex].value;
 %     $cgi->param('locationnum', $locationnum);
     }
-    
+
   </SCRIPT>
 
 % }
 
-<% $br++ ? ' | ' : '' %>
 % if ( $cust_main->num_cancelled_pkgs ) {
+ <% $br++ ? ' | ' : '' %>
 %     if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
 %          || ( $conf->exists('hidecancelledpackages')
 %               && ! $cgi->param('showcancelledpackages')
@@ -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 $maxrecords = $conf->config('cust_main-packages-num_per_page') || 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