diff options
| -rw-r--r-- | FS/FS/cust_credit.pm | 6 | ||||
| -rw-r--r-- | httemplate/edit/credit-cust_bill_pkg.html | 9 | ||||
| -rw-r--r-- | httemplate/edit/process/credit-cust_bill_pkg.html | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm index 83e5d6049..4553aff44 100644 --- a/FS/FS/cust_credit.pm +++ b/FS/FS/cust_credit.pm @@ -629,6 +629,7 @@ Example: 'billpkgnums' => \@billpkgnums, 'setuprecurs' => \@setuprecurs, 'amounts' => \@amounts, + 'apply' => 1, #0 leaves the credit unapplied #the credit 'newreasonnum' => scalar($cgi->param('newreasonnum')), @@ -705,6 +706,11 @@ sub credit_lineitems { return "Error inserting credit: $error"; } + unless ( $arg{'apply'} ) { + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + return ''; + } + #my $subtotal = 0; # keys in all of these are invoice numbers my %taxlisthash = (); diff --git a/httemplate/edit/credit-cust_bill_pkg.html b/httemplate/edit/credit-cust_bill_pkg.html index 77453a1cc..3d1cf2438 100644 --- a/httemplate/edit/credit-cust_bill_pkg.html +++ b/httemplate/edit/credit-cust_bill_pkg.html @@ -92,6 +92,15 @@ </TD> </TR> +% if ( $conf->exists('credits-auto-apply-disable') ) { + <INPUT TYPE="HIDDEN" NAME="apply" VALUE="no"> +% } else { + <TR> + <TD ALIGN="right"><% mt('Apply to selected line items') |h %></TD> + <TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED><% mt('yes') |h %><OPTION><% mt('no') |h %></SELECT></TD> + </TR> +% } + </table> <BR> diff --git a/httemplate/edit/process/credit-cust_bill_pkg.html b/httemplate/edit/process/credit-cust_bill_pkg.html index 1b6199772..cbcf619ca 100644 --- a/httemplate/edit/process/credit-cust_bill_pkg.html +++ b/httemplate/edit/process/credit-cust_bill_pkg.html @@ -32,6 +32,7 @@ my $error = FS::cust_credit->credit_lineitems( 'billpkgnums' => \@billpkgnums, 'setuprecurs' => \@setuprecurs, 'amounts' => \@amounts, + 'apply' => ( $cgi->param('apply') eq 'yes' ), #the credit 'newreasonnum' => scalar($cgi->param('newreasonnum')), |