[freeside-commits] freeside/httemplate/view/cust_main packages.html, 1.75.2.1, 1.75.2.2

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail.420.am:/tmp/cvs-serv526/httemplate/view/cust_main

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	packages.html 
Log Message:
cust_location editing features, RT#10766

Index: packages.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages.html,v
retrieving revision 1.75.2.1
retrieving revision 1.75.2.2
diff -u -w -d -r1.75.2.1 -r1.75.2.2
--- packages.html	14 Dec 2010 06:33:30 -0000	1.75.2.1
+++ packages.html	29 Dec 2010 22:56:47 -0000	1.75.2.2
@@ -65,61 +65,23 @@
 
   <TR>
     <TD COLSPAN=2>
-
-% if ( @$packages ) { 
-
-<% include('/elements/table-grid.html') %>
-% my $bgcolor1 = '#eeeeee';
-%   my $bgcolor2 = '#ffffff';
-%   my $bgcolor = '';
-
-<TR>
-  <TH CLASS="grid" BGCOLOR="#cccccc">Package</TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
-% if ( $show_location ) {
-  <TH CLASS="grid" BGCOLOR="#cccccc">Location</TH>
-% }
-  <TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
-</TR>
-
-% #$FS::cust_pkg::DEBUG = 2;
-% foreach my $cust_pkg (@$packages) {
-%
-%   if ( $bgcolor eq $bgcolor1 ) {
-%     $bgcolor = $bgcolor2;
-%   } else {
-%     $bgcolor = $bgcolor1;
-%   }
-%
-%   my %iopt = (
-%     'bgcolor'  => $bgcolor,
-%     'cust_pkg' => $cust_pkg,
-%     'part_pkg' => $cust_pkg->part_pkg,
-%     %conf_opt,
-%   );
-%
-
-    <!--pkgnum: <% $cust_pkg->pkgnum %>-->
-    <TR>
-      <% include('packages/package.html',  %iopt) %>
-      <% include('packages/status.html',   %iopt) %>
-% if ( $show_location ) {
-      <% include('packages/location.html', %iopt) %>
-% }
-      <% include('packages/services.html', %iopt) %>
-    </TR>
-
+% if ( $conf->exists('cust_pkg-group_by_location') and $show_location ) {
+<% include('locations.html',
+    'cust_main'     => $cust_main,
+    'packages'      => $packages,
+) %>
 % }
-
+% else {
+% # in this format, put all packages in one section
+<% include('/elements/table-grid.html') %>
+<% include('packages/section.html',
+    'packages'      => $packages,
+    'show_location' => $show_location,
+) %>
 </TABLE>
-
-% } else {
-<BR>
 % } 
-
     </TD>
   </TR>
-</TABLE>
 
 % if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
   <SCRIPT>
@@ -130,42 +92,22 @@
     if ( el ) el.scrollIntoView(true);
   </SCRIPT>
 % }
-
+</TABLE>
 <%init>
 
-my( $cust_main ) = @_;
+my $cust_main = shift;
+my %opt = @_;
 my $conf = new FS::Conf;
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my( $packages, $num_old_packages ) = get_packages($cust_main, $conf);
 
+
 my $show_location = $conf->exists('cust_pkg-always_show_location')
                         || ( grep $_->locationnum, @$packages ); # ? '1' : '0';
 
 my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
-my %conf_opt = (
-  #for services.html and status.html
-  'cust_pkg-display_times'    => ($conf->exists('cust_pkg-display_times')
-                                 || $curuser->option('cust_pkg-display_times')), 
-  #for status.html
-  'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'),
-  #for status.html pkg-balances
-  'pkg-balances'              => $conf->exists('pkg-balances'),
-  'money_char'                => ( $conf->config('money_char') || '$' ),
-
-  #for location.html
-  'countrydefault'            => $countrydefault,
-  'statedefault'              => ( scalar($conf->config('statedefault'))
-                                  || ($countrydefault eq 'US' ? 'CA' : '') ),
-  #for services.html
-  'svc_external-skip_manual'  => $conf->exists('svc_external-skip_manual'),
-  'legacy_link'               => $conf->exists('legacy_link'),
-  'svc_broadband-manage_link' => scalar($conf->config('svc_broadband-manage_link')),
-  'maestro-status_test'       => $conf->exists('maestro-status_test'),
-  'cust_pkg-large_pkg_size'   => $conf->config('cust_pkg-large_pkg_size'),
-);
-
 #subroutines
 
 sub get_packages {