[freeside-commits] branch master updated. d3880a1402fd46454ab448d59c2e4ff861094981

[Ivan]

The branch, master has been updated
       via  d3880a1402fd46454ab448d59c2e4ff861094981 (commit)
       via  727d620374a9798dd2fe630d57e707fe16a63e49 (commit)
      from  076f8cdad3dea2c56859df36479be398074c4807 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d3880a1402fd46454ab448d59c2e4ff861094981
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 28 20:21:27 2015 -0700

    remove payment deletion, RT#37908

diff --git a/httemplate/misc/delete-cust_pay.cgi b/httemplate/misc/delete-cust_pay.cgi
deleted file mode 100755
index 38e7e4b..0000000
--- a/httemplate/misc/delete-cust_pay.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-% if ( $error ) {
-%   errorpage($error);
-% } else {
-<% $cgi->redirect($p. "view/cust_main.cgi?". $custnum) %>
-% }
-<%init>
-
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Delete payment');
-
-#untaint paynum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal paynum";
-my $paynum = $1;
-
-my $cust_pay = qsearchs('cust_pay',{'paynum'=>$paynum});
-my $custnum = $cust_pay->custnum;
-
-my $error = $cust_pay->delete;
-
-</%init>

commit 727d620374a9798dd2fe630d57e707fe16a63e49
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 28 20:21:12 2015 -0700

    remove payment deletion, RT#37908

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 3f2c0f3..95cf29a 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -209,7 +209,6 @@ tie my %rights, 'Tie::IxHash',
     { 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.
   ],
   
   ###
@@ -223,7 +222,6 @@ tie my %rights, 'Tie::IxHash',
     'Void credit', #NEWER than things marked NEWNEWNEW
     'Unvoid credit', #NEWER than things marked NEWNEWNEW
     { 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.' },
     'View refunds',
     { rightname=>'Post refund', desc=>'Enable posting of check and cash refunds.' },
     'Post check refund',
@@ -441,8 +439,6 @@ Most (but not all) right names.
 sub default_superuser_rights {
   my $class = shift;
   my %omit = map { $_=>1 } (
-    'Delete payment',
-    'Delete credit', #?
     'Delete refund', #?
     'Edit customer package dates',
     'Time queue',
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index c855595..d81fe99 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -230,7 +230,7 @@ my %opt = (
         'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
         'Post refund', 'Post check refund', 'Post cash refund ', 'Refund payment',
         'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
-        'Delete payment', 'Unapply payment',
+        'Unapply payment',
         'Apply credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
         'Delete refund',
         'Billing event reports', 'View customer billing events',
diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 0ed2f80..fd336b8 100644
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -1,5 +1,5 @@
 <% $payment. ' '.  $info. $desc.
-   $view. $change_pkg. $apply. $refund. $void. $delete. $unapply
+   $view. $change_pkg. $apply. $refund. $void. $unapply
 %>
 <%init>
 
@@ -185,16 +185,6 @@ $void = areyousure_link("${p}misc/void-cust_pay.cgi?".$cust_pay->paynum,
        || ( $cust_pay->payby !~ /^(CARD|CHEK)$/ && $opt{'Void payments'}    )
      );
 
-my $delete = '';
-$delete = areyousure_link("${p}misc/delete-cust_pay.cgi?".$cust_pay->paynum,
-                            emt('Are you sure you want to delete this payment?'),
-                            emt('Delete this payment from the database completely - not recommended'),
-                            emt('delete')
-                         )
-  if $cust_pay->closed !~ /^Y/i
-  && $opt{'deletepayments'}
-  && $opt{'Delete payment'};
-
 my $unapply = '';
 $unapply = areyousure_link("${p}misc/unapply-cust_pay.cgi?".$cust_pay->paynum,
                             emt('Are you sure you want to unapply this payment?'),

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/AccessRight.pm                               |    4 ----
 httemplate/misc/delete-cust_pay.cgi                |   21 --------------------
 httemplate/view/cust_main/payment_history.html     |    2 +-
 .../view/cust_main/payment_history/payment.html    |   12 +----------
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100755 httemplate/misc/delete-cust_pay.cgi