X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=143cd62ad9e6763d380fca41ae28ab3eefef7df6;hb=a31c3c63d893b38065f2b9e18235ba99ac412630;hp=bc57364d2c5a47dd21e1157571c697f743c3a9ff;hpb=f24c4bebce257bfcc61ba07fd3d16c5c0d730071;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index bc57364d2..143cd62ad 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use Tie::IxHash;
 use FS::Record qw( qsearch qsearchs );
 use FS::upgrade_journal;
+use FS::access_group;
 
 @ISA = qw(FS::Record);
 
@@ -152,6 +153,8 @@ sub _upgrade_data { # class method
     'Process payment' => [ 'Process credit card payment', 'Process Echeck payment' ],
     'Post refund'     => [ 'Post check refund', 'Post cash refund' ],
     'Refund payment'  => [ 'Refund credit card payment', 'Refund Echeck payment' ],
+    'Regular void'    => [ 'Void payments' ],
+    'Unvoid'          => [ 'Unvoid payments', 'Unvoid invoices' ],
   );
 
   foreach my $oldright (keys %migrate) {
@@ -174,9 +177,10 @@ sub _upgrade_data { # class method
         die $error if $error;
       }
 
-      #after the WEST stuff is sorted, etc.
-      #my $error = $old->delete;
-      #die $error if $error;
+      unless ( $oldright =~ / (payment|refund)$/ ) { #after the WEST stuff is sorted
+        my $error = $old->delete;
+        die $error if $error;
+      }
 
     }
 
@@ -184,7 +188,8 @@ sub _upgrade_data { # class method
 
   my @all_groups = qsearch('access_group', {});
 
-  tie my %onetime, 'Tie::IxHash',
+  #tie my %onetime, 'Tie::IxHash',
+  my @onetime = (
     'List customers'                      => 'List all customers',
     'List all customers'                  => 'Advanced customer search',
     'List packages'                       => 'Summarize packages',
@@ -194,6 +199,11 @@ sub _upgrade_data { # class method
     'Unsuspend customer package'          => 'Unsuspend customer',
     'New prospect'                        => 'Generate quotation',
     'Delete invoices'                     => 'Void invoices',
+    'List invoices'                       => 'List quotations',
+    'Post credit'                         => 'Credit line items',
+    #'View customer tax exemptions'        => 'Edit customer tax exemptions',
+    'Edit customer'                       => 'Edit customer tax exemptions',
+    'Edit package definitions'            => 'Bulk edit package definitions',
 
     'List services'    => [ 'Services: Accounts',
                             'Services: Domains',
@@ -214,18 +224,37 @@ sub _upgrade_data { # class method
     'Services: Accounts' => 'Services: Accounts: Advanced search',
     'Services: Wireless broadband services' => 'Services: Wireless broadband services: Advanced search',
     'Services: Hardware' => 'Services: Hardware: Advanced search',
+    'Services: Phone numbers' => 'Services: Phone numbers: Advanced search',
+
+    'Services: Accounts' => 'Services: Alarm services',
 
     'List rating data' => [ 'Usage: RADIUS sessions',
                             'Usage: Call Detail Records (CDRs)',
                             'Usage: Unrateable CDRs',
                           ],
-  ;
+    'Provision customer service' => [ 'Edit password' ],
+    'Financial reports' => [ 'Employees: Commission Report',
+                             'Employees: Audit Report',
+                           ],
+    'Change customer package' => 'Detach customer package',
+    'Services: Accounts' => 'Services: Cable Subscribers',
+    'Bulk change customer packages' => 'Bulk move customer services',
+    'Configuration' => 'Edit sales people',
+    'Configuration' => 'Alarm global configuration',
+    'Edit global package definitions' => 'Edit package definition costs',
+    'Configuration' => 'Edit global fee definitions',
+  );
+
+#  foreach my $old_acl ( keys %onetime ) {
+#
+#    my @new_acl = ref($onetime{$old_acl})
+#                    ? @{ $onetime{$old_acl} }
+#                    :  ( $onetime{$old_acl} );
 
-  foreach my $old_acl ( keys %onetime ) {
+  while ( @onetime ) {
 
-    my @new_acl = ref($onetime{$old_acl})
-                    ? @{ $onetime{$old_acl} }
-                    :  ( $onetime{$old_acl} );
+    my( $old_acl, $new_acl ) = splice(@onetime, 0, 2);
+    my @new_acl = ref($new_acl) ? @$new_acl : ( $new_acl );
 
     foreach my $new_acl ( @new_acl ) {
 
@@ -262,7 +291,7 @@ sub _upgrade_data { # class method
           'rightname'   => 'Download report data',
       } );
       my $error = $access_right->insert;
-      die $error if $error;
+      warn $error if $error;
     }
 
     FS::upgrade_journal->set_done('ACL_download_report_data');