6 files changed, 65 insertions, 202 deletions
diff --git a/httemplate/browse/sales.cgi b/httemplate/browse/sales.cgi
deleted file mode 100755
index af098121d..000000000
--- a/httemplate/browse/sales.cgi
+++ /dev/null
@@ -1,100 +0,0 @@
-<% include("/elements/header.html",'Sales Listing', menubar(
-  'Add new sales person' => '../edit/sales.cgi'
-)) %>
-Sales people bring in business.<BR><BR>
-% if ( dbdef->table('sales')->column('disabled') ) { 
-
-  <% $cgi->param('showdisabled')
-      ? do { $cgi->param('showdisabled', 0);
-             '( <a href="'. $cgi->self_url. '">hide disabled sales people</a> )'; }
-      : do { $cgi->param('showdisabled', 1);
-             '( <a href="'. $cgi->self_url. '">show disabled sales people</a> )'; }
-  %>
-% } 
-
-
-<% include('/elements/table-grid.html') %>
-% my $bgcolor1 = '#eeeeee';
-%   my $bgcolor2 = '#ffffff';
-%   my $bgcolor = '';
-
-<TR>
-  <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=<% ( $cgi->param('showdisabled') || !dbdef->table('sales')->column('disabled') ) ? 2 : 3 %>>Sales person</TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc">Agent</TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc">Access Groups</TH>
-</TR>
-
-%foreach my $sales ( sort { 
-%  $a->getfield('salesnum') cmp $b->getfield('salesnum')
-%} qsearch('sales', \%search ) ) {
-%
-%  if ( $bgcolor eq $bgcolor1 ) {
-%    $bgcolor = $bgcolor2;
-%  } else {
-%    $bgcolor = $bgcolor1;
-%  }
-
-      <TR>
-
-        <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-          <A HREF="<%$p%>edit/sales.cgi?<% $sales->salesnum %>"><% $sales->salesnum %></A>
-        </TD>
-
-        <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-          <A HREF="<%$p%>edit/sales.cgi?<% $sales->salesnum %>"><% $sales->salesperson %></A>
-        </TD>
-
-%       if ( ! $cgi->param('showdisabled') ) { 
-          <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN="center">
-            <% $sales->disabled ? '<FONT COLOR="#FF0000"><B>DISABLED</B></FONT>'
-                                : '<FONT COLOR="#00CC00"><B>Active</B></FONT>'
-            %>
-          </TD>
-%       } 
-
-%       my ($agent) = qsearch('agent', { 'agentnum' => $sales->agentnum });
-
-        <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-          <A HREF="<%$p%>edit/sales.cgi?<% $sales->agentnum %>"><% $sales->agentnum %></A>
-          <A HREF="<%$p%>edit/agent.cgi?<% $agent->agentnum %>">(<% $agent->agent %>)<BR>
-        </TD>
-
-        <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
-%         foreach my $access_group (
-%           map $_->access_group,
-%               qsearch('access_groupsales', { 'salesnum' => $sales->salesnum })
-%         ) {
-            <A HREF="<%$p%>edit/access_group.html?<% $access_group->groupnum %>"><% $access_group->groupname |h %><BR>
-%         }
-        </TD>
-
-      </TR>
-% } 
-
-    </TABLE>
-
-<SCRIPT TYPE="text/javascript">
-  function areyousure(what, href) {
-    if ( confirm("Are you sure you want to " + what + "?") == true )
-      window.location.href = href;
-  }
-</SCRIPT>
-
-  </BODY>
-</HTML>
-<%init>
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-
-my %search;
-if ( $cgi->param('showdisabled')
-     || !dbdef->table('agent')->column('disabled') ) {
-  %search = ();
-} else {
-  %search = ( 'disabled' => '' );
-}
-
-my $conf = new FS::Conf;
-
-</%init>
diff --git a/httemplate/browse/sales.html b/httemplate/browse/sales.html
new file mode 100644
index 000000000..1cdc49085
--- /dev/null
+++ b/httemplate/browse/sales.html
@@ -0,0 +1,32 @@
+<& elements/browse.html,
+     'title'              => 'Sales People',
+     'name_singular'      => 'sales person',
+     'menubar'            => ['Add a new sales person' => $p.'edit/sales.html'],
+     'query'              => { 'table' => 'sales' },
+     'count_query'        => 'SELECT COUNT(*) FROM sales',
+     'header'             => \@header,
+     'fields'             => \@fields,
+     'links'              => \@links,
+     'disableable'        => 1,
+     'disabled_statuspos' => 1,
+     'agent_virt'         => 1,
+&>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied" unless $curuser->access_right('Edit sales people');
+
+my @header = ( 'Sales person' );
+my @fields = ( 'salesperson' );
+my @links  = ( [$p.'edit/sales.html?', 'salesnum'] );
+
+if ( $curuser->access_right('Configuration') ) {
+  push @header, 'Agent';
+  push @fields, 'agent_name';
+  push @links,  [ $p.'edit/agent.cgi?', 'agentnum' ];
+}
+
+#Sales people bring in business.<BR><BR>
+
+</%init>
diff --git a/httemplate/edit/process/sales.cgi b/httemplate/edit/process/sales.cgi
deleted file mode 100644
index edef4d65c..000000000
--- a/httemplate/edit/process/sales.cgi
+++ /dev/null
@@ -1,23 +0,0 @@
-<% include( 'elements/process.html',
-              'table'       => 'sales',
-              'viewall_dir' => 'browse',
-              'viewall_ext' => 'cgi',
-              'debug'       => '1',
-              'process_m2m' => { 'link_table'   => 'access_groupsales',
-                                 'target_table' => 'access_group',
-                               },
-              'edit_ext'    => 'cgi',
-          )
-%>
-<%init>
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-
-if ( FS::Conf->new->exists('disable_acl_changes') ) {
-  errorpage('ACL changes disabled in public demo.');
-  die "shouldn't be reached";
-}
-
-</%init>
-
diff --git a/httemplate/edit/process/sales.html b/httemplate/edit/process/sales.html
new file mode 100644
index 000000000..b60276dcb
--- /dev/null
+++ b/httemplate/edit/process/sales.html
@@ -0,0 +1,12 @@
+<& elements/process.html,
+     'table'       => 'sales',
+     'viewall_dir' => 'browse',
+     'agent_virt'  => 1,
+&>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Edit sales people');
+
+</%init>
+
diff --git a/httemplate/edit/sales.cgi b/httemplate/edit/sales.cgi
deleted file mode 100755
index 3497de505..000000000
--- a/httemplate/edit/sales.cgi
+++ /dev/null
@@ -1,79 +0,0 @@
-<% include("/elements/header.html","$action Sales Person", menubar(
-  'View all sales people' => $p. 'browse/sales.cgi',
-)) %>
-
-<% include('/elements/error.html') %>
-
-<FORM METHOD   = POST
-      ACTION   = "<%popurl(1)%>process/sales.cgi"
->
-
-<INPUT TYPE="hidden" NAME="salesnum" VALUE="<% $sales->salesnum %>">
-Sales #<% $sales->salesnum ? $sales->salesnum : "(NEW)" %>
-
-<% &ntable("#cccccc", 2, '') %>
-
-  <TR>
-    <TH ALIGN="right">Sales</TH>
-    <TD><INPUT TYPE="text" NAME="salesperson" SIZE=32 VALUE="<% $sales->salesperson %>"></TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right"><% emt('Agent') %></TD>
-    <TD>
-      <& /elements/select-agent.html,
-                     'curr_value' => $sales->salesnum,
-                     'disable_empty' => 1,
-      &>
-    </TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right">Disable</TD>
-    <TD><INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<% $sales->disabled eq 'Y' ? ' CHECKED' : '' %>></TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right">Access Groups</TD>
-    <TD><% include('/elements/checkboxes-table.html',
-                     'source_obj'   => $sales,
-                     'link_table'   => 'access_groupsales',
-                     'target_table' => 'access_group',
-                     'name_col'     => 'groupname',
-                     'target_link'  => $p. 'edit/access_group.html?',
-                  )
-        %>
-    </TD>
-  </TR>
-
-</TABLE>
-
-<BR>
-<INPUT TYPE="submit" VALUE="<% $sales->salesnum ? "Apply changes" : "Add sales" %>">
-
-</FORM>
-
-<% include('/elements/footer.html') %>
-
-<%init>
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-
-my $sales;
-if ( $cgi->param('error') ) {
-  $sales = new FS::sales ( {
-    map { $_, scalar($cgi->param($_)) } fields('sales')
-  } );
-} elsif ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $sales = qsearchs( 'sales', { 'salesnum' => $1 } );
-} else { #adding
-  $sales = new FS::sales {};
-}
-my $action = $sales->salesnum ? 'Edit' : 'Add';
-
-my $conf = new FS::Conf;
-
-</%init>
diff --git a/httemplate/edit/sales.html b/httemplate/edit/sales.html
new file mode 100755
index 000000000..65cddfc13
--- /dev/null
+++ b/httemplate/edit/sales.html
@@ -0,0 +1,21 @@
+<& elements/edit.html,
+     'name_singular' => 'sales person',
+     'table'         => 'sales',
+     'fields'        => [ 'salesperson',
+                          { field=>'agentnum', type=>'select-agent', disable_empty=>1, },
+                          { field=>'disabled', type=>'checkbox', value=>'Y', },
+                        ],
+     'labels'        => { 'salesnum'    => 'Sales Person',
+                          'salesperson' => 'Name',
+                          'agentnum'    => 'Agent',
+                          'disabled'    => 'Disabled',
+                        },
+     'viewall_dir'   => 'browse',
+     'agent_virt'    => 1,
+&>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Edit sales people');
+
+</%init>