| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php |
| — | — | @@ -69,7 +69,10 @@ |
| 70 | 70 | // GlobalCollect |
| 71 | 71 | $wgResourceModules[ 'gc.form.rapidhtml.webitects' ] = array( |
| 72 | 72 | 'styles' => '', |
| 73 | | - 'scripts' => 'js/webitects.js', |
| | 73 | + 'scripts' => array( |
| | 74 | + 'js/webitects.js', |
| | 75 | + #'js/webitects.accordian.js', |
| | 76 | + ), |
| 74 | 77 | 'dependencies' => 'di.form.rapidhtml.webitects', |
| 75 | 78 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 76 | 79 | 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| — | — | @@ -113,8 +116,11 @@ |
| 114 | 117 | ); |
| 115 | 118 | $wgResourceModules[ 'gc.form.rapidhtml.webitects.bt' ] = array( |
| 116 | 119 | 'styles' => '', |
| 117 | | - 'scripts' => 'js/webitects.bt.js', |
| 118 | | - 'dependencies' => 'gc.form.rapidhtml.webitects.2nd', |
| | 120 | +// 'scripts' => 'js/webitects.bt.js', |
| | 121 | + 'dependencies' => array( |
| | 122 | + 'gc.form.rapidhtml.webitects.2nd', |
| | 123 | + #'gc.form.core.validate' |
| | 124 | + ), |
| 119 | 125 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 120 | 126 | 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| 121 | 127 | ); |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/css/webitects.css |
| — | — | @@ -86,16 +86,31 @@ |
| 87 | 87 | .loc-fields.nostate .loc-city { float: left; margin: 0 1% 5px 0; width: 48%; } |
| 88 | 88 | .loc-fields.nostate .loc-postal { float: left; margin: 0 1% 5px 0; width: 49%; } |
| 89 | 89 | |
| | 90 | +/* Location where we are not including a state select */ |
| | 91 | +.loc-fields.bigstate .loc-city { margin-right: 1%; width: 42%; } |
| | 92 | +.loc-fields.bigstate .loc-postal { width: 24%; } |
| | 93 | +.loc-fields.bigstate .loc-state { margin-right: 0%; width: 30%; } |
| | 94 | + |
| | 95 | +.loc-postal.ja { width: 300px; } |
| | 96 | + |
| | 97 | +/* Direct debit fields */ |
| | 98 | + |
| | 99 | +.dd-acctnumber { float: left; margin: 5px 2% 5px 0; width: 48%; } |
| | 100 | +.dd-acctname { float: left; margin: 5px 2% 5px 0; width: 48%; } |
| | 101 | +.dd-bankcode { margin-bottom: 5px; width: 100%; } |
| | 102 | + |
| | 103 | + |
| 90 | 104 | /* Name */ |
| 91 | 105 | .name-fields span { float: left; margin: 0 2% 5px 0; width: 48%; } |
| 92 | 106 | .name-fields .name-last { margin: 0; } |
| 93 | 107 | |
| | 108 | +/* Name - reversed */ |
| | 109 | +.name-fields.reversed span { float: left; margin: 0 2% 5px 0; width: 48%; } |
| | 110 | +.name-fields.reserved .name-first{ margin: 0; } |
| | 111 | + |
| 94 | 112 | /* Help text */ |
| 95 | 113 | .field-help { color: #666; font-size: 0.8em; font-weight: normal; } |
| 96 | 114 | |
| 97 | | -/* Hints */ |
| 98 | | -.ezpz-hint { color: #777; font-style: italic; } |
| 99 | | - |
| 100 | 115 | /* Options */ |
| 101 | 116 | .form .options-h, .form .options-v { margin: 0; } |
| 102 | 117 | .options-h, .options-v { list-style: none; margin: 0 0 1em 0; } |
| — | — | @@ -222,3 +237,8 @@ |
| 223 | 238 | list-style: none !important; |
| 224 | 239 | list-style-image: none !important; |
| 225 | 240 | } |
| | 241 | + |
| | 242 | +#bpay{ |
| | 243 | + margin: 25px 0 0 15px; |
| | 244 | + font-size: 12px; |
| | 245 | +} |
| \ No newline at end of file |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/Form.php |
| — | — | @@ -202,6 +202,8 @@ |
| 203 | 203 | |
| 204 | 204 | // generate a dropdown option for each country |
| 205 | 205 | foreach ( $countries as $iso_value => $full_name ) { |
| | 206 | + // Note: If the server has the php5-geoip package, $this->form_data['country'] will |
| | 207 | + // always have a value. |
| 206 | 208 | if ( $this->form_data['country'] ) { |
| 207 | 209 | $selected = ( $iso_value == $this->form_data['country'] ) ? true : false; |
| 208 | 210 | } else { |
| — | — | @@ -503,7 +505,6 @@ |
| 504 | 506 | // payment_method is no longer set to: processed |
| 505 | 507 | 'payment_method' => isset( $this->form_data['payment_method'] ) ? $this->form_data['payment_method'] : '', |
| 506 | 508 | 'payment_submethod' => isset( $this->form_data['payment_submethod'] ) ? $this->form_data['payment_submethod'] : '', |
| 507 | | - 'issuer_id' => isset( $this->form_data['issuer_id'] ) ? $this->form_data['issuer_id'] : '', |
| 508 | 509 | 'token' => $this->form_data['token'], |
| 509 | 510 | 'order_id' => $this->form_data['order_id'], |
| 510 | 511 | 'i_order_id' => $this->form_data['i_order_id'], |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/card-jcb.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/card-jcb.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 511 | 512 | + image/png |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/RapidHtml.php |
| — | — | @@ -160,7 +160,7 @@ |
| 161 | 161 | |
| 162 | 162 | // handle the appeal and appeal header |
| 163 | 163 | // TODO: determine and set variables for the default templates |
| 164 | | - $appeal_title_name = $this->make_safe( $wgRequest->getText( 'appeal-title', 'Appeal-default' ) ); |
| | 164 | + $appeal_title_name = $this->make_safe( $wgRequest->getText( 'appeal-title', 'Appeal-title-default' ) ); |
| 165 | 165 | $appeal_name = $this->make_safe( $wgRequest->getText( 'appeal', 'Appeal-default' ) ); |
| 166 | 166 | |
| 167 | 167 | $form = str_replace( "@appeal-title", $appeal_title_name, $form ); |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 168 | 168 | Merged /trunk/extensions/DonationInterface/gateway_forms:r102185,103070,103105,103281,103500,103515,103636 |