credit deletions: need to use Date::Format and FS::Misc qw(send_email) in cust_credit...

diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 90f9b59..19a5453 100644 (file)
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -2,8 +2,10 @@ package FS::cust_credit;
 
 use strict;
 use vars qw( @ISA $conf $unsuspendauto );
 
 use strict;
 use vars qw( @ISA $conf $unsuspendauto );

+use Date::Format;

 use FS::UID qw( dbh getotaker );
 use FS::Record qw( qsearch qsearchs );
 use FS::UID qw( dbh getotaker );
 use FS::Record qw( qsearch qsearchs );

+use FS::Misc qw(send_email);

 use FS::cust_main;
 use FS::cust_refund;
 use FS::cust_credit_bill;
 use FS::cust_main;
 use FS::cust_refund;
 use FS::cust_credit_bill;

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8123b2f..ee5f869 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -668,12 +668,16 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
              qsearch('cust_credit',{'custnum'=>$custnum});
   foreach my $credit (@credits) {
     my($cref)=$credit->hashref;
              qsearch('cust_credit',{'custnum'=>$custnum});
   foreach my $credit (@credits) {
     my($cref)=$credit->hashref;

+    my $delete =
+      $credit->closed !~ /^Y/i && $conf->exists('deletecredits')
+        ? qq! (<A HREF="javascript:cust_credit_areyousure('${p}misc/delete-cust_credit.cgi?!. $credit->crednum. qq!')">delete</A>)!
+        : '';

     push @history,
       $cref->{_date} . "\t" .
       qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
       '<b><font size="+1" color="#ff0000">Unapplied credit #' .
       $cref->{crednum} . "</font></b></A>: ".
     push @history,
       $cref->{_date} . "\t" .
       qq!<A HREF="! . popurl(2). qq!edit/cust_credit_bill.cgi?!. $cref->{crednum} . qq!">!.
       '<b><font size="+1" color="#ff0000">Unapplied credit #' .
       $cref->{crednum} . "</font></b></A>: ".

-      $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
+      $cref->{reason} . "$delete\t\t\t" . $credit->credited . "\t";

   }
   
   my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
   }
   
   my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );