X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FAccessRight.pm;h=1bfae03ad0203e8cfbf4e4dc99ae355534dc9719;hp=9e79754d36ef530d69763c6c4f457cd6fea0b79a;hb=87ff794bc37c12c22ddc03c4182e4d37446df245;hpb=9569b2f1e6147f97bfacb41bc94c6605eb59206f

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 9e79754d3..1bfae03ad 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -108,10 +108,12 @@ tie my %rights, 'Tie::IxHash',
     'View customer',
     #'View Customer | View tickets',
     'Edit customer',
+    'Edit customer tags',
     'Edit referring customer',
     'View customer history',
     'Cancel customer',
     'Complimentary customer', #aka users-allow_comp 
+    'Merge customer',
     { rightname=>'Delete customer', desc=>"Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customer's packages if they cancel service." }, #aka. deletecustomers
     'Bill customer now', #NEW
     'Bulk send customer notices', #NEW
@@ -141,6 +143,8 @@ tie my %rights, 'Tie::IxHash',
     'Add on-the-fly suspend reason', #NEW
     'Edit customer package invoice details', #NEW
     'Edit customer package comments', #NEW
+    'Qualify service', #NEW
+    'Waive setup fee', #NEW
   ],
   
   ###
@@ -149,6 +153,7 @@ tie my %rights, 'Tie::IxHash',
   'Customer service rights' => [
     'View customer services', #NEW
     'Provision customer service',
+    'Bulk provision customer service',
     'Recharge customer service', #NEW
     'Unprovision customer service',
     'Change customer service', #NEWNEW
@@ -181,15 +186,17 @@ tie my %rights, 'Tie::IxHash',
   # customer payment rights
   ###
   'Customer payment rights' => [
-    'Post payment',
+    'View payments',
+    { rightname=>'Post payment', desc=>'Make check or cash payments.' },
+    'Post check payment',
+    'Post cash payment',
     'Post payment batch',
     'Apply payment', #NEWNEW
     { rightname=>'Unapply payment', desc=>'Enable "unapplication" of unclosed payments from specific invoices.' }, #aka. unapplypayments
-    'Process payment',
-    { rightname=>'Refund payment', desc=>'Enable refund of existing customer payments.' },
-
+    { rightname=>'Process payment', desc=>'Process credit card or e-check payments' },
+    'Process credit card payment',
+    'Process Echeck payment',
     { rightname=>'Delete payment', desc=>'Enable deletion of unclosed payments. Be very careful!  Only delete payments that were data-entry errors, not adjustments.' }, #aka. deletepayments Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.
-  
   ],
   
   ###
@@ -200,8 +207,14 @@ tie my %rights, 'Tie::IxHash',
     'Apply credit', #NEWNEW
     { rightname=>'Unapply credit', desc=>'Enable "unapplication" of unclosed credits.' }, #aka unapplycredits
     { rightname=>'Delete credit', desc=>'Enable deletion of unclosed credits. Be very careful!  Only delete credits that were data-entry errors, not adjustments.' }, #aka. deletecredits Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.
+    'View refunds',
     { rightname=>'Post refund', desc=>'Enable posting of check and cash refunds.' },
+    'Post check refund',
+    'Post cash refund',
 #    { rightname=>'Process refund', desc=>'Enable processing of generic credit card/ACH refunds (i.e. not associated with a specific prior payment).' },
+    { rightname=>'Refund payment', desc=>'Enable refund of existing customer credit card or e-check payments.' },
+    'Refund credit card payment',
+    'Refund Echeck payment',
     'Delete refund', #NEW
     'Add on-the-fly credit reason', #NEW
   ],
@@ -250,6 +263,8 @@ tie my %rights, 'Tie::IxHash',
     'Billing event reports',
     'Receivables report',
     'Financial reports',
+    { rightname=> 'List inventory', global=>1 },
+    { rightname=>'View email logs', global=>1 },
 
     #{ rightname => 'List customers of all agents', global=>1 },
   ],
@@ -260,9 +275,12 @@ tie my %rights, 'Tie::IxHash',
   'Miscellaneous rights' => [
     { rightname=>'Job queue', global=>1 },
     { rightname=>'Time queue', global=>1 },
-    { rightname=>'Process batches', global=>1 },
-    { rightname=>'Reprocess batches', global=>1 },
-    { rightname=>'Redownload resolved batches', global=>1 },
+    { rightname=>'Process batches', }, #Process payment batches
+    { rightname=>'Process global batches', global=>1 }, #Process global payment batches
+    { rightname=>'Reprocess batches', global=>1 }, #Reprocess payment batches
+    { rightname=>'Redownload resolved batches', global=>1 }, #Redownload resolved payment batches
+    { rightname=>'Process invoice batches', },
+    { rightname=>'Process global invoice batches', global=>1 },
     { rightname=>'Import', global=>1 }, #some of these are ag-virt'ed now?  give em their own ACLs
     { rightname=>'Export', global=>1 },
     { rightname=> 'Edit rating data', desc=>'Delete CDRs', global=>1 },
@@ -299,6 +317,8 @@ tie my %rights, 'Tie::IxHash',
 
     { rightname=>'Broadband configuration' },
     { rightname=>'Broadband global configuration', global=>1 },
+    
+    { rightname=> 'Configure network monitoring', global=>1 },
 
     #{ rightname=>'Edit employees', global=>1, },
     #{ rightname=>'Edit employee groupss', global=>1, },
@@ -345,6 +365,11 @@ sub default_superuser_rights {
     'Redownload resolved batches',
     'Raw SQL',
     'Configuration download',
+    'View customers of all agents',
+    'View/link unlinked services',
+    'Edit usage',
+    'Credit card void',
+    'Echeck void',
   );
 
   no warnings 'uninitialized';