| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | protected function generateBillingFields() { |
| 97 | | - global $wgScriptPath; |
| | 97 | + global $wgScriptPath, $wgPayflowGatewayTest; |
| 98 | 98 | |
| 99 | 99 | $form = ''; |
| 100 | 100 | |
| — | — | @@ -127,7 +127,23 @@ |
| 128 | 128 | $form .= '</tr>'; |
| 129 | 129 | |
| 130 | 130 | // card number |
| 131 | | - $form .= $this->getCardNumberField(); |
| | 131 | + $card_num = ( $wgPayflowGatewayTest ) ? $this->form_data[ 'card_num' ] : ''; |
| | 132 | + $form .= ''; |
| | 133 | + if ( $this->form_errors['card_num'] ) { |
| | 134 | + $form .= '<tr>'; |
| | 135 | + $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['card_num'] . '</span></td>'; |
| | 136 | + $form .= '</tr>'; |
| | 137 | + } |
| | 138 | + if ( $this->form_errors['card'] ) { |
| | 139 | + $form .= '<tr>'; |
| | 140 | + $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['card'] . '</span></td>'; |
| | 141 | + $form .= '</tr>'; |
| | 142 | + } |
| | 143 | + $form .= '<tr>'; |
| | 144 | + $form .= '<td class="label">' . Xml::label( 'Credit / Debit card', 'card_num' ) . '</td>'; |
| | 145 | + $form .= '<td>' . Xml::input( 'card_num', '30', $card_num, array( 'type' => 'text', 'maxlength' => '100', 'id' => 'card_num', 'class' => 'fullwidth', 'autocomplete' => 'off' ) ) . |
| | 146 | + '</td>'; |
| | 147 | + $form .= '</tr>'; |
| 132 | 148 | |
| 133 | 149 | // expiry |
| 134 | 150 | $form .= '<tr>'; |
| — | — | @@ -204,8 +220,8 @@ |
| 205 | 221 | $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) ); |
| 206 | 222 | $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) ); |
| 207 | 223 | $form .= Xml::tags( 'div', array( 'style' => 'text-align:center;' ), '* * *' ); |
| 208 | | - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) ); |
| 209 | | - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) ); |
| | 224 | + $form .= Xml::tags( 'div', array( 'class' => '' ), 'Your credit / debit card will be securely processed.' ); |
| | 225 | + $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-alt' ) ); |
| 210 | 226 | $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) ); |
| 211 | 227 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text |
| 212 | 228 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info |
| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css |
| — | — | @@ -18,8 +18,11 @@ |
| 19 | 19 | } |
| 20 | 20 | div#payflowpro_gateway-donate-addl-info-text { |
| 21 | 21 | font-size: 90%; |
| 22 | | - line-height: 90%; |
| | 22 | + line-height: 120%; |
| 23 | 23 | } |
| | 24 | +#payflow-table-donor td.label, #payflow-table-comment td.label, #payflow-table-cc td.label { |
| | 25 | + padding-right:0; |
| | 26 | +} |
| 24 | 27 | |
| 25 | 28 | .payflow-cc-form-section { |
| 26 | 29 | float: none; |