X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fquick-charge.html;h=c18b2bc6413e788f56ba772f1f030474ea2fbb33;hb=7bc780834a604a2e678d028f875fd4b546412cfb;hp=95ec70c54c9dd5f3d59031e4f9e6142482551888;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index 95ec70c54..c18b2bc64 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -1,4 +1,4 @@ -<% include("/elements/header-popup.html", 'One-time charge entry', '', +<% include("/elements/header-popup.html", 'One-time charge', '', ( $cgi->param('error') ? '' : 'onload="addRow()"' ), ) %> @@ -16,22 +16,6 @@ function enable_quick_charge () { } } -function enable_quick_charge_desc () { - if ( document.QuickChargeForm.amount.value && document.QuickChargeForm.pkg.value ) { - document.QuickChargeForm.submit.disabled = false; - } else { - document.QuickChargeForm.submit.disabled = true; - } -} - -function enable_quick_charge_amount () { - if ( document.QuickChargeForm.amount.value && document.QuickChargeForm.pkg.value ) { - document.QuickChargeForm.submit.disabled = false; - } else { - document.QuickChargeForm.submit.disabled = true; - } -} - function validate_quick_charge () { var pkg = document.QuickChargeForm.pkg.value; var pkg_regex = /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]*)$/ ; @@ -71,32 +55,56 @@ function validate_quick_charge () { -
@@ -167,6 +175,8 @@ function validate_quick_charge () { die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('One-time charge'); +my $conf = new FS::Conf; + $cgi->param('custnum') =~ /^(\d+)$/ or die 'illegal custnum'; my $custnum = $1; @@ -175,6 +185,11 @@ if ( $cgi->param('amount') =~ /^\s*\$?\s*(\d+(\.\d{1,2})?)\s*$/ ) { $amount = $1; } +my $quantity = 1; +if ( $cgi->param('quantity') =~ /^\s*(\d+)\s*$/ ) { + $quantity = $1; +} + $cgi->param('pkg') =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]*)$/ or die 'illegal description'; my $pkg = $1;