change credit reasons from freetext to new reason/reason type system (#2777)

8 files changed, 67 insertions, 35 deletions

diff --git a/httemplate/browse/reason.html b/httemplate/browse/reason.html
index 94141eea3..49b452cf8 100644
--- a/httemplate/browse/reason.html
+++ b/httemplate/browse/reason.html
@@ -38,14 +38,10 @@ die "access denied"
 $cgi->param('class') =~ /^(\w)$/ or die "illegal class";
 my $class = $1;
 
-my %classmap = ( 'C' => 'cancel',
-               'S' => 'suspend',
-             );
+my $classname = $FS::reason_type::class_name{$class};;
+my $classpurpose = $FS::reason_type::class_purpose{$class};;
 
-my $classname = $classmap{$class};
-
-my $html_init = ucfirst($classname) .
-" reasons explain why we $classname a package.<BR><BR>".
+my $html_init = ucfirst($classname).  " reasons $classpurpose.<BR><BR>".
 qq!<A HREF="${p}edit/reason.html?class=$class">!.
 "<I>Add a $classname reason</I></A><BR><BR>";
 
diff --git a/httemplate/browse/reason_type.html b/httemplate/browse/reason_type.html
index 09f451c9f..6b444bad1 100644
--- a/httemplate/browse/reason_type.html
+++ b/httemplate/browse/reason_type.html
@@ -33,11 +33,7 @@ die "access denied"
 $cgi->param('class') =~ /^(\w)$/ or die "illegal class";
 my $class=$1;
 
-my %classmap = ( 'C' => 'cancel',
-                 'S' => 'suspend',
-                );
-
-my $classname = $classmap{$class};
+my $classname = $FS::reason_type::class_name{$class};
 
 my $html_init = ucfirst($classname) .
   " reason types allow groups of $classname reasons for reporting purposes." .
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 13d062c74..b6924f4d9 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -5,7 +5,7 @@
   <BR><BR>
 % } 
 
-<FORM ACTION="<% $p1 %>process/cust_credit.cgi" METHOD=POST>
+<FORM NAME="credit_popup" ACTION="<% $p1 %>process/cust_credit.cgi" METHOD=POST>
 <INPUT TYPE="hidden" NAME="crednum" VALUE="">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
 <INPUT TYPE="hidden" NAME="paybatch" VALUE="">
@@ -30,10 +30,7 @@ Credit
 %#print qq! <INPUT TYPE="checkbox" NAME="refund" VALUE="$refund">Also post refund!;
 %
 
-  <TR>
-    <TD ALIGN="right">Reason</TD>
-    <TD BGCOLOR="#ffffff"><INPUT TYPE="text" NAME="reason" VALUE="<% $reason %>" SIZE=32></TD>
-  </TR>
+<% include('/elements/tr-select-reason.html', 'reasonnum', 'R', '', '', '', 'document.credit_popup.submit',) %>
 
   <TR>
     <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 19faca47a..9dcad7f68 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -3,16 +3,39 @@
 %$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
 %my $custnum = $1;
 %
-%my $new = new FS::cust_credit ( {
-%  map {
-%    $_, scalar($cgi->param($_));
-%  } fields('cust_credit')
-%} );
-%
-%my $error = $new->insert;
+%$cgi->param('reasonnum') =~ /^(-?\d+)$/ or die "Illegal reasonnum";
+%my $reasonnum = $1;
+%
+%my $oldAutoCommit = $FS::UID::AutoCommit;
+%local $FS::UID::AutoCommit = 0;
+%my $dbh = dbh;
+%
+%my $error = '';
+%if ($reasonnum == -1) {
+%
+%  $error = 'Enter a new reason (or select an existing one)'
+%    unless $cgi->param('newreasonnum') !~ /^\s*$/;
+%  my $reason = new FS::reason({ 'reason_type' => $cgi->param('newreasonnumT'),
+%                                'reason'      => $cgi->param('newreasonnum'),
+%                              });
+%  $error ||= $reason->insert;
+%  $cgi->param('reasonnum', $reason->reasonnum)
+%    unless $error;
+%}
+%
+%unless ($error) {
+%  my $new = new FS::cust_credit ( {
+%    map {
+%      $_, scalar($cgi->param($_));
+%    } fields('cust_credit')
+%  } );
+%  $error = $new->insert;
+%}
 %
 %if ( $error ) {
+%  $cgi->param('reasonnum', $reasonnum);
 %  $cgi->param('error', $error);
+%  $dbh->rollback if $oldAutoCommit;
 %
 %  
 <% $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string ) %>
@@ -27,6 +50,7 @@
 %  }
 %  #print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 %
