| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php |
| — | — | @@ -195,7 +195,7 @@ |
| 196 | 196 | // cc submit button |
| 197 | 197 | $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) ); |
| 198 | 198 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 199 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) ); |
| | 199 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'false\';return true;', 'type' => 'submit' ) ); |
| 200 | 200 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 201 | 201 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 202 | 202 | wfMsg( 'payflowpro_gateway-donate-click' ); |
| — | — | @@ -205,8 +205,8 @@ |
| 206 | 206 | // paypal submit button |
| 207 | 207 | $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal' ) ); |
| 208 | 208 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 209 | | - $form .= Html::hidden( 'PaypalRedirect', 0 ); |
| 210 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) ); |
| | 209 | + $form .= Html::hidden( 'PaypalRedirect', false ); |
| | 210 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) ); |
| 211 | 211 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage |
| 212 | 212 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit |
| 213 | 213 | |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter6.php |
| — | — | @@ -208,7 +208,7 @@ |
| 209 | 209 | $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) ); |
| 210 | 210 | } |
| 211 | 211 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 212 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) ); |
| | 212 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'false\';return true;', 'type' => 'submit' ) ); |
| 213 | 213 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 214 | 214 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 215 | 215 | wfMsg( 'payflowpro_gateway-donate-click' ); |
| — | — | @@ -222,8 +222,8 @@ |
| 223 | 223 | $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal' ) ); |
| 224 | 224 | } |
| 225 | 225 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 226 | | - $form .= Html::hidden( 'PaypalRedirect', 0 ); |
| 227 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) ); |
| | 226 | + $form .= Html::hidden( 'PaypalRedirect', false ); |
| | 227 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) ); |
| 228 | 228 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage |
| 229 | 229 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit |
| 230 | 230 | return $form; |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php |
| — | — | @@ -118,7 +118,7 @@ |
| 119 | 119 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 120 | 120 | $form .= Xml::tags( 'div', |
| 121 | 121 | array(), |
| 122 | | - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif" ) ) . ' <a href="#" onclick="document.payment.PaypalRedirect.value=\'true\';return true;"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>' |
| | 122 | + Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif" ) ) . ' <a href="#" onclick="document.payment.PaypalRedirect.value=\'true\';document.payment.submit();"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>' |
| 123 | 123 | ); |
| 124 | 124 | $form .= '</td>'; |
| 125 | 125 | $form .= '</tr>'; |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/OneStepTwoColumn.php |
| — | — | @@ -55,32 +55,43 @@ |
| 56 | 56 | i, |
| 57 | 57 | output = '', |
| 58 | 58 | currField = ''; |
| 59 | | - |
| 60 | | - for( i = 0; i < numFields; i++ ) { |
| 61 | | - if( document.getElementById( fields[i] ).value == '' ) { |
| 62 | | - currField = window['payflowproGatewayErrorMsg'+ msg[i]]; |
| 63 | | - output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\\r\\n'; |
| | 59 | + |
| | 60 | + var doCheck = true; |
| | 61 | + if( typeof( document.payment.PaypalRedirect.value ) !== 'undefined' ) { |
| | 62 | + if( document.payment.PaypalRedirect.value == 'true' ) { |
| | 63 | + doCheck = false; |
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | | - if (document.getElementById('fname').value == '$first') { |
| 68 | | - output += payflowproGatewayErrorMsgJs + ' first name.\\r\\n'; |
| | 67 | + if( doCheck ) { |
| | 68 | + for( i = 0; i < numFields; i++ ) { |
| | 69 | + if( document.getElementById( fields[i] ).value == '' ) { |
| | 70 | + currField = window['payflowproGatewayErrorMsg'+ msg[i]]; |
| | 71 | + output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\\r\\n'; |
| | 72 | + } |
| | 73 | + } |
| | 74 | + |
| | 75 | + if (document.getElementById('fname').value == '$first') { |
| | 76 | + output += payflowproGatewayErrorMsgJs + ' first name.\\r\\n'; |
| | 77 | + } |
| | 78 | + if (document.getElementById('lname').value == '$last') { |
| | 79 | + output += payflowproGatewayErrorMsgJs + ' last name.\\r\\n'; |
| | 80 | + } |
| | 81 | + |
| | 82 | + // validate email address |
| | 83 | + var apos = document.payment.emailAdd.value.indexOf("@"); |
| | 84 | + var dotpos = document.payment.emailAdd.value.lastIndexOf("."); |
| | 85 | + |
| | 86 | + if( apos < 1 || dotpos-apos < 2 ) { |
| | 87 | + output += payflowproGatewayErrorMsgEmail; |
| | 88 | + } |
| 69 | 89 | } |
| 70 | | - if (document.getElementById('lname').value == '$last') { |
| 71 | | - output += payflowproGatewayErrorMsgJs + ' last name.\\r\\n'; |
| 72 | | - } |
| 73 | | - |
| 74 | | - // validate email address |
| 75 | | - var apos = document.payment.emailAdd.value.indexOf("@"); |
| 76 | | - var dotpos = document.payment.emailAdd.value.lastIndexOf("."); |
| 77 | | - |
| 78 | | - if( apos < 1 || dotpos-apos < 2 ) { |
| 79 | | - output += payflowproGatewayErrorMsgEmail; |
| 80 | | - } |
| 81 | 90 | |
| 82 | 91 | if( output ) { |
| 83 | 92 | alert( output ); |
| 84 | 93 | return false; |
| | 94 | + } else { |
| | 95 | + return true; |
| 85 | 96 | } |
| 86 | 97 | } |
| 87 | 98 | </script> |
| — | — | @@ -152,7 +163,7 @@ |
| 153 | 164 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 154 | 165 | if ( $this->paypal ) { |
| 155 | 166 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 156 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';document.payment.submit();', 'type' => 'submit' ) ); |
| | 167 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) ); |
| 157 | 168 | } else { |
| 158 | 169 | $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-cc-button' ), 'type' => 'submit' ) ); |
| 159 | 170 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| Property changes on: branches/fundraising/deployment/DonationInterface |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 160 | 171 | Merged /trunk/extensions/DonationInterface:r77023-77037 |