| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php |
| — | — | @@ -183,29 +183,12 @@ |
| 184 | 184 | $form .= '</tr>'; |
| 185 | 185 | $form .= '<tr>'; |
| 186 | 186 | $form .= '<td class="label"> </td>'; |
| 187 | | - $form .= '<td>' . Xml::input( 'city', '30', $this->form_data['city'], array( 'type' => 'text', 'maxlength' => '40', 'id' => 'city', 'class' => 'fullwidth' ) ) . |
| | 187 | + $form .= '<td>' . Xml::input( 'city', '30', $this->form_data['city'], array( 'type' => 'text', 'maxlength' => '40', 'id' => 'city' ) ) . |
| | 188 | + $this->generateStateDropdown() . |
| | 189 | + Xml::input( 'zip', '10', $this->form_data['zip'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'zip' ) ) . |
| 188 | 190 | '</td>'; |
| 189 | 191 | $form .= '</tr>'; |
| 190 | 192 | |
| 191 | | - // state |
| 192 | | - $form .= '<tr>'; |
| 193 | | - $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['state'] . '</span></td>'; |
| 194 | | - $form .= '</tr>'; |
| 195 | | - $form .= '<tr>'; |
| 196 | | - $form .= '<td class="label"> </td>'; |
| 197 | | - $form .= '<td>' . $this->generateStateDropdown() . '</td>'; |
| 198 | | - $form .= '</tr>'; |
| 199 | | - |
| 200 | | - // zip |
| 201 | | - $form .= '<tr>'; |
| 202 | | - $form .= '<td colspan=2><span class="creditcard-error-msg"> </span></td>'; |
| 203 | | - $form .= '</tr>'; |
| 204 | | - $form .= '<tr>'; |
| 205 | | - $form .= '<td class="label"> </td>'; |
| 206 | | - $form .= '<td>' . Xml::input( 'zip', '30', $this->form_data['zip'], array( 'type' => 'text', 'maxlength' => '9', 'id' => 'zip', 'class' => 'fullwidth' ) ) . |
| 207 | | - '</td>'; |
| 208 | | - $form .= '</tr>'; |
| 209 | | - |
| 210 | 193 | // country |
| 211 | 194 | $form .= '<tr>'; |
| 212 | 195 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['country'] . '</span></td>'; |