@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | /** |
202 | 202 | * Overrides parent ot also check by the slug |
203 | 203 | * @see EEM_Base::ensure_is_obj() |
204 | - * @param string|int|EE_Payment_Method $base_class_obj_or_id |
|
204 | + * @param EE_Payment_Method $base_class_obj_or_id |
|
205 | 205 | * @param boolean $ensure_is_in_db |
206 | 206 | * @return EE_Payment_Method |
207 | 207 | * @throws EE_Error |
@@ -363,8 +363,8 @@ discard block |
||
363 | 363 | * Note: if an offline payment method was selected on the related transaction then this will have no payment methods returned. |
364 | 364 | * It will ONLY return a payment method for a PAYMENT recorded against the registration. |
365 | 365 | * |
366 | - * @param EE_Registration|int $registration_or_reg_id Either the EE_Registration object or the id for the registration. |
|
367 | - * @return EE_Payment|null |
|
366 | + * @param EE_Registration $registration_or_reg_id Either the EE_Registration object or the id for the registration. |
|
367 | + * @return EE_Base_Class|null |
|
368 | 368 | */ |
369 | 369 | public function get_last_used_for_registration( $registration_or_reg_id ) { |
370 | 370 | $registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id ); |
@@ -217,8 +217,7 @@ discard block |
||
217 | 217 | //ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID) |
218 | 218 | try { |
219 | 219 | return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db ); |
220 | - } |
|
221 | - catch ( EE_Error $e ) { |
|
220 | + } catch ( EE_Error $e ) { |
|
222 | 221 | //handle it outside the catch |
223 | 222 | } |
224 | 223 | throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) ); |
@@ -283,8 +282,7 @@ discard block |
||
283 | 282 | break; |
284 | 283 | } |
285 | 284 | } |
286 | - } |
|
287 | - catch ( EE_Error $e ) { |
|
285 | + } catch ( EE_Error $e ) { |
|
288 | 286 | $payment_method->set_active( FALSE ); |
289 | 287 | } |
290 | 288 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /** |
5 | 5 | * |
@@ -37,33 +37,33 @@ discard block |
||
37 | 37 | * @access protected |
38 | 38 | * @return EEM_Payment_Method |
39 | 39 | */ |
40 | - protected function __construct( $timezone = NULL ) { |
|
41 | - $this->singlular_item = __( 'Payment Method', 'event_espresso' ); |
|
42 | - $this->plural_item = __( 'Payment Methods', 'event_espresso' ); |
|
43 | - $this->_tables = array( 'Payment_Method' => new EE_Primary_Table( 'esp_payment_method', 'PMD_ID' ) ); |
|
40 | + protected function __construct($timezone = NULL) { |
|
41 | + $this->singlular_item = __('Payment Method', 'event_espresso'); |
|
42 | + $this->plural_item = __('Payment Methods', 'event_espresso'); |
|
43 | + $this->_tables = array('Payment_Method' => new EE_Primary_Table('esp_payment_method', 'PMD_ID')); |
|
44 | 44 | $this->_fields = array( |
45 | 45 | 'Payment_Method' => array( |
46 | - 'PMD_ID' => new EE_Primary_Key_Int_Field( 'PMD_ID', __( "ID", 'event_espresso' ) ), |
|
47 | - 'PMD_type' => new EE_Plain_Text_Field( 'PMD_type', __( "Payment Method Type", 'event_espresso' ), FALSE, 'Admin_Only' ), |
|
48 | - 'PMD_name' => new EE_Plain_Text_Field( 'PMD_name', __( "Name", 'event_espresso' ), FALSE ), |
|
49 | - 'PMD_desc' => new EE_Post_Content_Field( 'PMD_desc', __( "Description", 'event_espresso' ), FALSE, '' ), |
|
50 | - 'PMD_admin_name' => new EE_Plain_Text_Field( 'PMD_admin_name', __( "Admin-Only Name", 'event_espresso' ), TRUE ), |
|
51 | - 'PMD_admin_desc' => new EE_Post_Content_Field( 'PMD_admin_desc', __( "Admin-Only Description", 'event_espresso' ), TRUE ), |
|
52 | - 'PMD_slug' => new EE_Slug_Field( 'PMD_slug', __( "Slug", 'event_espresso' ), FALSE ), |
|
53 | - 'PMD_order' => new EE_Integer_Field( 'PMD_order', __( "Order", 'event_espresso' ), FALSE, 0 ), |
|
54 | - 'PMD_debug_mode' => new EE_Boolean_Field( 'PMD_debug_mode', __( "Debug Mode On?", 'event_espresso' ), FALSE, FALSE ), |
|
55 | - 'PMD_wp_user' => new EE_WP_User_Field( 'PMD_wp_user', __( "Payment Method Creator ID", 'event_espresso' ), FALSE ), |
|
56 | - 'PMD_open_by_default' => new EE_Boolean_Field( 'PMD_open_by_default', __( "Open by Default?", 'event_espresso' ), FALSE, FALSE ), 'PMD_button_url' => new EE_Plain_Text_Field( 'PMD_button_url', __( "Button URL", 'event_espresso' ), TRUE, '' ), |
|
57 | - 'PMD_scope' => new EE_Serialized_Text_Field( 'PMD_scope', __( "Usable From?", 'event_espresso' ), FALSE, array() ), //possible values currently are 'CART','ADMIN','API' |
|
46 | + 'PMD_ID' => new EE_Primary_Key_Int_Field('PMD_ID', __("ID", 'event_espresso')), |
|
47 | + 'PMD_type' => new EE_Plain_Text_Field('PMD_type', __("Payment Method Type", 'event_espresso'), FALSE, 'Admin_Only'), |
|
48 | + 'PMD_name' => new EE_Plain_Text_Field('PMD_name', __("Name", 'event_espresso'), FALSE), |
|
49 | + 'PMD_desc' => new EE_Post_Content_Field('PMD_desc', __("Description", 'event_espresso'), FALSE, ''), |
|
50 | + 'PMD_admin_name' => new EE_Plain_Text_Field('PMD_admin_name', __("Admin-Only Name", 'event_espresso'), TRUE), |
|
51 | + 'PMD_admin_desc' => new EE_Post_Content_Field('PMD_admin_desc', __("Admin-Only Description", 'event_espresso'), TRUE), |
|
52 | + 'PMD_slug' => new EE_Slug_Field('PMD_slug', __("Slug", 'event_espresso'), FALSE), |
|
53 | + 'PMD_order' => new EE_Integer_Field('PMD_order', __("Order", 'event_espresso'), FALSE, 0), |
|
54 | + 'PMD_debug_mode' => new EE_Boolean_Field('PMD_debug_mode', __("Debug Mode On?", 'event_espresso'), FALSE, FALSE), |
|
55 | + 'PMD_wp_user' => new EE_WP_User_Field('PMD_wp_user', __("Payment Method Creator ID", 'event_espresso'), FALSE), |
|
56 | + 'PMD_open_by_default' => new EE_Boolean_Field('PMD_open_by_default', __("Open by Default?", 'event_espresso'), FALSE, FALSE), 'PMD_button_url' => new EE_Plain_Text_Field('PMD_button_url', __("Button URL", 'event_espresso'), TRUE, ''), |
|
57 | + 'PMD_scope' => new EE_Serialized_Text_Field('PMD_scope', __("Usable From?", 'event_espresso'), FALSE, array()), //possible values currently are 'CART','ADMIN','API' |
|
58 | 58 | ) ); |
59 | 59 | $this->_model_relations = array( |
60 | 60 | // 'Event'=>new EE_HABTM_Relation('Event_Payment_Method'), |
61 | 61 | 'Payment' => new EE_Has_Many_Relation(), |
62 | - 'Currency' => new EE_HABTM_Relation( 'Currency_Payment_Method' ), |
|
62 | + 'Currency' => new EE_HABTM_Relation('Currency_Payment_Method'), |
|
63 | 63 | 'Transaction' => new EE_Has_Many_Relation(), |
64 | 64 | 'WP_User' => new EE_Belongs_To_Relation(), |
65 | 65 | ); |
66 | - parent::__construct( $timezone ); |
|
66 | + parent::__construct($timezone); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | * @param string $slug |
74 | 74 | * @return EE_Payment_Method |
75 | 75 | */ |
76 | - public function get_one_by_slug( $slug ) { |
|
77 | - return $this->get_one( array( array( 'PMD_slug' => $slug ) ) ); |
|
76 | + public function get_one_by_slug($slug) { |
|
77 | + return $this->get_one(array(array('PMD_slug' => $slug))); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | return apply_filters( |
89 | 89 | 'FHEE__EEM_Payment_Method__scopes', |
90 | 90 | array( |
91 | - self::scope_cart => __( "Front-end Registration Page", 'event_espresso' ), |
|
92 | - self::scope_admin => __( "Admin Registration Page (no online processing)", 'event_espresso' ) |
|
91 | + self::scope_cart => __("Front-end Registration Page", 'event_espresso'), |
|
92 | + self::scope_admin => __("Admin Registration Page (no online processing)", 'event_espresso') |
|
93 | 93 | ) |
94 | 94 | ); |
95 | 95 | } |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | * @param string $scope like one of EEM_Payment_Method::instance()->scopes() |
102 | 102 | * @return boolean |
103 | 103 | */ |
104 | - public function is_valid_scope( $scope ) { |
|
104 | + public function is_valid_scope($scope) { |
|
105 | 105 | $scopes = $this->scopes(); |
106 | - if ( isset( $scopes[ $scope ] ) ) { |
|
106 | + if (isset($scopes[$scope])) { |
|
107 | 107 | return TRUE; |
108 | 108 | } else { |
109 | 109 | return FALSE; |
@@ -119,11 +119,11 @@ discard block |
||
119 | 119 | * @throws EE_Error |
120 | 120 | * @return EE_Payment_Method[] |
121 | 121 | */ |
122 | - public function get_all_active( $scope = NULL, $query_params = array() ) { |
|
123 | - if( ! isset( $query_params[ 'order_by' ] ) && ! isset( $query_params[ 'order' ] ) ) { |
|
124 | - $query_params = array( 'order_by' => array( 'PMD_order' => 'ASC', 'PMD_ID' => 'ASC' ) ); |
|
122 | + public function get_all_active($scope = NULL, $query_params = array()) { |
|
123 | + if ( ! isset($query_params['order_by']) && ! isset($query_params['order'])) { |
|
124 | + $query_params = array('order_by' => array('PMD_order' => 'ASC', 'PMD_ID' => 'ASC')); |
|
125 | 125 | } |
126 | - return $this->get_all( $this->_get_query_params_for_all_active( $scope, $query_params ) ); |
|
126 | + return $this->get_all($this->_get_query_params_for_all_active($scope, $query_params)); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -132,8 +132,8 @@ discard block |
||
132 | 132 | * @param array $query_params |
133 | 133 | * @return int |
134 | 134 | */ |
135 | - public function count_active( $scope = NULL, $query_params = array() ){ |
|
136 | - return $this->count( $this->_get_query_params_for_all_active( $scope, $query_params ) ); |
|
135 | + public function count_active($scope = NULL, $query_params = array()) { |
|
136 | + return $this->count($this->_get_query_params_for_all_active($scope, $query_params)); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -144,21 +144,21 @@ discard block |
||
144 | 144 | * @return array like param of EEM_Base::get_all() |
145 | 145 | * @throws EE_Error |
146 | 146 | */ |
147 | - protected function _get_query_params_for_all_active( $scope = NULL, $query_params = array() ){ |
|
148 | - if ( $scope ) { |
|
149 | - if ( $this->is_valid_scope( $scope ) ) { |
|
150 | - return array_replace_recursive( array( array( 'PMD_scope' => array( 'LIKE', "%$scope%" ) ) ), $query_params ); |
|
147 | + protected function _get_query_params_for_all_active($scope = NULL, $query_params = array()) { |
|
148 | + if ($scope) { |
|
149 | + if ($this->is_valid_scope($scope)) { |
|
150 | + return array_replace_recursive(array(array('PMD_scope' => array('LIKE', "%$scope%"))), $query_params); |
|
151 | 151 | } else { |
152 | - throw new EE_Error( sprintf( __( "'%s' is not a valid scope for a payment method", "event_espresso" ), $scope ) ); |
|
152 | + throw new EE_Error(sprintf(__("'%s' is not a valid scope for a payment method", "event_espresso"), $scope)); |
|
153 | 153 | } |
154 | 154 | } else { |
155 | 155 | $acceptable_scopes = array(); |
156 | 156 | $count = 0; |
157 | - foreach ( $this->scopes() as $scope_name => $desc ) { |
|
157 | + foreach ($this->scopes() as $scope_name => $desc) { |
|
158 | 158 | $count++; |
159 | - $acceptable_scopes[ 'PMD_scope*' . $count ] = array( 'LIKE', '%' . $scope_name . '%' ); |
|
159 | + $acceptable_scopes['PMD_scope*'.$count] = array('LIKE', '%'.$scope_name.'%'); |
|
160 | 160 | } |
161 | - return array_replace_recursive( array( array( 'OR*active_scope' => $acceptable_scopes ) ), $query_params ); |
|
161 | + return array_replace_recursive(array(array('OR*active_scope' => $acceptable_scopes)), $query_params); |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | * @return array like param of EEM_Base::get_all() |
171 | 171 | * @throws EE_Error |
172 | 172 | */ |
173 | - public function get_query_params_for_all_active( $scope = NULL, $query_params = array() ) { |
|
174 | - return $this->_get_query_params_for_all_active( $scope, $query_params ); |
|
173 | + public function get_query_params_for_all_active($scope = NULL, $query_params = array()) { |
|
174 | + return $this->_get_query_params_for_all_active($scope, $query_params); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | |
@@ -181,8 +181,8 @@ discard block |
||
181 | 181 | * @param array $query_params |
182 | 182 | * @return EE_Payment_Method |
183 | 183 | */ |
184 | - public function get_one_active( $scope = NULL, $query_params = array() ) { |
|
185 | - return $this->get_one( $this->_get_query_params_for_all_active( $scope, $query_params ) ); |
|
184 | + public function get_one_active($scope = NULL, $query_params = array()) { |
|
185 | + return $this->get_one($this->_get_query_params_for_all_active($scope, $query_params)); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | * @param string $type |
193 | 193 | * @return EE_Payment_Method |
194 | 194 | */ |
195 | - public function get_one_of_type( $type ) { |
|
196 | - return $this->get_one( array( array( 'PMD_type' => $type ) ) ); |
|
195 | + public function get_one_of_type($type) { |
|
196 | + return $this->get_one(array(array('PMD_type' => $type))); |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | |
@@ -206,22 +206,22 @@ discard block |
||
206 | 206 | * @return EE_Payment_Method |
207 | 207 | * @throws EE_Error |
208 | 208 | */ |
209 | - public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ) { |
|
209 | + public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) { |
|
210 | 210 | //first: check if it's a slug |
211 | - if( is_string( $base_class_obj_or_id ) ) { |
|
212 | - $obj = $this->get_one_by_slug( $base_class_obj_or_id ); |
|
213 | - if( $obj ) { |
|
211 | + if (is_string($base_class_obj_or_id)) { |
|
212 | + $obj = $this->get_one_by_slug($base_class_obj_or_id); |
|
213 | + if ($obj) { |
|
214 | 214 | return $obj; |
215 | 215 | } |
216 | 216 | } |
217 | 217 | //ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID) |
218 | 218 | try { |
219 | - return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db ); |
|
219 | + return parent::ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db); |
|
220 | 220 | } |
221 | - catch ( EE_Error $e ) { |
|
221 | + catch (EE_Error $e) { |
|
222 | 222 | //handle it outside the catch |
223 | 223 | } |
224 | - throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) ); |
|
224 | + throw new EE_Error(sprintf(__("'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso"), $base_class_obj_or_id)); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | |
@@ -232,12 +232,12 @@ discard block |
||
232 | 232 | * @param mixed $base_obj_or_id_or_slug |
233 | 233 | * @return int |
234 | 234 | */ |
235 | - function ensure_is_ID( $base_obj_or_id_or_slug ) { |
|
236 | - if ( is_string( $base_obj_or_id_or_slug ) ) { |
|
235 | + function ensure_is_ID($base_obj_or_id_or_slug) { |
|
236 | + if (is_string($base_obj_or_id_or_slug)) { |
|
237 | 237 | //assume it's a slug |
238 | - $base_obj_or_id_or_slug = $this->get_one_by_slug( $base_obj_or_id_or_slug ); |
|
238 | + $base_obj_or_id_or_slug = $this->get_one_by_slug($base_obj_or_id_or_slug); |
|
239 | 239 | } |
240 | - return parent::ensure_is_ID( $base_obj_or_id_or_slug ); |
|
240 | + return parent::ensure_is_ID($base_obj_or_id_or_slug); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | |
@@ -246,36 +246,36 @@ discard block |
||
246 | 246 | * Verifies the button urls on all the passed payment methods have a valid button url. If not, resets them to their default. |
247 | 247 | * @param EE_Payment_Method[] $payment_methods. If NULL is provided defaults to all payment methods active in the cart |
248 | 248 | */ |
249 | - function verify_button_urls( $payment_methods = NULL ) { |
|
250 | - $payment_methods = is_array( $payment_methods ) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart); |
|
251 | - foreach ( $payment_methods as $payment_method ) { |
|
249 | + function verify_button_urls($payment_methods = NULL) { |
|
250 | + $payment_methods = is_array($payment_methods) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart); |
|
251 | + foreach ($payment_methods as $payment_method) { |
|
252 | 252 | try { |
253 | 253 | $current_button_url = $payment_method->button_url(); |
254 | - $buttons_urls_to_try = apply_filters( 'FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array( |
|
255 | - 'current_ssl' => str_replace( "http://", "https://", $current_button_url ), |
|
256 | - 'current' => str_replace( "https://", "http://", $current_button_url ), |
|
257 | - 'default_ssl' => str_replace( "http://", "https://", $payment_method->type_obj()->default_button_url() ), |
|
258 | - 'default' => str_replace( "https://", "http://", $payment_method->type_obj()->default_button_url() ), |
|
259 | - ) ); |
|
260 | - foreach( $buttons_urls_to_try as $button_url_to_try ) { |
|
261 | - if( |
|
254 | + $buttons_urls_to_try = apply_filters('FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array( |
|
255 | + 'current_ssl' => str_replace("http://", "https://", $current_button_url), |
|
256 | + 'current' => str_replace("https://", "http://", $current_button_url), |
|
257 | + 'default_ssl' => str_replace("http://", "https://", $payment_method->type_obj()->default_button_url()), |
|
258 | + 'default' => str_replace("https://", "http://", $payment_method->type_obj()->default_button_url()), |
|
259 | + )); |
|
260 | + foreach ($buttons_urls_to_try as $button_url_to_try) { |
|
261 | + if ( |
|
262 | 262 | (//this is the current url and it exists, regardless of SSL issues |
263 | 263 | $button_url_to_try == $current_button_url && |
264 | 264 | EEH_URL::remote_file_exists( |
265 | 265 | $button_url_to_try, |
266 | 266 | array( |
267 | 267 | 'sslverify' => false, |
268 | - 'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
268 | + 'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block |
|
269 | 269 | ) ) |
270 | 270 | ) |
271 | 271 | || |
272 | 272 | (//this is NOT the current url and it exists with a working SSL cert |
273 | 273 | $button_url_to_try != $current_button_url && |
274 | - EEH_URL::remote_file_exists( $button_url_to_try ) |
|
274 | + EEH_URL::remote_file_exists($button_url_to_try) |
|
275 | 275 | ) ) { |
276 | - if( $current_button_url != $button_url_to_try ){ |
|
277 | - $payment_method->save( array( 'PMD_button_url' => $button_url_to_try ) ); |
|
278 | - EE_Error::add_attention( sprintf( __( "Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso" ), $payment_method->name(), $button_url_to_try ) ); |
|
276 | + if ($current_button_url != $button_url_to_try) { |
|
277 | + $payment_method->save(array('PMD_button_url' => $button_url_to_try)); |
|
278 | + EE_Error::add_attention(sprintf(__("Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso"), $payment_method->name(), $button_url_to_try)); |
|
279 | 279 | } |
280 | 280 | //this image exists. So if wasn't set before, now it is; |
281 | 281 | //or if it was already set, we have nothing to do |
@@ -283,8 +283,8 @@ discard block |
||
283 | 283 | } |
284 | 284 | } |
285 | 285 | } |
286 | - catch ( EE_Error $e ) { |
|
287 | - $payment_method->set_active( FALSE ); |
|
286 | + catch (EE_Error $e) { |
|
287 | + $payment_method->set_active(FALSE); |
|
288 | 288 | } |
289 | 289 | } |
290 | 290 | } |
@@ -298,29 +298,29 @@ discard block |
||
298 | 298 | * @param array $rows |
299 | 299 | * @return EE_Payment_Method[] |
300 | 300 | */ |
301 | - protected function _create_objects( $rows = array() ) { |
|
302 | - EE_Registry::instance()->load_lib( 'Payment_Method_Manager' ); |
|
303 | - $payment_methods = parent::_create_objects( $rows ); |
|
301 | + protected function _create_objects($rows = array()) { |
|
302 | + EE_Registry::instance()->load_lib('Payment_Method_Manager'); |
|
303 | + $payment_methods = parent::_create_objects($rows); |
|
304 | 304 | /* @var $payment_methods EE_Payment_Method[] */ |
305 | 305 | $usable_payment_methods = array(); |
306 | - foreach ( $payment_methods as $key => $payment_method ) { |
|
307 | - if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $payment_method->type() ) ) { |
|
308 | - $usable_payment_methods[ $key ] = $payment_method; |
|
306 | + foreach ($payment_methods as $key => $payment_method) { |
|
307 | + if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($payment_method->type())) { |
|
308 | + $usable_payment_methods[$key] = $payment_method; |
|
309 | 309 | //some payment methods enqueue their scripts in EE_PMT_*::__construct |
310 | 310 | //which is kinda a no-no (just because it's being constructed doesn't mean we need to enqueue |
311 | 311 | //its scripts). but for backwards-compat we should continue to do that |
312 | 312 | $payment_method->type_obj(); |
313 | - } elseif( $payment_method->active() ) { |
|
313 | + } elseif ($payment_method->active()) { |
|
314 | 314 | //only deactivate and notify the admin if the payment is active somewhere |
315 | 315 | $payment_method->deactivate(); |
316 | 316 | $payment_method->save(); |
317 | 317 | EE_Error::add_persistent_admin_notice( |
318 | - 'auto-deactivated-' . $payment_method->type(), |
|
318 | + 'auto-deactivated-'.$payment_method->type(), |
|
319 | 319 | sprintf( |
320 | - __( 'The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.', 'event_espresso' ), |
|
320 | + __('The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.', 'event_espresso'), |
|
321 | 321 | $payment_method->admin_name(), |
322 | 322 | '<br />', |
323 | - '<a href="' . admin_url('plugins.php') . '">', |
|
323 | + '<a href="'.admin_url('plugins.php').'">', |
|
324 | 324 | '</a>' |
325 | 325 | ), |
326 | 326 | true |
@@ -340,16 +340,16 @@ discard block |
||
340 | 340 | * @param string $scope @see EEM_Payment_Method::get_all_for_events |
341 | 341 | * @return EE_Payment_Method[] |
342 | 342 | */ |
343 | - public function get_all_for_transaction( $transaction, $scope ) { |
|
343 | + public function get_all_for_transaction($transaction, $scope) { |
|
344 | 344 | //@todo take relations between events and payment methods into account, once that relation exists |
345 | - if ( $transaction instanceof EE_Transaction ) { |
|
345 | + if ($transaction instanceof EE_Transaction) { |
|
346 | 346 | //@todo take the relation between transaction and currencies into account |
347 | 347 | } |
348 | - $currencies_for_events = array( EE_Config::instance()->currency->code ); |
|
348 | + $currencies_for_events = array(EE_Config::instance()->currency->code); |
|
349 | 349 | //give addons a chance to override what payment methods are chosen based on the transaction |
350 | 350 | return apply_filters( |
351 | 351 | 'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods', |
352 | - $this->get_all_active( $scope, array( array( 'Currency.CUR_code' => array( 'IN', $currencies_for_events ) ) ) ), |
|
352 | + $this->get_all_active($scope, array(array('Currency.CUR_code' => array('IN', $currencies_for_events)))), |
|
353 | 353 | $transaction, |
354 | 354 | $scope |
355 | 355 | ); |
@@ -365,16 +365,16 @@ discard block |
||
365 | 365 | * @param EE_Registration|int $registration_or_reg_id Either the EE_Registration object or the id for the registration. |
366 | 366 | * @return EE_Payment|null |
367 | 367 | */ |
368 | - public function get_last_used_for_registration( $registration_or_reg_id ) { |
|
369 | - $registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id ); |
|
368 | + public function get_last_used_for_registration($registration_or_reg_id) { |
|
369 | + $registration_id = EEM_Registration::instance()->ensure_is_ID($registration_or_reg_id); |
|
370 | 370 | |
371 | 371 | $query_params = array( |
372 | 372 | 0 => array( |
373 | 373 | 'Payment.Registration.REG_ID' => $registration_id, |
374 | 374 | ), |
375 | - 'order_by' => array( 'Payment.PAY_ID' => 'DESC' ) |
|
375 | + 'order_by' => array('Payment.PAY_ID' => 'DESC') |
|
376 | 376 | ); |
377 | - return $this->get_one( $query_params ); |
|
377 | + return $this->get_one($query_params); |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <p id="spco-attendee_information-pg" class="spco-steps-pg small-text drk-grey-text"> |
2 | - <?php echo apply_filters( 'FHEE__registration_page_attendee_information__attendee_information_pg', sprintf( __('In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.', 'event_espresso'), '<br />', '<span class="asterisk">*</span>' )); ?> |
|
2 | + <?php echo apply_filters('FHEE__registration_page_attendee_information__attendee_information_pg', sprintf(__('In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.', 'event_espresso'), '<br />', '<span class="asterisk">*</span>')); ?> |
|
3 | 3 | </p> |
4 | 4 | |
5 | 5 | <?php |
@@ -7,34 +7,34 @@ discard block |
||
7 | 7 | $prev_event = ''; |
8 | 8 | $prev_ticket = ''; |
9 | 9 | |
10 | -if ( count( $registrations ) > 0 ) { |
|
11 | - foreach ( $registrations as $registration ) { |
|
12 | - if ( $registration instanceof EE_Registration ) { |
|
10 | +if (count($registrations) > 0) { |
|
11 | + foreach ($registrations as $registration) { |
|
12 | + if ($registration instanceof EE_Registration) { |
|
13 | 13 | $att_nmbr++; |
14 | 14 | ?> |
15 | 15 | |
16 | - <div id="spco-attendee-panel-dv-<?php echo $registration->reg_url_link();?>" class="spco-attendee-panel-dv spco-attendee-ticket-<?php echo $registration->ticket()->ID();?>"> |
|
16 | + <div id="spco-attendee-panel-dv-<?php echo $registration->reg_url_link(); ?>" class="spco-attendee-panel-dv spco-attendee-ticket-<?php echo $registration->ticket()->ID(); ?>"> |
|
17 | 17 | |
18 | - <?php if ( $registration->event()->ID() != $prev_event ) { ?> |
|
18 | + <?php if ($registration->event()->ID() != $prev_event) { ?> |
|
19 | 19 | <h4 id="event_title-<?php echo $registration->event()->ID() ?>" class="big-event-title-hdr"> |
20 | 20 | <?php echo $registration->event()->name(); ?> |
21 | 21 | </h4> |
22 | 22 | <?php } ?> |
23 | - <?php if ( $registration->ticket()->ID() != $prev_ticket ) { ?> |
|
24 | - <?php if ( ! $revisit ) { ?> |
|
23 | + <?php if ($registration->ticket()->ID() != $prev_ticket) { ?> |
|
24 | + <?php if ( ! $revisit) { ?> |
|
25 | 25 | <div class="spco-ticket-info-dv small-text"> |
26 | - <h5><?php _e('Details', 'event_espresso');?></h5> |
|
26 | + <h5><?php _e('Details', 'event_espresso'); ?></h5> |
|
27 | 27 | <table> |
28 | 28 | <thead> |
29 | 29 | <tr> |
30 | - <th scope="col" width=""><?php _e('Name and Description', 'event_espresso');?></th> |
|
31 | - <th scope="col" width="7.5%" class="jst-rght"><?php _e('Qty', 'event_espresso');?></th> |
|
32 | - <th scope="col" width="17.5%" class="jst-rght"><?php _e('Price', 'event_espresso');?></th> |
|
33 | - <th scope="col" width="17.5%" class="jst-rght"><?php _e('Total', 'event_espresso');?></th> |
|
30 | + <th scope="col" width=""><?php _e('Name and Description', 'event_espresso'); ?></th> |
|
31 | + <th scope="col" width="7.5%" class="jst-rght"><?php _e('Qty', 'event_espresso'); ?></th> |
|
32 | + <th scope="col" width="17.5%" class="jst-rght"><?php _e('Price', 'event_espresso'); ?></th> |
|
33 | + <th scope="col" width="17.5%" class="jst-rght"><?php _e('Total', 'event_espresso'); ?></th> |
|
34 | 34 | </tr> |
35 | 35 | </thead> |
36 | 36 | <tbody> |
37 | - <?php echo $ticket_line_item[ $registration->ticket()->ID() ]; ?> |
|
37 | + <?php echo $ticket_line_item[$registration->ticket()->ID()]; ?> |
|
38 | 38 | </tbody> |
39 | 39 | </table> |
40 | 40 | </div> |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | <?php |
45 | 45 | // ATTENDEE QUESTIONS |
46 | - $reg_form = EE_Template_Layout::get_subform_name( $registration->reg_url_link() ); |
|
46 | + $reg_form = EE_Template_Layout::get_subform_name($registration->reg_url_link()); |
|
47 | 47 | echo ${$reg_form}; |
48 | 48 | ?> |
49 | 49 |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /** |
5 | 5 | * Event Espresso |
@@ -43,23 +43,23 @@ discard block |
||
43 | 43 | * @param bool $delete true=>delete, false=>restore |
44 | 44 | * @return bool|int |
45 | 45 | */ |
46 | - public function delete_or_restore( $delete = true ) { |
|
46 | + public function delete_or_restore($delete = true) { |
|
47 | 47 | /** |
48 | 48 | * Called just before trashing (soft delete) or restoring a trashed item. |
49 | 49 | * |
50 | 50 | * @param EE_Base_Class $model_object about to be trashed or restored |
51 | 51 | * @param bool $delete true the item is being trashed, false the item is being restored. |
52 | 52 | */ |
53 | - do_action( 'AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__before', $this, $delete ); |
|
53 | + do_action('AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__before', $this, $delete); |
|
54 | 54 | $model = $this->get_model(); |
55 | - $result = $model->delete_or_restore_by_ID( $delete, $this->ID() ); |
|
55 | + $result = $model->delete_or_restore_by_ID($delete, $this->ID()); |
|
56 | 56 | /** |
57 | 57 | * Called just after trashing (soft delete) or restoring a trashed item. |
58 | 58 | * @param EE_Base_Class $model_object that was just trashed or restored. |
59 | 59 | * @param bool $delete true the item is being trashed, false the item is being restored. |
60 | 60 | * @param bool|int $result |
61 | 61 | */ |
62 | - do_action( 'AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__after', $this, $delete, $result ); |
|
62 | + do_action('AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__after', $this, $delete, $result); |
|
63 | 63 | return $result; |
64 | 64 | } |
65 | 65 | |
@@ -70,6 +70,6 @@ discard block |
||
70 | 70 | * @return bool|int |
71 | 71 | */ |
72 | 72 | public function restore() { |
73 | - return $this->delete_or_restore( false ); |
|
73 | + return $this->delete_or_restore(false); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | \ No newline at end of file |
@@ -128,7 +128,7 @@ |
||
128 | 128 | if( $subsection->form_data_present_in( $req_data ) ) { |
129 | 129 | try{ |
130 | 130 | $subsection->_normalize($req_data); |
131 | - }catch( EE_Validation_Error $e ){ |
|
131 | + } catch( EE_Validation_Error $e ){ |
|
132 | 132 | $subsection->add_validation_error( $e ); |
133 | 133 | } |
134 | 134 | } |
@@ -13,11 +13,11 @@ discard block |
||
13 | 13 | * @since 4.8.30.rc.009 |
14 | 14 | * |
15 | 15 | */ |
16 | -if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
17 | - exit( 'No direct script access allowed' ); |
|
16 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
17 | + exit('No direct script access allowed'); |
|
18 | 18 | } |
19 | 19 | |
20 | -class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper{ |
|
20 | +class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper { |
|
21 | 21 | /** |
22 | 22 | * |
23 | 23 | * @var EE_Registration |
@@ -29,16 +29,16 @@ discard block |
||
29 | 29 | * @param EE_Registration $reg |
30 | 30 | * @param array $options |
31 | 31 | */ |
32 | - public function __construct( EE_Registration $reg, $options = array() ) { |
|
32 | + public function __construct(EE_Registration $reg, $options = array()) { |
|
33 | 33 | $this->_registration = $reg; |
34 | - if( ! isset( $options[ 'layout_strategy' ] ) ) { |
|
35 | - $options[ 'layout_strategy' ] = new EE_Admin_Two_Column_Layout(); |
|
34 | + if ( ! isset($options['layout_strategy'])) { |
|
35 | + $options['layout_strategy'] = new EE_Admin_Two_Column_Layout(); |
|
36 | 36 | } |
37 | - if( ! isset( $options[ 'html_id' ] ) ) { |
|
38 | - $options[ 'html_id' ] = 'reg-admin-attendee-questions-frm'; |
|
37 | + if ( ! isset($options['html_id'])) { |
|
38 | + $options['html_id'] = 'reg-admin-attendee-questions-frm'; |
|
39 | 39 | } |
40 | 40 | $this->build_form_from_registration(); |
41 | - parent::__construct( $options ); |
|
41 | + parent::__construct($options); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | |
53 | 53 | public function build_form_from_registration() { |
54 | 54 | $reg = $this->get_registration(); |
55 | - if( ! $reg instanceof EE_Registration ) { |
|
56 | - throw new EE_Error( __( 'We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso') ); |
|
55 | + if ( ! $reg instanceof EE_Registration) { |
|
56 | + throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso')); |
|
57 | 57 | } |
58 | 58 | //we want to get all their question groups |
59 | 59 | $question_groups = EEM_Question_Group::instance()->get_all( |
@@ -63,16 +63,16 @@ discard block |
||
63 | 63 | 'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? TRUE : FALSE, |
64 | 64 | 'OR' => array( |
65 | 65 | 'Question.QST_system*blank' => '', |
66 | - 'Question.QST_system*null' => array( 'IS_NULL' ) |
|
66 | + 'Question.QST_system*null' => array('IS_NULL') |
|
67 | 67 | ) |
68 | 68 | ), |
69 | - 'order_by' => array( 'QSG_order' => 'ASC' ) |
|
69 | + 'order_by' => array('QSG_order' => 'ASC') |
|
70 | 70 | ) |
71 | 71 | ); |
72 | 72 | //get each question groups questions |
73 | - foreach( $question_groups as $question_group ) { |
|
74 | - if ( $question_group instanceof EE_Question_Group ) { |
|
75 | - $this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group( |
|
73 | + foreach ($question_groups as $question_group) { |
|
74 | + if ($question_group instanceof EE_Question_Group) { |
|
75 | + $this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group( |
|
76 | 76 | $question_group, |
77 | 77 | $reg |
78 | 78 | ); |
@@ -89,16 +89,16 @@ discard block |
||
89 | 89 | * @return \EE_Form_Section_Proper |
90 | 90 | * @throws \EE_Error |
91 | 91 | */ |
92 | - public function build_subform_from_question_group( $question_group, $registration ) { |
|
93 | - if( ! $question_group instanceof EE_Question_Group || |
|
92 | + public function build_subform_from_question_group($question_group, $registration) { |
|
93 | + if ( ! $question_group instanceof EE_Question_Group || |
|
94 | 94 | ! $registration instanceof EE_Registration) { |
95 | - throw new EE_Error( __( 'A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso' ) ); |
|
95 | + throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso')); |
|
96 | 96 | } |
97 | 97 | $parts_of_subsection = array( |
98 | 98 | 'title' => new EE_Form_Section_HTML( |
99 | - EEH_HTML::h5( $question_group->name(), |
|
99 | + EEH_HTML::h5($question_group->name(), |
|
100 | 100 | $question_group->identifier(), |
101 | - 'espresso-question-group-title-h5 section-title' ) |
|
101 | + 'espresso-question-group-title-h5 section-title') |
|
102 | 102 | ) |
103 | 103 | ); |
104 | 104 | $questions = $question_group->questions( |
@@ -106,17 +106,17 @@ discard block |
||
106 | 106 | array( |
107 | 107 | 'OR' => array( |
108 | 108 | 'QST_system*blank' => '', |
109 | - 'QST_system*null' => array( 'IS_NULL' ) |
|
109 | + 'QST_system*null' => array('IS_NULL') |
|
110 | 110 | ) |
111 | 111 | ) |
112 | 112 | ) |
113 | 113 | ); |
114 | - foreach( $questions as $question ) { |
|
115 | - $parts_of_subsection[ $question->ID() ] = $question->generate_form_input( $registration ); |
|
114 | + foreach ($questions as $question) { |
|
115 | + $parts_of_subsection[$question->ID()] = $question->generate_form_input($registration); |
|
116 | 116 | } |
117 | - $parts_of_subsection[ 'edit_link' ] = new EE_Form_Section_HTML( |
|
118 | - '<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '"> |
|
119 | - <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span> |
|
117 | + $parts_of_subsection['edit_link'] = new EE_Form_Section_HTML( |
|
118 | + '<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="'.esc_attr__('click to edit question', 'event_espresso').'"> |
|
119 | + <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span> |
|
120 | 120 | <div class="dashicons dashicons-edit"></div> |
121 | 121 | </a></td></tr>' |
122 | 122 | ); |
@@ -136,12 +136,12 @@ discard block |
||
136 | 136 | protected function _normalize($req_data) { |
137 | 137 | $this->_received_submission = TRUE; |
138 | 138 | $this->_validation_errors = array(); |
139 | - foreach($this->get_validatable_subsections() as $subsection){ |
|
140 | - if( $subsection->form_data_present_in( $req_data ) ) { |
|
141 | - try{ |
|
139 | + foreach ($this->get_validatable_subsections() as $subsection) { |
|
140 | + if ($subsection->form_data_present_in($req_data)) { |
|
141 | + try { |
|
142 | 142 | $subsection->_normalize($req_data); |
143 | - }catch( EE_Validation_Error $e ){ |
|
144 | - $subsection->add_validation_error( $e ); |
|
143 | + } catch (EE_Validation_Error $e) { |
|
144 | + $subsection->add_validation_error($e); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | } |
@@ -156,13 +156,13 @@ discard block |
||
156 | 156 | * calling parent::_validate() first. |
157 | 157 | */ |
158 | 158 | protected function _validate() { |
159 | - foreach($this->get_validatable_subsections() as $subsection_name => $subsection){ |
|
160 | - if( $subsection->form_data_present_in( array_merge( $_GET, $_POST ) ) ) { |
|
161 | - if(method_exists($this,'_validate_'.$subsection_name)){ |
|
162 | - call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection)); |
|
159 | + foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) { |
|
160 | + if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) { |
|
161 | + if (method_exists($this, '_validate_'.$subsection_name)) { |
|
162 | + call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection)); |
|
163 | 163 | } |
164 | 164 | $subsection->_validate(); |
165 | - } elseif( $subsection instanceof EE_Form_Section_Proper ) { |
|
165 | + } elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
166 | 166 | $subsection->_received_submission = true; |
167 | 167 | } |
168 | 168 | } |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <div class="wrap espresso-admin"> |
2 | 2 | |
3 | - <h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?> - <?php echo $admin_page_title; ?></h1> |
|
3 | + <h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?> - <?php echo $admin_page_title; ?></h1> |
|
4 | 4 | |
5 | 5 | <div id="ajax-notices-container"></div> |
6 | 6 | |
7 | 7 | <?php echo $nav_tabs; ?> |
8 | 8 | |
9 | 9 | <?php |
10 | - do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' ); |
|
10 | + do_action('AHEE__admin_wrapper__template__before_admin_page_content'); |
|
11 | 11 | echo $before_admin_page_content; |
12 | 12 | echo $admin_page_content; |
13 | 13 | echo $after_admin_page_content; |
14 | - do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' ); |
|
14 | + do_action('AHEE__admin_wrapper__template__after_admin_page_content'); |
|
15 | 15 | ?> |
16 | 16 | |
17 | 17 | </div> |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <div class="wrap espresso-admin"> |
2 | - <h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?> - <?php echo $admin_page_title; ?></h1> |
|
2 | + <h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?> - <?php echo $admin_page_title; ?></h1> |
|
3 | 3 | |
4 | - <div class="ee-notices"><?php echo isset( $ajax_notices ) ? $ajax_notices : ''; ?></div> |
|
4 | + <div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices : ''; ?></div> |
|
5 | 5 | <?php |
6 | - do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' ); |
|
6 | + do_action('AHEE__admin_wrapper__template__before_admin_page_content'); |
|
7 | 7 | echo $before_admin_page_content; |
8 | 8 | echo $admin_page_content; |
9 | 9 | echo $after_admin_page_content; |
10 | - do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' ); |
|
10 | + do_action('AHEE__admin_wrapper__template__after_admin_page_content'); |
|
11 | 11 | ?> |
12 | 12 | </div> |
13 | 13 | <!-- espresso-admin --> |
14 | 14 | \ No newline at end of file |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | |
2 | 2 | <div class="padding"> |
3 | 3 | |
4 | - <h3 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info');?></h3> |
|
4 | + <h3 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info'); ?></h3> |
|
5 | 5 | <table class="form-table"> |
6 | 6 | <tbody> |
7 | - <?php echo EEH_Form_Fields::generate_form_input( $countries ); ?> |
|
7 | + <?php echo EEH_Form_Fields::generate_form_input($countries); ?> |
|
8 | 8 | </tbody> |
9 | 9 | </table> |
10 | 10 | <br/> |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | <?php _e('The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.', 'event_espresso'); ?> |
13 | 13 | </p> |
14 | 14 | <div id="country-details-settings-dv"> |
15 | - <h3 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info');?></h3> |
|
15 | + <h3 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info'); ?></h3> |
|
16 | 16 | <div id="country-details-dv"><?php echo $country_details_settings; ?></div> |
17 | 17 | </div> |
18 | 18 | |
19 | 19 | <div id="country-states-settings-dv"> |
20 | - <h3 class="ee-admin-settings-hdr"><?php _e( 'States/Provinces', 'event_espresso' );?> <?php echo EEH_Template::get_help_tab_link('country_states_info');?></h3> |
|
20 | + <h3 class="ee-admin-settings-hdr"><?php _e('States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_states_info'); ?></h3> |
|
21 | 21 | <div id="country-states-dv"><?php echo $country_states_settings; ?></div> |
22 | 22 | </div> |
23 | 23 |
@@ -1,19 +1,19 @@ |
||
1 | 1 | |
2 | - <h3 class="txn-navigation-strip"><?php echo $previous_transaction . ' '; echo __( 'Transaction # ', 'event_espresso' ) . $txn_nmbr['value']; echo ' ' . $next_transaction; ?></h3> |
|
3 | - <h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value'];?></h2> |
|
2 | + <h3 class="txn-navigation-strip"><?php echo $previous_transaction.' '; echo __('Transaction # ', 'event_espresso').$txn_nmbr['value']; echo ' '.$next_transaction; ?></h3> |
|
3 | + <h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value']; ?></h2> |
|
4 | 4 | |
5 | 5 | <?php echo $send_payment_reminder_button; ?> |
6 | 6 | <h2 id="txn-status-h2" class="txn-status-h2"> |
7 | - <?php echo __( 'Transaction Status: ', 'event_espresso' );?><span id="txn-status" class="<?php echo $txn_status['class'];?>"><?php echo $txn_status['value'];?></span> |
|
7 | + <?php echo __('Transaction Status: ', 'event_espresso'); ?><span id="txn-status" class="<?php echo $txn_status['class']; ?>"><?php echo $txn_status['value']; ?></span> |
|
8 | 8 | </h2> |
9 | 9 | |
10 | 10 | <?php $attributes = $amount_due ? 'class="txn-amount-due-h2"' : 'class="txn-amount-due-h2 hidden"'; ?> |
11 | 11 | <h2 id="txn-amount-due-h2" <?php echo $attributes; ?>> |
12 | - <?php echo __( 'Total Amount Due: ', 'event_espresso' );?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class;?>"><?php echo $amount_due;?></span> |
|
12 | + <?php echo __('Total Amount Due: ', 'event_espresso'); ?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class; ?>"><?php echo $amount_due; ?></span> |
|
13 | 13 | </h2> |
14 | 14 | |
15 | 15 | <h3 id="txn-selected-method-of-payment-h3" class="txn-selected-method-of-payment-h3"> |
16 | - <?php echo __( 'Last Method of Payment: ', 'event_espresso' );?><?php echo $method_of_payment_name;?> |
|
16 | + <?php echo __('Last Method of Payment: ', 'event_espresso'); ?><?php echo $method_of_payment_name; ?> |
|
17 | 17 | </h3> |
18 | 18 | |
19 | 19 |
@@ -2,40 +2,40 @@ |
||
2 | 2 | <p> |
3 | 3 | <?php _e('This page shows all available payment methods for Event Espresso.', 'event_espresso'); ?> |
4 | 4 | </p> |
5 | -<p><strong><?php _e('Common Settings', 'event_espresso' )?></strong></p> |
|
5 | +<p><strong><?php _e('Common Settings', 'event_espresso')?></strong></p> |
|
6 | 6 | <ul> |
7 | 7 | <li> |
8 | - <strong><?php _e( 'Name', 'event_espresso' );?></strong><br> |
|
9 | - <?php _e( 'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso' );?> |
|
8 | + <strong><?php _e('Name', 'event_espresso'); ?></strong><br> |
|
9 | + <?php _e('The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso'); ?> |
|
10 | 10 | </li> |
11 | 11 | <li> |
12 | - <strong><?php _e( 'Description', 'event_espresso' );?></strong><br/> |
|
13 | - <?php _e( 'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso' );?> |
|
12 | + <strong><?php _e('Description', 'event_espresso'); ?></strong><br/> |
|
13 | + <?php _e('The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso'); ?> |
|
14 | 14 | </li> |
15 | - <li><strong><?php _e( 'Admin-Only Name', 'event_espresso' );?></strong><br/> |
|
16 | - <?php _e( 'The name of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?> |
|
15 | + <li><strong><?php _e('Admin-Only Name', 'event_espresso'); ?></strong><br/> |
|
16 | + <?php _e('The name of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?> |
|
17 | 17 | </li> |
18 | 18 | <li> |
19 | - <strong><?php _e( 'Admin-Only Description', 'event_espresso' );?></strong><br/> |
|
20 | - <?php _e( 'The description of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?> |
|
19 | + <strong><?php _e('Admin-Only Description', 'event_espresso'); ?></strong><br/> |
|
20 | + <?php _e('The description of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?> |
|
21 | 21 | </li> |
22 | 22 | <li> |
23 | - <strong><?php _e( 'Debug (sandbox) Mode', 'event_espresso' );?></strong><br/> |
|
24 | - <?php _e( 'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso' );?> |
|
23 | + <strong><?php _e('Debug (sandbox) Mode', 'event_espresso'); ?></strong><br/> |
|
24 | + <?php _e('Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso'); ?> |
|
25 | 25 | </li> |
26 | 26 | <li> |
27 | - <strong><?php _e( 'Open by Default', 'event_espresso' );?></strong><br/> |
|
28 | - <?php _e( 'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso' );?> |
|
27 | + <strong><?php _e('Open by Default', 'event_espresso'); ?></strong><br/> |
|
28 | + <?php _e('If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso'); ?> |
|
29 | 29 | </li> |
30 | 30 | <li> |
31 | - <strong><?php _e( 'Button URL', 'event_espresso' );?></strong><br/> |
|
32 | - <?php printf( __( 'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso' ), '<img src="' . admin_url('images/media-button-image.gif') . '">' );?> |
|
31 | + <strong><?php _e('Button URL', 'event_espresso'); ?></strong><br/> |
|
32 | + <?php printf(__('The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso'), '<img src="'.admin_url('images/media-button-image.gif').'">'); ?> |
|
33 | 33 | </li> |
34 | - <li><strong><?php _e( 'Usable From', 'event_espresso' );?></strong><br/> |
|
35 | - <?php _e( 'Where this payment method can be used from.', 'event_espresso' );?> |
|
34 | + <li><strong><?php _e('Usable From', 'event_espresso'); ?></strong><br/> |
|
35 | + <?php _e('Where this payment method can be used from.', 'event_espresso'); ?> |
|
36 | 36 | <ul> |
37 | - <li><?php _e( 'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso' );?></li> |
|
38 | - <li><?php _e( 'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso' );?></li> |
|
37 | + <li><?php _e('Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso'); ?></li> |
|
38 | + <li><?php _e('Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso'); ?></li> |
|
39 | 39 | </ul> |
40 | 40 | </li> |
41 | 41 | </ul> |