| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumn.php |
| — | — | @@ -10,6 +10,11 @@ |
| 11 | 11 | // we only want to load this JS if the form is being rendered |
| 12 | 12 | $this->loadValidateJs(); // validation JS |
| 13 | 13 | |
| | 14 | + $this->loadPlaceholders(); |
| | 15 | + } |
| | 16 | + |
| | 17 | + public function loadPlaceholders() { |
| | 18 | + global $wgOut; |
| 14 | 19 | // form placeholder values |
| 15 | 20 | $first = wfMsg( 'payflowpro_gateway-first' ); |
| 16 | 21 | $last = wfMsg( 'payflowpro_gateway-last' ); |
| — | — | @@ -33,7 +38,7 @@ |
| 34 | 39 | EOT; |
| 35 | 40 | $wgOut->addHeadItem( 'placeholders', $js ); |
| 36 | 41 | } |
| 37 | | - |
| | 42 | + |
| 38 | 43 | /** |
| 39 | 44 | * Required method for constructing the entire form |
| 40 | 45 | * |
| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php |
| — | — | @@ -129,15 +129,15 @@ |
| 130 | 130 | // card number |
| 131 | 131 | $form .= $this->getCardNumberField(); |
| 132 | 132 | |
| 133 | | - // cvv |
| 134 | | - $form .= $this->getCvvField(); |
| 135 | | - |
| 136 | 133 | // expiry |
| 137 | 134 | $form .= '<tr>'; |
| 138 | 135 | $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>'; |
| 139 | 136 | $form .= '<td>' . $this->generateExpiryMonthDropdown() . ' / ' . $this->generateExpiryYearDropdown() . '</td>'; |
| 140 | 137 | $form .= '</tr>'; |
| 141 | 138 | |
| | 139 | + // cvv |
| | 140 | + $form .= $this->getCvvField(); |
| | 141 | + |
| 142 | 142 | // name |
| 143 | 143 | $form .= '<tr>'; |
| 144 | 144 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['fname'] . '</span></td>'; |
| — | — | @@ -152,7 +152,14 @@ |
| 153 | 153 | $form .= "</tr>"; |
| 154 | 154 | |
| 155 | 155 | // email |
| 156 | | - $form .= $this->getEmailField(); |
| | 156 | + $form .= '<tr>'; |
| | 157 | + $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['emailAdd'] . '</span></td>'; |
| | 158 | + $form .= '</tr>'; |
| | 159 | + $form .= '<tr>'; |
| | 160 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-email-receipt' ), 'emailAdd' ) . '</td>'; |
| | 161 | + $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) . |
| | 162 | + '</td>'; |
| | 163 | + $form .= '</tr>'; |
| 157 | 164 | |
| 158 | 165 | // street |
| 159 | 166 | $form .= $this->getStreetField(); |
| — | — | @@ -162,6 +169,7 @@ |
| 163 | 170 | |
| 164 | 171 | // state |
| 165 | 172 | $form .= $this->getStateField(); |
| | 173 | + |
| 166 | 174 | // zip |
| 167 | 175 | $form .= $this->getZipField(); |
| 168 | 176 | |
| Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css |
| — | — | @@ -101,6 +101,11 @@ |
| 102 | 102 | margin-bottom:1em; |
| 103 | 103 | } |
| 104 | 104 | |
| | 105 | +/* Move the form up */ |
| | 106 | +#mw-head-base { |
| | 107 | + height: 1em !important; |
| | 108 | +} |
| | 109 | + |
| 105 | 110 | /* Hiding content border */ |
| 106 | 111 | table { |
| 107 | 112 | background-color: transparent; |
| Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php |
| — | — | @@ -198,6 +198,7 @@ |
| 199 | 199 | 'payflowpro_gateway-please-complete' => 'Please complete your donation below ...', |
| 200 | 200 | 'payflowpro_gateway-description' => 'Description', |
| 201 | 201 | 'payflowpro_gateway-donation' => 'Donation', |
| | 202 | + 'payflowpro_gateway-email-receipt' => 'Email receipt to', |
| 202 | 203 | |
| 203 | 204 | // For more USA states, see payflowpro_gateway.us-states.i18n.php. |
| 204 | 205 | 'payflowpro_gateway-state-dropdown-YY' => 'Select a State', |
| — | — | @@ -291,6 +292,7 @@ |
| 292 | 293 | 'payflowpro_gateway-continue' => '{{Identical|Continue}}', |
| 293 | 294 | 'payflowpro_gateway-cancel' => '{{Identical|Cancel}}', |
| 294 | 295 | 'payflowpro_gateway-month' => 'Expiration month for credit card. $1 is the month number, $2 is the month name.', |
| | 296 | + 'payflowpro_gateway-email-receipt' => "Label for field which contains the email address the donor's receipt will be mailed to.", |
| 295 | 297 | ); |
| 296 | 298 | |
| 297 | 299 | /** Magyar (magázó) (Magyar (magázó)) |