| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php |
| — | — | @@ -54,11 +54,6 @@ |
| 55 | 55 | $wgPayFlowProGatewayCSSVersion, |
| 56 | 56 | $wgPayflowGatewaySalt; |
| 57 | 57 | |
| 58 | | - // make a log entry if the user has submitted the cc form |
| 59 | | - if ( $wgRequest->wasPosted() && $wgRequest->getText( 'order_id', 0 )) { |
| 60 | | - wfDebugLog( 'payflowpro_gateway', $wgRequest->getText( 'order_id' ) . " Transaction initiated." ); |
| 61 | | - } |
| 62 | | - |
| 63 | 58 | $wgOut->addExtensionStyle( |
| 64 | 59 | "{$wgScriptPath}/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css?284" . |
| 65 | 60 | $wgPayFlowProGatewayCSSVersion ); |
| — | — | @@ -112,7 +107,12 @@ |
| 113 | 108 | require_once( 'includes/payflowUser.inc' ); |
| 114 | 109 | |
| 115 | 110 | $payflow_data = payflowUser(); |
| 116 | | - |
| | 111 | + |
| | 112 | + // make a log entry if the user has submitted the cc form |
| | 113 | + if ( $wgRequest->wasPosted() && $wgRequest->getText( 'process', 0 )) { |
| | 114 | + wfDebugLog( 'payflowpro_gateway', $payflow_data[ 'order_id' ] . " Transaction initiated." ); |
| | 115 | + } |
| | 116 | + |
| 117 | 117 | // if _cache_ is requested by the user, do not set a session/token; dynamic data will be loaded via ajax |
| 118 | 118 | if ( $wgRequest->getText( '_cache_', false ) ) { |
| 119 | 119 | $cache = true; |
| — | — | @@ -524,7 +524,7 @@ |
| 525 | 525 | $errorCode = $this->fnPayflowGetResponseMsg( $resultCode, $responseMsg ); |
| 526 | 526 | |
| 527 | 527 | // log that the transaction is essentially complete |
| 528 | | - wfDebugLog( 'payflowpro_gateway', $wgRequest->getText( 'order_id' ) . " Transaction complete." ); |
| | 528 | + wfDebugLog( 'payflowpro_gateway', $data[ 'order_id' ] . " Transaction complete." ); |
| 529 | 529 | |
| 530 | 530 | // if approved, display results and send transaction to the queue |
| 531 | 531 | if ( $errorCode == '1' ) { |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter2.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | |
| 60 | 60 | // Xml::element seems to convert html to htmlentities |
| 61 | 61 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 62 | | - $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) ); |
| | 62 | + $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) ); |
| 63 | 63 | |
| 64 | 64 | $form .= $this->generateBillingContainer(); |
| 65 | 65 | return $form; |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 167 | 167 | $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' ) ); |
| 168 | 168 | } else { |
| 169 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'submit_form( this )', 'type' => 'submit' ) ); |
| | 169 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) ); |
| 170 | 170 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 171 | 171 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 172 | 172 | wfMsg( 'payflowpro_gateway-donate-click' ); |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter3.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | |
| 60 | 60 | // Xml::element seems to convert html to htmlentities |
| 61 | 61 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 62 | | - $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) ); |
| | 62 | + $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) ); |
| 63 | 63 | |
| 64 | 64 | $form .= $this->generateBillingContainer(); |
| 65 | 65 | return $form; |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 167 | 167 | $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' ) ); |
| 168 | 168 | } else { |
| 169 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'submit_form( this )', 'type' => 'submit' ) ); |
| | 169 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) ); |
| 170 | 170 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 171 | 171 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 172 | 172 | wfMsg( 'payflowpro_gateway-donate-click' ); |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter4.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | |
| 60 | 60 | // Xml::element seems to convert html to htmlentities |
| 61 | 61 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 62 | | - $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) ); |
| | 62 | + $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) ); |
| 63 | 63 | |
| 64 | 64 | $form .= $this->generateBillingContainer(); |
| 65 | 65 | return $form; |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | $form .= Html::hidden( 'PaypalRedirect', false ); |
| 167 | 167 | $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' ) ); |
| 168 | 168 | } else { |
| 169 | | - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'submit_form( this )', 'type' => 'submit' ) ); |
| | 169 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) ); |
| 170 | 170 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 171 | 171 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 172 | 172 | wfMsg( 'payflowpro_gateway-donate-click' ); |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | |
| 57 | 57 | // Xml::element seems to convert html to htmlentities |
| 58 | 58 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 59 | | - $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'autocomplete' => 'off' ) ); |
| | 59 | + $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) ); |
| 60 | 60 | |
| 61 | 61 | $form .= $this->generateBillingContainer(); |
| 62 | 62 | return $form; |
| — | — | @@ -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;submit_form( this );', 'type' => 'submit' ) ); |
| | 199 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;document.payment.submit();', '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' ); |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter6.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | |
| 57 | 57 | // Xml::element seems to convert html to htmlentities |
| 58 | 58 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 59 | | - $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'autocomplete' => 'off' ) ); |
| | 59 | + $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) ); |
| 60 | 60 | |
| 61 | 61 | $form .= $this->generateBillingContainer(); |
| 62 | 62 | return $form; |
| — | — | @@ -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;submit_form( this );', 'type' => 'submit' ) ); |
| | 212 | + $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;document.payment.submit();', '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' ); |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnPayPal.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | |
| 33 | 33 | // Xml::element seems to convert html to htmlentities |
| 34 | 34 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 35 | | - $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) ); |
| | 35 | + $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) ); |
| 36 | 36 | |
| 37 | 37 | $form .= Xml::openElement( 'div', array( 'id' => 'left-column', 'class' => 'payflow-cc-form-section' ) ); |
| 38 | 38 | $form .= $this->generatePersonalContainer(); |
| Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | |
| 60 | 60 | // Xml::element seems to convert html to htmlentities |
| 61 | 61 | $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>"; |
| 62 | | - $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return validate_form(this)', 'autocomplete' => 'off' ) ); |
| | 62 | + $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) ); |
| 63 | 63 | |
| 64 | 64 | $form .= $this->generateBillingContainer(); |
| 65 | 65 | return $form; |
| Property changes on: branches/fundraising/deployment/DonationInterface |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 66 | 66 | Merged /trunk/extensions/DonationInterface:r76993-77001 |