fix acl rewrite causing problems: void now shows up properly, deprecate all the redun...

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 888a686..d03b79a 100644 (file)
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -120,6 +120,7 @@ assigned to users and/or groups.
 
   'Credit card void', #aka. cc-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
   'Echeck void', #aka. echeck-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
+  'Regular void',
   'Unvoid', #aka. unvoid #Enable unvoiding of voided payments
 
   'List customers',

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8b3cd1a..5b77234 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -435,29 +435,29 @@ httemplate/docs/config.html
 
   {
     'key'         => 'deletepayments',
-    'section'     => 'UI',
-    'description' => 'Enable deletion of unclosed payments.  Be very careful!  Only delete payments that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
+    'section'     => 'billing',
+    'description' => 'Enable deletion of unclosed payments.  Really, with voids this is pretty much not recommended in any situation anymore.  Be very careful!  Only delete payments that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'deletecredits',
-    'section'     => 'UI',
-    'description' => 'Enable deletion of unclosed credits.  Be very careful!  Only delete credits that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable deletion of unclosed credits.  Be very careful!  Only delete credits that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.',
     'type'        => [qw( checkbox text )],
   },
 
   {
     'key'         => 'unapplypayments',
-    'section'     => 'UI',
-    'description' => 'Enable "unapplication" of unclosed payments.',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable "unapplication" of unclosed payments.',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'unapplycredits',
-    'section'     => 'UI',
-    'description' => 'Enable "unapplication" of unclosed credits.',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to nable "unapplication" of unclosed credits.',
     'type'        => 'checkbox',
   },
 