+%  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 %  
 <% header('Credit sucessful') %>
   <SCRIPT TYPE="text/javascript">
diff --git a/httemplate/edit/reason.html b/httemplate/edit/reason.html
index c652a0820..512013ace 100644
--- a/httemplate/edit/reason.html
+++ b/httemplate/edit/reason.html
@@ -2,10 +2,7 @@
 % $cgi->param('class') =~ /^(\w)$/ or die "illegal class";
 % my $class=$1;
 %
-% my %classmap = ('C' => 'cancel',
-%              'S' => 'suspend',
-%             );
-% my $classname = $classmap{$class};
+% my $classname = $FS::reason_type::class_name{$class};
 %
 % my (@types) = qsearch( 'reason_type', { 'class' => $class } );
 %
diff --git a/httemplate/edit/reason_type.html b/httemplate/edit/reason_type.html
index 970529e35..056544e5d 100644
--- a/httemplate/edit/reason_type.html
+++ b/httemplate/edit/reason_type.html
@@ -2,11 +2,7 @@
 %$cgi->param('class') =~ /^(\w)$/;
 %my $class = $1;
 %
-%my %classmap = ( 'C' => 'Cancel',
-%                 'S' => 'Suspend',
-%		);
-%
-%my $classname = $classmap{$class};
+%my $classname = $FS::reason_type::class_name{$class};
 %
 <% include( 'elements/edit.html',
                  'name'   => $classname . ' Reason Type',
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 8f86dea0c..da8f58054 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -267,6 +267,7 @@ if ( $curuser->access_right('Configuration') ) {
   $config_billing{'View/Edit prepaid cards'}          = [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ];
   $config_billing{'View/Edit call rates and regions'} = [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ];
   $config_billing{'View/Edit locales and tax rates'}  = [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ];
+  $config_billing{'View/Edit credit reason types'}  = [ $fsurl.'browse/reason_type.html?class=R', 'Credit reason types define groups of reasons, for reporting and convenience purposes.' ];
 }
 
 tie my %config_dialup, 'Tie::IxHash',
diff --git a/httemplate/elements/tr-select-reason.html b/httemplate/elements/tr-select-reason.html
index 71997c221..23f31ec51 100755
--- a/httemplate/elements/tr-select-reason.html
+++ b/httemplate/elements/tr-select-reason.html
@@ -53,18 +53,39 @@
   </TD>
 </TR>
 
+%     my @types = qsearch( 'reason_type', { 'class' => $class } );
+%   if (scalar(@types) < 1) {  # we should never reach this
+<TR>
+  <TD ALIGN="right">
+    <P>No reason types.  Go add some. </P>
+  </TD>
+</TR>
+%   }elsif (scalar(@types) == 1) {
+<TR>
+  <TD ALIGN="right">
+    <P id="new<% $name %>TLabel" style="display:<% $display %>">Reason Type</P>
+  </TD>
+  <TD>
+    <P id="new<% $name %>T" disabled="<% $disabled %>" style="display:<% $display %>"><% $types[0]->type %>
+    <INPUT type="hidden" name="new<% $name %>T" value="<% $types[0]->typenum %>">
+  </TD>
+</TR>
+
+%   }else{
+
 <TR>
   <TD ALIGN="right">
     <P id="new<% $id %>TLabel" style="display:<% $display %>">Reason Type</P>
   </TD>
   <TD>
     <SELECT id="new<% $id %>T" name="new<% $name %>T" "<% $disabled %>" style="display:<% $display %>">
-%     for my $type (qsearch( 'reason_type', { 'class' => $class } )){
+%     for my $type (@types)){
         <OPTION VALUE="<% $type->typenum %>" <% ($init_type == $type->typenum) ? 'SELECTED' : '' %>><% $type->type %></OPTION>
 %     }
     </SELECT>
   </TD>
 </TR>
+%   }
 
 <TR>
   <TD ALIGN="right">
@@ -94,6 +115,9 @@ if ($class eq 'C') {
 } elsif ($class eq 'S') {
   $access_right = 'Suspend customer package';
   $add_access_right = 'Add on-the-fly suspend reason';
+} elsif ($class eq 'S') {
+  $access_right = 'Post credit';
+  $add_access_right = 'Add on-the-fly credit reason';
 } else {
   die "illegal class: $class";
 }
@@ -113,7 +137,8 @@ if ($init_reason == -1 || ref($init_reason) ) {
 
 }
 
-my $extra_sql = "WHERE class = '$class' ORDER BY reason_type";
+my $extra_sql = "WHERE class = '$class' and (disabled = '' OR disabled is NULL) ".
+                "ORDER BY reason_type";
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 </%init>