installers, RT#16584

4 files changed, 92 insertions, 23 deletions

diff --git a/httemplate/browse/access_user.html b/httemplate/browse/access_user.html
index 6a1fea1ce..446bfe0be 100644
--- a/httemplate/browse/access_user.html
+++ b/httemplate/browse/access_user.html
@@ -49,6 +49,12 @@ my $groups_sub = sub {
 
 };
 
+my $installer_sub = sub {
+  my $access_user = shift;
+  my @sched_item = $access_user->sched_item or return '';
+  $sched_item[0]->disabled ? '(disabled)' : 'Installer';
+};
+
 my $cust_sub = sub {
   my $access_user = shift;
   $access_user->user_custnum ? $access_user->user_cust_main->name : '';
@@ -59,10 +65,12 @@ my $count_query = 'SELECT COUNT(*) FROM access_user';
 
 my $link = [ $p.'edit/access_user.html?', 'usernum' ];
 
-my @header = ( '#',       'Username', 'Full name', 'Groups',    'Customer' );
-my @fields = ( 'usernum', 'username', 'name',      $groups_sub, $cust_sub, );
-my $align = 'rllll';
-my @links = ( $link, $link, $link, '', $cust_link );
+my @header = (
+  'Username', 'Full name', 'Groups',    'Installer',    'Customer' );
+my @fields = (
+  'username', 'name',      $groups_sub, $installer_sub, $cust_sub, );
+my $align = 'lllcl';
+my @links = ( $link, $link, $link, '', '', $cust_link );
 
 #if ( FS::Conf->new->config('ticket_system') ) {
 #  push @header, 'Ticketing';
diff --git a/httemplate/browse/sched_item.html b/httemplate/browse/sched_item.html
new file mode 100644
index 000000000..09435805a
--- /dev/null
+++ b/httemplate/browse/sched_item.html
@@ -0,0 +1,18 @@
+<& elements/browse.html,
+     'title'         => 'Installers', #PL($sched_item_class->classname),
+     'name_singular' => 'installer', #$sched_item_class->classname
+     'query'         => { 'table' => 'sched_item' },
+     'count_query'   => 'SELECT COUNT(*) FROM sched_item',
+     'header'        => [ 'Installer', ], #$sched_item_class->classname
+     'fields'        => [ 'name' ],
+     #'links'         => [ $link, ],
+     'disableable'        => 1,
+     'disabled_statuspos' => 1,
+&>
+<%init>
+
+#XXX more specific AccessRight for scheduling
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+</%init>
diff --git a/httemplate/edit/access_user.html b/httemplate/edit/access_user.html
index 3dc30d23b..c2d2d6ebc 100644
--- a/httemplate/edit/access_user.html
+++ b/httemplate/edit/access_user.html
@@ -2,26 +2,31 @@
                  'name'   => 'Employee',
                  'table'  => 'access_user',
                  'fields' => [
-                               'username',
-                               { field=>'_password', type=>'password' },
-                               { field=>'_password2', type=>'password' },
-                               'last',
-                               'first',
-                               { field=>'user_custnum', type=>'search-cust_main', },
-                               { field=>'report_salesnum', type=>'select-sales', empty_label=>'all', },
-                               { field=>'disabled', type=>'checkbox', value=>'Y' },
-                             ],
+                   'username',
+                   { field=>'_password', type=>'password' },
+                   { field=>'_password2', type=>'password' },
+                   'last',
+                   'first',
+                   { field=>'sched_item_enabled', type=>'checkbox', value=>'Y' },
+                   { field=>'user_custnum', type=>'search-cust_main', },
+                   { field       => 'report_salesnum',
+                     type        => 'select-sales',
+                     empty_label => 'all',
+                   },
+                   { field=>'disabled', type=>'checkbox', value=>'Y' },
+                 ],
                  'labels' => { 
-                               'usernum'         => 'User number',
-                               'username'        => 'Username',
-                               '_password'       => 'Password',
-                               '_password2'      => 'Re-enter Password',
-                               'last'            => 'Last name',
-                               'first'           => 'First name',
-                               'user_custnum'    => 'Customer (optional)',
-                               'report_salesnum' => 'Limit commission report to sales person',
-                               'disabled'        => 'Disable employee',
-                             },
+                   'usernum'         => 'User number',
+                   'username'        => 'Username',
+                   '_password'       => 'Password',
+                   '_password2'      => 'Re-enter Password',
+                   'last'            => 'Last name',
+                   'first'           => 'First name',
+                   'sched_item_enabled' => 'Installer',
+                   'user_custnum'    => 'Customer (optional)',
+                   'report_salesnum' => 'Limit commission report to sales person',
+                   'disabled'        => 'Disable employee',
+                 },
                  'edit_callback' => \&edit_callback,
                  'field_callback'=> \&field_callback,
                  'viewall_dir' => 'browse',
@@ -66,6 +71,10 @@ END
 sub edit_callback {
   my ($cgi, $access_user, $fields_listref, $opt_hashref) = @_;
   $access_user->_password('');
+
+  my @sched_item = $access_user->sched_item;
+  $access_user->sched_item_enabled('Y')
+    if $sched_item[0] && ! $sched_item[0]->disabled;
 }
 
 sub field_callback {
diff --git a/httemplate/edit/process/access_user.html b/httemplate/edit/process/access_user.html
index 8e7e70a06..3a5d95198 100644
--- a/httemplate/edit/process/access_user.html
+++ b/httemplate/edit/process/access_user.html
@@ -11,6 +11,7 @@
                                     'target_table' => 'access_group',
                                   },
                  'precheck_callback'=> \&precheck_callback,
+                 'noerror_callback' => \&noerror_callback,
              )
 %>
 %   }
@@ -33,4 +34,37 @@ sub precheck_callback {
   }
   return '';
 }
+
+sub noerror_callback {
+  my( $cgi, $access_user ) = @_;
+
+  #handle installer checkbox
+  my @sched_item = $access_user->sched_item;
+  my $sched_item = $sched_item[0];
+  if ( $cgi->param('sched_item_enabled') ) {
+
+    if ( ! $sched_item ) {
+      my $sched_item = new FS::sched_item {
+        'usernum' => $access_user->usernum,
+      };
+      my $error = $sched_item->insert;
+      die $error if $error; #wtf?  shouldn't happen
+    } elsif ( $sched_item->disabled ) {
+      $sched_item->disabled('');
+      my $error = $sched_item->replace;
+      die $error if $error; #wtf?  shouldn't happen
+    }
+
+  } elsif ( ! $cgi->param('sched_item_enabled')
+              && $sched_item
+              && ! $sched_item->disabled
+          )
+  {
+    $sched_item->disabled('Y');
+    my $error = $sched_item->replace;
+    die $error if $error; #wtf?  shouldn't happen
+  }
+
+}
+
 </%init>