@@ -1557,22 +1557,22 @@ httemplate/docs/config.html
 
   {
     'key'         => 'echeck-void',
-    'section'     => 'billing',
-    'description' => 'Enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'cc-void',
-    'section'     => 'billing',
-    'description' => 'Enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'unvoid',
-    'section'     => 'billing',
-    'description' => 'Enable unvoiding of voided payments',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable unvoiding of voided payments',
     'type'        => 'checkbox',
   },
 

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 5c2aa24..482136f 100644 (file)
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -135,7 +135,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
              $cust_pay->paynum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+             qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
 
   } elsif (    scalar(@cust_bill_pay)   == 1
             && scalar(@cust_pay_refund) == 0
@@ -161,7 +161,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
       } elsif ( $app->isa('FS::cust_pay_refund') ) {
         $desc .= '&nbsp;&nbsp;'.
                  '$'. $app->amount.
-                 ' refunded on'. time2str("%D", $app->_date).
+                 ' refunded on '. time2str("%D", $app->_date).
                  '<BR>';
       } else {
         die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
@@ -173,7 +173,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
                $cust_pay->unapplied. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
                $cust_pay->paynum. 
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+               qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }
@@ -195,13 +195,14 @@ foreach my $cust_pay ($cust_main->cust_pay) {
   my $void = '';
   if (    $cust_pay->closed !~ /^Y/i
        && (    ( $cust_pay->payby eq 'CARD'
-                 && $conf->exists('cc-void')
-                 && $curuser->acccess_right('Credit card void')
+                 && $curuser->access_right('Credit card void')
                )
             || ( $cust_pay->payby eq 'CHEK'
-                 && $conf->exists('echeck-void')
-                 && $curuser->acccess_right('Echeck void')
-               ) 
+                 && $curuser->access_right('Echeck void')
+               )
+            || ( $cust_pay->payby !~ /^(CARD|CHEK)$/
+                 && $curuser->access_right('Regular void')
+               )
           )
      )
   {
@@ -231,7 +232,6 @@ foreach my $cust_pay ($cust_main->cust_pay) {
 
   my $unapply = '';
   if (    $cust_pay->closed !~ /^Y/i
-       && $conf->exists('unapplypayments')
        && scalar(@cust_bill_pay)           
        && $curuser->access_right('Unapply payment')
      )
@@ -268,7 +268,6 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
 
   my $unvoid = '';
   if ( $cust_pay_void->closed !~ /^Y/i
-       && $conf->exists('unvoid')
        && $curuser->access_right('Unvoid')
      )
   {
@@ -307,7 +306,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
              $cust_credit->crednum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+             qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
   } elsif (    scalar(@cust_credit_bill)   == 1
             && scalar(@cust_credit_refund) == 0
             && $cust_credit->credited == 0      ) {
@@ -332,7 +331,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
       } elsif ( $app->isa('FS::cust_credit_refund') ) {
         $desc .= '&nbsp;&nbsp;'.
                  '$'. $app->amount.
-                 ' refunded on'. time2str("%D", $app->_date).
+                 ' refunded on '. time2str("%D", $app->_date).
                  '<BR>';
       } else {
         die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
@@ -343,14 +342,18 @@ foreach my $cust_credit ($cust_main->cust_credit) {
                $cust_credit->credited. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
                $cust_credit->crednum.
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+               qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }
 #
   my $delete = '';
   if ( $cust_credit->closed !~ /^Y/i
-       && $conf->exists('deletecredits')
+
+       #s'pose deleting a credit isn't bad like deleting a payment
+       # and this needs to be generally available until we have credit voiding..
+       #&& $conf->exists('deletecredits')
+
        && $curuser->access_right('Delete credit')
      )
   {
@@ -362,7 +365,6 @@ foreach my $cust_credit ($cust_main->cust_credit) {
   
   my $unapply = '';
   if (    $cust_credit->closed !~ /^Y/i
-       && $conf->exists('unapplycredits')
        && scalar(@cust_credit_bill)
        && $curuser->access_right('Unapply credit')
      )
@@ -408,15 +410,21 @@ foreach my $cust_refund ($cust_main->cust_refund) {
 
 %>
 
-<%= include("/elements/table.html") %>
+<%= include("/elements/table-grid.html") %>
+
+<% my $bgcolor1 = '#eeeeee';
+   my $bgcolor2 = '#ffffff';
+   my $bgcolor = '';
+%>
+
 <TR>
-  <TH>Date</TH>
-  <TH>Description</TH>
-  <TH><FONT SIZE=-1>Charge</FONT></TH>
-  <TH><FONT SIZE=-1>Payment</FONT></TH>
-  <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
-  <TH><FONT SIZE=-1>Refund</FONT></TH>
-  <TH><FONT SIZE=-1>Balance</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Charge</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Payment</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Refund</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Balance</FONT></TH>
 </TR>
 
 <%
@@ -426,6 +434,12 @@ my %target;
 my $balance = 0;
 foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
 
+  if ( $bgcolor eq $bgcolor1 ) {
+    $bgcolor = $bgcolor2;
+  } else {
+    $bgcolor = $bgcolor1;
+  }
+
   my $charge  = exists($item->{'charge'})
                   ? sprintf('$%.2f', $item->{'charge'})
                   : '';
@@ -454,7 +468,7 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
 %>
 
   <TR>
-    <TD>
+    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
       <% unless ( !$target || $target{$target}++ ) { %>
         <A NAME="<%= $target %>">
       <% } %>
@@ -464,12 +478,24 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
       <% } %>
       </FONT>
     </TD>
-    <TD><%= $item->{'desc'} %></TD>
-    <TD ALIGN="right"><%= $charge  %></TD>
-    <TD ALIGN="right"><%= $payment %></TD>
-    <TD ALIGN="right"><%= $credit  %></TD>
-    <TD ALIGN="right"><%= $refund  %></TD>
-    <TD ALIGN="right"><%= $showbalance %></TD>
+    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $item->{'desc'} %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $charge  %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $payment %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $credit  %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $refund  %>
+    </TD>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+      <%= $showbalance %>
+    </TD>
   </TR>
 
 <% } %>