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

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 143cd62ad..955817c80 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -243,6 +243,21 @@ sub _upgrade_data { # class method
     'Configuration' => 'Alarm global configuration',
     'Edit global package definitions' => 'Edit package definition costs',
     'Configuration' => 'Edit global fee definitions',
+    'Edit package definition costs' => 'View package definition costs',
+    'List prospects' => 'List contacts',
+    'List customers' => 'List contacts',
+    'Backdate payment' => 'Backdate credit',
+    'Generate quotation' => 'Disable quotation',
+    'Void credit' => 'Void credit',
+    'Unvoid credit' => 'Unvoid credit',
+    'Add on-the-fly void credit reason' => 'Add on-the-fly void credit reason',
+    '_ALL' => 'Employee preference telephony integration',
+    '_ALL' => 'RT activity notification',
+    'Add on-the-fly credit reason' => 'Add on-the-fly refund reason',
+    'Resend invoices' => 'Print and mail invoices',
+    'List customers' => 'Customers: Customer churn report',
+    'Edit customer' => 'Edit customer invoice terms',
+    'Financial reports' => 'Basic payment and refund reports',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
@@ -263,7 +278,7 @@ sub _upgrade_data { # class method
 
       # grant $new_acl to all groups who have $old_acl
       for my $group (@all_groups) {
-        next unless $group->access_right($old_acl);
+        next unless $old_acl eq '_ALL' || $group->access_right($old_acl);
         next if     $group->access_right($new_acl);
         my $access_right = FS::access_right->new( {
             'righttype'   => 'FS::access_group',
@@ -280,11 +295,39 @@ sub _upgrade_data { # class method
 
   }
 
+  # some false laziness with @onetime above,
+  # but for use when multiple old acls trigger a single new acl
+  # (keys/values reversed from @onetime, expects arrayref value)
+  my @onetime_bynew = (
+    'Customize billing during suspension' => [ 'Suspend customer package', 'Suspend customer package later' ],
+  );
+  while ( @onetime_bynew ) {
+    my( $new_acl, $old_acl ) = splice(@onetime_bynew, 0, 2);
+    ( my $journal = 'ACL_'.lc($new_acl) ) =~ s/\W/_/g;
+    next if FS::upgrade_journal->is_done($journal);
+    # grant $new_acl to all groups who have one of @old_acl
+    for my $group (@all_groups) {
+      next unless grep { $group->access_right($_) } @$old_acl;
+      next if     $group->access_right($new_acl);
+      my $access_right = FS::access_right->new( {
+          'righttype'   => 'FS::access_group',
+          'rightobjnum' => $group->groupnum,
+          'rightname'   => $new_acl,
+      } );
+      my $error = $access_right->insert;
+      die $error if $error;
+    }
+    
+    FS::upgrade_journal->set_done($journal);
+
+  }
+
   ### ACL_download_report_data
   if ( !FS::upgrade_journal->is_done('ACL_download_report_data') ) {
 
     # grant to everyone
     for my $group (@all_groups) {
+      next if $group->access_right('Download report data');
       my $access_right = FS::access_right->new( {
           'righttype'   => 'FS::access_group',
           'rightobjnum' => $group->groupnum,