add back ability to post a check/cash refund. be more explicit about it instead of just being a checkbox when posting a credit. RT#3812

2 files changed, 13 insertions, 2 deletions

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 4e6eaaf..262b134 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -161,8 +161,8 @@ tie my %rights, 'Tie::IxHash',
     'Apply payment', #NEWNEW
     { rightname=>'Unapply payment', desc=>'Enable "unapplication" of unclosed payments from specific invoices.' }, #aka. unapplypayments
     'Process payment',
-    'Refund payment',
-  
+    { rightname=>'Refund payment', desc=>'Enable refund of existing customer payments.' },
+
     { 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.
   
   ],
@@ -175,6 +175,8 @@ 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.
+    { rightname=>'Post refund', desc=>'Enable posting of check and cash refunds.' },
+#    { rightname=>'Process refund', desc=>'Enable processing of generic credit card/ACH refunds (i.e. not associated with a specific prior payment).' },
     'Delete refund', #NEW
     'Add on-the-fly credit reason', #NEW
   ],
diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 349d266..b54e5d9 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -74,6 +74,7 @@ tie %hash, 'Tie::IxHash',
   'BILL' => {
     tinyname  => 'billing',
     shortname => 'Billing',
+    payname   => 'Check',
     longname  => 'Billing',
   },
   'PREP' => {
@@ -140,6 +141,14 @@ sub shortname {
   $hash{$payby}->{shortname};
 }
 
+sub payname {
+  my( $self, $payby ) = @_;
+  #$hash{$payby}->{payname} || $hash{$payby}->{shortname};
+  exists($hash{$payby}->{payname})
+    ? $hash{$payby}->{payname}
+    : $hash{$payby}->{shortname};
+}
+
 sub longname {
   my( $self, $payby ) = @_;
   $hash{$payby}->{longname};