prevent Enter from submitting quick payment form, RT13651

[freeside.git] / httemplate / misc / batch-cust_pay.html

diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index 610f6e1..11fdeee 100644 (file)
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -5,7 +5,7 @@
 <SCRIPT TYPE="text/javascript">
 function warnUnload() {
   if(document.getElementById("OneTrueTable").rows.length > 3 &&
-     !document.OneTrueForm.submit.disabled) {
+     !document.OneTrueForm.btnsubmit.disabled) {
     return "The current batch will be lost.";
   }
   else {
@@ -54,7 +54,7 @@ function select_discount_term(row, prefix) {
            )
 %>
 
-<FORM ACTION="process/batch-cust_pay.cgi" NAME="OneTrueForm" METHOD="POST" onsubmit="document.OneTrueForm.submit.disabled=true;window.onbeforeunload = null;">
+<FORM ACTION="process/batch-cust_pay.cgi" NAME="OneTrueForm" METHOD="POST" onsubmit="document.OneTrueForm.btnsubmit.disabled=true;window.onbeforeunload = null;">
 
 <!-- <B>Batch</B> <INPUT TYPE="text" NAME="paybatch"><BR><BR> -->
 
@@ -73,11 +73,8 @@ function select_discount_term(row, prefix) {
           )
 %>
 
-<!-- <BR>
-<INPUT TYPE="button" VALUE="TEST addrow" onclick="addRow()"> -->
-
 <BR>
-<INPUT TYPE="submit" NAME="submit" VALUE="Post payment batch">
+<INPUT TYPE="button" VALUE="Post payment batch" name="btnsubmit" onclick="window.onbeforeunload = null; document.OneTrueForm.submit(); this.disabled = true;">
 
 </FORM>
 
@@ -96,18 +93,21 @@ function select_discount_term(row, prefix) {
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Post payment batch');
 
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
 my @header  = ( '', 'Amount', 'Check #' );
-my @fields  = ( sub {'$'}, 'paid', 'payinfo' );
+my @fields  = ( sub { "$money_char" }, 'paid', 'payinfo' );
 my @types   = ( 'immutable', '', '' );
 my @align   = ( 'c', 'r', 'r' );
 my @sizes   = ( 0, 8, 10 );
 my @colors  = ( '', '', '' );
 my %param   = ();
-my @footer  = ( '$', '_TOTAL', '' );
+my @footer  = ( "$money_char", '_TOTAL', '' );
 my @footer_align = ( 'c', 'r', 'r' );
 my $custnum_update_callback = '';
 
-if ( FS::Record->scalar_sql('SELECT count(*) FROM part_pkg_discount') ) {
+if ( FS::Record->scalar_sql('SELECT COUNT(*) FROM part_pkg_discount') ) {
   push @header, '';
   push @fields, 'discount_term';
   push @types, 'immutable';
@@ -128,4 +128,6 @@ push @colors, '#ff0000';
 push @footer, '';
 push @footer_align, '';
 
+$m->comp('/elements/handle_uri_query');
+
 </%init>