r100878 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r100877‎ | r100878 | r100879 >
Date:21:35, 26 October 2011
Author:awjrichards
Status:resolved (Comments)
Tags:fundraising 
Comment:
Updating message names tb donate_interface-<msg> rather than payflowpro_gateway-<msg>; re-adding the weird that used to live in payflowpro_gateway.body.php directly into TwoStepTwoColumnLetterForm to get form checking/error handling working correctly again (at least for this form). This is a really ugly, shameful hack. But.. we just need it to work. NOW.
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js
@@ -52,4 +52,4 @@
5353 return true;
5454 }
5555 }
56 -//]]>
\ No newline at end of file
 56+//]]>
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
@@ -17,12 +17,34 @@
1818 *
1919 * @see parent::loadResources()
2020 */
21 - public function loadResources() {
 21+ /*public function loadResources() {
2222 $this->loadValidateJs();
23 - }
 23+ }*/
2424
2525 public function loadPlaceholders() {
2626 global $wgOut;
 27+
 28+
 29+ $scriptVars = array(
 30+ 'payflowproGatewayErrorMsgJs' => wfMsg( 'donate_interface-error-msg-js' ),
 31+ 'payflowproGatewayErrorMsgEmail' => wfMsg( 'donate_interface-error-msg-email' ),
 32+ 'payflowproGatewayErrorMsgAmount' => wfMsg( 'donate_interface-error-msg-amount' ),
 33+ 'payflowproGatewayErrorMsgEmailAdd' => wfMsg( 'donate_interface-error-msg-emailAdd' ),
 34+ 'payflowproGatewayErrorMsgFname' => wfMsg( 'donate_interface-error-msg-fname' ),
 35+ 'payflowproGatewayErrorMsgLname' => wfMsg( 'donate_interface-error-msg-lname' ),
 36+ 'payflowproGatewayErrorMsgStreet' => wfMsg( 'donate_interface-error-msg-street' ),
 37+ 'payflowproGatewayErrorMsgCity' => wfMsg( 'donate_interface-error-msg-city' ),
 38+ 'payflowproGatewayErrorMsgState' => wfMsg( 'donate_interface-error-msg-state' ),
 39+ 'payflowproGatewayErrorMsgZip' => wfMsg( 'donate_interface-error-msg-zip' ),
 40+ 'payflowproGatewayErrorMsgCountry' => wfMsg( 'donate_interface-error-msg-country' ),
 41+ 'payflowproGatewayErrorMsgCardNum' => wfMsg( 'donate_interface-error-msg-card_num' ),
 42+ 'payflowproGatewayErrorMsgExpiration' => wfMsg( 'donate_interface-error-msg-expiration' ),
 43+ 'payflowproGatewayErrorMsgCvv' => wfMsg( 'donate_interface-error-msg-cvv' ),
 44+ 'payflowproGatewayCVVExplain' => wfMsg( 'donate_interface-cvv-explain' ),
 45+ );
 46+
 47+ $wgOut->addScript( Skin::makeVariablesScript( $scriptVars ) );
 48+
2749 // form placeholder values
2850 $first = wfMsg( 'donate_interface-donor-fname' );
2951 $last = wfMsg( 'donate_interface-donor-lname' );
@@ -161,7 +183,7 @@
162184 $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>";
163185 $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) );
164186
165 - $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) );
 187+ $form .= Xml::openElement( 'div', array( 'id' => 'donate_interface-personal-info' ) );
166188 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
167189 $form .= $this->generateBillingFields();
168190

Follow-up revisions

RevisionCommit summaryAuthorDate
r100880Removed commented out loadResources method; fixed accidentally borked div id ...awjrichards21:39, 26 October 2011
r100889follow-up to r100886, fixing error messageskaldari22:24, 26 October 2011

Comments

#Comment by Awjrichards (talk | contribs)   01:55, 27 October 2011

This was really dumb and was fixed by Kaldari in r100889

Status & tagging log