@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | * |
22 | 22 | * ------------------------------------------------------------------------ |
23 | 23 | */ |
24 | -require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' ); |
|
25 | -require_once( EE_CLASSES . 'EE_Question.class.php'); |
|
24 | +require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php'); |
|
25 | +require_once(EE_CLASSES.'EE_Question.class.php'); |
|
26 | 26 | |
27 | 27 | class EEM_Question extends EEM_Soft_Delete_Base { |
28 | 28 | |
@@ -69,21 +69,21 @@ discard block |
||
69 | 69 | // private instance of the Attendee object |
70 | 70 | protected static $_instance = NULL; |
71 | 71 | |
72 | - protected function __construct( $timezone = NULL ) { |
|
73 | - $this->singular_item = __('Question','event_espresso'); |
|
74 | - $this->plural_item = __('Questions','event_espresso'); |
|
75 | - $this->_allowed_question_types=apply_filters( |
|
72 | + protected function __construct($timezone = NULL) { |
|
73 | + $this->singular_item = __('Question', 'event_espresso'); |
|
74 | + $this->plural_item = __('Questions', 'event_espresso'); |
|
75 | + $this->_allowed_question_types = apply_filters( |
|
76 | 76 | 'FHEE__EEM_Question__construct__allowed_question_types', |
77 | 77 | array( |
78 | - EEM_Question::QST_type_text =>__('Text','event_espresso'), |
|
79 | - EEM_Question::QST_type_textarea =>__('Textarea','event_espresso'), |
|
80 | - EEM_Question::QST_type_checkbox =>__('Checkboxes','event_espresso'), |
|
81 | - EEM_Question::QST_type_radio =>__('Radio Buttons','event_espresso'), |
|
82 | - EEM_Question::QST_type_dropdown =>__('Dropdown','event_espresso'), |
|
83 | - EEM_Question::QST_type_state =>__('State/Province Dropdown','event_espresso'), |
|
84 | - EEM_Question::QST_type_country =>__('Country Dropdown','event_espresso'), |
|
85 | - EEM_Question::QST_type_date =>__('Date Picker','event_espresso'), |
|
86 | - EEM_Question::QST_type_html_textarea => __( 'HTML Textarea', 'event_espresso' ), |
|
78 | + EEM_Question::QST_type_text =>__('Text', 'event_espresso'), |
|
79 | + EEM_Question::QST_type_textarea =>__('Textarea', 'event_espresso'), |
|
80 | + EEM_Question::QST_type_checkbox =>__('Checkboxes', 'event_espresso'), |
|
81 | + EEM_Question::QST_type_radio =>__('Radio Buttons', 'event_espresso'), |
|
82 | + EEM_Question::QST_type_dropdown =>__('Dropdown', 'event_espresso'), |
|
83 | + EEM_Question::QST_type_state =>__('State/Province Dropdown', 'event_espresso'), |
|
84 | + EEM_Question::QST_type_country =>__('Country Dropdown', 'event_espresso'), |
|
85 | + EEM_Question::QST_type_date =>__('Date Picker', 'event_espresso'), |
|
86 | + EEM_Question::QST_type_html_textarea => __('HTML Textarea', 'event_espresso'), |
|
87 | 87 | ) |
88 | 88 | ); |
89 | 89 | $this->_question_type_categories = apply_filters( |
@@ -102,22 +102,22 @@ discard block |
||
102 | 102 | ); |
103 | 103 | |
104 | 104 | $this->_tables = array( |
105 | - 'Question'=>new EE_Primary_Table('esp_question','QST_ID') |
|
105 | + 'Question'=>new EE_Primary_Table('esp_question', 'QST_ID') |
|
106 | 106 | ); |
107 | 107 | $this->_fields = array( |
108 | 108 | 'Question'=>array( |
109 | - 'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID','event_espresso')), |
|
110 | - 'QST_display_text'=>new EE_Full_HTML_Field('QST_display_text', __('Question Text','event_espresso'), true, ''), |
|
111 | - 'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)','event_espresso'), true, ''), |
|
112 | - 'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question','event_espresso'), TRUE, NULL ), |
|
113 | - 'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type','event_espresso'),false, 'TEXT',$this->_allowed_question_types), |
|
114 | - 'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?','event_espresso'), false, false), |
|
115 | - 'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided','event_espresso'), true, ''), |
|
116 | - 'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order','event_espresso'), false, 0), |
|
117 | - 'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?','event_espresso'), false, false), |
|
118 | - 'QST_max' => new EE_Infinite_Integer_Field( 'QST_max', __( 'Max Size', 'event_espresso' ), false, EE_INF ), |
|
119 | - 'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID','event_espresso'), false ), |
|
120 | - 'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted','event_espresso'), false, false) |
|
109 | + 'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso')), |
|
110 | + 'QST_display_text'=>new EE_Full_HTML_Field('QST_display_text', __('Question Text', 'event_espresso'), true, ''), |
|
111 | + 'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)', 'event_espresso'), true, ''), |
|
112 | + 'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question', 'event_espresso'), TRUE, NULL), |
|
113 | + 'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type', 'event_espresso'), false, 'TEXT', $this->_allowed_question_types), |
|
114 | + 'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?', 'event_espresso'), false, false), |
|
115 | + 'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided', 'event_espresso'), true, ''), |
|
116 | + 'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order', 'event_espresso'), false, 0), |
|
117 | + 'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?', 'event_espresso'), false, false), |
|
118 | + 'QST_max' => new EE_Infinite_Integer_Field('QST_max', __('Max Size', 'event_espresso'), false, EE_INF), |
|
119 | + 'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID', 'event_espresso'), false), |
|
120 | + 'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted', 'event_espresso'), false, false) |
|
121 | 121 | ) |
122 | 122 | ); |
123 | 123 | $this->_model_relations = array( |
@@ -129,11 +129,11 @@ discard block |
||
129 | 129 | 'Question_Group_Question'=>new EE_Has_Many_Relation() |
130 | 130 | ); |
131 | 131 | //this model is generally available for reading |
132 | - $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public(); |
|
133 | - $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system'); |
|
134 | - $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system'); |
|
135 | - $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system'); |
|
136 | - parent::__construct( $timezone ); |
|
132 | + $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public(); |
|
133 | + $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QST_system'); |
|
134 | + $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QST_system'); |
|
135 | + $this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QST_system'); |
|
136 | + parent::__construct($timezone); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | * but they can be extended |
142 | 142 | * @return string[] |
143 | 143 | */ |
144 | - public function allowed_question_types(){ |
|
144 | + public function allowed_question_types() { |
|
145 | 145 | return $this->_allowed_question_types; |
146 | 146 | } |
147 | 147 | /** |
@@ -149,16 +149,16 @@ discard block |
||
149 | 149 | * @param string $question_type one of EEM_Question::allowed_question_types( |
150 | 150 | * @return string[] like EEM_Question::allowed_question_types() |
151 | 151 | */ |
152 | - public function question_types_in_same_category( $question_type ) { |
|
153 | - $question_types = array( $question_type ); |
|
154 | - foreach( $this->_question_type_categories as $category => $question_types_in_category ) { |
|
155 | - if( in_array( $question_type, $question_types_in_category ) ) { |
|
152 | + public function question_types_in_same_category($question_type) { |
|
153 | + $question_types = array($question_type); |
|
154 | + foreach ($this->_question_type_categories as $category => $question_types_in_category) { |
|
155 | + if (in_array($question_type, $question_types_in_category)) { |
|
156 | 156 | $question_types = $question_types_in_category; |
157 | 157 | break; |
158 | 158 | } |
159 | 159 | } |
160 | 160 | |
161 | - return array_intersect_key( $this->allowed_question_types(), array_flip( $question_types ) ); |
|
161 | + return array_intersect_key($this->allowed_question_types(), array_flip($question_types)); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
@@ -167,11 +167,11 @@ discard block |
||
167 | 167 | * @param string $category one of the top-level keys of EEM_Question::question_type_categories() |
168 | 168 | * @return boolean |
169 | 169 | */ |
170 | - public function question_type_is_in_category( $question_type, $category ) { |
|
171 | - if( ! isset( $this->_question_type_categories[ $category ] ) ) { |
|
170 | + public function question_type_is_in_category($question_type, $category) { |
|
171 | + if ( ! isset($this->_question_type_categories[$category])) { |
|
172 | 172 | return false; |
173 | 173 | } |
174 | - return in_array( $question_type, $this->_question_type_categories[ $category ] ); |
|
174 | + return in_array($question_type, $this->_question_type_categories[$category]); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
@@ -188,9 +188,9 @@ discard block |
||
188 | 188 | * @param string $system_question_group_id QSG_system |
189 | 189 | * @return array of system question names (QST_system) |
190 | 190 | */ |
191 | - public function allowed_system_questions_in_system_question_group( $system_question_group_id ) { |
|
191 | + public function allowed_system_questions_in_system_question_group($system_question_group_id) { |
|
192 | 192 | $question_system_ids = array(); |
193 | - switch( $system_question_group_id ) { |
|
193 | + switch ($system_question_group_id) { |
|
194 | 194 | case EEM_Question_Group::system_personal: |
195 | 195 | $question_system_ids = array( |
196 | 196 | EEM_Attendee::system_question_fname, |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | ); |
212 | 212 | break; |
213 | 213 | } |
214 | - return apply_filters( 'FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id ); |
|
214 | + return apply_filters('FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
@@ -220,11 +220,11 @@ discard block |
||
220 | 220 | * @param string $system_question_group_id QSG_system |
221 | 221 | * @return array of system question names (QST_system) |
222 | 222 | */ |
223 | - public function required_system_questions_in_system_question_group( $system_question_group_id ) { |
|
223 | + public function required_system_questions_in_system_question_group($system_question_group_id) { |
|
224 | 224 | $question_system_ids = null; |
225 | - switch( $system_question_group_id ) { |
|
225 | + switch ($system_question_group_id) { |
|
226 | 226 | case EEM_Question_Group::system_personal: |
227 | - $question_system_ids = array( |
|
227 | + $question_system_ids = array( |
|
228 | 228 | EEM_Attendee::system_question_fname, |
229 | 229 | EEM_Attendee::system_question_email, |
230 | 230 | ); |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | default: |
233 | 233 | $question_system_ids = array(); |
234 | 234 | } |
235 | - return apply_filters( 'FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id ); |
|
235 | + return apply_filters('FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | |
@@ -243,8 +243,8 @@ discard block |
||
243 | 243 | * @param $QST_system |
244 | 244 | * @return int of QST_ID for the question that corresponds to that QST_system |
245 | 245 | */ |
246 | - public function get_Question_ID_from_system_string( $QST_system ){ |
|
247 | - return $this->get_var( array( array( 'QST_system' => $QST_system ) ) ); |
|
246 | + public function get_Question_ID_from_system_string($QST_system) { |
|
247 | + return $this->get_var(array(array('QST_system' => $QST_system))); |
|
248 | 248 | } |
249 | 249 | |
250 | 250 | |
@@ -256,9 +256,9 @@ discard block |
||
256 | 256 | */ |
257 | 257 | public function get_latest_question_order() { |
258 | 258 | $columns_to_select = array( |
259 | - 'max_order' => array("MAX(QST_order)","%d") |
|
259 | + 'max_order' => array("MAX(QST_order)", "%d") |
|
260 | 260 | ); |
261 | - $max = $this->_get_all_wpdb_results( array(), ARRAY_A, $columns_to_select ); |
|
261 | + $max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select); |
|
262 | 262 | return $max[0]['max_order']; |
263 | 263 | } |
264 | 264 | |
@@ -288,10 +288,10 @@ discard block |
||
288 | 288 | * @param string $system_question_value |
289 | 289 | * @return int|float |
290 | 290 | */ |
291 | - public function absolute_max_for_system_question( $system_question_value ) { |
|
291 | + public function absolute_max_for_system_question($system_question_value) { |
|
292 | 292 | $maxes = $this->system_question_maxes(); |
293 | - if( isset( $maxes[ $system_question_value ] ) ) { |
|
294 | - return $maxes[ $system_question_value ]; |
|
293 | + if (isset($maxes[$system_question_value])) { |
|
294 | + return $maxes[$system_question_value]; |
|
295 | 295 | } else { |
296 | 296 | return EE_INF; |
297 | 297 | } |
@@ -1,26 +1,26 @@ |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | /** |
3 | - * Event Espresso |
|
4 | - * |
|
5 | - * Event Registration and Management Plugin for WordPress |
|
6 | - * |
|
7 | - * @ package Event Espresso |
|
8 | - * @ author Seth Shoultes |
|
9 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
11 | - * @ link http://www.eventespresso.com |
|
12 | - * @ version 4.0 |
|
13 | - * |
|
14 | - * ------------------------------------------------------------------------ |
|
15 | - * |
|
16 | - * Question Model |
|
17 | - * |
|
18 | - * @package Event Espresso |
|
19 | - * @subpackage includes/models/ |
|
20 | - * @author Michael Nelson |
|
21 | - * |
|
22 | - * ------------------------------------------------------------------------ |
|
23 | - */ |
|
3 | + * Event Espresso |
|
4 | + * |
|
5 | + * Event Registration and Management Plugin for WordPress |
|
6 | + * |
|
7 | + * @ package Event Espresso |
|
8 | + * @ author Seth Shoultes |
|
9 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
11 | + * @ link http://www.eventespresso.com |
|
12 | + * @ version 4.0 |
|
13 | + * |
|
14 | + * ------------------------------------------------------------------------ |
|
15 | + * |
|
16 | + * Question Model |
|
17 | + * |
|
18 | + * @package Event Espresso |
|
19 | + * @subpackage includes/models/ |
|
20 | + * @author Michael Nelson |
|
21 | + * |
|
22 | + * ------------------------------------------------------------------------ |
|
23 | + */ |
|
24 | 24 | require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' ); |
25 | 25 | require_once( EE_CLASSES . 'EE_Question.class.php'); |
26 | 26 |
@@ -37,13 +37,13 @@ discard block |
||
37 | 37 | * @param EE_Checkout $checkout |
38 | 38 | * @return \EE_SPCO_Reg_Step_Attendee_Information |
39 | 39 | */ |
40 | - public function __construct( EE_Checkout $checkout ) { |
|
40 | + public function __construct(EE_Checkout $checkout) { |
|
41 | 41 | $this->_slug = 'attendee_information'; |
42 | 42 | $this->_name = __('Attendee Information', 'event_espresso'); |
43 | - $this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_main.template.php'; |
|
43 | + $this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_main.template.php'; |
|
44 | 44 | $this->checkout = $checkout; |
45 | 45 | $this->_reset_success_message(); |
46 | - $this->set_instructions( __('Please answer the following registration questions before proceeding.', 'event_espresso')); |
|
46 | + $this->set_instructions(__('Please answer the following registration questions before proceeding.', 'event_espresso')); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | EE_Registry::$i18n_js_strings['required_field'] = __(' is a required question.', 'event_espresso'); |
53 | 53 | EE_Registry::$i18n_js_strings['required_multi_field'] = __(' is a required question. Please enter a value for at least one of the options.', 'event_espresso'); |
54 | 54 | EE_Registry::$i18n_js_strings['answer_required_questions'] = __('Please answer all required questions correctly before proceeding.', 'event_espresso'); |
55 | - EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf( __('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>' ); |
|
55 | + EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(__('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>'); |
|
56 | 56 | EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = __('An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.', 'event_espresso'); |
57 | 57 | EE_Registry::$i18n_js_strings['enter_valid_email'] = __('You must enter a valid email address.', 'event_espresso'); |
58 | 58 | EE_Registry::$i18n_js_strings['valid_email_and_questions'] = __('You must enter a valid email address and answer all other required questions before you can proceed.', 'event_espresso'); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | EEH_Autoloader::register_line_item_display_autoloaders(); |
86 | 86 | $Line_Item_Display = new EE_Line_Item_Display(); |
87 | 87 | // calculate taxes |
88 | - $Line_Item_Display->display_line_item( $this->checkout->cart->get_grand_total(), array( 'set_tax_rate' => true ) ); |
|
88 | + $Line_Item_Display->display_line_item($this->checkout->cart->get_grand_total(), array('set_tax_rate' => true)); |
|
89 | 89 | EE_Registry::instance()->load_helper('Line_Item'); |
90 | 90 | /** @var $subsections EE_Form_Section_Proper[] */ |
91 | 91 | $subsections = array( |
@@ -97,33 +97,33 @@ discard block |
||
97 | 97 | 'ticket_count' => array() |
98 | 98 | ); |
99 | 99 | // grab the saved registrations from the transaction |
100 | - $registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ); |
|
101 | - if ( $registrations ) { |
|
102 | - foreach ( $registrations as $registration ) { |
|
103 | - if ( $registration instanceof EE_Registration ) { |
|
100 | + $registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params); |
|
101 | + if ($registrations) { |
|
102 | + foreach ($registrations as $registration) { |
|
103 | + if ($registration instanceof EE_Registration) { |
|
104 | 104 | // can this registration be processed during this visit ? |
105 | - if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) { |
|
106 | - $subsections[ $registration->reg_url_link() ] = $this->_registrations_reg_form( $registration ); |
|
107 | - if ( ! $this->checkout->admin_request ) { |
|
108 | - $template_args['registrations'][ $registration->reg_url_link() ] = $registration; |
|
109 | - $template_args['ticket_count'][ $registration->ticket()->ID() ] = isset( $template_args['ticket_count'][ $registration->ticket()->ID() ] ) ? $template_args['ticket_count'][ $registration->ticket()->ID() ] + 1 : 1; |
|
110 | - $ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs( $this->checkout->cart->get_grand_total(), 'Ticket', array( $registration->ticket()->ID() ) ); |
|
111 | - $ticket_line_item = is_array( $ticket_line_item ) ? reset( $ticket_line_item ) : $ticket_line_item; |
|
112 | - $template_args['ticket_line_item'][ $registration->ticket()->ID() ] = $Line_Item_Display->display_line_item( $ticket_line_item ); |
|
105 | + if ($this->checkout->visit_allows_processing_of_this_registration($registration)) { |
|
106 | + $subsections[$registration->reg_url_link()] = $this->_registrations_reg_form($registration); |
|
107 | + if ( ! $this->checkout->admin_request) { |
|
108 | + $template_args['registrations'][$registration->reg_url_link()] = $registration; |
|
109 | + $template_args['ticket_count'][$registration->ticket()->ID()] = isset($template_args['ticket_count'][$registration->ticket()->ID()]) ? $template_args['ticket_count'][$registration->ticket()->ID()] + 1 : 1; |
|
110 | + $ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs($this->checkout->cart->get_grand_total(), 'Ticket', array($registration->ticket()->ID())); |
|
111 | + $ticket_line_item = is_array($ticket_line_item) ? reset($ticket_line_item) : $ticket_line_item; |
|
112 | + $template_args['ticket_line_item'][$registration->ticket()->ID()] = $Line_Item_Display->display_line_item($ticket_line_item); |
|
113 | 113 | } |
114 | - if ( $registration->is_primary_registrant() ) { |
|
114 | + if ($registration->is_primary_registrant()) { |
|
115 | 115 | $primary_registrant = $registration->reg_url_link(); |
116 | 116 | } |
117 | 117 | } |
118 | 118 | } |
119 | 119 | } |
120 | 120 | // print_copy_info ? |
121 | - if ( $primary_registrant && count( $registrations ) > 1 && ! $this->checkout->admin_request ) { |
|
121 | + if ($primary_registrant && count($registrations) > 1 && ! $this->checkout->admin_request) { |
|
122 | 122 | // TODO: add admin option for toggling copy attendee info, then use that value to change $this->_print_copy_info |
123 | 123 | $copy_options['spco_copy_attendee_chk'] = $this->_print_copy_info ? $this->_copy_attendee_info_form() : $this->_auto_copy_attendee_info(); |
124 | 124 | // generate hidden input |
125 | - if ( isset( $subsections[ $primary_registrant ] ) && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper ) { |
|
126 | - $subsections[ $primary_registrant ]->add_subsections( $copy_options, 'primary_registrant', false ); |
|
125 | + if (isset($subsections[$primary_registrant]) && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper) { |
|
126 | + $subsections[$primary_registrant]->add_subsections($copy_options, 'primary_registrant', false); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | |
@@ -135,8 +135,7 @@ discard block |
||
135 | 135 | 'html_id' => $this->reg_form_name(), |
136 | 136 | 'subsections' => $subsections, |
137 | 137 | 'layout_strategy' => $this->checkout->admin_request ? |
138 | - new EE_Div_Per_Section_Layout() : |
|
139 | - new EE_Template_Layout( |
|
138 | + new EE_Div_Per_Section_Layout() : new EE_Template_Layout( |
|
140 | 139 | array( |
141 | 140 | 'layout_template_file' => $this->_template, // layout_template |
142 | 141 | 'template_args' => $template_args |
@@ -153,61 +152,61 @@ discard block |
||
153 | 152 | * @param EE_Registration $registration |
154 | 153 | * @return EE_Form_Section_Proper |
155 | 154 | */ |
156 | - private function _registrations_reg_form( EE_Registration $registration ) { |
|
157 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
155 | + private function _registrations_reg_form(EE_Registration $registration) { |
|
156 | + EE_Registry::instance()->load_helper('Template'); |
|
158 | 157 | static $attendee_nmbr = 1; |
159 | 158 | // array of params to pass to parent constructor |
160 | 159 | $form_args = array( |
161 | - 'html_id' => 'ee-registration-' . $registration->reg_url_link(), |
|
160 | + 'html_id' => 'ee-registration-'.$registration->reg_url_link(), |
|
162 | 161 | 'html_class' => 'ee-reg-form-attendee-dv', |
163 | 162 | 'html_style' => $this->checkout->admin_request ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;' : '', |
164 | 163 | 'subsections' => array(), |
165 | 164 | 'layout_strategy' => new EE_Fieldset_Section_Layout( |
166 | 165 | array( |
167 | 166 | 'legend_class' => 'spco-attendee-lgnd smaller-text lt-grey-text', |
168 | - 'legend_text' => sprintf( __( 'Attendee %d', 'event_espresso' ), $attendee_nmbr ) |
|
167 | + 'legend_text' => sprintf(__('Attendee %d', 'event_espresso'), $attendee_nmbr) |
|
169 | 168 | ) |
170 | 169 | ) |
171 | 170 | ); |
172 | 171 | // verify that registration has valid event |
173 | - if ( $registration->event() instanceof EE_Event ) { |
|
172 | + if ($registration->event() instanceof EE_Event) { |
|
174 | 173 | $query_params = array( |
175 | 174 | array( |
176 | 175 | 'Event.EVT_ID' => $registration->event()->ID(), |
177 | 176 | 'Event_Question_Group.EQG_primary' => $registration->count() == 1 ? TRUE : FALSE |
178 | 177 | ), |
179 | - 'order_by'=>array( 'QSG_order'=>'ASC' ) |
|
178 | + 'order_by'=>array('QSG_order'=>'ASC') |
|
180 | 179 | ); |
181 | - $question_groups = $registration->event()->question_groups( $query_params ); |
|
182 | - if ( $question_groups ) { |
|
183 | - foreach ( $question_groups as $question_group ) { |
|
184 | - if ( $question_group instanceof EE_Question_Group ) { |
|
185 | - $form_args['subsections'][ $question_group->identifier() ] = $this->_question_group_reg_form( $registration, $question_group ); |
|
180 | + $question_groups = $registration->event()->question_groups($query_params); |
|
181 | + if ($question_groups) { |
|
182 | + foreach ($question_groups as $question_group) { |
|
183 | + if ($question_group instanceof EE_Question_Group) { |
|
184 | + $form_args['subsections'][$question_group->identifier()] = $this->_question_group_reg_form($registration, $question_group); |
|
186 | 185 | // add hidden input |
187 | - $form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration ); |
|
186 | + $form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration); |
|
188 | 187 | } |
189 | 188 | } |
190 | 189 | // if we have question groups for additional attendees, then display the copy options |
191 | 190 | $this->_print_copy_info = $attendee_nmbr > 1 ? TRUE : $this->_print_copy_info; |
192 | 191 | } else { |
193 | - $form_args['subsections'][ 'attendee_info_not_required_' . $registration->reg_url_link() ] = new EE_Form_Section_HTML( |
|
192 | + $form_args['subsections']['attendee_info_not_required_'.$registration->reg_url_link()] = new EE_Form_Section_HTML( |
|
194 | 193 | EEH_Template::locate_template( |
195 | - SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_not_required.template.php', |
|
196 | - apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args', array()), |
|
194 | + SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_not_required.template.php', |
|
195 | + apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args', array()), |
|
197 | 196 | TRUE, |
198 | 197 | TRUE |
199 | 198 | ) |
200 | 199 | ); |
201 | 200 | // add hidden input |
202 | - $form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration, FALSE ); |
|
201 | + $form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration, FALSE); |
|
203 | 202 | } |
204 | 203 | } |
205 | - if ( $registration->is_primary_registrant() ) { |
|
204 | + if ($registration->is_primary_registrant()) { |
|
206 | 205 | // generate hidden input |
207 | - $form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs( $registration ); |
|
206 | + $form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs($registration); |
|
208 | 207 | } |
209 | 208 | $attendee_nmbr++; |
210 | - return new EE_Form_Section_Proper( $form_args ); |
|
209 | + return new EE_Form_Section_Proper($form_args); |
|
211 | 210 | } |
212 | 211 | |
213 | 212 | |
@@ -220,11 +219,11 @@ discard block |
||
220 | 219 | * @param bool $additional_attendee_reg_info |
221 | 220 | * @return EE_Form_Input_Base |
222 | 221 | */ |
223 | - private function _additional_attendee_reg_info_input( EE_Registration $registration, $additional_attendee_reg_info = TRUE ){ |
|
222 | + private function _additional_attendee_reg_info_input(EE_Registration $registration, $additional_attendee_reg_info = TRUE) { |
|
224 | 223 | // generate hidden input |
225 | 224 | return new EE_Hidden_Input( |
226 | 225 | array( |
227 | - 'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(), |
|
226 | + 'html_id' => 'additional-attendee-reg-info-'.$registration->reg_url_link(), |
|
228 | 227 | 'default' => $additional_attendee_reg_info |
229 | 228 | ) |
230 | 229 | ); |
@@ -237,22 +236,22 @@ discard block |
||
237 | 236 | * @param EE_Question_Group $question_group |
238 | 237 | * @return EE_Form_Section_Proper |
239 | 238 | */ |
240 | - private function _question_group_reg_form( EE_Registration $registration, EE_Question_Group $question_group ){ |
|
239 | + private function _question_group_reg_form(EE_Registration $registration, EE_Question_Group $question_group) { |
|
241 | 240 | // array of params to pass to parent constructor |
242 | 241 | $form_args = array( |
243 | - 'html_id' => 'ee-reg-form-qstn-grp-' . $question_group->identifier(), |
|
242 | + 'html_id' => 'ee-reg-form-qstn-grp-'.$question_group->identifier(), |
|
244 | 243 | 'html_class' => $this->checkout->admin_request ? 'form-table ee-reg-form-qstn-grp-dv' : 'ee-reg-form-qstn-grp-dv', |
245 | - 'html_label_id' => 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-lbl', |
|
244 | + 'html_label_id' => 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-lbl', |
|
246 | 245 | 'subsections' => array( |
247 | - 'reg_form_qstn_grp_hdr' => $this->_question_group_header( $question_group ) |
|
246 | + 'reg_form_qstn_grp_hdr' => $this->_question_group_header($question_group) |
|
248 | 247 | ), |
249 | 248 | 'layout_strategy' => $this->checkout->admin_request ? new EE_Admin_Two_Column_Layout() : new EE_Div_Per_Section_Layout() |
250 | 249 | ); |
251 | 250 | // where params |
252 | - $query_params = array( 'QST_deleted' => 0 ); |
|
251 | + $query_params = array('QST_deleted' => 0); |
|
253 | 252 | // don't load admin only questions on the frontend |
254 | - if ( ! $this->checkout->admin_request ) { |
|
255 | - $query_params['QST_admin_only'] = array( '!=', TRUE ); |
|
253 | + if ( ! $this->checkout->admin_request) { |
|
254 | + $query_params['QST_admin_only'] = array('!=', TRUE); |
|
256 | 255 | } |
257 | 256 | $questions = $question_group->get_many_related( |
258 | 257 | 'Question', |
@@ -264,21 +263,21 @@ discard block |
||
264 | 263 | ) |
265 | 264 | ); |
266 | 265 | // filter for additional content before questions |
267 | - $form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this )); |
|
266 | + $form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this)); |
|
268 | 267 | // loop thru questions |
269 | - foreach ( $questions as $question ) { |
|
270 | - if( $question instanceof EE_Question ){ |
|
268 | + foreach ($questions as $question) { |
|
269 | + if ($question instanceof EE_Question) { |
|
271 | 270 | $identifier = $question->is_system_question() ? $question->system_ID() : $question->ID(); |
272 | - $form_args['subsections'][ $identifier ] = $this->reg_form_question( $registration, $question ); |
|
271 | + $form_args['subsections'][$identifier] = $this->reg_form_question($registration, $question); |
|
273 | 272 | } |
274 | 273 | } |
275 | - $form_args['subsections'] = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this ); |
|
274 | + $form_args['subsections'] = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this); |
|
276 | 275 | |
277 | 276 | // filter for additional content after questions |
278 | - $form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this )); |
|
277 | + $form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this)); |
|
279 | 278 | // d( $form_args ); |
280 | - $question_group_reg_form = new EE_Form_Section_Proper( $form_args ); |
|
281 | - return apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this ); |
|
279 | + $question_group_reg_form = new EE_Form_Section_Proper($form_args); |
|
280 | + return apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this); |
|
282 | 281 | } |
283 | 282 | |
284 | 283 | |
@@ -288,12 +287,12 @@ discard block |
||
288 | 287 | * @param EE_Question_Group $question_group |
289 | 288 | * @return EE_Form_Section_HTML |
290 | 289 | */ |
291 | - private function _question_group_header( EE_Question_Group $question_group ){ |
|
290 | + private function _question_group_header(EE_Question_Group $question_group) { |
|
292 | 291 | $html = ''; |
293 | 292 | // group_name |
294 | - if ( $question_group->show_group_name() && $question_group->name() != '' ) { |
|
293 | + if ($question_group->show_group_name() && $question_group->name() != '') { |
|
295 | 294 | EE_Registry::instance()->load_helper('HTML'); |
296 | - if ( $this->checkout->admin_request ) { |
|
295 | + if ($this->checkout->admin_request) { |
|
297 | 296 | $html .= EEH_HTML::br(); |
298 | 297 | $html .= EEH_HTML::h3( |
299 | 298 | $question_group->name(), |
@@ -307,7 +306,7 @@ discard block |
||
307 | 306 | } |
308 | 307 | } |
309 | 308 | // group_desc |
310 | - if ( $question_group->show_group_desc() && $question_group->desc() != '' ) { |
|
309 | + if ($question_group->show_group_desc() && $question_group->desc() != '') { |
|
311 | 310 | $html .= EEH_HTML::p( |
312 | 311 | $question_group->desc(), |
313 | 312 | '', |
@@ -315,7 +314,7 @@ discard block |
||
315 | 314 | ); |
316 | 315 | |
317 | 316 | } |
318 | - return new EE_Form_Section_HTML( $html ); |
|
317 | + return new EE_Form_Section_HTML($html); |
|
319 | 318 | } |
320 | 319 | |
321 | 320 | |
@@ -324,14 +323,14 @@ discard block |
||
324 | 323 | * @access public |
325 | 324 | * @return EE_Form_Section_Proper |
326 | 325 | */ |
327 | - private function _copy_attendee_info_form(){ |
|
326 | + private function _copy_attendee_info_form() { |
|
328 | 327 | // array of params to pass to parent constructor |
329 | 328 | return new EE_Form_Section_Proper( |
330 | 329 | array( |
331 | 330 | 'subsections' => $this->_copy_attendee_info_inputs(), |
332 | 331 | 'layout_strategy' => new EE_Template_Layout( |
333 | 332 | array( |
334 | - 'layout_template_file' => SPCO_REG_STEPS_PATH . $this->_slug . DS . 'copy_attendee_info.template.php', // layout_template |
|
333 | + 'layout_template_file' => SPCO_REG_STEPS_PATH.$this->_slug.DS.'copy_attendee_info.template.php', // layout_template |
|
335 | 334 | 'begin_template_file' => NULL, |
336 | 335 | 'input_template_file' => NULL, |
337 | 336 | 'subsection_template_file' => NULL, |
@@ -353,8 +352,8 @@ discard block |
||
353 | 352 | private function _auto_copy_attendee_info() { |
354 | 353 | return new EE_Form_Section_HTML( |
355 | 354 | EEH_Template::locate_template( |
356 | - SPCO_REG_STEPS_PATH . $this->_slug . DS . '_auto_copy_attendee_info.template.php', |
|
357 | - apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()), |
|
355 | + SPCO_REG_STEPS_PATH.$this->_slug.DS.'_auto_copy_attendee_info.template.php', |
|
356 | + apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()), |
|
358 | 357 | TRUE, |
359 | 358 | TRUE |
360 | 359 | ) |
@@ -373,25 +372,25 @@ discard block |
||
373 | 372 | $copy_attendee_info_inputs = array(); |
374 | 373 | $prev_ticket = NULL; |
375 | 374 | // grab the saved registrations from the transaction |
376 | - $registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ); |
|
377 | - foreach ( $registrations as $registration ) { |
|
375 | + $registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params); |
|
376 | + foreach ($registrations as $registration) { |
|
378 | 377 | // for all attendees other than the primary attendee |
379 | - if ( $registration instanceof EE_Registration && ! $registration->is_primary_registrant() ) { |
|
378 | + if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) { |
|
380 | 379 | // if this is a new ticket OR if this is the very first additional attendee after the primary attendee |
381 | - if ( $registration->ticket()->ID() !== $prev_ticket ) { |
|
380 | + if ($registration->ticket()->ID() !== $prev_ticket) { |
|
382 | 381 | $item_name = $registration->ticket()->name(); |
383 | - $item_name .= $registration->ticket()->description() != '' ? ' - ' . $registration->ticket()->description() : ''; |
|
384 | - $copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ] = new EE_Form_Section_HTML( |
|
385 | - '<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>' |
|
382 | + $item_name .= $registration->ticket()->description() != '' ? ' - '.$registration->ticket()->description() : ''; |
|
383 | + $copy_attendee_info_inputs['spco_copy_attendee_chk[ticket-'.$registration->ticket()->ID().']'] = new EE_Form_Section_HTML( |
|
384 | + '<h6 class="spco-copy-attendee-event-hdr">'.$item_name.'</h6>' |
|
386 | 385 | ); |
387 | 386 | $prev_ticket = $registration->ticket()->ID(); |
388 | 387 | } |
389 | 388 | |
390 | - $copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ] = new |
|
389 | + $copy_attendee_info_inputs['spco_copy_attendee_chk['.$registration->ID().']'] = new |
|
391 | 390 | EE_Checkbox_Multi_Input( |
392 | - array( $registration->ID() => sprintf( __('Attendee #%s', 'event_espresso'), $registration->count() )), |
|
391 | + array($registration->ID() => sprintf(__('Attendee #%s', 'event_espresso'), $registration->count())), |
|
393 | 392 | array( |
394 | - 'html_id' => 'spco-copy-attendee-chk-' . $registration->reg_url_link(), |
|
393 | + 'html_id' => 'spco-copy-attendee-chk-'.$registration->reg_url_link(), |
|
395 | 394 | 'html_class' => 'spco-copy-attendee-chk ee-do-not-validate', |
396 | 395 | 'display_html_label_text' => FALSE |
397 | 396 | ) |
@@ -410,7 +409,7 @@ discard block |
||
410 | 409 | * @param EE_Registration $registration |
411 | 410 | * @return EE_Form_Input_Base |
412 | 411 | */ |
413 | - private function _additional_primary_registrant_inputs( EE_Registration $registration ){ |
|
412 | + private function _additional_primary_registrant_inputs(EE_Registration $registration) { |
|
414 | 413 | // generate hidden input |
415 | 414 | return new EE_Hidden_Input( |
416 | 415 | array( |
@@ -428,31 +427,31 @@ discard block |
||
428 | 427 | * @param EE_Question $question |
429 | 428 | * @return EE_Form_Input_Base |
430 | 429 | */ |
431 | - public function reg_form_question( EE_Registration $registration, EE_Question $question ){ |
|
430 | + public function reg_form_question(EE_Registration $registration, EE_Question $question) { |
|
432 | 431 | |
433 | 432 | // if this question was for an attendee detail, then check for that answer |
434 | - $answer_value = EEM_Answer::instance()->get_attendee_property_answer_value( $registration, $question->system_ID() ); |
|
433 | + $answer_value = EEM_Answer::instance()->get_attendee_property_answer_value($registration, $question->system_ID()); |
|
435 | 434 | $answer = $answer_value === null |
436 | - ? EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) ) ) |
|
435 | + ? EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()))) |
|
437 | 436 | : null; |
438 | 437 | // if NOT returning to edit an existing registration OR if this question is for an attendee property OR we still don't have an EE_Answer object |
439 | - if( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer ) { |
|
438 | + if ( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer) { |
|
440 | 439 | // create an EE_Answer object for storing everything in |
441 | - $answer = EE_Answer::new_instance ( array( |
|
440 | + $answer = EE_Answer::new_instance(array( |
|
442 | 441 | 'QST_ID'=> $question->ID(), |
443 | 442 | 'REG_ID'=> $registration->ID() |
444 | 443 | )); |
445 | 444 | } |
446 | 445 | // verify instance |
447 | - if( $answer instanceof EE_Answer ){ |
|
448 | - if ( ! empty( $answer_value )) { |
|
449 | - $answer->set( 'ANS_value', $answer_value ); |
|
446 | + if ($answer instanceof EE_Answer) { |
|
447 | + if ( ! empty($answer_value)) { |
|
448 | + $answer->set('ANS_value', $answer_value); |
|
450 | 449 | } |
451 | - $answer->cache( 'Question', $question ); |
|
452 | - $answer_cache_id =$question->system_ID() != NULL ? $question->system_ID() . '-' . $registration->reg_url_link() : $question->ID() . '-' . $registration->reg_url_link(); |
|
453 | - $registration->cache( 'Answer', $answer, $answer_cache_id ); |
|
450 | + $answer->cache('Question', $question); |
|
451 | + $answer_cache_id = $question->system_ID() != NULL ? $question->system_ID().'-'.$registration->reg_url_link() : $question->ID().'-'.$registration->reg_url_link(); |
|
452 | + $registration->cache('Answer', $answer, $answer_cache_id); |
|
454 | 453 | } |
455 | - return $this->_generate_question_input( $registration, $question, $answer ); |
|
454 | + return $this->_generate_question_input($registration, $question, $answer); |
|
456 | 455 | |
457 | 456 | } |
458 | 457 | |
@@ -464,7 +463,7 @@ discard block |
||
464 | 463 | * @param mixed EE_Answer|NULL $answer |
465 | 464 | * @return EE_Form_Input_Base |
466 | 465 | */ |
467 | - private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){ |
|
466 | + private function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) { |
|
468 | 467 | // d( $registration ); |
469 | 468 | // d( $question ); |
470 | 469 | // d( $answer ); |
@@ -487,29 +486,29 @@ discard block |
||
487 | 486 | $identifier = $question->is_system_question() ? $question->system_ID() : $question->ID(); |
488 | 487 | |
489 | 488 | $input_constructor_args = array( |
490 | - 'html_name' => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']', |
|
491 | - 'html_id' => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier, |
|
492 | - 'html_class' => 'ee-reg-qstn ee-reg-qstn-' . $identifier, |
|
489 | + 'html_name' => 'ee_reg_qstn['.$registration->ID().']['.$identifier.']', |
|
490 | + 'html_id' => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier, |
|
491 | + 'html_class' => 'ee-reg-qstn ee-reg-qstn-'.$identifier, |
|
493 | 492 | 'required' => $question->required() ? TRUE : FALSE, |
494 | - 'html_label_id' => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier, |
|
493 | + 'html_label_id' => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier, |
|
495 | 494 | 'html_label_class' => 'ee-reg-qstn', |
496 | 495 | 'html_label_text' => $question->display_text(), |
497 | 496 | 'required_validation_error_message' => $question->required_text() |
498 | 497 | ); |
499 | 498 | // has this question been answered ? |
500 | - if ( $answer instanceof EE_Answer ) { |
|
501 | - if ( $answer->ID() ) { |
|
502 | - $input_constructor_args['html_name'] .= '[' . $answer->ID() . ']'; |
|
503 | - $input_constructor_args['html_id'] .= '-' . $answer->ID(); |
|
504 | - $input_constructor_args['html_label_id'] .= '-' . $answer->ID(); |
|
499 | + if ($answer instanceof EE_Answer) { |
|
500 | + if ($answer->ID()) { |
|
501 | + $input_constructor_args['html_name'] .= '['.$answer->ID().']'; |
|
502 | + $input_constructor_args['html_id'] .= '-'.$answer->ID(); |
|
503 | + $input_constructor_args['html_label_id'] .= '-'.$answer->ID(); |
|
505 | 504 | } |
506 | 505 | $input_constructor_args['default'] = $answer->value(); |
507 | 506 | } |
508 | 507 | //add "-lbl" to the end of the label id |
509 | - $input_constructor_args['html_label_id'] .= '-lbl'; |
|
510 | - $max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $question->system_ID() ); |
|
511 | - if( EEM_Question::instance()->question_type_is_in_category( $question->type(), 'text' ) ) { |
|
512 | - $input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy( |
|
508 | + $input_constructor_args['html_label_id'] .= '-lbl'; |
|
509 | + $max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($question->system_ID()); |
|
510 | + if (EEM_Question::instance()->question_type_is_in_category($question->type(), 'text')) { |
|
511 | + $input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy( |
|
513 | 512 | null, |
514 | 513 | min( |
515 | 514 | $max_max_for_question, |
@@ -517,83 +516,83 @@ discard block |
||
517 | 516 | ) |
518 | 517 | ); |
519 | 518 | } |
520 | - $input_constructor_args = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__input_constructor_args', |
|
519 | + $input_constructor_args = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__input_constructor_args', |
|
521 | 520 | $input_constructor_args, |
522 | 521 | $registration, |
523 | 522 | $question, |
524 | 523 | $answer |
525 | 524 | ); |
526 | 525 | |
527 | - $this->_required_questions[ $identifier ] = $question->required() ? true : false; |
|
526 | + $this->_required_questions[$identifier] = $question->required() ? true : false; |
|
528 | 527 | |
529 | - switch ( $question->type() ) { |
|
528 | + switch ($question->type()) { |
|
530 | 529 | // Text |
531 | 530 | case EEM_Question::QST_type_text : |
532 | - if( $identifier == 'email' ){ |
|
533 | - return new EE_Email_Input( $input_constructor_args ); |
|
534 | - }else{ |
|
535 | - return new EE_Text_Input( $input_constructor_args ); |
|
531 | + if ($identifier == 'email') { |
|
532 | + return new EE_Email_Input($input_constructor_args); |
|
533 | + } else { |
|
534 | + return new EE_Text_Input($input_constructor_args); |
|
536 | 535 | } |
537 | 536 | break; |
538 | 537 | // Textarea |
539 | 538 | case EEM_Question::QST_type_textarea : |
540 | - return new EE_Text_Area_Input( $input_constructor_args ); |
|
539 | + return new EE_Text_Area_Input($input_constructor_args); |
|
541 | 540 | break; |
542 | 541 | // Radio Buttons |
543 | 542 | case EEM_Question::QST_type_radio : |
544 | - return new EE_Radio_Button_Input( $question->options(), $input_constructor_args ); |
|
543 | + return new EE_Radio_Button_Input($question->options(), $input_constructor_args); |
|
545 | 544 | break; |
546 | 545 | // Dropdown |
547 | 546 | case EEM_Question::QST_type_dropdown : |
548 | - return new EE_Select_Input( $question->options(), $input_constructor_args ); |
|
547 | + return new EE_Select_Input($question->options(), $input_constructor_args); |
|
549 | 548 | break; |
550 | 549 | // State Dropdown |
551 | 550 | case EEM_Question::QST_type_state : |
552 | - $state_options = array( '' => array( '' => '')); |
|
551 | + $state_options = array('' => array('' => '')); |
|
553 | 552 | $states = $this->checkout->action == 'process_reg_step' ? EEM_State::instance()->get_all_states() : EEM_State::instance()->get_all_active_states(); |
554 | - if ( ! empty( $states )) { |
|
555 | - foreach( $states as $state ){ |
|
556 | - if ( $state instanceof EE_State ) { |
|
557 | - $state_options[ $state->country()->name() ][ $state->ID() ] = $state->name(); |
|
553 | + if ( ! empty($states)) { |
|
554 | + foreach ($states as $state) { |
|
555 | + if ($state instanceof EE_State) { |
|
556 | + $state_options[$state->country()->name()][$state->ID()] = $state->name(); |
|
558 | 557 | } |
559 | 558 | } |
560 | 559 | } |
561 | - $state_options = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', $state_options, $this, $registration, $question, $answer ); |
|
562 | - return new EE_State_Select_Input( $state_options, $input_constructor_args ); |
|
560 | + $state_options = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', $state_options, $this, $registration, $question, $answer); |
|
561 | + return new EE_State_Select_Input($state_options, $input_constructor_args); |
|
563 | 562 | break; |
564 | 563 | // Country Dropdown |
565 | 564 | case EEM_Question::QST_type_country : |
566 | - $country_options = array( '' => '' ); |
|
565 | + $country_options = array('' => ''); |
|
567 | 566 | // get possibly cached list of countries |
568 | 567 | $countries = $this->checkout->action == 'process_reg_step' ? EEM_Country::instance()->get_all_countries() : EEM_Country::instance()->get_all_active_countries(); |
569 | - if ( ! empty( $countries )) { |
|
570 | - foreach( $countries as $country ){ |
|
571 | - if ( $country instanceof EE_Country ) { |
|
572 | - $country_options[ $country->ID() ] = $country->name(); |
|
568 | + if ( ! empty($countries)) { |
|
569 | + foreach ($countries as $country) { |
|
570 | + if ($country instanceof EE_Country) { |
|
571 | + $country_options[$country->ID()] = $country->name(); |
|
573 | 572 | } |
574 | 573 | } |
575 | 574 | } |
576 | - $country_options = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', $country_options, $this, $registration, $question, $answer ); |
|
577 | - return new EE_Country_Select_Input( $country_options, $input_constructor_args ); |
|
575 | + $country_options = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', $country_options, $this, $registration, $question, $answer); |
|
576 | + return new EE_Country_Select_Input($country_options, $input_constructor_args); |
|
578 | 577 | break; |
579 | 578 | // Checkboxes |
580 | 579 | case EEM_Question::QST_type_checkbox : |
581 | - return new EE_Checkbox_Multi_Input( $question->options(), $input_constructor_args ); |
|
580 | + return new EE_Checkbox_Multi_Input($question->options(), $input_constructor_args); |
|
582 | 581 | break; |
583 | 582 | // Date |
584 | 583 | case EEM_Question::QST_type_date : |
585 | - return new EE_Datepicker_Input( $input_constructor_args ); |
|
584 | + return new EE_Datepicker_Input($input_constructor_args); |
|
586 | 585 | break; |
587 | 586 | case EEM_Question::QST_type_html_textarea : |
588 | - $input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy(); |
|
589 | - $input = new EE_Text_Area_Input( $input_constructor_args ); |
|
590 | - $input->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' ); |
|
587 | + $input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy(); |
|
588 | + $input = new EE_Text_Area_Input($input_constructor_args); |
|
589 | + $input->remove_validation_strategy('EE_Plaintext_Validation_Strategy'); |
|
591 | 590 | return $input; |
592 | 591 | // fallback |
593 | 592 | default : |
594 | - $default_input = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__default', null, $question->type(), $question, $input_constructor_args ); |
|
595 | - if( ! $default_input ){ |
|
596 | - $default_input = new EE_Text_Input( $input_constructor_args ); |
|
593 | + $default_input = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__default', null, $question->type(), $question, $input_constructor_args); |
|
594 | + if ( ! $default_input) { |
|
595 | + $default_input = new EE_Text_Input($input_constructor_args); |
|
597 | 596 | } |
598 | 597 | return $default_input; |
599 | 598 | } |
@@ -618,65 +617,65 @@ discard block |
||
618 | 617 | */ |
619 | 618 | public function process_reg_step() { |
620 | 619 | |
621 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
620 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
622 | 621 | // grab validated data from form |
623 | 622 | $valid_data = $this->checkout->current_step->valid_data(); |
624 | 623 | //EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ ); |
625 | 624 | //EEH_Debug_Tools::printr( $valid_data, '$valid_data', __FILE__, __LINE__ ); |
626 | 625 | // if we don't have any $valid_data then something went TERRIBLY WRONG !!! |
627 | - if ( empty( $valid_data )) { |
|
628 | - EE_Error::add_error( __('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
626 | + if (empty($valid_data)) { |
|
627 | + EE_Error::add_error(__('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
629 | 628 | return FALSE; |
630 | 629 | } |
631 | 630 | //EEH_Debug_Tools::printr( $this->checkout->transaction, '$this->checkout->transaction', __FILE__, __LINE__ ); |
632 | - if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg ) { |
|
633 | - EE_Error::add_error( __( 'A valid transaction could not be initiated for processing your registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
631 | + if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) { |
|
632 | + EE_Error::add_error(__('A valid transaction could not be initiated for processing your registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
634 | 633 | return FALSE; |
635 | 634 | } |
636 | 635 | // get cached registrations |
637 | - $registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ); |
|
636 | + $registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params); |
|
638 | 637 | // verify we got the goods |
639 | - if ( empty( $registrations )) { |
|
640 | - EE_Error::add_error( __( 'Your form data could not be applied to any valid registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
638 | + if (empty($registrations)) { |
|
639 | + EE_Error::add_error(__('Your form data could not be applied to any valid registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
641 | 640 | return FALSE; |
642 | 641 | } |
643 | 642 | // extract attendee info from form data and save to model objects |
644 | - $registrations_processed = $this->_process_registrations( $registrations, $valid_data ); |
|
643 | + $registrations_processed = $this->_process_registrations($registrations, $valid_data); |
|
645 | 644 | // if first pass thru SPCO, then let's check processed registrations against the total number of tickets in the cart |
646 | - if ( $registrations_processed === FALSE ) { |
|
645 | + if ($registrations_processed === FALSE) { |
|
647 | 646 | // but return immediately if the previous step exited early due to errors |
648 | 647 | return FALSE; |
649 | - } else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count ) { |
|
648 | + } else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) { |
|
650 | 649 | // generate a correctly translated string for all possible singular/plural combinations |
651 | - if ( $this->checkout->total_ticket_count === 1 && $registrations_processed !== 1 ) { |
|
650 | + if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) { |
|
652 | 651 | $error_msg = sprintf( |
653 | - __( 'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ), |
|
652 | + __('There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso'), |
|
654 | 653 | $this->checkout->total_ticket_count, |
655 | 654 | $registrations_processed |
656 | 655 | ); |
657 | - } else if ( $this->checkout->total_ticket_count !== 1 && $registrations_processed === 1 ) { |
|
656 | + } else if ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) { |
|
658 | 657 | $error_msg = sprintf( |
659 | - __( 'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso' ), |
|
658 | + __('There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso'), |
|
660 | 659 | $this->checkout->total_ticket_count, |
661 | 660 | $registrations_processed |
662 | 661 | ); |
663 | 662 | } else { |
664 | 663 | $error_msg = sprintf( |
665 | - __( 'There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ), |
|
664 | + __('There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso'), |
|
666 | 665 | $this->checkout->total_ticket_count, |
667 | 666 | $registrations_processed |
668 | 667 | ); |
669 | 668 | |
670 | 669 | } |
671 | - EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
670 | + EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__); |
|
672 | 671 | return FALSE; |
673 | 672 | } |
674 | 673 | // mark this reg step as completed |
675 | 674 | $this->set_completed(); |
676 | - $this->_set_success_message( __('The Attendee Information Step has been successfully completed.', 'event_espresso' )); |
|
675 | + $this->_set_success_message(__('The Attendee Information Step has been successfully completed.', 'event_espresso')); |
|
677 | 676 | //do action in case a plugin wants to do something with the data submitted in step 1. |
678 | 677 | //passes EE_Single_Page_Checkout, and it's posted data |
679 | - do_action( 'AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data ); |
|
678 | + do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data); |
|
680 | 679 | return TRUE; |
681 | 680 | |
682 | 681 | } |
@@ -690,9 +689,9 @@ discard block |
||
690 | 689 | * @param array $valid_data |
691 | 690 | * @return boolean | int |
692 | 691 | */ |
693 | - private function _process_registrations( $registrations = array(), $valid_data = array() ) { |
|
692 | + private function _process_registrations($registrations = array(), $valid_data = array()) { |
|
694 | 693 | // load resources and set some defaults |
695 | - EE_Registry::instance()->load_model( 'Attendee' ); |
|
694 | + EE_Registry::instance()->load_model('Attendee'); |
|
696 | 695 | // holder for primary registrant attendee object |
697 | 696 | $this->checkout->primary_attendee_obj = NULL; |
698 | 697 | // array for tracking reg form data for the primary registrant |
@@ -709,19 +708,19 @@ discard block |
||
709 | 708 | // attendee counter |
710 | 709 | $att_nmbr = 0; |
711 | 710 | // grab the saved registrations from the transaction |
712 | - foreach ( $registrations as $registration ) { |
|
711 | + foreach ($registrations as $registration) { |
|
713 | 712 | // verify EE_Registration object |
714 | - if ( ! $registration instanceof EE_Registration ) { |
|
715 | - EE_Error::add_error( __( 'An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__); |
|
713 | + if ( ! $registration instanceof EE_Registration) { |
|
714 | + EE_Error::add_error(__('An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
716 | 715 | return FALSE; |
717 | 716 | } |
718 | 717 | $reg_url_link = $registration->reg_url_link(); |
719 | 718 | // reg_url_link exists ? |
720 | - if ( $reg_url_link ) { |
|
719 | + if ($reg_url_link) { |
|
721 | 720 | // should this registration be processed during this visit ? |
722 | - if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) { |
|
721 | + if ($this->checkout->visit_allows_processing_of_this_registration($registration)) { |
|
723 | 722 | // if NOT revisiting, then let's save the registration now, so that we have a REG_ID to use when generating other objects |
724 | - if ( ! $this->checkout->revisit ) { |
|
723 | + if ( ! $this->checkout->revisit) { |
|
725 | 724 | $registration->save(); |
726 | 725 | } |
727 | 726 | |
@@ -732,41 +731,41 @@ discard block |
||
732 | 731 | * @var bool if TRUE is returned by the plugin then the |
733 | 732 | * registration processing is halted. |
734 | 733 | */ |
735 | - if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this ) ) { |
|
734 | + if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this)) { |
|
736 | 735 | return FALSE; |
737 | 736 | } |
738 | 737 | |
739 | 738 | // Houston, we have a registration! |
740 | 739 | $att_nmbr++; |
741 | - $this->_attendee_data[ $reg_url_link ] = array(); |
|
740 | + $this->_attendee_data[$reg_url_link] = array(); |
|
742 | 741 | // unset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ); |
743 | - if ( isset( $valid_data[ $reg_url_link ] )) { |
|
742 | + if (isset($valid_data[$reg_url_link])) { |
|
744 | 743 | // do we need to copy basic info from primary attendee ? |
745 | - $copy_primary = isset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) && absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0 ? TRUE : FALSE; |
|
744 | + $copy_primary = isset($valid_data[$reg_url_link]['additional_attendee_reg_info']) && absint($valid_data[$reg_url_link]['additional_attendee_reg_info']) === 0 ? TRUE : FALSE; |
|
746 | 745 | // filter form input data for this registration |
747 | - $valid_data[ $reg_url_link ] = apply_filters( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[ $reg_url_link ] ); |
|
746 | + $valid_data[$reg_url_link] = apply_filters('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[$reg_url_link]); |
|
748 | 747 | //EEH_Debug_Tools::printr( $valid_data[ $reg_url_link ], '$valid_data[ $reg_url_link ]', __FILE__, __LINE__ ); |
749 | - if ( isset( $valid_data['primary_attendee'] )) { |
|
750 | - $primary_registrant['line_item_id'] = ! empty( $valid_data['primary_attendee'] ) ? $valid_data['primary_attendee'] : FALSE; |
|
751 | - unset( $valid_data['primary_attendee'] ); |
|
748 | + if (isset($valid_data['primary_attendee'])) { |
|
749 | + $primary_registrant['line_item_id'] = ! empty($valid_data['primary_attendee']) ? $valid_data['primary_attendee'] : FALSE; |
|
750 | + unset($valid_data['primary_attendee']); |
|
752 | 751 | } |
753 | 752 | // now loop through our array of valid post data && process attendee reg forms |
754 | - foreach ( $valid_data[ $reg_url_link ] as $form_section => $form_inputs ) { |
|
755 | - if ( ! in_array( $form_section, $non_input_form_sections )) { |
|
756 | - foreach ( $form_inputs as $form_input => $input_value ) { |
|
753 | + foreach ($valid_data[$reg_url_link] as $form_section => $form_inputs) { |
|
754 | + if ( ! in_array($form_section, $non_input_form_sections)) { |
|
755 | + foreach ($form_inputs as $form_input => $input_value) { |
|
757 | 756 | // check for critical inputs |
758 | - if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email( $form_input, $input_value )) { |
|
757 | + if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email($form_input, $input_value)) { |
|
759 | 758 | return FALSE; |
760 | 759 | } |
761 | 760 | // store a bit of data about the primary attendee |
762 | - if ( $att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty( $input_value )) { |
|
763 | - $primary_registrant[ $form_input ] = $input_value; |
|
764 | - } else if ( $copy_primary && isset( $primary_registrant[ $form_input ] ) && $input_value == NULL ) { |
|
765 | - $input_value = $primary_registrant[ $form_input ]; |
|
761 | + if ($att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty($input_value)) { |
|
762 | + $primary_registrant[$form_input] = $input_value; |
|
763 | + } else if ($copy_primary && isset($primary_registrant[$form_input]) && $input_value == NULL) { |
|
764 | + $input_value = $primary_registrant[$form_input]; |
|
766 | 765 | } |
767 | 766 | // now attempt to save the input data |
768 | - if ( ! $this->_save_registration_form_input( $registration, $form_input, $input_value )) { |
|
769 | - EE_Error::add_error( sprintf( __( 'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso' ), $form_input, $input_value ), __FILE__, __FUNCTION__, __LINE__ ); |
|
767 | + if ( ! $this->_save_registration_form_input($registration, $form_input, $input_value)) { |
|
768 | + EE_Error::add_error(sprintf(__('Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso'), $form_input, $input_value), __FILE__, __FUNCTION__, __LINE__); |
|
770 | 769 | return FALSE; |
771 | 770 | } |
772 | 771 | } |
@@ -775,51 +774,51 @@ discard block |
||
775 | 774 | } |
776 | 775 | //EEH_Debug_Tools::printr( $this->_attendee_data, '$this->_attendee_data', __FILE__, __LINE__ ); |
777 | 776 | // this registration does not require additional attendee information ? |
778 | - if ( $copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee ) { |
|
777 | + if ($copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee) { |
|
779 | 778 | // just copy the primary registrant |
780 | 779 | $attendee = $this->checkout->primary_attendee_obj; |
781 | 780 | } else { |
782 | 781 | // have we met before? |
783 | - $attendee = $this->_find_existing_attendee( $registration, $this->_attendee_data[ $reg_url_link ] ); |
|
782 | + $attendee = $this->_find_existing_attendee($registration, $this->_attendee_data[$reg_url_link]); |
|
784 | 783 | // did we find an already existing record for this attendee ? |
785 | - if ( $attendee instanceof EE_Attendee ) { |
|
786 | - $attendee = $this->_update_existing_attendee_data( $attendee, $this->_attendee_data[ $reg_url_link ] ); |
|
784 | + if ($attendee instanceof EE_Attendee) { |
|
785 | + $attendee = $this->_update_existing_attendee_data($attendee, $this->_attendee_data[$reg_url_link]); |
|
787 | 786 | } else { |
788 | 787 | // ensure critical details are set for additional attendees |
789 | - $this->_attendee_data[ $reg_url_link ] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant( $this->_attendee_data[ $reg_url_link ] ) : $this->_attendee_data[ $reg_url_link ]; |
|
790 | - $attendee = $this->_create_new_attendee( $registration, $this->_attendee_data[ $reg_url_link ] ); |
|
788 | + $this->_attendee_data[$reg_url_link] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant($this->_attendee_data[$reg_url_link]) : $this->_attendee_data[$reg_url_link]; |
|
789 | + $attendee = $this->_create_new_attendee($registration, $this->_attendee_data[$reg_url_link]); |
|
791 | 790 | } |
792 | 791 | // who's #1 ? |
793 | - if ( $att_nmbr == 1 ) { |
|
792 | + if ($att_nmbr == 1) { |
|
794 | 793 | $this->checkout->primary_attendee_obj = $attendee; |
795 | 794 | } |
796 | 795 | } |
797 | 796 | //EEH_Debug_Tools::printr( $attendee, '$attendee', __FILE__, __LINE__ ); |
798 | 797 | // add relation to registration, set attendee ID, and cache attendee |
799 | - $this->_associate_attendee_with_registration( $registration, $attendee ); |
|
800 | - if ( ! $registration->attendee() instanceof EE_Attendee ) { |
|
801 | - EE_Error::add_error( sprintf( __( 'Registration %s has an invalid or missing Attendee object.', 'event_espresso' ), $reg_url_link ), __FILE__, __FUNCTION__, __LINE__ ); |
|
798 | + $this->_associate_attendee_with_registration($registration, $attendee); |
|
799 | + if ( ! $registration->attendee() instanceof EE_Attendee) { |
|
800 | + EE_Error::add_error(sprintf(__('Registration %s has an invalid or missing Attendee object.', 'event_espresso'), $reg_url_link), __FILE__, __FUNCTION__, __LINE__); |
|
802 | 801 | return FALSE; |
803 | 802 | } |
804 | 803 | /** @type EE_Registration_Processor $registration_processor */ |
805 | - $registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' ); |
|
804 | + $registration_processor = EE_Registry::instance()->load_class('Registration_Processor'); |
|
806 | 805 | // at this point, we should have enough details about the registrant to consider the registration NOT incomplete |
807 | - $registration_processor->toggle_incomplete_registration_status_to_default( $registration, FALSE ); |
|
806 | + $registration_processor->toggle_incomplete_registration_status_to_default($registration, FALSE); |
|
808 | 807 | /** @type EE_Transaction_Processor $transaction_processor */ |
809 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
808 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
810 | 809 | // we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned |
811 | - $transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction ); |
|
810 | + $transaction_processor->toggle_failed_transaction_status($this->checkout->transaction); |
|
812 | 811 | // if we've gotten this far, then let's save what we have |
813 | 812 | $registration->save(); |
814 | 813 | // add relation between TXN and registration |
815 | - $this->_associate_registration_with_transaction( $registration ); |
|
814 | + $this->_associate_registration_with_transaction($registration); |
|
816 | 815 | |
817 | 816 | } // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) { |
818 | 817 | |
819 | - } else { |
|
820 | - EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
818 | + } else { |
|
819 | + EE_Error::add_error(__('An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
821 | 820 | // remove malformed data |
822 | - unset( $valid_data[ $reg_url_link ] ); |
|
821 | + unset($valid_data[$reg_url_link]); |
|
823 | 822 | return FALSE; |
824 | 823 | } |
825 | 824 | |
@@ -837,22 +836,22 @@ discard block |
||
837 | 836 | * @param string $input_value |
838 | 837 | * @return boolean |
839 | 838 | */ |
840 | - private function _save_registration_form_input( EE_Registration $registration, $form_input = '', $input_value = '' ) { |
|
839 | + private function _save_registration_form_input(EE_Registration $registration, $form_input = '', $input_value = '') { |
|
841 | 840 | //echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '()</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span> <b style="font-size:10px;"> ' . __LINE__ . ' </b></h3>'; |
842 | 841 | //EEH_Debug_Tools::printr( $form_input, '$form_input', __FILE__, __LINE__ ); |
843 | 842 | // allow for plugins to hook in and do their own processing of the form input. |
844 | 843 | // For plugins to bypass normal processing here, they just need to return a boolean value. |
845 | - if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this ) ) { |
|
844 | + if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this)) { |
|
846 | 845 | return TRUE; |
847 | 846 | } |
848 | 847 | |
849 | 848 | // grab related answer objects |
850 | 849 | $answers = $registration->answers(); |
851 | 850 | // $answer_cache_id is the key used to find the EE_Answer we want |
852 | - $answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input . '-' . $registration->reg_url_link(); |
|
853 | - $answer_is_obj = isset( $answers[ $answer_cache_id ] ) && $answers[ $answer_cache_id ] instanceof EE_Answer ? TRUE : FALSE; |
|
851 | + $answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input.'-'.$registration->reg_url_link(); |
|
852 | + $answer_is_obj = isset($answers[$answer_cache_id]) && $answers[$answer_cache_id] instanceof EE_Answer ? TRUE : FALSE; |
|
854 | 853 | //rename form_inputs if they are EE_Attendee properties |
855 | - switch( (string)$form_input ) { |
|
854 | + switch ((string) $form_input) { |
|
856 | 855 | |
857 | 856 | case 'state' : |
858 | 857 | case 'STA_ID' : |
@@ -867,33 +866,33 @@ discard block |
||
867 | 866 | break; |
868 | 867 | |
869 | 868 | default : |
870 | - $ATT_input = 'ATT_' . $form_input; |
|
869 | + $ATT_input = 'ATT_'.$form_input; |
|
871 | 870 | //EEH_Debug_Tools::printr( $ATT_input, '$ATT_input', __FILE__, __LINE__ ); |
872 | - $attendee_property = EEM_Attendee::instance()->has_field( $ATT_input ) ? TRUE : FALSE; |
|
873 | - $form_input = $attendee_property ? 'ATT_' . $form_input : $form_input; |
|
871 | + $attendee_property = EEM_Attendee::instance()->has_field($ATT_input) ? TRUE : FALSE; |
|
872 | + $form_input = $attendee_property ? 'ATT_'.$form_input : $form_input; |
|
874 | 873 | } |
875 | 874 | //EEH_Debug_Tools::printr( $input_value, '$input_value', __FILE__, __LINE__ ); |
876 | 875 | //EEH_Debug_Tools::printr( $answer_cache_id, '$answer_cache_id', __FILE__, __LINE__ ); |
877 | 876 | //EEH_Debug_Tools::printr( $attendee_property, '$attendee_property', __FILE__, __LINE__ ); |
878 | 877 | //EEH_Debug_Tools::printr( $answer_is_obj, '$answer_is_obj', __FILE__, __LINE__ ); |
879 | 878 | // if this form input has a corresponding attendee property |
880 | - if ( $attendee_property ) { |
|
881 | - $this->_attendee_data[ $registration->reg_url_link() ][ $form_input ] = $input_value; |
|
882 | - if ( $answer_is_obj ) { |
|
879 | + if ($attendee_property) { |
|
880 | + $this->_attendee_data[$registration->reg_url_link()][$form_input] = $input_value; |
|
881 | + if ($answer_is_obj) { |
|
883 | 882 | // and delete the corresponding answer since we won't be storing this data in that object |
884 | - $registration->_remove_relation_to( $answers[ $answer_cache_id ], 'Answer' ); |
|
885 | - $answers[ $answer_cache_id ]->delete_permanently(); |
|
883 | + $registration->_remove_relation_to($answers[$answer_cache_id], 'Answer'); |
|
884 | + $answers[$answer_cache_id]->delete_permanently(); |
|
886 | 885 | } |
887 | 886 | return TRUE; |
888 | - } elseif ( $answer_is_obj ) { |
|
887 | + } elseif ($answer_is_obj) { |
|
889 | 888 | // save this data to the answer object |
890 | - $answers[ $answer_cache_id ]->set_value( $input_value ); |
|
891 | - $result = $answers[ $answer_cache_id ]->save(); |
|
889 | + $answers[$answer_cache_id]->set_value($input_value); |
|
890 | + $result = $answers[$answer_cache_id]->save(); |
|
892 | 891 | return $result !== false ? true : false; |
893 | 892 | } else { |
894 | - foreach ( $answers as $answer ) { |
|
895 | - if ( $answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id ) { |
|
896 | - $answer->set_value( $input_value ); |
|
893 | + foreach ($answers as $answer) { |
|
894 | + if ($answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id) { |
|
895 | + $answer->set_value($input_value); |
|
897 | 896 | $result = $answer->save(); |
898 | 897 | return $result !== false ? true : false; |
899 | 898 | } |
@@ -911,33 +910,33 @@ discard block |
||
911 | 910 | * @param string $input_value |
912 | 911 | * @return boolean |
913 | 912 | */ |
914 | - private function _verify_critical_attendee_details_are_set_and_validate_email( $form_input = '', $input_value = '' ) { |
|
915 | - if ( empty( $input_value )) { |
|
913 | + private function _verify_critical_attendee_details_are_set_and_validate_email($form_input = '', $input_value = '') { |
|
914 | + if (empty($input_value)) { |
|
916 | 915 | // if the form input isn't marked as being required, then just return |
917 | - if ( ! isset( $this->_required_questions[ $form_input ] ) || ! $this->_required_questions[ $form_input ] ) { |
|
916 | + if ( ! isset($this->_required_questions[$form_input]) || ! $this->_required_questions[$form_input]) { |
|
918 | 917 | return true; |
919 | 918 | } |
920 | - switch( $form_input ) { |
|
919 | + switch ($form_input) { |
|
921 | 920 | case 'fname' : |
922 | - EE_Error::add_error( __( 'First Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
921 | + EE_Error::add_error(__('First Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
923 | 922 | return FALSE; |
924 | 923 | break; |
925 | 924 | case 'lname' : |
926 | - EE_Error::add_error( __( 'Last Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
925 | + EE_Error::add_error(__('Last Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
927 | 926 | return FALSE; |
928 | 927 | break; |
929 | 928 | case 'email' : |
930 | - EE_Error::add_error( __( 'Email Address is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
929 | + EE_Error::add_error(__('Email Address is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
931 | 930 | return FALSE; |
932 | 931 | break; |
933 | 932 | } |
934 | - } else if ( $form_input === 'email' ) { |
|
933 | + } else if ($form_input === 'email') { |
|
935 | 934 | // clean the email address |
936 | - $valid_email = sanitize_email( $input_value ); |
|
935 | + $valid_email = sanitize_email($input_value); |
|
937 | 936 | // check if it matches |
938 | - if ( $input_value != $valid_email ) { |
|
937 | + if ($input_value != $valid_email) { |
|
939 | 938 | // whoops!!! |
940 | - EE_Error::add_error( __( 'Please enter a valid email address.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
939 | + EE_Error::add_error(__('Please enter a valid email address.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
941 | 940 | return FALSE; |
942 | 941 | } |
943 | 942 | } |
@@ -965,14 +964,14 @@ discard block |
||
965 | 964 | * @param array $attendee_data |
966 | 965 | * @return boolean |
967 | 966 | */ |
968 | - private function _find_existing_attendee( EE_Registration $registration, $attendee_data = array() ) { |
|
967 | + private function _find_existing_attendee(EE_Registration $registration, $attendee_data = array()) { |
|
969 | 968 | // does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address |
970 | - $ATT_fname = isset( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_fname'] ) ? $attendee_data['ATT_fname'] : ''; |
|
971 | - $ATT_lname = isset( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_lname'] ) ? $attendee_data['ATT_lname'] : ''; |
|
972 | - $ATT_email = isset( $attendee_data['ATT_email'] ) && ! empty( $attendee_data['ATT_email'] ) ? $attendee_data['ATT_email'] : ''; |
|
969 | + $ATT_fname = isset($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_fname']) ? $attendee_data['ATT_fname'] : ''; |
|
970 | + $ATT_lname = isset($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_lname']) ? $attendee_data['ATT_lname'] : ''; |
|
971 | + $ATT_email = isset($attendee_data['ATT_email']) && ! empty($attendee_data['ATT_email']) ? $attendee_data['ATT_email'] : ''; |
|
973 | 972 | // but only if those have values |
974 | - if ( $ATT_fname && $ATT_lname && $ATT_email ) { |
|
975 | - $existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array( |
|
973 | + if ($ATT_fname && $ATT_lname && $ATT_email) { |
|
974 | + $existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array( |
|
976 | 975 | 'ATT_fname' => $ATT_fname, |
977 | 976 | 'ATT_lname' => $ATT_lname, |
978 | 977 | 'ATT_email' => $ATT_email |
@@ -980,7 +979,7 @@ discard block |
||
980 | 979 | } else { |
981 | 980 | $existing_attendee = NULL; |
982 | 981 | } |
983 | - return apply_filters( 'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data ); |
|
982 | + return apply_filters('FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data); |
|
984 | 983 | } |
985 | 984 | |
986 | 985 | |
@@ -992,13 +991,13 @@ discard block |
||
992 | 991 | * @param array $attendee_data |
993 | 992 | * @return \EE_Attendee |
994 | 993 | */ |
995 | - private function _update_existing_attendee_data( EE_Attendee $existing_attendee, $attendee_data = array() ) { |
|
994 | + private function _update_existing_attendee_data(EE_Attendee $existing_attendee, $attendee_data = array()) { |
|
996 | 995 | // first remove fname, lname, and email from attendee data |
997 | - $dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' ); |
|
996 | + $dont_set = array('ATT_fname', 'ATT_lname', 'ATT_email'); |
|
998 | 997 | // now loop thru what's left and add to attendee CPT |
999 | - foreach ( $attendee_data as $property_name => $property_value ) { |
|
1000 | - if ( ! in_array( $property_name, $dont_set ) && EEM_Attendee::instance()->has_field( $property_name )) { |
|
1001 | - $existing_attendee->set( $property_name, $property_value ); |
|
998 | + foreach ($attendee_data as $property_name => $property_value) { |
|
999 | + if ( ! in_array($property_name, $dont_set) && EEM_Attendee::instance()->has_field($property_name)) { |
|
1000 | + $existing_attendee->set($property_name, $property_value); |
|
1002 | 1001 | } |
1003 | 1002 | } |
1004 | 1003 | // better save that now |
@@ -1015,11 +1014,11 @@ discard block |
||
1015 | 1014 | * @param EE_Attendee $attendee |
1016 | 1015 | * @return void |
1017 | 1016 | */ |
1018 | - private function _associate_attendee_with_registration( EE_Registration $registration, EE_Attendee $attendee ) { |
|
1017 | + private function _associate_attendee_with_registration(EE_Registration $registration, EE_Attendee $attendee) { |
|
1019 | 1018 | // add relation to attendee |
1020 | - $registration->_add_relation_to( $attendee, 'Attendee' ); |
|
1021 | - $registration->set_attendee_id( $attendee->ID() ); |
|
1022 | - $registration->update_cache_after_object_save( 'Attendee', $attendee ); |
|
1019 | + $registration->_add_relation_to($attendee, 'Attendee'); |
|
1020 | + $registration->set_attendee_id($attendee->ID()); |
|
1021 | + $registration->update_cache_after_object_save('Attendee', $attendee); |
|
1023 | 1022 | } |
1024 | 1023 | |
1025 | 1024 | |
@@ -1030,10 +1029,10 @@ discard block |
||
1030 | 1029 | * @param EE_Registration $registration |
1031 | 1030 | * @return void |
1032 | 1031 | */ |
1033 | - private function _associate_registration_with_transaction( EE_Registration $registration ) { |
|
1032 | + private function _associate_registration_with_transaction(EE_Registration $registration) { |
|
1034 | 1033 | // add relation to attendee |
1035 | - $this->checkout->transaction->_add_relation_to( $registration, 'Registration' ); |
|
1036 | - $this->checkout->transaction->update_cache_after_object_save( 'Registration', $registration ); |
|
1034 | + $this->checkout->transaction->_add_relation_to($registration, 'Registration'); |
|
1035 | + $this->checkout->transaction->update_cache_after_object_save('Registration', $registration); |
|
1037 | 1036 | } |
1038 | 1037 | |
1039 | 1038 | |
@@ -1045,17 +1044,17 @@ discard block |
||
1045 | 1044 | * @param array $attendee_data |
1046 | 1045 | * @return array |
1047 | 1046 | */ |
1048 | - private function _copy_critical_attendee_details_from_primary_registrant( $attendee_data = array() ) { |
|
1047 | + private function _copy_critical_attendee_details_from_primary_registrant($attendee_data = array()) { |
|
1049 | 1048 | // bare minimum critical details include first name, last name, email address |
1050 | - $critical_attendee_details = array( 'ATT_fname', 'ATT_lname', 'ATT_email' ); |
|
1049 | + $critical_attendee_details = array('ATT_fname', 'ATT_lname', 'ATT_email'); |
|
1051 | 1050 | // add address info to critical details? |
1052 | - if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE )) { |
|
1053 | - $address_details = array( 'ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone' ); |
|
1054 | - $critical_attendee_details = array_merge( $critical_attendee_details, $address_details ); |
|
1051 | + if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE)) { |
|
1052 | + $address_details = array('ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone'); |
|
1053 | + $critical_attendee_details = array_merge($critical_attendee_details, $address_details); |
|
1055 | 1054 | } |
1056 | - foreach ( $critical_attendee_details as $critical_attendee_detail ) { |
|
1057 | - if ( ! isset( $attendee_data[ $critical_attendee_detail ] ) || empty( $attendee_data[ $critical_attendee_detail ] )) { |
|
1058 | - $attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get( $critical_attendee_detail ); |
|
1055 | + foreach ($critical_attendee_details as $critical_attendee_detail) { |
|
1056 | + if ( ! isset($attendee_data[$critical_attendee_detail]) || empty($attendee_data[$critical_attendee_detail])) { |
|
1057 | + $attendee_data[$critical_attendee_detail] = $this->checkout->primary_attendee_obj->get($critical_attendee_detail); |
|
1059 | 1058 | } |
1060 | 1059 | } |
1061 | 1060 | return $attendee_data; |
@@ -1070,11 +1069,11 @@ discard block |
||
1070 | 1069 | * @param array $attendee_data |
1071 | 1070 | * @return \EE_Attendee |
1072 | 1071 | */ |
1073 | - private function _create_new_attendee( EE_Registration $registration, $attendee_data = array() ) { |
|
1072 | + private function _create_new_attendee(EE_Registration $registration, $attendee_data = array()) { |
|
1074 | 1073 | // create new attendee object |
1075 | - $new_attendee = EE_Attendee::new_instance( $attendee_data ); |
|
1074 | + $new_attendee = EE_Attendee::new_instance($attendee_data); |
|
1076 | 1075 | // set author to event creator |
1077 | - $new_attendee->set( 'ATT_author', $registration->event()->wp_user() ); |
|
1076 | + $new_attendee->set('ATT_author', $registration->event()->wp_user()); |
|
1078 | 1077 | $new_attendee->save(); |
1079 | 1078 | return $new_attendee; |
1080 | 1079 | } |
@@ -1090,7 +1089,7 @@ discard block |
||
1090 | 1089 | */ |
1091 | 1090 | public function update_reg_step() { |
1092 | 1091 | // save everything |
1093 | - if ( $this->process_reg_step() ) { |
|
1092 | + if ($this->process_reg_step()) { |
|
1094 | 1093 | $this->checkout->redirect = TRUE; |
1095 | 1094 | $this->checkout->redirect_url = add_query_arg( |
1096 | 1095 | array( |
@@ -1099,7 +1098,7 @@ discard block |
||
1099 | 1098 | ), |
1100 | 1099 | $this->checkout->thank_you_page_url |
1101 | 1100 | ); |
1102 | - $this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url ); |
|
1101 | + $this->checkout->json_response->set_redirect_url($this->checkout->redirect_url); |
|
1103 | 1102 | return TRUE; |
1104 | 1103 | } |
1105 | 1104 | return FALSE; |
@@ -26,9 +26,9 @@ |
||
26 | 26 | protected $_model_version_info; |
27 | 27 | |
28 | 28 | /** |
29 | - * Sets the version the user requested |
|
30 | - * @param string $version eg '4.8' |
|
31 | - */ |
|
29 | + * Sets the version the user requested |
|
30 | + * @param string $version eg '4.8' |
|
31 | + */ |
|
32 | 32 | public function set_requested_version( $version ) { |
33 | 33 | parent::set_requested_version( $version ); |
34 | 34 | $this->_model_version_info = new Model_Version_Info( $version ); |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | use EventEspresso\core\libraries\rest_api\controllers\Base as Controller_Base; |
4 | 4 | use EventEspresso\core\libraries\rest_api\Model_Version_Info; |
5 | 5 | |
6 | -if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
7 | - exit( 'No direct script access allowed' ); |
|
6 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
7 | + exit('No direct script access allowed'); |
|
8 | 8 | } |
9 | 9 | |
10 | 10 | /** |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | * Sets the version the user requested |
30 | 30 | * @param string $version eg '4.8' |
31 | 31 | */ |
32 | - public function set_requested_version( $version ) { |
|
33 | - parent::set_requested_version( $version ); |
|
34 | - $this->_model_version_info = new Model_Version_Info( $version ); |
|
32 | + public function set_requested_version($version) { |
|
33 | + parent::set_requested_version($version); |
|
34 | + $this->_model_version_info = new Model_Version_Info($version); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | * @return \EventEspresso\core\libraries\rest_api\Model_Version_Info |
44 | 44 | * @throws \EE_Error |
45 | 45 | */ |
46 | - public function get_model_version_info(){ |
|
47 | - if( ! $this->_model_version_info ) { |
|
46 | + public function get_model_version_info() { |
|
47 | + if ( ! $this->_model_version_info) { |
|
48 | 48 | throw new \EE_Error( |
49 | 49 | sprintf( |
50 | 50 | __( |
@@ -66,9 +66,9 @@ discard block |
||
66 | 66 | * @param array $classnames |
67 | 67 | * @return boolean |
68 | 68 | */ |
69 | - public function is_subclass_of_one( $object, $classnames ) { |
|
70 | - foreach( $classnames as $classname ) { |
|
71 | - if( is_a( $object, $classname ) ) { |
|
69 | + public function is_subclass_of_one($object, $classnames) { |
|
70 | + foreach ($classnames as $classname) { |
|
71 | + if (is_a($object, $classname)) { |
|
72 | 72 | return true; |
73 | 73 | } |
74 | 74 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
43 | 43 | } |
44 | 44 | throw new EE_Validation_Error( $validation_error_message, 'float_only' ); |
45 | - }else{ |
|
45 | + } else{ |
|
46 | 46 | return floatval($normalized_value); |
47 | 47 | } |
48 | 48 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | public function unnormalize($normalized_value) { |
56 | 56 | if( empty( $normalized_value ) ){ |
57 | 57 | return '0.00'; |
58 | - }else{ |
|
58 | + } else{ |
|
59 | 59 | return "$normalized_value"; |
60 | 60 | } |
61 | 61 | } |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\libraries\rest_api; |
3 | 3 | |
4 | -if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | /** |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | protected $_cached_fields_on_models = array(); |
89 | 89 | |
90 | 90 | |
91 | - public function __construct( $requested_version ) { |
|
91 | + public function __construct($requested_version) { |
|
92 | 92 | $this->_requested_version = $requested_version; |
93 | 93 | $this->_model_changes = array( |
94 | 94 | '4.8.28' => array( |
@@ -110,13 +110,13 @@ discard block |
||
110 | 110 | 'table_column' => 'N/A', |
111 | 111 | 'always_available' => true, |
112 | 112 | ); |
113 | - foreach( $this->_resource_changes as $version => $model_classnames ) { |
|
114 | - foreach( $model_classnames as $model_classname => $extra_fields ) { |
|
115 | - foreach( $extra_fields as $fieldname => $field_data ) { |
|
116 | - $this->_resource_changes[ $model_classname ][ $fieldname ][ 'name' ] = $fieldname; |
|
117 | - foreach( $defaults as $attribute => $default_value ) { |
|
118 | - if( ! isset( $this->_resource_changes[ $model_classname ][ $fieldname ][ $attribute ] ) ) { |
|
119 | - $this->_resource_changes[ $model_classname ][ $fieldname ][ $attribute ] = $default_value; |
|
113 | + foreach ($this->_resource_changes as $version => $model_classnames) { |
|
114 | + foreach ($model_classnames as $model_classname => $extra_fields) { |
|
115 | + foreach ($extra_fields as $fieldname => $field_data) { |
|
116 | + $this->_resource_changes[$model_classname][$fieldname]['name'] = $fieldname; |
|
117 | + foreach ($defaults as $attribute => $default_value) { |
|
118 | + if ( ! isset($this->_resource_changes[$model_classname][$fieldname][$attribute])) { |
|
119 | + $this->_resource_changes[$model_classname][$fieldname][$attribute] = $default_value; |
|
120 | 120 | } |
121 | 121 | } |
122 | 122 | } |
@@ -132,11 +132,11 @@ discard block |
||
132 | 132 | * @return array |
133 | 133 | */ |
134 | 134 | public function model_changes_between_requested_version_and_current() { |
135 | - if( $this->_cached_model_changes_between_requested_version_and_current === null ) { |
|
135 | + if ($this->_cached_model_changes_between_requested_version_and_current === null) { |
|
136 | 136 | $model_changes = array(); |
137 | - foreach( $this->model_changes() as $version => $models_changed_in_version ) { |
|
138 | - if( $version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version() ) { |
|
139 | - $model_changes[ $version ] = $models_changed_in_version; |
|
137 | + foreach ($this->model_changes() as $version => $models_changed_in_version) { |
|
138 | + if ($version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version()) { |
|
139 | + $model_changes[$version] = $models_changed_in_version; |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | $this->_cached_model_changes_between_requested_version_and_current = $model_changes; |
@@ -152,11 +152,11 @@ discard block |
||
152 | 152 | * @return array |
153 | 153 | */ |
154 | 154 | public function resource_changes_between_requested_version_and_current() { |
155 | - if( $this->_cached_resource_changes_between_requested_version_and_current === null ) { |
|
155 | + if ($this->_cached_resource_changes_between_requested_version_and_current === null) { |
|
156 | 156 | $resource_changes = array(); |
157 | - foreach( $this->resource_changes() as $version => $model_classnames ) { |
|
158 | - if( $version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version() ) { |
|
159 | - $resource_changes[ $version ] = $model_classnames; |
|
157 | + foreach ($this->resource_changes() as $version => $model_classnames) { |
|
158 | + if ($version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version()) { |
|
159 | + $resource_changes[$version] = $model_classnames; |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | $this->_cached_resource_changes_between_requested_version_and_current = $resource_changes; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * If a request was sent to 'wp-json/ee/v4.7/events' this would be '4.7' |
169 | 169 | * @return string like '4.6' |
170 | 170 | */ |
171 | - public function requested_version(){ |
|
171 | + public function requested_version() { |
|
172 | 172 | return $this->_requested_version; |
173 | 173 | } |
174 | 174 | |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | * If a version is missing then we don't know anything about what changes it introduced from the previous version |
183 | 183 | * @return array |
184 | 184 | */ |
185 | - public function model_changes(){ |
|
185 | + public function model_changes() { |
|
186 | 186 | return $this->_model_changes; |
187 | 187 | } |
188 | 188 | |
@@ -193,12 +193,12 @@ discard block |
||
193 | 193 | * @return array keys are model names, values are their classname |
194 | 194 | */ |
195 | 195 | public function models_for_requested_version() { |
196 | - if( $this->_cached_models_for_requested_version === null ) { |
|
196 | + if ($this->_cached_models_for_requested_version === null) { |
|
197 | 197 | $all_models_in_current_version = \EE_Registry::instance()->non_abstract_db_models; |
198 | - foreach( $this->model_changes_between_requested_version_and_current() as $version => $models_changed ) { |
|
199 | - foreach( $models_changed as $model_name => $new_indicator_or_fields_added ) { |
|
200 | - if( $new_indicator_or_fields_added === Model_Version_Info::model_added ) { |
|
201 | - unset( $all_models_in_current_version[ $model_name ] ); |
|
198 | + foreach ($this->model_changes_between_requested_version_and_current() as $version => $models_changed) { |
|
199 | + foreach ($models_changed as $model_name => $new_indicator_or_fields_added) { |
|
200 | + if ($new_indicator_or_fields_added === Model_Version_Info::model_added) { |
|
201 | + unset($all_models_in_current_version[$model_name]); |
|
202 | 202 | } |
203 | 203 | } |
204 | 204 | } |
@@ -217,11 +217,11 @@ discard block |
||
217 | 217 | * @param string $model_name eg 'Event' |
218 | 218 | * @return boolean |
219 | 219 | */ |
220 | - public function is_model_name_in_this_version( $model_name ) { |
|
220 | + public function is_model_name_in_this_version($model_name) { |
|
221 | 221 | $model_names = $this->models_for_requested_version(); |
222 | - if( isset( $model_names[ $model_name ] ) ) { |
|
222 | + if (isset($model_names[$model_name])) { |
|
223 | 223 | return true; |
224 | - }else{ |
|
224 | + } else { |
|
225 | 225 | return false; |
226 | 226 | } |
227 | 227 | } |
@@ -236,10 +236,10 @@ discard block |
||
236 | 236 | * @return \EEM_Base |
237 | 237 | * @throws \EE_Error |
238 | 238 | */ |
239 | - public function load_model( $model_name ) { |
|
240 | - if( $this->is_model_name_in_this_version( $model_name ) ) { |
|
241 | - return \EE_Registry::instance()->load_model( $model_name ); |
|
242 | - }else{ |
|
239 | + public function load_model($model_name) { |
|
240 | + if ($this->is_model_name_in_this_version($model_name)) { |
|
241 | + return \EE_Registry::instance()->load_model($model_name); |
|
242 | + } else { |
|
243 | 243 | throw new \EE_Error( |
244 | 244 | sprintf( |
245 | 245 | __( |
@@ -261,21 +261,21 @@ discard block |
||
261 | 261 | * @param \EEM_Base $model |
262 | 262 | * @return array|\EE_Model_Field_Base[] |
263 | 263 | */ |
264 | - public function fields_on_model_in_this_version( $model ) { |
|
265 | - if( ! isset( $this->_cached_fields_on_models[ $model->get_this_model_name() ] ) ) { |
|
264 | + public function fields_on_model_in_this_version($model) { |
|
265 | + if ( ! isset($this->_cached_fields_on_models[$model->get_this_model_name()])) { |
|
266 | 266 | //get all model changes between the requested version and current core version |
267 | 267 | $changes = $this->model_changes_between_requested_version_and_current(); |
268 | 268 | //fetch all fields currently on this model |
269 | 269 | $current_fields = $model->field_settings(); |
270 | 270 | //remove all fields that have been added since |
271 | - foreach( $changes as $version => $changes_in_version ) { |
|
272 | - if( |
|
273 | - isset( $changes_in_version[ $model->get_this_model_name() ] ) |
|
274 | - && $changes_in_version[ $model->get_this_model_name() ] !== Model_Version_Info::model_added |
|
271 | + foreach ($changes as $version => $changes_in_version) { |
|
272 | + if ( |
|
273 | + isset($changes_in_version[$model->get_this_model_name()]) |
|
274 | + && $changes_in_version[$model->get_this_model_name()] !== Model_Version_Info::model_added |
|
275 | 275 | ) { |
276 | 276 | $current_fields = array_diff_key( |
277 | 277 | $current_fields, |
278 | - array_flip( $changes_in_version[ $model->get_this_model_name() ] ) |
|
278 | + array_flip($changes_in_version[$model->get_this_model_name()]) |
|
279 | 279 | ); |
280 | 280 | } |
281 | 281 | } |
@@ -293,9 +293,9 @@ discard block |
||
293 | 293 | * @param array $classnames |
294 | 294 | * @return boolean |
295 | 295 | */ |
296 | - public function is_subclass_of_one( $object, $classnames ) { |
|
297 | - foreach( $classnames as $classname ) { |
|
298 | - if( is_a( $object, $classname ) ) { |
|
296 | + public function is_subclass_of_one($object, $classnames) { |
|
297 | + foreach ($classnames as $classname) { |
|
298 | + if (is_a($object, $classname)) { |
|
299 | 299 | return true; |
300 | 300 | } |
301 | 301 | } |
@@ -306,10 +306,10 @@ discard block |
||
306 | 306 | * Returns the list of model field classes that that the API basically ignores |
307 | 307 | * @return array |
308 | 308 | */ |
309 | - public function fields_ignored(){ |
|
309 | + public function fields_ignored() { |
|
310 | 310 | return apply_filters( |
311 | 311 | 'FHEE__Controller_Model_Read_fields_ignored', |
312 | - array( 'EE_Foreign_Key_Field_Base', 'EE_Any_Foreign_Model_Name_Field' ) |
|
312 | + array('EE_Foreign_Key_Field_Base', 'EE_Any_Foreign_Model_Name_Field') |
|
313 | 313 | ); |
314 | 314 | } |
315 | 315 | |
@@ -318,8 +318,8 @@ discard block |
||
318 | 318 | * @param EE_Model_Field_Base |
319 | 319 | * @return boolean |
320 | 320 | */ |
321 | - public function field_is_ignored( $field_obj ){ |
|
322 | - return $this->is_subclass_of_one( $field_obj, $this->fields_ignored() ); |
|
321 | + public function field_is_ignored($field_obj) { |
|
322 | + return $this->is_subclass_of_one($field_obj, $this->fields_ignored()); |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | /** |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | public function fields_that_have_rendered_format() { |
331 | 331 | return apply_filters( |
332 | 332 | 'FHEE__Controller_Model_Read__fields_raw', |
333 | - array( 'EE_Post_Content_Field', 'EE_Full_HTML_Field' ) |
|
333 | + array('EE_Post_Content_Field', 'EE_Full_HTML_Field') |
|
334 | 334 | ); |
335 | 335 | } |
336 | 336 | |
@@ -339,8 +339,8 @@ discard block |
||
339 | 339 | * @param EE_Model_Field_Base |
340 | 340 | * @return boolean |
341 | 341 | */ |
342 | - public function field_has_rendered_format( $field_obj ){ |
|
343 | - return $this->is_subclass_of_one( $field_obj, $this->fields_that_have_rendered_format() ); |
|
342 | + public function field_has_rendered_format($field_obj) { |
|
343 | + return $this->is_subclass_of_one($field_obj, $this->fields_that_have_rendered_format()); |
|
344 | 344 | } |
345 | 345 | |
346 | 346 | /** |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | public function fields_that_have_pretty_format() { |
353 | 353 | return apply_filters( |
354 | 354 | 'FHEE__Controller_Model_Read__fields_pretty', |
355 | - array( 'EE_Enum_Integer_Field', 'EE_Enum_Text_Field', 'EE_Money_Field' ) |
|
355 | + array('EE_Enum_Integer_Field', 'EE_Enum_Text_Field', 'EE_Money_Field') |
|
356 | 356 | ); |
357 | 357 | } |
358 | 358 | |
@@ -361,8 +361,8 @@ discard block |
||
361 | 361 | * @param EE_Model_Field_Base |
362 | 362 | * @return boolean |
363 | 363 | */ |
364 | - public function field_has_pretty_format( $field_obj ){ |
|
365 | - return $this->is_subclass_of_one( $field_obj, $this->fields_that_have_pretty_format() ); |
|
364 | + public function field_has_pretty_format($field_obj) { |
|
365 | + return $this->is_subclass_of_one($field_obj, $this->fields_that_have_pretty_format()); |
|
366 | 366 | } |
367 | 367 | |
368 | 368 | /** |
@@ -379,12 +379,12 @@ discard block |
||
379 | 379 | * @param \EEM_Base $model |
380 | 380 | * @return array |
381 | 381 | */ |
382 | - public function extra_resource_properties_for_model( $model ) { |
|
382 | + public function extra_resource_properties_for_model($model) { |
|
383 | 383 | $extra_properties = array(); |
384 | - foreach( $this->resource_changes_between_requested_version_and_current() as $version => $model_classnames ) { |
|
385 | - foreach( $model_classnames as $model_classname => $properties_added_in_this_version ) { |
|
386 | - if( is_subclass_of( $model, $model_classname ) ) { |
|
387 | - $extra_properties = array_merge( $extra_properties, $properties_added_in_this_version ); |
|
384 | + foreach ($this->resource_changes_between_requested_version_and_current() as $version => $model_classnames) { |
|
385 | + foreach ($model_classnames as $model_classname => $properties_added_in_this_version) { |
|
386 | + if (is_subclass_of($model, $model_classname)) { |
|
387 | + $extra_properties = array_merge($extra_properties, $properties_added_in_this_version); |
|
388 | 388 | } |
389 | 389 | } |
390 | 390 | } |
@@ -44,11 +44,11 @@ |
||
44 | 44 | |
45 | 45 | if( $field_obj instanceof \EE_Boolean_Field ) { |
46 | 46 | $datatype = 'Boolean'; |
47 | - }elseif( $field_obj->get_wpdb_data_type() == '%d' ) { |
|
47 | + } elseif( $field_obj->get_wpdb_data_type() == '%d' ) { |
|
48 | 48 | $datatype = 'Number'; |
49 | - }elseif( $field_name instanceof \EE_Serialized_Text_Field ) { |
|
49 | + } elseif( $field_name instanceof \EE_Serialized_Text_Field ) { |
|
50 | 50 | $datatype = 'Object'; |
51 | - }else{ |
|
51 | + } else{ |
|
52 | 52 | $datatype = 'String'; |
53 | 53 | } |
54 | 54 | $field_json = array( |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\libraries\rest_api\controllers\model; |
3 | -if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
4 | - exit( 'No direct script access allowed' ); |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
4 | + exit('No direct script access allowed'); |
|
5 | 5 | } |
6 | 6 | |
7 | 7 | /** |
@@ -18,75 +18,75 @@ discard block |
||
18 | 18 | class Meta extends Base { |
19 | 19 | |
20 | 20 | |
21 | - public static function handle_request_models_meta( \WP_REST_Request $request ) { |
|
21 | + public static function handle_request_models_meta(\WP_REST_Request $request) { |
|
22 | 22 | $controller = new Meta(); |
23 | 23 | $matches = $controller->parse_route( |
24 | 24 | $request->get_route(), |
25 | - '~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . 'resources~', |
|
26 | - array( 'version' ) ); |
|
27 | - if( $matches instanceof \WP_REST_Response ) { |
|
25 | + '~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'resources~', |
|
26 | + array('version') ); |
|
27 | + if ($matches instanceof \WP_REST_Response) { |
|
28 | 28 | return $matches; |
29 | 29 | } |
30 | - $controller->set_requested_version( $matches[ 'version' ] ); |
|
31 | - return $controller->send_response( $controller->_get_models_metadata_entity() ); |
|
30 | + $controller->set_requested_version($matches['version']); |
|
31 | + return $controller->send_response($controller->_get_models_metadata_entity()); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /* |
35 | 35 | * Gets the model metadata resource entity |
36 | 36 | * @return array for JSON response, describing all the models available in teh requested version |
37 | 37 | */ |
38 | - protected function _get_models_metadata_entity(){ |
|
38 | + protected function _get_models_metadata_entity() { |
|
39 | 39 | $response = array(); |
40 | - foreach( $this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname ){ |
|
41 | - $model = $this->get_model_version_info()->load_model( $model_name ); |
|
40 | + foreach ($this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname) { |
|
41 | + $model = $this->get_model_version_info()->load_model($model_name); |
|
42 | 42 | $fields_json = array(); |
43 | - foreach( $this->get_model_version_info()->fields_on_model_in_this_version( $model ) as $field_name => $field_obj ) { |
|
44 | - if( $this->get_model_version_info()->field_is_ignored( $field_obj ) ) { |
|
43 | + foreach ($this->get_model_version_info()->fields_on_model_in_this_version($model) as $field_name => $field_obj) { |
|
44 | + if ($this->get_model_version_info()->field_is_ignored($field_obj)) { |
|
45 | 45 | continue; |
46 | 46 | } |
47 | - if( $field_obj instanceof \EE_Boolean_Field ) { |
|
47 | + if ($field_obj instanceof \EE_Boolean_Field) { |
|
48 | 48 | $datatype = 'Boolean'; |
49 | - }elseif( $field_obj->get_wpdb_data_type() == '%d' ) { |
|
49 | + }elseif ($field_obj->get_wpdb_data_type() == '%d') { |
|
50 | 50 | $datatype = 'Number'; |
51 | - }elseif( $field_name instanceof \EE_Serialized_Text_Field ) { |
|
51 | + }elseif ($field_name instanceof \EE_Serialized_Text_Field) { |
|
52 | 52 | $datatype = 'Object'; |
53 | - }else{ |
|
53 | + } else { |
|
54 | 54 | $datatype = 'String'; |
55 | 55 | } |
56 | 56 | $default_value = $field_obj->get_default_value(); |
57 | - if( $default_value === EE_INF ) { |
|
57 | + if ($default_value === EE_INF) { |
|
58 | 58 | $default_value = EE_INF_IN_DB; |
59 | - } elseif( $field_obj instanceof \EE_Datetime_Field && |
|
60 | - $default_value instanceof \DateTime ) { |
|
61 | - $default_value = $default_value->format( 'c' ); |
|
59 | + } elseif ($field_obj instanceof \EE_Datetime_Field && |
|
60 | + $default_value instanceof \DateTime) { |
|
61 | + $default_value = $default_value->format('c'); |
|
62 | 62 | } |
63 | 63 | $field_json = array( |
64 | 64 | 'name' => $field_name, |
65 | 65 | 'nicename' => $field_obj->get_nicename(), |
66 | - 'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format( $field_obj ), |
|
67 | - 'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format( $field_obj ), |
|
68 | - 'type' => str_replace('EE_', '', get_class( $field_obj ) ), |
|
66 | + 'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format($field_obj), |
|
67 | + 'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format($field_obj), |
|
68 | + 'type' => str_replace('EE_', '', get_class($field_obj)), |
|
69 | 69 | 'datatype' => $datatype, |
70 | 70 | 'nullable' => $field_obj->is_nullable(), |
71 | 71 | 'default' => $default_value, |
72 | 72 | 'table_alias' => $field_obj->get_table_alias(), |
73 | 73 | 'table_column' => $field_obj->get_table_column(), |
74 | 74 | ); |
75 | - $fields_json[ $field_json[ 'name' ] ] = $field_json; |
|
75 | + $fields_json[$field_json['name']] = $field_json; |
|
76 | 76 | |
77 | 77 | } |
78 | - $fields_json = array_merge( $fields_json, $this->get_model_version_info()->extra_resource_properties_for_model( $model ) ); |
|
79 | - $response[ $model_name ]['fields'] = apply_filters( 'FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model ); |
|
78 | + $fields_json = array_merge($fields_json, $this->get_model_version_info()->extra_resource_properties_for_model($model)); |
|
79 | + $response[$model_name]['fields'] = apply_filters('FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model); |
|
80 | 80 | $relations_json = array(); |
81 | - foreach( $model->relation_settings() as $relation_name => $relation_obj ) { |
|
81 | + foreach ($model->relation_settings() as $relation_name => $relation_obj) { |
|
82 | 82 | $relation_json = array( |
83 | 83 | 'name' => $relation_name, |
84 | - 'type' => str_replace( 'EE_', '', get_class( $relation_obj ) ), |
|
84 | + 'type' => str_replace('EE_', '', get_class($relation_obj)), |
|
85 | 85 | 'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false, |
86 | 86 | ); |
87 | - $relations_json[ $relation_name ] = $relation_json; |
|
87 | + $relations_json[$relation_name] = $relation_json; |
|
88 | 88 | } |
89 | - $response[ $model_name ][ 'relations' ] = apply_filters( 'FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model ); |
|
89 | + $response[$model_name]['relations'] = apply_filters('FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model); |
|
90 | 90 | } |
91 | 91 | return $response; |
92 | 92 | } |
@@ -96,23 +96,23 @@ discard block |
||
96 | 96 | * @param WP_REST_Response $rest_response_obj |
97 | 97 | * @return WP_REST_Response |
98 | 98 | */ |
99 | - public static function filter_ee_metadata_into_index( $rest_response_obj ) { |
|
99 | + public static function filter_ee_metadata_into_index($rest_response_obj) { |
|
100 | 100 | $response_data = $rest_response_obj->get_data(); |
101 | 101 | $addons = array(); |
102 | - foreach( \EE_Registry::instance()->addons as $addon){ |
|
102 | + foreach (\EE_Registry::instance()->addons as $addon) { |
|
103 | 103 | $addon_json = array( |
104 | 104 | 'name' => $addon->name(), |
105 | 105 | 'version' => $addon->version() |
106 | 106 | ); |
107 | - $addons[ $addon_json[ 'name' ] ] = $addon_json; |
|
107 | + $addons[$addon_json['name']] = $addon_json; |
|
108 | 108 | } |
109 | - $response_data[ 'ee' ] = array( |
|
109 | + $response_data['ee'] = array( |
|
110 | 110 | 'version' => \EEM_System_Status::instance()->get_ee_version(), |
111 | 111 | 'addons' => $addons, |
112 | 112 | 'maintenance_mode' => \EE_Maintenance_Mode::instance()->real_level(), |
113 | - 'served_core_versions' => array_keys( \EED_Core_Rest_Api::versions_served() ) |
|
113 | + 'served_core_versions' => array_keys(\EED_Core_Rest_Api::versions_served()) |
|
114 | 114 | ); |
115 | - $rest_response_obj->set_data( $response_data ); |
|
115 | + $rest_response_obj->set_data($response_data); |
|
116 | 116 | return $rest_response_obj; |
117 | 117 | } |
118 | 118 | } |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | global $post_type, $post; |
3 | 3 | //action for registering metaboxes |
4 | -do_action( 'add_meta_boxes', $post_type, $post ); |
|
4 | +do_action('add_meta_boxes', $post_type, $post); |
|
5 | 5 | ?> |
6 | 6 | <div id="admin-page-header"> |
7 | 7 | <?php echo $admin_page_header; ?> |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | <!-- admin-page-header --> |
11 | 11 | <div id="post-body" class="metabox-holder columns-2"> |
12 | 12 | |
13 | - <?php if ( ! empty( $post_body_content )) : ?> |
|
13 | + <?php if ( ! empty($post_body_content)) : ?> |
|
14 | 14 | <div id="post-body-content"> |
15 | 15 | <?php echo $post_body_content; ?> |
16 | 16 | </div> |
@@ -18,13 +18,13 @@ discard block |
||
18 | 18 | <?php endif; ?> |
19 | 19 | |
20 | 20 | <div id="postbox-container-1" class="postbox-container"> |
21 | - <?php do_meta_boxes( $current_page, 'side', NULL ); ?> |
|
21 | + <?php do_meta_boxes($current_page, 'side', NULL); ?> |
|
22 | 22 | </div> |
23 | 23 | <!-- postbox-container-1 --> |
24 | 24 | |
25 | 25 | <div id="postbox-container-2" class="postbox-container"> |
26 | - <?php do_meta_boxes( $current_page, 'normal', NULL ); ?> |
|
27 | - <?php do_meta_boxes( $current_page, 'advanced', NULL ); ?> |
|
26 | + <?php do_meta_boxes($current_page, 'normal', NULL); ?> |
|
27 | + <?php do_meta_boxes($current_page, 'advanced', NULL); ?> |
|
28 | 28 | </div> |
29 | 29 | <!-- postbox-container-2 --> |
30 | 30 |
@@ -69,104 +69,104 @@ discard block |
||
69 | 69 | * @param array $options |
70 | 70 | * @return mixed |
71 | 71 | */ |
72 | - public function display_line_item( EE_Line_Item $line_item, $options = array() ) { |
|
72 | + public function display_line_item(EE_Line_Item $line_item, $options = array()) { |
|
73 | 73 | |
74 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
75 | - EE_Registry::instance()->load_helper( 'HTML' ); |
|
74 | + EE_Registry::instance()->load_helper('Template'); |
|
75 | + EE_Registry::instance()->load_helper('HTML'); |
|
76 | 76 | |
77 | 77 | $html = ''; |
78 | 78 | // set some default options and merge with incoming |
79 | 79 | $default_options = array( |
80 | - 'show_desc' => true, // true false |
|
80 | + 'show_desc' => true, // true false |
|
81 | 81 | 'odd' => false |
82 | 82 | ); |
83 | - $options = array_merge( $default_options, (array)$options ); |
|
83 | + $options = array_merge($default_options, (array) $options); |
|
84 | 84 | |
85 | - switch( $line_item->type() ) { |
|
85 | + switch ($line_item->type()) { |
|
86 | 86 | |
87 | 87 | case EEM_Line_Item::type_line_item: |
88 | 88 | $this->_show_taxes = $line_item->is_taxable() ? true : $this->_show_taxes; |
89 | - if ( $line_item->OBJ_type() == 'Ticket' ) { |
|
89 | + if ($line_item->OBJ_type() == 'Ticket') { |
|
90 | 90 | // item row |
91 | - $html .= $this->_ticket_row( $line_item, $options ); |
|
91 | + $html .= $this->_ticket_row($line_item, $options); |
|
92 | 92 | // got any kids? |
93 | - foreach ( $line_item->children() as $child_line_item ) { |
|
94 | - $this->display_line_item( $child_line_item, $options ); |
|
93 | + foreach ($line_item->children() as $child_line_item) { |
|
94 | + $this->display_line_item($child_line_item, $options); |
|
95 | 95 | } |
96 | 96 | } else { |
97 | 97 | // item row |
98 | - $html .= $this->_item_row( $line_item, $options ); |
|
98 | + $html .= $this->_item_row($line_item, $options); |
|
99 | 99 | // got any kids? |
100 | - foreach ( $line_item->children() as $child_line_item ) { |
|
101 | - $this->display_line_item( $child_line_item, $options ); |
|
100 | + foreach ($line_item->children() as $child_line_item) { |
|
101 | + $this->display_line_item($child_line_item, $options); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | break; |
105 | 105 | |
106 | 106 | case EEM_Line_Item::type_sub_line_item: |
107 | - $html .= $this->_sub_item_row( $line_item, $options ); |
|
107 | + $html .= $this->_sub_item_row($line_item, $options); |
|
108 | 108 | break; |
109 | 109 | |
110 | 110 | case EEM_Line_Item::type_sub_total: |
111 | 111 | static $sub_total = 0; |
112 | 112 | $event_sub_total = 0; |
113 | - $text = __( 'Sub-Total', 'event_espresso' ); |
|
114 | - if ( $line_item->OBJ_type() == 'Event' ) { |
|
115 | - $options[ 'event_id' ] = $event_id = $line_item->OBJ_ID(); |
|
116 | - if ( ! isset( $this->_events[ $options[ 'event_id' ] ] ) ) { |
|
117 | - $event = EEM_Event::instance()->get_one_by_ID( $options[ 'event_id' ] ); |
|
118 | - if ( $event instanceof EE_Event ) { |
|
119 | - if ( $event->default_registration_status() == EEM_Registration::status_id_not_approved ) { |
|
113 | + $text = __('Sub-Total', 'event_espresso'); |
|
114 | + if ($line_item->OBJ_type() == 'Event') { |
|
115 | + $options['event_id'] = $event_id = $line_item->OBJ_ID(); |
|
116 | + if ( ! isset($this->_events[$options['event_id']])) { |
|
117 | + $event = EEM_Event::instance()->get_one_by_ID($options['event_id']); |
|
118 | + if ($event instanceof EE_Event) { |
|
119 | + if ($event->default_registration_status() == EEM_Registration::status_id_not_approved) { |
|
120 | 120 | return ''; |
121 | 121 | } |
122 | 122 | } |
123 | - $this->_events[ $options[ 'event_id' ] ] = 0; |
|
124 | - $html .= $this->_event_row( $line_item ); |
|
125 | - $text = __( 'Event Sub-Total', 'event_espresso' ); |
|
123 | + $this->_events[$options['event_id']] = 0; |
|
124 | + $html .= $this->_event_row($line_item); |
|
125 | + $text = __('Event Sub-Total', 'event_espresso'); |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | $child_line_items = $line_item->children(); |
129 | 129 | // loop thru children |
130 | - foreach( $child_line_items as $child_line_item ) { |
|
130 | + foreach ($child_line_items as $child_line_item) { |
|
131 | 131 | // recursively feed children back into this method |
132 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
132 | + $html .= $this->display_line_item($child_line_item, $options); |
|
133 | 133 | } |
134 | - $event_sub_total += isset( $options[ 'event_id' ] ) ? $this->_events[ $options[ 'event_id' ] ] : 0; |
|
134 | + $event_sub_total += isset($options['event_id']) ? $this->_events[$options['event_id']] : 0; |
|
135 | 135 | $sub_total += $event_sub_total; |
136 | 136 | if ( |
137 | 137 | ( |
138 | 138 | // event subtotals |
139 | 139 | $line_item->code() != 'pre-tax-subtotal' && |
140 | - count( $child_line_items ) > 1 |
|
140 | + count($child_line_items) > 1 |
|
141 | 141 | ) |
142 | 142 | || |
143 | 143 | ( |
144 | 144 | // pre-tax subtotals |
145 | 145 | $line_item->code() == 'pre-tax-subtotal' && |
146 | - count( $this->_events ) > 1 |
|
146 | + count($this->_events) > 1 |
|
147 | 147 | ) |
148 | 148 | ) { |
149 | 149 | $options['sub_total'] = $line_item->OBJ_type() == 'Event' ? $event_sub_total : $sub_total; |
150 | - $html .= $this->_sub_total_row( $line_item, $text, $options ); |
|
150 | + $html .= $this->_sub_total_row($line_item, $text, $options); |
|
151 | 151 | } |
152 | 152 | break; |
153 | 153 | |
154 | 154 | case EEM_Line_Item::type_tax: |
155 | - if ( $this->_show_taxes ) { |
|
156 | - $this->_taxes_html .= $this->_tax_row( $line_item, $options ); |
|
155 | + if ($this->_show_taxes) { |
|
156 | + $this->_taxes_html .= $this->_tax_row($line_item, $options); |
|
157 | 157 | } |
158 | 158 | break; |
159 | 159 | |
160 | 160 | case EEM_Line_Item::type_tax_sub_total: |
161 | - if ( $this->_show_taxes ) { |
|
161 | + if ($this->_show_taxes) { |
|
162 | 162 | $child_line_items = $line_item->children(); |
163 | 163 | // loop thru children |
164 | - foreach( $child_line_items as $child_line_item ) { |
|
164 | + foreach ($child_line_items as $child_line_item) { |
|
165 | 165 | // recursively feed children back into this method |
166 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
166 | + $html .= $this->display_line_item($child_line_item, $options); |
|
167 | 167 | } |
168 | - if ( count( $child_line_items ) > 1 ) { |
|
169 | - $this->_taxes_html .= $this->_total_tax_row( $line_item, __( 'Tax Total', 'event_espresso' ) ); |
|
168 | + if (count($child_line_items) > 1) { |
|
169 | + $this->_taxes_html .= $this->_total_tax_row($line_item, __('Tax Total', 'event_espresso')); |
|
170 | 170 | } |
171 | 171 | } |
172 | 172 | break; |
@@ -175,25 +175,25 @@ discard block |
||
175 | 175 | // get all child line items |
176 | 176 | $children = $line_item->children(); |
177 | 177 | // loop thru all non-tax child line items |
178 | - foreach( $children as $child_line_item ) { |
|
179 | - if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) { |
|
178 | + foreach ($children as $child_line_item) { |
|
179 | + if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) { |
|
180 | 180 | // recursively feed children back into this method |
181 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
181 | + $html .= $this->display_line_item($child_line_item, $options); |
|
182 | 182 | } |
183 | 183 | } |
184 | 184 | |
185 | 185 | // now loop thru tax child line items |
186 | - foreach( $children as $child_line_item ) { |
|
187 | - if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) { |
|
186 | + foreach ($children as $child_line_item) { |
|
187 | + if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) { |
|
188 | 188 | // recursively feed children back into this method |
189 | - $html .= $this->display_line_item( $child_line_item, $options ); |
|
189 | + $html .= $this->display_line_item($child_line_item, $options); |
|
190 | 190 | } |
191 | 191 | } |
192 | 192 | $html .= $this->_taxes_html; |
193 | - $html .= $this->_total_row( $line_item, __('Total', 'event_espresso') ); |
|
193 | + $html .= $this->_total_row($line_item, __('Total', 'event_espresso')); |
|
194 | 194 | |
195 | 195 | |
196 | - $html .= $this->_payments_and_amount_owing_rows( $line_item, $options ); |
|
196 | + $html .= $this->_payments_and_amount_owing_rows($line_item, $options); |
|
197 | 197 | break; |
198 | 198 | |
199 | 199 | } |
@@ -208,11 +208,11 @@ discard block |
||
208 | 208 | * @param EE_Line_Item $line_item |
209 | 209 | * @return mixed |
210 | 210 | */ |
211 | - private function _event_row( EE_Line_Item $line_item ) { |
|
211 | + private function _event_row(EE_Line_Item $line_item) { |
|
212 | 212 | // start of row |
213 | - $html = EEH_HTML::tr( '', 'event-cart-total-row', 'total_tr odd' ); |
|
213 | + $html = EEH_HTML::tr('', 'event-cart-total-row', 'total_tr odd'); |
|
214 | 214 | // event name td |
215 | - $html .= EEH_HTML::td( EEH_HTML::strong( $line_item->name() ), '', 'event-header', '', ' colspan="4"' ); |
|
215 | + $html .= EEH_HTML::td(EEH_HTML::strong($line_item->name()), '', 'event-header', '', ' colspan="4"'); |
|
216 | 216 | // end of row |
217 | 217 | $html .= EEH_HTML::trx(); |
218 | 218 | return $html; |
@@ -227,10 +227,10 @@ discard block |
||
227 | 227 | * @param array $options |
228 | 228 | * @return mixed |
229 | 229 | */ |
230 | - private function _ticket_row( EE_Line_Item $line_item, $options = array() ) { |
|
230 | + private function _ticket_row(EE_Line_Item $line_item, $options = array()) { |
|
231 | 231 | // start of row |
232 | 232 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
233 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
233 | + $html = EEH_HTML::tr('', '', $row_class); |
|
234 | 234 | // name && desc |
235 | 235 | $name_and_desc = apply_filters( |
236 | 236 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name', |
@@ -239,23 +239,23 @@ discard block |
||
239 | 239 | ); |
240 | 240 | $name_and_desc .= apply_filters( |
241 | 241 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc', |
242 | - ( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ), |
|
242 | + ($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''), |
|
243 | 243 | $line_item, |
244 | 244 | $options |
245 | 245 | ); |
246 | 246 | $name_and_desc .= $line_item->is_taxable() ? ' * ' : ''; |
247 | 247 | // name td |
248 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
248 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' ); |
|
249 | 249 | // price td |
250 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
250 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
251 | 251 | // quantity td |
252 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
|
252 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght'); |
|
253 | 253 | $this->_total_items += $line_item->quantity(); |
254 | 254 | // determine total for line item |
255 | 255 | $total = $line_item->total(); |
256 | - $this->_events[ $options[ 'event_id' ] ] += $total; |
|
256 | + $this->_events[$options['event_id']] += $total; |
|
257 | 257 | // total td |
258 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '', 'item_r jst-rght' ); |
|
258 | + $html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght'); |
|
259 | 259 | // end of row |
260 | 260 | $html .= EEH_HTML::trx(); |
261 | 261 | return $html; |
@@ -270,41 +270,41 @@ discard block |
||
270 | 270 | * @param array $options |
271 | 271 | * @return mixed |
272 | 272 | */ |
273 | - private function _item_row( EE_Line_Item $line_item, $options = array() ) { |
|
273 | + private function _item_row(EE_Line_Item $line_item, $options = array()) { |
|
274 | 274 | // start of row |
275 | 275 | $row_class = $options['odd'] ? 'item odd' : 'item'; |
276 | - $html = EEH_HTML::tr( '', '', $row_class ); |
|
277 | - $obj_name = $line_item->OBJ_type() ? $line_item->OBJ_type() . ': ' : ''; |
|
276 | + $html = EEH_HTML::tr('', '', $row_class); |
|
277 | + $obj_name = $line_item->OBJ_type() ? $line_item->OBJ_type().': ' : ''; |
|
278 | 278 | // name && desc |
279 | 279 | $name_and_desc = apply_filters( |
280 | 280 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__name', |
281 | - $obj_name . $line_item->name(), |
|
281 | + $obj_name.$line_item->name(), |
|
282 | 282 | $line_item |
283 | 283 | ); |
284 | 284 | $name_and_desc .= apply_filters( |
285 | 285 | 'FHEE__EE_SPCO_Line_Item_Display_Strategy__item_row__desc', |
286 | - ( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ), |
|
286 | + ($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''), |
|
287 | 287 | $line_item, |
288 | 288 | $options |
289 | 289 | ); |
290 | 290 | $name_and_desc .= $line_item->is_taxable() ? ' * ' : ''; |
291 | 291 | // name td |
292 | - $html .= EEH_HTML::td( $name_and_desc, '', 'item_l' ); |
|
292 | + $html .= EEH_HTML::td($name_and_desc, '', 'item_l'); |
|
293 | 293 | // price td |
294 | - if ( $line_item->is_percent() ) { |
|
295 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c jst-rght' ); |
|
294 | + if ($line_item->is_percent()) { |
|
295 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c jst-rght'); |
|
296 | 296 | } else { |
297 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
297 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
298 | 298 | } |
299 | 299 | // quantity td |
300 | - $html .= EEH_HTML::td( $line_item->quantity(), '', 'item_l jst-rght' ); |
|
300 | + $html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght'); |
|
301 | 301 | //$total = $line_item->total() * $line_item->quantity(); |
302 | 302 | $total = $line_item->total(); |
303 | - if( isset( $options[ 'event_id' ] ) && isset( $this->_events[ $options[ 'event_id' ] ] ) ) { |
|
304 | - $this->_events[ $options[ 'event_id' ] ] += $total; |
|
303 | + if (isset($options['event_id']) && isset($this->_events[$options['event_id']])) { |
|
304 | + $this->_events[$options['event_id']] += $total; |
|
305 | 305 | } |
306 | 306 | // total td |
307 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $total, false, false ), '', 'item_r jst-rght' ); |
|
307 | + $html .= EEH_HTML::td(EEH_Template::format_currency($total, false, false), '', 'item_r jst-rght'); |
|
308 | 308 | // end of row |
309 | 309 | $html .= EEH_HTML::trx(); |
310 | 310 | return $html; |
@@ -319,22 +319,22 @@ discard block |
||
319 | 319 | * @param array $options |
320 | 320 | * @return mixed |
321 | 321 | */ |
322 | - private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) { |
|
322 | + private function _sub_item_row(EE_Line_Item $line_item, $options = array()) { |
|
323 | 323 | // start of row |
324 | - $html = EEH_HTML::tr( '', 'item sub-item-row' ); |
|
324 | + $html = EEH_HTML::tr('', 'item sub-item-row'); |
|
325 | 325 | // name && desc |
326 | 326 | $name_and_desc = $line_item->name(); |
327 | - $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : ''; |
|
327 | + $name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''; |
|
328 | 328 | // name td |
329 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
329 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
330 | 330 | // discount/surcharge td |
331 | - if ( $line_item->is_percent() ) { |
|
332 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', 'item_c' ); |
|
331 | + if ($line_item->is_percent()) { |
|
332 | + $html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c'); |
|
333 | 333 | } else { |
334 | - $html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'item_c jst-rght' ); |
|
334 | + $html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght'); |
|
335 | 335 | } |
336 | 336 | // total td |
337 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'item_r jst-rght' ); |
|
337 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght'); |
|
338 | 338 | // end of row |
339 | 339 | $html .= EEH_HTML::trx(); |
340 | 340 | return $html; |
@@ -349,21 +349,21 @@ discard block |
||
349 | 349 | * @param array $options |
350 | 350 | * @return mixed |
351 | 351 | */ |
352 | - private function _tax_row( EE_Line_Item $line_item, $options = array() ) { |
|
352 | + private function _tax_row(EE_Line_Item $line_item, $options = array()) { |
|
353 | 353 | // start of row |
354 | - $html = EEH_HTML::tr( '', 'item sub-item tax-total' ); |
|
354 | + $html = EEH_HTML::tr('', 'item sub-item tax-total'); |
|
355 | 355 | // name && desc |
356 | 356 | $name_and_desc = $line_item->name(); |
357 | - $name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable items', 'event_espresso' ) . '</span>'; |
|
358 | - $name_and_desc .= $options[ 'show_desc' ] ? '<br/>' . $line_item->desc() : ''; |
|
357 | + $name_and_desc .= '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable items', 'event_espresso').'</span>'; |
|
358 | + $name_and_desc .= $options['show_desc'] ? '<br/>'.$line_item->desc() : ''; |
|
359 | 359 | // name td |
360 | - $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
360 | + $html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' ); |
|
361 | 361 | // percent td |
362 | - $html .= EEH_HTML::td( $line_item->percent() . '%', '', ' jst-rght', '' ); |
|
362 | + $html .= EEH_HTML::td($line_item->percent().'%', '', ' jst-rght', ''); |
|
363 | 363 | // empty td (price) |
364 | - $html .= EEH_HTML::td( EEH_HTML::nbsp() ); |
|
364 | + $html .= EEH_HTML::td(EEH_HTML::nbsp()); |
|
365 | 365 | // total td |
366 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'item_r jst-rght' ); |
|
366 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght'); |
|
367 | 367 | // end of row |
368 | 368 | $html .= EEH_HTML::trx(); |
369 | 369 | return $html; |
@@ -378,17 +378,17 @@ discard block |
||
378 | 378 | * @param string $text |
379 | 379 | * @return mixed |
380 | 380 | */ |
381 | - private function _total_tax_row( EE_Line_Item $line_item, $text = '' ) { |
|
381 | + private function _total_tax_row(EE_Line_Item $line_item, $text = '') { |
|
382 | 382 | $html = ''; |
383 | - if ( $line_item->total() ) { |
|
383 | + if ($line_item->total()) { |
|
384 | 384 | // start of row |
385 | - $html = EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
385 | + $html = EEH_HTML::tr('', '', 'total_tr odd'); |
|
386 | 386 | // total td |
387 | - $html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="2"' ); |
|
387 | + $html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="2"'); |
|
388 | 388 | // empty td (price) |
389 | - $html .= EEH_HTML::td( EEH_HTML::nbsp() ); |
|
389 | + $html .= EEH_HTML::td(EEH_HTML::nbsp()); |
|
390 | 390 | // total td |
391 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'total jst-rght' ); |
|
391 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght'); |
|
392 | 392 | // end of row |
393 | 393 | $html .= EEH_HTML::trx(); |
394 | 394 | } |
@@ -405,15 +405,15 @@ discard block |
||
405 | 405 | * @param array $options |
406 | 406 | * @return mixed |
407 | 407 | */ |
408 | - private function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) { |
|
408 | + private function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) { |
|
409 | 409 | $html = ''; |
410 | - if ( $line_item->total() ) { |
|
410 | + if ($line_item->total()) { |
|
411 | 411 | // start of row |
412 | - $html = EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
412 | + $html = EEH_HTML::tr('', '', 'total_tr odd'); |
|
413 | 413 | // total td |
414 | - $html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="3"' ); |
|
414 | + $html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"'); |
|
415 | 415 | // total td |
416 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $options[ 'sub_total' ], false, false ), '', 'total jst-rght' ); |
|
416 | + $html .= EEH_HTML::td(EEH_Template::format_currency($options['sub_total'], false, false), '', 'total jst-rght'); |
|
417 | 417 | // end of row |
418 | 418 | $html .= EEH_HTML::trx(); |
419 | 419 | } |
@@ -430,13 +430,13 @@ discard block |
||
430 | 430 | * @param string $text |
431 | 431 | * @return mixed |
432 | 432 | */ |
433 | - private function _total_row( EE_Line_Item $line_item, $text = '' ) { |
|
433 | + private function _total_row(EE_Line_Item $line_item, $text = '') { |
|
434 | 434 | // start of row |
435 | - $html = EEH_HTML::tr( '', '', 'spco-grand-total total_tr odd' ); |
|
435 | + $html = EEH_HTML::tr('', '', 'spco-grand-total total_tr odd'); |
|
436 | 436 | // total td |
437 | - $html .= EEH_HTML::td( $text, '', 'total_currency total jst-rght', '', ' colspan="3"' ); |
|
437 | + $html .= EEH_HTML::td($text, '', 'total_currency total jst-rght', '', ' colspan="3"'); |
|
438 | 438 | // total td |
439 | - $html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'total jst-rght' ); |
|
439 | + $html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'total jst-rght'); |
|
440 | 440 | // end of row |
441 | 441 | $html .= EEH_HTML::trx(); |
442 | 442 | return $html; |
@@ -451,30 +451,30 @@ discard block |
||
451 | 451 | * @param array $options |
452 | 452 | * @return mixed |
453 | 453 | */ |
454 | - private function _payments_and_amount_owing_rows( EE_Line_Item $line_item, $options = array() ) { |
|
454 | + private function _payments_and_amount_owing_rows(EE_Line_Item $line_item, $options = array()) { |
|
455 | 455 | $html = ''; |
456 | 456 | $owing = $line_item->total(); |
457 | - $transaction = EEM_Transaction::instance()->get_one_by_ID( $line_item->TXN_ID() ); |
|
458 | - if ( $transaction instanceof EE_Transaction ) { |
|
457 | + $transaction = EEM_Transaction::instance()->get_one_by_ID($line_item->TXN_ID()); |
|
458 | + if ($transaction instanceof EE_Transaction) { |
|
459 | 459 | $registration_payments = array(); |
460 | - $registrations = ! empty( $options['registrations'] ) |
|
461 | - ? $options[ 'registrations' ] |
|
460 | + $registrations = ! empty($options['registrations']) |
|
461 | + ? $options['registrations'] |
|
462 | 462 | : $transaction->registrations(); |
463 | - foreach ( $registrations as $registration ) { |
|
464 | - if ( $registration instanceof EE_Registration && $registration->owes_monies_and_can_pay() ) { |
|
463 | + foreach ($registrations as $registration) { |
|
464 | + if ($registration instanceof EE_Registration && $registration->owes_monies_and_can_pay()) { |
|
465 | 465 | $registration_payments = $registration_payments + $registration->registration_payments(); |
466 | 466 | } |
467 | 467 | } |
468 | - if ( ! empty( $registration_payments )) { |
|
469 | - foreach ( $registration_payments as $registration_payment ) { |
|
470 | - if ( $registration_payment instanceof EE_Registration_Payment ) { |
|
468 | + if ( ! empty($registration_payments)) { |
|
469 | + foreach ($registration_payments as $registration_payment) { |
|
470 | + if ($registration_payment instanceof EE_Registration_Payment) { |
|
471 | 471 | $owing = $owing - $registration_payment->amount(); |
472 | 472 | $payment = $registration_payment->payment(); |
473 | - if ( $payment instanceof EE_Payment ) { |
|
473 | + if ($payment instanceof EE_Payment) { |
|
474 | 474 | $payment_desc = sprintf( |
475 | - __( 'Payment%1$s Received: %2$s', 'event_espresso' ), |
|
475 | + __('Payment%1$s Received: %2$s', 'event_espresso'), |
|
476 | 476 | $payment->txn_id_chq_nmbr() != '' |
477 | - ? ' <span class="small-text">(#' . $payment->txn_id_chq_nmbr() . ')</span> ' |
|
477 | + ? ' <span class="small-text">(#'.$payment->txn_id_chq_nmbr().')</span> ' |
|
478 | 478 | : '', |
479 | 479 | $payment->timestamp() |
480 | 480 | ); |
@@ -482,12 +482,12 @@ discard block |
||
482 | 482 | $payment_desc = ''; |
483 | 483 | } |
484 | 484 | // start of row |
485 | - $html .= EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
485 | + $html .= EEH_HTML::tr('', '', 'total_tr odd'); |
|
486 | 486 | // payment desc |
487 | - $html .= EEH_HTML::td( $payment_desc, '', '', '', ' colspan="3"' ); |
|
487 | + $html .= EEH_HTML::td($payment_desc, '', '', '', ' colspan="3"'); |
|
488 | 488 | // total td |
489 | 489 | $html .= EEH_HTML::td( |
490 | - EEH_Template::format_currency( $registration_payment->amount(), false, false ), |
|
490 | + EEH_Template::format_currency($registration_payment->amount(), false, false), |
|
491 | 491 | '', |
492 | 492 | 'total jst-rght' |
493 | 493 | ); |
@@ -495,17 +495,17 @@ discard block |
||
495 | 495 | $html .= EEH_HTML::trx(); |
496 | 496 | } |
497 | 497 | } |
498 | - if ( $line_item->total() ) { |
|
498 | + if ($line_item->total()) { |
|
499 | 499 | // start of row |
500 | - $html .= EEH_HTML::tr( '', '', 'total_tr odd' ); |
|
500 | + $html .= EEH_HTML::tr('', '', 'total_tr odd'); |
|
501 | 501 | // total td |
502 | 502 | $html .= EEH_HTML::td( |
503 | 503 | __('Amount Owing', 'event_espresso'), |
504 | - '', 'total_currency total jst-rght', '', ' colspan="3"' |
|
504 | + '', 'total_currency total jst-rght', '', ' colspan="3"' |
|
505 | 505 | ); |
506 | 506 | // total td |
507 | 507 | $html .= EEH_HTML::td( |
508 | - EEH_Template::format_currency( $owing, false, false ), '', 'total jst-rght' |
|
508 | + EEH_Template::format_currency($owing, false, false), '', 'total jst-rght' |
|
509 | 509 | ); |
510 | 510 | // end of row |
511 | 511 | $html .= EEH_HTML::trx(); |
@@ -26,16 +26,16 @@ discard block |
||
26 | 26 | * |
27 | 27 | * ------------------------------------------------------------------------ |
28 | 28 | */ |
29 | -require_once ( EE_MODELS . 'EEM_Base.model.php' ); |
|
29 | +require_once (EE_MODELS.'EEM_Base.model.php'); |
|
30 | 30 | |
31 | 31 | class EEM_Extra_Meta extends EEM_Base { |
32 | 32 | |
33 | 33 | // private instance of the Attendee object |
34 | 34 | protected static $_instance = NULL; |
35 | 35 | |
36 | - protected function __construct( $timezone = NULL ) { |
|
37 | - $this->singular_item = __('Extra Meta','event_espresso'); |
|
38 | - $this->plural_item = __('Extra Metas','event_espresso'); |
|
36 | + protected function __construct($timezone = NULL) { |
|
37 | + $this->singular_item = __('Extra Meta', 'event_espresso'); |
|
38 | + $this->plural_item = __('Extra Metas', 'event_espresso'); |
|
39 | 39 | $this->_tables = array( |
40 | 40 | 'Extra_Meta'=> new EE_Primary_Table('esp_extra_meta', 'EXM_ID') |
41 | 41 | ); |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | |
51 | 51 | )); |
52 | 52 | $this->_model_relations = array(); |
53 | - foreach($models_this_can_attach_to as $model){ |
|
53 | + foreach ($models_this_can_attach_to as $model) { |
|
54 | 54 | $this->_model_relations[$model] = new EE_Belongs_To_Any_Relation(); |
55 | 55 | } |
56 | - foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ) { |
|
57 | - $this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta( 'EXM_key', 'EXM_value' ); |
|
56 | + foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) { |
|
57 | + $this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta('EXM_key', 'EXM_value'); |
|
58 | 58 | } |
59 | - parent::__construct( $timezone ); |
|
59 | + parent::__construct($timezone); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 |
@@ -31,20 +31,20 @@ discard block |
||
31 | 31 | * |
32 | 32 | * ------------------------------------------------------------------------ |
33 | 33 | */ |
34 | -require_once ( EE_MODELS . 'EEM_Base.model.php' ); |
|
34 | +require_once (EE_MODELS.'EEM_Base.model.php'); |
|
35 | 35 | |
36 | 36 | class EEM_Post_Meta extends EEM_Base { |
37 | 37 | |
38 | 38 | // private instance of the EE_Post_Meta object |
39 | 39 | protected static $_instance = NULL; |
40 | 40 | |
41 | - protected function __construct( $timezone = NULL ) { |
|
42 | - $this->singular_item = __('Post Meta','event_espresso'); |
|
43 | - $this->plural_item = __('Post Metas','event_espresso'); |
|
41 | + protected function __construct($timezone = NULL) { |
|
42 | + $this->singular_item = __('Post Meta', 'event_espresso'); |
|
43 | + $this->plural_item = __('Post Metas', 'event_espresso'); |
|
44 | 44 | $this->_tables = array( |
45 | 45 | 'Post_Meta'=> new EE_Primary_Table('postmeta', 'meta_id') |
46 | 46 | ); |
47 | - $models_this_can_attach_to = array_keys( EE_Registry::instance()->cpt_models() ); |
|
47 | + $models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models()); |
|
48 | 48 | $this->_fields = array( |
49 | 49 | 'Post_Meta'=>array( |
50 | 50 | 'meta_id'=>new EE_Primary_Key_Int_Field('meta_id', __("Meta ID", "event_espresso")), |
@@ -53,13 +53,13 @@ discard block |
||
53 | 53 | 'meta_value'=>new EE_Maybe_Serialized_Text_Field('meta_value', __("Meta Value", "event_espresso"), true) |
54 | 54 | )); |
55 | 55 | $this->_model_relations = array(); |
56 | - foreach($models_this_can_attach_to as $model){ |
|
56 | + foreach ($models_this_can_attach_to as $model) { |
|
57 | 57 | $this->_model_relations[$model] = new EE_Belongs_To_Relation(); |
58 | 58 | } |
59 | - foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ) { |
|
60 | - $this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta( 'meta_key', 'meta_value' ); |
|
59 | + foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) { |
|
60 | + $this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta('meta_key', 'meta_value'); |
|
61 | 61 | } |
62 | - parent::__construct( $timezone ); |
|
62 | + parent::__construct($timezone); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 |