[freeside-commits] branch master updated. dd53090fe68e2264e09a85db3d512d1baebe96b3

[Ivan]

The branch, master has been updated
       via  dd53090fe68e2264e09a85db3d512d1baebe96b3 (commit)
      from  ceeaad3d99869f159bf2fee490aafa4c95d03365 (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 dd53090fe68e2264e09a85db3d512d1baebe96b3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 7 14:47:50 2015 -0800

    fix one time charge costs, RT#31429, RT#32894

diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index e87be62..6de746e 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -83,9 +83,11 @@ if ( $param->{'pkgnum'} =~ /^(\d+)$/ ) { #modifying an existing one-time charge
   my $amount = $1;
 
   my $setup_cost = '';
-  $param->{"setup_cost"} =~ /^\s*(\d*(?:\.?\d{1,2}))\s*$/
-    or $error .= "Illegal setup_cost " . $param->{"setup_cost"} . "  ";
-  my $setup_cost = $1;
+  if ( $param->{setup_cost} =~ /\S/ ) {
+    $param->{setup_cost} =~ /^\s*(\d*(?:\.?\d{1,2}))\s*$/
+      or $error .= "Illegal setup_cost " . $param->{setup_cost} . "  ";
+    $setup_cost = $1;
+  }
 
   my $quantity = 1;
   if ( $cgi->param('quantity') =~ /^\s*(\d+)\s*$/ ) {

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

Summary of changes:
 httemplate/edit/process/quick-charge.cgi |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)