http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76818

Revision: 76818
Author:   kaldari
Date:     2010-11-16 18:55:35 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
testing

Modified Paths:
--------------
    
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php
    trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js

Modified: 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php
===================================================================
--- 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php
     2010-11-16 18:51:44 UTC (rev 76817)
+++ 
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php
     2010-11-16 18:55:35 UTC (rev 76818)
@@ -57,6 +57,44 @@
        }
 }
 addEvent( window, 'load', loadPlaceholders );
+
+function formCheck( ccform ) {
+       var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'State', 
'Zip', 'CardNum', 'Cvv' ];
+
+       var fields = 
["emailAdd","fname","lname","street","city","state","zip","card_num","cvv" ],
+               numFields = fields.length,
+               i,
+               output = '',
+               currField = '';
+
+       for( i = 0; i < numFields; i++ ) {
+               if( document.getElementById( fields[i] ).value == '' ) {
+                       currField = window['payflowproGatewayErrorMsg'+ msg[i]];
+                       output += payflowproGatewayErrorMsgJs + ' ' + currField 
+ '.\r\n';
+               }
+       }
+
+       //set state to "outside us"
+       if ( document.payment.country.value != '840' ) {
+                       document.payment.state.value = 'XX';
+       }
+
+       // validate email address
+       var apos = document.payment.emailAdd.value.indexOf("@");
+       var dotpos = document.payment.emailAdd.value.lastIndexOf(".");
+
+       if( apos < 1 || dotpos-apos < 2 ) {
+               output += payflowproGatewayErrorMsgEmail;
+       }
+       
+       if( output ) {
+               alert( output );
+               return false;
+       } else {
+               document.payment.submit();
+               return true;
+       }
+}
 </script>
 EOT;
                $wgOut->addHeadItem( 'placeholders', $js );
@@ -123,7 +161,7 @@
                // submit button
                $form .= Xml::openElement( 'div', array( 'id' => 
'mw-donate-submit-button' ) );
                // $form .= Xml::submitButton( wfMsg( 
'payflowpro_gateway-submit-button' ));
-               $form .= '&nbsp;<br/>' . Xml::element( 'input', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png",
 'alt' => 'Submit donation', 'onclick' => 'submit_form( this )', 'type' => 
'image' ) );
+               $form .= '&nbsp;<br/>' . Xml::element( 'input', array( 'src' => 
$wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png",
 'alt' => 'Submit donation', 'onclick' => 'formCheck( this )', 'type' => 
'image' ) );
                $form .= Xml::closeElement( 'div' ); // close 
div#mw-donate-submit-button
                $form .= Xml::openElement( 'div', array( 'class' => 
'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
                        Xml::element( 'img', array( 'src' => $wgScriptPath . 
"/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 
'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your credit / 
debit card will be securely processed.';

Modified: 
trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js
===================================================================
--- trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js     
2010-11-16 18:51:44 UTC (rev 76817)
+++ trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js     
2010-11-16 18:55:35 UTC (rev 76818)
@@ -59,16 +59,6 @@
        if ( document.payment.country.value != '840' ) {
                        document.payment.state.value = 'XX';
        }
-       
-       // validate name
-       /*
-       if (document.getElementById('fname').style.color == '#999999') {
-               output += payflowproGatewayErrorMsgJs + ' ' + 
window['payflowproGatewayErrorMsg' + msg['Fname']] + '.\r\n';
-       }
-       if (document.getElementById('lname').style.color == '#999999') {
-               output += payflowproGatewayErrorMsgJs + ' ' + 
window['payflowproGatewayErrorMsg' + msg['Lname']] + '.\r\n';
-       }
-       */
 
        // validate email address
        var apos = document.payment.emailAdd.value.indexOf("@");


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to