| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php |
| — | — | @@ -120,22 +120,6 @@ |
| 121 | 121 | Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>'; |
| 122 | 122 | $form .= '</tr>'; |
| 123 | 123 | |
| 124 | | - // name |
| 125 | | - $form .= '<tr>'; |
| 126 | | - $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['fname'] . '</span></td>'; |
| 127 | | - $form .= '</tr>'; |
| 128 | | - $form .= '<tr>'; |
| 129 | | - $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['lname'] . '</span></td>'; |
| 130 | | - $form .= '</tr>'; |
| 131 | | - $form .= '<tr>'; |
| 132 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-name-on-card' ), 'fname' ) . '</td>'; |
| 133 | | - $form .= '<td>' . Xml::input( 'fname', '30', $this->form_data['fname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-first' ).'\' )', 'maxlength' => '25', 'class' => 'required', 'id' => 'fname' ) ) . |
| 134 | | - Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-last' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>'; |
| 135 | | - $form .= "</tr>"; |
| 136 | | - |
| 137 | | - // email |
| 138 | | - $form .= $this->getEmailField(); |
| 139 | | - |
| 140 | 124 | // card logos |
| 141 | 125 | $form .= '<tr>'; |
| 142 | 126 | $form .= '<td />'; |
| — | — | @@ -153,7 +137,23 @@ |
| 154 | 138 | $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>'; |
| 155 | 139 | $form .= '<td>' . $this->generateExpiryMonthDropdown() . ' / ' . $this->generateExpiryYearDropdown() . '</td>'; |
| 156 | 140 | $form .= '</tr>'; |
| | 141 | + |
| | 142 | + // name |
| | 143 | + $form .= '<tr>'; |
| | 144 | + $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['fname'] . '</span></td>'; |
| | 145 | + $form .= '</tr>'; |
| | 146 | + $form .= '<tr>'; |
| | 147 | + $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['lname'] . '</span></td>'; |
| | 148 | + $form .= '</tr>'; |
| | 149 | + $form .= '<tr>'; |
| | 150 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-name-on-card' ), 'fname' ) . '</td>'; |
| | 151 | + $form .= '<td>' . Xml::input( 'fname', '30', $this->form_data['fname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-first' ).'\' )', 'maxlength' => '25', 'class' => 'required', 'id' => 'fname' ) ) . |
| | 152 | + Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-last' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>'; |
| | 153 | + $form .= "</tr>"; |
| 157 | 154 | |
| | 155 | + // email |
| | 156 | + $form .= $this->getEmailField(); |
| | 157 | + |
| 158 | 158 | // street |
| 159 | 159 | $form .= $this->getStreetField(); |
| 160 | 160 | |