Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / AccessRight.pm

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 6c06ec2..d2417f0 100644 (file)
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -143,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
     '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

   ],
   
   ###
   ],
   
   ###


@@ -151,6 +153,7 @@ tie my %rights, 'Tie::IxHash',
   'Customer service rights' => [
     'View customer services', #NEW
     'Provision customer service',
   '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
     'Recharge customer service', #NEW
     'Unprovision customer service',
     'Change customer service', #NEWNEW


@@ -183,15 +186,17 @@ tie my %rights, 'Tie::IxHash',
   # customer payment rights
   ###
   'Customer payment rights' => [
   # 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
     '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.
     { 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.

-  

   ],
   
   ###
   ],
   
   ###


@@ -202,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.
     '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.' },
     { 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=>'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
   ],
     'Delete refund', #NEW
     'Add on-the-fly credit reason', #NEW
   ],


@@ -242,9 +253,11 @@ tie my %rights, 'Tie::IxHash',
   ###
   'Reporting/listing rights' => [
     'List customers',
   ###
   'Reporting/listing rights' => [
     'List customers',

+    'List all customers',

     'List zip codes', #NEW
     'List invoices',
     'List packages',
     'List zip codes', #NEW
     'List invoices',
     'List packages',

+    'Summarize packages',

     'List services',
     'List service passwords',
   
     'List services',
     'List service passwords',
   


@@ -252,6 +265,10 @@ tie my %rights, 'Tie::IxHash',
     'Billing event reports',
     'Receivables report',
     'Financial reports',
     'Billing event reports',
     'Receivables report',
     'Financial reports',

+    { rightname=> 'List inventory', global=>1 },
+    { rightname=>'View email logs', global=>1 },
+
+    'Download report data',

 
     #{ rightname => 'List customers of all agents', global=>1 },
   ],
 
     #{ rightname => 'List customers of all agents', global=>1 },
   ],


@@ -262,9 +279,12 @@ tie my %rights, 'Tie::IxHash',
   'Miscellaneous rights' => [
     { rightname=>'Job queue', global=>1 },
     { rightname=>'Time queue', global=>1 },
   '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 },
     { 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 },


@@ -301,6 +321,8 @@ tie my %rights, 'Tie::IxHash',
 
     { rightname=>'Broadband configuration' },
     { rightname=>'Broadband global configuration', global=>1 },
 
     { 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, },
 
     #{ rightname=>'Edit employees', global=>1, },
     #{ rightname=>'Edit employee groupss', global=>1, },


@@ -343,11 +365,16 @@ sub default_superuser_rights {
     'Delete payment',
     'Delete credit', #?
     'Delete refund', #?
     'Delete payment',
     'Delete credit', #?
     'Delete refund', #?

+    'Edit customer package dates',

     'Time queue',
     'Redownload resolved batches',
     'Raw SQL',
     'Configuration download',
     'View customers of all agents',
     'Time queue',
     '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';
   );
 
   no warnings 'uninitialized';